Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue

@@ -380,7 +380,7 @@ export default {
     }
   },
   mounted(){
-    if(!this.qbfsForm.passFlag){
+    if(this.qbfsForm.passFlag){
       this.qbfsForm = {}
     }
     //查询下拉框数据

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue

@@ -401,7 +401,7 @@ export default {
     }
   },
   mounted(){
-    if(!this.qbfsForm.passFlag){
+    if(this.qbfsForm.passFlag){
       this.qbfsForm = {}
     }
     //查询下拉框数据

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue

@@ -550,7 +550,7 @@ export default {
   },
   mounted(){
     this.getWorkData()
-    if(!this.qbfsForm.passFlag){
+    if(this.qbfsForm.passFlag){
       this.qbfsForm = {}
     }
     //查询下拉框数据

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue

@@ -712,7 +712,7 @@ export default {
     }
   },
   mounted() {
-    if(!this.qbfsForm.passFlag){
+    if(this.qbfsForm.passFlag){
       this.qbfsForm = {}
     }
     //查询下拉框数据

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue

@@ -389,7 +389,7 @@ export default {
     }
   },
   mounted(){
-    if(!this.qbfsForm.passFlag){
+    if(this.qbfsForm.passFlag){
       this.qbfsForm = {}
     }
     this.$http.get('sys/dictype/getDicTypeListCode', '',{

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue

@@ -128,11 +128,11 @@
                               :color="roleForm.approver ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="approverName" style="margin-bottom: 0">
-                  <h4>标准法规部高级经理</h4>
+                  <h4>总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.approver" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.approverName" placeholder="选择标准法规部高级经理"
-                              @click.native="choiceZRR('approver', '选择标准法规部高级经理', roleForm.approver)">
+                    <el-input v-model="roleForm.approverName" placeholder="选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长"
+                              @click.native="choiceZRR('approver', '选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长', roleForm.approver)">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -321,7 +321,7 @@ export default {
           {required: true, message:'请选择标准体系工作组组长',  trigger: "change" }
         ],
         approverName:[
-          {required: true, message:'请选择标准法规部高级经理',  trigger: "change" }
+          {required: true, message:'请选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长',  trigger: "change" }
         ],
         engineerName:[
           {required: true, message:'请选择相关单位、工程研究总院标准法规部',  trigger: "change" }
@@ -333,7 +333,7 @@ export default {
    this.taskId = this.$route.query.taskIds
     this.bpnId = this.$route.query.bpnId
     if (this.bpnId !== undefined) {
-      this.getDatas()
+      this.getData()
     }
     if(this.taskId){
       this.approvalFlag = true
@@ -368,25 +368,20 @@ export default {
     getData() {
       this.formLoading = true
       this.showFlag = false
-      return new Promise((resolve, reject) => {
-        inboundLiaisonDetail({
-          taskIds: this.$route.query.taskIds,
-          pId: this.$route.query.prcId
-        }).then(res => {
-          if (res) {
-            const processForm = JSON.parse(res.mesg);
-            this.getFormFieldList(processForm);
-          }
-        }).catch(e => {
-        });
+      queryTaskFirst({
+        bpnId: this.$route.query.bpnId
+      }).then(res => {
+        let mes = JSON.parse(res.mes)
+        this.getFormFieldList(mes);
       });
     },
     /**
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
+      let type = item.qbfsForm.type
       this.$nextTick(() => {
-        switch (item.type){
+        switch (type){
           case '1':
             this.comName = "merge"
             break
@@ -403,18 +398,18 @@ export default {
             this.comName = "establish"
             break
         }
-        this.qbfsForm = item;
+        this.qbfsForm = item.qbfsForm;
         this.formLoading = false;
-        this.roleForm.dockUser = item.dockUser;
-        this.roleForm.dockUserName = item.dockUserName;
-        this.roleForm.countersigner = item.countersigner;
-        this.roleForm.countersignerName = item.countersignerName;
-        this.roleForm.approver = item.approver;
-        this.roleForm.approverName = item.approverName;
-        this.roleForm.engineer = item.engineer;
-        this.roleForm.engineerName = item.engineerName;
-        this.roleForm.examine = item.examine;
-        this.roleForm.examineName = item.examineName;
+        this.roleForm.dockUser = item.roleForm.dockUser;
+        this.roleForm.dockUserName = item.roleForm.dockUserName;
+        this.roleForm.countersigner = item.roleForm.countersigner;
+        this.roleForm.countersignerName = item.roleForm.countersignerName;
+        this.roleForm.approver = item.roleForm.approver;
+        this.roleForm.approverName = item.roleForm.approverName;
+        this.roleForm.engineer = item.roleForm.engineer;
+        this.roleForm.engineerName = item.roleForm.engineerName;
+        this.roleForm.examine = item.roleForm.examine;
+        this.roleForm.examineName = item.roleForm.examineName;
       });
     },
     handleTabs(name) {
@@ -437,6 +432,7 @@ export default {
     //流程保存
     handleSave() {
       let qbzxdFrom = this.$refs["childForm"].qbfsForm;
+      qbzxdFrom.type = this.toggleType
       this.saveLoading = true
       let _formData = new FormData()
       _formData.append('id', this.bpnId || '')