Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
71fb119e by lihua
Options

修改部分审批接口联调

1 parent 83b659b1
Inline Side-by-side
Showing 8 changed files with 82 additions and 72 deletions
src/api/modules/dataIdentify.ts
......@@ -89,7 +89,7 @@ export const getUserTenant = () => request({
// 获取企业信息
export const getEnterpriseData = (params) => request({
url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/connector-invoke/detail-by-logonUser`,
url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/detail-by-logonUser`,
method: 'get',
params
})
......
src/api/modules/dataRequire.ts
......@@ -94,7 +94,7 @@ export const getUserTenant = () => request({
// 获取企业信息
export const getEnterpriseData = (params) => request({
url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/connector-invoke/detail-by-logonUser`,
url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/enterprise/detail-by-logonUser`,
method: 'get',
params
})
......
src/api/modules/workFlowService.ts
......@@ -22,7 +22,7 @@ export const rejectFlowData = (params, serviceTenantGuid:any=null) => request({
})
// 审批撤销
export const revokeFlowData = (params, serviceTenantGuid:any=null) => request({
url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/canal-flow${ serviceTenantGuid ? `?serviceTenantGuid=${serviceTenantGuid}` : '' }`,
url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/connector-invoke/data/canal-flow${ serviceTenantGuid ? `?serviceTenantGuid=${serviceTenantGuid}` : '' }`,
method: 'post',
data: params
})
......
src/views/data_facilitator/authenticationManagement.vue
......@@ -883,7 +883,7 @@ const getTenant = () => {
detailGuid.value = data.guid || '';
bizApproveState.value = data.bizApproveState || '';
// crossPlatformApproveState.value = data.tdsApproveState || '';
isEdit.value = (bizApproveState.value == 'Y' || crossPlatformApproveState.value == 'Y' || bizApproveState.value == 'A' || crossPlatformApproveState.value == 'A' || bizApproveState.value == 'B') ? false : true;
isEdit.value = (bizApproveState.value == 'Y' || bizApproveState.value == 'E' || crossPlatformApproveState.value == 'Y' || bizApproveState.value == 'A' || crossPlatformApproveState.value == 'A' || bizApproveState.value == 'B') ? false : true;
contentFormItems.value[1].disabled = bizApproveState.value == 'Y' || crossPlatformApproveState.value == 'Y' ? true : false;
tableData.value = data.changeList || [];
orgData.value = data.domainRSVOS?.map(d => {
......
src/views/data_facilitator/certificationAudit.vue
......@@ -68,6 +68,12 @@ const handleApprovalDialogCancel = () => {
const tableFields: any = ref([
{ label: "序号", type: "index", width: 56, align: "center" },
{ label: "企业名称", field: "tenantName", width: 200, },
{
label: "机构类型", field: "tenantType", width: 120, getName: (scope) => {
const datas = typeMap.value?.tenantType;
return datas?.find((item) => item.value == scope.row.tenantType)?.label || '--';
}
},
{ label: "统一社会信用代码", field: "socialCreditCode", width: 160 },
{
label: "法人姓名", field: "juridicalPerson", width: TableColumnWidth.USERNAME,
......@@ -220,7 +226,7 @@ const getTableBtns = (row, includeDetail = true) => {
const promiseList = async (...promises: Promise<void>[]) => {
try {
await Promise.all(promises).then((res) => {
setTableField();
// setTableField();
});
} catch (e) {
loading.value = false;
......@@ -241,15 +247,6 @@ const getDataType = (dictType, fieldName) => {
})
}
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.tenantType)?.label || '--';
}
});
}
const toSearch = (val: any, clear: boolean = false) => {
page.value.curr = 1;
if (clear) {
......@@ -270,8 +267,8 @@ const getTableData = () => {
getEnterpriseList({
pageSize: page.value.limit,
pageIndex: page.value.curr,
param1Like: page.value.tenantName,
param2: page.value.tenantType,
tenantName: page.value.tenantName,
tenantType: page.value.tenantType,
flowTypeList: ["10013", "10014"],
tenantGuid: userData.tenantGuid,
staffGuid: userData.staffGuid,
......
src/views/data_facilitator/settleManagement.vue
......@@ -169,7 +169,7 @@ const getTableBtns = (row, includeDetail = true) => {
// if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) {
// flowState = 2;
// }
if ((approveState == 'C' || approveState == 'R') && staffGuid == currentStaffGuid) {
if ((approveState == 'C' || approveState == 'E' || approveState == 'R') && staffGuid == currentStaffGuid) {
flowState = 3;
}
if (approveState == 'A' && staffGuid == currentStaffGuid) {
......
src/views/data_product/productListing.vue
......@@ -106,7 +106,7 @@ const tableInfo = ref({
},
// { label: "上架分类", field: "exchangeName", width: 140 },
{
label: "审批状态", field: "approveState", type: "tag", width: TableColumnWidth.STATE, align: 'center'
label: "审批状态", field: "bizApproveState", type: "tag", width: TableColumnWidth.STATE, align: 'center'
},
{
label: '上架状态', field: 'listingStatus', width: 100, getName: (scope) => {
......@@ -138,7 +138,7 @@ const tableInfo = ref({
width: 170,
btns: (scope) => {
const { row } = scope;
const bizApproveState = row.approveState;
const bizApproveState = row.bizApproveState;
let flowState;
if (bizApproveState == 'N') {
flowState = 1;
......@@ -181,7 +181,7 @@ const tableInfo = ref({
if (flowState === 3) {
list.push({ label: "删除", value: "del" })
}
if (flowState === 3 && bizApproveState != 'D') { //重新提交过的不能再重新提交
if (flowState === 3) { //重新提交过的不能再重新提交 && bizApproveState != 'D'
list.push({ label: "重新提交", value: "redit" }) //已驳回
}
if (isShowCancel) {
......@@ -384,26 +384,25 @@ const tableBtnClick = (scope, btn) => {
}
//撤销
if (type == 'revoke') {
//TODO。撤销调用什么接口。
// ElMessageBox.confirm(`撤销后，该流程将不再进行审核，确定这样操作吗？`, "提示", {
// confirmButtonText: "确定",
// cancelButtonText: "取消",
// type: 'warning',
// }).then(() => {
// revokeFlowData({
// guid: row.approveVO.approveGuid,
// flowType: row.approveVO.flowType,
// approveStaffGuid: userData.staffGuid
// }, row.tenantGuid).then((res: any) => {
// if (res.code == '00000') {
// ElMessage.success('撤销成功！')
// getTableData();
// getListingCountData();
// } else {
// ElMessage.error(res.msg)
// }
// })
// });
ElMessageBox.confirm(`撤销后，该流程将不再进行审核，确定这样操作吗？`, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: 'warning',
}).then(() => {
revokeFlowData({
guid: row.approveVO.approveGuid,
flowType: row.approveVO.flowType,
approveStaffGuid: userData.staffGuid
}, row.tenantGuid).then((res: any) => {
if (res.code == '00000') {
ElMessage.success('撤销成功！')
getTableData();
getListingCountData();
} else {
ElMessage.error(res.msg)
}
})
});
}
if (type == 'pass') {
......
src/views/data_product/productListingDetail.vue
......@@ -1766,43 +1766,57 @@ const rejectDialogBtnClick = (btn, info) => {
<template>
<div class="container_wrap" v-loading="flowDetailLoading">
<div class="content_main">
<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 class="panel_header">
<div class="header_title" v-if="flowDetail.approveState == '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.approveState == 'R'">
<el-icon class="title-icon">
<CircleCloseFilled />
</el-icon>
<span class="title_text">平台被驳回</span>
</div>
<div class="header_title" v-else-if="flowDetail.approveState == '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.approveState == 'C'">
<el-icon class="title-icon">
<svg-icon name="icon-revoke" />
</el-icon>
<span class="title_text">已撤销</span>
<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.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>
</div>
<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>
</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 class="panel_body" v-if="flowDetail.approveState == 'R'">
<div class="results_list">
<div class="list_item">
<span class="item_label">平台审批意见:</span>
<span class="item_value">{{ flowDetail?.approveSuggest || '--' }}</span>
</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>
<div class="panel_wrap">
<div class="panel_header">
<div class="header_title">
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!