8211b987 by lihua

验收修改

1 parent 0d7ae088
......@@ -218,7 +218,7 @@ export const continueContractNegotiate = (params) => request({
/** 获取可选的企业下拉列表,认证过之后带标识的 */
export const getContractTenantList = (tenantName = '') => request({
url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/connector-invoke/get-enterprise?tenantName=${tenantName}`,
url: `${import.meta.env.VITE_APP_DIGITAL_CONTRACT_URL}/tenant/get-enterprise?tenantName=${tenantName}`,
method: 'get'
})
......
......@@ -217,19 +217,19 @@ const tableInfo = ref({
let deliveryStatus = row.deliveryStatus;
if (deliveryStatus == 2) {//已交付有删除按钮
btns.push({
value: 'del', label: '删除', click: (scope) => {
proxy.$openMessageBox("此操作将永久删除, 是否继续?", () => {
value: 'del', label: '销毁', click: (scope) => {
proxy.$openMessageBox("此操作将永久销毁数据, 是否继续?", () => {
deleteDeliveryContract([scope.row.guid]).then((res: any) => {
if (res?.code == proxy.$passCode) {
page.value.curr = 1;
getTableData();
proxy.$ElMessage.success('删除成功');
proxy.$ElMessage.success('销毁成功');
} else {
res?.msg && proxy.$ElMessage.error(res?.msg);
}
});
}, () => {
proxy.$ElMessage.info("已取消");
proxy.$ElMessage.info("已取消销毁");
})
}
});
......
......@@ -117,7 +117,9 @@ const processInstanceId = ref('');
const registerDetailTableInfo = ref({
id: 'register-data-table',
rowKey: 'guid',
height: 220,
height: 'auto',
minPanelHeight: '60px',
minHeight: '60px',
loading: false,
fields: [{ label: "序号", type: "index", width: 56, align: "center" },
{ label: "事项", field: "title", width: 160, align: "left" },
......
......@@ -19,7 +19,6 @@ import { getParamsList, getDamTypesList } from "@/api/modules/dataAsset";
import {
changeNum,
} from "@/utils/common";
import { chunk } from "@/api/modules/common";
import { passFlowData, rejectFlowData, revokeFlowData, isMyFirstNode } from "@/api/modules/workFlowService";
const { proxy } = getCurrentInstance() as any;
......@@ -633,15 +632,16 @@ onBeforeMount(() => {
proxy.$ElMessage.error(res.msg);
}
})
getParamsList({
dictType: "数据产品上架审批合规信息",
}).then((res: any) => {
if (res.code == proxy.$passCode) {
assetsSafeInfo.value = res.data || [];
} else {
proxy.$ElMessage.error(res.msg);
}
})
// 连接器没有通过和驳回,不需要审批通过时填写合规信息。
// getParamsList({
// dictType: "数据产品上架审批合规信息",
// }).then((res: any) => {
// if (res.code == proxy.$passCode) {
// assetsSafeInfo.value = res.data || [];
// } else {
// proxy.$ElMessage.error(res.msg);
// }
// })
})
const assetsSafeInfo = ref<any>()
......@@ -928,7 +928,7 @@ const rejectDialogBtnClick = (btn, info) => {
@tableSwitchBeforeChange="tableSwitchBeforeChange" />
</div>
<el-dialog v-model="dialogVisible" :title="dialogTitle" width="550px" :close-on-click-modal="false">
<Form ref="listingFormRef" :itemList="formInfo.items" :rules="formInfo.rules" />
<!-- <Form ref="listingFormRef" :itemList="formInfo.items" :rules="formInfo.rules" /> -->
<el-input type="textarea" :rows="3" maxlength="100" v-model="approveSuggest" resize="none"
:placeholder="dynamicPlaceholder" />
<template #footer>
......
......@@ -1433,19 +1433,19 @@ onActivated(() => {
<el-table ref="execContractTableRef" :data="execContractTableInfo.data" :highlight-current-row="true" stripe
v-loading="execContractTableInfo.loading" border height="100%" tooltip-effect="light" row-key="guid" :style="{
width: '100%',
height: '300px',
height: '350px',
display: 'inline-block',
}">
<el-table-column type="expand">
<template #default="scope">
<div class="h-title mt6">履约证明</div>
<div class="list_panel" style="width: 1200px;">
<div class="list_item">
<div class="list_item is_block">
<span class="item_label">日志摘要:</span>
<span class="item_value"><ellipsis-tooltip :content="scope.row?.contractProof?.logHash || '--'"
class-name="w100f mr8-i" :refName="'tooltipOver' + 'logHash'"></ellipsis-tooltip></span>
</div>
<div class="list_item">
<div class="list_item is_block">
<span class="item_label">区块链交易ID:</span>
<span class="item_value row"><ellipsis-tooltip
:content="scope.row?.contractProof?.blockchainTx || '--'" class-name="w100f mr8-i"
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!