Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
688fa34f by lihua
Options

添加主平台审核状态

1 parent 874a471b
Inline Side-by-side
Showing 11 changed files with 224 additions and 71 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,10 @@ export const isMyFirstNode = (params) => request({ ...@@ -64,3 +64,10 @@ 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 })
......
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 } from '@/api/modules/workFlowService';
6
7 const { proxy } = getCurrentInstance() as any;
8
9 const emits = defineEmits([
10 "dialogCancel"
11 ]);
12
13 const props = defineProps({
14 visible: {
15 type: Boolean,
16 default: false
17 },
18 currentRowInfo: {
19 type: Object,
20 default: {
21 }
22 }
23 })
24
25 const dialogInfo = ref({
26 visible: false,
27 size: 700,
28 direction: "column",
29 header: {
30 title: "主平台审批节点",
31 },
32 footer: {
33 visible: false
34 }
35 });
36
37 watch(() => props.visible, () => {
38 dialogInfo.value.visible = props.visible;
39 if (props.visible) {
40 tableInfo.value.data = [];
41 gettableList();
42 }
43 }, {
44 immediate: true
45 })
46
47 /** 获取版本信息数据 */
48 const gettableList = () => {
49 tableInfo.value.loading = true;
50 getCrossDetailList({
51 pageIndex: 1,
52 pageSize: -1,
53 bizGuid: props.currentRowInfo.guid
54 }).then((res: any) => {
55 tableInfo.value.loading = false;
56 if (res.code == proxy.$passCode) {
57 const data = res.data || [];
58 tableInfo.value.data = data?.map(d => {
59 d.approveState = d.approveState == null ? undefined : d.approveState;
60 return d;
61 });
62 } else {
63 proxy.$ElMessage.error(res.msg);
64 }
65 })
66 }
67
68 const tableInfo = ref({
69 id: 'approval-table',
70 loading: false,
71 minPanelHeight: "60px",
72 minHeight: "60px",
73 fields: [
74 { label: "序号", type: "index", width: TableColumnWidth.INDEX, align: "center", fixed: "left" },
75 {
76 label: "节点", field: "processName", width: 100
77 },
78 { label: "处理对象", field: "operator", width: TableColumnWidth.USERNAME },
79 { label: "操作时间", field: "operatingTime", width: TableColumnWidth.DATETIME, },
80 {
81 label: "审批状态", field: "approveState", width: 120, type: 'tag'
82 },
83 { label: "审批原因", field: "approveSuggest", width: TableColumnWidth.DESCRIPTION },
84 ],
85 data: [],
86 showPage: false,
87 actionInfo: {
88 show: false
89 }
90 });
91
92 const handleDialogCancel = () => {
93 dialogInfo.value.visible = false;
94 emits("dialogCancel");
95 }
96
97 </script>
98
99 <template>
100 <!-- 版本信息 -->
101 <el-dialog v-model="dialogInfo.visible" :title="dialogInfo.header.title" :width="dialogInfo.size" :modal="true"
102 :close-on-click-modal="true" destroy-on-close align-center @close="handleDialogCancel">
103 <Table ref="tableRef" :tableInfo="tableInfo" class="approval-table" />
104 </el-dialog>
105 </template>
106
107 <style lang="scss" scoped>
108 .approval-table {
109 height: 180px !important;
110 }
111
112 :deep(.cusror-inherit) {
113 cursor: inherit;
114 }
115 </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';
...@@ -705,7 +705,7 @@ export const tagMethod = (row, type) => { ...@@ -705,7 +705,7 @@ export const tagMethod = (row, type) => {
705 tag = '待受理' 705 tag = '待受理'
706 break; 706 break;
707 } 707 }
708 } else if (type == 'approveState') { 708 } else if (type == 'approveState' || type == 'crossPlatformApproveState') {
709 switch (row[type]) { 709 switch (row[type]) {
710 case "N": 710 case "N":
711 tag = '草稿中' 711 tag = '草稿中'
...@@ -723,7 +723,7 @@ export const tagMethod = (row, type) => { ...@@ -723,7 +723,7 @@ export const tagMethod = (row, type) => {
723 tag = '已撤销' 723 tag = '已撤销'
724 break; 724 break;
725 default: 725 default:
726 tag = '--' 726 tag = type == 'crossPlatformApproveState' ? '未发起' : '--'
727 break; 727 break;
728 } 728 }
729 } else if (type == 'standardType') { 729 } 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,14 @@ const { proxy } = getCurrentInstance() as any; ...@@ -30,6 +31,14 @@ 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 = () => {
39 approvalDialogVisible.value = false;
40 }
41
33 /** 数据来源于该企业申请登记的数据资产已通过且剔除数据质量评价中已通过、审批中的资产。 */ 42 /** 数据来源于该企业申请登记的数据资产已通过且剔除数据质量评价中已通过、审批中的资产。 */
34 const assetListData: any = ref([]); 43 const assetListData: any = ref([]);
35 44
...@@ -40,6 +49,16 @@ const tableFields = ref([ ...@@ -40,6 +49,16 @@ const tableFields = ref([
40 // { label: "企业名称", field: "tenantName", width: 240, align: "left" }, 49 // { label: "企业名称", field: "tenantName", width: 240, align: "left" },
41 { label: "评估机构", field: "evaluationAgencyName", width: 250, align: "left" }, 50 { label: "评估机构", field: "evaluationAgencyName", width: 250, align: "left" },
42 { label: "审批状态", field: "approveVO", type: "approveTag", width: 96, align: 'center' }, 51 { label: "审批状态", field: "approveVO", type: "approveTag", width: 96, align: 'center' },
52 {
53 label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 150, align: 'center', btn: {
54 label: '查看', visible: (scope) => {
55 return scope.row.crossPlatformApproveState != null;
56 }, click: (scope) => {
57 systemApproveCurrentRowInfo.value = scope.row;
58 approvalDialogVisible.value = true;
59 }
60 }
61 },
43 ]); 62 ]);
44 63
45 const deploymentId = ref(''); 64 const deploymentId = ref('');
...@@ -845,6 +864,8 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -845,6 +864,8 @@ const passCommonDialogBtnClick = (btn, info) => {
845 <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" @inputChange=passDialogInputChange /> 864 <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" @inputChange=passDialogInputChange />
846 <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" /> 865 <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" />
847 <Dialog :dialogInfo="passCommonDialogInfo" @btnClick="passCommonDialogBtnClick" /> 866 <Dialog :dialogInfo="passCommonDialogInfo" @btnClick="passCommonDialogBtnClick" />
867 <DialogApproval :visible="approvalDialogVisible" :currentRowInfo="systemApproveCurrentRowInfo"
868 @dialog-cancel="handleApprovalDialogCancel"></DialogApproval>
848 </div> 869 </div>
849 </template> 870 </template>
850 871
......
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,21 @@ const pageInfo = ref({ ...@@ -95,13 +96,21 @@ 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 = () => {
104 approvalDialogVisible.value = false;
105 }
106
98 const tableFields = ref([{ label: "序号", type: "index", width: 56, align: "center" }, 107 const tableFields = ref([{ label: "序号", type: "index", width: 56, align: "center" },
99 { label: "资产名称", field: "daName", width: 160, align: "left" }, 108 { label: "资产名称", field: "daName", width: 160, align: "left" },
100 { label: "数据分类", field: "dataCategoryName", width: 120, align: "left" }, 109 { label: "数据分类", field: "dataCategoryName", width: 120, align: "left" },
101 { label: "存储方式", field: "storageFormName", width: 120, align: "left" }, 110 { label: "存储方式", field: "storageFormName", width: 120, align: "left" },
102 { label: "数交所名称", field: "exchangeName", width: 160, align: "left" }, 111 { label: "数交所名称", field: "exchangeName", width: 160, align: "left" },
103 { 112 {
104 label: "状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => { 113 label: "审批状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => {
105 const approveVO = scope.row.approveVO || {} 114 const approveVO = scope.row.approveVO || {}
106 switch (approveVO.approveState) { 115 switch (approveVO.approveState) {
107 case 'N': 116 case 'N':
...@@ -133,6 +142,16 @@ const tableFields = ref([{ label: "序号", type: "index", width: 56, align: "ce ...@@ -133,6 +142,16 @@ const tableFields = ref([{ label: "序号", type: "index", width: 56, align: "ce
133 } 142 }
134 } 143 }
135 }, 144 },
145 {
146 label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 150, align: 'center', btn: {
147 label: '查看', visible: (scope) => {
148 return scope.row.crossPlatformApproveState != null;
149 }, click: (scope) => {
150 systemApproveCurrentRowInfo.value = scope.row;
151 approvalDialogVisible.value = true;
152 }
153 }
154 },
136 { label: "修改人", field: "updateUserName", width: 140 }, 155 { label: "修改人", field: "updateUserName", width: 140 },
137 { label: "修改时间", field: "updateTime", width: 180 }]); 156 { label: "修改时间", field: "updateTime", width: 180 }]);
138 157
...@@ -562,6 +581,8 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -562,6 +581,8 @@ const rejectDialogBtnClick = (btn, info) => {
562 </div> 581 </div>
563 <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" /> 582 <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" />
564 <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" /> 583 <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" />
584 <DialogApproval :visible="approvalDialogVisible" :currentRowInfo="systemApproveCurrentRowInfo"
585 @dialog-cancel="handleApprovalDialogCancel"></DialogApproval>
565 </div> 586 </div>
566 </template> 587 </template>
567 588
......
src/views/data_asset/valueEvaluate.vue
...@@ -12,10 +12,9 @@ import { ...@@ -12,10 +12,9 @@ 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";
17 import DialogApproval from '@/components/ApprovalProcess/dialog_approval.vue';
19 import { 18 import {
20 getStaffDetailInfo 19 getStaffDetailInfo
21 } from "@/api/modules/queryService"; 20 } from "@/api/modules/queryService";
...@@ -36,8 +35,14 @@ const isCompanyPlatform = ref(userData.tenantType == 1); ...@@ -36,8 +35,14 @@ const isCompanyPlatform = ref(userData.tenantType == 1);
36 35
37 /** 数据来源于该企业申请登记的数据资产已通过且剔除数据价值评估中已通过、审批中的资产。 */ 36 /** 数据来源于该企业申请登记的数据资产已通过且剔除数据价值评估中已通过、审批中的资产。 */
38 const assetListData: any = ref([]); 37 const assetListData: any = ref([]);
39 /** 会员附件模板 */ 38
40 const attachDataInfo: any = ref({}); 39 const systemApproveCurrentRowInfo: any = ref({})
40
41 const approvalDialogVisible = ref(false);
42
43 const handleApprovalDialogCancel = () => {
44 approvalDialogVisible.value = false;
45 }
41 46
42 const tableFields = ref([ 47 const tableFields = ref([
43 { label: "序号", type: "index", width: 56, align: "center" }, 48 { label: "序号", type: "index", width: 56, align: "center" },
...@@ -46,35 +51,15 @@ const tableFields = ref([ ...@@ -46,35 +51,15 @@ const tableFields = ref([
46 // { label: "企业名称", field: "tenantName", width: 240, align: "left" }, 51 // { label: "企业名称", field: "tenantName", width: 240, align: "left" },
47 { label: "评估机构", field: "evaluationAgencyName", width: 250, align: "left" }, 52 { label: "评估机构", field: "evaluationAgencyName", width: 250, align: "left" },
48 { 53 {
49 label: "审批状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => { 54 label: "审批状态", field: "approveVO", type: "approveTag", width: 96, align: 'center'
50 const approveVO = scope.row.approveVO || {} 55 },
51 switch (approveVO.approveState) { 56 {
52 case 'N': 57 label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 150, align: 'center', btn: {
53 return '草稿中'; 58 label: '查看', visible: (scope) => {
54 case 'A': 59 return scope.row.crossPlatformApproveState != null;
55 return '审批中'; 60 }, click: (scope) => {
56 case 'Y': 61 systemApproveCurrentRowInfo.value = scope.row;
57 return '已通过'; 62 approvalDialogVisible.value = true;
58 case 'R':
59 return '已驳回';
60 case 'C':
61 return '已撤销';
62 case 'I':
63 return '--';
64 default:
65 return '草稿中';
66 }
67 }, tagType: (scope) => {
68 const approveVO = scope.row.approveVO || {}
69 switch (approveVO.approveState) {
70 case 'A':
71 return 'warning';
72 case 'Y':
73 return 'success';
74 case 'R':
75 return 'danger';
76 default:
77 return 'info';
78 } 63 }
79 } 64 }
80 }, 65 },
...@@ -1180,6 +1165,7 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1180,6 +1165,7 @@ const passCommonDialogBtnClick = (btn, info) => {
1180 <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" @inputChange="passDialogInputChange" /> 1165 <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" @inputChange="passDialogInputChange" />
1181 <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" /> 1166 <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" />
1182 <Dialog :dialogInfo="passCommonDialogInfo" @btnClick="passCommonDialogBtnClick" /> 1167 <Dialog :dialogInfo="passCommonDialogInfo" @btnClick="passCommonDialogBtnClick" />
1168 <DialogApproval :visible="approvalDialogVisible" :currentRowInfo="systemApproveCurrentRowInfo" @dialog-cancel="handleApprovalDialogCancel"></DialogApproval>
1183 </div> 1169 </div>
1184 </template> 1170 </template>
1185 1171
......
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,15 @@ const page = ref({ ...@@ -76,6 +76,15 @@ 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 = () => {
85 approvalDialogVisible.value = false;
86 }
87
79 const tableInfo = ref({ 88 const tableInfo = ref({
80 id: "mapping-table", 89 id: "mapping-table",
81 fields: [ 90 fields: [
...@@ -92,43 +101,23 @@ const tableInfo = ref({ ...@@ -92,43 +101,23 @@ const tableInfo = ref({
92 }, 101 },
93 { label: "上架分类", field: "exchangeName", width: 140 }, 102 { label: "上架分类", field: "exchangeName", width: 140 },
94 { 103 {
95 label: "审核状态", field: "approveState", width: TableColumnWidth.STATE, align: 'center', type: "tag", getName: (scope) => { 104 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 }, 105 },
127 { 106 {
128 label: '上架状态', field: 'listingStatus', width: 100, getName: (scope) => { 107 label: '上架状态', field: 'listingStatus', width: 100, getName: (scope) => {
129 return scope.row.listingStatus == 'Y' ? '已上架' : '未上架'; 108 return scope.row.listingStatus == 'Y' ? '已上架' : '未上架';
130 } 109 }
131 }, 110 },
111 {
112 label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 150, align: 'center', btn: {
113 label: '查看', visible: (scope) => {
114 return scope.row.crossPlatformApproveState != null;
115 }, click: (scope) => {
116 systemApproveCurrentRowInfo.value = scope.row;
117 approvalDialogVisible.value = true;
118 }
119 }
120 },
132 { label: "修改时间", field: "updateTime", width: TableColumnWidth.DATETIME }, 121 { label: "修改时间", field: "updateTime", width: TableColumnWidth.DATETIME },
133 ], 122 ],
134 loading: false, 123 loading: false,
...@@ -995,6 +984,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -995,6 +984,7 @@ const rejectDialogBtnClick = (btn, info) => {
995 </el-dialog> 984 </el-dialog>
996 <Dialog :dialogInfo="passCommonDialogInfo" @btnClick="passCommonDialogBtnClick" /> 985 <Dialog :dialogInfo="passCommonDialogInfo" @btnClick="passCommonDialogBtnClick" />
997 <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" /> 986 <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" />
987 <DialogApproval :visible="approvalDialogVisible" :currentRowInfo="systemApproveCurrentRowInfo" @dialog-cancel="handleApprovalDialogCancel"></DialogApproval>
998 </div> 988 </div>
999 </template> 989 </template>
1000 990
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!