From 2c7524df9cfb35e1f402ad9281650d35e481836a Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 16 Aug 2024 09:11:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[update]=20=E6=A0=91=E5=BD=A2=E5=BC=B9?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/customField/AddForm.vue | 41 +- .../selection/TreeDataSelectModal.vue | 531 ++++++++++++++++++ .../selection/TreeDataSelection.vue | 145 +++++ 3 files changed, 703 insertions(+), 14 deletions(-) create mode 100644 src/components/selection/TreeDataSelectModal.vue create mode 100644 src/components/selection/TreeDataSelection.vue diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue index 20657bc4..6a4cd736 100644 --- a/src/components/customField/AddForm.vue +++ b/src/components/customField/AddForm.vue @@ -134,16 +134,24 @@ :label-in-value="false" :placeholder="$t('pleaseSelect')+item.dbFieldTxt" /> - + + + + + + + + + + + @@ -174,10 +182,11 @@ import JMultipleDatePicker from '../JMultipleDatePicker' import UserSelection from '../selection/UserSelection' import { getAction } from '../../api/manage.js' import { ajaxGetDictItems, getDictByCode, getFormDictTreeList } from '../../api/api.js' -import TreeSelection from '../selection/TreeSelection' +// import TreeSelection from '../selection/TreeSelection' import { getStandardGradeClassification } from '../../api/enterpriseStandardLibraryApi' import STreeSelect from '../STreeSelect' -import { getDomesticStandardDetail } from '../../api/standardRegulationLibraryApi'; +import { getDomesticStandardDetail } from '../../api/standardRegulationLibraryApi' +import TreeDataSelection from '../selection/TreeDataSelection' // 本系统限制可以上传的文件格式 const CAN_UPLOAD_FILE_TYPE = 'pdf,docx,doc,xlsx,xls,ppt,pptx,rar,zip,jpg,jpeg,png,avi,wmv,mov,rm,mp4,cad' @@ -193,8 +202,9 @@ export default { JDictSelectTag, JMultiSelectTag, UploadFile, - TreeSelection, - STreeSelect + // TreeSelection, + STreeSelect, + TreeDataSelection }, props: { url: { @@ -859,6 +869,9 @@ export default { treeSelectNameChange (value, fieldName) { this.formInline[fieldName + '_dictText'] = value }, + treeDataSelectNameChange (value, fieldName) { + this.formInline[fieldName + '_dictText'] = value + }, submit () { this.$refs.ruleForm.validate(valid => { if (valid) { diff --git a/src/components/selection/TreeDataSelectModal.vue b/src/components/selection/TreeDataSelectModal.vue new file mode 100644 index 00000000..1b81f658 --- /dev/null +++ b/src/components/selection/TreeDataSelectModal.vue @@ -0,0 +1,531 @@ + + + + + diff --git a/src/components/selection/TreeDataSelection.vue b/src/components/selection/TreeDataSelection.vue new file mode 100644 index 00000000..bca415a6 --- /dev/null +++ b/src/components/selection/TreeDataSelection.vue @@ -0,0 +1,145 @@ + + + + + From 39add7caaed16529f3702620bf5f27f678db545d Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 16 Aug 2024 16:32:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[update]=20=E6=A0=91=E5=BD=A2=E5=BC=B9?= =?UTF-8?q?=E6=A1=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/selection/TreeDataSelectModal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/selection/TreeDataSelectModal.vue b/src/components/selection/TreeDataSelectModal.vue index 1b81f658..01b289e6 100644 --- a/src/components/selection/TreeDataSelectModal.vue +++ b/src/components/selection/TreeDataSelectModal.vue @@ -518,7 +518,7 @@ export default { padding: 5px 16px; margin-right: 12px; margin-top: 8px; - background: rgba(0, 100, 250, 0.08); + background: rgba(213, 44, 38, 0.08); border-radius: 4px 4px 4px 4px; opacity: 1; color: @primary-color; From ebf65cfd97288cb505ec04026ae51272e51df8de Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Tue, 20 Aug 2024 15:39:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[update]=20=E7=B3=BB=E7=BB=9F=E4=B8=AD?= =?UTF-8?q?=E7=9A=84tree-selection=E7=BB=84=E4=BB=B7=E7=94=A8=E5=88=B0?= =?UTF-8?q?=E7=9A=84=E5=9C=B0=E6=96=B9=E5=85=A8=E9=83=BD=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E6=88=90tree-data-selection=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/customField/AddForm.vue | 3 +- .../selection/TreeDataSelection.vue | 13 ++++++-- .../documentSplit/modules/SplitAddForm.vue | 22 +++++++++++-- .../modules/SplitDetailBatchEditDrawer.vue | 18 ++++++++-- .../modules/ContactEnterSendTaskModal.vue | 29 ++++++++++------ .../modules/BaseInfoTableModal.vue | 27 ++++++++++----- .../modules/BaseInfoForm.vue | 28 +++++++++++----- .../modules/ApprovalBaseInfo.vue | 27 ++++++++++----- .../modules/MergeBaseInfo.vue | 27 ++++++++++----- .../modules/BaseInfoForm.vue | 32 +++++++++++------- .../StandardEntryOrChangeProcess.vue | 33 ++++++++++++------- 11 files changed, 182 insertions(+), 77 deletions(-) diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue index 6a4cd736..9802c897 100644 --- a/src/components/customField/AddForm.vue +++ b/src/components/customField/AddForm.vue @@ -151,7 +151,8 @@ :nameStr="formInline[item.dbFieldName + '_dictText']" @nameChange="treeDataSelectNameChange" :optionsHref="item.treeFirstHref" - :dict-id="item.dictId"/> + :dict-id="item.dictId" + :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"/> diff --git a/src/components/selection/TreeDataSelection.vue b/src/components/selection/TreeDataSelection.vue index bca415a6..4fddfe84 100644 --- a/src/components/selection/TreeDataSelection.vue +++ b/src/components/selection/TreeDataSelection.vue @@ -1,7 +1,14 @@ @@ -238,6 +248,7 @@ import { getAction } from '../../../../api/manage' import { getFormDictTreeList } from '../../../../api/api' import STreeSelect from '../../../../components/STreeSelect' import TreeSelection from '../../../../components/selection/TreeSelection' +import TreeDataSelection from '../../../../components/selection/TreeDataSelection' export default { name: 'SplitAddForm', @@ -248,7 +259,8 @@ export default { UploadFile, StandardSelection, SplitDetailAddTypeCheck, - STreeSelect + STreeSelect, + TreeDataSelection }, data () { return { @@ -581,6 +593,10 @@ export default { this.formInline[this.uploadName] = attIdList.join(',') this.formInline = { ...this.formInline } }, + // 树形弹框名称改变 + treeDataSelectNameChange (value, fieldName) { + this.formInline[fieldName + '_dictText'] = value + }, // 正则替换小数点 limitNumber (value) { if (typeof value === 'string') { diff --git a/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue b/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue index 67ff1e49..b1683dfc 100644 --- a/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue +++ b/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue @@ -146,7 +146,7 @@ :label-in-value="false" :placeholder="$t('pleaseSelect')+item.dbFieldTxt + getPlaceholderSuffix(item)" /> - + @@ -187,10 +196,11 @@ import { getFormDictTreeList } from '../../../../api/api' import { getAction } from '../../../../api/manage' import STreeSelect from '../../../../components/STreeSelect' import TreeSelection from '../../../../components/selection/TreeSelection' +import TreeDataSelection from '../../../../components/selection/TreeDataSelection' export default { name: 'SplitDetailBatchEditDrawer', - components: { TreeSelection, UserSelection, StandardSelection, UploadFile, JMultipleDatePicker, STreeSelect }, + components: { TreeSelection, UserSelection, StandardSelection, UploadFile, JMultipleDatePicker, STreeSelect, TreeDataSelection }, data () { return { FieldType, @@ -384,6 +394,10 @@ export default { this.formInline[this.uploadName] = attIdList.join(',') this.formInline = { ...this.formInline } }, + // 树形弹框名称改变 + treeDataSelectNameChange (value, fieldName) { + this.formInline[fieldName + '_dictText'] = value + }, handleSave () { if (this.confirmLoading) { return diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue index d2962d77..4bed80e7 100644 --- a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue +++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue @@ -402,15 +402,23 @@ - - + + + + + + + + + +
@@ -545,10 +553,11 @@ import Vue from 'vue' import { USER_INFO } from '@/store/mutation-types' // import { getEnStandardNo } from '@/api/workCenter' import TreeSelection from '@/components/selection/TreeSelection' +import TreeDataSelection from '../../../../components/selection/TreeDataSelection' export default { name: 'ContactEnterSendTaskModal', - components: { UserSelection, StandardSelection, UploadFile, TreeSelection }, + components: { UserSelection, StandardSelection, UploadFile, TreeSelection, TreeDataSelection }, props: { // 是否可以编辑新企标编号 canEditNewStandardNumber: { diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue index d6ad7c1e..109bf518 100644 --- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue +++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue @@ -381,14 +381,22 @@
- + + + + + + + + + @@ -522,10 +530,11 @@ import Vue from 'vue' import { USER_INFO } from '@/store/mutation-types' import TreeSelection from '@/components/selection/TreeSelection' import { ajaxGetDictItems } from '@/api/api' +import TreeDataSelection from '../../../../components/selection/TreeDataSelection' export default { name: 'BaseInfoTableModal', - components: { UserSelection, StandardSelection, UploadFile, TreeSelection }, + components: { UserSelection, StandardSelection, UploadFile, TreeSelection, TreeDataSelection }, props: { /** * 部所联络人汇总节点的话三个日期标准化填了的,主起草人不能修改;是联络人的话标准化未填写,联络人必填 diff --git a/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue b/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue index 7f5324f3..88756936 100644 --- a/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue +++ b/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue @@ -198,14 +198,22 @@ - + + + + + + + + + @@ -370,6 +378,7 @@ import UserSelection from '@/components/selection/UserSelection' import UploadFile from '@/components/UploadFile' import TreeSelection from '@/components/selection/TreeSelection' import STreeSelect from '@/components/STreeSelect' +import TreeDataSelection from '../../../../components/selection/TreeDataSelection' export default { name: 'BaseInfoForm', @@ -378,7 +387,8 @@ export default { UserSelection, UploadFile, TreeSelection, - STreeSelect + STreeSelect, + TreeDataSelection }, props: { disabled: { diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue index 1577f275..1e89f404 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue @@ -350,14 +350,22 @@ - + + + + + + + + + @@ -625,10 +633,11 @@ import { getStandardGradeClassification } from '@/api/enterpriseStandardLibraryApi' import { getWorkGroupTreeList, ajaxGetDictItems } from '@/api/api' +import TreeDataSelection from '../../../../components/selection/TreeDataSelection' export default { name: 'ApprovalBaseInfo', - components: { StandardSelection, UserSelection, UploadFile, TreeSelection }, + components: { StandardSelection, UserSelection, UploadFile, TreeSelection, TreeDataSelection }, props: { projectType: { type: [Number, String], diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue index 32114116..758e6e9d 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue @@ -351,14 +351,22 @@ - + + + + + + + + + @@ -445,10 +453,11 @@ import { import { getFormDictTreeList, ajaxGetDictItems } from '@/api/api' import TreeSelection from '@/components/selection/TreeSelection' import { getEnStandardNo } from '@/api/workCenter' +import TreeDataSelection from '../../../../components/selection/TreeDataSelection' export default { name: 'MergeBaseInfo', - components: { EnterprisePlanSelection, UserSelection, UploadFile, TreeSelection }, + components: { EnterprisePlanSelection, UserSelection, UploadFile, TreeSelection, TreeDataSelection }, props: { disabled: { type: Boolean, diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue b/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue index 143126bd..763678b9 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue @@ -167,15 +167,24 @@ :label-in-value="false" :placeholder="$t('pleaseSelect')+item.dbFieldTxt" /> - + + + + + + + + + + @@ -200,7 +209,7 @@ import StandardSelection from '@/components/selection/StandardSelection' import UploadFile from '@/components/UploadFile' import EnterprisePlanSelection from '@/components/selection/EnterprisePlanSelection' import TreeSelection from '@/components/selection/TreeSelection' -import error from '../../../result/Error' +import TreeDataSelection from '../../../../components/selection/TreeDataSelection' export default { name: 'BaseInfoForm', @@ -210,7 +219,8 @@ export default { StandardSelection, UploadFile, EnterprisePlanSelection, - TreeSelection + TreeSelection, + TreeDataSelection }, props: { // 流程发起类型,是自动发起(auto)的还是从新建流程发起的(newProcess) diff --git a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue index d4152340..8cdf271a 100644 --- a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue +++ b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue @@ -255,16 +255,25 @@ :label-in-value="false" :placeholder="$t('pleaseSelect')+item.dbFieldTxt" /> - + + + + + + + + + + + @@ -369,6 +378,7 @@ import { } from '../../../api/workCenter' import { WorkCenterMixin } from '../../../mixins/WorkCenterMixin' import STreeSelect from '../../../components/STreeSelect' +import TreeDataSelection from '../../../components/selection/TreeDataSelection' export default { name: 'StandardEntryOrChangeProcess', @@ -382,7 +392,8 @@ export default { ProcessDetailList, UserSelectModal, TreeSelection, - STreeSelect + STreeSelect, + TreeDataSelection }, mixins: [WorkCenterMixin], data () {