Merge branch 'fix_foton_20230613' into 'master'

Fix foton 20230613

See merge request laws-foton-slrs/foton-laws-system-front!109

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

@@ -1198,8 +1198,8 @@
                 this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus,standSort:this.form.standSort,taskId: this.taskIds}, {
                   _this: this
                 }, res => {
-                  const obj = res.data
+                  const standSn = res.data
-                  let standSn = (obj.newStandSn / 1) + 1
+                  // let standSn = (obj.newStandSn / 1) + 1
                   this.form.standSn = standSn
                   this.form.standNumber = standSn
                   this.form.standNum = standSn + ''
@@ -2527,10 +2527,14 @@
                     commentText: this.formTongGuo.commentText
                 }))
                 saveTaskForPub(_formData).then(res => {
-                    this.isSubmit = false
+                    if (res.success) {
-                    this.saveLoading = false
+                      this.isSubmit = false
-                    this.$message.success('保存成功')
+                      this.saveLoading = false
-                    this.bpnId = res.result
+                      this.$message.success(res.message)
+                      this.bpnId = res.result
+                    }else{
+                      this.$message.warning(res.message)
+                    }
                 }).catch(e => {
                     this.isSubmit = false
                     this.saveLoading = false
@@ -2711,7 +2715,7 @@
                                       if(res.ok){
                                         this.completeTask()
                                       }else{
-                                        this.$message.error(res.data)
+                                        this.$message.error(res.message)
                                       }
                                     })
                               }else{
@@ -2772,7 +2776,7 @@
                         planForm.id = this.form.planId
                         planForm.planStatus = '4'
                         planForm.reviseStatus = this.form.reviseStatus
-                        planForm.standCode = this.form.DTQBBHBUSS
+                        planForm.standCode = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS : this.form.standCode
                         planForm.standId = res.data
                         planForm.processType = "buss1";
                         this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, {
@@ -3075,8 +3079,8 @@
                     this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus,standSort:this.form.standSort,taskId: this.taskIds}, {
                         _this: this
                     }, res => {
-                        const obj = res.data
+                        const standSn = res.data
-                        let standSn = (obj.newStandSn / 1) + 1
+                        // let standSn = (obj.newStandSn / 1) + 1
                         this.form.standSn = standSn
                         this.form.standNumber = standSn
                         this.form.standNum = standSn + ''
@@ -3165,7 +3169,7 @@
             }
             this.busVsFunc()
             this.modelFunc()
-            this.getMaxStandnSn();
+            // this.getMaxStandnSn();
         }
 
     }

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

@@ -282,7 +282,7 @@
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.countersigner" style="display: none;"></el-input>
                     <el-input v-model="roleForm.countersignerName" readonly placeholder="选择会签人员"
-                              @click.native="choicePeoples">
+                              @click.native="choicePeoples('1')">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -849,7 +849,7 @@ export default {
             if (valid) {
               this.isSubmit = true
               this.qbfsForm.commentText = this.commentText
-              this.qbfsForm.LXD = this.lxdList[0].id
+              this.qbfsForm.LXD = this.lxdList && this.lxdList.length > 0 ? this.lxdList[0].id : ''
               this.qbfsForm.LXDName = '立项单'
               let jsons = JSON.stringify(this.qbfsForm);
               this.$http.post('lawss/activiti/completeTask', {
@@ -1365,7 +1365,8 @@ export default {
       }
       this.modalshowflag = false;
     },
-    choicePeoples() {
+    choicePeoples(type) {
+      this.roleType = type
       this.nodeList2 = [];
       if (this.roleForm.countersigner.length > 0) {
         this.nodeList2 = this.roleForm.countersigner.split(",");
@@ -1384,10 +1385,13 @@ export default {
         nameList += item.name;
       });
       console.log(nameList)
-      this.roleForm.countersigner = idList;
+      if(this.roleType == '1'){
-      this.roleForm.countersignerName = nameList;
+        this.roleForm.countersigner = idList;
-      this.qbfsForm.resPerson = idList;
+        this.roleForm.countersignerName = nameList;
-      this.qbfsForm.resPersonName = nameList;
+      }else{
+        this.qbfsForm.resPerson = idList;
+        this.qbfsForm.resPersonName = nameList;
+      }
     },
     workGroupUnfold(type, title, ids){
       if(ids){