Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/components/ImageUpload/index.vue

@@ -309,7 +309,6 @@ export default {
     // 上传结束处理
     uploadedSuccessfully() {
       if (this.number > 0 && this.uploadList.length === this.number) {
-        debugger
         this.fileList = this.fileList.concat(this.uploadList);
         this.uploadList = [];
         this.number = 0;

src/utils/request.js

@@ -197,7 +197,6 @@ export function download(url, params, filename, config) {
     responseType: 'blob',
     ...config
   }).then(async (data) => {
-    debugger
     const isBlob = blobValidate(data);
     if (isBlob) {
       const blob = new Blob([data])

src/views/check/dialog.edit.vue

@@ -165,15 +165,16 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item prop="checkOrgType" label="受检机构类型:">
+              <el-form-item prop="checkOrgTypes" label="受检机构类型:">
                 <el-select
                   :disabled="isChildren()"
                   @change="cleanCheckOrgList"
-                  prop="checkOrgType"
+                  prop="checkOrgTypes"
                   label="受检机构类型"
-                  v-model="formData.checkOrgType"
+                  v-model="formData.checkOrgTypes"
                   placeholder="请选择机构类型"
                   clearable
+                  multiple
                 >
                   <el-option
                     v-for="item in dict.type.sys_org_type"
@@ -336,7 +337,7 @@
     <DialogSelect
       ref="DialogSelect"
       :defaultSelect="defaultSelect"
-      :orgType="formData.checkOrgType"
+      :orgType="formData.checkOrgTypes"
       @select="onSelect"
     ></DialogSelect>
   </div>
@@ -394,7 +395,7 @@ export default {
         roleList: [{ required: true, message: "请选择检查角色" }],
         planExec: [{ required: true, message: "请选择计划时间" }],
         count: [{ required: true, message: "请选择计划次数" }],
-        checkOrgType: [{ required: true, message: "请选择受检机构类型" }],
+        checkOrgTypes: [{ required: true, message: "请选择受检机构类型" }],
         roleIds: [{ required: true, message: "请选择检查角色" }],
       },
       statusOptions: statusOptions,
@@ -633,7 +634,7 @@ export default {
         checkOrgIds: null,
         execOrgIds: null,
         rulePointIds: null,
-        checkOrgType: null,
+        checkOrgTypes: [],
         checkType: null,
         startDate: null,
         endDate: null,
@@ -663,6 +664,9 @@ export default {
             this.formData.roleIds = this.formData.roleList.map(
               (role) => role.id
             );
+            this.formData.checkOrgTypes = this.formData.checkOrgTypeList.map(
+              (type) => type.typeId.toString()
+            );
             this.formData.execOrgIds = this.formData.execOrgList.map(
               (org) => org.id
             );
@@ -679,7 +683,7 @@ export default {
         this.formData.planCycle = null;
         this.formData.planStatus = null;
         this.formData.execOrgType = null;
-        this.formData.checkOrgType = null;
+        this.formData.checkOrgTypes = [];
         this.formData.checkType = null;
         this.formData.roleNames = null;
         this.formData.count = null;

src/views/check/index.vue

@@ -246,14 +246,14 @@
             </el-table-column>
 
             <el-table-column
-              prop="checkOrgType"
+              prop="typeNames"
               align="center"
               width="180px"
               label="受检机构"
             >
-              <template slot-scope="r"
+              <!-- <template slot-scope="r"
                 >{{ getLabel(dict.type.sys_org_type, `${r.row.checkOrgType}`) }}
-              </template>
+              </template> -->
             </el-table-column>
 
             <el-table-column

src/views/system/device/index.vue

@@ -509,7 +509,6 @@ export default {
   methods: {
     onOrgSelect(node) {
       this.form.orgPath = node.path;
-      debugger;
       this.form.orgName = node.name;
     },
     // 文件上传中处理