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

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

@@ -684,12 +684,23 @@
         <ProcessFooter
                 :show-save="false"
                 show-submit
+                show-transfer
                 :submitLoading="isSubmit"
                 :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>
 
@@ -697,13 +708,18 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+    import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 
     export default {
         name: "bzrkStep2",
         data () {
             return {
+              // 调整处理人抽屉状态
+              drawerModal: false,
+              drawerTitle: '',
+              nodeList: [],
+              selectPeople:'',
               xgdFileId: '',
               fbgbjbdFileId: '',
               bpgFileId: '',
@@ -877,6 +893,26 @@
         },
       },
         methods: {
+            checkedRole (data) {
+                this.assigneeNewLoading = true
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    this.assigneeNewLoading = false
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.processNum()
+                        this.queryProcess()
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
           downloadFile (fileType) {
             //文件id中出现了','字符,去除掉
             if(fileType === 'fbgbjbd'){
@@ -1032,6 +1068,10 @@
             handleTabs(name) {
                 this.active = name
             },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
             handleSave() {},
             handleSubmit() {
               const val= this.form.country;

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

@@ -665,10 +665,19 @@
         show-submit
         :submitLoading="isSubmit"
         :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>
 
@@ -677,7 +686,7 @@ import {saveTaskFirst} from "api/process";
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 
 export default {
@@ -835,6 +844,11 @@ export default {
       // 流程路由信息
       prcNum : this.$route.query.prcNum,
       prcName : this.$route.query.prcName,
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      drawerTitle: '',
+      nodeList: [],
+      selectPeople:'',
     }
   },
   components: {
@@ -849,6 +863,26 @@ export default {
     },
   },
   methods: {
+    checkedRole (data) {
+      this.assigneeNewLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        userId:this.$store.getters.userInfo.userId, // 委托人
+        assignee: data[0].id, // 被委托人
+        pId: this.$route.query.prcId, // 流程实例
+      }).then(res => {
+        this.assigneeNewLoading = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.processNum()
+          this.queryProcess()
+          this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
     downloadFile (fileType) {
       if(fileType === 'fbgbjbd'){
         window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId.replace(",","");
@@ -991,6 +1025,10 @@ export default {
     handleTabs(name) {
       this.active = name
     },
+    handleTransfer() {
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+    },
     handleSave() {
       this.saveLoading = true
       let _formData = new FormData()

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

@@ -1041,6 +1041,14 @@
         <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
       </div>
     </el-dialog>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+            check-box
+            :is-title="drawerTitle"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRole"
+            :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -1049,7 +1057,7 @@ import {saveTaskFirst, queryTaskFirst} from "api/process";
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
 
@@ -1283,6 +1291,11 @@ export default {
       // 流程路由信息
       prcNum : this.$route.query.prcNum,
       prcName : this.$route.query.prcName,
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      drawerTitle: '',
+      nodeList: [],
+      selectPeople:'',
     }
   },
   computed: {
@@ -1291,6 +1304,26 @@ export default {
     },
   },
   methods: {
+    checkedRole (data) {
+      this.assigneeNewLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        userId:this.$store.getters.userInfo.userId, // 委托人
+        assignee: data[0].id, // 被委托人
+        pId: this.$route.query.prcId, // 流程实例
+      }).then(res => {
+        this.assigneeNewLoading = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.processNum()
+          this.queryProcess()
+          this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
     getTaskId () {
       queryTaskFirst({
         bpnId: this.$route.query.bpnId

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

@@ -370,6 +370,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -334,6 +334,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -333,6 +333,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -333,6 +333,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -318,6 +318,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -316,6 +316,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -318,6 +318,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -271,6 +271,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -473,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,
@@ -567,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

@@ -444,6 +444,7 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -318,6 +318,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -316,6 +316,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -318,6 +318,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -128,7 +128,7 @@
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'b9abd00768c8ed97be89547c2da3f0eb'">查看</el-dropdown-item>
-                    <el-dropdown-item :command="[scope.row, '强制撤回']">强制撤回</el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '强制撤回']">撤回</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>