Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
71becdbd by xukangle
Options

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

2 parents f6b63f6f 4e8a5653
Inline Side-by-side
Showing 7 changed files with 116 additions and 108 deletions
.env.development
...@@ -79,6 +79,9 @@ VITE_APP_ATTACHMENT_TEMPLATE = ms-daop-personel-service ...@@ -79,6 +79,9 @@ VITE_APP_ATTACHMENT_TEMPLATE = ms-daop-personel-service
79 #人员服务 79 #人员服务
80 VITE_APP_PERSONAL_URL = 'ms-daop-personel-service' 80 VITE_APP_PERSONAL_URL = 'ms-daop-personel-service'
81 81
82 #流通平台地址
83 VITE_APP_CIRCULATION = http://192.168.6.20:18052/
84
82 # 是否在打包时生成 sourcemap 85 # 是否在打包时生成 sourcemap
83 VITE_BUILD_SOURCEMAP = false 86 VITE_BUILD_SOURCEMAP = false
84 # 是否在打包时开启压缩，支持 gzip 和 brotli 87 # 是否在打包时开启压缩，支持 gzip 和 brotli
......
.env.product
...@@ -114,6 +114,10 @@ VITE_API_MESSAGE = ms-swzl-message-notification-service ...@@ -114,6 +114,10 @@ VITE_API_MESSAGE = ms-swzl-message-notification-service
114 #企业信息接口 114 #企业信息接口
115 VITE_APP_PERSONAL_URL = ms-daop-personel-service 115 VITE_APP_PERSONAL_URL = ms-daop-personel-service
116 116
117 #流通平台接口地址
118 VITE_APP_CIRCULATION = http://192.168.6.20:18052/
119
120
117 # 是否在打包时生成 sourcemap 121 # 是否在打包时生成 sourcemap
118 VITE_BUILD_SOURCEMAP = false 122 VITE_BUILD_SOURCEMAP = false
119 # 是否在打包时开启压缩，支持 gzip 和 brotli 123 # 是否在打包时开启压缩，支持 gzip 和 brotli
......
src/api/modules/queryService.ts
...@@ -82,6 +82,13 @@ export const getProduct = (params) => request({ ...@@ -82,6 +82,13 @@ export const getProduct = (params) => request({
82 method: 'get', 82 method: 'get',
83 params 83 params
84 }) 84 })
85 // 查看平台会员信息
86 export const getTenantInfo = (params) => request({
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`,
89 method: 'get',
90 params
91 })
85 // 查看平台会员详情 92 // 查看平台会员详情
86 export const getTenantDetailInfo = (params) => request({ 93 export const getTenantDetailInfo = (params) => request({
87 url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/getByGuid/${params}`, 94 url: `${import.meta.env.VITE_APP_PERSONAL_URL}/tenant/getByGuid/${params}`,
......
src/views/data_asset/registerDetail.vue
...@@ -25,7 +25,8 @@ import { ...@@ -25,7 +25,8 @@ import {
25 } from "@/api/modules/dataAsset"; 25 } from "@/api/modules/dataAsset";
26 import { 26 import {
27 getTenantDetailInfo, 27 getTenantDetailInfo,
28 getImageContent 28 getImageContent,
29 getTenantInfo
29 } from "@/api/modules/queryService"; 30 } from "@/api/modules/queryService";
30 import { passFlowData, rejectFlowData, revokeFlowData } from "@/api/modules/workFlowService"; 31 import { passFlowData, rejectFlowData, revokeFlowData } from "@/api/modules/workFlowService";
31 import useDataAssetStore from "@/store/modules/dataAsset"; 32 import useDataAssetStore from "@/store/modules/dataAsset";
...@@ -253,8 +254,8 @@ const getDetailInfo = () => { ...@@ -253,8 +254,8 @@ const getDetailInfo = () => {
253 isTextTruncated(); 254 isTextTruncated();
254 }) 255 })
255 } else { 256 } else {
256 getRegiaterDetail({ guid: assetGuid }).then((res: any) => { 257 let ps: any = [], tentData = {};
257 fullscreenLoading.value = false; 258 ps.push(getRegiaterDetail({ guid: assetGuid }).then((res: any) => {
258 if (res.code == proxy.$passCode) { 259 if (res.code == proxy.$passCode) {
259 const data = res.data || {}; 260 const data = res.data || {};
260 let { approveVO } = data; 261 let { approveVO } = data;
...@@ -266,6 +267,29 @@ const getDetailInfo = () => { ...@@ -266,6 +267,29 @@ const getDetailInfo = () => {
266 } else { 267 } else {
267 ElMessage.error(res.msg); 268 ElMessage.error(res.msg);
268 } 269 }
270 }));
271 ps.push(getTenantDetailInfo(userData.tenantGuid).then((res: any) => {
272 if (res.code == proxy.$passCode) {
273 const data = res.data ?? {};
274 tentData = {...tentData, ...data};
275 } else {
276 ElMessage.error(res.msg);
277 }
278 }));
279 ps.push(getTenantInfo({ tenantName: userData.tenantName }).then((res: any) => {
280 if (res.code == proxy.$passCode) {
281 const data = res.data ?? {};
282 tentData = {...tentData, ...data};
283 } else {
284 ElMessage.error(res.msg);
285 }
286 }))
287
288 Promise.all(ps).then(() => {
289 fullscreenLoading.value = false;
290 tenantDetail.value = tentData;
291 }).catch(() => {
292 fullscreenLoading.value = false;
269 }); 293 });
270 } 294 }
271 // approveTableInfo.value.loading = true; 295 // approveTableInfo.value.loading = true;
...@@ -286,7 +310,7 @@ const handleExpand = () => { ...@@ -286,7 +310,7 @@ const handleExpand = () => {
286 310
287 onBeforeMount(() => { 311 onBeforeMount(() => {
288 getDetailInfo(); 312 getDetailInfo();
289 getTenantDetail(); 313 // getTenantDetail();
290 }); 314 });
291 315
292 onActivated(() => { 316 onActivated(() => {
...@@ -402,14 +426,22 @@ const tenantDetail: any = ref({}); ...@@ -402,14 +426,22 @@ const tenantDetail: any = ref({});
402 426
403 /** 获取当前登录会员，服务商，企业等详情。 */ 427 /** 获取当前登录会员，服务商，企业等详情。 */
404 const getTenantDetail = () => { 428 const getTenantDetail = () => {
405 getTenantDetailInfo(userData.tenantGuid).then((res: any) => { 429 // getTenantDetailInfo(userData.tenantGuid).then((res: any) => {
406 if (res.code == proxy.$passCode) { 430 // if (res.code == proxy.$passCode) {
407 const data = res.data ?? {}; 431 // const data = res.data ?? {};
408 tenantDetail.value = data; 432 // userData.value = data;
409 } else { 433 // } else {
410 ElMessage.error(res.msg); 434 // ElMessage.error(res.msg);
411 } 435 // }
412 }); 436 // })
437 // getTenantInfo({tenantName: userData.tenantName}).then((res: any) => {
438 // if (res.code == proxy.$passCode) {
439 // const data = res.data ?? {};
440 // tenantDetail.value = data;
441 // } else {
442 // ElMessage.error(res.msg);
443 // }
444 // });
413 } 445 }
414 446
415 const onUploadFilePreview = (file) => { 447 const onUploadFilePreview = (file) => {
...@@ -1402,8 +1434,8 @@ const handleClickDamCatalogDetail = () => { ...@@ -1402,8 +1434,8 @@ const handleClickDamCatalogDetail = () => {
1402 <div class="list_item is_block isFile" :style="{ width: '40%' }" 1434 <div class="list_item is_block isFile" :style="{ width: '40%' }"
1403 v-if="(detailType == 'asset' && assetDetailInfo.isQualityAssessment == 'Y') && assetDetailInfo.registerAttachment?.evaluationFile?.length"> 1435 v-if="(detailType == 'asset' && assetDetailInfo.isQualityAssessment == 'Y') && assetDetailInfo.registerAttachment?.evaluationFile?.length">
1404 <span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">质量评估报告</span> 1436 <span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">质量评估报告</span>
1405 <span v-for="(item) in (assetDetailInfo.registerAttachment?.evaluationFile || [])" 1437 <span v-for="(item) in (assetDetailInfo.registerAttachment?.evaluationFile || [])" class="item_value"
1406 class="item_value" :style="{ 'padding-left': '0px' }"> 1438 :style="{ 'padding-left': '0px' }">
1407 <div class="file-operate"> 1439 <div class="file-operate">
1408 <template 1440 <template
1409 v-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'xls' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'xlsx' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'csv'"> 1441 v-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'xls' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'xlsx' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'csv'">
...@@ -1603,7 +1635,7 @@ const handleClickDamCatalogDetail = () => { ...@@ -1603,7 +1635,7 @@ const handleClickDamCatalogDetail = () => {
1603 </div> 1635 </div>
1604 <div class="list_item"> 1636 <div class="list_item">
1605 <span class="item_label">统一社会信用代码:</span> 1637 <span class="item_label">统一社会信用代码:</span>
1606 <span class="item_value">{{ tenantDetail.usci ?? "--" }}</span> 1638 <span class="item_value">{{ tenantDetail.socialCreditCode ?? "--" }}</span>
1607 </div> 1639 </div>
1608 <div class="list_item"> 1640 <div class="list_item">
1609 <span class="item_label">是否列入失信:</span> 1641 <span class="item_label">是否列入失信:</span>
...@@ -1615,15 +1647,15 @@ const handleClickDamCatalogDetail = () => { ...@@ -1615,15 +1647,15 @@ const handleClickDamCatalogDetail = () => {
1615 </div> 1647 </div>
1616 <div class="list_item"> 1648 <div class="list_item">
1617 <span class="item_label">注册日期:</span> 1649 <span class="item_label">注册日期:</span>
1618 <span class="item_value">{{ tenantDetail.registerDate ?? "--" }}</span> 1650 <span class="item_value">{{ tenantDetail.registrationDate ?? "--" }}</span>
1619 </div> 1651 </div>
1620 <div class="list_item"> 1652 <div class="list_item">
1621 <span class="item_label">营业开始日期:</span> 1653 <span class="item_label">营业开始日期:</span>
1622 <span class="item_value">{{ tenantDetail.tradeStartDate ?? "--" }}</span> 1654 <span class="item_value">{{ tenantDetail.businessLicenseStartDate ?? "--" }}</span>
1623 </div> 1655 </div>
1624 <div class="list_item"> 1656 <div class="list_item">
1625 <span class="item_label">营业结束日期:</span> 1657 <span class="item_label">营业结束日期:</span>
1626 <span class="item_value">{{ tenantDetail.tradeEndDate ?? "--" }}</span> 1658 <span class="item_value">{{ tenantDetail.businessLicenseEndDate ?? "--" }}</span>
1627 </div> 1659 </div>
1628 <div class="list_item is_block"> 1660 <div class="list_item is_block">
1629 <span class="item_label">单位注册地址:</span> 1661 <span class="item_label">单位注册地址:</span>
......
src/views/data_asset/registerManagemant.vue
...@@ -208,6 +208,7 @@ const currTableData: any = ref({}); ...@@ -208,6 +208,7 @@ const currTableData: any = ref({});
208 const btnClick = (btn) => { 208 const btnClick = (btn) => {
209 const type = btn.value; 209 const type = btn.value;
210 if (type == 'create') { 210 if (type == 'create') {
211 localStorage.setItem('isRestart', '');
211 router.push({ 212 router.push({
212 name: 'registerStart', 213 name: 'registerStart',
213 query: { exchangeGuid: btn.exchangeGuid, type } 214 query: { exchangeGuid: btn.exchangeGuid, type }
...@@ -277,20 +278,6 @@ const tableBtnClick = (scope, btn) => { ...@@ -277,20 +278,6 @@ const tableBtnClick = (scope, btn) => {
277 } 278 }
278 }; 279 };
279 280
280 const handleDataClick = (item) => {
281 if (item.approveState === 'N') {
282 router.push({
283 name: 'registerStart',
284 query: { guid: item.guid }
285 });
286 } else {
287 router.push({
288 name: 'registerInfoDetail',
289 query: { guid: item.guid, type: 'asset', daTenantGuid: item.tenantGuid }
290 });
291 }
292 }
293
294 const delTableOpen = (msg, type, isBatch: boolean = false) => { 281 const delTableOpen = (msg, type, isBatch: boolean = false) => {
295 ElMessageBox.confirm(msg, "提示", { 282 ElMessageBox.confirm(msg, "提示", {
296 confirmButtonText: "确定", 283 confirmButtonText: "确定",
...@@ -535,10 +522,6 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -535,10 +522,6 @@ const rejectDialogBtnClick = (btn, info) => {
535 } 522 }
536 }; 523 };
537 524
538 const createBtnVisible = computed(() => {
539 return isCompanyPlatform || (userStore.hasPermission('数据资产', path, '新建'))
540 })
541
542 </script> 525 </script>
543 526
544 <template> 527 <template>
...@@ -574,51 +557,8 @@ const createBtnVisible = computed(() => { ...@@ -574,51 +557,8 @@ const createBtnVisible = computed(() => {
574 </div> 557 </div>
575 </div> 558 </div>
576 </div> 559 </div>
577 <div class="table_panel_wrap" :style="{ height: createBtnVisible ? 'calc(100% - 89px)' : 'calc(100% - 40px)' }"> 560 <div class="table_panel_wrap">
578 <div v-if="activeListType === 'card'" class="data-content" v-loading="listDataLoading"> 561 <Table :tableInfo="tableInfo" @tableBtnClick="tableBtnClick" />
579 <div class="card-content" v-for="item in listData" :key="item.guid" @click="handleDataClick(item)">
580 <div class="title-row">
581 <div class="title">
582 <ellipsis-tooltip :content="item.daName" class-name="w100f"
583 :refName="'tooltipOver' + item.guid"></ellipsis-tooltip>
584 </div>
585 <el-tag :type="(tagType(item, 'approveState') as any)">{{
586 tagMethod(item, 'approveState')
587 }}</el-tag>
588 </div>
589 <div v-if="!isCompanyPlatform" class="desc">{{ item.tenantName ?? '深圳传世般若有限公司' }}</div>
590 <div class="desc">{{ item.updateTime }}</div>
591 <div class="type-btn">
592 <template v-if="item.ownIndustryName?.length">
593 <div class="type-items">
594 <div v-for="(info) in item.ownIndustryName" class="type">{{ info }}</div>
595 </div>
596 </template>
597 <template v-else>
598 <div class="type-items"></div>
599 </template>
600 <el-popover v-model="cardBtnVisible" placement="bottom" width="96" trigger="click"
601 popper-class="tree-item-edit-menu" :show-arrow="false" :hide-after="0">
602 <template #reference>
603 <el-icon class="list-more" color="#666" v-show="getTableBtns(item, false)?.length > 0"
604 @click.stop="cardBtnVisible = true">
605 <MoreFilled />
606 </el-icon>
607 </template>
608 <div class="levitation-ul">
609 <span class="levitation-li" v-for="btn in getTableBtns(item, false)"
610 @click="tableBtnClick({ row: item }, btn)">{{
611 btn.label }}</span>
612 </div>
613 </el-popover>
614 </div>
615 </div>
616 <div v-if="!listData.length" class="card-noData">
617 <img src="../../assets/images/no-data.png" :style="{ width: '96px', height: '96px' }" />
618 <span>暂无数据资产</span>
619 </div>
620 </div>
621 <Table v-else :tableInfo="tableInfo" @tableBtnClick="tableBtnClick" />
622 <PageNav :class="[pageInfo.type]" :pageInfo="pageInfo" @pageChange="pageChange" /> 562 <PageNav :class="[pageInfo.type]" :pageInfo="pageInfo" @pageChange="pageChange" />
623 </div> 563 </div>
624 </div> 564 </div>
......
src/views/data_asset/registerStart.vue
...@@ -11,6 +11,7 @@ import { ContentWrap } from '@/components/ContentWrap'; ...@@ -11,6 +11,7 @@ import { ContentWrap } from '@/components/ContentWrap';
11 import useUserStore from "@/store/modules/user"; 11 import useUserStore from "@/store/modules/user";
12 import { 12 import {
13 getAreaData, 13 getAreaData,
14 getTenantInfo,
14 getTenantDetailInfo, 15 getTenantDetailInfo,
15 getServiceTenants, 16 getServiceTenants,
16 getTenantAttach, 17 getTenantAttach,
...@@ -47,7 +48,7 @@ const guid = route.query.guid; ...@@ -47,7 +48,7 @@ const guid = route.query.guid;
47 const fullPath = route.fullPath; 48 const fullPath = route.fullPath;
48 const editType = route.query.type; 49 const editType = route.query.type;
49 const exGuid = route.query.exchangeGuid; 50 const exGuid = route.query.exchangeGuid;
50 const restart = localStorage.getItem('isRestart'); 51 const restart = ref(false);
51 52
52 /** 资产目录列表 */ 53 /** 资产目录列表 */
53 const registerCatalogList: any = ref([]); 54 const registerCatalogList: any = ref([]);
...@@ -166,14 +167,30 @@ const tenantDetail: any = ref({}); ...@@ -166,14 +167,30 @@ const tenantDetail: any = ref({});
166 167
167 /** 获取当前登录会员，服务商，企业等详情。 */ 168 /** 获取当前登录会员，服务商，企业等详情。 */
168 const getTenantDetail = () => { 169 const getTenantDetail = () => {
169 getTenantDetailInfo(userData.tenantGuid).then((res: any) => { 170 let ps: any = [], tentData = {};
171 ps.push(getTenantDetailInfo(userData.tenantGuid).then((res: any) => {
170 if (res.code == proxy.$passCode) { 172 if (res.code == proxy.$passCode) {
171 const data = res.data ?? {}; 173 const data = res.data ?? {};
172 tenantDetail.value = data; 174 tentData = {...tentData, ...data};
175 } else {
176 ElMessage.error(res.msg);
177 }
178 }));
179 ps.push(getTenantInfo({ tenantName: userData.tenantName }).then((res: any) => {
180 if (res.code == proxy.$passCode) {
181 const data = res.data ?? {};
182 tentData = {...tentData, ...data};
183 } else {
184 ElMessage.error(res.msg);
185 }
186 }))
187
188 Promise.all(ps).then(() => {
189 tenantDetail.value = tentData;
173 propertyFormItems.value.forEach((item, index) => { 190 propertyFormItems.value.forEach((item, index) => {
174 if (item.field == 'address' || item.field == 'usci' || item.field == 'registerDate' || item.field == 'tradeStartDate' || item.field == 'tradeEndDate') {//在会员详情处获取。 191 if (item.field == 'address' || item.field == 'socialCreditCode' || item.field == 'registrationDate' || item.field == 'businessLicenseStartDate' || item.field == 'businessLicenseEndDate') {//在会员详情处获取。
175 item.default = tenantDetail.value[item.field]; 192 item.default = tenantDetail.value[item.field];
176 } else if (item.field == 'businessLicense') { 193 } else if (item.field == 'businessLicenseJson') {
177 item.default = tenantDetail.value[item.field] || []; 194 item.default = tenantDetail.value[item.field] || [];
178 if (!item.default.length) { 195 if (!item.default.length) {
179 item.visible = false; 196 item.visible = false;
...@@ -186,9 +203,8 @@ const getTenantDetail = () => { ...@@ -186,9 +203,8 @@ const getTenantDetail = () => {
186 } 203 }
187 } 204 }
188 }); 205 });
189 } else { 206 }).catch(() => {
190 ElMessage.error(res.msg); 207 fullscreenLoading.value = false;
191 }
192 }); 208 });
193 } 209 }
194 210
...@@ -327,9 +343,9 @@ const setPropertyFormItemsValue = (info) => { ...@@ -327,9 +343,9 @@ const setPropertyFormItemsValue = (info) => {
327 propertyFormItems.value[index + 1].visible = false; 343 propertyFormItems.value[index + 1].visible = false;
328 propertyFormItems.value[index + 2].visible = false; 344 propertyFormItems.value[index + 2].visible = false;
329 } 345 }
330 } else if (item.field == 'address' || item.field == 'usci' || item.field == 'registerDate' || item.field == 'tradeStartDate' || item.field == 'tradeEndDate') {//在会员详情处获取。 346 } else if (item.field == 'address' || item.field == 'socialCreditCode' || item.field == 'registrationDate' || item.field == 'businessLicenseStartDate' || item.field == 'businessLicenseEndDate') {//在会员详情处获取。
331 item.default = tenantDetail.value[item.field]; 347 item.default = tenantDetail.value[item.field];
332 } else if (item.field == 'businessLicense') { 348 } else if (item.field == 'businessLicenseJson') {
333 item.default = tenantDetail.value[item.field] || []; 349 item.default = tenantDetail.value[item.field] || [];
334 if (!item.default.length) { 350 if (!item.default.length) {
335 item.visible = false; 351 item.visible = false;
...@@ -391,6 +407,7 @@ onActivated(() => { ...@@ -391,6 +407,7 @@ onActivated(() => {
391 }) 407 })
392 408
393 onBeforeMount(() => { 409 onBeforeMount(() => {
410 restart.value = localStorage.getItem('isRestart')?true:false;
394 if (guid) { 411 if (guid) {
395 fullscreenLoading.value = true; 412 fullscreenLoading.value = true;
396 getRegiaterDetail({ guid: guid }).then((res: any) => { 413 getRegiaterDetail({ guid: guid }).then((res: any) => {
...@@ -955,7 +972,7 @@ const baseFormItems: any = ref([ ...@@ -955,7 +972,7 @@ const baseFormItems: any = ref([
955 block: true, 972 block: true,
956 field: "dataSensitivityLevel", 973 field: "dataSensitivityLevel",
957 col: 'other-group-flex', 974 col: 'other-group-flex',
958 default: [1], 975 default: [],
959 children: [ 976 children: [
960 { 977 {
961 label: "公开数据", 978 label: "公开数据",
...@@ -1041,7 +1058,7 @@ const baseFormItems: any = ref([ ...@@ -1041,7 +1058,7 @@ const baseFormItems: any = ref([
1041 type: "checkbox-group-row", 1058 type: "checkbox-group-row",
1042 placeholder: "", 1059 placeholder: "",
1043 field: "dataGetWay", 1060 field: "dataGetWay",
1044 default: [1], 1061 default: [],
1045 col: 'other-group-flex', 1062 col: 'other-group-flex',
1046 block: true, 1063 block: true,
1047 children: [ 1064 children: [
...@@ -1093,7 +1110,7 @@ const baseFormItems: any = ref([ ...@@ -1093,7 +1110,7 @@ const baseFormItems: any = ref([
1093 type: "checkbox-group-row", 1110 type: "checkbox-group-row",
1094 placeholder: "", 1111 placeholder: "",
1095 field: "updateFrequency", 1112 field: "updateFrequency",
1096 default: [3], 1113 default: [],
1097 block: true, 1114 block: true,
1098 col: 'other-group-flex', 1115 col: 'other-group-flex',
1099 children: [ 1116 children: [
...@@ -1143,7 +1160,7 @@ const baseFormItems: any = ref([ ...@@ -1143,7 +1160,7 @@ const baseFormItems: any = ref([
1143 placeholder: "", 1160 placeholder: "",
1144 col: 'other-group-flex', 1161 col: 'other-group-flex',
1145 field: "ownIndustry", 1162 field: "ownIndustry",
1146 default: [2], 1163 default: [],
1147 children: [ 1164 children: [
1148 { 1165 {
1149 label: "能源", 1166 label: "能源",
...@@ -1181,7 +1198,7 @@ const baseFormItems: any = ref([ ...@@ -1181,7 +1198,7 @@ const baseFormItems: any = ref([
1181 placeholder: "", 1198 placeholder: "",
1182 col: 'other-group-flex', 1199 col: 'other-group-flex',
1183 field: "bizOwn", 1200 field: "bizOwn",
1184 default: [1], 1201 default: [],
1185 children: [ 1202 children: [
1186 { 1203 {
1187 label: "生产类业务数据", 1204 label: "生产类业务数据",
...@@ -1401,7 +1418,7 @@ const propertyFormItems: any = ref([ ...@@ -1401,7 +1418,7 @@ const propertyFormItems: any = ref([
1401 type: "checkbox-group-row", 1418 type: "checkbox-group-row",
1402 placeholder: "", 1419 placeholder: "",
1403 field: "propertyType", 1420 field: "propertyType",
1404 default: [3], 1421 default: [],
1405 children: [ 1422 children: [
1406 { 1423 {
1407 label: "数据资源持有权", 1424 label: "数据资源持有权",
...@@ -1424,7 +1441,7 @@ const propertyFormItems: any = ref([ ...@@ -1424,7 +1441,7 @@ const propertyFormItems: any = ref([
1424 placeholder: "", 1441 placeholder: "",
1425 field: "rightsContent", 1442 field: "rightsContent",
1426 col: 'col2', 1443 col: 'col2',
1427 default: [5], 1444 default: [],
1428 children: [ 1445 children: [
1429 { 1446 {
1430 label: "可转让", 1447 label: "可转让",
...@@ -1600,10 +1617,10 @@ const propertyFormItems: any = ref([ ...@@ -1600,10 +1617,10 @@ const propertyFormItems: any = ref([
1600 label: '统一社会信用代码', 1617 label: '统一社会信用代码',
1601 type: 'input', 1618 type: 'input',
1602 placeholder: '请输入', 1619 placeholder: '请输入',
1603 field: 'usci', 1620 field: 'socialCreditCode',
1604 col: 'mr8', 1621 col: 'mr8',
1605 disabled: true, 1622 disabled: true,
1606 default: tenantDetail.value.usci ?? "", 1623 default: tenantDetail.value.socialCreditCode ?? "",
1607 required: false 1624 required: false
1608 }, 1625 },
1609 { 1626 {
...@@ -1648,9 +1665,9 @@ const propertyFormItems: any = ref([ ...@@ -1648,9 +1665,9 @@ const propertyFormItems: any = ref([
1648 { 1665 {
1649 label: "注册日期", 1666 label: "注册日期",
1650 type: "date", 1667 type: "date",
1651 field: "registerDate", 1668 field: "registrationDate",
1652 col: 'mr8', 1669 col: 'mr8',
1653 default: tenantDetail.value.registerDate ?? "", 1670 default: tenantDetail.value.registrationDate ?? "",
1654 placeholder: "请选择", 1671 placeholder: "请选择",
1655 clearable: true, 1672 clearable: true,
1656 disabled: true, 1673 disabled: true,
...@@ -1660,9 +1677,9 @@ const propertyFormItems: any = ref([ ...@@ -1660,9 +1677,9 @@ const propertyFormItems: any = ref([
1660 label: '营业开始日期', 1677 label: '营业开始日期',
1661 type: 'date', 1678 type: 'date',
1662 placeholder: '请输入', 1679 placeholder: '请输入',
1663 field: 'tradeStartDate', 1680 field: 'businessLicenseStartDate',
1664 col: 'mr8', 1681 col: 'mr8',
1665 default: tenantDetail.value.tradeStartDate ?? "", 1682 default: tenantDetail.value.businessLicenseStartDate ?? "",
1666 unlink: true, 1683 unlink: true,
1667 disabled: true, 1684 disabled: true,
1668 clearable: true, 1685 clearable: true,
...@@ -1672,8 +1689,8 @@ const propertyFormItems: any = ref([ ...@@ -1672,8 +1689,8 @@ const propertyFormItems: any = ref([
1672 label: '营业结束日期', 1689 label: '营业结束日期',
1673 type: 'date', 1690 type: 'date',
1674 placeholder: '无固定期限', 1691 placeholder: '无固定期限',
1675 field: 'tradeEndDate', 1692 field: 'businessLicenseEndDate',
1676 default: tenantDetail.value.tradeEndDate ?? "", 1693 default: tenantDetail.value.businessLicenseEndDate ?? "",
1677 unlink: true, 1694 unlink: true,
1678 col: 'no-margin-r', 1695 col: 'no-margin-r',
1679 disabled: true, 1696 disabled: true,
...@@ -1688,7 +1705,7 @@ const propertyFormItems: any = ref([ ...@@ -1688,7 +1705,7 @@ const propertyFormItems: any = ref([
1688 templateUrl: null, 1705 templateUrl: null,
1689 default: [], 1706 default: [],
1690 visible: false, 1707 visible: false,
1691 field: 'businessLicense' 1708 field: 'businessLicenseJson'
1692 }, 1709 },
1693 ]); 1710 ]);
1694 1711
...@@ -2015,7 +2032,7 @@ const save = () => { ...@@ -2015,7 +2032,7 @@ const save = () => {
2015 fullscreenLoading.value = true; 2032 fullscreenLoading.value = true;
2016 if (draftDetailInfo.value.guid) { 2033 if (draftDetailInfo.value.guid) {
2017 params.guid = draftDetailInfo.value.guid; 2034 params.guid = draftDetailInfo.value.guid;
2018 params.isRestart = restart ? true : false; 2035 params.isRestart = restart.value;
2019 registerUpdate(params).then((res: any) => { 2036 registerUpdate(params).then((res: any) => {
2020 fullscreenLoading.value = false; 2037 fullscreenLoading.value = false;
2021 if (res.code == proxy.$passCode) { 2038 if (res.code == proxy.$passCode) {
......
vite.config.ts
...@@ -40,6 +40,11 @@ export default ({ mode, command }) => { ...@@ -40,6 +40,11 @@ export default ({ mode, command }) => {
40 changeOrigin: env.VITE_OPEN_PROXY === 'true', 40 changeOrigin: env.VITE_OPEN_PROXY === 'true',
41 rewrite: path => path.replace(/\/portal/, ''), 41 rewrite: path => path.replace(/\/portal/, ''),
42 }, 42 },
43 '/circulation':{
44 target: env.VITE_APP_CIRCULATION,
45 changeOrigin: env.VITE_OPEN_PROXY === 'true',
46 rewrite: path => path.replace(/\/circulation/, ''),
47 },
43 '/obs': { 48 '/obs': {
44 target: '//csbr-daop.obs.cn-north-1.myhuaweicloud.com:443', 49 target: '//csbr-daop.obs.cn-north-1.myhuaweicloud.com:443',
45 changeOrigin: env.VITE_OPEN_PROXY === 'true', 50 changeOrigin: env.VITE_OPEN_PROXY === 'true',
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!