Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
a8d3c64e by lihua
Options

连接器审批联调代码

1 parent a2ab5bd3
Expand all
Inline Side-by-side
Showing 10 changed files with 463 additions and 304 deletions
src/api/modules/dataRequire.ts
...@@ -94,7 +94,7 @@ export const getUserTenant = () => request({ ...@@ -94,7 +94,7 @@ export const getUserTenant = () => request({
94 94
95 // 获取企业信息 95 // 获取企业信息
96 export const getEnterpriseData = (params) => request({ 96 export const getEnterpriseData = (params) => request({
97 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/connector-invoke/detail-by-logonUser`, 97 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/detail-by-logonUser`,
98 method: 'get', 98 method: 'get',
99 params 99 params
100 }) 100 })
...@@ -137,7 +137,7 @@ export const deleteConnector = (params) => request({ ...@@ -137,7 +137,7 @@ export const deleteConnector = (params) => request({
137 }) 137 })
138 138
139 export const getConnectorDetail = (guid) => request({ 139 export const getConnectorDetail = (guid) => request({
140 url: `${import.meta.env.VITE_APP_CIRCULATION_PORTAL_URL}/tds-connector-identity/detail?guid=${guid}`, 140 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/tds-connector-identity/detail?guid=${guid}`,
141 method: 'get' 141 method: 'get'
142 }) 142 })
143 143
......
src/api/modules/workFlowService.ts
...@@ -22,7 +22,7 @@ export const rejectFlowData = (params, serviceTenantGuid:any=null) => request({ ...@@ -22,7 +22,7 @@ export const rejectFlowData = (params, serviceTenantGuid:any=null) => request({
22 }) 22 })
23 // 审批撤销 23 // 审批撤销
24 export const revokeFlowData = (params, serviceTenantGuid:any=null) => request({ 24 export const revokeFlowData = (params, serviceTenantGuid:any=null) => request({
25 url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/canal-flow${ serviceTenantGuid ? `?serviceTenantGuid=${serviceTenantGuid}` : '' }`, 25 url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/connector-invoke/data/canal-flow${ serviceTenantGuid ? `?serviceTenantGuid=${serviceTenantGuid}` : '' }`,
26 method: 'post', 26 method: 'post',
27 data: params 27 data: params
28 }) 28 })
......
src/views/data_facilitator/authenticationManagement.vue
...@@ -882,8 +882,8 @@ const getTenant = () => { ...@@ -882,8 +882,8 @@ const getTenant = () => {
882 flowDetail.value = data; 882 flowDetail.value = data;
883 detailGuid.value = data.guid || ''; 883 detailGuid.value = data.guid || '';
884 bizApproveState.value = data.bizApproveState || ''; 884 bizApproveState.value = data.bizApproveState || '';
885 crossPlatformApproveState.value = data.crossPlatformApproveState || ''; 885 // crossPlatformApproveState.value = data.tdsApproveState || '';
886 isEdit.value = (bizApproveState.value == 'Y' || crossPlatformApproveState.value == 'Y' || bizApproveState.value == 'A' || crossPlatformApproveState.value == 'A' || bizApproveState.value == 'B') ? false : true; 886 isEdit.value = (bizApproveState.value == 'Y' || bizApproveState.value == 'E' || crossPlatformApproveState.value == 'Y' || bizApproveState.value == 'A' || crossPlatformApproveState.value == 'A' || bizApproveState.value == 'B') ? false : true;
887 contentFormItems.value[1].disabled = bizApproveState.value == 'Y' || crossPlatformApproveState.value == 'Y' ? true : false; 887 contentFormItems.value[1].disabled = bizApproveState.value == 'Y' || crossPlatformApproveState.value == 'Y' ? true : false;
888 tableData.value = data.changeList || []; 888 tableData.value = data.changeList || [];
889 orgData.value = data.domainRSVOS?.map(d => { 889 orgData.value = data.domainRSVOS?.map(d => {
...@@ -920,7 +920,7 @@ const getTenant = () => { ...@@ -920,7 +920,7 @@ const getTenant = () => {
920 getDataType('机构类型', 'tenantTypeVal'), 920 getDataType('机构类型', 'tenantTypeVal'),
921 getDataType('证件类型', 'juridicalPersonIdType'), 921 getDataType('证件类型', 'juridicalPersonIdType'),
922 getDataType('组织机构性质', 'institutionType'), 922 getDataType('组织机构性质', 'institutionType'),
923 getDeploymentId('10013') 923 // getDeploymentId('10013')
924 ) 924 )
925 if (userData.tenantName != '非认证会员') { 925 if (userData.tenantName != '非认证会员') {
926 getTenantData() 926 getTenantData()
...@@ -959,14 +959,14 @@ const getTenantData = () => { ...@@ -959,14 +959,14 @@ const getTenantData = () => {
959 } 959 }
960 960
961 // 获取流程信息 961 // 获取流程信息
962 const getDeploymentId = (flowType: any) => { 962 // const getDeploymentId = (flowType: any) => {
963 return getCamundaDeploymentId(flowType, userData.tenantGuid, userData.staffGuid).then((res: any) => { 963 // return getCamundaDeploymentId(flowType, userData.tenantGuid, userData.staffGuid).then((res: any) => {
964 if (res.code == proxy.$passCode) { 964 // if (res.code == proxy.$passCode) {
965 } else { 965 // } else {
966 ElMessage.error(res.msg); 966 // ElMessage.error(res.msg);
967 } 967 // }
968 }) 968 // })
969 } 969 // }
970 970
971 const setTableField = () => { 971 const setTableField = () => {
972 tableField.value.splice(2); 972 tableField.value.splice(2);
...@@ -1169,7 +1169,7 @@ const subSave = (params) => { ...@@ -1169,7 +1169,7 @@ const subSave = (params) => {
1169 1169
1170 const changeApprove = (params) => { 1170 const changeApprove = (params) => {
1171 loading.value = true; 1171 loading.value = true;
1172 changeApproveSave(params).then((res: any) => { 1172 enterpriseSave(params).then((res: any) => {
1173 loading.value = false; 1173 loading.value = false;
1174 if (res.code == proxy.$passCode) { 1174 if (res.code == proxy.$passCode) {
1175 ElMessage.success('认证信息变更申请成功'); 1175 ElMessage.success('认证信息变更申请成功');
...@@ -1279,15 +1279,34 @@ const btnClick = async (btn, bType = null) => { ...@@ -1279,15 +1279,34 @@ const btnClick = async (btn, bType = null) => {
1279 } 1279 }
1280 params.attachmentRQVOS = attachmentRQVOS; 1280 params.attachmentRQVOS = attachmentRQVOS;
1281 1281
1282 if (bizApproveState.value == 'Y' && crossPlatformApproveState.value == 'Y') { 1282 if (bizApproveState.value == 'Y') {
1283 let flowParams: any = {}; 1283 params.immediateApprove = true;
1284 flowParams.flowType = '10014'; 1284 params.bizApproveState = 'A';
1285 flowParams.bizGuid = detailGuid.value; 1285 params.isRestart = false;
1286 flowParams.sourceApproveGuid = flowDetail.value.approveVO.approveGuid; 1286 params.isChange = 'Y';
1287 flowParams.bizDataJson = JSON.stringify(params); 1287 loading.value = true;
1288 flowParams.oldBizDataJson = JSON.stringify(flowDetail.value); 1288 enterpriseUpdate(params).then((res: any) => {
1289 flowParams.isDraft = type == 'submit' ? 'N' : 'Y'; 1289 loading.value = false;
1290 changeApprove(flowParams); 1290 if (res.code == proxy.$passCode) {
1291 ElMessage.success('编辑认证信息提交申请成功');
1292 bizApproveState.value = 'A';
1293 setFormDisable();
1294 } else {
1295 ElMessage.error(res.msg);
1296 }
1297 }).catch((xhr) => {
1298 loading.value = false;
1299 ElMessage.error(xhr.response.data.msg);
1300 });
1301 // let flowParams: any = {};
1302
1303 // flowParams.flowType = '10014';
1304 // flowParams.bizGuid = detailGuid.value;
1305 // // flowParams.sourceApproveGuid = flowDetail.value.approveVO.approveGuid;
1306 // flowParams.bizDataJson = JSON.stringify(params);
1307 // flowParams.oldBizDataJson = JSON.stringify(flowDetail.value);
1308 // flowParams.isDraft = type == 'submit' ? 'N' : 'Y';
1309 // changeApprove(flowParams);
1291 } else { 1310 } else {
1292 if (type == 'submit') { 1311 if (type == 'submit') {
1293 params.immediateApprove = true; 1312 params.immediateApprove = true;
...@@ -1337,7 +1356,7 @@ const btnClick = async (btn, bType = null) => { ...@@ -1337,7 +1356,7 @@ const btnClick = async (btn, bType = null) => {
1337 }); 1356 });
1338 } else if (type == 'cancel') { 1357 } else if (type == 'cancel') {
1339 setFormItems(); 1358 setFormItems();
1340 if (bizApproveState.value == 'Y' && crossPlatformApproveState.value == 'Y') { 1359 if (bizApproveState.value == 'Y') {
1341 setFormDisable(); 1360 setFormDisable();
1342 } 1361 }
1343 } else if (type == 'change') { 1362 } else if (type == 'change') {
...@@ -1613,8 +1632,8 @@ const viewVoucherFile = () => { ...@@ -1613,8 +1632,8 @@ const viewVoucherFile = () => {
1613 <div class="empty_tips" v-else>暂无变更信息</div> 1632 <div class="empty_tips" v-else>暂无变更信息</div>
1614 </div> 1633 </div>
1615 </ContentWrap> 1634 </ContentWrap>
1616 <ContentWrap title="认证结果信息" v-if="bizApproveState == 'Y' && crossPlatformApproveState == 'Y' && !isEdit" expandSwicth style="margin-top: 15px" :isExpand="expandResult" 1635 <ContentWrap title="认证结果信息" v-if="bizApproveState == 'Y' && !isEdit" expandSwicth style="margin-top: 15px"
1617 @expand="(v) => expandResult = v"> 1636 :isExpand="expandResult" @expand="(v) => expandResult = v">
1618 <div class="list_panel"> 1637 <div class="list_panel">
1619 <div class="list_item"> 1638 <div class="list_item">
1620 <span class="item_label">认证时间：</span> 1639 <span class="item_label">认证时间：</span>
...@@ -1641,7 +1660,7 @@ const viewVoucherFile = () => { ...@@ -1641,7 +1660,7 @@ const viewVoucherFile = () => {
1641 @click="btnClick({ value: 'save' })">保存</el-button> --> 1660 @click="btnClick({ value: 'save' })">保存</el-button> -->
1642 <el-button type="primary" @click="btnClick({ value: 'submit' })">提交</el-button> 1661 <el-button type="primary" @click="btnClick({ value: 'submit' })">提交</el-button>
1643 </div> 1662 </div>
1644 <div class="btns" v-else-if="bizApproveState == 'Y' && crossPlatformApproveState == 'Y' && !isEdit"> 1663 <div class="btns" v-else-if="bizApproveState == 'Y' && !isEdit">
1645 <el-button type="primary" @click="btnClick({ value: 'change' })">变更认证</el-button> 1664 <el-button type="primary" @click="btnClick({ value: 'change' })">变更认证</el-button>
1646 </div> 1665 </div>
1647 </div> 1666 </div>
......
src/views/data_facilitator/certificationAudit.vue
...@@ -7,7 +7,7 @@ import { ref } from 'vue'; ...@@ -7,7 +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 { getParamsList } from "@/api/modules/queryService"; 9 import { getParamsList } from "@/api/modules/queryService";
10 import { getTaskGressList, getTaskRestart, getTaskExecutionLog, getFlowEnterpriseList, enterpriseDelete, enterpriseChangeDelete } from "@/api/modules/dataRequire"; 10 import { getTaskGressList, getTaskRestart, getTaskExecutionLog, getEnterpriseList, enterpriseDelete, enterpriseChangeDelete } from "@/api/modules/dataRequire";
11 import { passFlowData, rejectFlowData, myLastNode } from "@/api/modules/workFlowService"; 11 import { passFlowData, rejectFlowData, myLastNode } from "@/api/modules/workFlowService";
12 import useDataAssetStore from "@/store/modules/dataAsset"; 12 import useDataAssetStore from "@/store/modules/dataAsset";
13 import Moment from "moment"; 13 import Moment from "moment";
...@@ -67,69 +67,79 @@ const handleApprovalDialogCancel = () => { ...@@ -67,69 +67,79 @@ const handleApprovalDialogCancel = () => {
67 67
68 const tableFields: any = ref([ 68 const tableFields: any = ref([
69 { label: "序号", type: "index", width: 56, align: "center" }, 69 { label: "序号", type: "index", width: 56, align: "center" },
70 { label: "企业名称", field: "param1", width: 200, }, 70 { label: "企业名称", field: "tenantName", width: 200, },
71 { label: "统一社会信用代码", field: "param3", width: 160 },
72 { 71 {
73 label: "法人姓名", field: "juridicalPerson", width: TableColumnWidth.USERNAME, getName: (scope) => { 72 label: "机构类型", field: "tenantType", width: 120, getName: (scope) => {
74 const param4 = scope.row.param4 || ''; 73 const datas = typeMap.value?.tenantType;
75 return param4 ? param4.split('_')[0] : '--' 74 return datas?.find((item) => item.value == scope.row.tenantType)?.label || '--';
76 } 75 }
77 }, 76 },
77 { label: "统一社会信用代码", field: "socialCreditCode", width: 160 },
78 { 78 {
79 label: "管理员姓名", field: "contacts", width: TableColumnWidth.USERNAME, getName: (scope) => { 79 label: "法人姓名", field: "juridicalPerson", width: TableColumnWidth.USERNAME,
80 const param4 = scope.row.param4 || ''; 80 // getName: (scope) => {
81 return param4 ? param4.split('_')[1] : '--' 81 // const param4 = scope.row.param4 || '';
82 } 82 // return param4 ? param4.split('_')[0] : '--'
83 // }
83 }, 84 },
84 { 85 {
85 label: "管理员手机号", field: "contactTel", width: 120, getName: (scope) => { 86 label: "管理员姓名", field: "contacts", width: TableColumnWidth.USERNAME,
86 const param4 = scope.row.param4 || ''; 87 // getName: (scope) => {
87 return param4 ? param4.split('_')[2] : '--' 88 // const param4 = scope.row.param4 || '';
88 } 89 // return param4 ? param4.split('_')[1] : '--'
90 // }
89 }, 91 },
90 { 92 {
91 label: "审批状态", field: "bizApproveState", type: "tag", width: TableColumnWidth.STATE, align: 'center', getName: (scope) => { 93 label: "管理员手机号", field: "contactTel", width: 120,
92 const approveState = scope.row.bizApproveState 94 // getName: (scope) => {
93 switch (approveState) { 95 // const param4 = scope.row.param4 || '';
94 case 'N': 96 // return param4 ? param4.split('_')[2] : '--'
95 return '草稿中'; 97 // }
96 case 'A':
97 return '审批中';
98 case 'Y':
99 return '已通过';
100 case 'R':
101 return '已驳回';
102 case 'C':
103 return '已撤销';
104 case 'D':
105 return '已废弃';
106 default:
107 return '--';
108 }
109 }, tagType: (scope) => {
110 const approveState = scope.row.bizApproveState
111 switch (approveState) {
112 case 'A':
113 return 'warning';
114 case 'Y':
115 return 'success';
116 case 'R':
117 return 'danger';
118 default:
119 return 'info';
120 }
121 }
122 }, 98 },
123 { 99 {
124 label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 150, align: 'center', btn: { 100 label: "审批状态", field: "bizApproveState", type: "tag", width: TableColumnWidth.STATE, align: 'center',
125 label: '查看', visible: (scope) => { 101 // getName: (scope) => {
126 return scope.row.crossPlatformApproveState != null; 102 // const approveState = scope.row.bizApproveState
127 }, click: (scope) => { 103 // switch (approveState) {
128 systemApproveCurrentRowInfo.value = scope.row; 104 // case 'N':
129 approvalDialogVisible.value = true; 105 // return '草稿中';
130 } 106 // case 'A':
131 } 107 // return '审批中';
108 // case 'Y':
109 // return '已通过';
110 // case 'R':
111 // return '已驳回';
112 // case 'C':
113 // return '已撤销';
114 // case 'D':
115 // return '已废弃';
116 // default:
117 // return '--';
118 // }
119 // }, tagType: (scope) => {
120 // const approveState = scope.row.bizApproveState
121 // switch (approveState) {
122 // case 'A':
123 // return 'warning';
124 // case 'Y':
125 // return 'success';
126 // case 'R':
127 // return 'danger';
128 // default:
129 // return 'info';
130 // }
131 // }
132 }, 132 },
133 // {
134 // label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 150, align: 'center', btn: {
135 // label: '查看', visible: (scope) => {
136 // return scope.row.crossPlatformApproveState != null;
137 // }, click: (scope) => {
138 // systemApproveCurrentRowInfo.value = scope.row;
139 // approvalDialogVisible.value = true;
140 // }
141 // }
142 // },
133 { 143 {
134 label: "提交时间", field: "createTime", width: TableColumnWidth.DATETIME, getName: (scope) => { 144 label: "提交时间", field: "createTime", width: TableColumnWidth.DATETIME, getName: (scope) => {
135 return scope.row.createTime ? Moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '--'; 145 return scope.row.createTime ? Moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '--';
...@@ -166,7 +176,7 @@ const tableInfo = ref({ ...@@ -166,7 +176,7 @@ const tableInfo = ref({
166 actionInfo: { 176 actionInfo: {
167 label: "操作", 177 label: "操作",
168 type: "btn", 178 type: "btn",
169 width: 180, 179 width: 170,
170 btns: (scope) => { 180 btns: (scope) => {
171 let row = scope.row; 181 let row = scope.row;
172 return getTableBtns(row); 182 return getTableBtns(row);
...@@ -176,34 +186,36 @@ const tableInfo = ref({ ...@@ -176,34 +186,36 @@ const tableInfo = ref({
176 186
177 const getTableBtns = (row, includeDetail = true) => { 187 const getTableBtns = (row, includeDetail = true) => {
178 let btnsArr: any[] = []; 188 let btnsArr: any[] = [];
179 const currentStaffGuid = userData.staffGuid; 189 const currentStaffGuid = userData.userGuid
180 const approveState = row.bizApproveState || 'N'; 190 const approveState = row.approveState;
181 const approveStaffGuids = row.approveStaffGuids || []; 191 const staffGuid = row.createUserId || '';
182 const staffGuid = row.staffGuid || '';
183 let flowState; 192 let flowState;
184 if (approveState == 'N' && staffGuid == currentStaffGuid) { 193 if (approveState == 'N' && staffGuid == currentStaffGuid) {
185 flowState = 1; 194 flowState = 1;
186 } 195 }
187 if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) { 196 // if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) {
188 flowState = 2; 197 // flowState = 2;
189 } 198 // }
190 if ((approveState == 'C' || approveState == 'R') && staffGuid == currentStaffGuid) { 199 if ((approveState == 'C' || approveState == 'R') && staffGuid == currentStaffGuid) {
191 flowState = 3; 200 flowState = 3;
192 } 201 }
193 if (row.flowType == '10013' && approveState == 'Y') { 202 // if (row.flowType == '10013' && approveState == 'Y') {
194 flowState = 4; 203 // flowState = 4;
195 } 204 // }
196 205
197 btnsArr.push({ label: "详情", value: "detail" }) 206 btnsArr.push({ label: "详情", value: "detail" })
198 if (flowState === 1) { 207 if (flowState === 1) {
199 btnsArr.push({ label: "删除", value: "delete" }) 208 btnsArr.push({ label: "删除", value: "delete" })
200 } else if (flowState === 2) { 209 }
201 btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }]) 210 // else if (flowState === 2) {
202 } else if (flowState === 3) { 211 // btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }])
212 // }
213 else if (flowState === 3) {
203 btnsArr.push({ label: "删除", value: "delete" }) 214 btnsArr.push({ label: "删除", value: "delete" })
204 } else if (flowState === 4) {
205 btnsArr.push({ label: "查看进度", value: "progress" })
206 } 215 }
216 // else if (flowState === 4) {
217 // btnsArr.push({ label: "查看进度", value: "progress" })
218 // }
207 return btnsArr 219 return btnsArr
208 } 220 }
209 221
...@@ -214,7 +226,7 @@ const getTableBtns = (row, includeDetail = true) => { ...@@ -214,7 +226,7 @@ const getTableBtns = (row, includeDetail = true) => {
214 const promiseList = async (...promises: Promise<void>[]) => { 226 const promiseList = async (...promises: Promise<void>[]) => {
215 try { 227 try {
216 await Promise.all(promises).then((res) => { 228 await Promise.all(promises).then((res) => {
217 setTableField(); 229 // setTableField();
218 }); 230 });
219 } catch (e) { 231 } catch (e) {
220 loading.value = false; 232 loading.value = false;
...@@ -235,15 +247,6 @@ const getDataType = (dictType, fieldName) => { ...@@ -235,15 +247,6 @@ const getDataType = (dictType, fieldName) => {
235 }) 247 })
236 } 248 }
237 249
238 const setTableField = () => {
239 tableFields.value.splice(2, 0, {
240 label: "机构类型", field: "tenantType", width: 120, getName: (scope) => {
241 const datas = typeMap.value.tenantType;
242 return datas.find((item) => item.value == scope.row.param2)?.label || '--';
243 }
244 });
245 }
246
247 const toSearch = (val: any, clear: boolean = false) => { 250 const toSearch = (val: any, clear: boolean = false) => {
248 page.value.curr = 1; 251 page.value.curr = 1;
249 if (clear) { 252 if (clear) {
...@@ -261,11 +264,11 @@ const toSearch = (val: any, clear: boolean = false) => { ...@@ -261,11 +264,11 @@ const toSearch = (val: any, clear: boolean = false) => {
261 264
262 const getTableData = () => { 265 const getTableData = () => {
263 tableInfo.value.loading = true; 266 tableInfo.value.loading = true;
264 getFlowEnterpriseList({ 267 getEnterpriseList({
265 pageSize: page.value.limit, 268 pageSize: page.value.limit,
266 pageIndex: page.value.curr, 269 pageIndex: page.value.curr,
267 param1Like: page.value.tenantName, 270 tenantName: page.value.tenantName,
268 param2: page.value.tenantType, 271 tenantType: page.value.tenantType,
269 flowTypeList: ["10013", "10014"], 272 flowTypeList: ["10013", "10014"],
270 tenantGuid: userData.tenantGuid, 273 tenantGuid: userData.tenantGuid,
271 staffGuid: userData.staffGuid, 274 staffGuid: userData.staffGuid,
...@@ -292,7 +295,7 @@ const tableBtnClick = (scope, btn) => { ...@@ -292,7 +295,7 @@ const tableBtnClick = (scope, btn) => {
292 if (type === 'detail') { // 详情 295 if (type === 'detail') { // 详情
293 router.push({ 296 router.push({
294 name: 'certificationAuditDetail', 297 name: 'certificationAuditDetail',
295 query: { guid: row.flowType == '10014' ? row.objectGuid : row.bizGuid, name: row.param1, tName: row.tenantName, fType: row.flowType, bizGuid: row.bizGuid, type } 298 query: { guid: row.guid, name: row.tenantName, tName: row.tenantName, fType: row.flowType, type }
296 }); 299 });
297 } else if (type == "delete") { 300 } else if (type == "delete") {
298 delTableOpen("此操作将永久删除该认证信息，是否继续?", "warning"); 301 delTableOpen("此操作将永久删除该认证信息，是否继续?", "warning");
......
src/views/data_facilitator/certificationAuditDetail.vue
...@@ -27,7 +27,7 @@ const detailType = route.query.type; ...@@ -27,7 +27,7 @@ const detailType = route.query.type;
27 const tName = route.query.tName; 27 const tName = route.query.tName;
28 const fType = route.query.fType; 28 const fType = route.query.fType;
29 29
30 const bizGuid = route.query.bizGuid; 30 const bizGuid = route.query.guid;
31 const loading = ref(false); 31 const loading = ref(false);
32 const flowDetail: any = ref({}); 32 const flowDetail: any = ref({});
33 const approveState = ref(''); 33 const approveState = ref('');
...@@ -1130,12 +1130,27 @@ onActivated(() => { ...@@ -1130,12 +1130,27 @@ onActivated(() => {
1130 } 1130 }
1131 }) 1131 })
1132 1132
1133 const getIndustryParamsList = () => {
1134 return getParamsList({ dictType: '行业分类' }).then((res: any) => {
1135 if (res?.code == proxy.$passCode) {
1136 industryList.value = res.data || [];
1137 let index = contentFormItems.value.findIndex(item => item.field == 'industry');
1138 let item = contentFormItems.value[index];
1139 item.options = industryList.value;
1140 contentFormItems.value[index + 1].options = !item.default ? [] : industryList.value.find(i => i.value == item.default)?.childDictList || [];
1141 } else {
1142 res?.msg && proxy.$ElMessage.error(res?.msg);
1143 }
1144 })
1145 }
1146
1133 onBeforeMount(() => { 1147 onBeforeMount(() => {
1134 if (fType == '10014') { 1148 if (fType == '10014') {
1135 promiseList( 1149 promiseList(
1136 () => getDataType('机构类型', 'tenantType'), 1150 () => getDataType('机构类型', 'tenantType'),
1137 () => getDataType('证件类型', 'juridicalPersonIdType'), 1151 () => getDataType('证件类型', 'juridicalPersonIdType'),
1138 () => getDataType('组织机构性质', 'institutionType'), 1152 () => getDataType('组织机构性质', 'institutionType'),
1153 () => getIndustryParamsList(),
1139 () => getDetail(), 1154 () => getDetail(),
1140 () => getChangeDetail() 1155 () => getChangeDetail()
1141 ) 1156 )
...@@ -1144,20 +1159,10 @@ onBeforeMount(() => { ...@@ -1144,20 +1159,10 @@ onBeforeMount(() => {
1144 () => getDataType('机构类型', 'tenantType'), 1159 () => getDataType('机构类型', 'tenantType'),
1145 () => getDataType('证件类型', 'juridicalPersonIdType'), 1160 () => getDataType('证件类型', 'juridicalPersonIdType'),
1146 () => getDataType('组织机构性质', 'institutionType'), 1161 () => getDataType('组织机构性质', 'institutionType'),
1162 () => getIndustryParamsList(),
1147 () => getDetail(), 1163 () => getDetail(),
1148 ) 1164 )
1149 } 1165 }
1150 getParamsList({ dictType: '行业分类' }).then((res: any) => {
1151 if (res?.code == proxy.$passCode) {
1152 industryList.value = res.data || [];
1153 let index = contentFormItems.value.findIndex(item => item.field == 'industry');
1154 let item = contentFormItems.value[index];
1155 item.options = industryList.value;
1156 contentFormItems.value[index + 1].options = !item.default ? [] : industryList.value.find(i => i.value == item.default)?.childDictList || [];
1157 } else {
1158 res?.msg && proxy.$ElMessage.error(res?.msg);
1159 }
1160 })
1161 }) 1166 })
1162 1167
1163 const orgTableRef = ref(); 1168 const orgTableRef = ref();
...@@ -1214,21 +1219,54 @@ const viewVoucherFile = () => { ...@@ -1214,21 +1219,54 @@ const viewVoucherFile = () => {
1214 <template> 1219 <template>
1215 <div class="container_wrap full" v-loading="loading"> 1220 <div class="container_wrap full" v-loading="loading">
1216 <div class="content_main panel"> 1221 <div class="content_main panel">
1217 <div 1222 <div v-if="detailType == 'detail' && flowDetail.bizApproveState"
1218 v-if="detailType == 'detail' && (flowDetail.crossPlatformApproveState == 'R' || flowDetail.crossPlatformApproveState == 'E')" 1223 :class="['panel_wrap', 'results_panel', flowDetail.bizApproveState == 'Y' ? 'success' : ((flowDetail.bizApproveState == 'R' || flowDetail.bizApproveState == 'E') ? 'reject' : (flowDetail.bizApproveState == 'C' ? 'revoke' : 'audit'))]">
1219 :class="['panel_wrap', 'results_panel', 'reject']">
1220 <div class="panel_header"> 1224 <div class="panel_header">
1221 <div class="header_title" v-if="flowDetail.crossPlatformApproveState == 'R'"> 1225 <div class="header_title" v-if="flowDetail.bizApproveState == 'Y'">
1226 <el-icon class="title-icon">
1227 <svg-icon name="icon-success" />
1228 </el-icon>
1229 <span class="title_text">审批通过</span>
1230 </div>
1231 <div class="header_title" v-else-if="flowDetail.bizApproveState == 'R'">
1222 <el-icon class="title-icon"> 1232 <el-icon class="title-icon">
1223 <CircleCloseFilled /> 1233 <CircleCloseFilled />
1224 </el-icon> 1234 </el-icon>
1225 <span class="title_text">主平台审批已驳回，请在列表页面查看具体驳回原因</span> 1235 <span class="title_text">审批被驳回</span>
1226 </div> 1236 </div>
1227 <div class="header_title" v-else-if="flowDetail.crossPlatformApproveState == 'E'"> 1237 <div class="header_title" v-else-if="flowDetail.bizApproveState == 'E'">
1228 <el-icon class="title-icon"> 1238 <el-icon class="title-icon">
1229 <CircleCloseFilled /> 1239 <CircleCloseFilled />
1230 </el-icon> 1240 </el-icon>
1231 <span class="title_text">主平台审批发起失败，请在列表页面查看具体发起失败原因</span> 1241 <span class="title_text">审批发起失败</span>
1242 </div>
1243 <div class="header_title" v-else-if="flowDetail.bizApproveState == 'A'">
1244 <el-icon class="title-icon">
1245 <svg-icon name="icon-audit" />
1246 </el-icon>
1247 <span class="title_text">审批中</span>
1248 </div>
1249 <div class="header_title" v-else-if="flowDetail.bizApproveState == 'C'">
1250 <el-icon class="title-icon">
1251 <svg-icon name="icon-revoke" />
1252 </el-icon>
1253 <span class="title_text">已撤销</span>
1254 </div>
1255 </div>
1256 <div class="panel_body" v-if="flowDetail.bizApproveState == 'R'" style="padding: 0px 16px 10px;">
1257 <div class="results_list">
1258 <div class="list_item">
1259 <span class="item_label">审批意见：</span>
1260 <span class="item_value">{{ flowDetail?.tdsApproveSuggest || '--' }}</span>
1261 </div>
1262 </div>
1263 </div>
1264 <div class="panel_body" v-if="flowDetail.bizApproveState == 'E'" style="padding: 0px 16px 10px;">
1265 <div class="results_list">
1266 <div class="list_item">
1267 <span class="item_label">失败原因:</span>
1268 <span class="item_value">{{ flowDetail?.tdsApproveErrorMsg || '--' }}</span>
1269 </div>
1232 </div> 1270 </div>
1233 </div> 1271 </div>
1234 </div> 1272 </div>
...@@ -1284,8 +1322,8 @@ const viewVoucherFile = () => { ...@@ -1284,8 +1322,8 @@ const viewVoucherFile = () => {
1284 <div class="empty_tips" v-else>暂无变更信息</div> 1322 <div class="empty_tips" v-else>暂无变更信息</div>
1285 </div> 1323 </div>
1286 </ContentWrap> 1324 </ContentWrap>
1287 <ContentWrap title="认证结果信息" v-if="approveState == 'Y'" expandSwicth style="margin-top: 15px" :isExpand="expandResult" 1325 <ContentWrap title="认证结果信息" v-if="approveState == 'Y'" expandSwicth style="margin-top: 15px"
1288 @expand="(v) => expandResult = v"> 1326 :isExpand="expandResult" @expand="(v) => expandResult = v">
1289 <div class="list_panel"> 1327 <div class="list_panel">
1290 <div class="list_item"> 1328 <div class="list_item">
1291 <span class="item_label">认证时间：</span> 1329 <span class="item_label">认证时间：</span>
...@@ -1298,21 +1336,21 @@ const viewVoucherFile = () => { ...@@ -1298,21 +1336,21 @@ const viewVoucherFile = () => {
1298 </div> 1336 </div>
1299 </div> 1337 </div>
1300 </ContentWrap> 1338 </ContentWrap>
1301 <ContentWrap id="id-approveInfo" title="审核信息" expandSwicth style="margin-top: 15px" :isExpand="expand6" 1339 <!-- <ContentWrap id="id-approveInfo" title="审核信息" expandSwicth style="margin-top: 15px" :isExpand="expand6"
1302 @expand="(v) => expand6 = v"> 1340 @expand="(v) => expand6 = v">
1303 <ApprovalProcess ref="approvalProcessRef" v-if="deploymentId" :deploymentId="deploymentId" 1341 <ApprovalProcess ref="approvalProcessRef" v-if="deploymentId" :deploymentId="deploymentId"
1304 :processInstanceId="processInstanceId"> 1342 :processInstanceId="processInstanceId">
1305 </ApprovalProcess> 1343 </ApprovalProcess>
1306 </ContentWrap> 1344 </ContentWrap> -->
1307 </div> 1345 </div>
1308 <div class="tool_btns"> 1346 <div class="tool_btns">
1309 <div class="btns"> 1347 <div class="btns">
1310 <el-button @click="btnClick({ value: 'cancel' })" v-if="detailType == 'detail'">关闭</el-button> 1348 <el-button @click="btnClick({ value: 'cancel' })" v-if="detailType == 'detail'">关闭</el-button>
1311 <el-button @click="btnClick({ value: 'cancel' })" v-else>取消</el-button> 1349 <!-- <el-button @click="btnClick({ value: 'cancel' })" v-else>取消</el-button>
1312 <el-button type="primary" @click="btnClick({ value: 'pass' })" 1350 <el-button type="primary" @click="btnClick({ value: 'pass' })"
1313 v-if="approveState == 'A' && flowState == 2">通过</el-button> 1351 v-if="approveState == 'A' && flowState == 2">通过</el-button>
1314 <el-button type="danger" plain @click="btnClick({ value: 'reject' })" 1352 <el-button type="danger" plain @click="btnClick({ value: 'reject' })"
1315 v-if="approveState == 'A' && flowState == 2">驳回</el-button> 1353 v-if="approveState == 'A' && flowState == 2">驳回</el-button> -->
1316 </div> 1354 </div>
1317 </div> 1355 </div>
1318 <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" /> 1356 <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" />
...@@ -1493,6 +1531,19 @@ const viewVoucherFile = () => { ...@@ -1493,6 +1531,19 @@ const viewVoucherFile = () => {
1493 } 1531 }
1494 } 1532 }
1495 1533
1534 &.success {
1535 background-color: #F4FEF6;
1536 box-shadow: 0 0 0 1px #4FA55D;
1537
1538 .panel_header {
1539 .header_title {
1540 .el-icon {
1541 color: #4FA55D;
1542 }
1543 }
1544 }
1545 }
1546
1496 &.reject { 1547 &.reject {
1497 background-color: #FDF2F4; 1548 background-color: #FDF2F4;
1498 box-shadow: 0 0 0 1px #E63E33; 1549 box-shadow: 0 0 0 1px #E63E33;
...@@ -1505,6 +1556,32 @@ const viewVoucherFile = () => { ...@@ -1505,6 +1556,32 @@ const viewVoucherFile = () => {
1505 } 1556 }
1506 } 1557 }
1507 } 1558 }
1559
1560 &.audit {
1561 background-color: #FEFBF3;
1562 box-shadow: 0 0 0 1px #F19E40;
1563
1564 .panel_header {
1565 .header_title {
1566 .el-icon {
1567 color: #F19E40;
1568 }
1569 }
1570 }
1571 }
1572
1573 &.revoke {
1574 background-color: #F5F5F5;
1575 box-shadow: 0 0 0 1px #CCCCCC;
1576
1577 .panel_header {
1578 .header_title {
1579 .el-icon {
1580 color: #666666;
1581 }
1582 }
1583 }
1584 }
1508 } 1585 }
1509 } 1586 }
1510 1587
......
src/views/data_facilitator/settleDetail.vue
...@@ -37,14 +37,13 @@ const toolBtns: any = computed(() => { ...@@ -37,14 +37,13 @@ const toolBtns: any = computed(() => {
37 let btnsArr: any = [{ 37 let btnsArr: any = [{
38 label: "关闭", value: "cancel", plain: true 38 label: "关闭", value: "cancel", plain: true
39 }]; 39 }];
40 let approveVO = flowDetail.value.approveVO; 40 let staffGuid = userData.userGuid;
41 let staffGuid = userData.staffGuid; 41 // if (approveVO && approveVO.approveState == 'A' && approveVO.approveStaffGuids && approveVO.approveStaffGuids.indexOf(staffGuid) > -1) {
42 if (approveVO && approveVO.approveState == 'A' && approveVO.approveStaffGuids && approveVO.approveStaffGuids.indexOf(staffGuid) > -1) { 42 // btnsArr.push(...[{ label: "通过", value: "pass", type: 'primary' }, { label: "驳回", value: "reject", type: 'danger', plain: true }]);
43 btnsArr.push(...[{ label: "通过", value: "pass", type: 'primary' }, { label: "驳回", value: "reject", type: 'danger', plain: true }]); 43 // }
44 } 44 // if (flowDetail.value.approveState == 'A' && flowDetail.value.createUserId == staffGuid) {
45 if (approveVO && approveVO.approveState == 'A' && approveVO.staffGuid == staffGuid) { 45 // btnsArr.push({ label: "撤销", value: "revoke" });
46 btnsArr.push({ label: "撤销", value: "revoke" }); 46 // }
47 }
48 return btnsArr; 47 return btnsArr;
49 }); 48 });
50 49
...@@ -257,8 +256,8 @@ const getDetail = () => { ...@@ -257,8 +256,8 @@ const getDetail = () => {
257 if (res?.code == proxy.$passCode) { 256 if (res?.code == proxy.$passCode) {
258 flowDetail.value = res.data || {}; 257 flowDetail.value = res.data || {};
259 flowDetail.value.accessMethodName = assessMethodList.find(a => a.value == flowDetail.value.accessMethod)?.label; 258 flowDetail.value.accessMethodName = assessMethodList.find(a => a.value == flowDetail.value.accessMethod)?.label;
260 deploymentId.value = res.data.approveVO.camundaDeploymentId 259 // deploymentId.value = res.data.approveVO.camundaDeploymentId
261 processInstanceId.value = res.data.approveVO.camundaInstanceId 260 // processInstanceId.value = res.data.approveVO.camundaInstanceId
262 flowDetail.value.tdsConnectorVerifiable.thirdPartyCertification = []; 261 flowDetail.value.tdsConnectorVerifiable.thirdPartyCertification = [];
263 } else { 262 } else {
264 proxy.$ElMessage.error(res.msg); 263 proxy.$ElMessage.error(res.msg);
...@@ -291,20 +290,54 @@ const fileKeyNames = ref({ ...@@ -291,20 +290,54 @@ const fileKeyNames = ref({
291 <template> 290 <template>
292 <div class="container_wrap full" v-loading="fullscreenloading"> 291 <div class="container_wrap full" v-loading="fullscreenloading">
293 <div class="content_main panel"> 292 <div class="content_main panel">
294 <div v-if="flowDetail.crossPlatformApproveState == 'R' || flowDetail.crossPlatformApproveState == 'E'" 293 <div v-if="flowDetail.bizApproveState"
295 :class="['panel_wrap', 'results_panel', 'reject']"> 294 :class="['panel_wrap', 'results_panel', flowDetail.bizApproveState == 'Y' ? 'success' : ((flowDetail.bizApproveState == 'R' || flowDetail.bizApproveState == 'E') ? 'reject' : (flowDetail.bizApproveState == 'C' ? 'revoke' : 'audit'))]">
296 <div class="panel_header"> 295 <div class="panel_header">
297 <div class="header_title" v-if="flowDetail.crossPlatformApproveState == 'R'"> 296 <div class="header_title" v-if="flowDetail.bizApproveState == 'Y'">
297 <el-icon class="title-icon">
298 <svg-icon name="icon-success" />
299 </el-icon>
300 <span class="title_text">审批通过</span>
301 </div>
302 <div class="header_title" v-else-if="flowDetail.bizApproveState == 'R'">
298 <el-icon class="title-icon"> 303 <el-icon class="title-icon">
299 <CircleCloseFilled /> 304 <CircleCloseFilled />
300 </el-icon> 305 </el-icon>
301 <span class="title_text">主平台审批已驳回，请在列表页面查看具体驳回原因</span> 306 <span class="title_text">审批被驳回</span>
302 </div> 307 </div>
303 <div class="header_title" v-else-if="flowDetail.crossPlatformApproveState == 'E'"> 308 <div class="header_title" v-else-if="flowDetail.bizApproveState == 'E'">
304 <el-icon class="title-icon"> 309 <el-icon class="title-icon">
305 <CircleCloseFilled /> 310 <CircleCloseFilled />
306 </el-icon> 311 </el-icon>
307 <span class="title_text">主平台审批发起失败，请在列表页面查看具体发起失败原因</span> 312 <span class="title_text">审批发起失败</span>
313 </div>
314 <div class="header_title" v-else-if="flowDetail.bizApproveState == 'A'">
315 <el-icon class="title-icon">
316 <svg-icon name="icon-audit" />
317 </el-icon>
318 <span class="title_text">审批中</span>
319 </div>
320 <div class="header_title" v-else-if="flowDetail.bizApproveState == 'C'">
321 <el-icon class="title-icon">
322 <svg-icon name="icon-revoke" />
323 </el-icon>
324 <span class="title_text">已撤销</span>
325 </div>
326 </div>
327 <div class="panel_body" v-if="flowDetail.bizApproveState == 'R'" style="padding: 0px 16px 10px;">
328 <div class="results_list">
329 <div class="list_item">
330 <span class="item_label">平台审批意见:</span>
331 <span class="item_value">{{ flowDetail?.tdsApproveSuggest || '--' }}</span>
332 </div>
333 </div>
334 </div>
335 <div class="panel_body" v-if="flowDetail.bizApproveState == 'E'" style="padding: 0px 16px 10px;">
336 <div class="results_list">
337 <div class="list_item">
338 <span class="item_label">失败原因:</span>
339 <span class="item_value">{{ flowDetail?.tdsApproveErrorMsg || '--' }}</span>
340 </div>
308 </div> 341 </div>
309 </div> 342 </div>
310 </div> 343 </div>
...@@ -447,12 +480,12 @@ const fileKeyNames = ref({ ...@@ -447,12 +480,12 @@ const fileKeyNames = ref({
447 </template> 480 </template>
448 </div> 481 </div>
449 </ContentWrap> 482 </ContentWrap>
450 <ContentWrap id="id-approveInfo" title="审核信息" expandSwicth style="margin-top: 15px" :isExpand="expandApprove" 483 <!-- <ContentWrap id="id-approveInfo" title="审核信息" expandSwicth style="margin-top: 15px" :isExpand="expandApprove"
451 @expand="(v) => expandApprove = v"> 484 @expand="(v) => expandApprove = v">
452 <ApprovalProcess ref="approvalProcessRef" v-if="deploymentId" :deploymentId="deploymentId" 485 <ApprovalProcess ref="approvalProcessRef" v-if="deploymentId" :deploymentId="deploymentId"
453 :processInstanceId="processInstanceId"> 486 :processInstanceId="processInstanceId">
454 </ApprovalProcess> 487 </ApprovalProcess>
455 </ContentWrap> 488 </ContentWrap> -->
456 <ContentWrap v-if="flowDetail.connectorIdentity" title="连接器凭证信息" expandSwicth style="margin-top: 15px" :isExpand="expandCert" 489 <ContentWrap v-if="flowDetail.connectorIdentity" title="连接器凭证信息" expandSwicth style="margin-top: 15px" :isExpand="expandCert"
457 @expand="(v) => expandCert = v"> 490 @expand="(v) => expandCert = v">
458 <div class="list_panel"> 491 <div class="list_panel">
...@@ -471,12 +504,12 @@ const fileKeyNames = ref({ ...@@ -471,12 +504,12 @@ const fileKeyNames = ref({
471 </div> 504 </div>
472 </div> 505 </div>
473 </ContentWrap> 506 </ContentWrap>
474 <ContentWrap id="id-approveInfo" title="审核信息" expandSwicth style="margin-top: 15px" :isExpand="expandApprove" 507 <!-- <ContentWrap id="id-approveInfo" title="审核信息" expandSwicth style="margin-top: 15px" :isExpand="expandApprove"
475 @expand="(v) => expandApprove = v"> 508 @expand="(v) => expandApprove = v">
476 <ApprovalProcess ref="approvalProcessRef" v-if="deploymentId" :deploymentId="deploymentId" 509 <ApprovalProcess ref="approvalProcessRef" v-if="deploymentId" :deploymentId="deploymentId"
477 :processInstanceId="processInstanceId"> 510 :processInstanceId="processInstanceId">
478 </ApprovalProcess> 511 </ApprovalProcess>
479 </ContentWrap> 512 </ContentWrap> -->
480 </div> 513 </div>
481 <div class="tool_btns"> 514 <div class="tool_btns">
482 <div class="btns"> 515 <div class="btns">
...@@ -683,6 +716,19 @@ const fileKeyNames = ref({ ...@@ -683,6 +716,19 @@ const fileKeyNames = ref({
683 } 716 }
684 } 717 }
685 718
719 &.success {
720 background-color: #F4FEF6;
721 box-shadow: 0 0 0 1px #4FA55D;
722
723 .panel_header {
724 .header_title {
725 .el-icon {
726 color: #4FA55D;
727 }
728 }
729 }
730 }
731
686 &.reject { 732 &.reject {
687 background-color: #FDF2F4; 733 background-color: #FDF2F4;
688 box-shadow: 0 0 0 1px #E63E33; 734 box-shadow: 0 0 0 1px #E63E33;
...@@ -695,6 +741,32 @@ const fileKeyNames = ref({ ...@@ -695,6 +741,32 @@ const fileKeyNames = ref({
695 } 741 }
696 } 742 }
697 } 743 }
744
745 &.audit {
746 background-color: #FEFBF3;
747 box-shadow: 0 0 0 1px #F19E40;
748
749 .panel_header {
750 .header_title {
751 .el-icon {
752 color: #F19E40;
753 }
754 }
755 }
756 }
757
758 &.revoke {
759 background-color: #F5F5F5;
760 box-shadow: 0 0 0 1px #CCCCCC;
761
762 .panel_header {
763 .header_title {
764 .el-icon {
765 color: #666666;
766 }
767 }
768 }
769 }
698 } 770 }
699 } 771 }
700 </style> 772 </style>
...\ No newline at end of file ...\ No newline at end of file
......
src/views/data_facilitator/settleManagement.vue
...@@ -69,50 +69,51 @@ const tableFields = ref([ ...@@ -69,50 +69,51 @@ const tableFields = ref([
69 } 69 }
70 }, 70 },
71 { 71 {
72 label: "审批状态", field: "approveVO", type: "tag", width: 96, align: 'center', getName: (scope) => { 72 label: "审批状态", field: "bizApproveState", type: "tag", width: 96, align: 'center',
73 const approveVO = scope.row.approveVO || {} 73 // getName: (scope) => {
74 switch (approveVO.approveState) { 74 // const approveVO = scope.row.approveVO || {}
75 case 'N': 75 // switch (approveVO.approveState) {
76 return '草稿中'; 76 // case 'N':
77 case 'A': 77 // return '草稿中';
78 return '审批中'; 78 // case 'A':
79 case 'Y': 79 // return '审批中';
80 return '已通过'; 80 // case 'Y':
81 case 'R': 81 // return '已通过';
82 return '已驳回'; 82 // case 'R':
83 case 'C': 83 // return '已驳回';
84 return '已撤销'; 84 // case 'C':
85 case 'I': 85 // return '已撤销';
86 return '--'; 86 // case 'I':
87 default: 87 // return '--';
88 return '草稿中'; 88 // default:
89 } 89 // return '草稿中';
90 }, tagType: (scope) => { 90 // }
91 const approveVO = scope.row.approveVO || {} 91 // }, tagType: (scope) => {
92 switch (approveVO.approveState) { 92 // const approveVO = scope.row.approveVO || {}
93 case 'A': 93 // switch (approveVO.approveState) {
94 return 'warning'; 94 // case 'A':
95 case 'Y': 95 // return 'warning';
96 return 'success'; 96 // case 'Y':
97 case 'R': 97 // return 'success';
98 return 'danger'; 98 // case 'R':
99 default: 99 // return 'danger';
100 return 'info'; 100 // default:
101 } 101 // return 'info';
102 } 102 // }
103 // }
103 }, 104 },
104 // { label: "同步状态", field: "approveVO", type: "tag", }, 105 // { label: "同步状态", field: "approveVO", type: "tag", },
105 // 专区才需要显示的 106 // 专区才需要显示的
106 { 107 // {
107 label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 170, align: 'center', btn: { 108 // label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 170, align: 'center', btn: {
108 label: '查看', visible: (scope) => { 109 // label: '查看', visible: (scope) => {
109 return scope.row.crossPlatformApproveState != null; 110 // return scope.row.crossPlatformApproveState != null;
110 }, click: (scope) => { 111 // }, click: (scope) => {
111 systemApproveCurrentRowInfo.value = scope.row; 112 // systemApproveCurrentRowInfo.value = scope.row;
112 approvalDialogVisible.value = true; 113 // approvalDialogVisible.value = true;
113 } 114 // }
114 } 115 // }
115 }, 116 // },
116 { label: "法人或其他组织", field: "legalEntity", width: 200 }, 117 { label: "法人或其他组织", field: "legalEntity", width: 200 },
117 { label: "修改人", field: "updateUserName", width: 130 }, 118 { label: "修改人", field: "updateUserName", width: 130 },
118 { label: "修改时间", field: "updateTime", width: 170 }, 119 { label: "修改时间", field: "updateTime", width: 170 },
...@@ -156,24 +157,22 @@ const tableInfo = ref({ ...@@ -156,24 +157,22 @@ const tableInfo = ref({
156 157
157 const getTableBtns = (row, includeDetail = true) => { 158 const getTableBtns = (row, includeDetail = true) => {
158 let btnsArr: any[] = []; 159 let btnsArr: any[] = [];
159 const approveVO = row.approveVO; 160 const currentStaffGuid = userData.userGuid;
160 const currentStaffGuid = userData.staffGuid 161 const approveState = row.bizApproveState || 'N';
161 const bizApproveState = row.bizApproveState; 162 // const bizApproveState = row.bizApproveState;
162 const approveState = approveVO?.approveState || 'N'; 163 const staffGuid = row?.createUserId || '';
163 const approveStaffGuids = approveVO?.approveStaffGuids || [];
164 const staffGuid = approveVO?.staffGuid || '';
165 let isShowCancel = false; 164 let isShowCancel = false;
166 let flowState; 165 let flowState;
167 if (approveState == 'N') { 166 if (approveState == 'N') {
168 flowState = 1; 167 flowState = 1;
169 } 168 }
170 if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) { 169 // if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) {
171 flowState = 2; 170 // flowState = 2;
172 } 171 // }
173 if ((approveState == 'C' || approveState == 'R') && staffGuid == currentStaffGuid) { 172 if ((approveState == 'C' || approveState == 'E' || approveState == 'R') && staffGuid == currentStaffGuid) {
174 flowState = 3; 173 flowState = 3;
175 } 174 }
176 if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid) { 175 if (approveState == 'A' && staffGuid == currentStaffGuid) {
177 isShowCancel = true; 176 isShowCancel = true;
178 } 177 }
179 178
...@@ -181,13 +180,12 @@ const getTableBtns = (row, includeDetail = true) => { ...@@ -181,13 +180,12 @@ const getTableBtns = (row, includeDetail = true) => {
181 btnsArr = [{ label: "编辑", value: "edit" }, { label: "删除", value: "delete" }] 180 btnsArr = [{ label: "编辑", value: "edit" }, { label: "删除", value: "delete" }]
182 } else { 181 } else {
183 btnsArr.push({ label: "详情", value: "detail" }) 182 btnsArr.push({ label: "详情", value: "detail" })
184 if (flowState === 2) { 183 // if (flowState === 2) {
185 btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }]) 184 // btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }])
186 } else if (flowState === 3) { 185 // } else
187 if (bizApproveState != 'D') { 186 if (flowState === 3) {
188 btnsArr.push({ label: "重新提交", value: "edit" }) 187 btnsArr.push({ label: "重新提交", value: "edit" })
189 } 188 }
190 }
191 isShowCancel && btnsArr.push({ label: "撤销", value: "revoke" }) 189 isShowCancel && btnsArr.push({ label: "撤销", value: "revoke" })
192 flowState === 3 && btnsArr.push({ label: "删除", value: "delete" }) 190 flowState === 3 && btnsArr.push({ label: "删除", value: "delete" })
193 } 191 }
...@@ -312,10 +310,11 @@ const tablePageChange = (info) => { ...@@ -312,10 +310,11 @@ const tablePageChange = (info) => {
312 }; 310 };
313 311
314 const newCreate = () => { 312 const newCreate = () => {
315 if (tenantData.isCertification != 'Y') { 313 // TODO，要不要加企业认证。
316 proxy.$ElMessage.error('请先进行企业认证，再新增连接器'); 314 // if (tenantData.isCertification != 'Y') {
317 return; 315 // proxy.$ElMessage.error('请先进行企业认证，再新增连接器');
318 } 316 // return;
317 // }
319 router.push({ 318 router.push({
320 name: 'settleStart' 319 name: 'settleStart'
321 }); 320 });
......
src/views/data_facilitator/settleStart.vue
...@@ -6,7 +6,6 @@ name: settleStart ...@@ -6,7 +6,6 @@ name: settleStart
6 import useUserStore from "@/store/modules/user"; 6 import useUserStore from "@/store/modules/user";
7 import { useValidator } from "@/hooks/useValidator"; 7 import { useValidator } from "@/hooks/useValidator";
8 import useDataConnectorStore from "@/store/modules/dataConnector"; 8 import useDataConnectorStore from "@/store/modules/dataConnector";
9 import { getCamundaDeploymentId } from "@/api/modules/workFlowService";
10 import { 9 import {
11 saveConnector, 10 saveConnector,
12 updateConnector, 11 updateConnector,
...@@ -42,7 +41,7 @@ const expandImpact = ref(true); ...@@ -42,7 +41,7 @@ const expandImpact = ref(true);
42 const expandValid = ref(true); 41 const expandValid = ref(true);
43 const approveInfoExpand = ref(false); 42 const approveInfoExpand = ref(false);
44 43
45 const deploymentId = ref(""); 44 // const deploymentId = ref("");
46 const processInstanceId = ref(""); 45 const processInstanceId = ref("");
47 46
48 /** 连接器身份信息表单配置 */ 47 /** 连接器身份信息表单配置 */
...@@ -591,15 +590,15 @@ const connectorDetailInfo: any = ref({}); ...@@ -591,15 +590,15 @@ const connectorDetailInfo: any = ref({});
591 590
592 onBeforeMount(() => { 591 onBeforeMount(() => {
593 if (!guid) { 592 if (!guid) {
594 getCamundaDeploymentId("10031", userData.tenantGuid, userData.staffGuid).then( 593 // getCamundaDeploymentId("10031", userData.tenantGuid, userData.staffGuid).then(
595 (res: any) => { 594 // (res: any) => {
596 if (res.code == proxy.$passCode) { 595 // if (res.code == proxy.$passCode) {
597 deploymentId.value = res.data; 596 // deploymentId.value = res.data;
598 } else { 597 // } else {
599 proxy.$ElMessage.error(res.msg); 598 // proxy.$ElMessage.error(res.msg);
600 } 599 // }
601 } 600 // }
602 ); 601 // );
603 fullscreenLoading.value = true; 602 fullscreenLoading.value = true;
604 getEnterpriseData({ 603 getEnterpriseData({
605 logonUser: userData.tenantName == "非认证会员" ? userData.logonUser : tenantData.logonUser 604 logonUser: userData.tenantName == "非认证会员" ? userData.logonUser : tenantData.logonUser
...@@ -642,19 +641,19 @@ onBeforeMount(() => { ...@@ -642,19 +641,19 @@ onBeforeMount(() => {
642 } 641 }
643 if (res1?.code == proxy.$passCode) { 642 if (res1?.code == proxy.$passCode) {
644 let connectorDetail = connectorDetailInfo.value = res1?.data || {}; 643 let connectorDetail = connectorDetailInfo.value = res1?.data || {};
645 deploymentId.value = connectorDetail.approveVO?.camundaDeploymentId || ''; 644 // deploymentId.value = connectorDetail.approveVO?.camundaDeploymentId || '';
646 processInstanceId.value = connectorDetail.approveVO?.camundaInstanceId || ''; 645 // processInstanceId.value = connectorDetail.approveVO?.camundaInstanceId || '';
647 if (!deploymentId.value) { 646 // if (!deploymentId.value) {
648 getCamundaDeploymentId("10031", userData.tenantGuid, userData.staffGuid).then( 647 // getCamundaDeploymentId("10031", userData.tenantGuid, userData.staffGuid).then(
649 (res: any) => { 648 // (res: any) => {
650 if (res.code == proxy.$passCode) { 649 // if (res.code == proxy.$passCode) {
651 deploymentId.value = res.data; 650 // deploymentId.value = res.data;
652 } else { 651 // } else {
653 proxy.$ElMessage.error(res.msg); 652 // proxy.$ElMessage.error(res.msg);
654 } 653 // }
655 } 654 // }
656 ); 655 // );
657 } 656 // }
658 let approveVO = connectorDetail.approveVO || {}; 657 let approveVO = connectorDetail.approveVO || {};
659 if ((approveVO.approveState == 'C' || approveVO.approveState == 'R') && approveVO.staffGuid == userData.staffGuid && connectorDetail.bizApproveState != 'D') { 658 if ((approveVO.approveState == 'C' || approveVO.approveState == 'R') && approveVO.staffGuid == userData.staffGuid && connectorDetail.bizApproveState != 'D') {
660 restart.value = true; 659 restart.value = true;
...@@ -714,11 +713,11 @@ onBeforeMount(() => { ...@@ -714,11 +713,11 @@ onBeforeMount(() => {
714 <Form ref="validInfoFormRef" formId="valid-info-form" :itemList="validInfoFormItems" :rules="validInfoFormRules" 713 <Form ref="validInfoFormRef" formId="valid-info-form" :itemList="validInfoFormItems" :rules="validInfoFormRules"
715 col="col3" /> 714 col="col3" />
716 </ContentWrap> 715 </ContentWrap>
717 <ContentWrap id="id-approveInfo" title="审批信息" :isExpand="approveInfoExpand" expandSwicth style="margin-top: 15px" 716 <!-- <ContentWrap id="id-approveInfo" title="审批信息" :isExpand="approveInfoExpand" expandSwicth style="margin-top: 15px"
718 @expand="(v) => (approveInfoExpand = v)"> 717 @expand="(v) => (approveInfoExpand = v)">
719 <ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :definitionId="''"> 718 <ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :definitionId="''">
720 </ApprovalProcess> 719 </ApprovalProcess>
721 </ContentWrap> 720 </ContentWrap> -->
722 </div> 721 </div>
723 <div class="tool_btns"> 722 <div class="tool_btns">
724 <div class="btns"> 723 <div class="btns">
......
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';
...@@ -77,6 +77,18 @@ const page = ref({ ...@@ -77,6 +77,18 @@ const page = ref({
77 }); 77 });
78 const searchItemValue: any = ref({}); 78 const searchItemValue: any = ref({});
79 const currTableData: any = ref({}); 79 const currTableData: any = ref({});
80
81 const systemApproveCurrentRowInfo: any = ref({})
82
83 const approvalDialogVisible = ref(false);
84
85 const handleApprovalDialogCancel = (reSubmit) => {
86 approvalDialogVisible.value = false;
87 if (reSubmit) {
88 getTableData();
89 }
90 }
91
80 const tableInfo = ref({ 92 const tableInfo = ref({
81 id: "mapping-table", 93 id: "mapping-table",
82 fields: [ 94 fields: [
...@@ -94,44 +106,23 @@ const tableInfo = ref({ ...@@ -94,44 +106,23 @@ const tableInfo = ref({
94 }, 106 },
95 // { label: "上架分类", field: "exchangeName", width: 140 }, 107 // { label: "上架分类", field: "exchangeName", width: 140 },
96 { 108 {
97 label: "审核状态", field: "approveState", width: TableColumnWidth.STATE, align: 'center', type: "tag", getName: (scope) => { 109 label: "审批状态", field: "approveState", type: "tag", width: TableColumnWidth.STATE, align: 'center'
98 const approveVO = scope.row.approveVO || {}
99 switch (approveVO.approveState) {
100 case 'N':
101 return '草稿中';
102 case 'A':
103 return '审批中';
104 case 'Y':
105 return '已通过';
106 case 'R':
107 return '已驳回';
108 case 'C':
109 return '已撤销';
110 case 'I':
111 return '--';
112 default:
113 return '草稿中';
114 }
115 }, tagType: (scope) => {
116 const approveVO = scope.row.approveVO || {}
117 switch (approveVO.approveState) {
118 case 'A':
119 return 'warning';
120 case 'Y':
121 return 'success';
122 case 'R':
123 return 'danger';
124 default:
125 return 'info';
126 }
127 }
128 }, 110 },
129 { 111 {
130 label: '上架状态', field: 'listingStatus', width: 100, getName: (scope) => { 112 label: '上架状态', field: 'listingStatus', width: 100, getName: (scope) => {
131 return scope.row.listingStatus == 'Y' ? '已上架' : '未上架'; 113 return scope.row.listingStatus == 'Y' ? '已上架' : '未上架';
132 } 114 }
133 }, 115 },
134 { label: "专区名称", field: "zqName", width: 160, align: "left" }, 116 // {
117 // label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 150, align: 'center', btn: {
118 // label: '查看', visible: (scope) => {
119 // return scope.row.crossPlatformApproveState != null;
120 // }, click: (scope) => {
121 // systemApproveCurrentRowInfo.value = scope.row;
122 // approvalDialogVisible.value = true;
123 // }
124 // }
125 // },
135 { label: "修改时间", field: "updateTime", width: TableColumnWidth.DATETIME }, 126 { label: "修改时间", field: "updateTime", width: TableColumnWidth.DATETIME },
136 ], 127 ],
137 loading: false, 128 loading: false,
...@@ -147,29 +138,35 @@ const tableInfo = ref({ ...@@ -147,29 +138,35 @@ const tableInfo = ref({
147 width: 170, 138 width: 170,
148 btns: (scope) => { 139 btns: (scope) => {
149 const { row } = scope; 140 const { row } = scope;
150 const approveVO = row.approveVO || {};
151 const currentStaffGuid = userData.staffGuid
152 const bizApproveState = row.approveState; 141 const bizApproveState = row.approveState;
153 const approveState = approveVO.approveState || null;
154 const approveStaffGuids = approveVO.approveStaffGuids || [];
155 const staffGuid = approveVO.staffGuid || '';
156 let isShowCancel = false;
157 let flowState; 142 let flowState;
158 let list: any = []; 143 if (bizApproveState == 'N') {
159 if (approveState == 'N') {
160 flowState = 1; 144 flowState = 1;
161 } 145 }
162 if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) { 146
163 flowState = 2; 147 const currentStaffGuid = userData.userGuid
148 // const bizApproveState = row.approveState;
149 // const approveState = approveVO.approveState || null;
150 // const approveStaffGuids = approveVO.approveStaffGuids || [];
151 const staffGuid = row.createUserId || '';
152 let isShowCancel = false;
153 // let flowState;
154 let list: any = [];
155 if (bizApproveState == 'N') {
156 flowState = 1;
164 } 157 }
165 if ((bizApproveState == 'D' || approveState == 'C' || approveState == 'R') && staffGuid == currentStaffGuid) { 158 // // 审批中包含。
159 // if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) {
160 // flowState = 2;
161 // }
162 if ((bizApproveState == 'D' || bizApproveState == 'C' || bizApproveState == 'R' || bizApproveState == 'E' || bizApproveState == 'R') && staffGuid == currentStaffGuid) {
166 flowState = 3; 163 flowState = 3;
167 } 164 }
168 if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid) { 165 if (bizApproveState == 'A' && staffGuid == currentStaffGuid) {
169 isShowCancel = true; 166 isShowCancel = true;
170 } 167 }
171 if (bizApproveState === 'Y' && staffGuid == currentStaffGuid && !row.zqName) { 168 if ((bizApproveState === 'Y') && staffGuid == currentStaffGuid) {
172 if (row.listingStatus === 'Y') { 169 if (row.listingStatus == 'Y') {
173 list.push({ label: "下架", value: "down" }); 170 list.push({ label: "下架", value: "down" });
174 } else { 171 } else {
175 list.push({ label: "上架", value: "up" }); 172 list.push({ label: "上架", value: "up" });
...@@ -178,16 +175,16 @@ const tableInfo = ref({ ...@@ -178,16 +175,16 @@ const tableInfo = ref({
178 if (flowState === 1) { 175 if (flowState === 1) {
179 list = [{ label: "编辑", value: "edit" }, { label: "删除", value: "del" }] 176 list = [{ label: "编辑", value: "edit" }, { label: "删除", value: "del" }]
180 } 177 }
181 if (flowState === 2) { 178 // if (flowState === 2) {
182 list = [{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }] 179 // list = [{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }]
183 } 180 // }
184 if (flowState === 3 && !row.zqName) { 181 if (flowState === 3) {
185 list.push({ label: "删除", value: "del" }) 182 list.push({ label: "删除", value: "del" })
186 } 183 }
187 if (flowState === 3 && bizApproveState != 'D' && !row.zqName) { 184 if (flowState === 3) { //重新提交过的不能再重新提交 && bizApproveState != 'D'
188 list.push({ label: "重新提交", value: "redit" }) //已驳回 185 list.push({ label: "重新提交", value: "redit" }) //已驳回
189 } 186 }
190 if (isShowCancel && !row.zqName) { 187 if (isShowCancel) {
191 list.push({ label: "撤销", value: "revoke" }) 188 list.push({ label: "撤销", value: "revoke" })
192 } 189 }
193 if (flowState !== 1) { 190 if (flowState !== 1) {
...@@ -409,10 +406,6 @@ const tableBtnClick = (scope, btn) => { ...@@ -409,10 +406,6 @@ const tableBtnClick = (scope, btn) => {
409 406
410 } 407 }
411 if (type == 'pass') { 408 if (type == 'pass') {
412 if (row.zqName) {
413 passCommonDialogInfo.value.visible = true;
414 return;
415 }
416 if (getFirstNodePromise.value[row.guid]) { 409 if (getFirstNodePromise.value[row.guid]) {
417 return; 410 return;
418 } 411 }
...@@ -444,10 +437,6 @@ const tableBtnClick = (scope, btn) => { ...@@ -444,10 +437,6 @@ const tableBtnClick = (scope, btn) => {
444 }) 437 })
445 } 438 }
446 if (type == 'reject') { 439 if (type == 'reject') {
447 if (row.zqName) {
448 rejectDialogInfo.value.visible = true;
449 return;
450 }
451 if (getFirstNodePromise1.value[row.guid]) { 440 if (getFirstNodePromise1.value[row.guid]) {
452 return; 441 return;
453 } 442 }
...@@ -1013,6 +1002,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -1013,6 +1002,7 @@ const rejectDialogBtnClick = (btn, info) => {
1013 </el-dialog> 1002 </el-dialog>
1014 <Dialog :dialogInfo="passCommonDialogInfo" @btnClick="passCommonDialogBtnClick" /> 1003 <Dialog :dialogInfo="passCommonDialogInfo" @btnClick="passCommonDialogBtnClick" />
1015 <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" /> 1004 <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" />
1005 <DialogApproval :visible="approvalDialogVisible" :currentRowInfo="systemApproveCurrentRowInfo" @dialog-cancel="handleApprovalDialogCancel"></DialogApproval>
1016 </div> 1006 </div>
1017 </template> 1007 </template>
1018 1008
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!