e290eaa5 by xukangle

fix 隐藏审批

1 parent 3026be5d
......@@ -85,8 +85,8 @@ export const getProduct = (params) => request({
// 查看平台会员信息
export const getTenantInfo = (params) => request({
// url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/getByGuid/${params}`,
// url: `http://localhost:9000/circulation/ms-data-circulation-portal-service/enterprise/detail-by-name`,
url: `http://192.168.6.22:29900/circulation/ms-data-circulation-portal-service/enterprise/detail-by-name`,
url: `http://localhost:9000/circulation/ms-data-circulation-portal-service/enterprise/detail-by-name`,
// url: `http://192.168.6.22:29900/circulation/ms-data-circulation-portal-service/enterprise/detail-by-name`,
method: 'get',
params
})
......
......@@ -354,6 +354,9 @@ onMounted(() => {
// }
// }
// }, 100));
if (route.query.type === 'certificate') {
tabsInfo.value.tabs = tabsInfo.value.tabs.filter(tab => tab.name !== 'approveInfo');
}
window.addEventListener('resize', () => {
isTextTruncated();
})
......@@ -1838,7 +1841,7 @@ const formattedDate = (dateVal) => {
</div>
</ContentWrap>
<ContentWrap id="id-approveInfo" title="审批信息" expandSwicth style="margin-top: 15px"
:isExpand="approveInfoExpand" @expand="(v) => approveInfoExpand = v">
:isExpand="approveInfoExpand" @expand="(v) => approveInfoExpand = v" v-if="route.query.type != 'certificate'">
<!-- <Table :tableInfo="approveTableInfo" /> -->
<ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :processInstanceId="processInstanceId">
</ApprovalProcess>
......
......@@ -388,14 +388,13 @@ const clearFormValues = (formInline) => {
const fullscreenLoading = ref(false);
const passSubmit = () => {
let row = currTableData.value
listingFormRef.value.ruleFormRef.validate().then((valid) => {
if (valid) {
let complianceInfoMap = {}
formInfo.value.items.forEach((item) => {
assetsSafeInfo.value.forEach((item1) => {
if (item.label == item1.label) {
complianceInfoMap[item1.value] = listingFormRef.value.formInline[item.field]
complianceInfoMap[`"${item1.value}"`] = listingFormRef.value.formInline[item.field];
}
})
})
......@@ -404,7 +403,8 @@ const passSubmit = () => {
flowType: row.approveVO.flowType,
approveSuggest: approveSuggest.value,
approveStaffGuid: userData.staffGuid,
complianceInfoMap: complianceInfoMap
complianceInfoMap: complianceInfoMap,
bizGuid: row.approveVO.bizGuid,
}).then((res: any) => {
if (res.code == '00000') {
fullscreenLoading.value = false;
......@@ -437,17 +437,14 @@ const listingFormRef = ref<any>();
const rejectSubmit = async () => {
if (!approveSuggest.value) return ElMessage.error('请填写驳回理由!')
let row = currTableData.value
console.log(row, '--------')
listingFormRef.value.ruleFormRef.validate().then((valid) => {
if (valid) {
console.log(listingFormRef.value.formInline, '-------------------')
let complianceInfoMap = {}
formInfo.value.items.forEach((item) => {
console.log(item, '-------------------')
assetsSafeInfo.value.forEach((item1) => {
if (item.label == item1.label) {
console.log(item1.value, item.default, '-------------------')
complianceInfoMap[item1.value] = listingFormRef.value.formInline[item.field]
complianceInfoMap[`"${item1.value}"`] = listingFormRef.value.formInline[item.field];
}
})
})
......@@ -456,7 +453,8 @@ const rejectSubmit = async () => {
flowType: row.approveVO.flowType,
approveSuggest: approveSuggest.value,
approveStaffGuid: userData.staffGuid,
complianceInfoMap: complianceInfoMap
complianceInfoMap: complianceInfoMap,
bizGuid: row.approveVO.bizGuid,
}).then((res: any) => {
if (res.code == '00000') {
fullscreenLoading.value = false;
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!