update 企标稽查计划

src/components/selection/WorkGroupSelection.vue

@@ -2,7 +2,7 @@
   <div class="selection-wrapper">
     <div class="box-title-text">
       <a-input class="box-input" v-model="textVals" :title="textVals"
-               :disabled="disabledInput" readonly :placeholder="placeholder">
+               :disabled="disabledInput" :placeholder="placeholder">
         <a-icon v-if="storeVals" slot="suffix" type="close-circle" @click="handleEmpty" title="清空"/>
       </a-input>
       <a-button v-if="!disabled" type="primary" class="button-box" @click="workGroupClick">
@@ -62,10 +62,10 @@ export default {
       default: true,
       required: false
     },
-    // 自定义返回字段，默认返回 id
+    // 自定义返回字段，默认返回 name
     customReturnField: {
       type: String,
-      default: ''
+      default: 'name'
     },
     backDepart: {
       type: Boolean,
@@ -156,9 +156,6 @@ export default {
       this.$emit('change', this.storeVals)
       this.backDepartInfo()
     },
-    getDepartNames () {
-      return this.departNames
-    },
     handleEmpty () {
       this.handleOK('')
     },

src/components/selection/WorkGroupSelectionModal.vue

@@ -280,7 +280,7 @@ export default {
           if (item.id === key) {
             return item
           }
-          if (item.children instanceof Array) {
+          if (Array.isArray(item.children)) {
             const value = forChildren(item.children, key)
             if (value != null) {
               return value

src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue

@@ -231,16 +231,25 @@ export default {
       this.loadPage({ projectId, taskId })
       return
     }
-    // 否则就是创建一个新的流程
+    this.getProjectId()
-    getInspectPlanProjectId().then(res => {
-      if (res) {
-        this.projectId = res + ''
-        this.currentNode = EsInspectionPlan.initiate.value
-        this.btn = EsInspectionPlan.initiate.btn
-      }
-    })
   },
   methods: {
+    /**
+     * 获取项目id
+     */
+    getProjectId () {
+      this.loading = true
+      // 否则就是创建一个新的流程
+      getInspectPlanProjectId().then(res => {
+        if (res) {
+          this.projectId = res + ''
+          this.currentNode = EsInspectionPlan.initiate.value
+          this.btn = EsInspectionPlan.initiate.btn
+        }
+      }).finally(() => {
+        this.loading = false
+      })
+    },
     /**
      * 获取页面详情
      */
@@ -295,7 +304,7 @@ export default {
             personnelObj = this.$refs.personnelInfo.getDataObjVerify()
             // List拆成数组
             for (const key in personnelObj) {
-              if (key.includes('List')) {
+              if (personnelObj[key] && key.includes('List')) {
                 personnelObj[key] = personnelObj[key].split(',')
               }
             }
@@ -332,7 +341,7 @@ export default {
             personnelObj = this.$refs.personnelInfo.getDataObj()
             // List拆成数组
             for (const key in personnelObj) {
-              if (key.includes('List')) {
+              if (personnelObj[key] && key.includes('List')) {
                 personnelObj[key] = personnelObj[key].split(',')
               }
             }

src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanDrawer.vue

@@ -64,19 +64,19 @@
           <!--  稽查负责人  -->
           <a-form-item :label="$t('workCenter.esInspectionPlan.inspectionDirector')" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <user-selection :placeholder="$t('pleaseSelect') + $t('workCenter.esInspectionPlan.solicitingOpinionsFrom')"
-                            type="radio"
+                            type="radio" :nameStr="model.inspectUserDictText"
                             v-decorator="['inspectUser', validatorRules.inspectionDirector]" />
           </a-form-item>
           <!--  标准化组对接人  -->
           <a-form-item :label="$t('workCenter.esInspectionPlan.standardizationGroupContactPerson')" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <user-selection :placeholder="$t('pleaseSelect') + $t('workCenter.esInspectionPlan.solicitingOpinionsFrom')"
-                            type="radio"
+                            type="radio" :nameStr="model.standardizationDockingUserDictText"
                             v-decorator="['standardizationDockingUser', validatorRules.standardizationGroupContactPerson]" />
           </a-form-item>
           <!--  征求意见对象  -->
           <a-form-item :label="$t('workCenter.esInspectionPlan.solicitingOpinionsFrom')" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <user-selection :placeholder="$t('pleaseSelect') + $t('workCenter.esInspectionPlan.solicitingOpinionsFrom')"
-                            type="checkbox"
+                            type="checkbox" :nameStr="model.objectOfConsultationDictText"
                             v-decorator="['objectOfConsultation', validatorRules.solicitingOpinionsFrom]" />
           </a-form-item>
           <!--  备注  -->

src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue

@@ -141,7 +141,7 @@ export default {
           title: this.$t('workCenter.esInspectionPlan.mainDutyStandardizationGroup'),
           align: 'center',
           width: 150,
-          dataIndex: 'standardizationWorkGroup_dictText',
+          dataIndex: 'standardizationWorkGroup',
           scopedSlots: { customRender: 'text' }
         },
         { // 所属部门
@@ -162,21 +162,21 @@ export default {
           title: this.$t('workCenter.esInspectionPlan.inspectionDirector'),
           align: 'center',
           width: 120,
-          dataIndex: 'inspectUser_dictText',
+          dataIndex: 'inspectUserDictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 标准化组对接人
           title: this.$t('workCenter.esInspectionPlan.standardizationGroupContactPerson'),
           align: 'center',
           width: 140,
-          dataIndex: 'standardizationDockingUser_dictText',
+          dataIndex: 'standardizationDockingUserDictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 所属部门人员
           title: this.$t('workCenter.esInspectionPlan.departmentPersonnel'),
           align: 'center',
           width: 120,
-          dataIndex: 'objectOfConsultation',
+          dataIndex: 'objectOfConsultationDictText',
           showCodeList: [EsInspectionPlan.initiate.value],
           scopedSlots: { customRender: 'text' }
         },
@@ -184,7 +184,7 @@ export default {
           title: this.$t('workCenter.esInspectionPlan.creator'),
           align: 'center',
           width: 120,
-          dataIndex: 'createBy',
+          dataIndex: 'createByDictText',
           showCodeList: [EsInspectionPlan.fillInComments.value],
           scopedSlots: { customRender: 'text' }
         },
@@ -229,7 +229,10 @@ export default {
     // 列表查询带上项目id
     projectId: {
       immediate: true,
-      handler () {
+      handler (val) {
+        if (!val) {
+          return
+        }
         this.filters.projectId = this.projectId
         if (this.currentNode === EsInspectionPlan.fillInComments.value) {
           this.filters.nodeId = this.$route.query.nodeId

src/views/workCenter/enterpriseStandardInspectionPlan/modules/WriteOpinionModal.vue

@@ -125,6 +125,10 @@ export default {
     },
     // 确定
     handleOk () {
+      if (this.disabled) {
+        this.close()
+        return
+      }
       const that = this
       // 触发表单验证
       this.$refs.form.validate(valid => {
@@ -155,6 +159,7 @@ export default {
     },
     close () {
       this.$emit('close')
+      this.dataSource = []
       this.$refs.form.resetFields()
       this.visible = false
     },