b0b06977 by lihua

专区资产登记自动生成登记名称

1 parent 0e64efe8
...@@ -7,6 +7,12 @@ export const getRegiaterDetail = (params) => request({ ...@@ -7,6 +7,12 @@ export const getRegiaterDetail = (params) => request({
7 params 7 params
8 }) 8 })
9 9
10 /** 获取产品登记详情 */
11 export const getRegisterCatalogDetail = (damGuid) => request({
12 url: `${import.meta.env.VITE_API_NEW_PORTAL}/public-data-products-main/detail-by-dam-guid?damGuid=${damGuid}`,
13 method: 'get'
14 })
15
10 /** 提交登记信息。 */ 16 /** 提交登记信息。 */
11 export const registerSave = (params) => request({ 17 export const registerSave = (params) => request({
12 url: `${import.meta.env.VITE_API_NEW_PORTAL}/public-data-products-main/save`, 18 url: `${import.meta.env.VITE_API_NEW_PORTAL}/public-data-products-main/save`,
...@@ -27,3 +33,9 @@ export const registerDelete = (params) => request({ ...@@ -27,3 +33,9 @@ export const registerDelete = (params) => request({
27 method: 'delete', 33 method: 'delete',
28 data: params 34 data: params
29 }); 35 });
36
37 /** 获取可使用的资产目录列表 */
38 export const getRegisterCatalogList = () => request({
39 url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/public-data/dam-list?isRegister=${'Y'}&foundMode=4`,
40 method: 'get'
41 })
......
...@@ -816,7 +816,7 @@ const panelChange = (scope, row) => { ...@@ -816,7 +816,7 @@ 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 :multiple="child.multiple ?? false" 819 :multiple="child.multiple ?? false" @change="(val) => selectChange(val, child)"
820 :collapse-tags="child.collapse ?? false" :collapse-tags-tooltip="child.tagsTooltip ?? false" 820 :collapse-tags="child.collapse ?? false" :collapse-tags-tooltip="child.tagsTooltip ?? false"
821 :max-collapse-tags="child.maxTags ?? 1" :teleported="child.teleported || true"> 821 :max-collapse-tags="child.maxTags ?? 1" :teleported="child.teleported || true">
822 <el-option v-for="opts in child.options" 822 <el-option v-for="opts in child.options"
...@@ -827,7 +827,7 @@ const panelChange = (scope, row) => { ...@@ -827,7 +827,7 @@ const panelChange = (scope, row) => {
827 :options="child.options" :props="child.props" :show-all-levels="child.showAllLevels ?? true" 827 :options="child.options" :props="child.props" :show-all-levels="child.showAllLevels ?? true"
828 :clearable="child.clearable" :filterable="child.filterable ?? false" 828 :clearable="child.clearable" :filterable="child.filterable ?? false"
829 :collapse-tags="child.collapse ?? false" :collapse-tags-tooltip="child.tagsTooltip ?? false" 829 :collapse-tags="child.collapse ?? false" :collapse-tags-tooltip="child.tagsTooltip ?? false"
830 :max-collapse-tags="child.maxTags ?? 1" :disabled="child.disabled || readonly" /> 830 :max-collapse-tags="child.maxTags ?? 1" :disabled="child.disabled || readonly" @change="(val) => cascaderChange(val, child)" />
831 </el-form-item> 831 </el-form-item>
832 </div> 832 </div>
833 </div> 833 </div>
......
...@@ -18,11 +18,10 @@ import { ...@@ -18,11 +18,10 @@ import {
18 import { 18 import {
19 registerSave, 19 registerSave,
20 registerUpdate, 20 registerUpdate,
21 getRegiaterDetail 21 getRegiaterDetail,
22 getRegisterCatalogList,
23 getRegisterCatalogDetail
22 } from '@/api/modules/dataAssetZq' 24 } from '@/api/modules/dataAssetZq'
23 import {
24 getRegisterCatalogList
25 } from '@/api/modules/dataAsset'
26 import useUserStore from "@/store/modules/user"; 25 import useUserStore from "@/store/modules/user";
27 import { getCamundaDeploymentId } from "@/api/modules/workFlowService" 26 import { getCamundaDeploymentId } from "@/api/modules/workFlowService"
28 import useDataAssetStore from "@/store/modules/dataAsset"; 27 import useDataAssetStore from "@/store/modules/dataAsset";
...@@ -54,7 +53,7 @@ const registerCatalogList: any = ref([]); ...@@ -54,7 +53,7 @@ const registerCatalogList: any = ref([]);
54 const formRef = ref(); 53 const formRef = ref();
55 54
56 /** 数据产品信息的表单配置 */ 55 /** 数据产品信息的表单配置 */
57 const productBaseInfoItems = ref([{ 56 const productBaseInfoItems = ref([/*{
58 type: "input", 57 type: "input",
59 label: "产品名称", 58 label: "产品名称",
60 field: "productName", 59 field: "productName",
...@@ -63,25 +62,25 @@ const productBaseInfoItems = ref([{ ...@@ -63,25 +62,25 @@ const productBaseInfoItems = ref([{
63 placeholder: "请输入", 62 placeholder: "请输入",
64 required: true, 63 required: true,
65 clearable: true 64 clearable: true
66 }, 65 }, */
67 // { 66 {
68 // label: '数据资产名称', 67 label: '产品名称',
69 // type: 'select', 68 type: 'select',
70 // placeholder: '请选择', 69 placeholder: '请选择',
71 // options: [], 70 options: [],
72 // field: 'productName', 71 field: 'productName',
73 // maxlength: 50, 72 maxlength: 50,
74 // allowCreate: true, 73 allowCreate: true,
75 // default: '', 74 default: '',
76 // filterable: true, 75 filterable: true,
77 // props: { 76 props: {
78 // value: 'guid', 77 value: 'guid',
79 // label: 'damName' 78 label: 'damName'
80 // }, 79 },
81 // clearable: true, 80 clearable: true,
82 // required: true 81 required: true
83 // }, 82 },
84 { 83 {
85 label: '产品编码', 84 label: '产品编码',
86 type: 'input', 85 type: 'input',
87 placeholder: '自动生成', 86 placeholder: '自动生成',
...@@ -90,7 +89,7 @@ const productBaseInfoItems = ref([{ ...@@ -90,7 +89,7 @@ const productBaseInfoItems = ref([{
90 disabled: true, 89 disabled: true,
91 required: false, 90 required: false,
92 visible: true 91 visible: true
93 }, { 92 }, {
94 label: '产品类型', 93 label: '产品类型',
95 type: 'select', 94 type: 'select',
96 placeholder: '请选择', 95 placeholder: '请选择',
...@@ -104,7 +103,7 @@ const productBaseInfoItems = ref([{ ...@@ -104,7 +103,7 @@ const productBaseInfoItems = ref([{
104 required: true, 103 required: true,
105 filterable: true, 104 filterable: true,
106 visible: true 105 visible: true
107 }, { 106 }, {
108 label: "是否需要信息主体授权", 107 label: "是否需要信息主体授权",
109 type: "radio-group", 108 type: "radio-group",
110 placeholder: "", 109 placeholder: "",
...@@ -121,7 +120,7 @@ const productBaseInfoItems = ref([{ ...@@ -121,7 +120,7 @@ const productBaseInfoItems = ref([{
121 }, 120 },
122 ], 121 ],
123 required: true, 122 required: true,
124 }, { 123 }, {
125 label: "更新频率", 124 label: "更新频率",
126 type: "select", 125 type: "select",
127 placeholder: "请选择", 126 placeholder: "请选择",
...@@ -136,7 +135,7 @@ const productBaseInfoItems = ref([{ ...@@ -136,7 +135,7 @@ const productBaseInfoItems = ref([{
136 filterable: true, 135 filterable: true,
137 required: true, 136 required: true,
138 clearable: true, 137 clearable: true,
139 }, { 138 }, {
140 type: "input", 139 type: "input",
141 label: "产品发布机构", 140 label: "产品发布机构",
142 field: "productPublisherName", 141 field: "productPublisherName",
...@@ -145,7 +144,7 @@ const productBaseInfoItems = ref([{ ...@@ -145,7 +144,7 @@ const productBaseInfoItems = ref([{
145 placeholder: "请输入", 144 placeholder: "请输入",
146 disabled: true, 145 disabled: true,
147 clearable: true 146 clearable: true
148 }, { 147 }, {
149 label: '领域', 148 label: '领域',
150 type: 'select', 149 type: 'select',
151 placeholder: '请选择', 150 placeholder: '请选择',
...@@ -160,7 +159,7 @@ const productBaseInfoItems = ref([{ ...@@ -160,7 +159,7 @@ const productBaseInfoItems = ref([{
160 required: true, 159 required: true,
161 filterable: true, 160 filterable: true,
162 visible: true 161 visible: true
163 }, { 162 }, {
164 label: '应用场景', 163 label: '应用场景',
165 type: 'select', 164 type: 'select',
166 placeholder: '请选择', 165 placeholder: '请选择',
...@@ -174,7 +173,7 @@ const productBaseInfoItems = ref([{ ...@@ -174,7 +173,7 @@ const productBaseInfoItems = ref([{
174 required: true, 173 required: true,
175 filterable: true, 174 filterable: true,
176 visible: true 175 visible: true
177 }, { 176 }, {
178 label: '所属科室', 177 label: '所属科室',
179 type: 'tree-select', 178 type: 'tree-select',
180 placeholder: '请选择', 179 placeholder: '请选择',
...@@ -193,7 +192,7 @@ const productBaseInfoItems = ref([{ ...@@ -193,7 +192,7 @@ const productBaseInfoItems = ref([{
193 clearable: true, 192 clearable: true,
194 visible: true, 193 visible: true,
195 required: true 194 required: true
196 }, { 195 }, {
197 label: '所属疾病', 196 label: '所属疾病',
198 type: 'tree-select', 197 type: 'tree-select',
199 placeholder: '请选择', 198 placeholder: '请选择',
...@@ -212,7 +211,7 @@ const productBaseInfoItems = ref([{ ...@@ -212,7 +211,7 @@ const productBaseInfoItems = ref([{
212 default: '', 211 default: '',
213 visible: true, 212 visible: true,
214 required: true 213 required: true
215 }, { 214 }, {
216 label: '数据规模(条)', 215 label: '数据规模(条)',
217 type: 'input', 216 type: 'input',
218 placeholder: '请输入', 217 placeholder: '请输入',
...@@ -222,7 +221,7 @@ const productBaseInfoItems = ref([{ ...@@ -222,7 +221,7 @@ const productBaseInfoItems = ref([{
222 default: '', 221 default: '',
223 visible: true, 222 visible: true,
224 required: true 223 required: true
225 }, { 224 }, {
226 label: '病例总数(例)', 225 label: '病例总数(例)',
227 type: 'input', 226 type: 'input',
228 placeholder: '请输入', 227 placeholder: '请输入',
...@@ -232,7 +231,7 @@ const productBaseInfoItems = ref([{ ...@@ -232,7 +231,7 @@ const productBaseInfoItems = ref([{
232 default: '', 231 default: '',
233 visible: true, 232 visible: true,
234 required: true 233 required: true
235 }, { 234 }, {
236 label: '所属主题', 235 label: '所属主题',
237 type: 'tree-select', 236 type: 'tree-select',
238 placeholder: '请选择', 237 placeholder: '请选择',
...@@ -251,7 +250,7 @@ const productBaseInfoItems = ref([{ ...@@ -251,7 +250,7 @@ const productBaseInfoItems = ref([{
251 default: '', 250 default: '',
252 visible: false, 251 visible: false,
253 required: true 252 required: true
254 }, { 253 }, {
255 label: "数据来源", 254 label: "数据来源",
256 type: "select", 255 type: "select",
257 placeholder: "", 256 placeholder: "",
...@@ -262,7 +261,7 @@ const productBaseInfoItems = ref([{ ...@@ -262,7 +261,7 @@ const productBaseInfoItems = ref([{
262 filterable: true, 261 filterable: true,
263 clearable: true, 262 clearable: true,
264 required: true, 263 required: true,
265 }, { 264 }, {
266 label: '数据覆盖范围', 265 label: '数据覆盖范围',
267 type: 'checkbox-select', 266 type: 'checkbox-select',
268 placeholder: '全国', 267 placeholder: '全国',
...@@ -292,7 +291,7 @@ const productBaseInfoItems = ref([{ ...@@ -292,7 +291,7 @@ const productBaseInfoItems = ref([{
292 clearable: false, 291 clearable: false,
293 required: true, 292 required: true,
294 col: 'checkbox-cascader' 293 col: 'checkbox-cascader'
295 }, { 294 }, {
296 label: '产品应用方向', 295 label: '产品应用方向',
297 type: 'select', 296 type: 'select',
298 placeholder: '请选择', 297 placeholder: '请选择',
...@@ -304,10 +303,10 @@ const productBaseInfoItems = ref([{ ...@@ -304,10 +303,10 @@ const productBaseInfoItems = ref([{
304 }, 303 },
305 filterable: true, 304 filterable: true,
306 clearable: true, 305 clearable: true,
307 default: '', 306 default: '1',
308 visible: true, 307 visible: true,
309 required: true 308 required: true
310 }, { 309 }, {
311 type: "input", 310 type: "input",
312 label: "版本名称", 311 label: "版本名称",
313 field: "versionName", 312 field: "versionName",
...@@ -316,7 +315,7 @@ const productBaseInfoItems = ref([{ ...@@ -316,7 +315,7 @@ const productBaseInfoItems = ref([{
316 placeholder: "请输入", 315 placeholder: "请输入",
317 required: true, 316 required: true,
318 clearable: true 317 clearable: true
319 }, { 318 }, {
320 type: "inputTag", 319 type: "inputTag",
321 label: "产品关键词", 320 label: "产品关键词",
322 field: 'productKeywords', 321 field: 'productKeywords',
...@@ -326,7 +325,7 @@ const productBaseInfoItems = ref([{ ...@@ -326,7 +325,7 @@ const productBaseInfoItems = ref([{
326 required: true, 325 required: true,
327 clearable: true, 326 clearable: true,
328 block: true 327 block: true
329 }, { 328 }, {
330 label: '产品描述', 329 label: '产品描述',
331 placeholder: '该输入对该产品的描述信息', 330 placeholder: '该输入对该产品的描述信息',
332 field: 'productDesc', 331 field: 'productDesc',
...@@ -336,7 +335,7 @@ const productBaseInfoItems = ref([{ ...@@ -336,7 +335,7 @@ const productBaseInfoItems = ref([{
336 block: true, 335 block: true,
337 clearable: true, 336 clearable: true,
338 required: true, 337 required: true,
339 }]); 338 }]);
340 339
341 /** 数据产品信息的表单配置校验规则 */ 340 /** 数据产品信息的表单配置校验规则 */
342 const productBaseInfoFormRules = ref({ 341 const productBaseInfoFormRules = ref({
...@@ -362,7 +361,7 @@ const productBaseInfoFormRules = ref({ ...@@ -362,7 +361,7 @@ const productBaseInfoFormRules = ref({
362 }); 361 });
363 362
364 const setProductBaseFormItems = (formValue) => { 363 const setProductBaseFormItems = (formValue) => {
365 formValue = Object.assign({ authLevel: 'Y', productpublisher: userData.tenantName, domain: '003', dataSources: '1' }, formValue); 364 formValue = Object.assign({ authLevel: 'Y', productpublisher: userData.tenantName, domain: '003', dataSources: '1', productDirection: '1' }, formValue);
366 productBaseInfoItems.value.forEach(item => { 365 productBaseInfoItems.value.forEach(item => {
367 item.default = formValue[item.field]; 366 item.default = formValue[item.field];
368 if (item.children?.length) { 367 if (item.children?.length) {
...@@ -378,20 +377,124 @@ const setProductBaseFormItems = (formValue) => { ...@@ -378,20 +377,124 @@ const setProductBaseFormItems = (formValue) => {
378 item && item.children?.length && (item.children[0].visible = formValue['dataCoverages'] != '1'); 377 item && item.children?.length && (item.children[0].visible = formValue['dataCoverages'] != '1');
379 } 378 }
380 }); 379 });
380 oldProductName.value = formValue.productName;
381 } 381 }
382 382
383 const oldProductName = ref('');
384
383 const handleProductBaseFormSelectChange = (val, row, info) => { 385 const handleProductBaseFormSelectChange = (val, row, info) => {
384 if (row.field == 'domain') { 386 if (row.field == 'domain') {
385 info.scenario = ''; //清空下应用场景 387 info.scenario = ''; //清空下应用场景
386 setProductBaseFormItems(info); 388 setProductBaseFormItems(info);
387 } else if (row.field == 'productName') { 389 } else if (row.field == 'productName') {
388 // TODO, 带出资产登记的所有信息。 390 // TODO, 带出资产登记的所有信息。更新产品登记名称
391 transferRegistName();
392 let da = val && registerCatalogList.value.find(r => r.guid == val);
393 if (da) {
394 proxy.$openMessageBox("切换到其它产品后,当前修改会被重置,确定切换?", () => {
395 oldProductName.value = info.productName;
396 fullscreenLoading.value = true;
397 getRegisterCatalogDetail(da.guid).then((res: any) => {
398 fullscreenLoading.value = false;
399 if (res?.code == proxy.$passCode) {
400 const detailValue = res.data || {};
401 detailValue.productName = da.guid;
402 detailValue.dataSources = (detailValue.dataSources || '') + '';
403 detailValue.productKeywords = detailValue.productKeywords || [];
404 let dataCoverage = detailValue.dataCoverage;
405 if (dataCoverage.length == 1 && dataCoverage[0] == '1') {
406 detailValue.dataCoverages = '1';
407 detailValue.dataCoverage = [];
408 } else {
409 detailValue.dataCoverages = '';
410 detailValue.dataCoverage = dataCoverage;
411 }
412 let approveVO = detailValue.approveVO;
413 if (approveVO && (approveVO.approveState == 'C' || approveVO.approveState == 'R') && approveVO.staffGuid == userData.staffGuid && detailValue.bizApproveState != 'D') {
414 restart.value = true;
415 }
416 setProductBaseFormItems(detailValue);
417 let dataCoverageTimeRange: string[] = [];
418 let dataCoverageStartTime = detailValue.registerRSVO.dataCoverageStartTime;
419 let dataCoverageEndTime = detailValue.registerRSVO.dataCoverageEndTime;
420 if (dataCoverageStartTime && dataCoverageEndTime) {
421 dataCoverageTimeRange = [dataCoverageStartTime, dataCoverageEndTime];
422 }
423 setRegisterFormItems(Object.assign({}, detailValue.registerRSVO || {}, {
424 dataCoverageTimeRange: dataCoverageTimeRange
425 }), true);
426 inputParamsData.value = detailValue.reqParamListRSVOS?.map(d => {
427 return {
428 fieldEnName: d.fieldEnName,
429 fieldCnName: d.fieldCnName,
430 fieldValueType: d.fieldValueType,
431 fieldMandatory: d.fieldMandatory,
432 fieldComment: d.fieldComment,
433 levelCode: d.levelCode
434 }
435 }) || [];
436 inputParamsTableInfo.value.data = inputParamsData.value;
437 respParamsData.value = detailValue.respParamListRSVOS?.map(d => {
438 return {
439 fieldEnName: d.fieldEnName,
440 fieldCnName: d.fieldCnName,
441 fieldValueType: d.fieldValueType,
442 fieldMandatory: d.fieldMandatory,
443 fieldComment: d.fieldComment,
444 levelCode: d.levelCode
445 }
446 }) || [];
447 respParamsTableInfo.value.data = respParamsData.value;
448 authSourceData.value = detailValue.resourcesRSVOS?.map(d => {
449 return {
450 authOperatTimeStart: d.authOperatTimeStart,
451 authOperatTimeEnd: d.authOperatTimeEnd,
452 dataRegistCode: d.dataRegistCode,
453 dataRegistName: d.dataRegistName
454 }
455 }) || [];
456 authSourceTableInfo.value.data = authSourceData.value;
457 orgData.value = detailValue.organizationRSVOS?.map(d => {
458 return {
459 sharedInstitutionCode: d.sharedInstitutionCode,
460 sharedInstitutionName: d.sharedInstitutionName,
461 sharedInstitutiontType: d.sharedInstitutiontType,
462 sharedInstitutionAdress: d.sharedInstitutionAdress
463 }
464 }) || [];
465 orgTableInfo.value.data = orgData.value;
466 let attachmentRQVOS = detailValue.attachmentRSVOS || [];
467 uploadFormItems.value.forEach(item => {
468 let field = item.field;
469 let key = field.slice(6);
470 item.default = attachmentRQVOS.filter(a => a.fileType == key).map(f => {
471 return {
472 name: f.fileName,
473 url: f.fileUrl
474 }
475 })
476 })
477 } else {
478 proxy.$ElMessage.error(res.msg);
479 }
480 })
481 }, () => {
482 info.productName = oldProductName.value;
483 setProductBaseFormItems(info);
484 proxy.$ElMessage.info("已取消");
485 });
486 } else {
487 oldProductName.value = info.productName;
488 }
489 } else if (row.field == 'dataCoverage') {
490 transferRegistName();
389 } 491 }
390 } 492 }
391 493
392 /** checkbox 全国修改之后 */ 494 /** checkbox 全国修改之后 */
393 const handleProductBaseFormCheckboxChange = (val, info, row) => { 495 const handleProductBaseFormCheckboxChange = (val, info, row) => {
394 row.field == 'dataCoverages' && setProductBaseFormItems(info); 496 row.field == 'dataCoverages' && setProductBaseFormItems(info);
497 row.field == 'dataCoverages' && transferRegistName();
395 } 498 }
396 499
397 const activeTabName = ref('reqParamList'); 500 const activeTabName = ref('reqParamList');
...@@ -749,7 +852,7 @@ const productRegisterInfoItems = ref([{ ...@@ -749,7 +852,7 @@ const productRegisterInfoItems = ref([{
749 col: "w50 no-margin-r", 852 col: "w50 no-margin-r",
750 field: "dataProductsAndServicesOtherType", 853 field: "dataProductsAndServicesOtherType",
751 default: '', 854 default: '',
752 maxlenght: 50, 855 maxlength: 50,
753 clearable: true, 856 clearable: true,
754 visible: false, 857 visible: false,
755 required: true, 858 required: true,
...@@ -881,7 +984,7 @@ const productRegisterInfoItems = ref([{ ...@@ -881,7 +984,7 @@ const productRegisterInfoItems = ref([{
881 col: "w50 no-margin-r", 984 col: "w50 no-margin-r",
882 field: "productionOtherMethod", 985 field: "productionOtherMethod",
883 default: '', 986 default: '',
884 maxlenght: 50, 987 maxlength: 50,
885 clearable: true, 988 clearable: true,
886 visible: false, 989 visible: false,
887 required: true, 990 required: true,
...@@ -912,7 +1015,7 @@ const productRegisterInfoItems = ref([{ ...@@ -912,7 +1015,7 @@ const productRegisterInfoItems = ref([{
912 col: "w50 no-margin-r", 1015 col: "w50 no-margin-r",
913 field: "dataOtherStructure", 1016 field: "dataOtherStructure",
914 default: '', 1017 default: '',
915 maxlenght: 50, 1018 maxlength: 50,
916 clearable: true, 1019 clearable: true,
917 visible: false, 1020 visible: false,
918 required: true, 1021 required: true,
...@@ -945,7 +1048,7 @@ const productRegisterInfoItems = ref([{ ...@@ -945,7 +1048,7 @@ const productRegisterInfoItems = ref([{
945 col: "w50 no-margin-r", 1048 col: "w50 no-margin-r",
946 field: "dataProvisionOtherFormat", 1049 field: "dataProvisionOtherFormat",
947 default: '', 1050 default: '',
948 maxlenght: 50, 1051 maxlength: 50,
949 clearable: true, 1052 clearable: true,
950 visible: false, 1053 visible: false,
951 required: true, 1054 required: true,
...@@ -976,7 +1079,7 @@ const productRegisterInfoItems = ref([{ ...@@ -976,7 +1079,7 @@ const productRegisterInfoItems = ref([{
976 col: "w50 no-margin-r", 1079 col: "w50 no-margin-r",
977 field: "storageOtherMethod", 1080 field: "storageOtherMethod",
978 default: '', 1081 default: '',
979 maxlenght: 50, 1082 maxlength: 50,
980 clearable: true, 1083 clearable: true,
981 visible: false, 1084 visible: false,
982 required: true, 1085 required: true,
...@@ -1015,7 +1118,7 @@ const productRegisterInfoItems = ref([{ ...@@ -1015,7 +1118,7 @@ const productRegisterInfoItems = ref([{
1015 field: "dataStorage", 1118 field: "dataStorage",
1016 default: '', 1119 default: '',
1017 inputType: 'moneyNumber', 1120 inputType: 'moneyNumber',
1018 maxlenght: 19, 1121 maxlength: 19,
1019 clearable: true, 1122 clearable: true,
1020 visible: true, 1123 visible: true,
1021 required: true, 1124 required: true,
...@@ -1049,7 +1152,7 @@ const productRegisterInfoItems = ref([{ ...@@ -1049,7 +1152,7 @@ const productRegisterInfoItems = ref([{
1049 field: "dataStorageIncrease", 1152 field: "dataStorageIncrease",
1050 default: '', 1153 default: '',
1051 inputType: 'moneyNumber', 1154 inputType: 'moneyNumber',
1052 maxlenght: 19, 1155 maxlength: 19,
1053 clearable: true, 1156 clearable: true,
1054 visible: true, 1157 visible: true,
1055 required: true, 1158 required: true,
...@@ -1163,7 +1266,7 @@ const productRegisterInfoItems = ref([{ ...@@ -1163,7 +1266,7 @@ const productRegisterInfoItems = ref([{
1163 col: "w50 no-margin-r", 1266 col: "w50 no-margin-r",
1164 field: "desensitizationOtherMethod", 1267 field: "desensitizationOtherMethod",
1165 default: '', 1268 default: '',
1166 maxlenght: 50, 1269 maxlength: 50,
1167 clearable: true, 1270 clearable: true,
1168 visible: false, 1271 visible: false,
1169 required: true, 1272 required: true,
...@@ -1222,7 +1325,7 @@ const productRegisterInfoItems = ref([{ ...@@ -1222,7 +1325,7 @@ const productRegisterInfoItems = ref([{
1222 col: "w50 no-margin-r", 1325 col: "w50 no-margin-r",
1223 field: "sharingConditions", 1326 field: "sharingConditions",
1224 default: '', 1327 default: '',
1225 maxlenght: 50, 1328 maxlength: 50,
1226 clearable: true, 1329 clearable: true,
1227 visible: false, 1330 visible: false,
1228 required: true, 1331 required: true,
...@@ -1255,7 +1358,7 @@ const productRegisterInfoItems = ref([{ ...@@ -1255,7 +1358,7 @@ const productRegisterInfoItems = ref([{
1255 col: "w50 no-margin-r", 1358 col: "w50 no-margin-r",
1256 field: "sharingOtherMethod", 1359 field: "sharingOtherMethod",
1257 default: '', 1360 default: '',
1258 maxlenght: 50, 1361 maxlength: 50,
1259 clearable: true, 1362 clearable: true,
1260 visible: false, 1363 visible: false,
1261 required: true, 1364 required: true,
...@@ -1471,14 +1574,8 @@ const handleRegisterFormSelectChange = (val, row, info) => { ...@@ -1471,14 +1574,8 @@ const handleRegisterFormSelectChange = (val, row, info) => {
1471 setRegisterFormItems(info); 1574 setRegisterFormItems(info);
1472 } else if (row.field == 'industry') { 1575 } else if (row.field == 'industry') {
1473 info.industryBigcode = ''; 1576 info.industryBigcode = '';
1474 setRegisterFormItems(info); 1577 transferRegistName();
1475 // if (val) { 1578 // setRegisterFormItems(info);
1476 // //判断自动生成产品登记名称
1477 // let formInline = formRef.value.formInline;
1478 // let dataCoverages = formInline.dataCoverages;
1479 // let cov = dataCoverages == '1' ? '全国' : (!formInline.formInline ? 'XX' : dictListMap.value['dataCoverage'].find(f => f.value == formInline.dataCoverage).label);
1480 // productRegisterInfoItems.value[0].default = cov + '-' + (val || 'XX') + '-' + (formInline.productName || 'XX')
1481 // }
1482 } 1579 }
1483 } 1580 }
1484 1581
...@@ -2021,15 +2118,30 @@ const cancel = () => { ...@@ -2021,15 +2118,30 @@ const cancel = () => {
2021 }); 2118 });
2022 } 2119 }
2023 2120
2121 let transferRegistName = () => {
2122 let baseInfoValue = formRef.value.formInline;
2123 let registerInfoValue = registerFormRef.value.formInline;
2124 let productName = baseInfoValue.productName;
2125 let da = productName && registerCatalogList.value.find(r => r.guid == productName);
2126 if (da) {
2127 productName = da.damName;
2128 }
2129 let coverName = baseInfoValue.dataCoverages == '1' ? '全国' : (baseInfoValue.dataCoverage?.length && dictListMap.value['dataCoverage'].find(f => f.value == baseInfoValue.dataCoverage[0])?.label || '');
2130 let industryName = registerInfoValue.industry && dictListMap.value['industry'].find(d => d.value == registerInfoValue.industry)?.label || '';
2131 let dataRegistName = (coverName || '产品数据覆盖范围') + '-' + (industryName || '行业分类') + '-' + (productName || '产品名称');
2132 registerInfoValue.dataRegistName = dataRegistName;
2133 setRegisterFormItems(registerInfoValue);
2134 }
2135
2024 /** 提交草稿,不需要检验 */ 2136 /** 提交草稿,不需要检验 */
2025 const saveDraft = () => { 2137 const saveDraft = () => {
2026 let params: any = { isSubmit: false }; 2138 let params: any = { isSubmit: false };
2027 let baseInfoValue = formRef.value.formInline; 2139 let baseInfoValue = formRef.value.formInline;
2028 let registerInfoValue = registerFormRef.value.formInline; 2140 let registerInfoValue = registerFormRef.value.formInline;
2029 /** 产品登记名称,是覆盖范围-行业大类-产品名称 */ 2141 // /** 产品登记名称,是覆盖范围-行业大类-产品名称 */
2030 let coverName = baseInfoValue.dataCoverages == '1' ? '全国' : (baseInfoValue.dataCoverage?.length && dictListMap.value['dataCoverage'].find(f => f.value == baseInfoValue.dataCoverage[0])?.label || ''); 2142 // let coverName = baseInfoValue.dataCoverages == '1' ? '全国' : (baseInfoValue.dataCoverage?.length && dictListMap.value['dataCoverage'].find(f => f.value == baseInfoValue.dataCoverage[0])?.label || '');
2031 let industryName = registerInfoValue.industry && dictListMap.value['industry'].find(d => d.value == registerInfoValue.industry)?.label || ''; 2143 // let industryName = registerInfoValue.industry && dictListMap.value['industry'].find(d => d.value == registerInfoValue.industry)?.label || '';
2032 let dataRegistName = coverName + '-' + industryName + '-' + baseInfoValue.productName; 2144 // let dataRegistName = coverName + '-' + industryName + '-' + baseInfoValue.productName;
2033 let uploadValue = uploadFormRef.value.formInline; 2145 let uploadValue = uploadFormRef.value.formInline;
2034 let attachmentRQVOS: any[] = []; 2146 let attachmentRQVOS: any[] = [];
2035 for (const key in uploadValue) { 2147 for (const key in uploadValue) {
...@@ -2057,7 +2169,6 @@ const saveDraft = () => { ...@@ -2057,7 +2169,6 @@ const saveDraft = () => {
2057 }, { 2169 }, {
2058 registerRQVO: { 2170 registerRQVO: {
2059 ...registerInfoValue, 2171 ...registerInfoValue,
2060 dataRegistName: dataRegistName,
2061 dataCoverageStartTime: registerInfoValue.dataCoverageTimeRange?.[0], 2172 dataCoverageStartTime: registerInfoValue.dataCoverageTimeRange?.[0],
2062 dataCoverageEndTime: registerInfoValue.dataCoverageTimeRange?.[1], 2173 dataCoverageEndTime: registerInfoValue.dataCoverageTimeRange?.[1],
2063 // coverageArea: !registerInfoValue.coverageAreas ? [] : (registerInfoValue.coverageArea == 'all' ? ['all'] : [registerInfoValue.coverageAreas]) 2174 // coverageArea: !registerInfoValue.coverageAreas ? [] : (registerInfoValue.coverageArea == 'all' ? ['all'] : [registerInfoValue.coverageAreas])
...@@ -2072,12 +2183,12 @@ const saveDraft = () => { ...@@ -2072,12 +2183,12 @@ const saveDraft = () => {
2072 } else if (!registerInfoValue.coverageArea) { 2183 } else if (!registerInfoValue.coverageArea) {
2073 params.registerRQVO.coverageArea = [registerInfoValue.coverageAreas]; 2184 params.registerRQVO.coverageArea = [registerInfoValue.coverageAreas];
2074 } 2185 }
2075 // let productName = params.productName; 2186 let productName = params.productName;
2076 // let da = registerCatalogList.value.find(r => r.guid == productName); 2187 let da = registerCatalogList.value.find(r => r.guid == productName);
2077 // if (da) { 2188 if (da) {
2078 // params.damGuid = da.guid; 2189 params.damGuid = da.guid;
2079 // params.productName = da.damName; 2190 params.productName = da.damName;
2080 // } 2191 }
2081 fullscreenLoading.value = true; 2192 fullscreenLoading.value = true;
2082 if (guid) { 2193 if (guid) {
2083 params.guid = guid; 2194 params.guid = guid;
...@@ -2226,10 +2337,10 @@ const save = () => { ...@@ -2226,10 +2337,10 @@ const save = () => {
2226 let params: any = { isSubmit: true, immediateApprove: true, }; 2337 let params: any = { isSubmit: true, immediateApprove: true, };
2227 let baseInfoValue = formRef.value.formInline; 2338 let baseInfoValue = formRef.value.formInline;
2228 let registerInfoValue = registerFormRef.value.formInline; 2339 let registerInfoValue = registerFormRef.value.formInline;
2229 /** 产品登记名称,是覆盖范围-行业大类-产品名称 */ 2340 // /** 产品登记名称,是覆盖范围-行业大类-产品名称 */
2230 let coverName = baseInfoValue.dataCoverages == '1' ? '全国' : dictListMap.value['dataCoverage'].find(f => f.value == baseInfoValue.dataCoverage[0])?.label || 'XX'; 2341 // let coverName = baseInfoValue.dataCoverages == '1' ? '全国' : dictListMap.value['dataCoverage'].find(f => f.value == baseInfoValue.dataCoverage[0])?.label || 'XX';
2231 let industryName = dictListMap.value['industry'].find(d => d.value == registerInfoValue.industry)?.label || 'XX'; 2342 // let industryName = dictListMap.value['industry'].find(d => d.value == registerInfoValue.industry)?.label || 'XX';
2232 let dataRegistName = coverName + '-' + industryName + '-' + baseInfoValue.productName; 2343 // let dataRegistName = coverName + '-' + industryName + '-' + baseInfoValue.productName;
2233 let uploadValue = uploadFormRef.value.formInline; 2344 let uploadValue = uploadFormRef.value.formInline;
2234 let attachmentRQVOS: any[] = []; 2345 let attachmentRQVOS: any[] = [];
2235 for (const key in uploadValue) { 2346 for (const key in uploadValue) {
...@@ -2258,7 +2369,6 @@ const save = () => { ...@@ -2258,7 +2369,6 @@ const save = () => {
2258 registerRQVO: { 2369 registerRQVO: {
2259 ...registerInfoValue, 2370 ...registerInfoValue,
2260 exchangeGuid: exGuid, 2371 exchangeGuid: exGuid,
2261 dataRegistName: dataRegistName,
2262 dataCoverageStartTime: registerInfoValue.dataCoverageTimeRange[0], 2372 dataCoverageStartTime: registerInfoValue.dataCoverageTimeRange[0],
2263 dataCoverageEndTime: registerInfoValue.dataCoverageTimeRange[1], 2373 dataCoverageEndTime: registerInfoValue.dataCoverageTimeRange[1],
2264 // coverageArea: registerInfoValue.coverageArea == 'all' ? ['all'] : [registerInfoValue.coverageAreas] 2374 // coverageArea: registerInfoValue.coverageArea == 'all' ? ['all'] : [registerInfoValue.coverageAreas]
...@@ -2273,6 +2383,12 @@ const save = () => { ...@@ -2273,6 +2383,12 @@ const save = () => {
2273 } else if (!registerInfoValue.coverageArea) { 2383 } else if (!registerInfoValue.coverageArea) {
2274 params.registerRQVO.coverageArea = [registerInfoValue.coverageAreas]; 2384 params.registerRQVO.coverageArea = [registerInfoValue.coverageAreas];
2275 } 2385 }
2386 let productName = params.productName;
2387 let da = registerCatalogList.value.find(r => r.guid == productName);
2388 if (da) {
2389 params.damGuid = da.guid;
2390 params.productName = da.damName;
2391 }
2276 fullscreenLoading.value = true; 2392 fullscreenLoading.value = true;
2277 if (guid) { 2393 if (guid) {
2278 params.guid = guid; 2394 params.guid = guid;
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!