Merge branch 'dev_20241202_xukangle' into develop

@@ -44,7 +44,7 @@ const tableFields = ref([
   { label: "资产名称", field: "daName", width: 160, align: "left" },
   { label: "资产名称", field: "daName", width: 160, align: "left" },
   { label: "登记时间", field: "registerTime", width: 120 },
   { label: "登记时间", field: "registerTime", width: 120 },
   //   { label: "企业名称", field: "tenantName", width: 240, align: "left" },
   //   { label: "企业名称", field: "tenantName", width: 240, align: "left" },
-  { label: "发证主体", field: "issuingEntityName", width: 250, align: "left" },
+  { label: "评估机构", field: "issuingEntityName", width: 250, align: "left" },
   { label: "状态", field: "approveState", type: "tag", width: 96, align: 'center' },
   { label: "状态", field: "approveState", type: "tag", width: 96, align: 'center' },
 ]);
 ]);
 
 
@@ -683,7 +683,7 @@ const rejectDialogBtnClick = (btn, info) => {
       <Table :tableInfo="tableInfo" @tableBtnClick="tableBtnClick" @tablePageChange="tablePageChange" />
       <Table :tableInfo="tableInfo" @tableBtnClick="tableBtnClick" @tablePageChange="tablePageChange" />
     </div>
     </div>
     <Dialog :dialogInfo="dialogInfo" @btnClick="dialogBtnClick" />
     <Dialog :dialogInfo="dialogInfo" @btnClick="dialogBtnClick" />
-    <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" @inputChange=passDialogInputChange  />
+    <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" @inputChange=passDialogInputChange />
     <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" />
     <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" />
   </div>
   </div>
 </template>
 </template>

@@ -134,8 +134,9 @@ const baseInfoFormItems = ref([
     placeholder: '请输入',
     placeholder: '请输入',
     field: 'rightMain',
     field: 'rightMain',
     maxlength: 20,
     maxlength: 20,
-    default: '',
-    required: true
+    default: userStore.userName,
+    required: true,
+    disabled: true
   },
   },
   {
   {
     label: '所属主题',
     label: '所属主题',

@@ -95,7 +95,7 @@ const searchItemList = ref([
   {
   {
     type: "select",
     type: "select",
     label: "",
     label: "",
-    field: "isRegister",
+    field: "registerState",
     default: "",
     default: "",
     placeholder: "登记状态",
     placeholder: "登记状态",
     clearable: true,
     clearable: true,
@@ -117,6 +117,8 @@ const pageInfo = ref({
   damName: "",
   damName: "",
   damType: "",
   damType: "",
   tenantGuid: "",
   tenantGuid: "",
+  dataSources: "",
+  registerState: "",
   subjectDomain: [],
   subjectDomain: [],
 });
 });
 
 
@@ -189,7 +191,9 @@ const getTableData = () => {
     damName: pageInfo.value.damName,
     damName: pageInfo.value.damName,
     damType: pageInfo.value.damType,
     damType: pageInfo.value.damType,
     subjectDomain: pageInfo.value.subjectDomain,
     subjectDomain: pageInfo.value.subjectDomain,
-    tenantGuid: pageInfo.value.tenantGuid
+    tenantGuid: pageInfo.value.tenantGuid,
+    dataSources: pageInfo.value.dataSources,
+    registerState: pageInfo.value.registerState,
   }).then((res: any) => {
   }).then((res: any) => {
     listDataLoading.value = false;
     listDataLoading.value = false;
     if (res.code == proxy.$passCode) {
     if (res.code == proxy.$passCode) {
@@ -212,11 +216,15 @@ const toSearch = (val: any, clear: boolean = false) => {
     pageInfo.value.damType = "";
     pageInfo.value.damType = "";
     pageInfo.value.subjectDomain = [];
     pageInfo.value.subjectDomain = [];
     pageInfo.value.tenantGuid = "";
     pageInfo.value.tenantGuid = "";
+    pageInfo.value.registerState = "";
+    pageInfo.value.dataSources = "";
   } else {
   } else {
     pageInfo.value.damName = val.damName;
     pageInfo.value.damName = val.damName;
     pageInfo.value.damType = val.damType;
     pageInfo.value.damType = val.damType;
     pageInfo.value.subjectDomain = val.subjectDomain;
     pageInfo.value.subjectDomain = val.subjectDomain;
     pageInfo.value.tenantGuid = val.tenantGuid;
     pageInfo.value.tenantGuid = val.tenantGuid;
+    pageInfo.value.registerState = val.registerState;
+    pageInfo.value.dataSources = val.dataSources;
   }
   }
   getTableData();
   getTableData();
 };
 };
@@ -317,7 +325,7 @@ const handleCreate = () => {
               <div class="type">{{ item.subjectDomainName || item.subjectDomain }}</div>
               <div class="type">{{ item.subjectDomainName || item.subjectDomain }}</div>
               <div class="type">{{ item.damTypeName || '--' }}</div>
               <div class="type">{{ item.damTypeName || '--' }}</div>
               <div class="type">{{ item.isRegister == 'Y' ? '已登记' : '未登记' }}</div>
               <div class="type">{{ item.isRegister == 'Y' ? '已登记' : '未登记' }}</div>
-              <div class="type">{{ item.foundMode ? (item.foundMode === '1' ? '自建' : '加工交付') : '--' }}</div>
+              <div class="type">{{ item.foundMode ? (item.foundMode === 1 ? '自建' : '加工交付') : '--' }}</div>
             </div>
             </div>
             <div class="desc">{{ item.propertyDescription }}</div>
             <div class="desc">{{ item.propertyDescription }}</div>
             <el-popover v-model="cardBtnVisible" placement="bottom" width="96" trigger="click"
             <el-popover v-model="cardBtnVisible" placement="bottom" width="96" trigger="click"

@@ -18,12 +18,12 @@ import {
   getImportData,
   getImportData,
   exportDictionary,
   exportDictionary,
   exportCollectTask,
   exportCollectTask,
- // getImageContent
+  // getImageContent
 } from '@/api/modules/queryService';
 } from '@/api/modules/queryService';
 import {
 import {
   parseAndDecodeUrl,
   parseAndDecodeUrl,
   getDownFileSignByUrl,
   getDownFileSignByUrl,
-  obsDownloadRequest 
+  obsDownloadRequest
 } from '@/api/modules/obsService';
 } from '@/api/modules/obsService';
 import { commonPageConfig } from '@/utils/enum';
 import { commonPageConfig } from '@/utils/enum';
 
 
@@ -384,7 +384,7 @@ const importData = (info) => {
     uploadFiles.value.forEach((item: any, index: number) => {
     uploadFiles.value.forEach((item: any, index: number) => {
       params.append("file", item.raw);
       params.append("file", item.raw);
     });
     });
-    paramUrl = `${import.meta.env.VITE_API_ASSET_BASEURL}/dam-catalog-table/excel-by-subject-guid?staffGuid=${userData.staffGuid}&subjectGuid=${route.query.bizGuid}`
+    paramUrl = `ms-daop-zcgl-asset-dam-service/dam-catalog-table/excel-by-subject-guid?staffGuid=${userData.staffGuid}&subjectGuid=${route.query.bizGuid}`
   } else if (isfileImport == '4') {
   } else if (isfileImport == '4') {
     if (!info.databaseNameZh) {
     if (!info.databaseNameZh) {
       ElMessage({
       ElMessage({