数据资产登记bug修改
Showing
7 changed files
with
54 additions
and
93 deletions
| ... | @@ -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 | ... | ... |
| ... | @@ -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 | ... | ... |
| ... | @@ -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}`, | ... | ... |
| ... | @@ -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"; |
| ... | @@ -402,7 +403,7 @@ const tenantDetail: any = ref({}); | ... | @@ -402,7 +403,7 @@ const tenantDetail: any = ref({}); |
| 402 | 403 | ||
| 403 | /** 获取当前登录会员,服务商,企业等详情。 */ | 404 | /** 获取当前登录会员,服务商,企业等详情。 */ |
| 404 | const getTenantDetail = () => { | 405 | const getTenantDetail = () => { |
| 405 | getTenantDetailInfo(userData.tenantGuid).then((res: any) => { | 406 | getTenantInfo({tenantName: userData.tenantName}).then((res: any) => { |
| 406 | if (res.code == proxy.$passCode) { | 407 | if (res.code == proxy.$passCode) { |
| 407 | const data = res.data ?? {}; | 408 | const data = res.data ?? {}; |
| 408 | tenantDetail.value = data; | 409 | tenantDetail.value = data; |
| ... | @@ -1603,7 +1604,7 @@ const handleClickDamCatalogDetail = () => { | ... | @@ -1603,7 +1604,7 @@ const handleClickDamCatalogDetail = () => { |
| 1603 | </div> | 1604 | </div> |
| 1604 | <div class="list_item"> | 1605 | <div class="list_item"> |
| 1605 | <span class="item_label">统一社会信用代码:</span> | 1606 | <span class="item_label">统一社会信用代码:</span> |
| 1606 | <span class="item_value">{{ tenantDetail.usci ?? "--" }}</span> | 1607 | <span class="item_value">{{ tenantDetail.socialCreditCode ?? "--" }}</span> |
| 1607 | </div> | 1608 | </div> |
| 1608 | <div class="list_item"> | 1609 | <div class="list_item"> |
| 1609 | <span class="item_label">是否列入失信:</span> | 1610 | <span class="item_label">是否列入失信:</span> |
| ... | @@ -1615,15 +1616,15 @@ const handleClickDamCatalogDetail = () => { | ... | @@ -1615,15 +1616,15 @@ const handleClickDamCatalogDetail = () => { |
| 1615 | </div> | 1616 | </div> |
| 1616 | <div class="list_item"> | 1617 | <div class="list_item"> |
| 1617 | <span class="item_label">注册日期:</span> | 1618 | <span class="item_label">注册日期:</span> |
| 1618 | <span class="item_value">{{ tenantDetail.registerDate ?? "--" }}</span> | 1619 | <span class="item_value">{{ tenantDetail.registrationDate ?? "--" }}</span> |
| 1619 | </div> | 1620 | </div> |
| 1620 | <div class="list_item"> | 1621 | <div class="list_item"> |
| 1621 | <span class="item_label">营业开始日期:</span> | 1622 | <span class="item_label">营业开始日期:</span> |
| 1622 | <span class="item_value">{{ tenantDetail.tradeStartDate ?? "--" }}</span> | 1623 | <span class="item_value">{{ tenantDetail.businessLicenseStartDate ?? "--" }}</span> |
| 1623 | </div> | 1624 | </div> |
| 1624 | <div class="list_item"> | 1625 | <div class="list_item"> |
| 1625 | <span class="item_label">营业结束日期:</span> | 1626 | <span class="item_label">营业结束日期:</span> |
| 1626 | <span class="item_value">{{ tenantDetail.tradeEndDate ?? "--" }}</span> | 1627 | <span class="item_value">{{ tenantDetail.businessLicenseEndDate ?? "--" }}</span> |
| 1627 | </div> | 1628 | </div> |
| 1628 | <div class="list_item is_block"> | 1629 | <div class="list_item is_block"> |
| 1629 | <span class="item_label">单位注册地址:</span> | 1630 | <span class="item_label">单位注册地址:</span> | ... | ... |
| ... | @@ -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> | ... | ... |
| ... | @@ -11,7 +11,7 @@ import { ContentWrap } from '@/components/ContentWrap'; | ... | @@ -11,7 +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 | getTenantDetailInfo, | 14 | getTenantInfo, |
| 15 | getServiceTenants, | 15 | getServiceTenants, |
| 16 | getTenantAttach, | 16 | getTenantAttach, |
| 17 | getSingleList | 17 | getSingleList |
| ... | @@ -47,7 +47,7 @@ const guid = route.query.guid; | ... | @@ -47,7 +47,7 @@ const guid = route.query.guid; |
| 47 | const fullPath = route.fullPath; | 47 | const fullPath = route.fullPath; |
| 48 | const editType = route.query.type; | 48 | const editType = route.query.type; |
| 49 | const exGuid = route.query.exchangeGuid; | 49 | const exGuid = route.query.exchangeGuid; |
| 50 | const restart = localStorage.getItem('isRestart'); | 50 | const restart = ref(false); |
| 51 | 51 | ||
| 52 | /** 资产目录列表 */ | 52 | /** 资产目录列表 */ |
| 53 | const registerCatalogList: any = ref([]); | 53 | const registerCatalogList: any = ref([]); |
| ... | @@ -166,14 +166,14 @@ const tenantDetail: any = ref({}); | ... | @@ -166,14 +166,14 @@ const tenantDetail: any = ref({}); |
| 166 | 166 | ||
| 167 | /** 获取当前登录会员,服务商,企业等详情。 */ | 167 | /** 获取当前登录会员,服务商,企业等详情。 */ |
| 168 | const getTenantDetail = () => { | 168 | const getTenantDetail = () => { |
| 169 | getTenantDetailInfo(userData.tenantGuid).then((res: any) => { | 169 | getTenantInfo({tenantName: userData.tenantName}).then((res: any) => { |
| 170 | if (res.code == proxy.$passCode) { | 170 | if (res.code == proxy.$passCode) { |
| 171 | const data = res.data ?? {}; | 171 | const data = res.data ?? {}; |
| 172 | tenantDetail.value = data; | 172 | tenantDetail.value = data; |
| 173 | propertyFormItems.value.forEach((item, index) => { | 173 | propertyFormItems.value.forEach((item, index) => { |
| 174 | if (item.field == 'address' || item.field == 'usci' || item.field == 'registerDate' || item.field == 'tradeStartDate' || item.field == 'tradeEndDate') {//在会员详情处获取。 | 174 | if (item.field == 'address' || item.field == 'socialCreditCode' || item.field == 'registrationDate' || item.field == 'businessLicenseStartDate' || item.field == 'businessLicenseEndDate') {//在会员详情处获取。 |
| 175 | item.default = tenantDetail.value[item.field]; | 175 | item.default = tenantDetail.value[item.field]; |
| 176 | } else if (item.field == 'businessLicense') { | 176 | } else if (item.field == 'businessLicenseJson') { |
| 177 | item.default = tenantDetail.value[item.field] || []; | 177 | item.default = tenantDetail.value[item.field] || []; |
| 178 | if (!item.default.length) { | 178 | if (!item.default.length) { |
| 179 | item.visible = false; | 179 | item.visible = false; |
| ... | @@ -327,9 +327,9 @@ const setPropertyFormItemsValue = (info) => { | ... | @@ -327,9 +327,9 @@ const setPropertyFormItemsValue = (info) => { |
| 327 | propertyFormItems.value[index + 1].visible = false; | 327 | propertyFormItems.value[index + 1].visible = false; |
| 328 | propertyFormItems.value[index + 2].visible = false; | 328 | propertyFormItems.value[index + 2].visible = false; |
| 329 | } | 329 | } |
| 330 | } else if (item.field == 'address' || item.field == 'usci' || item.field == 'registerDate' || item.field == 'tradeStartDate' || item.field == 'tradeEndDate') {//在会员详情处获取。 | 330 | } else if (item.field == 'address' || item.field == 'socialCreditCode' || item.field == 'registrationDate' || item.field == 'businessLicenseStartDate' || item.field == 'businessLicenseEndDate') {//在会员详情处获取。 |
| 331 | item.default = tenantDetail.value[item.field]; | 331 | item.default = tenantDetail.value[item.field]; |
| 332 | } else if (item.field == 'businessLicense') { | 332 | } else if (item.field == 'businessLicenseJson') { |
| 333 | item.default = tenantDetail.value[item.field] || []; | 333 | item.default = tenantDetail.value[item.field] || []; |
| 334 | if (!item.default.length) { | 334 | if (!item.default.length) { |
| 335 | item.visible = false; | 335 | item.visible = false; |
| ... | @@ -391,6 +391,7 @@ onActivated(() => { | ... | @@ -391,6 +391,7 @@ onActivated(() => { |
| 391 | }) | 391 | }) |
| 392 | 392 | ||
| 393 | onBeforeMount(() => { | 393 | onBeforeMount(() => { |
| 394 | restart.value = localStorage.getItem('isRestart')?true:false; | ||
| 394 | if (guid) { | 395 | if (guid) { |
| 395 | fullscreenLoading.value = true; | 396 | fullscreenLoading.value = true; |
| 396 | getRegiaterDetail({ guid: guid }).then((res: any) => { | 397 | getRegiaterDetail({ guid: guid }).then((res: any) => { |
| ... | @@ -955,7 +956,7 @@ const baseFormItems: any = ref([ | ... | @@ -955,7 +956,7 @@ const baseFormItems: any = ref([ |
| 955 | block: true, | 956 | block: true, |
| 956 | field: "dataSensitivityLevel", | 957 | field: "dataSensitivityLevel", |
| 957 | col: 'other-group-flex', | 958 | col: 'other-group-flex', |
| 958 | default: [1], | 959 | default: [], |
| 959 | children: [ | 960 | children: [ |
| 960 | { | 961 | { |
| 961 | label: "公开数据", | 962 | label: "公开数据", |
| ... | @@ -1041,7 +1042,7 @@ const baseFormItems: any = ref([ | ... | @@ -1041,7 +1042,7 @@ const baseFormItems: any = ref([ |
| 1041 | type: "checkbox-group-row", | 1042 | type: "checkbox-group-row", |
| 1042 | placeholder: "", | 1043 | placeholder: "", |
| 1043 | field: "dataGetWay", | 1044 | field: "dataGetWay", |
| 1044 | default: [1], | 1045 | default: [], |
| 1045 | col: 'other-group-flex', | 1046 | col: 'other-group-flex', |
| 1046 | block: true, | 1047 | block: true, |
| 1047 | children: [ | 1048 | children: [ |
| ... | @@ -1093,7 +1094,7 @@ const baseFormItems: any = ref([ | ... | @@ -1093,7 +1094,7 @@ const baseFormItems: any = ref([ |
| 1093 | type: "checkbox-group-row", | 1094 | type: "checkbox-group-row", |
| 1094 | placeholder: "", | 1095 | placeholder: "", |
| 1095 | field: "updateFrequency", | 1096 | field: "updateFrequency", |
| 1096 | default: [3], | 1097 | default: [], |
| 1097 | block: true, | 1098 | block: true, |
| 1098 | col: 'other-group-flex', | 1099 | col: 'other-group-flex', |
| 1099 | children: [ | 1100 | children: [ |
| ... | @@ -1143,7 +1144,7 @@ const baseFormItems: any = ref([ | ... | @@ -1143,7 +1144,7 @@ const baseFormItems: any = ref([ |
| 1143 | placeholder: "", | 1144 | placeholder: "", |
| 1144 | col: 'other-group-flex', | 1145 | col: 'other-group-flex', |
| 1145 | field: "ownIndustry", | 1146 | field: "ownIndustry", |
| 1146 | default: [2], | 1147 | default: [], |
| 1147 | children: [ | 1148 | children: [ |
| 1148 | { | 1149 | { |
| 1149 | label: "能源", | 1150 | label: "能源", |
| ... | @@ -1181,7 +1182,7 @@ const baseFormItems: any = ref([ | ... | @@ -1181,7 +1182,7 @@ const baseFormItems: any = ref([ |
| 1181 | placeholder: "", | 1182 | placeholder: "", |
| 1182 | col: 'other-group-flex', | 1183 | col: 'other-group-flex', |
| 1183 | field: "bizOwn", | 1184 | field: "bizOwn", |
| 1184 | default: [1], | 1185 | default: [], |
| 1185 | children: [ | 1186 | children: [ |
| 1186 | { | 1187 | { |
| 1187 | label: "生产类业务数据", | 1188 | label: "生产类业务数据", |
| ... | @@ -1401,7 +1402,7 @@ const propertyFormItems: any = ref([ | ... | @@ -1401,7 +1402,7 @@ const propertyFormItems: any = ref([ |
| 1401 | type: "checkbox-group-row", | 1402 | type: "checkbox-group-row", |
| 1402 | placeholder: "", | 1403 | placeholder: "", |
| 1403 | field: "propertyType", | 1404 | field: "propertyType", |
| 1404 | default: [3], | 1405 | default: [], |
| 1405 | children: [ | 1406 | children: [ |
| 1406 | { | 1407 | { |
| 1407 | label: "数据资源持有权", | 1408 | label: "数据资源持有权", |
| ... | @@ -1424,7 +1425,7 @@ const propertyFormItems: any = ref([ | ... | @@ -1424,7 +1425,7 @@ const propertyFormItems: any = ref([ |
| 1424 | placeholder: "", | 1425 | placeholder: "", |
| 1425 | field: "rightsContent", | 1426 | field: "rightsContent", |
| 1426 | col: 'col2', | 1427 | col: 'col2', |
| 1427 | default: [5], | 1428 | default: [], |
| 1428 | children: [ | 1429 | children: [ |
| 1429 | { | 1430 | { |
| 1430 | label: "可转让", | 1431 | label: "可转让", |
| ... | @@ -1600,10 +1601,10 @@ const propertyFormItems: any = ref([ | ... | @@ -1600,10 +1601,10 @@ const propertyFormItems: any = ref([ |
| 1600 | label: '统一社会信用代码', | 1601 | label: '统一社会信用代码', |
| 1601 | type: 'input', | 1602 | type: 'input', |
| 1602 | placeholder: '请输入', | 1603 | placeholder: '请输入', |
| 1603 | field: 'usci', | 1604 | field: 'socialCreditCode', |
| 1604 | col: 'mr8', | 1605 | col: 'mr8', |
| 1605 | disabled: true, | 1606 | disabled: true, |
| 1606 | default: tenantDetail.value.usci ?? "", | 1607 | default: tenantDetail.value.socialCreditCode ?? "", |
| 1607 | required: false | 1608 | required: false |
| 1608 | }, | 1609 | }, |
| 1609 | { | 1610 | { |
| ... | @@ -1648,9 +1649,9 @@ const propertyFormItems: any = ref([ | ... | @@ -1648,9 +1649,9 @@ const propertyFormItems: any = ref([ |
| 1648 | { | 1649 | { |
| 1649 | label: "注册日期", | 1650 | label: "注册日期", |
| 1650 | type: "date", | 1651 | type: "date", |
| 1651 | field: "registerDate", | 1652 | field: "registrationDate", |
| 1652 | col: 'mr8', | 1653 | col: 'mr8', |
| 1653 | default: tenantDetail.value.registerDate ?? "", | 1654 | default: tenantDetail.value.registrationDate ?? "", |
| 1654 | placeholder: "请选择", | 1655 | placeholder: "请选择", |
| 1655 | clearable: true, | 1656 | clearable: true, |
| 1656 | disabled: true, | 1657 | disabled: true, |
| ... | @@ -1660,9 +1661,9 @@ const propertyFormItems: any = ref([ | ... | @@ -1660,9 +1661,9 @@ const propertyFormItems: any = ref([ |
| 1660 | label: '营业开始日期', | 1661 | label: '营业开始日期', |
| 1661 | type: 'date', | 1662 | type: 'date', |
| 1662 | placeholder: '请输入', | 1663 | placeholder: '请输入', |
| 1663 | field: 'tradeStartDate', | 1664 | field: 'businessLicenseStartDate', |
| 1664 | col: 'mr8', | 1665 | col: 'mr8', |
| 1665 | default: tenantDetail.value.tradeStartDate ?? "", | 1666 | default: tenantDetail.value.businessLicenseStartDate ?? "", |
| 1666 | unlink: true, | 1667 | unlink: true, |
| 1667 | disabled: true, | 1668 | disabled: true, |
| 1668 | clearable: true, | 1669 | clearable: true, |
| ... | @@ -1672,8 +1673,8 @@ const propertyFormItems: any = ref([ | ... | @@ -1672,8 +1673,8 @@ const propertyFormItems: any = ref([ |
| 1672 | label: '营业结束日期', | 1673 | label: '营业结束日期', |
| 1673 | type: 'date', | 1674 | type: 'date', |
| 1674 | placeholder: '无固定期限', | 1675 | placeholder: '无固定期限', |
| 1675 | field: 'tradeEndDate', | 1676 | field: 'businessLicenseEndDate', |
| 1676 | default: tenantDetail.value.tradeEndDate ?? "", | 1677 | default: tenantDetail.value.businessLicenseEndDate ?? "", |
| 1677 | unlink: true, | 1678 | unlink: true, |
| 1678 | col: 'no-margin-r', | 1679 | col: 'no-margin-r', |
| 1679 | disabled: true, | 1680 | disabled: true, |
| ... | @@ -1688,7 +1689,7 @@ const propertyFormItems: any = ref([ | ... | @@ -1688,7 +1689,7 @@ const propertyFormItems: any = ref([ |
| 1688 | templateUrl: null, | 1689 | templateUrl: null, |
| 1689 | default: [], | 1690 | default: [], |
| 1690 | visible: false, | 1691 | visible: false, |
| 1691 | field: 'businessLicense' | 1692 | field: 'businessLicenseJson' |
| 1692 | }, | 1693 | }, |
| 1693 | ]); | 1694 | ]); |
| 1694 | 1695 | ||
| ... | @@ -2015,7 +2016,7 @@ const save = () => { | ... | @@ -2015,7 +2016,7 @@ const save = () => { |
| 2015 | fullscreenLoading.value = true; | 2016 | fullscreenLoading.value = true; |
| 2016 | if (draftDetailInfo.value.guid) { | 2017 | if (draftDetailInfo.value.guid) { |
| 2017 | params.guid = draftDetailInfo.value.guid; | 2018 | params.guid = draftDetailInfo.value.guid; |
| 2018 | params.isRestart = restart ? true : false; | 2019 | params.isRestart = restart.value; |
| 2019 | registerUpdate(params).then((res: any) => { | 2020 | registerUpdate(params).then((res: any) => { |
| 2020 | fullscreenLoading.value = false; | 2021 | fullscreenLoading.value = false; |
| 2021 | if (res.code == proxy.$passCode) { | 2022 | if (res.code == proxy.$passCode) { | ... | ... |
| ... | @@ -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', | ... | ... |
-
Please register or sign in to post a comment