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

src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue

@@ -233,6 +233,7 @@
     <ProcessFooter
       show-back
       show-submit
+      show-transfer
       :submitLoading="isSubmit"
       :transfer-loading="isTransfer"
       :saveLoading="saveLoading"

src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue

@@ -233,6 +233,7 @@
     <ProcessFooter
       show-back
       show-submit
+      show-transfer
       :submitLoading="isSubmit"
       :transfer-loading="isTransfer"
       :saveLoading="saveLoading"

src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue

@@ -231,6 +231,7 @@
       </el-table>
     </div>
     <ProcessFooter
+      show-transfer
       show-back
       show-submit
       :submitLoading="isSubmit"

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

@@ -231,6 +231,7 @@
       </el-table>
     </div>
     <ProcessFooter
+      show-transfer
       show-back
       show-submit
       :submitLoading="isSubmit"

src/pages/processCenter/pages/phone/wbsm/step3.vue

@@ -135,6 +135,7 @@
       </el-table>
     </div>
     <ProcessFooter
+      show-transfer
       show-back
       show-submit
       :transfer-loading="isTransfer"

src/pages/processCenter/pages/phone/wbsm/step4.vue

@@ -135,6 +135,7 @@
       </el-table>
     </div>
     <ProcessFooter
+      show-transfer
       show-back
       show-submit
       :transfer-loading="isTransfer"

src/pages/processCenter/pages/phone/wbsm/step5.vue

@@ -135,6 +135,7 @@
       </el-table>
     </div>
     <ProcessFooter
+      show-transfer
       show-back
       show-submit
       :transfer-loading="isTransfer"

src/pages/processCenter/pages/phone/xmpg/step2.vue

@@ -239,6 +239,7 @@
       </el-table>
     </div>
     <ProcessFooter
+      show-transfer
       show-back
       show-submit
       :transfer-loading="isTransfer"
@@ -250,6 +251,12 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <phone-role
+      :role-title="drawerTitle"
+      :result-list="phoneRoleList"
+      :is-show-phone.sync="phoneshowflag"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -272,6 +279,9 @@ export default {
   },
   data() {
     return {
+      phoneshowflag: false,
+      phoneRoleList: [],
+      phoneDrawerTitle: '',
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
       nodeList:[],
@@ -393,11 +403,32 @@ export default {
         this.processStep = window.URL.createObjectURL(res.data)
       })
     },
