[update] 修改年度制修订计划主动上报流程

src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue

@@ -322,15 +322,19 @@ export default {
               this.approvalInfoForm.setFieldsValue(pick(this.model.common, 'commitText', 'commitFile'))
             }
           })
+          console.log('-----------currentNode----------', this.currentNode)
           // 初始化业务基本信息
           if (this.currentNode === 1) {
             // 节点1需要回显数据
             this.$refs.baseInfoFormRef.initData(this.model)
           } else if (this.currentNode === 2) {
-            // 节点2草稿情况下需要回显数据 todo
+            // 节点2草稿情况下需要回显数据
+            if (type === 'draft') {
+              this.$refs.baseInfoFormRef.initData(this.model)
+            }
           } else if (this.currentNode === 3) {
-            // 节点3草稿回显所有 todo ，待办进来回显表格数据
+            // 节点3回显数据
-            this.$refs.baseInfoFormRef.initTableData(this.model)
+            this.$refs.baseInfoFormRef.initData(this.model)
           } else if ([4, 5, 6, 7].includes(this.currentNode)) {
             // 节点4,5,6,7回显数据
             this.$refs.baseInfoFormRef.initData(this.model)

src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue

@@ -916,13 +916,8 @@ export default {
             // 翻译项目类别
             formInline.projectType_dictText = formInline.projectType === ProjectType.ENACT.value ? ProjectType.ENACT.text : ProjectType.MODIFY.text
             // 设置变更状态
-            if (formInline.projectType === 1) {
+            formInline.changeStatus = 1
-              // 是制定，变更状态是新增
+            formInline.changeStatus_dictText = '新增'
-              formInline.changeStatus_dictText = '新增'
-            } else {
-              // 是修订，变更状态是变更
-              formInline.changeStatus_dictText = '变更'
-            }
           }
           // 翻译隶属工作组
           if (formInline.workGroup) {

src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterStandardForm.vue

@@ -71,8 +71,11 @@ export default {
     },
     // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了
     initData (data) {
+      console.log('&&&&&&&&&&&&7', data)
       // 给表单赋值
-      this.formInline = { collectUserLeader: data.dataList[0].collectUserLeader }
+      this.formInline.collectUserLeader = data.dataList[0].collectUserLeader
+      this.formInline.collectUserLeader_dictText = data.dataList[0].collectUserLeader_dictText
+      this.formInline = Object.assign({}, this.formInline)
       // 给表格赋值
       this.$nextTick(() => {
         this.$refs.tableRef.initData(data)

src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue

@@ -50,6 +50,14 @@
           </a-tooltip>
         </template>
 
+        <!--   创建人  -->
+        <template v-slot:createUser="{text, record}">
+          <a-tooltip overlay-class-name="tooltip-style">
+            <template slot="title">{{ record.workUser_dictText || record.contactUser_dictText || global.emptyLine }}</template>
+            <div class="table-text">{{ record.workUser_dictText || record.contactUser_dictText || global.emptyLine }}</div>
+          </a-tooltip>
+        </template>
+
         <!--    操作栏   -->
         <div slot="action" slot-scope="{record, index}" class="action-span-cell">
           <template v-if="!disabled">
@@ -136,8 +144,7 @@ export default {
         title: this.$t('creator'),
         align: 'center',
         width: 180,
-        dataIndex: 'createBy_dictText',
+        scopedSlots: { customRender: 'createUser' }
-        scopedSlots: { customRender: 'text' }
       })
     }
   },
@@ -294,7 +301,6 @@ export default {
   },
   methods: {
     initData (data) {
-      console.log('--------initData---------', data)
       // 给表格赋值
       if (data && data.dataList) {
         this.dataSource = data.dataList