修改流程

src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue

@@ -104,14 +104,14 @@
               <!--                                            clearable-->
               <!--                                    ></el-input>-->
               <!--                                </el-form-item>-->
-              <el-form-item class="add-form-item form-item-disabled" style="margin-left: -210px">
+<!--              <el-form-item class="add-form-item form-item-disabled" style="margin-left: -210px">-->
-                <el-button :disabled="disabledXX"
+<!--                <el-button :disabled="disabledXX"-->
-                           type="primary"
+<!--                           type="primary"-->
-                           :loading="loadSarStandard"
+<!--                           :loading="loadSarStandard"-->
-                           @click="handleSearchStandard">
+<!--                           @click="handleSearchStandard">-->
-                  根据企标名称、起草责任单位查询
+<!--                  根据企标名称、起草责任单位查询-->
-                </el-button>
+<!--                </el-button>-->
-              </el-form-item>
+<!--              </el-form-item>-->
               <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
                 <el-input :disabled="disabledXX"
                           v-model="form.standEnName"
@@ -695,7 +695,7 @@
     v-show="verifySarStandard && !disabledXX"
     show-save
     show-submit
-    show-receive
+    :show-receive="showreceive"
     :submitLoading="isSubmit"
     :saveLoading="saveLoading"
     @save="handleSave"