-    //转办事件
+    //转办按钮
     handleTransfer(){
-      this.drawerModal = true
+      this.phoneshowflag = true
-      this.drawerTitle = '转办处理人'
+      this.phoneRoleList = this.roleTransfer
-      this.selectPeople = row
+      this.phoneDrawerTitle = '转办处理人'
+    },
+    //确认转办
+    drawerCheck (data) {
+      this.roleTransfer = data
+      this.phoneRoleList = this.roleTransfer
+      this.turnLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res =>{
+        if (res.success) {
+          this.turnLoading = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter")
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+      this.modalshowflag = false
     },
     processTable () {
       this.$http.get('lawss/activiti/get_list_by_instance', {

src/pages/processCenter/pages/phone/xmpg/step5.vue

@@ -321,6 +321,7 @@
       </el-table>
     </div>
     <ProcessFooter
+      show-transfer
       show-back
       show-submit
       :transfer-loading="isTransfer"
@@ -332,6 +333,12 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <phone-role
+      :role-title="drawerTitle"
+      :result-list="phoneRoleList"
+      :is-show-phone.sync="phoneshowflag"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -354,6 +361,9 @@ export default {
   },
   data() {
     return {
+      phoneshowflag: false,
+      phoneRoleList: [],
+      phoneDrawerTitle: '',
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
       nodeList:[],
@@ -475,11 +485,32 @@ export default {
         this.processStep = window.URL.createObjectURL(res.data)
       })
     },
-    //转办事件
+    //转办按钮
     handleTransfer(){
-      this.drawerModal = true
+      this.phoneshowflag = true
-      this.drawerTitle = '转办处理人'
+      this.phoneRoleList = this.roleTransfer
-      this.selectPeople = row
+      this.phoneDrawerTitle = '转办处理人'
+    },
+    //确认转办
+    drawerCheck (data) {
+      this.roleTransfer = data
+      this.phoneRoleList = this.roleTransfer
+      this.turnLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res =>{
+        if (res.success) {
+          this.turnLoading = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter")
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+      this.modalshowflag = false
     },
     processTable () {
       this.$http.get('lawss/activiti/get_list_by_instance', {

src/pages/processCenter/pages/phone/xmpg/step6.vue

@@ -321,6 +321,7 @@
       </el-table>
     </div>
     <ProcessFooter
+      show-transfer
       show-back
       show-submit
       :transfer-loading="isTransfer"
@@ -332,6 +333,12 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <phone-role
+      :role-title="drawerTitle"
+      :result-list="phoneRoleList"
+      :is-show-phone.sync="phoneshowflag"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -354,6 +361,9 @@ export default {
   },
   data() {
     return {
+      phoneshowflag: false,
+      phoneRoleList: [],
+      phoneDrawerTitle: '',
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
       nodeList:[],
@@ -475,11 +485,32 @@ export default {
         this.processStep = window.URL.createObjectURL(res.data)
       })
     },
-    //转办事件
+    //转办按钮
     handleTransfer(){
-      this.drawerModal = true
+      this.phoneshowflag = true
-      this.drawerTitle = '转办处理人'
+      this.phoneRoleList = this.roleTransfer
-      this.selectPeople = row
+      this.phoneDrawerTitle = '转办处理人'
+    },
+    //确认转办
+    drawerCheck (data) {
+      this.roleTransfer = data
+      this.phoneRoleList = this.roleTransfer
+      this.turnLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res =>{
+        if (res.success) {
+          this.turnLoading = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter")
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+      this.modalshowflag = false
     },
     processTable () {
       this.$http.get('lawss/activiti/get_list_by_instance', {

src/pages/processCenter/pages/phone/xmpg/step7.vue

@@ -321,6 +321,7 @@
       </el-table>
     </div>
     <ProcessFooter
+      show-transfer
       show-back
       show-submit
       :transfer-loading="isTransfer"
@@ -332,6 +333,12 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <phone-role
+      :role-title="drawerTitle"
+      :result-list="phoneRoleList"
+      :is-show-phone.sync="phoneshowflag"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -354,6 +361,9 @@ export default {
   },
   data() {
     return {
+      phoneshowflag: false,
+      phoneRoleList: [],
+      phoneDrawerTitle: '',
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
       nodeList:[],
@@ -475,11 +485,32 @@ export default {
         this.processStep = window.URL.createObjectURL(res.data)
       })
     },
-    //转办事件
+    //转办按钮
     handleTransfer(){
-      this.drawerModal = true
+      this.phoneshowflag = true
-      this.drawerTitle = '转办处理人'
+      this.phoneRoleList = this.roleTransfer
-      this.selectPeople = row
+      this.phoneDrawerTitle = '转办处理人'
+    },
+    //确认转办
+    drawerCheck (data) {
+      this.roleTransfer = data
+      this.phoneRoleList = this.roleTransfer
+      this.turnLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res =>{
+        if (res.success) {
+          this.turnLoading = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter")
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+      this.modalshowflag = false
     },
     processTable () {
       this.$http.get('lawss/activiti/get_list_by_instance', {

src/pages/processCenter/pages/phone/xmpg2/step10.vue

@@ -253,6 +253,7 @@
     <ProcessFooter
       show-back
       show-submit
+      show-transfer
       :transfer-loading="isTransfer"
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
@@ -262,6 +263,12 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <phone-role
+      :role-title="drawerTitle"
+      :result-list="phoneRoleList"
+      :is-show-phone.sync="phoneshowflag"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -283,6 +290,9 @@ export default {
   },
   data() {
     return {
+      phoneshowflag: false,
+      phoneRoleList: [],
+      phoneDrawerTitle: '',
       tableIndex: 0,
       itemLists: [],
       foldFormFlag: false,
@@ -366,11 +376,32 @@ export default {
         this.processStep = window.URL.createObjectURL(res.data)
       })
     },
-    //转办事件
+    //转办按钮
     handleTransfer(){
-      this.drawerModal = true
+      this.phoneshowflag = true
-      this.drawerTitle = '转办处理人'
+      this.phoneRoleList = this.roleTransfer
-      this.selectPeople = row
+      this.phoneDrawerTitle = '转办处理人'
+    },
+    //确认转办
+    drawerCheck (data) {
+      this.roleTransfer = data
+      this.phoneRoleList = this.roleTransfer
+      this.turnLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res =>{
+        if (res.success) {
+          this.turnLoading = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter")
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+      this.modalshowflag = false
     },
     // 点击查看
     handlePreview(item) {

src/pages/processCenter/pages/phone/xmpg2/step11.vue

@@ -252,15 +252,21 @@
     </div>
     <ProcessFooter
       show-submit
+      show-transfer
       :transfer-loading="isTransfer"
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
       :approval="true"
       @transfer="handleTransfer"
-      @back="beforeBack"
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <phone-role
+      :role-title="drawerTitle"
+      :result-list="phoneRoleList"
+      :is-show-phone.sync="phoneshowflag"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -282,6 +288,9 @@ export default {
   },
   data() {
     return {
+      phoneshowflag: false,
+      phoneRoleList: [],
+      phoneDrawerTitle: '',
       tableIndex: 0,
       itemLists: [],
       foldFormFlag: false,
@@ -365,11 +374,32 @@ export default {
         this.processStep = window.URL.createObjectURL(res.data)
       })
     },
-    //转办事件
+    //转办按钮
     handleTransfer(){
-      this.drawerModal = true
+      this.phoneshowflag = true
-      this.drawerTitle = '转办处理人'
+      this.phoneRoleList = this.roleTransfer
-      this.selectPeople = row
+      this.phoneDrawerTitle = '转办处理人'
+    },
+    //确认转办
+    drawerCheck (data) {
+      this.roleTransfer = data
+      this.phoneRoleList = this.roleTransfer
+      this.turnLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res =>{
+        if (res.success) {
+          this.turnLoading = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter")
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+      this.modalshowflag = false
     },
     // 点击查看
     handlePreview(item) {

src/pages/processCenter/pages/phone/xmpg2/step12.vue

@@ -253,6 +253,7 @@
     <ProcessFooter
       show-back
       show-submit
+      show-transfer
       :transfer-loading="isTransfer"
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
@@ -262,6 +263,12 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <phone-role
+      :role-title="drawerTitle"
+      :result-list="phoneRoleList"
+      :is-show-phone.sync="phoneshowflag"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -283,6 +290,9 @@ export default {
   },
   data() {
     return {
+      phoneshowflag: false,
+      phoneRoleList: [],
+      phoneDrawerTitle: '',
       tableIndex: 0,
       itemLists: [],
       foldFormFlag: false,
@@ -366,11 +376,32 @@ export default {
         this.processStep = window.URL.createObjectURL(res.data)
       })
     },
-    //转办事件
+    //转办按钮
     handleTransfer(){
-      this.drawerModal = true
+      this.phoneshowflag = true
-      this.drawerTitle = '转办处理人'
+      this.phoneRoleList = this.roleTransfer
-      this.selectPeople = row
+      this.phoneDrawerTitle = '转办处理人'
+    },
+    //确认转办
+    drawerCheck (data) {
+      this.roleTransfer = data
+      this.phoneRoleList = this.roleTransfer
+      this.turnLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res =>{
+        if (res.success) {
+          this.turnLoading = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter")
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+      this.modalshowflag = false
     },
     // 点击查看
     handlePreview(item) {

src/pages/processCenter/pages/phone/xmpg2/step2.vue

@@ -222,6 +222,7 @@
     <ProcessFooter
       show-back
       show-submit
+      show-transfer
       :transfer-loading="isTransfer"
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
@@ -231,6 +232,12 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <phone-role
+      :role-title="drawerTitle"
+      :result-list="phoneRoleList"
+      :is-show-phone.sync="phoneshowflag"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -252,6 +259,9 @@ export default {
   },
   data() {
     return {
+      phoneshowflag: false,
+      phoneRoleList: [],
+      phoneDrawerTitle: '',
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
       nodeList:[],
@@ -321,11 +331,32 @@ export default {
         this.processStep = window.URL.createObjectURL(res.data)
       })
     },
-    //转办事件
+    //转办按钮
     handleTransfer(){
-      this.drawerModal = true
+      this.phoneshowflag = true
-      this.drawerTitle = '转办处理人'
+      this.phoneRoleList = this.roleTransfer
-      this.selectPeople = row
+      this.phoneDrawerTitle = '转办处理人'
+    },
+    //确认转办
+    drawerCheck (data) {
+      this.roleTransfer = data
+      this.phoneRoleList = this.roleTransfer
+      this.turnLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res =>{
+        if (res.success) {
+          this.turnLoading = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter")
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+      this.modalshowflag = false
     },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {

src/pages/processCenter/pages/phone/xmpg2/step7.vue

@@ -253,6 +253,7 @@
     <ProcessFooter
       show-back
       show-submit
+      show-transfer
       :transfer-loading="isTransfer"
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
@@ -262,6 +263,12 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <phone-role
+      :role-title="drawerTitle"
+      :result-list="phoneRoleList"
+      :is-show-phone.sync="phoneshowflag"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -283,6 +290,9 @@ export default {
   },
   data() {
     return {
+      phoneshowflag: false,
+      phoneRoleList: [],
+      phoneDrawerTitle: '',
       tableIndex: 0,
       itemLists: [],
       foldFormFlag: false,
@@ -366,11 +376,32 @@ export default {
         this.processStep = window.URL.createObjectURL(res.data)
       })
     },
-    //转办事件
+    //转办按钮
     handleTransfer(){
-      this.drawerModal = true
+      this.phoneshowflag = true
-      this.drawerTitle = '转办处理人'
+      this.phoneRoleList = this.roleTransfer
-      this.selectPeople = row
+      this.phoneDrawerTitle = '转办处理人'
+    },
+    //确认转办
+    drawerCheck (data) {
+      this.roleTransfer = data
+      this.phoneRoleList = this.roleTransfer
+      this.turnLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res =>{
+        if (res.success) {
+          this.turnLoading = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter")
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+      this.modalshowflag = false
     },
     // 点击查看
     handlePreview(item) {

src/pages/processCenter/pages/phone/xmpg2/step8.vue

@@ -253,6 +253,7 @@
     <ProcessFooter
       show-back
       show-submit
+      show-transfer
       :transfer-loading="isTransfer"
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
@@ -262,6 +263,12 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <phone-role
+      :role-title="drawerTitle"
+      :result-list="phoneRoleList"
+      :is-show-phone.sync="phoneshowflag"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -283,6 +290,9 @@ export default {
   },
   data() {
     return {
+      phoneshowflag: false,
+      phoneRoleList: [],
+      phoneDrawerTitle: '',
       tableIndex: 0,
       itemLists: [],
       foldFormFlag: false,
@@ -366,11 +376,32 @@ export default {
         this.processStep = window.URL.createObjectURL(res.data)
       })
     },
-    //转办事件
+    //转办按钮
     handleTransfer(){
-      this.drawerModal = true
+      this.phoneshowflag = true
-      this.drawerTitle = '转办处理人'
+      this.phoneRoleList = this.roleTransfer
-      this.selectPeople = row
+      this.phoneDrawerTitle = '转办处理人'
+    },
+    //确认转办
+    drawerCheck (data) {
+      this.roleTransfer = data
+      this.phoneRoleList = this.roleTransfer
+      this.turnLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res =>{
+        if (res.success) {
+          this.turnLoading = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter")
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+      this.modalshowflag = false
     },
     // 点击查看
     handlePreview(item) {

src/pages/processCenter/pages/phone/xmpg2/step9.vue

@@ -262,6 +262,12 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <phone-role
+      :role-title="drawerTitle"
+      :result-list="phoneRoleList"
+      :is-show-phone.sync="phoneshowflag"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -283,6 +289,9 @@ export default {
   },
   data() {
     return {
+      phoneshowflag: false,
+      phoneRoleList: [],
+      phoneDrawerTitle: '',
       tableIndex: 0,
       itemLists: [],
       foldFormFlag: false,
@@ -366,11 +375,32 @@ export default {
         this.processStep = window.URL.createObjectURL(res.data)
       })
     },
-    //转办事件
+    //转办按钮
     handleTransfer(){
-      this.drawerModal = true
+      this.phoneshowflag = true
-      this.drawerTitle = '转办处理人'
+      this.phoneRoleList = this.roleTransfer
-      this.selectPeople = row
+      this.phoneDrawerTitle = '转办处理人'
+    },
+    //确认转办
+    drawerCheck (data) {
+      this.roleTransfer = data
+      this.phoneRoleList = this.roleTransfer
+      this.turnLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res =>{
+        if (res.success) {
+          this.turnLoading = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter")
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+      this.modalshowflag = false
     },
     // 点击查看
     handlePreview(item) {

src/pages/processCenter/pages/phone/xmqdqr/step5.vue

@@ -251,6 +251,7 @@
       </el-table>
     </div>
     <ProcessFooter
+      show-transfer
       show-back
       show-submit
       :transfer-loading="isTransfer"