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

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

@@ -578,7 +578,7 @@ export default {
             if (valid) {
               this.isSubmit = true
               let paramsInfo = new FormData()
-              paramsInfo.append('id', this.bpnId || '')
+              // paramsInfo.append('id', this.bpnId || '')
               paramsInfo.append('createUser', this.$store.getters.userInfo.userId)
               paramsInfo.append('createUserName', this.$store.getters.userInfo.userName)
               paramsInfo.append('type', '8')

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

@@ -290,13 +290,13 @@ export default {
         this.$message.warning("请选择至少一条数据进行分发责任人");
       } else {
         this.nodeList = []
+        this.drawerTitle = '选择分发责任人'
         this.nodeList.push(id)
         this.modalshowflag = true
       }
     },
     // 每行选择负责人点击操作
     clickOpen(val, id) {
-      console.log(val)
       this.$refs.multipleTable.clearSelection()
       this.rowDutyPeople = val
       this.nodeList = []

src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue

@@ -77,7 +77,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="commentText">
+              v-model="textarea">
             </el-input>
           </div>
         </el-collapse-item>
@@ -186,7 +186,7 @@ export default {
       passInfo: 0,
       detailData: [],
       loading: false,
-      commentText: '', // 意见
+      textarea: '', // 意见
       title: '', // 新增编辑抽屉标题
       ListModel: false, // 新增编辑抽屉开关
       nonSearch: {
@@ -266,6 +266,7 @@ export default {
             if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
               this.dataList = fileData[0].standardInfoList
               this.standardInfoList = this.dataList
+              this.textarea = JSON.parse(JSON.stringify(item)).textarea
             }
           }
         } else {
@@ -274,6 +275,7 @@ export default {
             if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
               this.dataList = fileData[i].standardInfoList
               this.standardInfoList = this.dataList
+              this.textarea = JSON.parse(JSON.stringify(item)).commentText
             }
           }
         }
@@ -311,12 +313,12 @@ export default {
     },
     // 退回按钮
     handleSubmitNo() {
-      if (this.commentText) {
+      if (this.textarea) {
 
         var json = {
           passInfo: 1,
           actionFlag: 1,
-          commentText: this.commentText,
+          commentText: this.textarea,
           standardInfoList: this.standardInfoList,
         }
         const params = new FormData();
@@ -370,7 +372,7 @@ export default {
       _formData.append('json', JSON.stringify({
         // roleForm: this.roleForm,
         dockUserList: list,
-        commentText: this.commentText
+        textarea: this.textarea
       }))
       saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
@@ -411,7 +413,7 @@ export default {
       let json = {
         passInfo: this.passInfo,
         responUserList: list,
-        commentText: this.commentText,
+        commentText: this.textarea,
         actionFlag: 0
       }
       if(flag)return;