From ebd074f442cfb1b1140dc1bb9e034c75fcc629fb Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Sat, 14 Sep 2024 14:55:13 +0800 Subject: [PATCH 1/6] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9UAT=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9A=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=BC=B9=E6=A1=86=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterprisePlanSelectionModal.vue | 107 +++++++++++------- 1 file changed, 68 insertions(+), 39 deletions(-) diff --git a/src/components/selection/EnterprisePlanSelectionModal.vue b/src/components/selection/EnterprisePlanSelectionModal.vue index 951e5995..e1e79bf9 100644 --- a/src/components/selection/EnterprisePlanSelectionModal.vue +++ b/src/components/selection/EnterprisePlanSelectionModal.vue @@ -24,46 +24,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + {{ toggleSearchStatus ? $t('putAway') : $t('open') }} + + {{ $t('query') }} {{ $t('reset') }}
@@ -282,7 +306,8 @@ export default { } ], dataList: [], - categoryTreeList: [] // 组织机构下拉框数据 + categoryTreeList: [], // 组织机构下拉框数据 + toggleSearchStatus: false } }, mounted () { @@ -296,6 +321,9 @@ export default { this.replacePage() }) }, + handleToggleSearch () { + this.toggleSearchStatus = !this.toggleSearchStatus + }, // 获取组织机构树 getSysCategoryTree () { queryDepartTreeList().then((res) => { @@ -393,6 +421,7 @@ export default { showSizeChanger: true, total: 0 } + this.toggleSearchStatus = false } } } From 72548127a8caa857b8e08dd64d43d9f279c4a54e Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Sat, 14 Sep 2024 15:02:14 +0800 Subject: [PATCH 2/6] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9UAT=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9A=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4=E8=8A=82=E7=82=B9=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/businessSupport.js | 3 +++ src/common/lang/businessSupport/zh.js | 3 ++- src/common/lang/zh-cn.js | 1 + .../StandardizationActivityPage.vue | 26 ++++++++++++++++++- 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/api/businessSupport.js b/src/api/businessSupport.js index 2c84b04f..0d26ff6e 100644 --- a/src/api/businessSupport.js +++ b/src/api/businessSupport.js @@ -15,6 +15,8 @@ const queryTreeList = (params) => getAction('/laws/standardization/lawsStandardi const addNode = (params) => postAction('/laws/standardization/lawsStandardization/add', params) // 标准化活动-编辑 const editNode = (params) => postAction('/laws/standardization/lawsStandardization/edit', params) +// 标准化活动-删除 +const deleteNode = (params) => postAction('/laws/standardization/lawsStandardization/delete', params) // 标准化活动-通过id查询 const queryById = (params) => getAction('/laws/standardization/lawsStandardization/queryById', params) // 标准化活动-通过id查询表格信息 @@ -43,6 +45,7 @@ export { queryTreeList, addNode, editNode, + deleteNode, queryById, queryTableDataById, queryStatisticalList, diff --git a/src/common/lang/businessSupport/zh.js b/src/common/lang/businessSupport/zh.js index 82768b65..47cbb61e 100644 --- a/src/common/lang/businessSupport/zh.js +++ b/src/common/lang/businessSupport/zh.js @@ -31,7 +31,8 @@ module.exports = { addUpToFourLevels: '该节点无法添加子节点', pleaseUploadGroupInfo: '请上传集团参与情况资料', pleaseUploadPaymentInfo: '请上传支付信息资料', - pleaseUploadMeeting: '请上传参会记录会议资料' + pleaseUploadMeeting: '请上传参会记录会议资料', + rootNodeNoDelete: '根节点不可以删除,请重新选择' }, // 问答库 questionAnswer: { diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index dedd303d..948d1102 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -189,6 +189,7 @@ module.exports = { noFileAvailableForPreview: '暂无可预览的文件', enterpriseStandard: '企业标准', pleaseAtLeastSelectOneUser: '请至少选择一个用户', + workNo: '工号', // 树右键 treeRight: { addFolder: '新增文件夹', diff --git a/src/views/businessSupport/standardizationActivity/StandardizationActivityPage.vue b/src/views/businessSupport/standardizationActivity/StandardizationActivityPage.vue index 5838bf94..48516dbc 100644 --- a/src/views/businessSupport/standardizationActivity/StandardizationActivityPage.vue +++ b/src/views/businessSupport/standardizationActivity/StandardizationActivityPage.vue @@ -17,6 +17,9 @@ {{ $t('edit') }} + + + {{ $t('delete') }} {{ $t('view') }} @@ -80,7 +83,7 @@