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

2022-02-23 17:52:06 +08:00
parent 37551bd6a6 c911fe37b5
commit c0cfb2b501
12 changed files with 13 additions and 11 deletions
@@ -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
@@ -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);
@@ -425,7 +425,7 @@ export default {
            this.standinfoList.push(item)
          }
        })
-        this.total = res.data.count
+        this.total = this.standinfoList.length
      })

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

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

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

    },
@@ -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,