From cada6fbddabf1776f0359820892fcc885c317408 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 10 Oct 2024 18:40:34 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E7=94=9F=E6=88=90=E9=9A=8F=E6=9C=BA?= =?UTF-8?q?=E6=95=B0=E6=96=B9=E6=B3=95=E6=94=B9=E6=88=90=E4=BD=BF=E7=94=A8?= =?UTF-8?q?util=E4=B8=AD=E7=9A=84randomUUID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/OnlyTableForm.vue | 16 ++++------------ .../modules/EngineerInitBaseInfo.vue | 16 ++++------------ .../modules/ApproveBaseInfo.vue | 6 ++---- .../modules/MainDrafterInitBaseInfo.vue | 11 +++-------- .../PlanApprovalChangeFlow.vue | 6 ++---- .../modules/FinishTimeChangeBaseInfo.vue | 6 ++---- .../modules/JobEndBaseInfo.vue | 6 ++---- .../modules/CommentObjectEnterBaseInfo.vue | 11 +++-------- .../modules/DepartLiaisonCollectBaseInfo.vue | 13 ++++--------- .../DepartLiaisonLeaderApproveBaseInfo.vue | 13 ++++--------- .../modules/MainDrafterCollectBaseInfo.vue | 13 ++++--------- .../MainDrafterCollectUploadMinuteBaseInfo.vue | 13 ++++--------- .../modules/MainDrafterSentBaseInfo.vue | 11 +++-------- .../OtherDrafterUploadStandardBaseInfo.vue | 7 ++----- 14 files changed, 43 insertions(+), 105 deletions(-) diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue index 4b3053d2..bbdc9bef 100644 --- a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue +++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue @@ -83,6 +83,7 @@ import store from '@/store' import JTable from '@/components/jero/JTable' import ContactEnterSendTaskModal from './ContactEnterSendTaskModal' import { downloadFile } from '@/api/manage' +import { randomUUID } from '../../../../utils/util' // 导入的加载提示 let importModalLoading @@ -322,11 +323,8 @@ export default { // 给表格赋值 if (data && data.dataList) { this.dataSource = data.dataList.map(item => { - const uidGenerator = () => { - return '-' + parseInt(Math.random() * 10000 + 1, 10) - } return { - uid: uidGenerator(), + uid: randomUUID(), ...item } }) @@ -376,10 +374,7 @@ export default { modelFormOk (value) { console.log(value, this.modalType) if (this.modalType === 'add') { - const uidGenerator = () => { - return '-' + parseInt(Math.random() * 10000 + 1, 10) - } - this.dataSource.push({ uid: uidGenerator(), ...value }) + this.dataSource.push({ uid: randomUUID(), ...value }) } else if (this.modalType && this.modalType.split(',')[0] === 'edit') { const dataIndex = this.dataSource.findIndex(item => item.uid === this.modalType.split(',')[1]) this.dataSource.splice(dataIndex, 1, value) @@ -437,11 +432,8 @@ export default { } // 推入表格中 this.dataSource = info.file.response.result.map(item => { - const uidGenerator = () => { - return '-' + parseInt(Math.random() * 10000 + 1, 10) - } return { - uid: uidGenerator(), + uid: randomUUID(), ...item } }) diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue index 98db94b9..3cbb85ba 100644 --- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue +++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue @@ -78,6 +78,7 @@ import { downloadFile } from '@/api/manage' import UserSelectByContact from '@/components/selection/UserSelectByContact' import UserSelectByContactModal from '@/components/selection/UserSelectByContactModal' import BaseInfoTableModal from './BaseInfoTableModal' +import { randomUUID } from '../../../../utils/util' // 导入的加载提示 let importModalLoading @@ -310,11 +311,8 @@ export default { initData (data) { // 给表格赋值 this.dataSource = data.map(item => { - const uidGenerator = () => { - return '-' + parseInt(Math.random() * 10000 + 1, 10) - } return { - uid: uidGenerator(), + uid: randomUUID(), ...item } }) @@ -383,10 +381,7 @@ export default { modelFormOk (value) { console.log(value, this.modalType) if (this.modalType === 'add') { - const uidGenerator = () => { - return '-' + parseInt(Math.random() * 10000 + 1, 10) - } - this.dataSource.push({ uid: uidGenerator(), ...value }) + this.dataSource.push({ uid: randomUUID(), ...value }) } else if (this.modalType && this.modalType.split(',')[0] === 'edit') { const dataIndex = this.dataSource.findIndex(item => item.uid === this.modalType.split(',')[1]) this.dataSource.splice(dataIndex, 1, value) @@ -444,11 +439,8 @@ export default { } // 推入表格中 this.dataSource = info.file.response.result.map(item => { - const uidGenerator = () => { - return '-' + parseInt(Math.random() * 10000 + 1, 10) - } return { - uid: uidGenerator(), + uid: randomUUID(), ...item } }) diff --git a/src/views/workCenter/enterpriseStandardChange/modules/ApproveBaseInfo.vue b/src/views/workCenter/enterpriseStandardChange/modules/ApproveBaseInfo.vue index 700a5643..dd9b3b45 100644 --- a/src/views/workCenter/enterpriseStandardChange/modules/ApproveBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardChange/modules/ApproveBaseInfo.vue @@ -50,6 +50,7 @@ import { kkFilePreview } from '@/utils/kkFilePreview' import { queryFileInfoByEditId } from '../../../../api/workCenter' import { Base64 } from 'js-base64' import { onlineEditorView } from '../../../../utils/onlyOfficeUtils' +import { randomUUID } from '../../../../utils/util' export default { name: 'ApproveBaseInfo', @@ -152,11 +153,8 @@ export default { initData (data) { // 给表格赋值，在线编辑不知道要怎么赋值？ this.dataSource = data.list.map(item => { - const uidGenerator = () => { - return '-' + parseInt(Math.random() * 10000 + 1, 10) - } return { - uid: uidGenerator(), + uid: randomUUID(), ...item } }) diff --git a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue index 50adcfea..0cc6a79f 100644 --- a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue @@ -269,6 +269,7 @@ import TextContentModal from '../../../businessSupport/askForAdvice/modules/Text import { getEnterpriseStandardInfoById } from '../../../../api/enterpriseStandardLibraryApi' import { onlineEditor, onlineEditorView } from '../../../../utils/onlyOfficeUtils' import { getOnlineFileIdByFileId, getStandardEditFileByNo } from '@/api/workCenter' +import { randomUUID } from '../../../../utils/util' export default { name: 'MainDrafterInitBaseInfo', @@ -465,11 +466,8 @@ export default { this.spinning = true // 给表格赋值，在线编辑不知道要怎么赋值？ this.dataSource = data.list.map(item => { - const uidGenerator = () => { - return '-' + parseInt(Math.random() * 10000 + 1, 10) - } return { - uid: uidGenerator(), + uid: randomUUID(), ...item } }) @@ -624,10 +622,7 @@ export default { this.dataSource.splice(dataIndex, 1, { ...value, uid: uid }) } else { // 没有下标， 是新增 - const uidGenerator = () => { - return '-' + parseInt(Math.random() * 10000 + 1, 10) - } - this.dataSource.push({ uid: uidGenerator(), ...value }) + this.dataSource.push({ uid: randomUUID(), ...value }) } }, // 修改前按钮点击 diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue index df22ef52..6ad71a35 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue @@ -286,6 +286,7 @@ import Vue from 'vue' import { USER_INFO } from '@/store/mutation-types' import pick from 'lodash.pick' import { WorkCenterMixin } from '@/mixins/WorkCenterMixin' +import { randomUUID } from '../../../utils/util' export default { name: 'PlanApprovalFlow', @@ -669,11 +670,8 @@ export default { // 是完成时间变更或工作终止的变更 this.$nextTick(() => { this.$refs.changeBaseInfo.dataSource = JSON.parse(JSON.stringify(this.model.dataList)).map(item => { - const uidGenerator = () => { - return '-' + parseInt(Math.random() * 10000 + 1, 10) - } return { - uid: uidGenerator(), + uid: randomUUID(), ...item } }) diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfo.vue index 2077ad84..29730455 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfo.vue @@ -50,6 +50,7 @@