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 174 additions and 47 deletions
src/utils/common.ts
......@@ -444,7 +444,7 @@ export const tagType = (row, type): any => {
state = 'warning';
break;
}
} else if (type == 'approveState' || type == 'crossPlatformApproveState') {
} else if (type == 'approveState' || type == 'bizApproveState' || type == 'crossPlatformApproveState') {
switch (row[type]) {
case "N":
state = 'info';
......@@ -755,7 +755,7 @@ export const tagMethod = (row, type) => {
tag = '待受理'
break;
}
} else if (type == 'approveState' || type == 'crossPlatformApproveState') {
} else if (type == 'approveState' || type == 'bizApproveState' || type == 'crossPlatformApproveState') {
switch (row[type]) {
case "N":
tag = '草稿中'
......@@ -776,7 +776,7 @@ export const tagMethod = (row, type) => {
tag = '发起失败'
break;
default:
tag = type == 'crossPlatformApproveState' ? '未发起' : '--'
tag = type == 'crossPlatformApproveState' || type == 'bizApproveState' ? '未发起' : '--'
break;
}
} else if (type == 'standardType') {
......
src/views/data_facilitator/authenticationManagement.vue
......@@ -1283,6 +1283,7 @@ const btnClick = async (btn, bType = null) => {
params.immediateApprove = true;
params.bizApproveState = 'A';
params.isRestart = false;
params.isChange = 'Y';
loading.value = true;
enterpriseSave(params).then((res: any) => {
loading.value = false;
......
src/views/data_facilitator/certificationAudit.vue
......@@ -7,7 +7,7 @@ import { ref } from 'vue';
import TableTools from "@/components/Tools/table_tools.vue";
import { ElMessage, ElMessageBox } from 'element-plus';
import { getParamsList } from "@/api/modules/queryService";
import { getTaskGressList, getTaskRestart, getTaskExecutionLog, getFlowEnterpriseList, enterpriseDelete, enterpriseChangeDelete } from "@/api/modules/dataRequire";
import { getTaskGressList, getTaskRestart, getTaskExecutionLog, getEnterpriseList, enterpriseDelete, enterpriseChangeDelete } from "@/api/modules/dataRequire";
import { passFlowData, rejectFlowData, myLastNode } from "@/api/modules/workFlowService";
import useDataAssetStore from "@/store/modules/dataAsset";
import Moment from "moment";
......@@ -67,28 +67,31 @@ const handleApprovalDialogCancel = () => {
const tableFields: any = ref([
{ label: "序号", type: "index", width: 56, align: "center" },
{ label: "企业名称", field: "param1", width: 200, },
{ label: "统一社会信用代码", field: "param3", width: 160 },
{ label: "企业名称", field: "tenantName", width: 200, },
{ label: "统一社会信用代码", field: "socialCreditCode", width: 160 },
{
label: "法人姓名", field: "juridicalPerson", width: TableColumnWidth.USERNAME, getName: (scope) => {
const param4 = scope.row.param4 || '';
return param4 ? param4.split('_')[0] : '--'
}
label: "法人姓名", field: "juridicalPerson", width: TableColumnWidth.USERNAME,
// getName: (scope) => {
// const param4 = scope.row.param4 || '';
// return param4 ? param4.split('_')[0] : '--'
// }
},
{
label: "管理员姓名", field: "contacts", width: TableColumnWidth.USERNAME, getName: (scope) => {
const param4 = scope.row.param4 || '';
return param4 ? param4.split('_')[1] : '--'
}
label: "管理员姓名", field: "contacts", width: TableColumnWidth.USERNAME,
// getName: (scope) => {
// const param4 = scope.row.param4 || '';
// return param4 ? param4.split('_')[1] : '--'
// }
},
{
label: "管理员手机号", field: "contactTel", width: 120, getName: (scope) => {
const param4 = scope.row.param4 || '';
return param4 ? param4.split('_')[2] : '--'
}
label: "管理员手机号", field: "contactTel", width: 120,
// getName: (scope) => {
// const param4 = scope.row.param4 || '';
// return param4 ? param4.split('_')[2] : '--'
// }
},
{
label: "审批状态", field: "approveState", type: "tag", width: TableColumnWidth.STATE, align: 'center',
label: "审批状态", field: "bizApproveState", type: "tag", width: TableColumnWidth.STATE, align: 'center',
// getName: (scope) => {
// const approveState = scope.row.bizApproveState
// switch (approveState) {
......@@ -242,7 +245,7 @@ const setTableField = () => {
tableFields.value.splice(2, 0, {
label: "机构类型", field: "tenantType", width: 120, getName: (scope) => {
const datas = typeMap.value.tenantType;
return datas.find((item) => item.value == scope.row.param2)?.label || '--';
return datas.find((item) => item.value == scope.row.tenantType)?.label || '--';
}
});
}
......@@ -264,7 +267,7 @@ const toSearch = (val: any, clear: boolean = false) => {
const getTableData = () => {
tableInfo.value.loading = true;
getFlowEnterpriseList({
getEnterpriseList({
pageSize: page.value.limit,
pageIndex: page.value.curr,
param1Like: page.value.tenantName,
......@@ -295,7 +298,7 @@ const tableBtnClick = (scope, btn) => {
if (type === 'detail') { // 详情
router.push({
name: 'certificationAuditDetail',
query: { guid: row.guid, name: row.param1, tName: row.tenantName, fType: row.flowType, type }
query: { guid: row.guid, name: row.tenantName, tName: row.tenantName, fType: row.flowType, type }
});
} else if (type == "delete") {
delTableOpen("此操作将永久删除该认证信息，是否继续?", "warning");
......
src/views/data_facilitator/certificationAuditDetail.vue
......@@ -1219,39 +1219,53 @@ const viewVoucherFile = () => {
<template>
<div class="container_wrap full" v-loading="loading">
<div class="content_main panel">
<div v-if="detailType == 'detail' && flowDetail.approveState"
:class="['panel_wrap', 'results_panel', flowDetail.approveState == 'Y' ? 'success' : (flowDetail.approveState == 'R' ? 'reject' : (flowDetail.approveState == 'C' ? 'revoke' : 'audit'))]">
<div v-if="detailType == 'detail' && flowDetail.bizApproveState"
:class="['panel_wrap', 'results_panel', flowDetail.bizApproveState == 'Y' ? 'success' : ((flowDetail.bizApproveState == 'R' || flowDetail.bizApproveState == 'E') ? 'reject' : (flowDetail.bizApproveState == 'C' ? 'revoke' : 'audit'))]">
<div class="panel_header">
<div class="header_title" v-if="flowDetail.approveState == 'Y'">
<div class="header_title" v-if="flowDetail.bizApproveState == 'Y'">
<el-icon class="title-icon">
<svg-icon name="icon-success" />
</el-icon>
<span class="title_text">平台审批通过</span>
<span class="title_text">审批通过</span>
</div>
<div class="header_title" v-else-if="flowDetail.approveState == 'R'">
<div class="header_title" v-else-if="flowDetail.bizApproveState == 'R'">
<el-icon class="title-icon">
<CircleCloseFilled />
</el-icon>
<span class="title_text">平台被驳回</span>
<span class="title_text">审批被驳回</span>
</div>
<div class="header_title" v-else-if="flowDetail.approveState == 'A'">
<div class="header_title" v-else-if="flowDetail.bizApproveState == 'E'">
<el-icon class="title-icon">
<CircleCloseFilled />
</el-icon>
<span class="title_text">审批发起失败</span>
</div>
<div class="header_title" v-else-if="flowDetail.bizApproveState == 'A'">
<el-icon class="title-icon">
<svg-icon name="icon-audit" />
</el-icon>
<span class="title_text">平台审批中</span>
<span class="title_text">审批中</span>
</div>
<!-- <div class="header_title" v-else-if="flowDetail.approveState == 'C'">
<div class="header_title" v-else-if="flowDetail.bizApproveState == 'C'">
<el-icon class="title-icon">
<svg-icon name="icon-revoke" />
</el-icon>
<span class="title_text">已撤销</span>
</div> -->
</div>
<div class="panel_body" v-if="flowDetail.approveState == 'R'">
</div>
<div class="panel_body" v-if="flowDetail.bizApproveState == 'R'">
<div class="results_list">
<div class="list_item">
<span class="item_label">平台审批意见:</span>
<span class="item_value">{{ flowDetail?.approveSuggest || '--' }}</span>
<span class="item_value">{{ flowDetail?.tdsApproveSuggest || '--' }}</span>
</div>
</div>
</div>
<div class="panel_body" v-if="flowDetail.bizApproveState == 'E'">
<div class="results_list">
<div class="list_item">
<span class="item_label">失败原因:</span>
<span class="item_value">{{ flowDetail?.tdsApproveErrorMsg || '--' }}</span>
</div>
</div>
</div>
......@@ -1517,6 +1531,19 @@ const viewVoucherFile = () => {
}
}
&.success {
background-color: #F4FEF6;
box-shadow: 0 0 0 1px #4FA55D;
.panel_header {
.header_title {
.el-icon {
color: #4FA55D;
}
}
}
}
&.reject {
background-color: #FDF2F4;
box-shadow: 0 0 0 1px #E63E33;
......@@ -1529,6 +1556,32 @@ const viewVoucherFile = () => {
}
}
}
&.audit {
background-color: #FEFBF3;
box-shadow: 0 0 0 1px #F19E40;
.panel_header {
.header_title {
.el-icon {
color: #F19E40;
}
}
}
}
&.revoke {
background-color: #F5F5F5;
box-shadow: 0 0 0 1px #CCCCCC;
.panel_header {
.header_title {
.el-icon {
color: #666666;
}
}
}
}
}
}
......
src/views/data_facilitator/settleDetail.vue
......@@ -290,20 +290,54 @@ const fileKeyNames = ref({
<template>
<div class="container_wrap full" v-loading="fullscreenloading">
<div class="content_main panel">
<div v-if="flowDetail.crossPlatformApproveState == 'R' || flowDetail.crossPlatformApproveState == 'E'"
:class="['panel_wrap', 'results_panel', 'reject']">
<div v-if="flowDetail.bizApproveState"
:class="['panel_wrap', 'results_panel', flowDetail.bizApproveState == 'Y' ? 'success' : ((flowDetail.bizApproveState == 'R' || flowDetail.bizApproveState == 'E') ? 'reject' : (flowDetail.bizApproveState == 'C' ? 'revoke' : 'audit'))]">
<div class="panel_header">
<div class="header_title" v-if="flowDetail.crossPlatformApproveState == 'R'">
<div class="header_title" v-if="flowDetail.bizApproveState == 'Y'">
<el-icon class="title-icon">
<svg-icon name="icon-success" />
</el-icon>
<span class="title_text">审批通过</span>
</div>
<div class="header_title" v-else-if="flowDetail.bizApproveState == 'R'">
<el-icon class="title-icon">
<CircleCloseFilled />
</el-icon>
<span class="title_text">主平台审批已驳回，请在列表页面查看具体驳回原因</span>
<span class="title_text">审批被驳回</span>
</div>
<div class="header_title" v-else-if="flowDetail.crossPlatformApproveState == 'E'">
<div class="header_title" v-else-if="flowDetail.bizApproveState == 'E'">
<el-icon class="title-icon">
<CircleCloseFilled />
</el-icon>
<span class="title_text">主平台审批发起失败，请在列表页面查看具体发起失败原因</span>
<span class="title_text">审批发起失败</span>
</div>
<div class="header_title" v-else-if="flowDetail.bizApproveState == 'A'">
<el-icon class="title-icon">
<svg-icon name="icon-audit" />
</el-icon>
<span class="title_text">审批中</span>
</div>
<div class="header_title" v-else-if="flowDetail.bizApproveState == 'C'">
<el-icon class="title-icon">
<svg-icon name="icon-revoke" />
</el-icon>
<span class="title_text">已撤销</span>
</div>
</div>
<div class="panel_body" v-if="flowDetail.bizApproveState == 'R'">
<div class="results_list">
<div class="list_item">
<span class="item_label">平台审批意见:</span>
<span class="item_value">{{ flowDetail?.tdsApproveSuggest || '--' }}</span>
</div>
</div>
</div>
<div class="panel_body" v-if="flowDetail.bizApproveState == 'E'">
<div class="results_list">
<div class="list_item">
<span class="item_label">失败原因:</span>
<span class="item_value">{{ flowDetail?.tdsApproveErrorMsg || '--' }}</span>
</div>
</div>
</div>
</div>
......@@ -682,6 +716,19 @@ const fileKeyNames = ref({
}
}
&.success {
background-color: #F4FEF6;
box-shadow: 0 0 0 1px #4FA55D;
.panel_header {
.header_title {
.el-icon {
color: #4FA55D;
}
}
}
}
&.reject {
background-color: #FDF2F4;
box-shadow: 0 0 0 1px #E63E33;
......@@ -694,6 +741,32 @@ const fileKeyNames = ref({
}
}
}
&.audit {
background-color: #FEFBF3;
box-shadow: 0 0 0 1px #F19E40;
.panel_header {
.header_title {
.el-icon {
color: #F19E40;
}
}
}
}
&.revoke {
background-color: #F5F5F5;
box-shadow: 0 0 0 1px #CCCCCC;
.panel_header {
.header_title {
.el-icon {
color: #666666;
}
}
}
}
}
}
</style>
\ No newline at end of file
......
src/views/data_facilitator/settleManagement.vue
......@@ -69,7 +69,7 @@ const tableFields = ref([
}
},
{
label: "审批状态", field: "approveState", type: "tag", width: 96, align: 'center',
label: "审批状态", field: "bizApproveState", type: "tag", width: 96, align: 'center',
// getName: (scope) => {
// const approveVO = scope.row.approveVO || {}
// switch (approveVO.approveState) {
......@@ -157,10 +157,9 @@ const tableInfo = ref({
const getTableBtns = (row, includeDetail = true) => {
let btnsArr: any[] = [];
const approveVO = row.approveVO;
const currentStaffGuid = userData.userGuid;
const approveState = row.approveState || 'N';
const bizApproveState = row.bizApproveState;
const approveState = row.bizApproveState || 'N';
// const bizApproveState = row.bizApproveState;
const staffGuid = row?.createUserId || '';
let isShowCancel = false;
let flowState;
......@@ -173,7 +172,7 @@ const getTableBtns = (row, includeDetail = true) => {
if ((approveState == 'C' || approveState == 'R') && staffGuid == currentStaffGuid) {
flowState = 3;
}
if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid) {
if (approveState == 'A' && staffGuid == currentStaffGuid) {
isShowCancel = true;
}
......@@ -185,10 +184,8 @@ const getTableBtns = (row, includeDetail = true) => {
// btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }])
// } else
if (flowState === 3) {
if (bizApproveState != 'D') {
btnsArr.push({ label: "重新提交", value: "edit" })
}
}
isShowCancel && btnsArr.push({ label: "撤销", value: "revoke" })
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!