Merge remote-tracking branch 'remotes/origin/3.3.7-scxjy' into web-v2

src/views/comprehensive/system/publicConfig/integrationConfig.vue

@@ -29,24 +29,24 @@
           <span>秒</span>
         </el-form-item>
       </div>
-      <!--<div class="form-max-box">-->
-        <!--<el-form-item label="签到/离开示意图：" prop="signMap">-->
-          <!--<el-upload-->
-            <!--class="certificate-avatar-uploader"-->
-            <!--:action="uploadImgUrl"-->
-            <!--:show-file-list="false"-->
-            <!--accept="image/jpeg,image/gif,image/png"-->
-            <!--:on-success="(res)=>handleAvatarSuccess(res,'signMap')"-->
-            <!--:headers="headers"-->
-            <!--:before-upload="beforeAvatarUpload">-->
-            <!--<img v-if="form.signMap" :src="form.signMap" class="avatar">-->
-            <!--<i v-if="!form.signMap" class="el-icon-plus avatar-uploader-icon" >上传</i>-->
-          <!--</el-upload>-->
-          <!--<i v-if="form.signMap" class="el-icon-view" @click="lookImg(form.signMap)"-->
-             <!--style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;-->
-            <!--height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>-->
-        <!--</el-form-item>-->
-      <!--</div>-->
+      <div class="form-max-box">
+        <el-form-item label="签到/离开示意图：" prop="signMap">
+          <el-upload
+            class="certificate-avatar-uploader"
+            :action="uploadImgUrl"
+            :show-file-list="false"
+            accept="image/jpeg,image/gif,image/png"
+            :on-success="(res)=>handleAvatarSuccess(res,'signMap')"
+            :headers="headers"
+            :before-upload="beforeAvatarUpload">
+            <img v-if="form.signMap" :src="form.signMap" class="avatar">
+            <i v-if="!form.signMap" class="el-icon-plus avatar-uploader-icon" >上传</i>
+          </el-upload>
+          <i v-if="form.signMap" class="el-icon-view" @click="lookImg(form.signMap)"
+             style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;
+            height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
+        </el-form-item>
+      </div>
       <div class="form-max-box">
         <el-form-item label="视频封面：" prop="videoCover">
           <el-upload
@@ -65,24 +65,24 @@
             height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
         </el-form-item>
       </div>
-      <!--<div class="form-max-box">-->
-        <!--<el-form-item label="操作指南：" prop="operationGuide">-->
-          <!--<el-upload-->
-            <!--class="certificate-avatar-uploader"-->
-            <!--:action="uploadImgUrl"-->
-            <!--:show-file-list="false"-->
-            <!--accept="image/jpeg,image/gif,image/png"-->
-            <!--:on-success="(res)=>handleAvatarSuccess(res,'operationGuide')"-->
-            <!--:headers="headers"-->
-            <!--:before-upload="beforeAvatarUpload">-->
-            <!--<img v-if="form.operationGuide" :src="form.operationGuide" class="avatar">-->
-            <!--<i v-if="!form.operationGuide" class="el-icon-plus avatar-uploader-icon">上传</i>-->
-          <!--</el-upload>-->
-          <!--<i v-if="form.operationGuide" class="el-icon-view" @click="lookImg(form.operationGuide)"-->
-             <!--style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;-->
-            <!--height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>-->
-        <!--</el-form-item>-->
-      <!--</div>-->
+      <div class="form-max-box">
+        <el-form-item label="操作指南：" prop="operationGuide">
+          <el-upload
+            class="certificate-avatar-uploader"
+            :action="uploadImgUrl"
+            :show-file-list="false"
+            accept="image/jpeg,image/gif,image/png"
+            :on-success="(res)=>handleAvatarSuccess(res,'operationGuide')"
+            :headers="headers"
+            :before-upload="beforeAvatarUpload">
+            <img v-if="form.operationGuide" :src="form.operationGuide" class="avatar">
+            <i v-if="!form.operationGuide" class="el-icon-plus avatar-uploader-icon">上传</i>
+          </el-upload>
+          <i v-if="form.operationGuide" class="el-icon-view" @click="lookImg(form.operationGuide)"
+             style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;
+            height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
+        </el-form-item>
+      </div>
     </el-form>
     <div class="sub_btn">
       <p class="null-p"></p>

src/views/studentViews/chemicalManagement/studentChemicalInfo/addPage.vue

@@ -223,7 +223,7 @@
 </template>
 
 <script>
-  import { getNoAdminSubjectListNopage,getCabinetBySubId,hxpChemicalJoinCabinet,getRestStockByManyCabinet,classifyList } from "@/api/medicUniversity-3_1/index";
+  import { filterDept,getSubList,getCabinetBySubId,hxpChemicalJoinCabinet,getRestStockByManyCabinet,classifyList } from "@/api/medicUniversity-3_1/index";
   import { getHxpQueryByUser } from "@/api/studentApi/chemicalManagement/index";
   import { getLogoInfo } from "@/api/system/publicConfig";
   export default {
@@ -547,27 +547,26 @@
       //化学品存放
       handleAdd(){
         //查询当前院系
-        // filterDept().then(response => {
-        //   if(!this.selectioned.id){
-        //     this.msgError('请勾选化学品')
-        //     return
-        //   }
-        //   let text = "";
-        //   let idText = "";
-        //   for(let i=0;i<response.data.length;i++){
-        //     if(i==0){
-        //       text = text + response.data[i].deptName;
-        //       idText = idText + response.data[i].deptId;
-        //     }else{
-        //       text = text +'-'+ response.data[i].deptName;
-        //       idText = idText +','+ response.data[i].deptId;
-        //     }
-        //   }
-        //   this.$set(this,'dialogDeptName',text);
-        //   this.$set(this,'dialogDeptId',idText);
-        //   this.getSubList();
-        // });
+        filterDept().then(response => {
+          if(!this.selectioned.id){
+            this.msgError('请勾选化学品')
+            return
+          }
+          let text = "";
+          let idText = "";
+          for(let i=0;i<response.data.length;i++){
+            if(i==0){
+              text = text + response.data[i].deptName;
+              idText = idText + response.data[i].deptId;
+            }else{
+              text = text +'-'+ response.data[i].deptName;
+              idText = idText +','+ response.data[i].deptId;
+            }
+          }
+          this.$set(this,'dialogDeptName',text);
+          this.$set(this,'dialogDeptId',idText);
           this.getSubList();
+        });
       },
       backPage(){
         this.$parent.pageToggle(0);
@@ -608,7 +607,8 @@
       },
       //根据所属院系或多个院系获取实验室列表
       getSubList(){
-        getNoAdminSubjectListNopage().then(response => {
+        let ids = this.dialogDeptId+'';
+        getSubList(ids).then(response => {
           this.$set(this,'dialogData',{
             subId:"",
             chemicalId:"",