Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
4677fa81 by lihua
Options

去掉身份认证代码

1 parent 85f91ac2
Inline Side-by-side
Showing 8 changed files with 247 additions and 205 deletions
src/views/data_facilitator/authenticationManagement.vue
......@@ -882,7 +882,7 @@ const getTenant = () => {
flowDetail.value = data;
detailGuid.value = data.guid || '';
bizApproveState.value = data.bizApproveState || '';
crossPlatformApproveState.value = data.crossPlatformApproveState || '';
// crossPlatformApproveState.value = data.tdsApproveState || '';
isEdit.value = (bizApproveState.value == 'Y' || 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 || [];
......@@ -1279,7 +1279,7 @@ const btnClick = async (btn, bType = null) => {
}
params.attachmentRQVOS = attachmentRQVOS;
if (bizApproveState.value == 'Y' && crossPlatformApproveState.value == 'Y') {
if (bizApproveState.value == 'Y') {
let flowParams: any = {};
flowParams.flowType = '10014';
flowParams.bizGuid = detailGuid.value;
......@@ -1337,7 +1337,7 @@ const btnClick = async (btn, bType = null) => {
});
} else if (type == 'cancel') {
setFormItems();
if (bizApproveState.value == 'Y' && crossPlatformApproveState.value == 'Y') {
if (bizApproveState.value == 'Y') {
setFormDisable();
}
} else if (type == 'change') {
......@@ -1380,7 +1380,7 @@ onBeforeMount(() => {
res?.msg && proxy.$ElMessage.error(res?.msg);
}
})
getParamsList({ dictType: '行业分类', level: 1 }).then((res: any) => {
getParamsList({ dictType: '行业分类' }).then((res: any) => {
if (res?.code == proxy.$passCode) {
industryList.value = res.data || [];
let index = contentFormItems.value.findIndex(item => item.field == 'industry');
......@@ -1613,7 +1613,7 @@ const viewVoucherFile = () => {
<div class="empty_tips" v-else>暂无变更信息</div>
</div>
</ContentWrap>
<ContentWrap title="认证结果信息" v-if="bizApproveState == 'Y' && crossPlatformApproveState == 'Y' && !isEdit" expandSwicth style="margin-top: 15px" :isExpand="expandResult"
<ContentWrap title="认证结果信息" v-if="bizApproveState == 'Y' && !isEdit" expandSwicth style="margin-top: 15px" :isExpand="expandResult"
@expand="(v) => expandResult = v">
<div class="list_panel">
<div class="list_item">
......@@ -1641,7 +1641,7 @@ const viewVoucherFile = () => {
@click="btnClick({ value: 'save' })">保存</el-button> -->
<el-button type="primary" @click="btnClick({ value: 'submit' })">提交</el-button>
</div>
<div class="btns" v-else-if="bizApproveState == 'Y' && crossPlatformApproveState == 'Y' && !isEdit">
<div class="btns" v-else-if="bizApproveState == 'Y' && !isEdit">
<el-button type="primary" @click="btnClick({ value: 'change' })">变更认证</el-button>
</div>
</div>
......
src/views/data_facilitator/certificationAudit.vue
......@@ -88,48 +88,49 @@ const tableFields: any = ref([
}
},
{
label: "审批状态", field: "bizApproveState", type: "tag", width: TableColumnWidth.STATE, align: 'center', getName: (scope) => {
const approveState = scope.row.bizApproveState
switch (approveState) {
case 'N':
return '草稿中';
case 'A':
return '审批中';
case 'Y':
return '已通过';
case 'R':
return '已驳回';
case 'C':
return '已撤销';
case 'D':
return '已废弃';
default:
return '--';
}
}, tagType: (scope) => {
const approveState = scope.row.bizApproveState
switch (approveState) {
case 'A':
return 'warning';
case 'Y':
return 'success';
case 'R':
return 'danger';
default:
return 'info';
}
}
},
{
label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 150, align: 'center', btn: {
label: '查看', visible: (scope) => {
return scope.row.crossPlatformApproveState != null;
}, click: (scope) => {
systemApproveCurrentRowInfo.value = scope.row;
approvalDialogVisible.value = true;
}
}
label: "审批状态", field: "approveState", type: "tag", width: TableColumnWidth.STATE, align: 'center',
// getName: (scope) => {
// const approveState = scope.row.bizApproveState
// switch (approveState) {
// case 'N':
// return '草稿中';
// case 'A':
// return '审批中';
// case 'Y':
// return '已通过';
// case 'R':
// return '已驳回';
// case 'C':
// return '已撤销';
// case 'D':
// return '已废弃';
// default:
// return '--';
// }
// }, tagType: (scope) => {
// const approveState = scope.row.bizApproveState
// switch (approveState) {
// case 'A':
// return 'warning';
// case 'Y':
// return 'success';
// case 'R':
// return 'danger';
// default:
// return 'info';
// }
// }
},
// {
// label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 150, align: 'center', btn: {
// label: '查看', visible: (scope) => {
// return scope.row.crossPlatformApproveState != null;
// }, click: (scope) => {
// systemApproveCurrentRowInfo.value = scope.row;
// approvalDialogVisible.value = true;
// }
// }
// },
{
label: "提交时间", field: "createTime", width: TableColumnWidth.DATETIME, getName: (scope) => {
return scope.row.createTime ? Moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '--';
......@@ -166,7 +167,7 @@ const tableInfo = ref({
actionInfo: {
label: "操作",
type: "btn",
width: 180,
width: 170,
btns: (scope) => {
let row = scope.row;
return getTableBtns(row);
......@@ -176,34 +177,36 @@ const tableInfo = ref({
const getTableBtns = (row, includeDetail = true) => {
let btnsArr: any[] = [];
const currentStaffGuid = userData.staffGuid;
const approveState = row.bizApproveState || 'N';
const approveStaffGuids = row.approveStaffGuids || [];
const staffGuid = row.staffGuid || '';
const currentStaffGuid = userData.userGuid
const approveState = row.approveState;
const staffGuid = row.createUserId || '';
let flowState;
if (approveState == 'N' && staffGuid == currentStaffGuid) {
flowState = 1;
}
if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) {
flowState = 2;
}
// if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) {
// flowState = 2;
// }
if ((approveState == 'C' || approveState == 'R') && staffGuid == currentStaffGuid) {
flowState = 3;
}
if (row.flowType == '10013' && approveState == 'Y') {
flowState = 4;
}
// if (row.flowType == '10013' && approveState == 'Y') {
// flowState = 4;
// }
btnsArr.push({ label: "详情", value: "detail" })
if (flowState === 1) {
btnsArr.push({ label: "删除", value: "delete" })
} else if (flowState === 2) {
btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }])
} else if (flowState === 3) {
}
// else if (flowState === 2) {
// btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }])
// }
else if (flowState === 3) {
btnsArr.push({ label: "删除", value: "delete" })
} else if (flowState === 4) {
btnsArr.push({ label: "查看进度", value: "progress" })
}
// else if (flowState === 4) {
// btnsArr.push({ label: "查看进度", value: "progress" })
// }
return btnsArr
}
......
src/views/data_facilitator/certificationAuditDetail.vue
......@@ -1147,7 +1147,7 @@ onBeforeMount(() => {
() => getDetail(),
)
}
getParamsList({ dictType: '行业分类', level: 1 }).then((res: any) => {
getParamsList({ dictType: '行业分类' }).then((res: any) => {
if (res?.code == proxy.$passCode) {
industryList.value = res.data || [];
let index = contentFormItems.value.findIndex(item => item.field == 'industry');
......@@ -1214,21 +1214,40 @@ const viewVoucherFile = () => {
<template>
<div class="container_wrap full" v-loading="loading">
<div class="content_main panel">
<div
v-if="detailType == 'detail' && (flowDetail.crossPlatformApproveState == 'R' || flowDetail.crossPlatformApproveState == 'E')"
:class="['panel_wrap', 'results_panel', 'reject']">
<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.crossPlatformApproveState == 'R'">
<div class="header_title" v-if="flowDetail.approveState == 'Y'">
<el-icon class="title-icon">
<CircleCloseFilled />
<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.crossPlatformApproveState == 'E'">
<div class="header_title" v-else-if="flowDetail.approveState == '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'">
<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> -->
</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>
</div>
......@@ -1284,9 +1303,9 @@ const viewVoucherFile = () => {
<div class="empty_tips" v-else>暂无变更信息</div>
</div>
</ContentWrap>
<ContentWrap title="认证结果信息" v-if="approveState == 'Y'" expandSwicth style="margin-top: 15px" :isExpand="expandResult"
@expand="(v) => expandResult = v">
<div class="list_panel">
<ContentWrap title="认证结果信息" v-if="approveState == 'Y'" expandSwicth style="margin-top: 15px"
:isExpand="expandResult" @expand="(v) => expandResult = v">
<div class="list_panel">
<div class="list_item">
<span class="item_label">认证时间：</span>
<span class="item_value">{{ flowDetail.credentialTime || '--' }}</span>
......@@ -1298,21 +1317,21 @@ const viewVoucherFile = () => {
</div>
</div>
</ContentWrap>
<ContentWrap id="id-approveInfo" title="审核信息" expandSwicth style="margin-top: 15px" :isExpand="expand6"
<!-- <ContentWrap id="id-approveInfo" title="审核信息" expandSwicth style="margin-top: 15px" :isExpand="expand6"
@expand="(v) => expand6 = v">
<ApprovalProcess ref="approvalProcessRef" v-if="deploymentId" :deploymentId="deploymentId"
:processInstanceId="processInstanceId">
</ApprovalProcess>
</ContentWrap>
</ContentWrap> -->
</div>
<div class="tool_btns">
<div class="btns">
<el-button @click="btnClick({ value: 'cancel' })" v-if="detailType == 'detail'">关闭</el-button>
<el-button @click="btnClick({ value: 'cancel' })" v-else>取消</el-button>
<!-- <el-button @click="btnClick({ value: 'cancel' })" v-else>取消</el-button>
<el-button type="primary" @click="btnClick({ value: 'pass' })"
v-if="approveState == 'A' && flowState == 2">通过</el-button>
<el-button type="danger" plain @click="btnClick({ value: 'reject' })"
v-if="approveState == 'A' && flowState == 2">驳回</el-button>
v-if="approveState == 'A' && flowState == 2">驳回</el-button> -->
</div>
</div>
<Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" />
......
src/views/data_facilitator/settleDetail.vue
......@@ -37,14 +37,13 @@ const toolBtns: any = computed(() => {
let btnsArr: any = [{
label: "关闭", value: "cancel", plain: true
}];
let approveVO = flowDetail.value.approveVO;
let staffGuid = userData.staffGuid;
if (approveVO && approveVO.approveState == 'A' && approveVO.approveStaffGuids && approveVO.approveStaffGuids.indexOf(staffGuid) > -1) {
btnsArr.push(...[{ label: "通过", value: "pass", type: 'primary' }, { label: "驳回", value: "reject", type: 'danger', plain: true }]);
}
if (approveVO && approveVO.approveState == 'A' && approveVO.staffGuid == staffGuid) {
btnsArr.push({ label: "撤销", value: "revoke" });
}
let staffGuid = userData.userGuid;
// if (approveVO && approveVO.approveState == 'A' && approveVO.approveStaffGuids && approveVO.approveStaffGuids.indexOf(staffGuid) > -1) {
// btnsArr.push(...[{ label: "通过", value: "pass", type: 'primary' }, { label: "驳回", value: "reject", type: 'danger', plain: true }]);
// }
// if (flowDetail.value.approveState == 'A' && flowDetail.value.createUserId == staffGuid) {
// btnsArr.push({ label: "撤销", value: "revoke" });
// }
return btnsArr;
});
......@@ -257,8 +256,8 @@ const getDetail = () => {
if (res?.code == proxy.$passCode) {
flowDetail.value = res.data || {};
flowDetail.value.accessMethodName = assessMethodList.find(a => a.value == flowDetail.value.accessMethod)?.label;
deploymentId.value = res.data.approveVO.camundaDeploymentId
processInstanceId.value = res.data.approveVO.camundaInstanceId
// deploymentId.value = res.data.approveVO.camundaDeploymentId
// processInstanceId.value = res.data.approveVO.camundaInstanceId
flowDetail.value.tdsConnectorVerifiable.thirdPartyCertification = [];
} else {
proxy.$ElMessage.error(res.msg);
......@@ -447,12 +446,12 @@ const fileKeyNames = ref({
</template>
</div>
</ContentWrap>
<ContentWrap id="id-approveInfo" title="审核信息" expandSwicth style="margin-top: 15px" :isExpand="expandApprove"
<!-- <ContentWrap id="id-approveInfo" title="审核信息" expandSwicth style="margin-top: 15px" :isExpand="expandApprove"
@expand="(v) => expandApprove = v">
<ApprovalProcess ref="approvalProcessRef" v-if="deploymentId" :deploymentId="deploymentId"
:processInstanceId="processInstanceId">
</ApprovalProcess>
</ContentWrap>
</ContentWrap> -->
<ContentWrap v-if="flowDetail.connectorIdentity" title="连接器凭证信息" expandSwicth style="margin-top: 15px" :isExpand="expandCert"
@expand="(v) => expandCert = v">
<div class="list_panel">
......@@ -471,12 +470,12 @@ const fileKeyNames = ref({
</div>
</div>
</ContentWrap>
<ContentWrap id="id-approveInfo" title="审核信息" expandSwicth style="margin-top: 15px" :isExpand="expandApprove"
<!-- <ContentWrap id="id-approveInfo" title="审核信息" expandSwicth style="margin-top: 15px" :isExpand="expandApprove"
@expand="(v) => expandApprove = v">
<ApprovalProcess ref="approvalProcessRef" v-if="deploymentId" :deploymentId="deploymentId"
:processInstanceId="processInstanceId">
</ApprovalProcess>
</ContentWrap>
</ContentWrap> -->
</div>
<div class="tool_btns">
<div class="btns">
......
src/views/data_facilitator/settleManagement.vue
......@@ -69,50 +69,51 @@ const tableFields = ref([
}
},
{
label: "审批状态", field: "approveVO", type: "tag", width: 96, align: 'center', getName: (scope) => {
const approveVO = scope.row.approveVO || {}
switch (approveVO.approveState) {
case 'N':
return '草稿中';
case 'A':
return '审批中';
case 'Y':
return '已通过';
case 'R':
return '已驳回';
case 'C':
return '已撤销';
case 'I':
return '--';
default:
return '草稿中';
}
}, tagType: (scope) => {
const approveVO = scope.row.approveVO || {}
switch (approveVO.approveState) {
case 'A':
return 'warning';
case 'Y':
return 'success';
case 'R':
return 'danger';
default:
return 'info';
}
}
label: "审批状态", field: "approveState", type: "tag", width: 96, align: 'center',
// getName: (scope) => {
// const approveVO = scope.row.approveVO || {}
// switch (approveVO.approveState) {
// case 'N':
// return '草稿中';
// case 'A':
// return '审批中';
// case 'Y':
// return '已通过';
// case 'R':
// return '已驳回';
// case 'C':
// return '已撤销';
// case 'I':
// return '--';
// default:
// return '草稿中';
// }
// }, tagType: (scope) => {
// const approveVO = scope.row.approveVO || {}
// switch (approveVO.approveState) {
// case 'A':
// return 'warning';
// case 'Y':
// return 'success';
// case 'R':
// return 'danger';
// default:
// return 'info';
// }
// }
},
// { label: "同步状态", field: "approveVO", type: "tag", },
// 专区才需要显示的
{
label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 170, align: 'center', btn: {
label: '查看', visible: (scope) => {
return scope.row.crossPlatformApproveState != null;
}, click: (scope) => {
systemApproveCurrentRowInfo.value = scope.row;
approvalDialogVisible.value = true;
}
}
},
// {
// label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 170, align: 'center', btn: {
// label: '查看', visible: (scope) => {
// return scope.row.crossPlatformApproveState != null;
// }, click: (scope) => {
// systemApproveCurrentRowInfo.value = scope.row;
// approvalDialogVisible.value = true;
// }
// }
// },
{ label: "法人或其他组织", field: "legalEntity", width: 200 },
{ label: "修改人", field: "updateUserName", width: 130 },
{ label: "修改时间", field: "updateTime", width: 170 },
......@@ -157,19 +158,18 @@ const tableInfo = ref({
const getTableBtns = (row, includeDetail = true) => {
let btnsArr: any[] = [];
const approveVO = row.approveVO;
const currentStaffGuid = userData.staffGuid
const currentStaffGuid = userData.userGuid;
const approveState = row.approveState || 'N';
const bizApproveState = row.bizApproveState;
const approveState = approveVO?.approveState || 'N';
const approveStaffGuids = approveVO?.approveStaffGuids || [];
const staffGuid = approveVO?.staffGuid || '';
const staffGuid = row?.createUserId || '';
let isShowCancel = false;
let flowState;
if (approveState == 'N') {
flowState = 1;
}
if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) {
flowState = 2;
}
// if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) {
// flowState = 2;
// }
if ((approveState == 'C' || approveState == 'R') && staffGuid == currentStaffGuid) {
flowState = 3;
}
......@@ -181,9 +181,10 @@ const getTableBtns = (row, includeDetail = true) => {
btnsArr = [{ label: "编辑", value: "edit" }, { label: "删除", value: "delete" }]
} else {
btnsArr.push({ label: "详情", value: "detail" })
if (flowState === 2) {
btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }])
} else if (flowState === 3) {
// if (flowState === 2) {
// btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }])
// } else
if (flowState === 3) {
if (bizApproveState != 'D') {
btnsArr.push({ label: "重新提交", value: "edit" })
}
......@@ -312,10 +313,11 @@ const tablePageChange = (info) => {
};
const newCreate = () => {
if (tenantData.isCertification != 'Y') {
proxy.$ElMessage.error('请先进行企业认证，再新增连接器');
return;
}
// TODO，要不要加企业认证。
// if (tenantData.isCertification != 'Y') {
// proxy.$ElMessage.error('请先进行企业认证，再新增连接器');
// return;
// }
router.push({
name: 'settleStart'
});
......
src/views/data_facilitator/settleStart.vue
......@@ -6,7 +6,6 @@ name: settleStart
import useUserStore from "@/store/modules/user";
import { useValidator } from "@/hooks/useValidator";
import useDataConnectorStore from "@/store/modules/dataConnector";
import { getCamundaDeploymentId } from "@/api/modules/workFlowService";
import {
saveConnector,
updateConnector,
......@@ -42,7 +41,7 @@ const expandImpact = ref(false);
const expandValid = ref(false);
const approveInfoExpand = ref(false);
const deploymentId = ref("");
// const deploymentId = ref("");
const processInstanceId = ref("");
/** 连接器身份信息表单配置 */
......@@ -591,15 +590,15 @@ const connectorDetailInfo: any = ref({});
onBeforeMount(() => {
if (!guid) {
getCamundaDeploymentId("10031", userData.tenantGuid, userData.staffGuid).then(
(res: any) => {
if (res.code == proxy.$passCode) {
deploymentId.value = res.data;
} else {
proxy.$ElMessage.error(res.msg);
}
}
);
// getCamundaDeploymentId("10031", userData.tenantGuid, userData.staffGuid).then(
// (res: any) => {
// if (res.code == proxy.$passCode) {
// deploymentId.value = res.data;
// } else {
// proxy.$ElMessage.error(res.msg);
// }
// }
// );
fullscreenLoading.value = true;
getEnterpriseData({
logonUser: userData.tenantName == "非认证会员" ? userData.logonUser : tenantData.logonUser
......@@ -642,19 +641,19 @@ onBeforeMount(() => {
}
if (res1?.code == proxy.$passCode) {
let connectorDetail = connectorDetailInfo.value = res1?.data || {};
deploymentId.value = connectorDetail.approveVO?.camundaDeploymentId || '';
processInstanceId.value = connectorDetail.approveVO?.camundaInstanceId || '';
if (!deploymentId.value) {
getCamundaDeploymentId("10031", userData.tenantGuid, userData.staffGuid).then(
(res: any) => {
if (res.code == proxy.$passCode) {
deploymentId.value = res.data;
} else {
proxy.$ElMessage.error(res.msg);
}
}
);
}
// deploymentId.value = connectorDetail.approveVO?.camundaDeploymentId || '';
// processInstanceId.value = connectorDetail.approveVO?.camundaInstanceId || '';
// if (!deploymentId.value) {
// getCamundaDeploymentId("10031", userData.tenantGuid, userData.staffGuid).then(
// (res: any) => {
// if (res.code == proxy.$passCode) {
// deploymentId.value = res.data;
// } else {
// proxy.$ElMessage.error(res.msg);
// }
// }
// );
// }
let approveVO = connectorDetail.approveVO || {};
if ((approveVO.approveState == 'C' || approveVO.approveState == 'R') && approveVO.staffGuid == userData.staffGuid && connectorDetail.bizApproveState != 'D') {
restart.value = true;
......@@ -714,11 +713,11 @@ onBeforeMount(() => {
<Form ref="validInfoFormRef" formId="valid-info-form" :itemList="validInfoFormItems" :rules="validInfoFormRules"
col="col3" />
</ContentWrap>
<ContentWrap id="id-approveInfo" title="审批信息" :isExpand="approveInfoExpand" expandSwicth style="margin-top: 15px"
<!-- <ContentWrap id="id-approveInfo" title="审批信息" :isExpand="approveInfoExpand" expandSwicth style="margin-top: 15px"
@expand="(v) => (approveInfoExpand = v)">
<ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :definitionId="''">
</ApprovalProcess>
</ContentWrap>
</ContentWrap> -->
</div>
<div class="tool_btns">
<div class="btns">
......
src/views/data_product/productListing.vue
......@@ -105,7 +105,7 @@ const tableInfo = ref({
},
// { label: "上架分类", field: "exchangeName", width: 140 },
{
label: "审批状态", field: "approveVO", type: "approveTag", width: TableColumnWidth.STATE, align: 'center'
label: "审批状态", field: "approveState", type: "tag", width: TableColumnWidth.STATE, align: 'center'
},
{
label: '上架状态', field: 'listingStatus', width: 100, getName: (scope) => {
......@@ -143,7 +143,7 @@ const tableInfo = ref({
flowState = 1;
}
const currentStaffGuid = userData.staffGuid
const currentStaffGuid = userData.userGuid
// const bizApproveState = row.approveState;
// const approveState = approveVO.approveState || null;
// const approveStaffGuids = approveVO.approveStaffGuids || [];
......@@ -383,25 +383,26 @@ const tableBtnClick = (scope, btn) => {
}
//撤销
if (type == 'revoke') {
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)
}
})
});
//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)
// }
// })
// });
}
if (type == 'pass') {
......
src/views/data_product/productListingDetail.vue
......@@ -683,8 +683,8 @@ const getProductDetail = async () => {
if (res.code == proxy.$passCode) {
const data = res.data || {}
flowDetail.value = data;
deploymentId.value = data.approveVO.camundaDeploymentId
processInstanceId.value = data.approveVO.camundaInstanceId
// deploymentId.value = data.approveVO.camundaDeploymentId
// processInstanceId.value = data.approveVO.camundaInstanceId
// if (res.data.qualityEvaluationFile && res.data.qualityEvaluationFile.length) {
// flowDetail.value.qualityEvaluationFile = { name: res.data.qualityEvaluationFile[0].name, url: res.data.qualityEvaluationFile[0].url }
// }
......@@ -1766,21 +1766,40 @@ const rejectDialogBtnClick = (btn, info) => {
<template>
<div class="container_wrap" v-loading="flowDetailLoading">
<div class="content_main">
<div v-if="detailType == 'detail' && (flowDetail.approveState == 'R' || flowDetail.approveState == 'E')"
:class="['panel_wrap', 'results_panel', 'reject']">
<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 == 'R'">
<div class="header_title" v-if="flowDetail.approveState == 'Y'">
<el-icon class="title-icon">
<CircleCloseFilled />
<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 == 'E'">
<div class="header_title" v-else-if="flowDetail.approveState == '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'">
<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>
</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>
</div>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!