Merge branch 'develop' into 'test'

Develop

See merge request LAWS/laws-system-front-FOTON!137

src/components/navMenu/index.vue

@@ -149,11 +149,11 @@ export default {
             // //   title: '子公司标准库',
             // //   path: '/subsidiaryStandardLibrary'
             // // }
-            {
+           /* {
               title: '车型/项目库',
               path: '/localProductsOrProjectLibrary',
               menuId: '42ce39c9f953be65a3e5643a4a2c786f'
-            },
+            },*/
             {
               title: '未符合项整改',
               path: '/nonConfomity',

src/pages/home1/components/todoList/index.vue

@@ -607,6 +607,35 @@ export default {
               }
             })
           }
+          break
+          //项目清单确认流程
+        case '10' :
+          if(row.taskInfo === '确认人确认'){
+            this.$router.push({
+              name: 'xmqdqrStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          // else if (row.taskInfo === '上传佐证材料填写信息') {
+          //   this.$router.push({
+          //     name: 'wfhxzgStep4',
+          //     query: {
+          //       taskIds: row.taskIds,
+          //       prcId: row.prcId,
+          //       prcNum: row.prcNum,
+          //       prcName: row.prcName,
+          //       prcType: row.prcType
+          //     }
+          //   })
+          // }
+          break
+
       }
     },
   },

src/pages/processCenter/pages/components/ProcessFooter.vue

@@ -38,6 +38,15 @@
               :loading="submitLoading"
               v-if="showOver"
       >撤销申请</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        class="common-button-primary"
+        icon="el-icon-s-promotion"
+        @click="handleTransfer"
+        :loading="transferLoading"
+        v-if="showTransfer"
+      >转办</el-button>
       <el-button
         type="primary"
         size="mini"
@@ -140,6 +149,10 @@ export default {
       type: Boolean,
       default: false
     },
