e290eaa5 by xukangle

fix 隐藏审批

1 parent 3026be5d
...@@ -85,8 +85,8 @@ export const getProduct = (params) => request({ ...@@ -85,8 +85,8 @@ export const getProduct = (params) => request({
85 // 查看平台会员信息 85 // 查看平台会员信息
86 export const getTenantInfo = (params) => request({ 86 export const getTenantInfo = (params) => request({
87 // url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/getByGuid/${params}`, 87 // url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/getByGuid/${params}`,
88 // url: `http://localhost:9000/circulation/ms-data-circulation-portal-service/enterprise/detail-by-name`, 88 url: `http://localhost:9000/circulation/ms-data-circulation-portal-service/enterprise/detail-by-name`,
89 url: `http://192.168.6.22:29900/circulation/ms-data-circulation-portal-service/enterprise/detail-by-name`, 89 // url: `http://192.168.6.22:29900/circulation/ms-data-circulation-portal-service/enterprise/detail-by-name`,
90 method: 'get', 90 method: 'get',
91 params 91 params
92 }) 92 })
......
...@@ -354,6 +354,9 @@ onMounted(() => { ...@@ -354,6 +354,9 @@ onMounted(() => {
354 // } 354 // }
355 // } 355 // }
356 // }, 100)); 356 // }, 100));
357 if (route.query.type === 'certificate') {
358 tabsInfo.value.tabs = tabsInfo.value.tabs.filter(tab => tab.name !== 'approveInfo');
359 }
357 window.addEventListener('resize', () => { 360 window.addEventListener('resize', () => {
358 isTextTruncated(); 361 isTextTruncated();
359 }) 362 })
...@@ -1838,7 +1841,7 @@ const formattedDate = (dateVal) => { ...@@ -1838,7 +1841,7 @@ const formattedDate = (dateVal) => {
1838 </div> 1841 </div>
1839 </ContentWrap> 1842 </ContentWrap>
1840 <ContentWrap id="id-approveInfo" title="审批信息" expandSwicth style="margin-top: 15px" 1843 <ContentWrap id="id-approveInfo" title="审批信息" expandSwicth style="margin-top: 15px"
1841 :isExpand="approveInfoExpand" @expand="(v) => approveInfoExpand = v"> 1844 :isExpand="approveInfoExpand" @expand="(v) => approveInfoExpand = v" v-if="route.query.type != 'certificate'">
1842 <!-- <Table :tableInfo="approveTableInfo" /> --> 1845 <!-- <Table :tableInfo="approveTableInfo" /> -->
1843 <ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :processInstanceId="processInstanceId"> 1846 <ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :processInstanceId="processInstanceId">
1844 </ApprovalProcess> 1847 </ApprovalProcess>
......
...@@ -388,14 +388,13 @@ const clearFormValues = (formInline) => { ...@@ -388,14 +388,13 @@ const clearFormValues = (formInline) => {
388 const fullscreenLoading = ref(false); 388 const fullscreenLoading = ref(false);
389 const passSubmit = () => { 389 const passSubmit = () => {
390 let row = currTableData.value 390 let row = currTableData.value
391
392 listingFormRef.value.ruleFormRef.validate().then((valid) => { 391 listingFormRef.value.ruleFormRef.validate().then((valid) => {
393 if (valid) { 392 if (valid) {
394 let complianceInfoMap = {} 393 let complianceInfoMap = {}
395 formInfo.value.items.forEach((item) => { 394 formInfo.value.items.forEach((item) => {
396 assetsSafeInfo.value.forEach((item1) => { 395 assetsSafeInfo.value.forEach((item1) => {
397 if (item.label == item1.label) { 396 if (item.label == item1.label) {
398 complianceInfoMap[item1.value] = listingFormRef.value.formInline[item.field] 397 complianceInfoMap[`"${item1.value}"`] = listingFormRef.value.formInline[item.field];
399 } 398 }
400 }) 399 })
401 }) 400 })
...@@ -404,7 +403,8 @@ const passSubmit = () => { ...@@ -404,7 +403,8 @@ const passSubmit = () => {
404 flowType: row.approveVO.flowType, 403 flowType: row.approveVO.flowType,
405 approveSuggest: approveSuggest.value, 404 approveSuggest: approveSuggest.value,
406 approveStaffGuid: userData.staffGuid, 405 approveStaffGuid: userData.staffGuid,
407 complianceInfoMap: complianceInfoMap 406 complianceInfoMap: complianceInfoMap,
407 bizGuid: row.approveVO.bizGuid,
408 }).then((res: any) => { 408 }).then((res: any) => {
409 if (res.code == '00000') { 409 if (res.code == '00000') {
410 fullscreenLoading.value = false; 410 fullscreenLoading.value = false;
...@@ -437,17 +437,14 @@ const listingFormRef = ref<any>(); ...@@ -437,17 +437,14 @@ const listingFormRef = ref<any>();
437 const rejectSubmit = async () => { 437 const rejectSubmit = async () => {
438 if (!approveSuggest.value) return ElMessage.error('请填写驳回理由!') 438 if (!approveSuggest.value) return ElMessage.error('请填写驳回理由!')
439 let row = currTableData.value 439 let row = currTableData.value
440 440 console.log(row, '--------')
441 listingFormRef.value.ruleFormRef.validate().then((valid) => { 441 listingFormRef.value.ruleFormRef.validate().then((valid) => {
442 if (valid) { 442 if (valid) {
443 console.log(listingFormRef.value.formInline, '-------------------')
444 let complianceInfoMap = {} 443 let complianceInfoMap = {}
445 formInfo.value.items.forEach((item) => { 444 formInfo.value.items.forEach((item) => {
446 console.log(item, '-------------------')
447 assetsSafeInfo.value.forEach((item1) => { 445 assetsSafeInfo.value.forEach((item1) => {
448 if (item.label == item1.label) { 446 if (item.label == item1.label) {
449 console.log(item1.value, item.default, '-------------------') 447 complianceInfoMap[`"${item1.value}"`] = listingFormRef.value.formInline[item.field];
450 complianceInfoMap[item1.value] = listingFormRef.value.formInline[item.field]
451 } 448 }
452 }) 449 })
453 }) 450 })
...@@ -456,7 +453,8 @@ const rejectSubmit = async () => { ...@@ -456,7 +453,8 @@ const rejectSubmit = async () => {
456 flowType: row.approveVO.flowType, 453 flowType: row.approveVO.flowType,
457 approveSuggest: approveSuggest.value, 454 approveSuggest: approveSuggest.value,
458 approveStaffGuid: userData.staffGuid, 455 approveStaffGuid: userData.staffGuid,
459 complianceInfoMap: complianceInfoMap 456 complianceInfoMap: complianceInfoMap,
457 bizGuid: row.approveVO.bizGuid,
460 }).then((res: any) => { 458 }).then((res: any) => {
461 if (res.code == '00000') { 459 if (res.code == '00000') {
462 fullscreenLoading.value = false; 460 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!