Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
38bfb485 by lihua
Options

数据资产登记专区

1 parent 58792e93
Expand all
Inline Side-by-side
Showing 15 changed files with 190 additions and 41 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" />
...@@ -1515,11 +1517,14 @@ const panelChange = (scope, row) => { ...@@ -1515,11 +1517,14 @@ const panelChange = (scope, row) => {
1515 :disabled="btn.disabled" :style="btn.style ?? {}" @click="btnClick(btn, null)">{{ btn.label }}</el-button> 1517 :disabled="btn.disabled" :style="btn.style ?? {}" @click="btnClick(btn, null)">{{ btn.label }}</el-button>
1516 </template> 1518 </template>
1517 </template> 1519 </template>
1520 <el-input-tag :class="[item.col, { is_block: item.block }]" v-else-if="item.type == 'inputTag'"
1521 v-model.trim="formInline[item.field]" :placeholder="item.placeholder" draggable
1522 :clearable="item.clearable" :maxlength="item.maxlength ?? ''" :disabled="item.disabled"
1523 :readonly="item.autocompleteSetting?.readonly || item.readonly" />
1518 <el-input :class="[item.col, { is_block: item.block }]" v-else-if="item.type == 'password'" 1524 <el-input :class="[item.col, { is_block: item.block }]" v-else-if="item.type == 'password'"
1519 v-model.trim="formInline[item.field]" type="password" :placeholder="item.placeholder" 1525 v-model.trim="formInline[item.field]" type="password" :placeholder="item.placeholder"
1520 :clearable="item.clearable" :maxlength="item.maxlength ?? ''" show-password :disabled="item.disabled" 1526 :clearable="item.clearable" :maxlength="item.maxlength ?? ''" show-password :disabled="item.disabled"
1521 :autocomplete="item.autocompleteSetting?.autocomplete || item.autocomplete 1527 :autocomplete="item.autocompleteSetting?.autocomplete || item.autocomplete" :readonly="item.autocompleteSetting?.readonly || item.readonly" @click="handlerIptClick(item)" />
1522 " :readonly="item.autocompleteSetting?.readonly || item.readonly" @click="handlerIptClick(item)" />
1523 <div class="input_def" v-else> 1528 <div class="input_def" v-else>
1524 <span v-if="item.beforeMsg" style="color: #212121;">{{ item.beforeMsg }}</span> 1529 <span v-if="item.beforeMsg" style="color: #212121;">{{ item.beforeMsg }}</span>
1525 <el-input :class="[item.col, { is_block: item.block }]" v-model.trim="formInline[item.field]" :style="item.width ? { width: item.width } : null" 1530 <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
...@@ -426,6 +426,9 @@ onMounted(() => { ...@@ -426,6 +426,9 @@ onMounted(() => {
426 " @input="inputKeyUp(editForm[item.field].regexp, scope, editForm[item.field])" 426 " @input="inputKeyUp(editForm[item.field].regexp, scope, editForm[item.field])"
427 @change="(val) => inputChange(val, scope, item)" 427 @change="(val) => inputChange(val, scope, item)"
428 @focus="(event) => inputFocus(event, scope, editForm[item.field])"></el-input> 428 @focus="(event) => inputFocus(event, scope, editForm[item.field])"></el-input>
429 <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"
430 :clearable="editForm[item.field].clearable" type="date"
431 format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
429 <template v-else-if="editForm[item.field] && editForm[item.field].type == 'defaultValue'"> 432 <template v-else-if="editForm[item.field] && editForm[item.field].type == 'defaultValue'">
430 <el-date-picker v-if="scope.row[item.dataTypeName] === 'date'" v-model="scope.row[item.field]" type="date" 433 <el-date-picker v-if="scope.row[item.dataTypeName] === 'date'" v-model="scope.row[item.field]" type="date"
431 format="YYYY-MM-DD" value-format="YYYY-MM-DD" :placeholder="editForm[item.field].placeholder" /> 434 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'),
...@@ -129,6 +170,18 @@ const routes: RouteRecordRaw[] = [ ...@@ -129,6 +170,18 @@ const routes: RouteRecordRaw[] = [
129 reuse: true 170 reuse: true
130 } 171 }
131 }, 172 },
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 },
132 { 185 {
133 path: 'register-catalog-detail', 186 path: 'register-catalog-detail',
134 name: 'costAssessDetail', 187 name: 'costAssessDetail',
...@@ -174,6 +227,18 @@ const routes: RouteRecordRaw[] = [ ...@@ -174,6 +227,18 @@ const routes: RouteRecordRaw[] = [
174 reuse: true 227 reuse: true
175 } 228 }
176 }, 229 },
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 },
177 { 242 {
178 path: 'register-catalog-detail', 243 path: 'register-catalog-detail',
179 name: 'certiCatalogDetail', 244 name: 'certiCatalogDetail',
......
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
...@@ -399,7 +399,10 @@ const tableBtnClick = (scope, btn) => { ...@@ -399,7 +399,10 @@ const tableBtnClick = (scope, btn) => {
399 }); 399 });
400 } else if (type === 'detail') { // 详情 400 } else if (type === 'detail') { // 详情
401 if (row.registerApproveState == 'Y') { 401 if (row.registerApproveState == 'Y') {
402 router.push({ 402 row.dataSource == '1' ? router.push({
403 name: 'registerJSZQDetail',
404 query: { guid: row.registerGuid, evaGuid: row.guid, type: 'qualityEvaluate', tenantGuid: row.tenantGuid, tenantName: row.tenantName }
405 }) : router.push({
403 name: 'registerDetail', 406 name: 'registerDetail',
404 query: { guid: row.registerGuid, evaGuid: row.guid, type: 'qualityEvaluate', tenantGuid: row.tenantGuid, tenantName: row.tenantName } 407 query: { guid: row.registerGuid, evaGuid: row.guid, type: 'qualityEvaluate', tenantGuid: row.tenantGuid, tenantName: row.tenantName }
405 }); 408 });
...@@ -468,6 +471,7 @@ const formItems = ref([{ ...@@ -468,6 +471,7 @@ const formItems = ref([{
468 value: 'guid', 471 value: 'guid',
469 label: 'damName' 472 label: 'damName'
470 }, 473 },
474 filterable: true,
471 visible: true, 475 visible: true,
472 required: true 476 required: true
473 }, { 477 }, {
...@@ -482,6 +486,7 @@ const formItems = ref([{ ...@@ -482,6 +486,7 @@ const formItems = ref([{
482 value: 'guid', 486 value: 'guid',
483 label: 'tenantName' 487 label: 'tenantName'
484 }, 488 },
489 filterable: true,
485 visible: false, 490 visible: false,
486 required: true 491 required: true
487 }, { 492 }, {
......
src/views/data_asset/registerCatalogDetail.vue
...@@ -120,7 +120,10 @@ const registerDetailTableInfo = ref({ ...@@ -120,7 +120,10 @@ const registerDetailTableInfo = ref({
120 }); 120 });
121 } else if (row.type == 'qualityEvaluate') { 121 } else if (row.type == 'qualityEvaluate') {
122 if (row.registerApproveState == 'Y') { 122 if (row.registerApproveState == 'Y') {
123 router.push({ 123 row.dataSource == '1' ? router.push({
124 name: 'registerJSZQDetail',
125 query: { guid: row.registerGuid, evaGuid: row.guid, type: 'qualityEvaluate', tenantGuid: row.tenantGuid, tenantName: row.tenantName }
126 }) : router.push({
124 name: 'registerDetail', 127 name: 'registerDetail',
125 query: { guid: row.registerGuid, evaGuid: row.guid, type: 'qualityEvaluate', tenantGuid: row.tenantGuid, tenantName: row.tenantName } 128 query: { guid: row.registerGuid, evaGuid: row.guid, type: 'qualityEvaluate', tenantGuid: row.tenantGuid, tenantName: row.tenantName }
126 }); 129 });
...@@ -132,7 +135,10 @@ const registerDetailTableInfo = ref({ ...@@ -132,7 +135,10 @@ const registerDetailTableInfo = ref({
132 } 135 }
133 } else if (row.type == 'costAssess') { 136 } else if (row.type == 'costAssess') {
134 if (row.registerApproveState == 'Y') { 137 if (row.registerApproveState == 'Y') {
135 router.push({ 138 row.dataSource == '1' ? router.push({
139 name: 'registerValueJSZQDetail',
140 query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', tenantGuid: row.tenantGuid, tenantName: row.tenantName }
141 }) : router.push({
136 name: 'registerValueDetail', 142 name: 'registerValueDetail',
137 query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', tenantGuid: row.tenantGuid, tenantName: row.tenantName } 143 query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', tenantGuid: row.tenantGuid, tenantName: row.tenantName }
138 }); 144 });
......
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
...@@ -44,7 +44,7 @@ const searchItemList = ref([ ...@@ -44,7 +44,7 @@ const searchItemList = ref([
44 { 44 {
45 type: "input", 45 type: "input",
46 label: "", 46 label: "",
47 field: "daName", 47 field: "damName",
48 default: "", 48 default: "",
49 placeholder: "资产名称", 49 placeholder: "资产名称",
50 clearable: true, 50 clearable: true,
...@@ -91,7 +91,7 @@ const pageInfo = ref({ ...@@ -91,7 +91,7 @@ const pageInfo = ref({
91 { label: "150", value: 150 }, 91 { label: "150", value: 150 },
92 { label: "200", value: 200 }, 92 { label: "200", value: 200 },
93 ], 93 ],
94 daName: '', 94 damName: '',
95 approveState: '', 95 approveState: '',
96 tenantGuid: '', 96 tenantGuid: '',
97 }); 97 });
...@@ -108,9 +108,9 @@ const handleApprovalDialogCancel = (reSubmit) => { ...@@ -108,9 +108,9 @@ const handleApprovalDialogCancel = (reSubmit) => {
108 } 108 }
109 109
110 const tableFields = ref([{ label: "序号", type: "index", width: 56, align: "center" }, 110 const tableFields = ref([{ label: "序号", type: "index", width: 56, align: "center" },
111 { label: "资产名称", field: "daName", width: 160, align: "left" }, 111 { label: "资产名称", field: "damName", width: 160, align: "left" },
112 { label: "数据分类", field: "dataCategoryName", width: 120, align: "left" }, 112 { label: "数据分类", field: "dataTypeName", width: 120, align: "left" },
113 { label: "存储方式", field: "storageFormName", width: 120, align: "left" }, 113 { label: "更新频率", field: "updateFrequencyName", width: 120, align: "left" },
114 { label: "数交所名称", field: "exchangeName", width: 160, align: "left" }, 114 { label: "数交所名称", field: "exchangeName", width: 160, align: "left" },
115 { 115 {
116 label: "审批状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => { 116 label: "审批状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => {
...@@ -227,10 +227,17 @@ const currTableData: any = ref({}); ...@@ -227,10 +227,17 @@ const currTableData: any = ref({});
227 const btnClick = (btn) => { 227 const btnClick = (btn) => {
228 const type = btn.value; 228 const type = btn.value;
229 if (type == 'create') { 229 if (type == 'create') {
230 router.push({ 230 if (btn.exchangeName.includes('数交所（勿删）') || btn.exchangeName.includes('江苏省数据交易所')) {
231 name: 'registerStart', 231 router.push({
232 query: { exchangeGuid: btn.exchangeGuid, type } 232 name: 'registerStartJS',
233 }); 233 query: { exchangeGuid: btn.exchangeGuid, type }
234 });
235 } else {
236 router.push({
237 name: 'registerStart',
238 query: { exchangeGuid: btn.exchangeGuid, type }
239 });
240 }
234 } else if (type == 'search') { 241 } else if (type == 'search') {
235 exchangGuid.value = btn.exchangeGuid; 242 exchangGuid.value = btn.exchangeGuid;
236 pageInfo.value.curr = 1; 243 pageInfo.value.curr = 1;
...@@ -244,10 +251,17 @@ const tableBtnClick = (scope, btn) => { ...@@ -244,10 +251,17 @@ const tableBtnClick = (scope, btn) => {
244 const row = scope.row; 251 const row = scope.row;
245 currTableData.value = row; 252 currTableData.value = row;
246 if (type === "edit") { //草稿中\已驳回\已撤销\已通过 状态，才可以编辑。 253 if (type === "edit") { //草稿中\已驳回\已撤销\已通过 状态，才可以编辑。
247 router.push({ 254 if (row.dataSource == '1') {
248 name: 'registerStart', 255 router.push({
249 query: { guid: row.guid, exchangeGuid: row.exchangeGuid, name: row.daName, tenantGuid: row.tenantGuid, type } 256 name: 'registerStartJS',
250 }); 257 query: { guid: row.bizGuid, exchangeGuid: row.exchangeGuid, name: row.damName, tenantGuid: row.tenantGuid, type }
258 });
259 } else {
260 router.push({
261 name: 'registerStart',
262 query: { guid: row.guid, exchangeGuid: row.exchangeGuid, name: row.damName, tenantGuid: row.tenantGuid, type }
263 });
264 }
251 } else if (type == "delete") { 265 } else if (type == "delete") {
252 delTableOpen("此操作将永久删除该资产登记，是否继续?", "warning"); 266 delTableOpen("此操作将永久删除该资产登记，是否继续?", "warning");
253 } else if (type === 'revoke') { // 撤销，状态为审批中时可以撤销。 267 } else if (type === 'revoke') { // 撤销，状态为审批中时可以撤销。
...@@ -284,10 +298,17 @@ const tableBtnClick = (scope, btn) => { ...@@ -284,10 +298,17 @@ const tableBtnClick = (scope, btn) => {
284 }); 298 });
285 }); 299 });
286 } else if (type === 'detail') { // 详情, 若是草稿中，详情就是编辑， 300 } else if (type === 'detail') { // 详情, 若是草稿中，详情就是编辑，
287 router.push({ 301 if (row.dataSource == '1') {
288 name: 'registerInfoDetail', 302 router.push({
289 query: { guid: row.guid, name: row.daName, tenantGuid: row.tenantGuid, tenantName: row.tenantName, type: 'asset' } 303 name: 'registerInfoJSZQDetail',
290 }); 304 query: { guid: row.guid, name: row.damName, tenantGuid: row.tenantGuid, tenantName: row.tenantName, type: 'asset' }
305 });
306 } else {
307 router.push({
308 name: 'registerInfoDetail',
309 query: { guid: row.guid, name: row.damName, tenantGuid: row.tenantGuid, tenantName: row.tenantName, type: 'asset' }
310 });
311 }
291 } else if (type === 'pass') { 312 } else if (type === 'pass') {
292 passDialogInfo.value.visible = true; 313 passDialogInfo.value.visible = true;
293 } else if (type == 'reject') { 314 } else if (type == 'reject') {
...@@ -302,7 +323,7 @@ const delTableOpen = (msg, type, isBatch: boolean = false) => { ...@@ -302,7 +323,7 @@ const delTableOpen = (msg, type, isBatch: boolean = false) => {
302 type: type, 323 type: type,
303 }).then(() => { 324 }).then(() => {
304 let guids: any = []; 325 let guids: any = [];
305 guids = [currTableData.value.guid] 326 guids = currTableData.value.guid;
306 loading.value = true; 327 loading.value = true;
307 registerDelete(guids).then((res: any) => { 328 registerDelete(guids).then((res: any) => {
308 loading.value = false; 329 loading.value = false;
...@@ -336,7 +357,7 @@ const getTableData = () => { ...@@ -336,7 +357,7 @@ const getTableData = () => {
336 getRegisterList({ 357 getRegisterList({
337 pageSize: pageInfo.value.limit, 358 pageSize: pageInfo.value.limit,
338 pageIndex: pageInfo.value.curr, 359 pageIndex: pageInfo.value.curr,
339 daName: pageInfo.value.daName, 360 damName: pageInfo.value.damName,
340 approveState: pageInfo.value.approveState, 361 approveState: pageInfo.value.approveState,
341 tenantGuid: pageInfo.value.tenantGuid, 362 tenantGuid: pageInfo.value.tenantGuid,
342 exchangGuid: exchangGuid.value, 363 exchangGuid: exchangGuid.value,
...@@ -376,12 +397,12 @@ const toSearch = (val: any, clear: boolean = false) => { ...@@ -376,12 +397,12 @@ const toSearch = (val: any, clear: boolean = false) => {
376 pageInfo.value.curr = 1; 397 pageInfo.value.curr = 1;
377 if (clear) { 398 if (clear) {
378 searchItemList.value.map((item) => item.default = ""); 399 searchItemList.value.map((item) => item.default = "");
379 pageInfo.value.daName = ''; 400 pageInfo.value.damName = '';
380 pageInfo.value.approveState = ""; 401 pageInfo.value.approveState = "";
381 pageInfo.value.tenantGuid = ""; 402 pageInfo.value.tenantGuid = "";
382 val && (exchangGuid.value = ''); 403 val && (exchangGuid.value = '');
383 } else { 404 } else {
384 pageInfo.value.daName = val.daName; 405 pageInfo.value.damName = val.damName;
385 pageInfo.value.approveState = val.approveState; 406 pageInfo.value.approveState = val.approveState;
386 pageInfo.value.tenantGuid = val.tenantGuid; 407 pageInfo.value.tenantGuid = val.tenantGuid;
387 } 408 }
...@@ -585,7 +606,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -585,7 +606,7 @@ const rejectDialogBtnClick = (btn, info) => {
585 <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" /> 606 <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" />
586 <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" /> 607 <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" />
587 <DialogApproval :visible="approvalDialogVisible" :currentRowInfo="systemApproveCurrentRowInfo" 608 <DialogApproval :visible="approvalDialogVisible" :currentRowInfo="systemApproveCurrentRowInfo"
588 @dialog-cancel="handleApprovalDialogCancel"></DialogApproval> 609 @dialog-cancel="handleApprovalDialogCancel"></DialogApproval>
589 </div> 610 </div>
590 </template> 611 </template>
591 612
......
src/views/data_asset/valueEvaluate.vue
...@@ -422,7 +422,10 @@ const tableBtnClick = (scope, btn) => { ...@@ -422,7 +422,10 @@ const tableBtnClick = (scope, btn) => {
422 }); 422 });
423 } else if (type === 'detail') { // 详情 423 } else if (type === 'detail') { // 详情
424 if (row.registerApproveState == 'Y') { 424 if (row.registerApproveState == 'Y') {
425 router.push({ 425 row.dataSource == '1' ? router.push({
426 name: 'registerValueJSZQDetail',
427 query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', tenantGuid: row.tenantGuid, tenantName: row.tenantName }
428 }) : router.push({
426 name: 'registerValueDetail', 429 name: 'registerValueDetail',
427 query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', tenantGuid: row.tenantGuid, tenantName: row.tenantName } 430 query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', tenantGuid: row.tenantGuid, tenantName: row.tenantName }
428 }); 431 });
...@@ -495,6 +498,7 @@ const formItems = ref<any>([ ...@@ -495,6 +498,7 @@ const formItems = ref<any>([
495 value: 'guid', 498 value: 'guid',
496 label: 'damName' 499 label: 'damName'
497 }, 500 },
501 filterable: true,
498 visible: true, 502 visible: true,
499 required: true 503 required: true
500 }, { 504 }, {
...@@ -509,6 +513,7 @@ const formItems = ref<any>([ ...@@ -509,6 +513,7 @@ const formItems = ref<any>([
509 value: 'guid', 513 value: 'guid',
510 label: 'tenantName' 514 label: 'tenantName'
511 }, 515 },
516 filterable: true,
512 visible: false, 517 visible: false,
513 required: true 518 required: true
514 }, 519 },
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!