+    showTransfer:{
+      type: Boolean,
+      default: false
+    },
     showConfirm: {
       type: Boolean,
       default: false
@@ -159,6 +172,11 @@ export default {
       type: Boolean,
       default: false
     },
+    //转办按钮loading
+    transferLoading: {
+      type: Boolean,
+      default: false
+    },
     // 保存按钮loading
     saveLoading: {
       type: Boolean,
@@ -225,6 +243,9 @@ export default {
     handleSubmit() {
       this.$emit('submit')
     },
+    handleTransfer(){
+      this.$emit('transfer')
+    },
     handleSendEmail() {
       this.$emit('sendEmail')
     },

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue

@@ -1325,12 +1325,15 @@ export default {
             }
             this.dataList = res.data.records;
             this.dataList.forEach(item => {
-              if (item.xcxssrqgj === null) {
+              if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' ||  item.xcxssrqgj === 'null'){
-                this.$set(item, "XCXSSRQ", "");
+                item.xcxssrqgj = ''
-                this.$set(item, "ZCCSSRQ", "");
+              }else{
-              } else {
+                this.$set(item, "XCXSSRQ", item.xcxssrqgj)
-                this.$set(item, "XCXSSRQ", item.xcxssrqgj);
+              }
-                this.$set(item, "ZCCSSRQ", item.zccssrqgj);
+              if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){
+                item.zccssrqgj = ''
+              }else{
+                this.$set(item, "ZCCSSRQ", item.zccssrqgj)
               }
             });
             this.listForm.dataList = res.data.records;

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

@@ -1305,11 +1305,15 @@ export default {
             }
             this.dataList = res.data.records;
             this.dataList.forEach(item => {
-             if(item.xcxssrqgj === 'undefined'){
+             if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' ||  item.xcxssrqgj === 'null'){
                item.xcxssrqgj = ''
+             }else{
+               this.$set(item, "XCXSSRQ", item.xcxssrqgj)
              }
-             if(item.zccssrqgj === 'undefined'){
+             if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){
                item.zccssrqgj = ''
+             }else{
+               this.$set(item, "ZCCSSRQ", item.zccssrqgj)
              }
             })
             this.listForm.dataList = this.dataList;

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

@@ -212,11 +212,22 @@
       </div>
     </div>
     <ProcessFooter
+      show-transfer
       show-submit
       :submitLoading="isSubmit"
+      :transferLoading="isTransfer"
+      @transfer="handleTransfer"
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -224,8 +235,9 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew} from "api/process";
 import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis";
+import axios from "axios";
 
 export default {
   name: "bzqdfbStep2",
@@ -240,6 +252,7 @@ export default {
       // 当前流程类型(1待办/2已办)
       processType: 1,
       loading: false,
+      nodeList:[],
       dataList: [],//清单里的标准数据
       active: "1",
       userId: this.$store.getters.userInfo.userId,
@@ -247,6 +260,8 @@ export default {
       pId: this.$route.query.prcId,
       listType: "country",  //选择的清单类型
       isSubmit: false,
+      isTransfer: false,
+      drawerTitle:'',
       saveLoading: false,
       tabValue: "listOfCountries",
       selectedList: [],  //选择清单的选择框
@@ -255,6 +270,8 @@ export default {
       fileList:[],
       fileIds: "",
       commentText: "", //填写会签意见
+      // 调整处理人抽屉状态
+      drawerModal: false,
       page: 1,
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
@@ -384,9 +401,46 @@ export default {
         }
       }
     },
-    //保存事件
+    //确认转办
-    handleSave() {
+    checkedRole (data) {
-
+      this.assigneeNewLoading = 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 => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
     },
     //提交事件
     handleSubmit() {

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

@@ -377,14 +377,25 @@
     </el-drawer>
 
     <ProcessFooter
+      show-transfer
       show-save
       show-submit
       :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
+      @transfer="handleTransfer"
       @save="handleSave"
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="drawerModal"
+        @checkedRole="checkedRole"
+        :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -392,7 +403,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail,  saveTaskForPub } from "api/process";
+import { inboundLiaisonDetail,  saveTaskForPub ,changeAssigneeNew } from "api/process";
 
 export default {
   name: "bzqdfbStep3",
@@ -409,6 +420,11 @@ export default {
       processType: 1,
       searching: false,
       commentText:'',
+      nodeList:[],
+      isTransfer: false,
+      drawerTitle:'',
+      // 调整处理人抽屉状态
+      drawerModal: false,
       standardTypeOptions: [
         {
           value: "INLAND",
@@ -482,6 +498,47 @@ export default {
     };
   },
   methods: {
+    //确认转办
+    checkedRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
     processTable () {
       this.$http.get('lawss/activiti/get_list_by_instance', {
         prcNum: this.$route.query.prcNum,

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

@@ -214,15 +214,26 @@
     </div>
 
     <ProcessFooter
+      show-transfer
       show-back
       show-submit
+      :transfer-loading="isTransfer"
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
       :approval="true"
+      @transfer="handleTransfer"
       @back="beforeBack"
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="drawerModal"
+        @checkedRole="checkedRole"
+        :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -230,7 +241,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail } from "api/process";
+import { inboundLiaisonDetail ,changeAssigneeNew} from "api/process";
 
 export default {
   name: "bzqdfbStep4",
@@ -241,6 +252,11 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      isTransfer: false,
+      drawerTitle:'',
+      // 调整处理人抽屉状态
+      drawerModal: false,
       detailData: [],
       // 当前流程类型(1待办/2已办)
       processType: 1,
@@ -296,6 +312,47 @@ export default {
     };
   },
   methods: {
+    //确认转办
+    checkedRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,

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

@@ -213,14 +213,17 @@
     <ProcessFooter
       show-save
       show-submit
+      show-transfer
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
+      :transferLoading="turnLoading"
+      @transfer="handleTurnTo"
       @save="handleSave"
       @submit="handleSubmit"
     >
     </ProcessFooter>
     <Role-tree
-      is-title="选择人员信息"
+      :is-title="drawerTitle"
       check-box
       :is-visible.sync="modalshowflag"
       :nodeList="nodeList"
@@ -234,7 +237,7 @@ import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
 import { roleTreeData } from "@/api/unqualProcess.js"
-import {completeTask, inboundLiaisonDetail, saveinboundTask, saveTaskForPub} from "@/api/process.js"
+import {completeTask, inboundLiaisonDetail, saveinboundTask, saveTaskForPub, changeAssigneeNew} from "@/api/process.js"
 
 export default {
   name: "wfhxzgStep2",
@@ -248,6 +251,7 @@ export default {
       ListModel: false, // 新增编辑抽屉开关
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
+      userId: this.$route.query.taskAssignee,
       nonSearch: {
         standSerialNumber: '',
         standId: '', // 标准号/名称
@@ -257,6 +261,7 @@ export default {
       active: '1', // 默认显示
       isSubmit: false,
       saveLoading: false,
+      turnLoading: false,
       dataList: [],
       endDataList: [],
       lastDataList: [],
@@ -370,6 +375,11 @@ export default {
       this.active = name
     },
 
+    // 转办按钮
+    handleTurnTo() {
+      this.modalshowflag = true
+      this.drawerTitle = '转办处理人'
+    },
     // 保存按钮
     handleSave() {
       this.saveLoading = true
@@ -444,21 +454,39 @@ export default {
       this.modalshowflag = true
     },
     drawerCheck (data) {
-      this.roleRow = data[0]
+      if (this.drawerTitle === '转办处理人') {
-      // 选取负责人时的操作
+        this.turnLoading = true
-      if (this.multipleSelection.length === 0) {
+        changeAssigneeNew({
-        this.rowDutyPeople.dutyPeopleInfo = this.roleRow.name
+          taskId: this.taskIds, // 任务id
-        this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.id
+          assignee: data[0].id, // 被委托人
-      }else {
+          userId: this.userId, // 委托人
-        this.multipleSelection.forEach(item => {
+          pId: this.pId // 流程实例
-          item.dutyPeopleInfo = this.roleRow.name
+        }).then(res =>{
-          item.dutyPeopleInfoId = this.roleRow.id
+          if (res.success) {
+            this.turnLoading = false
+            this.$message.success('调整成功')
+            this.$router.push("/processCenter")
+          } else {
+            this.$message.warning(res.message)
+          }
         })
-        this.$refs.multipleTable.clearSelection()
+      } else {
+        this.roleRow = data[0]
+        // 选取负责人时的操作
+        if (this.multipleSelection.length === 0) {
+          this.rowDutyPeople.dutyPeopleInfo = this.roleRow.name
+          this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.id
+        }else {
+          this.multipleSelection.forEach(item => {
+            item.dutyPeopleInfo = this.roleRow.name
+            item.dutyPeopleInfoId = this.roleRow.id
+          })
+          this.$refs.multipleTable.clearSelection()
+        }
+        this.lastDataList = this.dataList
+        // 选取流程信息完成
+        // this.roleForm.dutyUserInfoName = this.roleRow.name
       }
-      this.lastDataList = this.dataList
-      // 选取流程信息完成
-      // this.roleForm.dutyUserInfoName = this.roleRow.name
       this.modalshowflag = false
     },
     //查询按钮

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

@@ -220,8 +220,11 @@
       show-save
       show-submit
       show-back
+      show-transfer
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
+      :transferLoading="turnLoading"
+      @transfer="handleTurnTo"
       @back="handleSubmitNo"
       @save="handleSave"
       @submit="handleSubmit"
@@ -229,7 +232,7 @@
     </ProcessFooter>
     <Role-tree
       check-box
-      is-title="选择人员信息"
+      :is-title="drawerTitle"
       :is-visible.sync="modalshowflag"
       :nodeList="nodeList"
       @checkedRole="drawerCheck"
@@ -241,7 +244,7 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {completeTask, inboundLiaisonDetail, saveTaskForPub} from "@/api/process.js";
+import {changeAssigneeNew, completeTask, inboundLiaisonDetail, saveTaskForPub} from "@/api/process.js";
 
 export default {
   name: "wfhxzgStep3",
@@ -261,8 +264,10 @@ export default {
       active: '1', // 默认显示
       isSubmit: false,
       saveLoading: false,
+      turnLoading: false,
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
+      userId: this.$route.query.taskAssignee,
       dataList: [],
       newDataList: {},
       // 批量选择负责人table数组
@@ -339,6 +344,7 @@ export default {
       this.newDataList = val
       this.nodeList = []
       this.modalshowflag = true
+      this.drawerTitle = '选择人员信息'
     },
     // 批量选择负责人按钮
     dutyPeopleList(id) {
@@ -357,6 +363,11 @@ export default {
     handleTabs(name) {
       this.active = name
     },
+    // 转办按钮
+    handleTurnTo() {
+      this.modalshowflag = true
+      this.drawerTitle = '转办处理人'
+    },
     // 退回按钮
     handleSubmitNo() {
       if (this.commentText) {
@@ -478,18 +489,36 @@ export default {
     },
 
     drawerCheck (data) {
-      this.roleForm = data[0]
+      if (this.drawerTitle === '转办处理人') {
-      // 选择责任人时input框内值
+        this.turnLoading = true
-      if (this.selectTableMore.length ===0) {
+        changeAssigneeNew({
-        this.newDataList.dutyPeople = this.roleForm.name
+          taskId: this.taskIds, // 任务id
-        this.newDataList.dutyPeopleId = this.roleForm.id
+          assignee: data[0].id, // 被委托人
-      }else {
+          userId: this.userId, // 委托人
-        this.selectTableMore.forEach(item => {
+          pId: this.pId // 流程实例
-          item.dutyPeople = this.roleForm.name
+        }).then(res =>{
-          item.dutyPeopleId = this.roleForm.id
+          if (res.success) {
+            this.turnLoading = false
+            this.$message.success('调整成功')
+            this.$router.push("/processCenter")
+          } else {
+            this.$message.warning(res.message)
+          }
         })
+      } else {
+        this.roleForm = data[0]
+        // 选择责任人时input框内值
+        if (this.selectTableMore.length ===0) {
+          this.newDataList.dutyPeople = this.roleForm.name
+          this.newDataList.dutyPeopleId = this.roleForm.id
+        }else {
+          this.selectTableMore.forEach(item => {
+            item.dutyPeople = this.roleForm.name
+            item.dutyPeopleId = this.roleForm.id
+          })
+        }
+        this.lastDataList = this.dataList
       }
-      this.lastDataList = this.dataList
       this.modalshowflag = false
     },
 

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

@@ -217,12 +217,22 @@
     <ProcessFooter
       show-save
       show-submit
+      show-transfer
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
+      :transferLoading="turnLoading"
+      @transfer="handleTurnTo"
       @save="handleSave"
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <Role-tree
+      :is-title="drawerTitle"
+      check-box
+      :is-visible.sync="modalshowflag"
+      :nodeList="nodeList"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -230,14 +240,15 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {uploadFile} from '@/api/unqualProcess.js';
+import {inboundLiaisonDetail, completeTask, saveTaskForPub, changeAssigneeNew} from "@/api/process"
-import {inboundLiaisonDetail, completeTask, saveTaskForPub} from "@/api/process"
-import listOfCountries from "@/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries";
 
 export default {
   name: "wfhxzgStep4",
   data() {
     return {
+      drawerTitle: '',
+      nodeList: [],
+      modalshowflag: false, // drawer开关
       detailData: [],
       loading: false,
       textarea: '', // 意见
@@ -251,9 +262,11 @@ export default {
       active: '1', // 默认显示
       isSubmit: false,
       saveLoading: false,
+      turnLoading: false,
       dataList: [],
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
+      userId: this.$route.query.taskAssignee,
       // 当前页数
       pageNo: 1,
       total: 0,
@@ -409,6 +422,30 @@ export default {
       })
       window.open(routeUrl.href, '_blank')
     },
+    drawerCheck (data) {
+      this.turnLoading = true
+      changeAssigneeNew({
+        taskId: this.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.userId, // 委托人
+        pId: this.pId // 流程实例
+      }).then(res =>{
+        this.isSubmit = true
+        if (res.success) {
+          this.turnLoading = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter")
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+      this.modalshowflag = false
+    },
+    // 转办按钮
+    handleTurnTo() {
+      this.modalshowflag = true
+      this.drawerTitle = '转办处理人'
+    },
     // 保存按钮
     handleSave() {
       let zqa = new Map();

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

@@ -199,9 +199,12 @@
       show-submit
       show-back
       approval
+      show-transfer
       @back="handleSubmitNo"
       :submitLoading="isSubmit"
       :isSubmitBack="backLoading"
+      :transferLoading="turnLoading"
+      @transfer="handleTurnTo"
       @submit="handleSubmit"
       submitBTNText="同意"
     >
@@ -215,6 +218,13 @@
       >
       </el-upload>
     </el-dialog>
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="modalshowflag"
+      :nodeList="nodeList"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -223,12 +233,15 @@ import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
 import {interfaceUrl} from "@/sysConfig";
-import {inboundLiaisonDetail} from "@/api/process";
+import {inboundLiaisonDetail, changeAssigneeNew} from "@/api/process";
 
 export default {
   name: "wfhxzgStep5",
   data() {
     return {
+      drawerTitle: '',
+      nodeList: [],
+      modalshowflag: false, // drawer开关
       fileMadel: false,
       detailData: [],
       loading: false,
@@ -245,11 +258,13 @@ export default {
       active: '1', // 默认显示
       isSubmit: false,
       backLoading: false,
+      turnLoading: false,
       dataList: [],
       json: {},
       taskInfo: this.$route.query.taskInfo,
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
+      userId: this.$route.query.taskAssignee,
       // 当前页数
       pageNo: 1,
       total: 0,
@@ -360,6 +375,29 @@ export default {
         this.isSubmit = false
       })
     },
+    drawerCheck (data) {
+      this.turnLoading = true
+      changeAssigneeNew({
+        taskId: this.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.userId, // 委托人
+        pId: this.pId // 流程实例
+      }).then(res =>{
+        if (res.success) {
+          this.turnLoading = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter")
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+      this.modalshowflag = false
+    },
+    // 转办按钮
+    handleTurnTo() {
+      this.modalshowflag = true
+      this.drawerTitle = '转办处理人'
+    },
     handleSubmitNo() {
       this.backLoading = true
       if (this.commentText) {

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

@@ -178,14 +178,25 @@
 
     <ProcessFooter
       show-back
+      show-transfer
       show-submit
+      :transfer-loading="isTransfer"
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
       :approval="true"
+      @transfer="handleTransfer"
       @back="beforeBack"
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="drawerModal"
+        @checkedRole="checkedRole"
+        :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -193,7 +204,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew} from "api/process";
 
 export default {
   name: "xmpgStep2",
@@ -204,6 +215,11 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      isTransfer: false,
+      drawerTitle:'',
+      // 调整处理人抽屉状态
+      drawerModal: false,
       detailData: [],
       // 当前流程类型(1待办/2已办)
       processType: 1,
@@ -279,6 +295,47 @@ export default {
     };
   },
   methods: {
+    //确认转办
+    checkedRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
     processTable () {
       this.$http.get('lawss/activiti/get_list_by_instance', {
         prcNum: this.$route.query.prcNum,

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

@@ -208,13 +208,24 @@
 
     <ProcessFooter
       show-save
+      show-transfer
       show-submit
+      :transfer-loading="isTransfer"
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
       @save="handleSave"
+      @transfer="handleTransfer"
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="drawerModal"
+        @checkedRole="checkedTransferRole"
+        :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -222,7 +233,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
+import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew } from "api/process";
 
 export default {
   name: "xmpgStep3",
@@ -233,6 +244,9 @@ export default {
   },
   data() {
     return {
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
       showColumn: true,
       drawerTitle: "", //drawer标题
       modalshowflag: false, // drawer开关
@@ -325,6 +339,47 @@ export default {
     };
   },
   methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,

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

@@ -333,13 +333,24 @@
 
     <ProcessFooter
       show-save
+      show-transfer
       show-submit
       :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       @save="handleSave"
+      @transfer="handleTransfer"
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="drawerModal"
+        @checkedRole="checkedTransferRole"
+        :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -348,7 +359,7 @@ import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import Moment from 'moment';
-import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
+import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew } from "api/process";
 
 export default {
   name: "xmpgStep4",
@@ -359,6 +370,9 @@ export default {
   },
   data() {
     return {
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
       detailData: [],
       sarProStateTableHeight: null, // 项目列表高度
       // 当前流程类型(1待办/2已办)
@@ -418,6 +432,47 @@ export default {
     };
   },
   methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,

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

@@ -298,13 +298,24 @@
     <ProcessFooter
       show-back
       show-submit
+      show-transfer
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
+      :transfer-loading="isTransfer"
       :approval="true"
       @back="beforeBack"
+      @transfer="handleTransfer"
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="drawerModal"
+        @checkedRole="checkedTransferRole"
+        :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -312,7 +323,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew } from "api/process";
 
 export default {
   name: "xmpgStep5",
@@ -323,6 +334,9 @@ export default {
   },
   data() {
     return {
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
       detailData: [],
       sarProStateTableHeight: null, // 项目列表高度
       // 当前流程类型(1待办/2已办)
@@ -397,6 +411,47 @@ export default {
     };
   },
   methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
     processTable () {
       this.$http.get('lawss/activiti/get_list_by_instance', {
         prcNum: this.$route.query.prcNum,

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

@@ -297,13 +297,24 @@
 
     <ProcessFooter
       show-submit
+      show-transfer
       :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       :approval="true"
       @back="beforeBack"
+      @transfer="handleTransfer"
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="drawerModal"
+        @checkedRole="checkedTransferRole"
+        :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -311,7 +322,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew } from "api/process";
 
 export default {
   name: "xmpgStep6",
@@ -322,6 +333,9 @@ export default {
   },
   data() {
     return {
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
       detailData: [],
       sarProStateTableHeight: null, // 项目列表高度
       // 当前流程类型(1待办/2已办)
@@ -396,6 +410,47 @@ export default {
     };
   },
   methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
     processTable () {
       this.$http.get('lawss/activiti/get_list_by_instance', {
         prcNum: this.$route.query.prcNum,

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

@@ -297,13 +297,24 @@
 
     <ProcessFooter
       show-submit
+      show-transfer
       :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       :approval="true"
       @back="beforeBack"
+      @transfer="handleTransfer"
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="drawerModal"
+        @checkedRole="checkedTransferRole"
+        :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -311,7 +322,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew } from "api/process";
 
 export default {
   name: "xmpgStep7",
@@ -322,6 +333,9 @@ export default {
   },
   data() {
     return {
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
       detailData: [],
       sarProStateTableHeight: null, // 项目列表高度
       // 当前流程类型(1待办/2已办)
@@ -396,6 +410,47 @@ export default {
     };
   },
   methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
     processTable () {
       this.$http.get('lawss/activiti/get_list_by_instance', {
         prcNum: this.$route.query.prcNum,

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

@@ -281,14 +281,25 @@
     </div>
     <ProcessFooter
       show-back
+      show-transfer
       show-submit
       :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       :approval="true"
       @back="beforeBack"
+      @transfer="handleTransfer"
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="drawerModal"
+        @checkedRole="checkedTransferRole"
+        :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -296,7 +307,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew } from "api/process";
 
 export default {
   name: "xmpg2Step10",
@@ -307,6 +318,9 @@ export default {
   },
   data() {
     return {
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
       active: "1",
       loading: false,
       // 当前流程类型(1待办/2已办)
@@ -330,6 +344,47 @@ export default {
     };
   },
   methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
     // 点击查看
     handlePreview(item) {
       let routeUrl = this.$router.resolve({

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

@@ -281,12 +281,23 @@
     </div>
     <ProcessFooter
       show-submit
+      show-transfer
       :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       :approval="true"
       @submit="handleSubmit"
+      @transfer="handleTransfer"
     >
     </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="drawerModal"
+        @checkedRole="checkedTransferRole"
+        :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -294,7 +305,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew} from "api/process";
 
 export default {
   name: "xmpg2Step11",
@@ -305,6 +316,9 @@ export default {
   },
   data() {
     return {
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
       active: "1",
       loading: false,
       // 当前流程类型(1待办/2已办)
@@ -328,6 +342,47 @@ export default {
     };
   },
   methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
     // 点击查看
     handlePreview(item) {
       let routeUrl = this.$router.resolve({

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

@@ -281,14 +281,25 @@
     </div>
     <ProcessFooter
       show-back
+      show-transfer
       show-submit
       :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       :approval="true"
       @back="beforeBack"
+      @transfer="handleTransfer"
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="drawerModal"
+        @checkedRole="checkedTransferRole"
+        :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -296,7 +307,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew} from "api/process";
 
 export default {
   name: "xmpg2Step12",
@@ -307,6 +318,9 @@ export default {
   },
   data() {
     return {
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
       active: "1",
       loading: false,
       // 当前流程类型(1待办/2已办)
@@ -330,6 +344,47 @@ export default {
     };
   },
   methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
     // 点击查看
     handlePreview(item) {
       let routeUrl = this.$router.resolve({

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

@@ -234,14 +234,25 @@
     </div>
     <ProcessFooter
       show-back
+      show-transfer
       show-submit
       :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       :approval="true"
       @back="beforeBack"
+      @transfer="handleTransfer"
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="drawerModal"
+        @checkedRole="checkedTransferRole"
+        :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -249,7 +260,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew } from "api/process";
 
 export default {
   name: "xmpg2Step2",
@@ -260,6 +271,9 @@ export default {
   },
   data() {
     return {
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
       active: "1",
       loading: false,
       // 当前流程类型(1待办/2已办)
@@ -283,6 +297,47 @@ export default {
     };
   },
   methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,

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

@@ -197,13 +197,24 @@
     </div>
     <ProcessFooter
       show-save
+      show-transfer
       show-submit
       :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       @save="handleSave"
+      @transfer="handleTransfer"
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="drawerModal"
+        @checkedRole="checkedTransferRole"
+        :nodeList="nodeList"
+    ></Role-tree>
     <!--    选择责任人-->
     <Role-tree
       check-box
@@ -219,7 +230,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
+import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew} from "api/process";
 
 export default {
   name: "xmpg2Step3",
@@ -230,6 +241,9 @@ export default {
   },
   data() {
     return {
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
       active: "1",
       loading: false,
       // 当前流程类型(1待办/2已办)
@@ -267,6 +281,47 @@ export default {
     };
   },
   methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,

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

@@ -206,12 +206,23 @@
     <ProcessFooter
       show-save
       show-submit
+      show-transfer
       :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       @save="handleSave"
+      @transfer="handleTransfer"
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="drawerModal"
+        @checkedRole="checkedTransferRole"
+        :nodeList="nodeList"
+    ></Role-tree>
     <!--    选择责任人-->
     <Role-tree
       check-box
@@ -227,7 +238,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
+import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew} from "api/process";
 
 export default {
   name: "xmpg2Step4",
@@ -238,6 +249,9 @@ export default {
   },
   data() {
     return {
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
       active: "1",
       loading: false,
       // 当前流程类型(1待办/2已办)
@@ -276,6 +290,47 @@ export default {
     };
   },
   methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
     // 点击查看
     handlePreview(item) {
       let routeUrl = this.$router.resolve({

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

@@ -206,12 +206,23 @@
     <ProcessFooter
       show-save
       show-submit
+      show-transfer
       :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       @save="handleSave"
+      @transfer="handleTransfer"
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="drawerModal"
+        @checkedRole="checkedTransferRole"
+        :nodeList="nodeList"
+    ></Role-tree>
     <!--    选择责任人-->
     <Role-tree
       check-box
@@ -227,7 +238,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
+import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew } from "api/process";
 
 export default {
   name: "xmpg2Step5",
@@ -238,6 +249,9 @@ export default {
   },
   data() {
     return {
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
       workPeopleList:[],
       //防止按钮点击过快的按钮loading
       buttonLoading: false,
@@ -283,6 +297,47 @@ export default {
     };
   },
   methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
     // 点击查看
     handlePreview(item) {
       let routeUrl = this.$router.resolve({
@@ -418,6 +473,8 @@ export default {
     handleSubmit() {
       this.isSubmit = true;
       this.listForm.commentText = this.commentText;
+      this.listForm.children = this.dataList[0].children
+      this.listForm.dataList = this.dataList
       const json = JSON.stringify(this.listForm);
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
@@ -512,14 +569,14 @@ export default {
       } else if (this.type === 2) {
         this.selectList.forEach(item => {
           this.dataList.map(items => {
-            if (item.id == items.id) {
+            if (item.id === items.id) {
               items.workPeople = "";
               items.workPeopleId = "";
               this.$message.warning('您只能针对条款进行分发')
             }
             if (items.children.length) {
               items.children.map(childrenItem => {
-                if (childrenItem.id == item.id) {
+                if (childrenItem.id === item.id) {
                   childrenItem.workPeople = data[0].name;
                   childrenItem.workPeopleId = data[0].id;
                 }

src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue

@@ -342,12 +342,23 @@
     <ProcessFooter
       show-save
       show-submit
+      show-transfer
       :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       @save="handleSave"
+      @transfer="handleTransfer"
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="drawerModal"
+        @checkedRole="checkedTransferRole"
+        :nodeList="nodeList"
+    ></Role-tree>
     <el-drawer
         title="批量填写"
         :visible.sync="modalshowflag"
@@ -422,7 +433,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
+import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew } from "api/process";
 
 export default {
   name: "xmpg2Step6",
@@ -433,6 +444,9 @@ export default {
   },
   data() {
     return {
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
       batchEditForm: {
         // 在研产品
         // 合规
@@ -503,6 +517,47 @@ export default {
     };
   },
   methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
     //批量编辑确定按钮事件
     saveBatchEditForm() {
 

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

@@ -281,14 +281,25 @@
     </div>
     <ProcessFooter
       show-back
+      show-transfer
       show-submit
       :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       :approval="true"
       @back="beforeBack"
+      @transfer="handleTransfer"
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="drawerModal"
+        @checkedRole="checkedTransferRole"
+        :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -296,7 +307,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew } from "api/process";
 
 export default {
   name: "xmpg2Step7",
@@ -307,6 +318,9 @@ export default {
   },
   data() {
     return {
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
       active: "1",
       loading: false,
       // 当前流程类型(1待办/2已办)
@@ -330,6 +344,47 @@ export default {
     };
   },
   methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
     // 点击查看
     handlePreview(item) {
       console.log(item);

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

@@ -279,14 +279,25 @@
     </div>
     <ProcessFooter
       show-back
+      show-transfer
       show-submit
       :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       :approval="true"
       @back="beforeBack"
+      @transfer="handleTransfer"
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="drawerModal"
+        @checkedRole="checkedTransferRole"
+        :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -294,7 +305,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew} from "api/process";
 
 export default {
   name: "xmpg2Step8",
@@ -305,6 +316,9 @@ export default {
   },
   data() {
     return {
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
       active: "1",
       loading: false,
       // 当前流程类型(1待办/2已办)
@@ -328,6 +342,47 @@ export default {
     };
   },
   methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
     // 点击查看
     handlePreview(item) {
       let routeUrl = this.$router.resolve({

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

@@ -281,14 +281,25 @@
     </div>
     <ProcessFooter
       show-back
+      show-transfer
       show-submit
       :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       :approval="true"
       @back="beforeBack"
+      @transfer="handleTransfer"
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="drawerModal"
+        @checkedRole="checkedTransferRole"
+        :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -296,7 +307,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew } from "api/process";
 
 export default {
   name: "xmpg2Step9",
@@ -307,6 +318,9 @@ export default {
   },
   data() {
     return {
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
       active: "1",
       loading: false,
       // 当前流程类型(1待办/2已办)
@@ -330,6 +344,47 @@ export default {
     };
   },
   methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
     // 点击查看
     handlePreview(item) {
       let routeUrl = this.$router.resolve({

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

@@ -383,14 +383,25 @@
     </el-drawer>
     <ProcessFooter
       show-save
+      show-transfer
       show-confirm
       :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
       :saveLoading="saveLoading"
       @submit="handleSubmit"
+      @transfer="handleTransfer"
       @save="handleSave"
       :approval="true"
     >
     </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="drawerModal"
+        @checkedRole="checkedTransferRole"
+        :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -398,7 +409,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail, saveTaskForPub } from "api/process";
+import { inboundLiaisonDetail, queryDetail, saveTaskForPub ,changeAssigneeNew} from "api/process";
 
 export default {
   name: "xmqdqrStep2",
@@ -409,6 +420,9 @@ export default {
   },
   data() {
     return {
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
       active: "1",
       loading: false,
       // 当前流程类型(1待办/2已办)
@@ -468,6 +482,47 @@ export default {
     });
   },
   methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = 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 => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
     // 将文本状态的id与name对应
     setMap(data) {
       data.forEach(item => {

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

@@ -743,6 +743,7 @@ export default {
                 taskIds: row.taskIds,
                 prcId: row.prcId,
                 prcNum: row.prcNum,
+                taskAssignee: row.taskAssignee,
                 prcName: row.prcName,
                 prcType: row.prcType
               }
@@ -754,6 +755,7 @@ export default {
                 taskIds: row.taskIds,
                 prcId: row.prcId,
                 prcNum: row.prcNum,
+                taskAssignee: row.taskAssignee,
                 prcName: row.prcName,
                 prcType: row.prcType
               }
@@ -765,6 +767,7 @@ export default {
                 taskIds: row.taskIds,
                 prcId: row.prcId,
                 prcNum: row.prcNum,
+                taskAssignee: row.taskAssignee,
                 prcName: row.prcName,
                 prcType: row.prcType
               }
@@ -776,6 +779,7 @@ export default {
                 taskIds: row.taskIds,
                 prcId: row.prcId,
                 prcNum: row.prcNum,
+                taskAssignee: row.taskAssignee,
                 prcName: row.prcName,
                 prcType: row.prcType
               }

src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue

@@ -9,12 +9,12 @@
         <div v-else-if="tabValue === 'listProject'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
           <list-project></list-project>
         </div>
-<!--        <div v-else-if="tabValue === 'listTracking'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
-          <list-tracking></list-tracking>
-        </div>-->
         <div v-else-if="tabValue === 'listOther'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
           <list-other></list-other>
         </div>
+        <div v-else-if="tabValue === 'localProductsOrProjectLibrary'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
+          <local-products-or-project-library></local-products-or-project-library>
+        </div>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -23,8 +23,8 @@
 <script>
 import listOfCountries from "../accessStandardsAndRegulations/page/listOfCountries";
 import listProject from "../accessStandardsAndRegulations/page/listProject";
-import listTracking from "../accessStandardsAndRegulations/page/listTracking";
 import listOther from "../accessStandardsAndRegulations/page/listOther";
+import localProductsOrProjectLibrary from "../localProductsOrProjectLibrary/index";
 
 export default {
   name: "AccessStandardsAndRegulations",
@@ -32,14 +32,14 @@ export default {
     return {
       list: [],
       tabValue: "listProject",
-      menuName: ["国家/地区清单", "项目类清单", "重点标准跟踪清单", "其他清单"]
+      menuName: ["国家/地区清单", "项目类清单", "其他清单", "重点标准跟踪清单"]
     };
   },
   methods: {},
   components: {
+    localProductsOrProjectLibrary,
     listOfCountries,
     listProject,
-    listTracking,
     listOther
   },
   props: {},
@@ -68,18 +68,18 @@ export default {
               name: "listProject"
             });
             continue;
-          }/* else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") {
+          }else if (entity.id === "5a75523729b04102a565167004d640e9") {
-            list.push({
-              label: "重点标准跟踪清单",
-              name: "listTracking"
-            });
-            continue;
-          }*/ else if (entity.id === "5a75523729b04102a565167004d640e9") {
             list.push({
               label: "其他清单",
               name: "listOther"
             });
             continue;
+          } else {
+            list.push({
+              label: "项目清单",
+              name: "localProductsOrProjectLibrary"
+            });
+            continue;
           }
         }
       }

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -184,11 +184,16 @@
                 label="标准号"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear" class="table-jump"
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: red"
                    @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                     scope.row.standNumber
                   }}-{{ scope.row.standYear }}</a>
-                <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                <a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333"
+                   @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                    scope.row.standNumber
+                  }}-{{ scope.row.standYear }}</a>
+                <a v-else @click="handlePreview(scope.row)" class="table-jump" style="color: #333333">
+                  {{ scope.row.standSortShow }}
                   {{ scope.row.standNumber }}</a>
               </template>
             </el-table-column>
@@ -197,7 +202,8 @@
                 label="标准名称"
             >
               <template slot-scope="scope">
-                <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: red">{{ scope.row.standName }}</a>
+                <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
               </template>
             </el-table-column>
             <el-table-column
@@ -206,7 +212,8 @@
                 width="110px"
                 label="发布日期">
               <template slot-scope="scope">
-                {{ formatIssueDate(scope.row.issueTime) }}
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: red">{{ formatIssueDate(scope.row.issueTime) }}</span>
+                <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -216,7 +223,8 @@
                 label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: red">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
 
               </template>
             </el-table-column>
@@ -227,7 +235,8 @@
                 width="150px"
                 label="新车型实施日期">
               <template slot-scope="scope">
-                <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: red">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -236,7 +245,8 @@
                 width="150px"
                 label="在产车实施日期">
               <template slot-scope="scope">
-                <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: red">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -250,7 +260,8 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: red">{{ textStatusMap[scope.row.textStatus] }}</span>
+                <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="50" fixed="right">

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -297,7 +297,8 @@
           >
             <template slot-scope="scope">
 <!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              <a v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '参考' " style="color: red" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -306,7 +307,8 @@
             label="中文名称"
           >
             <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '参考' " style="color: red" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -315,7 +317,8 @@
             label="英文名称"
           >
             <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+              <a v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '参考' " style="color: red" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+              <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -325,7 +328,8 @@
             width="110"
           >
             <template slot-scope="scope">
-              {{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}
+              <span v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '参考' " style="color: red">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+              <span v-else>{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -335,7 +339,8 @@
             width="110"
           >
             <template slot-scope="scope">
-              {{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}
+              <span v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '参考' " style="color: red">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+              <span v-else>{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -347,10 +352,7 @@
             >
 
               <template slot-scope="scope">
-                <span v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '被代替' " style="color: #F56C6C">
+                <span v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '参考' " style="color: red">
-                  {{scope.row.standStatusShow}}
-                </span>
-                <span v-else-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">
                   {{scope.row.standStatusShow}}
                 </span>
                 <span v-else>
@@ -3326,6 +3328,7 @@ export default {
         this.sarBussionessSearch.TXLBBUSS = ''
         this.sarBussionessSearch.VPPSBMBUSS = ''
         this.sarBussionessSearch.advanceSearchVOStr = ''
+        this.sarBussionessSearch.standEnName=''
         this.pageChange(1)
         this.getBussionStandTable(this.sarBussionessSearch)
         this.isAdvancedSearch = false

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -171,10 +171,7 @@
               label="标准号"
             >
               <template slot-scope="scope">
-<!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
+                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
-<!--                暂时使用-->
-                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
-
                 <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
               </template>
             </el-table-column>
@@ -192,7 +189,11 @@
               width="110px"
               label="发布日期">
               <template slot-scope="scope">
-                {{ formatIssueDate(scope.row.issueTime) }}
+                <div>
+                  <a>
+                  {{ formatIssueDate(scope.row.issueTime) }}
+                  </a>
+                </div>
               </template>
             </el-table-column>
             <el-table-column
@@ -202,7 +203,7 @@
                 label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
+                <a>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</a>
 
               </template>
             </el-table-column>
@@ -212,7 +213,7 @@
                 width="150px"
                 label="新车型实施日期">
               <template slot-scope="scope">
-                <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
+                <a>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</a>
               </template>
             </el-table-column>
             <el-table-column
@@ -221,7 +222,7 @@
                 width="150px"
                 label="在产车实施日期">
               <template slot-scope="scope">
-                <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
+                <a>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</a>
               </template>
             </el-table-column>
             <el-table-column
@@ -235,7 +236,7 @@
 <!--                </el-tooltip>-->
 <!--              </template>-->
               <template slot-scope="scope">
-                <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                <a>{{ textStatusMap[scope.row.textStatus] }}</a>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="50" fixed="right">

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -1,6 +1,6 @@
 <!--车型/项目库 -->
 <template>
-  <div class="local-products-or-project-library v-class">
+  <div id="listOfCountries" class="local-products-or-project-library v-class">
     <div class="search-area">
       <div class="left">
         <el-form inline :model="localProTableSearch" class="label-input-form"