[update] 企标复审流程联调

src/components/PersonnelInfo.vue

@@ -103,12 +103,19 @@ export default {
     // 有校验的获取人员对象
     getDataObjVerify () {
       let personnelObj = {}
-      for (const item of this.stepsData) {
+      console.log(this.stepsData)
+      for (let i = 0; i < this.stepsData.length; i++) {
         // 该属性还没有人就给他赋值
-        if ((item.canChoose || item.sort === 1) && !personnelObj[item.variableName]) {
+        if ((this.stepsData[i].canChoose || i === 0) && !personnelObj[this.stepsData[i].variableName]) {
-          personnelObj[item.variableName] = item.linkUserIds
+          personnelObj[this.stepsData[i].variableName] = this.stepsData[i].linkUserIds
         }
       }
+      // for (const item of this.stepsData) {
+      //   // 该属性还没有人就给他赋值
+      //   if ((item.canChoose || item.sort === 1) && !personnelObj[item.variableName]) {
+      //     personnelObj[item.variableName] = item.linkUserIds
+      //   }
+      // }
       if (!Object.values(personnelObj).every(v => !!v)) {
         this.$message.warning(this.$t('pleaseEnterPersonnelInfo'))
         personnelObj = false

src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue

@@ -264,7 +264,7 @@ export default {
           this.model = res.result
           this.$nextTick(() => {
             // 初始化流程信息
-            this.processInfoForm.setFieldsValue(pick(this.model[0], 'prcName', 'dueTime', 'prcMes'))
+            this.processInfoForm.setFieldsValue(pick(this.model.common, 'prcName', 'dueTime', 'prcMes'))
             // 初始化流程审批信息，草稿进来的才回显审批信息
             if (type === 'draft') {
               this.approvalInfoForm.setFieldsValue(pick(this.model.common, 'commitText', 'commitFile'))

src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue

@@ -81,7 +81,7 @@
     <!--  人员信息  -->
     <div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0">
       <process-detail-list :processKey="ProcessKey.ES_RECHECK.value">
-        <personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNode + ''"></personnel-info>
+        <personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeName"></personnel-info>
       </process-detail-list>
     </div>
     <!--  操作按钮  -->
@@ -164,7 +164,7 @@ export default {
   },
   mounted () {
     // 初始化节点
-    const nodeId = this.$route.query.taskName
+    const nodeId = this.$route.query.nodeId
     if (nodeId) {
       if (nodeId === EsRecheckNodes.standardizationSelectContact.value) {
         // 标准化工程师选择联络人
@@ -199,8 +199,9 @@ export default {
           this.initPersonInfoData(false)
         }
       }
-      // 如果是正在手动发起流程，人员信息的节点1不显示
+      // 如果没有processInstanceId说明流程还没发起过
-      if (!this.$route.query.taskId && !this.$route.query.draftId) {
+      if (!this.$route.query.processInstanceId) {
+        // 不显示第一个节点人员信息
         this.personnelInfoData.shift()
         // 说明是在新发起一个节点，初始化发起人员信息
         this.personnelInfoData[0].linkUserIds = Vue.ls.get(USER_INFO).id
@@ -313,12 +314,12 @@ export default {
               this.$refs.baseInfoRef.initData(this.model.data)
             }
           })
-          enStandardRecheckIsShowFirstPerson({ id: this.model.data.id }).then(res => {
+          // enStandardRecheckIsShowFirstPerson({ id: this.model.data.id }).then(res => {
-            if (res.success && !res.result) {
+          //   if (res.success && !res.result) {
-              // 不显示第一个节点人员信息
+          //     // 不显示第一个节点人员信息
-              this.personnelInfoData.shift()
+          //     this.personnelInfoData.shift()
-            }
+          //   }
-          })
+          // })
         } else {
           this.$message.warning(res.message)
         }

src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue

@@ -178,9 +178,7 @@ export default {
     // 拿到外面传进来的数据初始化
     initData (data) {
       // 给表单赋值
-      this.$nextTick(() => {
+      this.formInline = Object.assign({}, data)
-        this.formInline = Object.assign({}, data)
-      })
     },
     // 外层要获取数据
     getData () {

src/views/workCenter/processCenter/table/TodoList.vue

@@ -305,7 +305,7 @@ export default {
         }
         const param = {}
         param.userId = value
-        param.taskId = this.$route.query.taskId
+        param.taskId = this.currentTurnTo.taskId
         func(param).then(res => {
           if (res.success) {
             this.$message.success(res.message)