Merge remote-tracking branch 'origin/develop' into develop

src/components/CustomFormComponents/InputForStandardsForForeign.vue

@@ -25,7 +25,7 @@
         style="position:absolute;top: 10px;right: 0;"
         @click="selectLaws"
         v-if="(processModel && !disabled) || !processModel"
-      >手动查找123</el-button>
+      >手动查找</el-button>
     </el-form-item>
     <el-dialog
       :title="config.attrName"

src/pages/details/otherBussStandardDetails/index.vue

@@ -508,7 +508,7 @@
                           class="modular-content-p-val"
                           :title="child.value || '-'"
                   >
-                    <span v-if="child.value" @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
+                    <span v-if="child.value" @click="showReplaceStandInfo(child.value)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
                           class="span-line">{{ child.value }}</span>
                     <span v-else>-</span>
               </span>

src/pages/localTool/standardWarning.vue

@@ -689,13 +689,11 @@ export default {
         this.$http.get('sys/EarlyWarning/ChangePermissions', {
             id: row.id,
           }, {}, res => {
-            if (res.ok === true) {
               this.pageConfig.page = 1
               this.pageConfig.newPolicyPage = 1
               this.pageConfig.oldPolicyPage = 1
               this.searchBtnClick()
               this.getEarlyDate()
-            }
           }
         )
       }).catch(() => {

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

@@ -1104,7 +1104,6 @@ export default {
         }).then(res => {
           if (res) {
             const processForm = JSON.parse(res.mesg)
-
             this.xgdFileId = processForm.xgd
             this.fbgbjbdFileId = processForm.fbgbjbd
             this.bpgFileId = processForm.bpg

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

@@ -360,6 +360,7 @@
           reason: '',
           cause: '',
           department: '',
+          responUser: '',
           responUserName: '',
           state: '',
           source: '',
@@ -469,6 +470,7 @@
           cause: row.cause,
           department: row.department,
           responUserName: row.responUserName,
+          responUser: row.responUser,
           state: row.state,
           source: row.source,
           id: row.id,
@@ -571,7 +573,7 @@
           json.oldinfo = this.oldData;
           json.commentText = this.commentText5;
           json.introduce = true;
-          this.$http.post("lawss/activiti/completeTask", {
+        this.$http.post("lawss/activiti/completeTask", {
             json: JSON.stringify(json),
             taskId: this.taskIds,
             userId: this.$store.getters.userInfo.userId
@@ -590,6 +592,7 @@
             pId: this.pId
           }).then(res => {
             let data = JSON.parse(res.mesg);
+            console.log(data);
             this.commentText5 = data.commentText5 || ''
             this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] )
             this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] )
@@ -617,6 +620,7 @@
                 res.data.forEach(item => {
                   item.chapterNumber = item.partCode;
                   item.responUserName = item.userName;
+                  item.responUser = item.userId
                   item.state = '1'
                   item.source = '2'
                   this.data.push(item);

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

@@ -425,7 +425,7 @@ export default {
             this.standinfoList.push(item)
           }
         })
-        this.total = res.data.count
+        this.total = this.standinfoList.length
       })
 
     },

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

@@ -446,7 +446,7 @@ export default {
             this.standinfoList.push(item)
           }
         })
-        this.total = res.data.count
+        this.total = this.standinfoList.length
       })
 
     },

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

@@ -1035,7 +1035,7 @@ export default {
             this.standinfoList.push(item)
           }
         })
-        this.total = res.data.count
+        this.total = this.standinfoList.length
       })
 
     },

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

@@ -433,7 +433,7 @@ export default {
             this.standinfoList.push(item)
           }
         })
-        this.total = res.data.count
+        this.total = this.standinfoList.length
       })
 
     },

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

@@ -459,6 +459,7 @@ export default {
               this.$refs["roleForm"].validate((valid) => {
                 if (valid) {
                   this.isSubmit = true;
+                  this.listForm.commentText = this.commentText;
                   let json = Object.assign(qbzxdFrom, this.roleForm);
                   this.$http.post("lawss/activiti/startProcessRollBack", {
                     createUser: this.$store.getters.userInfo.userId,

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -953,6 +953,7 @@
                     standCode: '',
                     standName: '',
                 }
+                this.QYBZmodal = false
             },
             QYBZenterDrawer () {
                 if (this.QYBZformSelect.length > 1) {

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -436,7 +436,6 @@
               })
             })
           })
-
           let routeData = this.$router.resolve({
             name: "AddFileDetails",
             query: {