feat:双预防跳转页面

.env.development

@@ -7,15 +7,16 @@ VUE_APP_PALYER_URL="192.168.1.66:8080"
 # 网关地址
 VUE_APP_GATEWAY_URL="/dev-api"
 # 服务地址
-VUE_APP_BASE_API_URL="http://192.168.2.187:8081"
+# VUE_APP_BASE_API_URL="http://192.168.2.187:8081"
+VUE_APP_BASE_API_URL="http://119.45.186.133/prod-api"
 # 服务前-- 请严格遵守格式  不允许换行
 VUE_APP_SERVICE_PREFIX= '{"system":"/system","file":"/file","prevention":"/prevention","bpm":"/bpm"}'
 # 是否显示全部菜单
 VUE_APP_ALL_MENU = false
 # # 微前端地址
-# VUE_APP_REMOTES_URL="http://192.168.2.14:8090"
+VUE_APP_REMOTES_URL="http://192.168.2.14:8090"
 # # 当前应用部署地址
 # VUE_APP_EXPOSES_URL="http://192.168.1.20:8090"
-VUE_APP_REMOTES_URL="http://192.168.1.212/common_dev"
+# VUE_APP_REMOTES_URL=""
 # 当前应用部署地址
 VUE_APP_EXPOSES_URL="http://192.168.1.66/dev/prevention/"

src/components/center/centerSide.component.vue