@@ -1337,6 +1337,7 @@ export default {
       glwjFileList: [],
       filterText:'',
       todoId:'',
+      nowEsId:'',
       esId1:'',
       esId2:'',
       textStatusMap: {}, // 文本状态id与name对应
@@ -1434,6 +1435,7 @@ export default {
       key3:4,
       treeData: [], // 人员数据
       modalShowFlag: false, // drawer开关
+      showreceive: false,
       modalShowRoleFlag: false, // drawer开关
       modalShowFlag1: false, // drawer开关
       modalShowFlag2: false, // drawer开关
@@ -3073,13 +3075,13 @@ export default {
       //   }
       //   this.isSubmit = false
       // })
-      if(!this.tableData.standardData[0]){
+      // if(!this.tableData.standardData[0]){
-        this.$message.warning('请先选择企标计划')
+      //   this.$message.warning('请先选择企标计划')
-        this.isSubmit = false
+      //   this.isSubmit = false
-        return
+      //   return
-      }
+      // }
       this.$http.get("lawss/activiti/acceptTack", {
-        nowEsId: this.tableData.standardData[0].id,
+        nowEsId: this.nowEsId,
         oaFlag:'0',
         taskId: this.$route.query.taskIds,
       }, {
@@ -3088,6 +3090,7 @@ export default {
           // if (res.sign && res.sign === '0') {
             this.$message.success('接收成功')
             this.isSubmit = false
+            this.showreceive = false
           //   this.$router.push('/processCenter')
           // }
       })
@@ -3127,7 +3130,7 @@ export default {
               json.prcCreateUser = this.form.prcCreateUser
               json.prcCreateUserName = this.form.prcCreateUserName
               if(this.form.reviseStatus == '1' || this.form.reviseStatus == '2'){
-                json.nowEsId = this.tableData.standardData[0].id
+                json.nowEsId = this.nowEsId
               }else if(this.form.reviseStatus == '3'){
                 json.standCode = this.tableData.standardData[0].standCode
               }
@@ -3238,18 +3241,41 @@ export default {
           }).then(res => {
             if (res) {
               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.bussSort
+              this.form.planId = processForm.nowEsId
+              this.nowEsId = processForm.nowEsId
               this.form.reviseStatus = processForm.reviseStatus
+              this.form.standName = processForm.esName
+              this.form.QCDW = processForm.unitName
+              this.form.QCDWID = processForm.unit
+              this.form.QCRBUSSID = processForm.drafter
+              this.form.QCRBUSS = processForm.drafterName
               if(processForm.type == '1'){
                 this.esId1 = processForm.esId1
                 this.esId2 = processForm.esId2
               }
               this.taskType = processForm.type
+              this.$http.get('lawss/activiti/judgeAcceptTack', {
+                nowEsId: this.nowEsId,
+                oaFlag:'1',
+                prcIdGk: this.$route.query.prcId,
+              }, {
+                _this: this
+              }, res => {
+                if(res.data === true){
+                  console.log(1);
+                  this.showreceive = true
+                }else {
+                  this.showreceive = false
+                }
+              })
             }
           }).catch(e => {
           })

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

@@ -2093,21 +2093,36 @@ export default {
             this.form.planId = this.standardCheckedList[0].id
             this.form.planStatus = this.standardCheckedList[0].planStatus
             this.form.reviseStatus = this.form.reviseStatus === '3'? this.form.reviseStatus :this.standardCheckedList[0].reviseStatus
-            // 代替企标编号
+            this.$http.get('lawss/sarBussionessStand/getStandInfoUpdateById', {
-            this.form.DTQBBHBUSS = this.filterDate(this.standardCheckedList[0].rqbName)
+              id: this.standardCheckedList[0].id
-            // 标准编号
+            }, {
-            this.form.standNum = this.filterDate(this.standardCheckedList[0].standNum)
+              _this: this
-            // 适用车型
+            }, res => {
-            this.form.SYCXCLASS = this.filterObj(this.standardCheckedList[0].area)
+              console.log(res.data);
-            // 采标程度
+              this.form.standEnName = res.data.standEnName
-            this.form.CYCD = this.filterDate(this.standardCheckedList[0].useLevel)
+              this.form.putTime = res.data.putTime
-            // 采用标准drafter
+              this.form.QCDW = res.data.attrInfoMap.QCDW
-            this.form.CYBZ = this.filterDate(this.standardCheckedList[0].esStandRelations)
+              this.form.WJSCRYBUSSName = res.data.attrInfoMap.WJSCRYBUSS
-            // 引用标准
+              this.form.NYLXCLASS = res.data.attrInfoMap.NYLXCLASS.split(',')
-            this.form.YYBZ = this.filterDate(this.standardCheckedList[0].esMatingRelations)
+              this.form.SYCXCLASS = res.data.attrInfoMap.SYCXCLASS.split(',')
-            // 起草人带入
+              this.form.CYCVPPSBMBUSS = res.data.attrInfoMap.CYCVPPSBMBUSS
-            this.form.QCRBUSS = this.filterStringDate(this.standardCheckedList[0].drafterName)
+              this.form.KCVPPSBMBUSS = res.data.attrInfoMap.KCVPPSBMBUSS
-            this.form.QCRBUSSID = this.filterStringDate(this.standardCheckedList[0].drafter)
+              this.form.SYCPXCLASS = res.data.attrInfoMap.SYCPXCLASS.split(',')
+              this.form.CYCD = res.data.attrInfoMap.CYCD.split(',')
+              this.form.TXLBBUSS = res.data.attrInfoMap.TXLBBUSS
+              this.form.QCRBUSS = res.data.attrInfoMap.QCRBUSS
+              this.form.CYCVPPSCNBUSS = res.data.attrInfoMap.CYCVPPSCNBUSS
+              this.form.KCVPPSCNBUSS = res.data.attrInfoMap.KCVPPSCNBUSS
+              this.form.DTQBBHBUSS = res.data.attrInfoMap.DTQBBHBUSS
+              this.form.CYBZ = res.data.attrInfoMap.CYBZ
+              this.form.YYBZ = res.data.attrInfoMap.YYBZ
+              this.form.XCSJBUSS = res.data.attrInfoMap.XCSJBUSS
+              this.BZSMBUSSFileList=this.assemble(res.data.attrInfoMap.BZSMBUSS.substring(0, res.data.attrInfoMap.BZSMBUSS.lastIndexOf(',')),res.data.attrInfoMap.BZSMBUSSName);
+              this.FBGBUSSFileList=this.assemble(res.data.attrInfoMap.FBGBUSS.substring(0, res.data.attrInfoMap.FBGBUSS.lastIndexOf(',')),res.data.attrInfoMap.FBGBUSSName);
+              this.LSBBBUSSFileList=this.assemble(res.data.attrInfoMap.LSBBBUSS.substring(0, res.data.attrInfoMap.LSBBBUSS.lastIndexOf(',')),res.data.attrInfoMap.LSBBBUSSName);
+              this.QTWJBUSSFileList=this.assemble(res.data.attrInfoMap.QTWJBUSS.substring(0, res.data.attrInfoMap.QTWJBUSS.lastIndexOf(',')),res.data.attrInfoMap.QTWJBUSSName);
+              this.GLWJBUSSFileList=this.assemble(res.data.attrInfoMap.GLWJBUSS.substring(0, res.data.attrInfoMap.GLWJBUSS.lastIndexOf(',')),res.data.attrInfoMap.GLWJBUSSName);
+            })
             // 起草部门带入
             this.form.QCDW = this.filterStringDate(this.standardCheckedList[0].unitName)
             this.form.QCDWID = this.filterStringDate(this.standardCheckedList[0].unit)

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

@@ -95,7 +95,7 @@
               <el-card>
                 <el-form-item prop="countersignerName" style="margin-bottom: 0">
                   <h4>创新技术委员会成员/标准体系工作组成员(必选)</h4>
-                  <h4>二级研发(部所所长、总工、中心主任/研究院院长)(必选)</h4>
+                  <h4>二级研发(部所所长、总工、中心主任/研究院院长)(可选)</h4>
                   <h4>质量相关人员(可选)</h4>
                   <h4>制造部相关人员(可选)</h4>
                   <h4>采购部相关人员(可选)</h4>
@@ -127,30 +127,30 @@
                               :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 :disabled="disabledXX"  v-model="roleForm.approver" style="display: none;"></el-input>
-                    <el-input :disabled="disabledXX"  v-model="roleForm.approverName" readonly placeholder="选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长"
+                    <el-input :disabled="disabledXX"  v-model="roleForm.approverName" readonly placeholder="选择标准法规部高级经理"
-                              @click.native="choiceZRR('approver', '选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长', roleForm.approver)">
+                              @click.native="choiceZRR('approver', '选择标准法规部高级经理', roleForm.approver)">
-                    </el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="抄送" placement="top"
-                              :color="roleForm.engineer ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="engineerName" style="margin-bottom: 0">
-                  <h4>相关单位、工程研究总院标准法规部</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input :disabled="disabledXX"  v-model="roleForm.engineer" style="display: none;"></el-input>
-                    <el-input :disabled="disabledXX"  v-model="roleForm.engineerName" readonly placeholder="选择相关单位、工程研究总院标准法规部"
-                              @click.native="choiceZRR('engineer', '选择相关单位、工程研究总院标准法规部', roleForm.engineer)">
                     </el-input>
                   </div>
                 </el-form-item>
               </el-card>
             </el-timeline-item>
+<!--            <el-timeline-item timestamp="抄送" placement="top"-->
+<!--                              :color="roleForm.engineer ? '#66b1ff' : ''">-->
+<!--              <el-card>-->
+<!--                <el-form-item prop="engineerName" style="margin-bottom: 0">-->
+<!--                  <h4>相关单位、工程研究总院标准法规部</h4>-->
+<!--                  <div style="margin-top: 10px;width: 300px;">-->
+<!--                    <el-input :disabled="disabledXX"  v-model="roleForm.engineer" style="display: none;"></el-input>-->
+<!--                    <el-input :disabled="disabledXX"  v-model="roleForm.engineerName" readonly placeholder="选择相关单位、工程研究总院标准法规部"-->
+<!--                              @click.native="choiceZRR('engineer', '选择相关单位、工程研究总院标准法规部', roleForm.engineer)">-->
+<!--                    </el-input>-->
+<!--                  </div>-->
+<!--                </el-form-item>-->
+<!--              </el-card>-->
+<!--            </el-timeline-item>-->
           </el-form>
         </el-timeline>
       </div>

src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue

@@ -558,6 +558,12 @@
       @checkedRole="checkedRolePeoples"
       :nodeList="nodeList2"
     ></Role-tree>
+    <Mechanism-tree v-if="!disabledXX"
+                    is-title="选择起草责任单位"
+                    :is-visible.sync="modalshowflagZRBM"
+                    :nodeList="nodeListZRBM"
+                    @checkedRole="drawerCheckZRBM"
+    />
     <!--    单选人-->
     <Role-tree
       check-box
@@ -871,7 +877,7 @@ export default {
                         _this: this
                       }, res => {
                         if (res.success) {
-                          this.$message.success("企标制修订立项计划-立项已完成");
+                          this.$message.success("提交成功");
                           if (this.bpnId !== '') {
                             let taskId = {
                               id: this.bpnId
@@ -880,8 +886,8 @@ export default {
                               return res
                             })
                           }
-                          this.isSubmit = false;
                           this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
+                          this.isSubmit = false;
                         }
                       });
                     }
@@ -1206,6 +1212,7 @@ export default {
       this.QYBZget()
     },
     choiceZRBM(type, title, id) {
+      console.log(1);
       this.nodeListZRBM = []
       this.nodeListZRBM.push(id)
       this.drawerTitle = title