d449ff95 by xukangle

update:新增审批流程

1 parent 94395ee8
This diff could not be displayed because it is too large.
...@@ -252,11 +252,11 @@ export const getParamsList = (params) => request({ ...@@ -252,11 +252,11 @@ export const getParamsList = (params) => request({
252 // method: 'post', 252 // method: 'post',
253 // data: { paramCode: "DAM-TYPE" } 253 // data: { paramCode: "DAM-TYPE" }
254 // }) 254 // })
255 // export const getDamTypesList = (params) => request({ 255 export const getDamTypesList = (params) => request({
256 // url: `${import.meta.env.VITE_APP_CONFIG_URL}/dict/data/get-by-dictType`, 256 url: `${import.meta.env.VITE_APP_CONFIG_URL}/dict/data/get-by-dictType`,
257 // method: 'get', 257 method: 'get',
258 // params 258 params
259 // }) 259 })
260 260
261 /** 获取所属主题的四级参数类型列表 */ 261 /** 获取所属主题的四级参数类型列表 */
262 // export const getSubjectDoaminList = () => request({ 262 // export const getSubjectDoaminList = () => request({
......
...@@ -11,7 +11,8 @@ import { MoreFilled } from "@element-plus/icons-vue"; ...@@ -11,7 +11,8 @@ import { MoreFilled } from "@element-plus/icons-vue";
11 import { 11 import {
12 getParamsList, 12 getParamsList,
13 getDamCatalogTable, 13 getDamCatalogTable,
14 registerCatalogDelete 14 registerCatalogDelete,
15 getDamTypesList
15 } from "@/api/modules/dataAsset"; 16 } from "@/api/modules/dataAsset";
16 import { commonPageConfig } from "@/utils/enum"; 17 import { commonPageConfig } from "@/utils/enum";
17 import useDataAssetStore from "@/store/modules/dataAsset"; 18 import useDataAssetStore from "@/store/modules/dataAsset";
......
...@@ -528,7 +528,7 @@ onBeforeMount(() => { ...@@ -528,7 +528,7 @@ onBeforeMount(() => {
528 } 528 }
529 }); 529 });
530 } else { 530 } else {
531 getCamundaDeploymentId('10017').then((res: any) => { 531 getCamundaDeploymentId('10016').then((res: any) => {
532 if (res.code == proxy.$passCode) { 532 if (res.code == proxy.$passCode) {
533 deploymentId.value = res.data; 533 deploymentId.value = res.data;
534 } else { 534 } else {
......
...@@ -1120,6 +1120,11 @@ const drawerBtnClick = async (btn, info) => { ...@@ -1120,6 +1120,11 @@ const drawerBtnClick = async (btn, info) => {
1120 params.length = 0; // 清空数组 1120 params.length = 0; // 清空数组
1121 } 1121 }
1122 }); 1122 });
1123 if (params.length === 0) {
1124 btn.loading = false;
1125 drawerInfo.value.visible = false;
1126 return;
1127 }
1123 1128
1124 try { 1129 try {
1125 const res: any = await saveBizRuleConfig(params); 1130 const res: any = await saveBizRuleConfig(params);
...@@ -1189,8 +1194,8 @@ const drawerSelectChange = (val, row, info) => { ...@@ -1189,8 +1194,8 @@ const drawerSelectChange = (val, row, info) => {
1189 if (item.field === 'dictionaryGuid') { 1194 if (item.field === 'dictionaryGuid') {
1190 item.default = tempInfo.dictionaryGuid; 1195 item.default = tempInfo.dictionaryGuid;
1191 } 1196 }
1192 if (item.field === 'isNotNull') { 1197 if (item.field === 'notNull') {
1193 item.default = tempInfo.isNotNull; 1198 item.default = tempInfo.notNull;
1194 } 1199 }
1195 if (item.field === 'isUnique') { 1200 if (item.field === 'isUnique') {
1196 item.default = tempInfo.isUnique; 1201 item.default = tempInfo.isUnique;
......
...@@ -18,6 +18,7 @@ import { getApproveList, getTenantApprove, registerApproveAllow, registerApprove ...@@ -18,6 +18,7 @@ import { getApproveList, getTenantApprove, registerApproveAllow, registerApprove
18 import { getProductList, getAddedProductList, getListingDetail, listingSave, listingUpdate, listingSavePortal, getParamsDataList } from "@/api/modules/dataProduct"; 18 import { getProductList, getAddedProductList, getListingDetail, listingSave, listingUpdate, listingSavePortal, getParamsDataList } from "@/api/modules/dataProduct";
19 import { getMatchDetail } from "@/api/modules/dataFinance"; 19 import { getMatchDetail } from "@/api/modules/dataFinance";
20 import { useValidator } from '@/hooks/useValidator'; 20 import { useValidator } from '@/hooks/useValidator';
21 import { getCamundaDeploymentId } from "@/api/modules/workFlowService";
21 22
22 const { required } = useValidator(); 23 const { required } = useValidator();
23 const route = useRoute(); 24 const route = useRoute();
...@@ -1121,6 +1122,8 @@ onActivated(() => { ...@@ -1121,6 +1122,8 @@ onActivated(() => {
1121 getProducts(); 1122 getProducts();
1122 }; 1123 };
1123 }) 1124 })
1125
1126 const deploymentId = ref('');
1124 onBeforeMount(() => { 1127 onBeforeMount(() => {
1125 if (route.query.type == 'add' && !route.query.type1) { 1128 if (route.query.type == 'add' && !route.query.type1) {
1126 formInfo.value.items.forEach(item => { 1129 formInfo.value.items.forEach(item => {
...@@ -1202,6 +1205,14 @@ onBeforeMount(() => { ...@@ -1202,6 +1205,14 @@ onBeforeMount(() => {
1202 proxy.$ElMessage.error(res.msg); 1205 proxy.$ElMessage.error(res.msg);
1203 } 1206 }
1204 }) 1207 })
1208
1209 getCamundaDeploymentId('10016').then((res: any) => {
1210 if (res.code == proxy.$passCode) {
1211 deploymentId.value = res.data;
1212 } else {
1213 ElMessage.error(res.msg);
1214 }
1215 })
1205 }) 1216 })
1206 1217
1207 </script> 1218 </script>
...@@ -1405,7 +1416,9 @@ onBeforeMount(() => { ...@@ -1405,7 +1416,9 @@ onBeforeMount(() => {
1405 <div class="panel_body" :class="{ collapse: collapseIcon1 }"> 1416 <div class="panel_body" :class="{ collapse: collapseIcon1 }">
1406 <div class="list_panel"> 1417 <div class="list_panel">
1407 <div class="table_panel_wrap"> 1418 <div class="table_panel_wrap">
1408 <Table :tableInfo="approveTableInfo" /> 1419 <!-- <Table :tableInfo="approveTableInfo" /> -->
1420 <ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :definitionId="''">
1421 </ApprovalProcess>
1409 </div> 1422 </div>
1410 </div> 1423 </div>
1411 </div> 1424 </div>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!