[update] 修改企标制修订流程

src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue

@@ -664,6 +664,7 @@ export default {
         this.approvalInfoForm.setFieldsValue({ commitText: '同意' })
       }
       this.approvalInfoForm.validateFields(async (err, values) => {
+        if (this.currentNode === 4) {
           const data = await this.$refs.baseInfoRef.getDataValidate()
           if (!err && data) {
             this.loading = true
@@ -682,6 +683,24 @@ export default {
               this.loading = false
             })
           }
+        } else {
+          if (!err) {
+            this.loading = true
+            const param = {}
+            param.common = Object.assign({}, values)
+            param.common.taskId = this.$route.query.taskId
+            enStandardEditAgree(param).then(res => {
+              if (res.success) {
+                this.$message.success(res.message)
+                this.goBack()
+              } else {
+                this.$message.warning(res.message)
+              }
+            }).finally(() => {
+              this.loading = false
+            })
+          }
+        }
       })
     },
     // 驳回

src/views/workCenter/enterpriseStandardRevision/modules/CommentObjectEnterBaseInfo.vue

@@ -123,6 +123,7 @@ export default {
       // 把数据抛出，在线编辑不知道要不要抛
       const data = {}
       data.advices = this.dataSource
+      data.businessJson = JSON.stringify(this.$refs.baseInfoForm.getData())
       return data
     },
     // 外层获取数据要过校验,返回false表示没有通过校验

src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonCollectBaseInfo.vue

@@ -39,8 +39,7 @@
     </div>
 
     <a-form-model :model="formInline" class="form-add" :rules="rules" ref="ruleForm">
-      <div class="collapsible-panel-form">
+      <div class="form-flex-box">
-        <div class="form-flex-box collapsible-panel-form-content collapsible-content-no-head">
         <!--  部门联络人主管级领导   -->
         <!--  人员是固定的，通过联络人管理维护后自动带出该领导审批，给该领导自动发送待办，人员离职后，管理员给转办待办任务  -->
         <div class="box-title-text form-flex-item">
@@ -61,7 +60,6 @@
           </a-form-model-item>
         </div>
       </div>
-      </div>
     </a-form-model>
     <comment-modal ref="commentModal" @ok="modalFormOk"></comment-modal>
   </div>
@@ -214,9 +212,8 @@ export default {
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
-.collapsible-content-no-head {
+.form-add {
-  border-top: 1px solid #E5E6EB;
+  margin-top: 20px;
-  border-radius: 8px 8px 8px 8px;
 }
 
 .online-edit-wrapper {

src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterPublishBaseInfo.vue

@@ -3,8 +3,7 @@
     <base-info-form ref="baseInfoForm" v-bind="$attrs" disabled></base-info-form>
 
     <a-form-model :model="formInline" class="form-add" :rules="rules" ref="ruleForm">
-      <div class="collapsible-panel-form">
+      <div class="form-flex-box">
-        <div class="form-flex-box collapsible-panel-form-content collapsible-content-no-head">
         <!--  发布日期  -->
         <div class="box-title-text form-flex-item">
           <div class="title-text">
@@ -55,7 +54,6 @@
           </a-form-model-item>
         </div>
       </div>
-      </div>
     </a-form-model>
   </div>
 </template>

src/views/workCenter/enterpriseStandardRevision/modules/OtherDrafterProofreadBaseInfo.vue

@@ -29,9 +29,14 @@ export default {
     initData (data) {
       // 在线编辑不知道要怎么赋值？
       // 给表单赋值
-      // this.$nextTick(() => {
+      this.$nextTick(() => {
-      //   this.$refs.baseInfoForm.formInline =
+        this.$refs.baseInfoForm.initData(data)
-      // })
+      })
+    },
+    getData () {
+      const data = {}
+      data.businessJson = JSON.stringify(this.$refs.baseInfoForm.getData())
+      return data
     }
   }
 }