Merge branch 'develop' into 'test'

Develop

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

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/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -297,8 +297,9 @@
           >
             <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.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>
+              <a v-if="scope.row.standStatusShow === '作废'" style="color: red" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -307,8 +308,9 @@
             label="中文名称"
           >
             <template slot-scope="scope">
-              <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>
+              <a v-if="scope.row.standStatusShow === '作废'" style="color: red" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -317,8 +319,9 @@
             label="英文名称"
           >
             <template slot-scope="scope">
-              <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>
+              <a v-if="scope.row.standStatusShow === '作废'" style="color: red" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+              <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+              <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -328,8 +331,9 @@
             width="110"
           >
             <template slot-scope="scope">
-              <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>
+              <span v-if="scope.row.standStatusShow === '作废'" style="color: red">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+              <span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+              <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -339,8 +343,9 @@
             width="110"
           >
             <template slot-scope="scope">
-              <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>
+              <span v-if="scope.row.standStatusShow === '作废'" style="color: red">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+              <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+              <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -352,10 +357,13 @@
             >
 
               <template slot-scope="scope">
-                <span v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '参考' " style="color: red">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: red">
                   {{scope.row.standStatusShow}}
                 </span>
-                <span v-else>
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">
+                  {{scope.row.standStatusShow}}
+                </span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
                   {{scope.row.standStatusShow}}
                 </span>
               </template>