Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
0c484b26 by lihua
Options

企业认证接口联调

1 parent ba25f0ed
Inline Side-by-side
Showing 6 changed files with 183 additions and 56 deletions
src/utils/common.ts
...@@ -444,7 +444,7 @@ export const tagType = (row, type): any => { ...@@ -444,7 +444,7 @@ export const tagType = (row, type): any => {
444 state = 'warning'; 444 state = 'warning';
445 break; 445 break;
446 } 446 }
447 } else if (type == 'approveState' || type == 'crossPlatformApproveState') { 447 } else if (type == 'approveState' || type == 'bizApproveState' || type == 'crossPlatformApproveState') {
448 switch (row[type]) { 448 switch (row[type]) {
449 case "N": 449 case "N":
450 state = 'info'; 450 state = 'info';
...@@ -755,7 +755,7 @@ export const tagMethod = (row, type) => { ...@@ -755,7 +755,7 @@ export const tagMethod = (row, type) => {
755 tag = '待受理' 755 tag = '待受理'
756 break; 756 break;
757 } 757 }
758 } else if (type == 'approveState' || type == 'crossPlatformApproveState') { 758 } else if (type == 'approveState' || type == 'bizApproveState' || type == 'crossPlatformApproveState') {
759 switch (row[type]) { 759 switch (row[type]) {
760 case "N": 760 case "N":
761 tag = '草稿中' 761 tag = '草稿中'
...@@ -776,7 +776,7 @@ export const tagMethod = (row, type) => { ...@@ -776,7 +776,7 @@ export const tagMethod = (row, type) => {
776 tag = '发起失败' 776 tag = '发起失败'
777 break; 777 break;
778 default: 778 default:
779 tag = type == 'crossPlatformApproveState' ? '未发起' : '--' 779 tag = type == 'crossPlatformApproveState' || type == 'bizApproveState' ? '未发起' : '--'
780 break; 780 break;
781 } 781 }
782 } else if (type == 'standardType') { 782 } else if (type == 'standardType') {
......
src/views/data_facilitator/authenticationManagement.vue
...@@ -1283,6 +1283,7 @@ const btnClick = async (btn, bType = null) => { ...@@ -1283,6 +1283,7 @@ const btnClick = async (btn, bType = null) => {
1283 params.immediateApprove = true; 1283 params.immediateApprove = true;
1284 params.bizApproveState = 'A'; 1284 params.bizApproveState = 'A';
1285 params.isRestart = false; 1285 params.isRestart = false;
1286 params.isChange = 'Y';
1286 loading.value = true; 1287 loading.value = true;
1287 enterpriseSave(params).then((res: any) => { 1288 enterpriseSave(params).then((res: any) => {
1288 loading.value = false; 1289 loading.value = false;
......
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,28 +67,31 @@ const handleApprovalDialogCancel = () => { ...@@ -67,28 +67,31 @@ 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 }, 71 { label: "统一社会信用代码", field: "socialCreditCode", width: 160 },
72 { 72 {
73 label: "法人姓名", field: "juridicalPerson", width: TableColumnWidth.USERNAME, getName: (scope) => { 73 label: "法人姓名", field: "juridicalPerson", width: TableColumnWidth.USERNAME,
74 const param4 = scope.row.param4 || ''; 74 // getName: (scope) => {
75 return param4 ? param4.split('_')[0] : '--' 75 // const param4 = scope.row.param4 || '';
76 } 76 // return param4 ? param4.split('_')[0] : '--'
77 // }
77 }, 78 },
78 { 79 {
79 label: "管理员姓名", field: "contacts", width: TableColumnWidth.USERNAME, getName: (scope) => { 80 label: "管理员姓名", field: "contacts", width: TableColumnWidth.USERNAME,
80 const param4 = scope.row.param4 || ''; 81 // getName: (scope) => {
81 return param4 ? param4.split('_')[1] : '--' 82 // const param4 = scope.row.param4 || '';
82 } 83 // return param4 ? param4.split('_')[1] : '--'
84 // }
83 }, 85 },
84 { 86 {
85 label: "管理员手机号", field: "contactTel", width: 120, getName: (scope) => { 87 label: "管理员手机号", field: "contactTel", width: 120,
86 const param4 = scope.row.param4 || ''; 88 // getName: (scope) => {
87 return param4 ? param4.split('_')[2] : '--' 89 // const param4 = scope.row.param4 || '';
88 } 90 // return param4 ? param4.split('_')[2] : '--'
91 // }
89 }, 92 },
90 { 93 {
91 label: "审批状态", field: "approveState", type: "tag", width: TableColumnWidth.STATE, align: 'center', 94 label: "审批状态", field: "bizApproveState", type: "tag", width: TableColumnWidth.STATE, align: 'center',
92 // getName: (scope) => { 95 // getName: (scope) => {
93 // const approveState = scope.row.bizApproveState 96 // const approveState = scope.row.bizApproveState
94 // switch (approveState) { 97 // switch (approveState) {
...@@ -242,7 +245,7 @@ const setTableField = () => { ...@@ -242,7 +245,7 @@ const setTableField = () => {
242 tableFields.value.splice(2, 0, { 245 tableFields.value.splice(2, 0, {
243 label: "机构类型", field: "tenantType", width: 120, getName: (scope) => { 246 label: "机构类型", field: "tenantType", width: 120, getName: (scope) => {
244 const datas = typeMap.value.tenantType; 247 const datas = typeMap.value.tenantType;
245 return datas.find((item) => item.value == scope.row.param2)?.label || '--'; 248 return datas.find((item) => item.value == scope.row.tenantType)?.label || '--';
246 } 249 }
247 }); 250 });
248 } 251 }
...@@ -264,7 +267,7 @@ const toSearch = (val: any, clear: boolean = false) => { ...@@ -264,7 +267,7 @@ const toSearch = (val: any, clear: boolean = false) => {
264 267
265 const getTableData = () => { 268 const getTableData = () => {
266 tableInfo.value.loading = true; 269 tableInfo.value.loading = true;
267 getFlowEnterpriseList({ 270 getEnterpriseList({
268 pageSize: page.value.limit, 271 pageSize: page.value.limit,
269 pageIndex: page.value.curr, 272 pageIndex: page.value.curr,
270 param1Like: page.value.tenantName, 273 param1Like: page.value.tenantName,
...@@ -295,7 +298,7 @@ const tableBtnClick = (scope, btn) => { ...@@ -295,7 +298,7 @@ const tableBtnClick = (scope, btn) => {
295 if (type === 'detail') { // 详情 298 if (type === 'detail') { // 详情
296 router.push({ 299 router.push({
297 name: 'certificationAuditDetail', 300 name: 'certificationAuditDetail',
298 query: { guid: row.guid, name: row.param1, tName: row.tenantName, fType: row.flowType, type } 301 query: { guid: row.guid, name: row.tenantName, tName: row.tenantName, fType: row.flowType, type }
299 }); 302 });
300 } else if (type == "delete") { 303 } else if (type == "delete") {
301 delTableOpen("此操作将永久删除该认证信息，是否继续?", "warning"); 304 delTableOpen("此操作将永久删除该认证信息，是否继续?", "warning");
......
src/views/data_facilitator/certificationAuditDetail.vue
...@@ -1219,39 +1219,53 @@ const viewVoucherFile = () => { ...@@ -1219,39 +1219,53 @@ const viewVoucherFile = () => {
1219 <template> 1219 <template>
1220 <div class="container_wrap full" v-loading="loading"> 1220 <div class="container_wrap full" v-loading="loading">
1221 <div class="content_main panel"> 1221 <div class="content_main panel">
1222 <div v-if="detailType == 'detail' && flowDetail.approveState" 1222 <div v-if="detailType == 'detail' && flowDetail.bizApproveState"
1223 :class="['panel_wrap', 'results_panel', flowDetail.approveState == 'Y' ? 'success' : (flowDetail.approveState == 'R' ? 'reject' : (flowDetail.approveState == 'C' ? 'revoke' : 'audit'))]"> 1223 :class="['panel_wrap', 'results_panel', flowDetail.bizApproveState == 'Y' ? 'success' : ((flowDetail.bizApproveState == 'R' || flowDetail.bizApproveState == 'E') ? 'reject' : (flowDetail.bizApproveState == 'C' ? 'revoke' : 'audit'))]">
1224 <div class="panel_header"> 1224 <div class="panel_header">
1225 <div class="header_title" v-if="flowDetail.approveState == 'Y'"> 1225 <div class="header_title" v-if="flowDetail.bizApproveState == 'Y'">
1226 <el-icon class="title-icon"> 1226 <el-icon class="title-icon">
1227 <svg-icon name="icon-success" /> 1227 <svg-icon name="icon-success" />
1228 </el-icon> 1228 </el-icon>
1229 <span class="title_text">平台审批通过</span> 1229 <span class="title_text">审批通过</span>
1230 </div> 1230 </div>
1231 <div class="header_title" v-else-if="flowDetail.approveState == 'R'"> 1231 <div class="header_title" v-else-if="flowDetail.bizApproveState == 'R'">
1232 <el-icon class="title-icon"> 1232 <el-icon class="title-icon">
1233 <CircleCloseFilled /> 1233 <CircleCloseFilled />
1234 </el-icon> 1234 </el-icon>
1235 <span class="title_text">平台被驳回</span> 1235 <span class="title_text">审批被驳回</span>
1236 </div> 1236 </div>
1237 <div class="header_title" v-else-if="flowDetail.approveState == 'A'"> 1237 <div class="header_title" v-else-if="flowDetail.bizApproveState == 'E'">
1238 <el-icon class="title-icon">
1239 <CircleCloseFilled />
1240 </el-icon>
1241 <span class="title_text">审批发起失败</span>
1242 </div>
1243 <div class="header_title" v-else-if="flowDetail.bizApproveState == 'A'">
1238 <el-icon class="title-icon"> 1244 <el-icon class="title-icon">
1239 <svg-icon name="icon-audit" /> 1245 <svg-icon name="icon-audit" />
1240 </el-icon> 1246 </el-icon>
1241 <span class="title_text">平台审批中</span> 1247 <span class="title_text">审批中</span>
1242 </div> 1248 </div>
1243 <!-- <div class="header_title" v-else-if="flowDetail.approveState == 'C'"> 1249 <div class="header_title" v-else-if="flowDetail.bizApproveState == 'C'">
1244 <el-icon class="title-icon"> 1250 <el-icon class="title-icon">
1245 <svg-icon name="icon-revoke" /> 1251 <svg-icon name="icon-revoke" />
1246 </el-icon> 1252 </el-icon>
1247 <span class="title_text">已撤销</span> 1253 <span class="title_text">已撤销</span>
1248 </div> --> 1254 </div>
1249 </div> 1255 </div>
1250 <div class="panel_body" v-if="flowDetail.approveState == 'R'"> 1256 <div class="panel_body" v-if="flowDetail.bizApproveState == 'R'">
1251 <div class="results_list"> 1257 <div class="results_list">
1252 <div class="list_item"> 1258 <div class="list_item">
1253 <span class="item_label">平台审批意见:</span> 1259 <span class="item_label">平台审批意见:</span>
1254 <span class="item_value">{{ flowDetail?.approveSuggest || '--' }}</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'">
1265 <div class="results_list">
1266 <div class="list_item">
1267 <span class="item_label">失败原因:</span>
1268 <span class="item_value">{{ flowDetail?.tdsApproveErrorMsg || '--' }}</span>
1255 </div> 1269 </div>
1256 </div> 1270 </div>
1257 </div> 1271 </div>
...@@ -1517,6 +1531,19 @@ const viewVoucherFile = () => { ...@@ -1517,6 +1531,19 @@ const viewVoucherFile = () => {
1517 } 1531 }
1518 } 1532 }
1519 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
1520 &.reject { 1547 &.reject {
1521 background-color: #FDF2F4; 1548 background-color: #FDF2F4;
1522 box-shadow: 0 0 0 1px #E63E33; 1549 box-shadow: 0 0 0 1px #E63E33;
...@@ -1529,6 +1556,32 @@ const viewVoucherFile = () => { ...@@ -1529,6 +1556,32 @@ const viewVoucherFile = () => {
1529 } 1556 }
1530 } 1557 }
1531 } 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 }
1532 } 1585 }
1533 } 1586 }
1534 1587
......
src/views/data_facilitator/settleDetail.vue
...@@ -290,20 +290,54 @@ const fileKeyNames = ref({ ...@@ -290,20 +290,54 @@ const fileKeyNames = ref({
290 <template> 290 <template>
291 <div class="container_wrap full" v-loading="fullscreenloading"> 291 <div class="container_wrap full" v-loading="fullscreenloading">
292 <div class="content_main panel"> 292 <div class="content_main panel">
293 <div v-if="flowDetail.crossPlatformApproveState == 'R' || flowDetail.crossPlatformApproveState == 'E'" 293 <div v-if="flowDetail.bizApproveState"
294 :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'))]">
295 <div class="panel_header"> 295 <div class="panel_header">
296 <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'">
297 <el-icon class="title-icon"> 303 <el-icon class="title-icon">
298 <CircleCloseFilled /> 304 <CircleCloseFilled />
299 </el-icon> 305 </el-icon>
300 <span class="title_text">主平台审批已驳回，请在列表页面查看具体驳回原因</span> 306 <span class="title_text">审批被驳回</span>
301 </div> 307 </div>
302 <div class="header_title" v-else-if="flowDetail.crossPlatformApproveState == 'E'"> 308 <div class="header_title" v-else-if="flowDetail.bizApproveState == 'E'">
303 <el-icon class="title-icon"> 309 <el-icon class="title-icon">
304 <CircleCloseFilled /> 310 <CircleCloseFilled />
305 </el-icon> 311 </el-icon>
306 <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'">
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'">
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>
307 </div> 341 </div>
308 </div> 342 </div>
309 </div> 343 </div>
...@@ -682,18 +716,57 @@ const fileKeyNames = ref({ ...@@ -682,18 +716,57 @@ const fileKeyNames = ref({
682 } 716 }
683 } 717 }
684 718
685 &.reject { 719 &.success {
686 background-color: #FDF2F4; 720 background-color: #F4FEF6;
687 box-shadow: 0 0 0 1px #E63E33; 721 box-shadow: 0 0 0 1px #4FA55D;
688 722
689 .panel_header { 723 .panel_header {
690 .header_title { 724 .header_title {
691 .el-icon { 725 .el-icon {
692 color: #E63E33; 726 color: #4FA55D;
727 }
728 }
729 }
730 }
731
732 &.reject {
733 background-color: #FDF2F4;
734 box-shadow: 0 0 0 1px #E63E33;
735
736 .panel_header {
737 .header_title {
738 .el-icon {
739 color: #E63E33;
740 }
741 }
742 }
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 }
693 } 767 }
694 } 768 }
695 } 769 }
696 }
697 } 770 }
698 } 771 }
699 </style> 772 </style>
...\ No newline at end of file ...\ No newline at end of file
......
src/views/data_facilitator/settleManagement.vue
...@@ -69,7 +69,7 @@ const tableFields = ref([ ...@@ -69,7 +69,7 @@ const tableFields = ref([
69 } 69 }
70 }, 70 },
71 { 71 {
72 label: "审批状态", field: "approveState", type: "tag", width: 96, align: 'center', 72 label: "审批状态", field: "bizApproveState", type: "tag", width: 96, align: 'center',
73 // getName: (scope) => { 73 // getName: (scope) => {
74 // const approveVO = scope.row.approveVO || {} 74 // const approveVO = scope.row.approveVO || {}
75 // switch (approveVO.approveState) { 75 // switch (approveVO.approveState) {
...@@ -157,10 +157,9 @@ const tableInfo = ref({ ...@@ -157,10 +157,9 @@ const tableInfo = ref({
157 157
158 const getTableBtns = (row, includeDetail = true) => { 158 const getTableBtns = (row, includeDetail = true) => {
159 let btnsArr: any[] = []; 159 let btnsArr: any[] = [];
160 const approveVO = row.approveVO;
161 const currentStaffGuid = userData.userGuid; 160 const currentStaffGuid = userData.userGuid;
162 const approveState = row.approveState || 'N'; 161 const approveState = row.bizApproveState || 'N';
163 const bizApproveState = row.bizApproveState; 162 // const bizApproveState = row.bizApproveState;
164 const staffGuid = row?.createUserId || ''; 163 const staffGuid = row?.createUserId || '';
165 let isShowCancel = false; 164 let isShowCancel = false;
166 let flowState; 165 let flowState;
...@@ -173,7 +172,7 @@ const getTableBtns = (row, includeDetail = true) => { ...@@ -173,7 +172,7 @@ const getTableBtns = (row, includeDetail = true) => {
173 if ((approveState == 'C' || approveState == 'R') && staffGuid == currentStaffGuid) { 172 if ((approveState == 'C' || 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
...@@ -185,9 +184,7 @@ const getTableBtns = (row, includeDetail = true) => { ...@@ -185,9 +184,7 @@ const getTableBtns = (row, includeDetail = true) => {
185 // btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }]) 184 // btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }])
186 // } else 185 // } else
187 if (flowState === 3) { 186 if (flowState === 3) {
188 if (bizApproveState != 'D') { 187 btnsArr.push({ label: "重新提交", value: "edit" })
189 btnsArr.push({ label: "重新提交", value: "edit" })
190 }
191 } 188 }
192 isShowCancel && btnsArr.push({ label: "撤销", value: "revoke" }) 189 isShowCancel && btnsArr.push({ label: "撤销", value: "revoke" })
193 flowState === 3 && btnsArr.push({ label: "删除", value: "delete" }) 190 flowState === 3 && btnsArr.push({ label: "删除", value: "delete" })
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!