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

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

@@ -521,6 +521,8 @@
                     newText: '',
                     reason: '',
                     id: id,
+                    department: this.$store.getters.userInfo.upDeptName,
+                    responUserName: this.$store.getters.userInfo.userName,
                 }
                 this.data.push(json)
                 this.itemId = id

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

@@ -3,7 +3,7 @@
     <!--    标准调研流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准征求意见流程</template>
-      <template slot="proNode">对接人批准</template>
+      <template slot="proNode">责任部门对接人汇总并选择审批人</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -62,6 +62,14 @@
                     - -
                   </div>
                 </el-form-item>
+                <el-form-item label="审批人" prop="spId" class="add-form-item form-item-disabled">
+                  <el-input
+                          v-model="form.spId"
+                          style="display: none;"
+                          clearable
+                  ></el-input>
+                  <el-input v-model="form.spName" placeholder="请选择审批人" @click.native="choiceZRR(form.spId)"></el-input>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -212,12 +220,7 @@
               :saveLoading="saveLoading"
               show-transfer
               @transfer="handleTransfer"
-              @save="handleSave"
               @submit="handleSubmit"
-              show-back
-              @back="handleSubmitNo"
-              approval
-              submitBTNText="同意"
       >
       </ProcessFooter>
       <Role-tree
@@ -235,6 +238,13 @@
         <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
       </div>
     </el-dialog>
+    <Role-tree
+            check-box
+            is-title="选择责任部门对接人"
+            :is-visible.sync="modalshowflag"
+            @checkedRole="checkedRole2"
+            :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -281,6 +291,8 @@ export default {
         textType: '',
         modelList: [],
         modelNameList: '',
+        spId: '',
+        spName: '',
       },
       formRules: {
         responUserList: [
@@ -296,6 +308,15 @@ export default {
     ProcessTitle
   },
   methods: {
+    checkedRole2(data) {
+      this.form.spId = data[0].id
+      this.form.spName = data[0].name
+    },
+    choiceZRR(id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.modalshowflag = true;
+    },
     itermsConditionsClose () {
       this.itermsConditionsFlag = false
     },
@@ -367,6 +388,8 @@ export default {
       var json = this.json
       json.actionFlag = 0
       json.commentText = this.commentText
+      json.spId = this.form.spId
+      json.spName = this.form.spName
       this.$http.post('lawss/activiti/completeTask', {
         json: JSON.stringify(json),
         taskId: this.taskIds,
@@ -379,26 +402,26 @@ export default {
         this.isSubmit = false
       })
     },
-    handleSubmitNo() {
-      if (this.commentText) {
-        var json = this.json
-        json.actionFlag = 1
-        json.commentText = this.commentText
-        this.$http.post('lawss/activiti/completeTask', {
-          json: JSON.stringify(json),
-          taskId: this.taskIds,
-          userId: this.$store.getters.userInfo.userId
-        }, {}, res => {
-          if (res.success) {
-            this.$message.success('提交成功')
-            this.$router.push('/processCenter')
-          }
-        })
-      } else {
-        this.$message.warning('请输入反馈意见')
-      }
-
-    },
+    // handleSubmitNo() {
+    //   if (this.commentText) {
+    //     var json = this.json
+    //     json.actionFlag = 1
+    //     json.commentText = this.commentText
+    //     this.$http.post('lawss/activiti/completeTask', {
+    //       json: JSON.stringify(json),
+    //       taskId: this.taskIds,
+    //       userId: this.$store.getters.userInfo.userId
+    //     }, {}, res => {
+    //       if (res.success) {
+    //         this.$message.success('提交成功')
+    //         this.$router.push('/processCenter')
+    //       }
+    //     })
+    //   } else {
+    //     this.$message.warning('请输入反馈意见')
+    //   }
+    //
+    // },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
@@ -418,8 +441,9 @@ export default {
           this.form.textType = data.textType
           this.form.modelList = data.modelList
           this.form.modelNameList = data.modelNameList
+          this.form.spId = data.spId || ''
+          this.form.spName = data.spName || ''
           this.json = data
-          console.log(data);
           this.data = data.info || data.data
         }).catch(e => {
         })

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -614,7 +614,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '标准法规工程师汇总填写处理意见') {
+          } else if (row.taskInfo === '审批人审批') {
             this.$router.push({
               name: 'bzzqyjStep5',
               query: {