Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
6aa50844 by lihua
Options

添加主平台审批状态

1 parent d2a68af8
Inline Side-by-side
Showing 11 changed files with 254 additions and 73 deletions
components.d.ts
...@@ -17,6 +17,7 @@ declare module '@vue/runtime-core' { ...@@ -17,6 +17,7 @@ declare module '@vue/runtime-core' {
17 Copyright: typeof import('./src/components/Copyright/index.vue')['default'] 17 Copyright: typeof import('./src/components/Copyright/index.vue')['default']
18 Day: typeof import('./src/components/Schedule/component/day.vue')['default'] 18 Day: typeof import('./src/components/Schedule/component/day.vue')['default']
19 Dialog: typeof import('./src/components/Dialog/index.vue')['default'] 19 Dialog: typeof import('./src/components/Dialog/index.vue')['default']
20 Dialog_approval: typeof import('./src/components/ApprovalProcess/dialog_approval.vue')['default']
20 Dialog_form: typeof import('./src/components/Dialog/dialog_form.vue')['default'] 21 Dialog_form: typeof import('./src/components/Dialog/dialog_form.vue')['default']
21 Dialog_grid: typeof import('./src/components/Dialog/dialog_grid.vue')['default'] 22 Dialog_grid: typeof import('./src/components/Dialog/dialog_grid.vue')['default']
22 Dialog_pane: typeof import('./src/components/Dialog/dialog_pane.vue')['default'] 23 Dialog_pane: typeof import('./src/components/Dialog/dialog_pane.vue')['default']
......
src/api/modules/workFlowService.ts
...@@ -64,3 +64,17 @@ export const isMyFirstNode = (params) => request({ ...@@ -64,3 +64,17 @@ export const isMyFirstNode = (params) => request({
64 method: 'post', 64 method: 'post',
65 data: params 65 data: params
66 }) 66 })
67
68 /** 获取跨平台审批数据节点详情 */
69 export const getCrossDetailList = (params) => request({
70 url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/approve-detail-cross/list`,
71 method: 'post',
72 data: params
73 })
74
75 /** 重新发起失败的流程 */
76 export const crossPlatformApprove = (params) => request({
77 url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/approve-detail-cross/list`,
78 method: 'post',
79 data: params
80 })
......
src/components/ApprovalProcess/dialog_approval.vue 0 → 100644
1 <script lang="ts" setup name="DialogApproval">
2 import { TableColumnWidth } from '@/utils/enum';
3 import {
4 getCrossDetailList,
5 crossPlatformApprove
6 } from '@/api/modules/workFlowService';
7
8 const { proxy } = getCurrentInstance() as any;
9
10 const emits = defineEmits([
11 "dialogCancel"
12 ]);
13
14 const props = defineProps({
15 visible: {
16 type: Boolean,
17 default: false
18 },
19 currentRowInfo: {
20 type: Object,
21 default: {
22 }
23 }
24 })
25
26 const dialogInfo = ref({
27 visible: false,
28 size: 700,
29 direction: "column",
30 header: {
31 title: "主平台审批节点",
32 },
33 footer: {
34 visible: false
35 }
36 });
37
38 watch(() => props.visible, () => {
39 dialogInfo.value.visible = props.visible;
40 if (props.visible) {
41 tableInfo.value.data = [];
42 tableInfo.value.actionInfo.show = props.currentRowInfo?.crossPlatformApproveState == 'E';
43 gettableList();
44 }
45 }, {
46 immediate: true
47 })
48
49 /** 获取版本信息数据 */
50 const gettableList = () => {
51 tableInfo.value.loading = true;
52 getCrossDetailList({
53 pageIndex: 1,
54 pageSize: -1,
55 bizGuid: props.currentRowInfo.guid
56 }).then((res: any) => {
57 tableInfo.value.loading = false;
58 if (res.code == proxy.$passCode) {
59 const data = res.data || [];
60 tableInfo.value.data = data?.map(d => {
61 d.approveState = d.approveState == null ? undefined : d.approveState;
62 return d;
63 });
64 } else {
65 proxy.$ElMessage.error(res.msg);
66 }
67 })
68 }
69
70 const isReSubmit = ref(false);
71
72 const tableInfo = ref({
73 id: 'approval-table',
74 loading: false,
75 minPanelHeight: "60px",
76 minHeight: "60px",
77 fields: [
78 { label: "序号", type: "index", width: TableColumnWidth.INDEX, align: "center", fixed: "left" },
79 {
80 label: "节点", field: "processName", width: 90
81 },
82 { label: "处理对象", field: "operator", width: TableColumnWidth.USERNAME },
83 { label: "操作时间", field: "operatingTime", width: TableColumnWidth.DATETIME, },
84 {
85 label: "审批状态", field: "approveState", width: 120, type: 'tag', align: 'center'
86 },
87 { label: "审批原因", field: "approveSuggest", width: TableColumnWidth.DESCRIPTION },
88 ],
89 data: [],
90 showPage: false,
91 actionInfo: {
92 show: props.currentRowInfo?.crossPlatformApproveState == 'E',
93 label: "操作",
94 type: "btn",
95 width: 100,
96 btns: [{
97 label: '重新发起',
98 click: (scope) => {
99 tableInfo.value.loading = true;
100 crossPlatformApprove({ approveGuid: props.currentRowInfo.approveVO.approveGuid, guid: props.currentRowInfo.guid }).then((res: any) => {
101 tableInfo.value.loading = false;
102 if (res.code == proxy.$passCode) {
103 proxy.$ElMessage({
104 type: "success",
105 message: '重新发起成功',
106 });
107 isReSubmit.value = true;
108 tableInfo.value.actionInfo.show = false;
109 } else {
110 proxy.$ElMessage({
111 type: "error",
112 message: res.msg,
113 });
114 }
115 })
116 }
117 }]
118 }
119 });
120
121 const handleDialogCancel = () => {
122 dialogInfo.value.visible = false;
123 emits("dialogCancel", isReSubmit.value);
124 }
125
126 </script>
127
128 <template>
129 <el-dialog v-model="dialogInfo.visible" :title="dialogInfo.header.title" width="700" :modal="true"
130 :close-on-click-modal="true" destroy-on-close align-center @close="handleDialogCancel">
131 <Table ref="tableRef" :tableInfo="tableInfo" class="approval-table" />
132 </el-dialog>
133 </template>
134
135 <style lang="scss" scoped>
136 .approval-table {
137 height: 180px !important;
138 }
139
140 :deep(.cusror-inherit) {
141 cursor: inherit;
142 }
143 </style>
...\ No newline at end of file ...\ No newline at end of file
src/components/Table/index.vue
...@@ -291,6 +291,17 @@ onMounted(() => { ...@@ -291,6 +291,17 @@ onMounted(() => {
291 }}</el-tag> 291 }}</el-tag>
292 <span v-else>{{ '--' }}</span> 292 <span v-else>{{ '--' }}</span>
293 </template> 293 </template>
294 <template #default="scope" v-else-if="item.type == 'approveTagBtn'">
295 <div v-if="scope.row[item.field] !== undefined" style="position: relative;">
296 <el-tag :type="tagType(scope.row, item.field)">{{
297 tagMethod(scope.row, item.field)
298 }}</el-tag>
299 <span v-if="item.btn?.visible?.(scope) !== false && item.btn.visible !== false" class="text_btn" style="position: absolute;right: 0;"
300 @click="(item.btn.click && !item.btn.disabled && !scope.row.disabled) ? item.btn.click(scope, item.btn) : handleClick(scope, item.btn)"
301 v-preReClick>{{ item.btn.label }}</span>
302 </div>
303 <span v-else>{{ '--' }}</span>
304 </template>
294 <template #default="scope" v-else-if="item.type == 'popover'"> 305 <template #default="scope" v-else-if="item.type == 'popover'">
295 <el-popover v-if="scope.row[item.field] !== undefined && (item.checkName ? item.checkName(scope) : true)" 306 <el-popover v-if="scope.row[item.field] !== undefined && (item.checkName ? item.checkName(scope) : true)"
296 placement="left-start" :title="props.tableInfo.popoverTitle || '变化'" :width="476" trigger="hover" 307 placement="left-start" :title="props.tableInfo.popoverTitle || '变化'" :width="476" trigger="hover"
......
src/types/components.d.ts
...@@ -17,6 +17,7 @@ declare module '@vue/runtime-core' { ...@@ -17,6 +17,7 @@ declare module '@vue/runtime-core' {
17 Copyright: typeof import('./../components/Copyright/index.vue')['default'] 17 Copyright: typeof import('./../components/Copyright/index.vue')['default']
18 Day: typeof import('./../components/Schedule/component/day.vue')['default'] 18 Day: typeof import('./../components/Schedule/component/day.vue')['default']
19 Dialog: typeof import('./../components/Dialog/index.vue')['default'] 19 Dialog: typeof import('./../components/Dialog/index.vue')['default']
20 Dialog_approval: typeof import('./../components/ApprovalProcess/dialog_approval.vue')['default']
20 Dialog_form: typeof import('./../components/Dialog/dialog_form.vue')['default'] 21 Dialog_form: typeof import('./../components/Dialog/dialog_form.vue')['default']
21 Dialog_grid: typeof import('./../components/Dialog/dialog_grid.vue')['default'] 22 Dialog_grid: typeof import('./../components/Dialog/dialog_grid.vue')['default']
22 Dialog_pane: typeof import('./../components/Dialog/dialog_pane.vue')['default'] 23 Dialog_pane: typeof import('./../components/Dialog/dialog_pane.vue')['default']
......
src/utils/common.ts
...@@ -379,7 +379,7 @@ export const chunk = (arr, size) => { ...@@ -379,7 +379,7 @@ export const chunk = (arr, size) => {
379 } 379 }
380 380
381 // 设置tag样式 381 // 设置tag样式
382 export const tagType = (row, type) => { 382 export const tagType = (row, type): any => {
383 let state = 'info' 383 let state = 'info'
384 if (type == 'connectStatus') { 384 if (type == 'connectStatus') {
385 switch (row[type]) { 385 switch (row[type]) {
...@@ -441,7 +441,7 @@ export const tagType = (row, type) => { ...@@ -441,7 +441,7 @@ export const tagType = (row, type) => {
441 state = 'warning'; 441 state = 'warning';
442 break; 442 break;
443 } 443 }
444 } else if (type == 'approveState') { 444 } else if (type == 'approveState' || type == 'crossPlatformApproveState') {
445 switch (row[type]) { 445 switch (row[type]) {
446 case "N": 446 case "N":
447 state = 'info'; 447 state = 'info';
...@@ -452,6 +452,7 @@ export const tagType = (row, type) => { ...@@ -452,6 +452,7 @@ export const tagType = (row, type) => {
452 case "Y": 452 case "Y":
453 state = 'success' 453 state = 'success'
454 break; 454 break;
455 case "E":
455 case "R": 456 case "R":
456 state = 'danger' 457 state = 'danger'
457 break; 458 break;
...@@ -705,7 +706,7 @@ export const tagMethod = (row, type) => { ...@@ -705,7 +706,7 @@ export const tagMethod = (row, type) => {
705 tag = '待受理' 706 tag = '待受理'
706 break; 707 break;
707 } 708 }
708 } else if (type == 'approveState') { 709 } else if (type == 'approveState' || type == 'crossPlatformApproveState') {
709 switch (row[type]) { 710 switch (row[type]) {
710 case "N": 711 case "N":
711 tag = '草稿中' 712 tag = '草稿中'
...@@ -722,8 +723,11 @@ export const tagMethod = (row, type) => { ...@@ -722,8 +723,11 @@ export const tagMethod = (row, type) => {
722 case "C": 723 case "C":
723 tag = '已撤销' 724 tag = '已撤销'
724 break; 725 break;
726 case "E":
727 tag = '发起失败'
728 break;
725 default: 729 default:
726 tag = '--' 730 tag = type == 'crossPlatformApproveState' ? '未发起' : '--'
727 break; 731 break;
728 } 732 }
729 } else if (type == 'standardType') { 733 } else if (type == 'standardType') {
......
src/views/data_asset/qualityEvaluate.vue
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
6 6
7 import { ref } from 'vue'; 7 import { ref } from 'vue';
8 import TableTools from "@/components/Tools/table_tools.vue"; 8 import TableTools from "@/components/Tools/table_tools.vue";
9 import DialogApproval from '@/components/ApprovalProcess/dialog_approval.vue';
9 import { ElMessage, ElMessageBox } from 'element-plus'; 10 import { ElMessage, ElMessageBox } from 'element-plus';
10 import { 11 import {
11 getQualityEvaList, 12 getQualityEvaList,
...@@ -30,6 +31,17 @@ const { proxy } = getCurrentInstance() as any; ...@@ -30,6 +31,17 @@ const { proxy } = getCurrentInstance() as any;
30 const userStore = useUserStore(); 31 const userStore = useUserStore();
31 const userData = JSON.parse(userStore.userData) 32 const userData = JSON.parse(userStore.userData)
32 33
34 const systemApproveCurrentRowInfo: any = ref({})
35
36 const approvalDialogVisible = ref(false);
37
38 const handleApprovalDialogCancel = (reSubmit) => {
39 approvalDialogVisible.value = false;
40 if (reSubmit) {
41 getTableData();
42 }
43 }
44
33 /** 数据来源于该企业申请登记的数据资产已通过且剔除数据质量评价中已通过、审批中的资产。 */ 45 /** 数据来源于该企业申请登记的数据资产已通过且剔除数据质量评价中已通过、审批中的资产。 */
34 const assetListData: any = ref([]); 46 const assetListData: any = ref([]);
35 47
...@@ -40,6 +52,16 @@ const tableFields = ref([ ...@@ -40,6 +52,16 @@ const tableFields = ref([
40 // { label: "企业名称", field: "tenantName", width: 240, align: "left" }, 52 // { label: "企业名称", field: "tenantName", width: 240, align: "left" },
41 { label: "评估机构", field: "evaluationAgencyName", width: 250, align: "left" }, 53 { label: "评估机构", field: "evaluationAgencyName", width: 250, align: "left" },
42 { label: "审批状态", field: "approveVO", type: "approveTag", width: 96, align: 'center' }, 54 { label: "审批状态", field: "approveVO", type: "approveTag", width: 96, align: 'center' },
55 {
56 label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 150, align: 'center', btn: {
57 label: '查看', visible: (scope) => {
58 return scope.row.crossPlatformApproveState != null;
59 }, click: (scope) => {
60 systemApproveCurrentRowInfo.value = scope.row;
61 approvalDialogVisible.value = true;
62 }
63 }
64 },
43 ]); 65 ]);
44 66
45 const deploymentId = ref(''); 67 const deploymentId = ref('');
...@@ -845,6 +867,8 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -845,6 +867,8 @@ const passCommonDialogBtnClick = (btn, info) => {
845 <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" @inputChange=passDialogInputChange /> 867 <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" @inputChange=passDialogInputChange />
846 <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" /> 868 <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" />
847 <Dialog :dialogInfo="passCommonDialogInfo" @btnClick="passCommonDialogBtnClick" /> 869 <Dialog :dialogInfo="passCommonDialogInfo" @btnClick="passCommonDialogBtnClick" />
870 <DialogApproval :visible="approvalDialogVisible" :currentRowInfo="systemApproveCurrentRowInfo"
871 @dialog-cancel="handleApprovalDialogCancel"></DialogApproval>
848 </div> 872 </div>
849 </template> 873 </template>
850 874
......
src/views/data_asset/registerDetail.vue
...@@ -25,7 +25,7 @@ import { ...@@ -25,7 +25,7 @@ import {
25 } from "@/api/modules/queryService"; 25 } from "@/api/modules/queryService";
26 import { passFlowData, rejectFlowData, revokeFlowData, isMyFirstNode } from "@/api/modules/workFlowService"; 26 import { passFlowData, rejectFlowData, revokeFlowData, isMyFirstNode } from "@/api/modules/workFlowService";
27 import useDataAssetStore from "@/store/modules/dataAsset"; 27 import useDataAssetStore from "@/store/modules/dataAsset";
28 import { changeNum, getDownloadUrl, download } from '@/utils/common'; 28 import { changeNum } from '@/utils/common';
29 import { onUploadFilePreview, onUploadFileDownload } from '@/api/modules/common'; 29 import { onUploadFilePreview, onUploadFileDownload } from '@/api/modules/common';
30 30
31 const assetStore = useDataAssetStore(); 31 const assetStore = useDataAssetStore();
......
src/views/data_asset/registerManagemant.vue
...@@ -7,6 +7,7 @@ import { ref } from 'vue'; ...@@ -7,6 +7,7 @@ import { ref } from 'vue';
7 import TableTools from "@/components/Tools/table_tools.vue"; 7 import TableTools from "@/components/Tools/table_tools.vue";
8 import { ElMessage, ElMessageBox } from 'element-plus'; 8 import { ElMessage, ElMessageBox } from 'element-plus';
9 import { CarouselPanel } from '@/components/CarouselPanel'; 9 import { CarouselPanel } from '@/components/CarouselPanel';
10 import DialogApproval from '@/components/ApprovalProcess/dialog_approval.vue';
10 import { useRouter, useRoute } from "vue-router"; 11 import { useRouter, useRoute } from "vue-router";
11 import { MoreFilled } from "@element-plus/icons-vue"; 12 import { MoreFilled } from "@element-plus/icons-vue";
12 import { changeNum } from "@/utils/common"; 13 import { changeNum } from "@/utils/common";
...@@ -95,13 +96,24 @@ const pageInfo = ref({ ...@@ -95,13 +96,24 @@ const pageInfo = ref({
95 tenantGuid: '', 96 tenantGuid: '',
96 }); 97 });
97 98
99 const systemApproveCurrentRowInfo: any = ref({})
100
101 const approvalDialogVisible = ref(false);
102
103 const handleApprovalDialogCancel = (reSubmit) => {
104 approvalDialogVisible.value = false;
105 if (reSubmit) {
106 getTableData();
107 }
108 }
109
98 const tableFields = ref([{ label: "序号", type: "index", width: 56, align: "center" }, 110 const tableFields = ref([{ label: "序号", type: "index", width: 56, align: "center" },
99 { label: "资产名称", field: "daName", width: 160, align: "left" }, 111 { label: "资产名称", field: "daName", width: 160, align: "left" },
100 { label: "数据分类", field: "dataCategoryName", width: 120, align: "left" }, 112 { label: "数据分类", field: "dataCategoryName", width: 120, align: "left" },
101 { label: "存储方式", field: "storageFormName", width: 120, align: "left" }, 113 { label: "存储方式", field: "storageFormName", width: 120, align: "left" },
102 { label: "数交所名称", field: "exchangeName", width: 160, align: "left" }, 114 { label: "数交所名称", field: "exchangeName", width: 160, align: "left" },
103 { 115 {
104 label: "状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => { 116 label: "审批状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => {
105 const approveVO = scope.row.approveVO || {} 117 const approveVO = scope.row.approveVO || {}
106 switch (approveVO.approveState) { 118 switch (approveVO.approveState) {
107 case 'N': 119 case 'N':
...@@ -133,6 +145,16 @@ const tableFields = ref([{ label: "序号", type: "index", width: 56, align: "ce ...@@ -133,6 +145,16 @@ const tableFields = ref([{ label: "序号", type: "index", width: 56, align: "ce
133 } 145 }
134 } 146 }
135 }, 147 },
148 {
149 label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 170, align: 'center', btn: {
150 label: '查看', visible: (scope) => {
151 return scope.row.crossPlatformApproveState != null;
152 }, click: (scope) => {
153 systemApproveCurrentRowInfo.value = scope.row;
154 approvalDialogVisible.value = true;
155 }
156 }
157 },
136 { label: "修改人", field: "updateUserName", width: 140 }, 158 { label: "修改人", field: "updateUserName", width: 140 },
137 { label: "修改时间", field: "updateTime", width: 180 }]); 159 { label: "修改时间", field: "updateTime", width: 180 }]);
138 160
...@@ -562,6 +584,8 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -562,6 +584,8 @@ const rejectDialogBtnClick = (btn, info) => {
562 </div> 584 </div>
563 <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" /> 585 <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" />
564 <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" /> 586 <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" />
587 <DialogApproval :visible="approvalDialogVisible" :currentRowInfo="systemApproveCurrentRowInfo"
588 @dialog-cancel="handleApprovalDialogCancel"></DialogApproval>
565 </div> 589 </div>
566 </template> 590 </template>
567 591
......
src/views/data_asset/valueEvaluate.vue
...@@ -12,8 +12,6 @@ import { ...@@ -12,8 +12,6 @@ import {
12 saveCostAssess, 12 saveCostAssess,
13 updateCostAssess, 13 updateCostAssess,
14 deleteCostAssess, 14 deleteCostAssess,
15 registerApproveCancel,
16 registerApproveBackup,
17 costAssessAllow 15 costAssessAllow
18 } from "@/api/modules/dataAsset"; 16 } from "@/api/modules/dataAsset";
19 import { 17 import {
...@@ -37,8 +35,6 @@ const isCompanyPlatform = ref(userData.tenantType == 1); ...@@ -37,8 +35,6 @@ const isCompanyPlatform = ref(userData.tenantType == 1);
37 35
38 /** 数据来源于该企业申请登记的数据资产已通过且剔除数据价值评估中已通过、审批中的资产。 */ 36 /** 数据来源于该企业申请登记的数据资产已通过且剔除数据价值评估中已通过、审批中的资产。 */
39 const assetListData: any = ref([]); 37 const assetListData: any = ref([]);
40 /** 会员附件模板 */
41 const attachDataInfo: any = ref({});
42 38
43 const tableFields = ref([ 39 const tableFields = ref([
44 { label: "序号", type: "index", width: 56, align: "center" }, 40 { label: "序号", type: "index", width: 56, align: "center" },
...@@ -47,37 +43,7 @@ const tableFields = ref([ ...@@ -47,37 +43,7 @@ const tableFields = ref([
47 // { label: "企业名称", field: "tenantName", width: 240, align: "left" }, 43 // { label: "企业名称", field: "tenantName", width: 240, align: "left" },
48 { label: "评估机构", field: "evaluationAgencyName", width: 250, align: "left" }, 44 { label: "评估机构", field: "evaluationAgencyName", width: 250, align: "left" },
49 { 45 {
50 label: "审批状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => { 46 label: "审批状态", field: "approveVO", type: "approveTag", width: 96, align: 'center'
51 const approveVO = scope.row.approveVO || {}
52 switch (approveVO.approveState) {
53 case 'N':
54 return '草稿中';
55 case 'A':
56 return '审批中';
57 case 'Y':
58 return '已通过';
59 case 'R':
60 return '已驳回';
61 case 'C':
62 return '已撤销';
63 case 'I':
64 return '--';
65 default:
66 return '草稿中';
67 }
68 }, tagType: (scope) => {
69 const approveVO = scope.row.approveVO || {}
70 switch (approveVO.approveState) {
71 case 'A':
72 return 'warning';
73 case 'Y':
74 return 'success';
75 case 'R':
76 return 'danger';
77 default:
78 return 'info';
79 }
80 }
81 }, 47 },
82 ]); 48 ]);
83 49
......
src/views/data_product/productListing.vue
...@@ -11,7 +11,7 @@ import { ElMessage, ElMessageBox } from "element-plus"; ...@@ -11,7 +11,7 @@ import { ElMessage, ElMessageBox } from "element-plus";
11 import useDataAssetStore from "@/store/modules/dataAsset"; 11 import useDataAssetStore from "@/store/modules/dataAsset";
12 import { getListingList, listingDelete, listingUpdateStatus, getListingCount, productRejectFlowData } from "@/api/modules/dataProduct"; 12 import { getListingList, listingDelete, listingUpdateStatus, getListingCount, productRejectFlowData } from "@/api/modules/dataProduct";
13 import { TableColumnWidth } from '@/utils/enum'; 13 import { TableColumnWidth } from '@/utils/enum';
14 14 import DialogApproval from '@/components/ApprovalProcess/dialog_approval.vue';
15 import TableTools from "@/components/Tools/table_tools.vue"; 15 import TableTools from "@/components/Tools/table_tools.vue";
16 import Table from "@/components/Table/index.vue"; 16 import Table from "@/components/Table/index.vue";
17 import { CarouselPanel } from '@/components/CarouselPanel'; 17 import { CarouselPanel } from '@/components/CarouselPanel';
...@@ -76,6 +76,18 @@ const page = ref({ ...@@ -76,6 +76,18 @@ const page = ref({
76 }); 76 });
77 const searchItemValue: any = ref({}); 77 const searchItemValue: any = ref({});
78 const currTableData: any = ref({}); 78 const currTableData: any = ref({});
79
80 const systemApproveCurrentRowInfo: any = ref({})
81
82 const approvalDialogVisible = ref(false);
83
84 const handleApprovalDialogCancel = (reSubmit) => {
85 approvalDialogVisible.value = false;
86 if (reSubmit) {
87 getTableData();
88 }
89 }
90
79 const tableInfo = ref({ 91 const tableInfo = ref({
80 id: "mapping-table", 92 id: "mapping-table",
81 fields: [ 93 fields: [
...@@ -92,43 +104,23 @@ const tableInfo = ref({ ...@@ -92,43 +104,23 @@ const tableInfo = ref({
92 }, 104 },
93 { label: "上架分类", field: "exchangeName", width: 140 }, 105 { label: "上架分类", field: "exchangeName", width: 140 },
94 { 106 {
95 label: "审核状态", field: "approveState", width: TableColumnWidth.STATE, align: 'center', type: "tag", getName: (scope) => { 107 label: "审批状态", field: "approveVO", type: "approveTag", width: TableColumnWidth.STATE, align: 'center'
96 const approveVO = scope.row.approveVO || {}
97 switch (approveVO.approveState) {
98 case 'N':
99 return '草稿中';
100 case 'A':
101 return '审批中';
102 case 'Y':
103 return '已通过';
104 case 'R':
105 return '已驳回';
106 case 'C':
107 return '已撤销';
108 case 'I':
109 return '--';
110 default:
111 return '草稿中';
112 }
113 }, tagType: (scope) => {
114 const approveVO = scope.row.approveVO || {}
115 switch (approveVO.approveState) {
116 case 'A':
117 return 'warning';
118 case 'Y':
119 return 'success';
120 case 'R':
121 return 'danger';
122 default:
123 return 'info';
124 }
125 }
126 }, 108 },
127 { 109 {
128 label: '上架状态', field: 'listingStatus', width: 100, getName: (scope) => { 110 label: '上架状态', field: 'listingStatus', width: 100, getName: (scope) => {
129 return scope.row.listingStatus == 'Y' ? '已上架' : '未上架'; 111 return scope.row.listingStatus == 'Y' ? '已上架' : '未上架';
130 } 112 }
131 }, 113 },
114 {
115 label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 150, align: 'center', btn: {
116 label: '查看', visible: (scope) => {
117 return scope.row.crossPlatformApproveState != null;
118 }, click: (scope) => {
119 systemApproveCurrentRowInfo.value = scope.row;
120 approvalDialogVisible.value = true;
121 }
122 }
123 },
132 { label: "修改时间", field: "updateTime", width: TableColumnWidth.DATETIME }, 124 { label: "修改时间", field: "updateTime", width: TableColumnWidth.DATETIME },
133 ], 125 ],
134 loading: false, 126 loading: false,
...@@ -995,6 +987,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -995,6 +987,7 @@ const rejectDialogBtnClick = (btn, info) => {
995 </el-dialog> 987 </el-dialog>
996 <Dialog :dialogInfo="passCommonDialogInfo" @btnClick="passCommonDialogBtnClick" /> 988 <Dialog :dialogInfo="passCommonDialogInfo" @btnClick="passCommonDialogBtnClick" />
997 <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" /> 989 <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" />
990 <DialogApproval :visible="approvalDialogVisible" :currentRowInfo="systemApproveCurrentRowInfo" @dialog-cancel="handleApprovalDialogCancel"></DialogApproval>
998 </div> 991 </div>
999 </template> 992 </template>
1000 993
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!