@@ -614,7 +614,7 @@ export default class CenterSideComponent extends Vue {
 
 
 </script>
-<style scoped lang="scss" src="../../assets/style/pageCommon.component.scss"></style>
+<style scoped lang="scss" src="../../assets/style/pageCommon.module.scss"></style>
 <style scoped lang="scss" src="./centerSide.component.scss"></style>
 <style scoped lang="scss">
 ::v-deep {

src/components/companyFile/right.component.vue

@@ -18,8 +18,6 @@ import {Component, Emit, PropSync, Vue} from 'vue-property-decorator';
 import TitleComponent from '@/components/title.component.vue';
 import echartsOpt from "@/utils/echarts"
 import * as echarts from "echarts"
-
-import("@/assets/style/pageCommon.component.scss")
 @Component({
   components: {
     TitleComponent,
@@ -269,6 +267,7 @@ export default class CompanyFileRightComponent extends Vue {
   }
 }
 </script>
+<style scoped lang="scss" src="../../assets/style/pageCommon.module.scss"></style>
 <style lang="scss" scoped>
 .full {
   width: 100%;

src/components/header.component.vue

@@ -35,8 +35,6 @@
 <script lang="ts">
 import { Component, Emit, PropSync, Vue } from 'vue-property-decorator';
 import moment from "moment"
-import("@/assets/style/pageCommon.component.scss")
-
 import screenfull from 'screenfull'
 
 @Component

src/components/leftSide/leftSide.component.ts

@@ -8,7 +8,7 @@ import {
 } from "vue-property-decorator";
 import TitleComponent from "@/components/title.component.vue";
 import template from "./leftSide.component.html";
-import("@/assets/style/pageCommon.component.scss");
+import "../../assets/style/pageCommon.module.scss";
 import("./leftSide.compontent.scss");
 import "css-doodle";
 import RiskService from "@/service/risk.service";

src/components/rightSide/rightSide.component.ts

@@ -3,7 +3,7 @@ import template from "./rightSide.component.html";
 import TitleComponent from "@/components/title.component.vue";
 import WarningListComponent from "@/components/warningList.component.vue";
 import { getPreviousDay } from "@/utils/utils";
-import("@/assets/style/pageCommon.component.scss");
+import '../../assets/style/pageCommon.module.scss';
 import("./rightSide.component.scss");
 import RiskService from "@/service/risk.service";
 import Treeselect from "@riophae/vue-treeselect";

src/service/bpm.service.ts

@@ -0,0 +1,17 @@
+
+
+  import BaseService from "hbt-common/service/base.service"
+  import type { AxiosResponse } from 'axios'
+  import { ActionResult } from "hbt-common/models/actionResult";
+  export default class BpmService extends BaseService<any>{
+      constructor(){
+          super()
+      }
+      public getTaskPageInfo(params: any): Promise<AxiosResponse<ActionResult<any>>> {
+        const url = this.prefix.bpm + "/task/info";
+        return this.get(url, params);
+      }
+    
+  
+  }
+  

src/views/hiddenDanger/manager.component.vue

@@ -12,6 +12,8 @@ import ButtonListComponent from "hbt-common/components/common/buttonList.compone
 import ManagerService from "@/service/manager.service";
 import mapboxgl from "mapbox-gl";
 import moment from "moment";
+import BpmService from "@/service/bpm.service";
+
 @Component({
   template,
   components: {
@@ -24,6 +26,7 @@ import moment from "moment";
 export default class HiddenDangerManagerComponent extends BaseRecordComponent<any> {
   public tableService = new ManagerService();
   public workFlowService = new WorkFlowService();
+  public bpmService = new BpmService();
   // 是否显示删改查按钮
   public isBase = false;
   // 显示治理列表按钮
@@ -193,10 +196,33 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
     },
   ];
 
+  public presetParams = null as any;
+
   created() {
-    //重大危险源
+    this.presetParams = this.$route.query;
-    // this.initRiskSource();
+    if (this.presetParams.application) {
-    // console.log('111');
+      this.bpmService.getTaskPageInfo(this.presetParams).then(async (res) => {
+        // 流程页面
+        const taskData = res.data as any;
+        const ids = taskData.candidateIds.split(",").map(item => +item);
+        const mode = ids.includes(this.account.userId) ? false : true;
+        //获取列表数据；
+        const data = await this.getTableRowData(this.presetParams.bizId);
+        this.rowCallback(null, data, true,mode)
+      })
+    }
+  }
+  //获取列表数据
+  public async getTableRowData(id) {
+    const params = {
+      type: 1,
+      pageNum: 0,
+      pageSize: 10000,
+      bpmSchemeCode: "prevention-yhzl",
+      id: id
+    } as any;
+    let res = await this.tableService.selectByPage(params) as any;
+    return res.data.datas.find((item:any)=> item.id === +id);
   }
   public tabTableChange(type) {
     this.params.pageNum = 1;
@@ -973,14 +999,15 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
     });
   }
 
-  public rowCallback(el, data) {
+  public rowCallback(el, data, isJumpPage = false,mode?) {
-    const isTarget = el.target.classList.contains("text_link");
+    let isTarget = null;
-    if (isTarget) {
+    if (el) {
+      isTarget = el.target.classList.contains("text_link");
+    }
+    if (isTarget || isJumpPage) {
       if (data.status === 2) {
         const dateJudge =
-          moment().format("YYYY-MM-DD HH:mm") > data.reformDeadline
+          moment().format("YYYY-MM-DD HH:mm") > data.reformDeadline ? true : false;
-            ? true
-            : false;
         data = Object.assign(
           {
             realConfirmUserId: this.account.userId,
@@ -995,9 +1022,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
       }
       if (data.status === 3) {
         const dateJudge =
-          moment().format("YYYY-MM-DD HH:mm") > data.executeDeadline
+          moment().format("YYYY-MM-DD HH:mm") > data.executeDeadline ? true : false;
-            ? true
-            : false;
         data = Object.assign(
           {
             realExecuteUserId: this.account.userId,
@@ -1022,7 +1047,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
           data
         );
       }
-      this.showUpdateModel(data);
+      this.showUpdateModel(data,mode);
     }
   }
 
@@ -1166,22 +1191,22 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
     if (action.value.indexOf("submit") >= 0 || action.value.indexOf("save") >= 0) {
       let formRef: any;
       if (this.updateParams.status === 0 || this.updateParams.status === 1) {
-        formRef = this.$refs.applyForm; 
+        formRef = this.$refs.applyForm;
         if (formRef.vaildParams()) {
           this.callback(action)
         }
-      }else if(this.updateParams.status === 2){
+      } else if (this.updateParams.status === 2) {
-        formRef = this.$refs.confirmForm; 
+        formRef = this.$refs.confirmForm;
         if (formRef.vaildParams()) {
           this.callback(action)
         }
-      }else if(this.updateParams.status === 3){
+      } else if (this.updateParams.status === 3) {
-        formRef = this.$refs.administerForm; 
+        formRef = this.$refs.administerForm;
         if (formRef.vaildParams()) {
           this.callback(action)
         }
-      }else if(this.updateParams.status === 4){
+      } else if (this.updateParams.status === 4) {
-        formRef = this.$refs.checkForm; 
+        formRef = this.$refs.checkForm;
         if (formRef.vaildParams()) {
           this.callback(action)
         }
@@ -1394,6 +1419,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
         data: JSON.stringify(this.updateParams),
         code: "prevention-yhzl",
         application: "hbt-prevention",
+        column: this.updateParams.title,
         processInstanceId: this.updateParams.taskInfo?.processInstanceId,
         schemeDetailId: this.updateParams.taskInfo?.schemeDetailId
       },
@@ -1512,6 +1538,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
           data: JSON.stringify(this.updateParams),
           code: "prevention-yhzl",
           application: "hbt-prevention",
+          column: this.updateParams.title,
         },
       })
       .then((res: any) => {

src/views/integral/exchange/exchangeFlow/exchange.component.vue

@@ -12,6 +12,7 @@ import IntegralFlowService from '@/service/integralFlow.service'
 import FormOption from 'hbt-common/models/formOptions'
 import BtnOption from 'hbt-common/models/btnOptions'
 import moment from 'moment'
+import BpmService from '@/service/bpm.service'
 
 @Component({
     template,
@@ -26,6 +27,7 @@ export default class IntegralExchange extends BaseRecordComponent<any> {
     public userIntegral = new IntegralCenterService()
     public integralGoodsService = new IntegralMallService()
     public integralFlowService = new IntegralFlowService()
+    public bpmService = new BpmService();
 
     public params = {
         applicantId: null,
@@ -376,8 +378,33 @@ export default class IntegralExchange extends BaseRecordComponent<any> {
         ]
     }
 
+    public presetParams = null as any;
+
     created() {
-        //
+        this.presetParams = this.$route.query;
+        if (this.presetParams.application) {
+            this.bpmService.getTaskPageInfo(this.presetParams).then(async (res) => {
+                // 流程页面
+                const taskData = res.data as any;
+                const ids = taskData.candidateIds.split(",").map(item => +item);
+                const mode = ids.includes(this.account.userId) ? false : true;
+                //获取列表数据；
+                const data = await this.getTableRowData(this.presetParams.bizId);
+                this.rowCallback(null, data, true, mode)
+            })
+        }
+    }
+    //获取列表数据
+    public async getTableRowData(id) {
+        const params = {
+            type: 1,
+            pageNum: 0,
+            pageSize: 10000,
+            bpmSchemeCode: "prevention-jfdh",
+            id: id
+        } as any;
+        let res = await this.tableService.selectByPage(params) as any;
+        return res.data.datas.find((item: any) => item.id === +id);
     }
 
     public getIntegralGoods(param) {
@@ -570,7 +597,7 @@ export default class IntegralExchange extends BaseRecordComponent<any> {
 
     public toggleAll() {
         this.tableData.datas.forEach((item, index) => {
-            ;(this.$refs.multipleTable as any).toggleRowSelection(item)
+            ; (this.$refs.multipleTable as any).toggleRowSelection(item)
         })
     }
     public selectAll() {
@@ -580,7 +607,7 @@ export default class IntegralExchange extends BaseRecordComponent<any> {
             this.tableData.datas.forEach((item, index) => {
                 const find = this.selectData.find((data: any) => data.userId === item.userId)
                 if (!find) {
-                    ;(this.$refs.multipleTable as any).toggleRowSelection(item)
+                    ; (this.$refs.multipleTable as any).toggleRowSelection(item)
                 }
             })
         }
@@ -655,6 +682,7 @@ export default class IntegralExchange extends BaseRecordComponent<any> {
                         bizData: {
                             bizId: res.data,
                             data: JSON.stringify(this.updateParams),
+                            column: this.updateParams.startUser,
                             code: 'prevention-jfdh',
                             application: 'hbt-prevention',
                             processInstanceId: this.updateParams.taskInfo?.processInstanceId,
@@ -677,6 +705,7 @@ export default class IntegralExchange extends BaseRecordComponent<any> {
                         bizId: this.updateParams.id,
                         data: JSON.stringify(this.updateParams),
                         application: 'hbt-prevention',
+                        column: this.updateParams.startUser,
                         processInstanceId: this.updateParams.taskInfo?.processInstanceId,
                         schemeDetailId: this.updateParams.taskInfo?.schemeDetailId,
                         code: 'prevention-jfdh',
@@ -865,8 +894,8 @@ export default class IntegralExchange extends BaseRecordComponent<any> {
     }
 
     //处理任务
-    public rowCallback(el, data) {
+    public rowCallback(el, data, isJumpPage?,mode?) {
-        if (el.target.classList.contains('applicantName')) {
+        if ((el && el.target.classList.contains('applicantName')) || isJumpPage) {
             this.tableService.getListDetail({ id: data.id }).then((res: any) => {
                 if (res.code === 200) {
                     this.updateParams = res.data
@@ -877,7 +906,7 @@ export default class IntegralExchange extends BaseRecordComponent<any> {
                     if (data.status === 2) {
                         this.operate = true
                         this.isApplyReadonly = false
-                        this.isReadonly = true
+                        this.isReadonly = mode !== null ? mode: true
 
                         this.updateParams.approvalUserId = this.account.userId
                         this.updateParams.approvalUserName = this.account.nickName
@@ -888,7 +917,7 @@ export default class IntegralExchange extends BaseRecordComponent<any> {
                     if (data.status === 1) {
                         this.operate = true
                         this.isApplyReadonly = true
-                        this.isReadonly = false
+                        this.isReadonly = mode !== null ? mode:  false
                         this.updateParams.approvalResultName = this.updateParams.approvalResult === 1 ? '同意' : '不同意'
                         this.buildApplyForm()
                     }
@@ -896,7 +925,7 @@ export default class IntegralExchange extends BaseRecordComponent<any> {
                     this.showUpdate = true
                 }
             })
-        } else if (el.target.classList.contains('goodsNumber')) {
+        } else if (el && el.target.classList.contains('goodsNumber')) {
             this.tableService.getListDetail({ id: data.id }).then((res: any) => {
                 this.updateParams = res.data
                 this.updateParams.taskId = data.taskId