Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
b43111cd by lihua
Options

数据资产登记专区

1 parent e6181892
Expand all
Inline Side-by-side
Showing 15 changed files with 179 additions and 30 deletions
package.json
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 "crypto-js": "^4.2.0", 30 "crypto-js": "^4.2.0",
31 "dayjs": "^1.11.7", 31 "dayjs": "^1.11.7",
32 "echarts": "^5.4.3", 32 "echarts": "^5.4.3",
33 "element-plus": "^2.5.2", 33 "element-plus": "^2.9.0",
34 "eruda": "^3.0.0", 34 "eruda": "^3.0.0",
35 "file-saver": "^2.0.5", 35 "file-saver": "^2.0.5",
36 "hotkeys-js": "^3.10.2", 36 "hotkeys-js": "^3.10.2",
......
pnpm-lock.yaml
...@@ -51,8 +51,8 @@ dependencies: ...@@ -51,8 +51,8 @@ dependencies:
51 specifier: ^5.4.3 51 specifier: ^5.4.3
52 version: 5.5.1 52 version: 5.5.1
53 element-plus: 53 element-plus:
54 specifier: ^2.5.2 54 specifier: ^2.9.0
55 version: 2.8.8(vue@3.5.13) 55 version: 2.9.0(vue@3.5.13)
56 eruda: 56 eruda:
57 specifier: ^3.0.0 57 specifier: ^3.0.0
58 version: 3.4.1 58 version: 3.4.1
...@@ -4015,8 +4015,8 @@ packages: ...@@ -4015,8 +4015,8 @@ packages:
4015 resolution: {integrity: sha512-IXEuxU+5ClW2IGEYFC2T7szbyVgehupCWQe5GNh+H065CD6U6IFN0s4KeAMFGNmQolRU4IV7zGBWSYMmZ8uuqQ==} 4015 resolution: {integrity: sha512-IXEuxU+5ClW2IGEYFC2T7szbyVgehupCWQe5GNh+H065CD6U6IFN0s4KeAMFGNmQolRU4IV7zGBWSYMmZ8uuqQ==}
4016 dev: true 4016 dev: true
4017 4017
4018 /element-plus@2.8.8(vue@3.5.13): 4018 /element-plus@2.9.0(vue@3.5.13):
4019 resolution: {integrity: sha512-MLAH1x2PGTnOT7Iwqh9ASgfZhvgqQqrdbxuJH0w2fGjzE4ZjryyLQj24HXoQO7Zon66U3lrYxbdLI57M6OX0qw==} 4019 resolution: {integrity: sha512-ccOFXKsauo2dtokAr4OX7gZsb7TuAoVxA2zGRZo5o2yyDDBLBaZxOoFQPoxITSLcHbBfQuNDGK5Iag5hnyKkZA==}
4020 peerDependencies: 4020 peerDependencies:
4021 vue: ^3.2.0 4021 vue: ^3.2.0
4022 dependencies: 4022 dependencies:
......
src/api/modules/dataAsset.ts
...@@ -2,14 +2,14 @@ import request from "@/utils/request"; ...@@ -2,14 +2,14 @@ import request from "@/utils/request";
2 2
3 /** 获取登记列表。 */ 3 /** 获取登记列表。 */
4 export const getRegisterList = (params) => request({ 4 export const getRegisterList = (params) => request({
5 url: `${import.meta.env.VITE_API_NEW_PORTAL}/register-base/page-list`, 5 url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-register-overview/page-list`,
6 method: 'post', 6 method: 'post',
7 data: params 7 data: params
8 }) 8 })
9 9
10 /** 获取登记详情 */ 10 /** 获取登记详情 */
11 export const getRegiaterDetail = (params) => request({ 11 export const getRegiaterDetail = (params) => request({
12 url: `${import.meta.env.VITE_API_NEW_PORTAL}/register-base/detail`, 12 url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-register-overview/detail`,
13 method: 'get', 13 method: 'get',
14 params 14 params
15 }) 15 })
...@@ -30,9 +30,8 @@ export const registerUpdate = (params) => request({ ...@@ -30,9 +30,8 @@ export const registerUpdate = (params) => request({
30 30
31 /** 删除登记信息 */ 31 /** 删除登记信息 */
32 export const registerDelete = (params) => request({ 32 export const registerDelete = (params) => request({
33 url: `${import.meta.env.VITE_API_NEW_PORTAL}/register-base/delete`, 33 url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-register-overview/delete?guid=${params}`,
34 method: 'delete', 34 method: 'delete'
35 data: params
36 }); 35 });
37 36
38 /** 获取当前会员审批流程信息 */ 37 /** 获取当前会员审批流程信息 */
...@@ -433,7 +432,7 @@ export const updateDissentState = (params) => request({ ...@@ -433,7 +432,7 @@ export const updateDissentState = (params) => request({
433 432
434 // 获取数交所数据 433 // 获取数交所数据
435 export const getExchangeList = (params) => request({ 434 export const getExchangeList = (params) => request({
436 url: `${import.meta.env.VITE_API_NEW_PORTAL}/register-base/register-num`, 435 url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-register-overview/register-num`,
437 method: 'post', 436 method: 'post',
438 data: params 437 data: params
439 }) 438 })
......
src/api/modules/dataAssetZq.ts 0 → 100644
1 import request from "@/utils/request";
2
3 /** 获取登记详情 */
4 export const getRegiaterDetail = (params) => request({
5 url: `${import.meta.env.VITE_API_NEW_PORTAL}/public-data-products-main/detail`,
6 method: 'get',
7 params
8 })
9
10 /** 提交登记信息。 */
11 export const registerSave = (params) => request({
12 url: `${import.meta.env.VITE_API_NEW_PORTAL}/public-data-products-main/save`,
13 method: 'post',
14 data: params
15 });
16
17 /** 更新登记信息 */
18 export const registerUpdate = (params) => request({
19 url: `${import.meta.env.VITE_API_NEW_PORTAL}/public-data-products-main/update`,
20 method: 'post',
21 data: params
22 });
23
24 /** 删除登记信息 */
25 export const registerDelete = (params) => request({
26 url: `${import.meta.env.VITE_API_NEW_PORTAL}/public-data-products-main/delete`,
27 method: 'delete',
28 data: params
29 });
...\ No newline at end of file ...\ No newline at end of file
src/api/modules/queryService.ts
...@@ -310,3 +310,10 @@ export const exportTemplate = (params) => request({ ...@@ -310,3 +310,10 @@ export const exportTemplate = (params) => request({
310 method: 'post', 310 method: 'post',
311 responseType: 'blob' 311 responseType: 'blob'
312 }); 312 });
313
314 /** 获取字典列表数据 */
315 export const getParamsList = (params) => request({
316 url: `${import.meta.env.VITE_APP_CONFIG_URL}/dict/data/get-by-dictType`,
317 method: 'get',
318 params
319 })
...\ No newline at end of file ...\ No newline at end of file
......
src/components/Form/index.vue
...@@ -816,7 +816,9 @@ const panelChange = (scope, row) => { ...@@ -816,7 +816,9 @@ const panelChange = (scope, row) => {
816 </span> 816 </span>
817 <el-select v-if="child.type == 'select'" v-model="formInline[child.field]" 817 <el-select v-if="child.type == 'select'" v-model="formInline[child.field]"
818 :placeholder="child.placeholder" :disabled="child.disabled || readonly" :filterable="child.filterable" 818 :placeholder="child.placeholder" :disabled="child.disabled || readonly" :filterable="child.filterable"
819 :teleported="child.teleported || true"> 819 :multiple="child.multiple ?? false"
820 :collapse-tags="child.collapse ?? false" :collapse-tags-tooltip="child.tagsTooltip ?? false"
821 :max-collapse-tags="child.maxTags ?? 1" :teleported="child.teleported || true">
820 <el-option v-for="opts in child.options" 822 <el-option v-for="opts in child.options"
821 :label="child.props?.label ? opts[child.props.label] : opts.label" 823 :label="child.props?.label ? opts[child.props.label] : opts.label"
822 :value="child.props?.value ? opts[child.props.value] : opts.value" :disabled="opts.disabled" /> 824 :value="child.props?.value ? opts[child.props.value] : opts.value" :disabled="opts.disabled" />
...@@ -1520,11 +1522,14 @@ const panelChange = (scope, row) => { ...@@ -1520,11 +1522,14 @@ const panelChange = (scope, row) => {
1520 :disabled="btn.disabled" :style="btn.style ?? {}" @click="btnClick(btn, null)">{{ btn.label }}</el-button> 1522 :disabled="btn.disabled" :style="btn.style ?? {}" @click="btnClick(btn, null)">{{ btn.label }}</el-button>
1521 </template> 1523 </template>
1522 </template> 1524 </template>
1525 <el-input-tag :class="[item.col, { is_block: item.block }]" v-else-if="item.type == 'inputTag'"
1526 v-model.trim="formInline[item.field]" :placeholder="item.placeholder" draggable
1527 :clearable="item.clearable" :maxlength="item.maxlength ?? ''" :disabled="item.disabled"
1528 :readonly="item.autocompleteSetting?.readonly || item.readonly" />
1523 <el-input :class="[item.col, { is_block: item.block }]" v-else-if="item.type == 'password'" 1529 <el-input :class="[item.col, { is_block: item.block }]" v-else-if="item.type == 'password'"
1524 v-model.trim="formInline[item.field]" type="password" :placeholder="item.placeholder" 1530 v-model.trim="formInline[item.field]" type="password" :placeholder="item.placeholder"
1525 :clearable="item.clearable" :maxlength="item.maxlength ?? ''" show-password :disabled="item.disabled" 1531 :clearable="item.clearable" :maxlength="item.maxlength ?? ''" show-password :disabled="item.disabled"
1526 :autocomplete="item.autocompleteSetting?.autocomplete || item.autocomplete 1532 :autocomplete="item.autocompleteSetting?.autocomplete || item.autocomplete" :readonly="item.autocompleteSetting?.readonly || item.readonly" @click="handlerIptClick(item)" />
1527 " :readonly="item.autocompleteSetting?.readonly || item.readonly" @click="handlerIptClick(item)" />
1528 <div class="input_def" v-else> 1533 <div class="input_def" v-else>
1529 <span v-if="item.beforeMsg" style="color: #212121;">{{ item.beforeMsg }}</span> 1534 <span v-if="item.beforeMsg" style="color: #212121;">{{ item.beforeMsg }}</span>
1530 <el-input :class="[item.col, { is_block: item.block }]" v-model.trim="formInline[item.field]" :style="item.width ? { width: item.width } : null" 1535 <el-input :class="[item.col, { is_block: item.block }]" v-model.trim="formInline[item.field]" :style="item.width ? { width: item.width } : null"
......
src/components/Table/index.vue
...@@ -415,6 +415,9 @@ onMounted(() => { ...@@ -415,6 +415,9 @@ onMounted(() => {
415 " @input="inputKeyUp(editForm[item.field].regexp, scope, editForm[item.field])" 415 " @input="inputKeyUp(editForm[item.field].regexp, scope, editForm[item.field])"
416 @change="(val) => inputChange(val, scope, item)" 416 @change="(val) => inputChange(val, scope, item)"
417 @focus="(event) => inputFocus(event, scope, editForm[item.field])"></el-input> 417 @focus="(event) => inputFocus(event, scope, editForm[item.field])"></el-input>
418 <el-date-picker v-else-if="editForm[item.field] && editForm[item.field].type == 'date'" v-model="scope.row[item.field]" :placeholder="editForm[item.field].placeholder"
419 :clearable="editForm[item.field].clearable" type="date"
420 format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
418 <template v-else-if="editForm[item.field] && editForm[item.field].type == 'defaultValue'"> 421 <template v-else-if="editForm[item.field] && editForm[item.field].type == 'defaultValue'">
419 <el-date-picker v-if="scope.row[item.dataTypeName] === 'date'" v-model="scope.row[item.field]" type="date" 422 <el-date-picker v-if="scope.row[item.dataTypeName] === 'date'" v-model="scope.row[item.field]" type="date"
420 format="YYYY-MM-DD" value-format="YYYY-MM-DD" :placeholder="editForm[item.field].placeholder" /> 423 format="YYYY-MM-DD" value-format="YYYY-MM-DD" :placeholder="editForm[item.field].placeholder" />
......
src/router/modules/dataAssetRegistry.ts
...@@ -23,6 +23,23 @@ const routes: RouteRecordRaw[] = [ ...@@ -23,6 +23,23 @@ const routes: RouteRecordRaw[] = [
23 }, 23 },
24 }, 24 },
25 { 25 {
26 path: 'register-start-js',
27 name: 'registerStartJS',
28 component: () => import('@/views/data_asset/registerStartJS.vue'),
29 meta: {
30 title: '新建资产登记',
31 sidebar: false,
32 breadcrumb: false,
33 cache: true,
34 editPage: true,
35 reuse: true
36 },
37 beforeEnter: (to, from) => {
38 to.meta.title = to.query.type == 'create' ? '新建资产登记' : `编辑-${to.query.name}`;
39 to.meta.editPage = true;
40 }
41 },
42 {
26 path: 'register-start', 43 path: 'register-start',
27 name: 'registerStart', 44 name: 'registerStart',
28 component: () => import('@/views/data_asset/registerStart.vue'), 45 component: () => import('@/views/data_asset/registerStart.vue'),
...@@ -50,6 +67,18 @@ const routes: RouteRecordRaw[] = [ ...@@ -50,6 +67,18 @@ const routes: RouteRecordRaw[] = [
50 cache: true, 67 cache: true,
51 reuse: true 68 reuse: true
52 }, 69 },
70 },
71 {
72 path: 'register-JQZQ-detail',
73 name: 'registerInfoJSZQDetail',
74 component: () => import('@/views/data_asset/registerJSZQDetail.vue'),
75 meta: {
76 title: '详情-',
77 sidebar: false,
78 breadcrumb: false,
79 cache: true,
80 reuse: true
81 },
53 } 82 }
54 ], 83 ],
55 }, 84 },
...@@ -85,6 +114,18 @@ const routes: RouteRecordRaw[] = [ ...@@ -85,6 +114,18 @@ const routes: RouteRecordRaw[] = [
85 } 114 }
86 }, 115 },
87 { 116 {
117 path: 'register-JSZQ-detail',
118 name: 'registerJSZQDetail',
119 component: () => import('@/views/data_asset/registerJSZQDetail.vue'),
120 meta: {
121 title: '详情-',
122 sidebar: false,
123 breadcrumb: false,
124 cache: true,
125 reuse: true
126 }
127 },
128 {
88 path: 'register-catalog-detail', 129 path: 'register-catalog-detail',
89 name: 'evaCatalogDetail', 130 name: 'evaCatalogDetail',
90 component: () => import('@/views/data_asset/registerCatalogDetail.vue'), 131 component: () => import('@/views/data_asset/registerCatalogDetail.vue'),
...@@ -130,6 +171,18 @@ const routes: RouteRecordRaw[] = [ ...@@ -130,6 +171,18 @@ const routes: RouteRecordRaw[] = [
130 } 171 }
131 }, 172 },
132 { 173 {
174 path: 'register-value-JSZQ-detail',
175 name: 'registerValueJSZQDetail',
176 component: () => import('@/views/data_asset/registerJSZQDetail.vue'),
177 meta: {
178 title: '详情-',
179 sidebar: false,
180 breadcrumb: false,
181 cache: true,
182 reuse: true
183 }
184 },
185 {
133 path: 'register-catalog-detail', 186 path: 'register-catalog-detail',
134 name: 'costAssessDetail', 187 name: 'costAssessDetail',
135 component: () => import('@/views/data_asset/registerCatalogDetail.vue'), 188 component: () => import('@/views/data_asset/registerCatalogDetail.vue'),
...@@ -175,6 +228,18 @@ const routes: RouteRecordRaw[] = [ ...@@ -175,6 +228,18 @@ const routes: RouteRecordRaw[] = [
175 } 228 }
176 }, 229 },
177 { 230 {
231 path: 'register-certi-JSZQ-detail',
232 name: 'certificateJSZQDetail',
233 component: () => import('@/views/data_asset/registerJSZQDetail.vue'),
234 meta: {
235 title: '详情-',
236 sidebar: false,
237 breadcrumb: false,
238 cache: true,
239 reuse: true
240 }
241 },
242 {
178 path: 'register-catalog-detail', 243 path: 'register-catalog-detail',
179 name: 'certiCatalogDetail', 244 name: 'certiCatalogDetail',
180 component: () => import('@/views/data_asset/registerCatalogDetail.vue'), 245 component: () => import('@/views/data_asset/registerCatalogDetail.vue'),
......
src/views/data_asset/certificateManagement.vue
...@@ -261,7 +261,10 @@ const tableBtnClick = (scope, btn) => { ...@@ -261,7 +261,10 @@ const tableBtnClick = (scope, btn) => {
261 }); 261 });
262 } else if (type === 'path_detail') { // 详情 262 } else if (type === 'path_detail') { // 详情
263 if (row.registerGuid) { 263 if (row.registerGuid) {
264 router.push({ 264 row.dataSource == '1' ? router.push({
265 name: 'certificateJSZQDetail',
266 query: { guid: row.registerGuid, certificateGuid: row.guid, type: 'certificate', tenantGuid: row.tenantGuid }
267 }) : router.push({
265 name: 'certificateDetail', 268 name: 'certificateDetail',
266 query: { guid: row.registerGuid, certificateGuid: row.guid, type: 'certificate', tenantGuid: row.tenantGuid } 269 query: { guid: row.registerGuid, certificateGuid: row.guid, type: 'certificate', tenantGuid: row.tenantGuid }
267 }); 270 });
...@@ -291,6 +294,7 @@ const formItems = ref([{ ...@@ -291,6 +294,7 @@ const formItems = ref([{
291 label: 'daName', 294 label: 'daName',
292 value: 'damGuid' 295 value: 'damGuid'
293 }, 296 },
297 filterable: true,
294 disabled: false, 298 disabled: false,
295 clearable: true, 299 clearable: true,
296 required: true, 300 required: true,
......
src/views/data_asset/qualityEvaluate.vue
...@@ -382,7 +382,10 @@ const tableBtnClick = (scope, btn) => { ...@@ -382,7 +382,10 @@ const tableBtnClick = (scope, btn) => {
382 }); 382 });
383 } else if (type === 'detail') { // 详情 383 } else if (type === 'detail') { // 详情
384 if (row.registerApproveState == 'Y') { 384 if (row.registerApproveState == 'Y') {
385 router.push({ 385 row.dataSource == '1' ? router.push({
386 name: 'registerJSZQDetail',
387 query: { guid: row.registerGuid, evaGuid: row.guid, type: 'qualityEvaluate', tenantGuid: row.tenantGuid, tenantName: row.tenantName }
388 }) : router.push({
386 name: 'registerDetail', 389 name: 'registerDetail',
387 query: { guid: row.registerGuid, evaGuid: row.guid, type: 'qualityEvaluate', tenantGuid: row.tenantGuid, tenantName: row.tenantName } 390 query: { guid: row.registerGuid, evaGuid: row.guid, type: 'qualityEvaluate', tenantGuid: row.tenantGuid, tenantName: row.tenantName }
388 }); 391 });
...@@ -451,6 +454,7 @@ const formItems = ref([{ ...@@ -451,6 +454,7 @@ const formItems = ref([{
451 value: 'guid', 454 value: 'guid',
452 label: 'damName' 455 label: 'damName'
453 }, 456 },
457 filterable: true,
454 visible: true, 458 visible: true,
455 required: true 459 required: true
456 }, { 460 }, {
...@@ -465,6 +469,7 @@ const formItems = ref([{ ...@@ -465,6 +469,7 @@ const formItems = ref([{
465 value: 'guid', 469 value: 'guid',
466 label: 'tenantName' 470 label: 'tenantName'
467 }, 471 },
472 filterable: true,
468 visible: false, 473 visible: false,
469 required: true 474 required: true
470 }, { 475 }, {
......
src/views/data_asset/registerCatalogDetail.vue
...@@ -119,7 +119,10 @@ const registerDetailTableInfo = ref({ ...@@ -119,7 +119,10 @@ const registerDetailTableInfo = ref({
119 }); 119 });
120 } else if (row.type == 'qualityEvaluate') { 120 } else if (row.type == 'qualityEvaluate') {
121 if (row.registerApproveState == 'Y') { 121 if (row.registerApproveState == 'Y') {
122 router.push({ 122 row.dataSource == '1' ? router.push({
123 name: 'registerJSZQDetail',
124 query: { guid: row.registerGuid, evaGuid: row.guid, type: 'qualityEvaluate', tenantGuid: row.tenantGuid, tenantName: row.tenantName }
125 }) : router.push({
123 name: 'registerDetail', 126 name: 'registerDetail',
124 query: { guid: row.registerGuid, evaGuid: row.guid, type: 'qualityEvaluate', tenantGuid: row.tenantGuid, tenantName: row.tenantName } 127 query: { guid: row.registerGuid, evaGuid: row.guid, type: 'qualityEvaluate', tenantGuid: row.tenantGuid, tenantName: row.tenantName }
125 }); 128 });
...@@ -131,7 +134,10 @@ const registerDetailTableInfo = ref({ ...@@ -131,7 +134,10 @@ const registerDetailTableInfo = ref({
131 } 134 }
132 } else if (row.type == 'costAssess') { 135 } else if (row.type == 'costAssess') {
133 if (row.registerApproveState == 'Y') { 136 if (row.registerApproveState == 'Y') {
134 router.push({ 137 row.dataSource == '1' ? router.push({
138 name: 'registerValueJSZQDetail',
139 query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', tenantGuid: row.tenantGuid, tenantName: row.tenantName }
140 }) : router.push({
135 name: 'registerValueDetail', 141 name: 'registerValueDetail',
136 query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', tenantGuid: row.tenantGuid, tenantName: row.tenantName } 142 query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', tenantGuid: row.tenantGuid, tenantName: row.tenantName }
137 }); 143 });
......
src/views/data_asset/registerJSZQDetail.vue 0 → 100644
This diff could not be displayed because it is too large.
src/views/data_asset/registerManagemant.vue
...@@ -43,7 +43,7 @@ const searchItemList = ref([ ...@@ -43,7 +43,7 @@ const searchItemList = ref([
43 { 43 {
44 type: "input", 44 type: "input",
45 label: "", 45 label: "",
46 field: "daName", 46 field: "damName",
47 default: "", 47 default: "",
48 placeholder: "资产名称", 48 placeholder: "资产名称",
49 clearable: true, 49 clearable: true,
...@@ -90,15 +90,15 @@ const pageInfo = ref({ ...@@ -90,15 +90,15 @@ const pageInfo = ref({
90 { label: "150", value: 150 }, 90 { label: "150", value: 150 },
91 { label: "200", value: 200 }, 91 { label: "200", value: 200 },
92 ], 92 ],
93 daName: '', 93 damName: '',
94 approveState: '', 94 approveState: '',
95 tenantGuid: '', 95 tenantGuid: '',
96 }); 96 });
97 97
98 const tableFields = ref([{ label: "序号", type: "index", width: 56, align: "center" }, 98 const tableFields = ref([{ label: "序号", type: "index", width: 56, align: "center" },
99 { label: "资产名称", field: "daName", width: 160, align: "left" }, 99 { label: "资产名称", field: "damName", width: 160, align: "left" },
100 { label: "数据分类", field: "dataCategoryName", width: 120, align: "left" }, 100 { label: "数据分类", field: "dataTypeName", width: 120, align: "left" },
101 { label: "存储方式", field: "storageFormName", width: 120, align: "left" }, 101 { label: "更新频率", field: "updateFrequencyName", width: 120, align: "left" },
102 { label: "数交所名称", field: "exchangeName", width: 160, align: "left" }, 102 { label: "数交所名称", field: "exchangeName", width: 160, align: "left" },
103 { label: "专区名称", field: "zqName", width: 160, align: "left" }, 103 { label: "专区名称", field: "zqName", width: 160, align: "left" },
104 { 104 {
...@@ -206,10 +206,17 @@ const currTableData: any = ref({}); ...@@ -206,10 +206,17 @@ const currTableData: any = ref({});
206 const btnClick = (btn) => { 206 const btnClick = (btn) => {
207 const type = btn.value; 207 const type = btn.value;
208 if (type == 'create') { 208 if (type == 'create') {
209 if (btn.exchangeName.includes('数交所（勿删）') || btn.exchangeName.includes('江苏省数据交易所')) {
210 router.push({
211 name: 'registerStartJS',
212 query: { exchangeGuid: btn.exchangeGuid, type }
213 });
214 } else {
209 router.push({ 215 router.push({
210 name: 'registerStart', 216 name: 'registerStart',
211 query: { exchangeGuid: btn.exchangeGuid, type } 217 query: { exchangeGuid: btn.exchangeGuid, type }
212 }); 218 });
219 }
213 } else if (type == 'search') { 220 } else if (type == 'search') {
214 exchangGuid.value = btn.exchangeGuid; 221 exchangGuid.value = btn.exchangeGuid;
215 pageInfo.value.curr = 1; 222 pageInfo.value.curr = 1;
...@@ -223,10 +230,17 @@ const tableBtnClick = (scope, btn) => { ...@@ -223,10 +230,17 @@ const tableBtnClick = (scope, btn) => {
223 const row = scope.row; 230 const row = scope.row;
224 currTableData.value = row; 231 currTableData.value = row;
225 if (type === "edit") { //草稿中\已驳回\已撤销\已通过 状态，才可以编辑。 232 if (type === "edit") { //草稿中\已驳回\已撤销\已通过 状态，才可以编辑。
233 if (row.dataSource == '1') {
234 router.push({
235 name: 'registerStartJS',
236 query: { guid: row.bizGuid, exchangeGuid: row.exchangeGuid, name: row.damName, tenantGuid: row.tenantGuid, type }
237 });
238 } else {
226 router.push({ 239 router.push({
227 name: 'registerStart', 240 name: 'registerStart',
228 query: { guid: row.guid, exchangeGuid: row.exchangeGuid, name: row.daName, tenantGuid: row.tenantGuid, type } 241 query: { guid: row.guid, exchangeGuid: row.exchangeGuid, name: row.damName, tenantGuid: row.tenantGuid, type }
229 }); 242 });
243 }
230 } else if (type == "delete") { 244 } else if (type == "delete") {
231 delTableOpen("此操作将永久删除该资产登记，是否继续?", "warning"); 245 delTableOpen("此操作将永久删除该资产登记，是否继续?", "warning");
232 } else if (type === 'revoke') { // 撤销，状态为审批中时可以撤销。 246 } else if (type === 'revoke') { // 撤销，状态为审批中时可以撤销。
...@@ -263,10 +277,17 @@ const tableBtnClick = (scope, btn) => { ...@@ -263,10 +277,17 @@ const tableBtnClick = (scope, btn) => {
263 }); 277 });
264 }); 278 });
265 } else if (type === 'detail') { // 详情, 若是草稿中，详情就是编辑， 279 } else if (type === 'detail') { // 详情, 若是草稿中，详情就是编辑，
280 if (row.dataSource == '1') {
281 router.push({
282 name: 'registerInfoJSZQDetail',
283 query: { guid: row.guid, name: row.damName, tenantGuid: row.tenantGuid, tenantName: row.tenantName, type: 'asset' }
284 });
285 } else {
266 router.push({ 286 router.push({
267 name: 'registerInfoDetail', 287 name: 'registerInfoDetail',
268 query: { guid: row.guid, name: row.daName, tenantGuid: row.tenantGuid, tenantName: row.tenantName, type: 'asset' } 288 query: { guid: row.guid, name: row.damName, tenantGuid: row.tenantGuid, tenantName: row.tenantName, type: 'asset' }
269 }); 289 });
290 }
270 } else if (type === 'pass') { 291 } else if (type === 'pass') {
271 passDialogInfo.value.visible = true; 292 passDialogInfo.value.visible = true;
272 } else if (type == 'reject') { 293 } else if (type == 'reject') {
...@@ -281,7 +302,7 @@ const delTableOpen = (msg, type, isBatch: boolean = false) => { ...@@ -281,7 +302,7 @@ const delTableOpen = (msg, type, isBatch: boolean = false) => {
281 type: type, 302 type: type,
282 }).then(() => { 303 }).then(() => {
283 let guids: any = []; 304 let guids: any = [];
284 guids = [currTableData.value.guid] 305 guids = currTableData.value.guid;
285 loading.value = true; 306 loading.value = true;
286 registerDelete(guids).then((res: any) => { 307 registerDelete(guids).then((res: any) => {
287 loading.value = false; 308 loading.value = false;
...@@ -315,7 +336,7 @@ const getTableData = () => { ...@@ -315,7 +336,7 @@ const getTableData = () => {
315 getRegisterList({ 336 getRegisterList({
316 pageSize: pageInfo.value.limit, 337 pageSize: pageInfo.value.limit,
317 pageIndex: pageInfo.value.curr, 338 pageIndex: pageInfo.value.curr,
318 daName: pageInfo.value.daName, 339 damName: pageInfo.value.damName,
319 approveState: pageInfo.value.approveState, 340 approveState: pageInfo.value.approveState,
320 tenantGuid: pageInfo.value.tenantGuid, 341 tenantGuid: pageInfo.value.tenantGuid,
321 exchangGuid: exchangGuid.value, 342 exchangGuid: exchangGuid.value,
...@@ -355,12 +376,12 @@ const toSearch = (val: any, clear: boolean = false) => { ...@@ -355,12 +376,12 @@ const toSearch = (val: any, clear: boolean = false) => {
355 pageInfo.value.curr = 1; 376 pageInfo.value.curr = 1;
356 if (clear) { 377 if (clear) {
357 searchItemList.value.map((item) => item.default = ""); 378 searchItemList.value.map((item) => item.default = "");
358 pageInfo.value.daName = ''; 379 pageInfo.value.damName = '';
359 pageInfo.value.approveState = ""; 380 pageInfo.value.approveState = "";
360 pageInfo.value.tenantGuid = ""; 381 pageInfo.value.tenantGuid = "";
361 val && (exchangGuid.value = ''); 382 val && (exchangGuid.value = '');
362 } else { 383 } else {
363 pageInfo.value.daName = val.daName; 384 pageInfo.value.damName = val.damName;
364 pageInfo.value.approveState = val.approveState; 385 pageInfo.value.approveState = val.approveState;
365 pageInfo.value.tenantGuid = val.tenantGuid; 386 pageInfo.value.tenantGuid = val.tenantGuid;
366 } 387 }
......
src/views/data_asset/valueEvaluate.vue
...@@ -426,7 +426,10 @@ const tableBtnClick = (scope, btn) => { ...@@ -426,7 +426,10 @@ const tableBtnClick = (scope, btn) => {
426 }); 426 });
427 } else if (type === 'detail') { // 详情 427 } else if (type === 'detail') { // 详情
428 if (row.registerApproveState == 'Y') { 428 if (row.registerApproveState == 'Y') {
429 router.push({ 429 row.dataSource == '1' ? router.push({
430 name: 'registerValueJSZQDetail',
431 query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', tenantGuid: row.tenantGuid, tenantName: row.tenantName }
432 }) : router.push({
430 name: 'registerValueDetail', 433 name: 'registerValueDetail',
431 query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', tenantGuid: row.tenantGuid, tenantName: row.tenantName } 434 query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', tenantGuid: row.tenantGuid, tenantName: row.tenantName }
432 }); 435 });
...@@ -499,6 +502,7 @@ const formItems = ref<any>([ ...@@ -499,6 +502,7 @@ const formItems = ref<any>([
499 value: 'guid', 502 value: 'guid',
500 label: 'damName' 503 label: 'damName'
501 }, 504 },
505 filterable: true,
502 visible: true, 506 visible: true,
503 required: true 507 required: true
504 }, { 508 }, {
...@@ -513,6 +517,7 @@ const formItems = ref<any>([ ...@@ -513,6 +517,7 @@ const formItems = ref<any>([
513 value: 'guid', 517 value: 'guid',
514 label: 'tenantName' 518 label: 'tenantName'
515 }, 519 },
520 filterable: true,
516 visible: false, 521 visible: false,
517 required: true 522 required: true
518 }, 523 },
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!