diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step7.vue
index 120ee72ca..7584c3b6c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step7.vue
@@ -3,6 +3,7 @@
   <ProcessHeader toggle>
     <template slot="proName">企标复审流程</template>
     <template slot="proNode">技术标准起草</template>
+
   </ProcessHeader>
   <div class="headerTabs">
     <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -1571,31 +1572,31 @@ export default {
       },
       roleRules:{
         qcUserName: [
-          { required: true, message: '选择其他起草人', trigger: 'blur' },
+          { required: true, message: '选择其他起草人', trigger: 'change' },
         ],
         bzhUserName: [
-          { required: true, message: '选择总院各中心兼职标准化员/各事业部标准化员', trigger: 'blur' },
+          { required: true, message: '选择总院各中心兼职标准化员/各事业部标准化员', trigger: 'change' },
         ],
         hqUserName: [
-          { required: true, message: '选择张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', trigger: 'blur' },
+          { required: true, message: '选择张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', trigger: 'change' },
         ],
         fggcsUserName: [
-          { required: true, message: '选择标准法规工程师', trigger: 'blur' },
+          { required: true, message: '选择标准法规工程师', trigger: 'change' },
         ],
         jsfzrUserName: [
-          { required: true, message: '选择起草单位高级经理', trigger: 'blur' },
+          { required: true, message: '选择起草单位高级经理', trigger: 'change' },
         ],
         bzUserName: [
-          { required: true, message: '选择标准法规部高级经理', trigger: 'blur' },
+          { required: true, message: '选择标准法规部高级经理', trigger: 'change' },
         ],
         fzrUserName: [
-          { required: true, message: '选择起草单位中心主任', trigger: 'blur' },
+          { required: true, message: '选择起草单位中心主任', trigger: 'change' },
         ],
         zhrUserName: [
-          { required: true, message: '选择总院技术委员会覆盖领域企业标准：专委会主任；总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长', trigger: 'blur' },
+          { required: true, message: '选择总院技术委员会覆盖领域企业标准：专委会主任；总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长', trigger: 'change' },
         ],
         fbUserName: [
-          { required: true, message: '选择标准法规工程师', trigger: 'blur' },
+          { required: true, message: '选择标准法规工程师', trigger: 'change' },
         ],
       },
       rules:{
@@ -1975,14 +1976,14 @@ export default {
           this.verifySarStandard = this.$route.query.verifySarStandard
           let mes = JSON.parse(res.mes)
           // mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-          // this.form = mes.form
+          // this.form = mes.qbfsForm
           // this.form.XCSJBUSS = this.dateFormatter()
           // this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
           // this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
           // this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
           // this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
           // this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-          this.roleForm = mes.roleForm
+          // this.roleForm = mes.roleForm
           this.commentText = mes.commentText
           this.ccc = false
         })
