合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-laws-system-front!75

src/common/verify/index.js

@@ -34,9 +34,8 @@ export default {
   },
   validateStandardItem2 (rule, value, callback) {
     // return callback()
-    let testval = /^[A-Za-z0-9/]+$/
+    let testval = /^[A-Za-z0-9\/\-.;；()（）\s]+$/
-    let testval1 = /[.-;；()（）]+/
+    if (value && !value.match(testval)) {
-    if (value && !value.match(testval) && !value.match(testval1)) {
       return callback(new Error('只能为（字母数字()（）.-;；）'))
     } else {
       callback()

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

@@ -1090,6 +1090,7 @@ export default {
       }else{
         if(this.showType === 'one'){
           this.qbfsForm.esId1 = this.selectList[0].id || '--'
+          this.qbfsForm.bussSort1 = this.selectList[0].bussSort || '--'
           this.qbfsForm.esName1 = this.selectList[0].esName || '--'
           this.qbfsForm.planStatus1 = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' :
             (this.selectList[0] === '3'? '已取消' : '已完成')))
@@ -1100,6 +1101,7 @@ export default {
             this.$message.warning('您选择的合并企标已经存在,请更改!')
           }else{
             this.qbfsForm.esId2 = this.selectList[0].id || '--'
+            this.qbfsForm.bussSort2 = this.selectList[0].bussSort || '--'
             this.qbfsForm.esName2 = this.selectList[0].esName || '--'
             this.qbfsForm.planStatus2 = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' :
               (this.selectList[0] === '3'? '已取消' : '已完成')))

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

@@ -532,27 +532,37 @@ export default {
 
         }
           this.endPrcName(params).then((res)=>{
-            if(res){
+            if(res && res.ok){
-              this.completeTask()
+              console.log(res)
+              this.completeTask(json,res.data)
             }
           })
       }else{
-        this.completeTask()
+        this.completeTask(json)
       }
 
     },
-    completeTask(){
+    completeTask(json,data){
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.$route.query.taskIds,
         userId: this.$store.getters.userInfo.userId,
-        json: json,
+        json
       }, {
         _this: this
       }, res => {
         if (res.success) {
           this.addLog(this.qbfsForm)
           this.$message.success(res.message)
-          this.$router.push('/processCenter')
+          if(this.type === '4'){
+            this.batchToDoTasks(data).then((result)=>{
+              if(result.success){
+                console.log(result)
+                this.$router.push('/processCenter')
+              }
+            })
+          }else{
+            this.$router.push('/processCenter')
+          }
         }
         this.isSubmit = false
       }, e => {
@@ -567,6 +577,13 @@ export default {
         })
       })
     },
+    batchToDoTasks(json){
+      return new Promise((resolve, reject)=>{
+        this.$http._getData('lawss/activiti/batchToDoTasks',{ json },{}).then((res)=>{
+          resolve(res)
+        })
+      })
+    },
     addLog(qbzxdFrom){
       let json = Object.assign(qbzxdFrom);
       this.$http.post("esRevisePlanLog/log/addLog", {