Merge branch 'develop' of ssh://gitlab.91isoft.com:10022/LAWS/laws-system-front-FOTON into develop

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

@@ -533,6 +533,10 @@ export default {
       drawerTitle: "", //drawer标题
       // 查询相关参数
       searching: false,
+      qualityEngineer: '',
+      qualityEngineerName: '',
+      certifiedEngineer: '',
+      certifiedEngineerName: '',
       fileType: "",
       subFlag: 0,
       projectSearch: {
@@ -698,6 +702,7 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList (item) {
+      console.log(item);
       this.$nextTick(() => {
         if(item.form){
           this.hisListForm = JSON.parse(JSON.stringify(item.form))
@@ -735,6 +740,10 @@ export default {
           this.roleForm.dockUserName = item.dockUserName
           this.roleForm.ministerUser =  item.ministerUser
           this.roleForm.ministerUserName =  item.ministerUserName
+          this.certifiedEngineer = item.certifiedEngineer
+          this.certifiedEngineerName = item.certifiedEngineerName
+          this.qualityEngineerName = item.qualityEngineerName
+          this.qualityEngineer = item.qualityEngineer
           this.submitFlag = '修改节点'
           this.dataList.distributePerson =  this.listForm.dataList[0].distributePerson
           this.$http.get("SarStandItems/sar-stand-items/getFileType", {
@@ -1025,6 +1034,10 @@ export default {
                       }
                     };
                     this.listForm.dataList = this.dataList
+                    this.listForm.qualityEngineer = this.qualityEngineer ?  this.qualityEngineer : this.listForm.qualityEngineer
+                    this.listForm.qualityEngineerName = this.qualityEngineerName ?  this.qualityEngineerName : this.listForm.qualityEngineerName
+                    this.listForm.certifiedEngineer = this.certifiedEngineer ?  this.certifiedEngineer : this.listForm.certifiedEngineer
+                    this.listForm.certifiedEngineerName = this.certifiedEngineerName ?  this.certifiedEngineerName : this.listForm.certifiedEngineerName
                     let json = this.listForm
                     this.$http.post("lawss/activiti/completeTaskNew", {
                       taskIds: this.$route.query.taskIds,