@@ -1991,9 +1992,10 @@ export default {
       }
     },
     assemble(ids,names){
+      let id = ids.substring(0, ids.lastIndexOf(','))
       let list= new Array();
-      if(ids && ids !== '' && names && names !== ''){
-        let idArray=ids.split(',');
+      if(id && id !== '' && names && names !== ''){
+        let idArray=id.split(',');
         let nameArray=names.split(',');
         for(let i=0; i<idArray.length; i++){
           list.push({id:idArray[i],name:nameArray[i]});
@@ -3111,9 +3113,9 @@ export default {
           //     this.$message.warning('请检查模块信息责任人是否填写完整')
           // }else {
           // }
-          this.$refs['userForm'].validate((valid) => {
-            if (valid) {
-              this.fileInfoHandle()
+          this.roleForm = {...this.roleForm}
+          this.$refs['userForm'].validate((v) => {
+            if (v) {
               this.isSubmit = true
               this.saveLoading = true
               this.form.country=this.countryArr;
@@ -3121,19 +3123,9 @@ export default {
               json.zrUserId = this.form.zrUserId
               json.jlUserId = this.form.jlUserId
               json.commentText = this.commentText
-              json.type = this.taskType
-              if(this.taskType == '1'){
-                json.esId1 = this.esId1
-                json.esId2 = this.esId2
-              }
               json.applyUpdUserId = this.form.applyUpdUserId
               json.prcCreateUser = this.form.prcCreateUser
               json.prcCreateUserName = this.form.prcCreateUserName
-              if(this.form.reviseStatus == '1' || this.form.reviseStatus == '2'){
-                json.nowEsId = this.nowEsId
-              }else if(this.form.reviseStatus == '3'){
-                json.standCode = this.tableData.standardData[0].standCode
-              }
               this.$http.post('lawss/activiti/completeTask', {
                 taskIds: this.$route.query.taskIds,
                 userId : this.$store.getters.userInfo.userId,
@@ -3183,7 +3175,8 @@ export default {
                                   })
                                 }
                                 // 流程提交之后，应该流转至待办任务页面
-                                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})                                                        } else {
+                                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                              } else {
                               }
                             } else {
                               this.$message.warning(res.data)
@@ -3240,29 +3233,48 @@ export default {
             pId: this.$route.query.prcId
           }).then(res => {
             if (res) {
-              const processForm = JSON.parse(res.mesg)
-              this.todoId = res.id
-              if(processForm.reviseStatus == '制定'){
-                processForm.reviseStatus = '1'
-              } else if(processForm.reviseStatus == '修订'){
-                processForm.reviseStatus = '2'
-              }
-              this.form.standSort = processForm.bussSort
-              this.form.planId = processForm.esPlanId
-
-              this.nowEsId = processForm.nowEsId
-              this.form.reviseStatus = processForm.reviseStatus
-              this.form.standName = processForm.esName
-              this.form.QCDW = processForm.QCDW
-              this.form.QCDWID = processForm.QCDWID
-              this.form.QCRBUSSID = processForm.QCRBUSSID
-              this.form.QCRBUSS = processForm.QCRBUSS
-              this.form.SYCXCLASS = processForm.area
-              if(processForm.type == '1'){
-                this.esId1 = processForm.esId1
-                this.esId2 = processForm.esId2
-              }
-              this.taskType = processForm.type
+              this.$http.get('lawss/activiti/getEsByWk', {
+                prcId: this.$route.query.prcId
+              }, {
+                _this: this
+              }, val => {
+                const processForm = JSON.parse(res.mesg)
+                console.log(processForm);
+                this.todoId = res.id
+                if(processForm.reviseStatus == '制定'){
+                  processForm.reviseStatus = '1'
+                } else if(processForm.reviseStatus == '修订'){
+                  processForm.reviseStatus = '2'
+                }
+                this.form.standSort = processForm.standSort
+                this.form.planId = val
+                this.form.reviseStatus = '2'
+                this.form.standName = processForm.standName
+                this.form.standEnName = processForm.standEnName
+                this.form.putTime = processForm.putTime
+                this.form.QCDW = processForm.QCDW
+                this.form.QCDWID = processForm.QCDWID
+                this.form.QCRBUSSID = processForm.QCRBUSSID
+                this.form.QCRBUSS = processForm.QCRBUSS
+                this.form.SYCXCLASS = processForm.SYCXCLASS
+                this.form.NYLXCLASS = processForm.NYLXCLASS
+                this.form.CYCVPPSBMBUSS = processForm.CYCVPPSBMBUSS
+                this.form.KCVPPSBMBUSS = processForm.KCVPPSBMBUSS
+                this.form.TXLBBUSS = processForm.TXLBBUSS
+                this.form.SYCXCLASS = processForm.SYCXCLASS
+                this.form.SYCPXCLASS = processForm.SYCPXCLASS
+                this.form.CYCVPPSCNBUSS = processForm.CYCVPPSCNBUSS
+                this.form.KCVPPSCNBUSS = processForm.KCVPPSCNBUSS
+                this.form.DTQBBHBUSS = processForm.DTQBBHBUSS
+                this.form.CYBZ = processForm.CYBZ
+                this.form.YYBZ = processForm.YYBZ
+                this.form.XCSJBUSS = processForm.XCSJBUSS
+                this.FBGBUSSFileList=this.assemble(processForm.attrInfoCaseMap.fbgbuss,processForm.attrInfoCaseMap.fbgbussName);
+                this.BZSMBUSSFileList=this.assemble(processForm.attrInfoCaseMap.bzsmbuss,processForm.attrInfoCaseMap.bzsmbussName);
+                this.LSBBBUSSFileList=this.assemble(processForm.attrInfoCaseMap.lsbbbuss,processForm.attrInfoCaseMap.lsbbbussName);
+                this.QTWJBUSSFileList=this.assemble(processForm.attrInfoCaseMap.qtwjbuss,processForm.attrInfoCaseMap.qtwjbussName);
+                this.GLWJBUSSFileList=this.assemble(processForm.attrInfoCaseMap.glwjbuss,processForm.attrInfoCaseMap.glwjbussName);
+              })
             }
           }).catch(e => {
           })
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
index 908db3fdd..28cd8f6c4 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
@@ -1991,9 +1991,10 @@ export default {
       }
     },
     assemble(ids,names){
+      let id = ids.substring(0, ids.lastIndexOf(','))
       let list= new Array();
-      if(ids && ids !== '' && names && names !== ''){
-        let idArray=ids.split(',');
+      if(id && id !== '' && names && names !== ''){
+        let idArray=id.split(',');
         let nameArray=names.split(',');
         for(let i=0; i<idArray.length; i++){
           list.push({id:idArray[i],name:nameArray[i]});