Merge branch 'develop' of http://117.78.60.236:8000/csbr-daop/fe-data-asset-management into develop

@@ -252,11 +252,11 @@ export const getParamsList = (params) => request({
 //     method: 'post',
 //     data: { paramCode: "DAM-TYPE" }
 // })
-// export const getDamTypesList = (params) => request({
-//   url: `${import.meta.env.VITE_APP_CONFIG_URL}/dict/data/get-by-dictType`,
-//   method: 'get',
-//   params
-// })
+export const getDamTypesList = (params) => request({
+  url: `${import.meta.env.VITE_APP_CONFIG_URL}/dict/data/get-by-dictType`,
+  method: 'get',
+  params
+})
 
 /** 获取所属主题的四级参数类型列表 */
 // export const getSubjectDoaminList = () => request({

@@ -11,7 +11,8 @@ import { MoreFilled } from "@element-plus/icons-vue";
 import {
   getParamsList,
   getDamCatalogTable,
-  registerCatalogDelete
+  registerCatalogDelete,
+  getDamTypesList
 } from "@/api/modules/dataAsset";
 import { commonPageConfig } from "@/utils/enum";
 import useDataAssetStore from "@/store/modules/dataAsset";

@@ -528,7 +528,7 @@ onBeforeMount(() => {
       }
     });
   } else {
-    getCamundaDeploymentId('10017').then((res: any) => {
+    getCamundaDeploymentId('10016').then((res: any) => {
       if (res.code == proxy.$passCode) {
         deploymentId.value = res.data;
       } else {

@@ -1120,6 +1120,11 @@ const drawerBtnClick = async (btn, info) => {
         params.length = 0; // 清空数组
       }
     });
+    if (params.length === 0) {
+      btn.loading = false;
+      drawerInfo.value.visible = false;
+      return;
+    }
 
     try {
       const res: any = await saveBizRuleConfig(params);
@@ -1189,8 +1194,8 @@ const drawerSelectChange = (val, row, info) => {
     if (item.field === 'dictionaryGuid') {
       item.default = tempInfo.dictionaryGuid;
     }
-    if (item.field === 'isNotNull') {
-      item.default = tempInfo.isNotNull;
+    if (item.field === 'notNull') {
+      item.default = tempInfo.notNull;
     }
     if (item.field === 'isUnique') {
       item.default = tempInfo.isUnique;

@@ -18,6 +18,7 @@ import { getApproveList, getTenantApprove, registerApproveAllow, registerApprove
 import { getProductList, getAddedProductList, getListingDetail, listingSave, listingUpdate, listingSavePortal, getParamsDataList } from "@/api/modules/dataProduct";
 import { getMatchDetail } from "@/api/modules/dataFinance";
 import { useValidator } from '@/hooks/useValidator';
+import { getCamundaDeploymentId } from "@/api/modules/workFlowService";
 
 const { required } = useValidator();
 const route = useRoute();
@@ -978,8 +979,8 @@ const selectChange = async (val, row, info) => {
     await setFormItems({ ...info, coverageArea: coverageArea });
     formInfo.value.items.at(0).default = val;
     formInfo.value.items.at(1).default = data.length ? data[0].damType : '';
-    formInfo.value.items.at(2).default = data.length ? data[0].subjectDomain : '';
-    formInfo.value.items.at(3).default = data.length ? data[0].damCode : '';
+    // formInfo.value.items.at(2).default = data.length ? data[0].subjectDomain : '';
+    formInfo.value.items.at(2).default = data.length ? data[0].damCode : '';
     formInfo.value.items.at(4).defaultValue = data.length ? data[0].dataScale : '';
     formInfo.value.items.at(4).default = data.length && data[0].dataScale != null ? changeNum(data[0].dataScale, 0) : '--';
     formInfo.value.items.at(5).defaultValue = data.length ? data[0].caseNumber : '';
@@ -1121,6 +1122,8 @@ onActivated(() => {
     getProducts();
   };
 })
+
+const deploymentId = ref('');
 onBeforeMount(() => {
   if (route.query.type == 'add' && !route.query.type1) {
     formInfo.value.items.forEach(item => {
@@ -1202,6 +1205,14 @@ onBeforeMount(() => {
       proxy.$ElMessage.error(res.msg);
     }
   })
+
+  getCamundaDeploymentId('10016').then((res: any) => {
+    if (res.code == proxy.$passCode) {
+      deploymentId.value = res.data;
+    } else {
+      ElMessage.error(res.msg);
+    }
+  })
 })
 
 </script>
@@ -1405,7 +1416,9 @@ onBeforeMount(() => {
         <div class="panel_body" :class="{ collapse: collapseIcon1 }">
           <div class="list_panel">
             <div class="table_panel_wrap">
-              <Table :tableInfo="approveTableInfo" />
+              <!-- <Table :tableInfo="approveTableInfo" /> -->
+              <ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :definitionId="''">
+              </ApprovalProcess>
             </div>
           </div>
         </div>