From 5812d14672bdbce97f12171ae864a7adff92f53f Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 15 Sep 2023 15:51:54 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=92=8C=E4=BC=81=E6=A0=87=E4=B8=B4=E6=97=B6=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/enterpriseStandardLibraryApi.js | 4 +- src/common/lang/en-us.js | 27 -- .../lang/enterpriseStandardLibrary/en.js | 16 +- .../lang/enterpriseStandardLibrary/zh.js | 16 +- src/common/lang/zh-cn.js | 30 +- src/components/selection/UserSelectModal.vue | 152 +++++----- src/components/selection/UserSelection.vue | 2 +- .../plan/PlanList.vue | 8 +- .../plan/detail/PlanDetail.vue | 261 +++++++++++++++--- .../modules/TemporaryPermissionSet.vue | 8 +- 10 files changed, 327 insertions(+), 197 deletions(-) diff --git a/src/api/enterpriseStandardLibraryApi.js b/src/api/enterpriseStandardLibraryApi.js index f5de3c3b..9c4775e7 100644 --- a/src/api/enterpriseStandardLibraryApi.js +++ b/src/api/enterpriseStandardLibraryApi.js @@ -19,7 +19,7 @@ const deleteTreeNode = (params) => postAction('/laws/standard/lawsTreeNode/enter // 发起变更 const initChange = (params) => getAction('', params) // 临时权限设置 -const temporaryPermissionSet = (params) => getAction('', params) +const temporaryPermissionSet = (params) => postAction('/laws/standard/enterprise/tempPermission', params) // 收藏企标 const collectStandard = (params) => getAction('', params) // 分享企标 @@ -41,7 +41,7 @@ const getRectificationPlanById = (params) => getAction('/enterprise/inspect/rect const initReview = (params) => getAction('', params) // 企标计划-根据id获取计划详情 -const getEnterpriseStandardPlanInfoById = (params) => getAction('', params) +const getEnterpriseStandardPlanInfoById = (params) => getAction('/enterprise/plan/detail', params) export { getEnterpriseStandardTableHeader, diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 78a9ab45..ed1a28a5 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -358,33 +358,6 @@ module.exports = { clickCheckADepart: 'Please click to select a department!', mobileFormatCorrect: 'Your mobile number format is incorrect!' }, - // 文档库 - docLibrary: { - cancelCollection: 'Delete Collection', - cancelSubscribe: 'Unsubscribe', - detailsPhasedImplementation: 'Phased Implementation', - statuteNumberClause: 'Statute number/clause', - implementationDateTwo: 'Implementation Date', - typeofImplementation: 'Type of implementation', - updateLog: 'Change Log', - problemKnowledgeBase: 'Knowledge Sharing', - collection: 'Invoice Collection', - subscribe: 'Subscribe', - textInformation: 'Document Files', - standardBreakdown: 'Standard Breakdown', - standardOne: 'Standard', - viewFileOne: 'View File', - dataLoading: 'Data loading...', - standardName: 'Standard Name', - modificationContent: 'Modification Content', - modificationTime: 'Modification Time', - personnel: 'Personnel', - documentLibraryDetails: 'Document Library Details', - confirmCollection: 'Confirm Collection?', - cancelConfirmCollection: 'Are you sure you want to cancel the collection?', - confirmSubscribe: 'Confirm Subscribe ?', - cancelConfirmSubscribe: 'Are you sure you want to cancel the subscribe' - }, // 文档工具 docTool: { // 文档拆分 diff --git a/src/common/lang/enterpriseStandardLibrary/en.js b/src/common/lang/enterpriseStandardLibrary/en.js index 5e434b76..66a64bec 100644 --- a/src/common/lang/enterpriseStandardLibrary/en.js +++ b/src/common/lang/enterpriseStandardLibrary/en.js @@ -135,6 +135,20 @@ module.exports = { reviewDate: '评审日期', submissionDate: '报批日期', releaseDate: '发布日期', - detailTitle: '企业标准计划详情页' + detailTitle: '企业标准计划详情页', + basicInformation: '基础信息', + englishNameOfEnterpriseStandard: '企标英文名称', + gradeClassification: '企标等级分类', + projectType: '项目类型', + rangeOfApplication: '适用范围', + enterpriseStandardSystem: '企标体系', + partName: '零部件名称', + scopeOfApplication: '标准适用范围', + compilationIllustration: '编制说明', + projectBackground: '立项背景、立项依据', + similarNaStandardsAnalysis: '国际、国家及行业同类标准分析', + similarEnStandardsAnalysis: '企业同类标准对比分析', + standardLeadingNecessity: '立项标准的领先性与必要性', + projectExpectedEffects: '立项目的及预期效果等' } } diff --git a/src/common/lang/enterpriseStandardLibrary/zh.js b/src/common/lang/enterpriseStandardLibrary/zh.js index ca8a1867..6f25a962 100644 --- a/src/common/lang/enterpriseStandardLibrary/zh.js +++ b/src/common/lang/enterpriseStandardLibrary/zh.js @@ -135,6 +135,20 @@ module.exports = { reviewDate: '评审日期', submissionDate: '报批日期', releaseDate: '发布日期', - detailTitle: '企业标准计划详情页' + detailTitle: '企业标准计划详情页', + basicInformation: '基础信息', + englishNameOfEnterpriseStandard: '企标英文名称', + gradeClassification: '企标等级分类', + projectType: '项目类型', + rangeOfApplication: '适用范围', + enterpriseStandardSystem: '企标体系', + partName: '零部件名称', + scopeOfApplication: '标准适用范围', + compilationIllustration: '编制说明', + projectBackground: '立项背景、立项依据', + similarNaStandardsAnalysis: '国际、国家及行业同类标准分析', + similarEnStandardsAnalysis: '企业同类标准对比分析', + standardLeadingNecessity: '立项标准的领先性与必要性', + projectExpectedEffects: '立项目的及预期效果等' } } diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 8d6ff6e6..c8107ac3 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -358,33 +358,6 @@ module.exports = { clickCheckADepart: '请点击选择一个部门!', mobileFormatCorrect: '您的手机号码格式不正确!' }, - // 文档库 - docLibrary: { - cancelCollection: '取消收藏', - cancelSubscribe: '取消订阅', - detailsPhasedImplementation: '分阶段实施详情', - statuteNumberClause: '法规编号/条款', - implementationDateTwo: '实施日期', - typeofImplementation: '实施类型', - updateLog: '更新log', - problemKnowledgeBase: '知识分享', - collection: '收藏', - subscribe: '订阅', - textInformation: '文本信息', - standardBreakdown: '标准分解单', - standardOne: '标准', - viewFileOne: '查看文件', - dataLoading: '数据加载中...', - standardName: '标准名称', - modificationContent: '修改内容', - modificationTime: '修改时间', - personnel: '人员', - documentLibraryDetails: '文档库详情', - confirmCollection: '确定收藏？', - cancelConfirmCollection: '确定取消收藏？', - confirmSubscribe: '确定订阅？', - cancelConfirmSubscribe: '确定取消订阅？' - }, // 文档工具 docTool: { // 文档拆分 @@ -502,7 +475,8 @@ module.exports = { selectUser: '选择用户', userList: '用户列表', name: '姓名', - post: '岗位' + post: '岗位', + selectedPersonnel: '已选人员' }, // 弹框上传附件 uploadFile: { diff --git a/src/components/selection/UserSelectModal.vue b/src/components/selection/UserSelectModal.vue index e3d58203..1622a18f 100644 --- a/src/components/selection/UserSelectModal.vue +++ b/src/components/selection/UserSelectModal.vue @@ -59,55 +59,32 @@
-
-
-

{{ $t('userSelect.select') }}

-
- {{ $t('userSelect.userList') }} -
-
- - - -
-
-
-

选择

-
- - - - + + + +
+

{{ $t('userSelect.selectedPersonnel') }}

+
+
+ {{ item.realname + '(' + item.workNo + ')' }} +
+ @@ -136,8 +113,10 @@ export default { immediate: true, handler (val) { console.log(val) - this.selectedRowKeys = val.split(',') - this.getUserListByIds(val) + if (val) { + this.selectedRowKeys = val ? val.split(',') : [] + this.getUserListByIds(val) + } } } }, @@ -193,25 +172,10 @@ export default { }, selectedRowKeys: [], loadingLeft: false, - columnsRight: [ - { - title: this.$t('userSelect.name'), - dataIndex: 'realname', - align: 'center', - scopedSlots: { customRender: 'text' } - }, - { - title: this.$t('operation'), - dataIndex: 'action', - scopedSlots: { customRender: 'action' }, - align: 'center' - } - ], - loadingRight: false, dataSourceRight: [], url: { userList: '/sys/user/page', - userListByIds: '' + userListByIds: '/sys/user/queryByIds' } } }, @@ -280,7 +244,7 @@ export default { this.loadingLeft = false }) }, - // 左侧选择 + // 表格选择 onSelectChange (selectedRowKeys, selectedRows) { this.selectedRowKeys = selectedRowKeys if (this.type === 'checkbox') { @@ -313,11 +277,11 @@ export default { // 根据ids获取用户列表 getUserListByIds (ids) { const params = {} - params.ids = ids + params.userIds = ids this.loadingRight = true getAction(this.url.userListByIds, params).then((res) => { if (res.success) { - this.dataSourceRight = res.result.records || [] + this.dataSourceRight = res.result || [] } else { this.$message.warn(res.message) } @@ -325,11 +289,10 @@ export default { this.loadingRight = false }) }, - // 右侧表的删除 + // 名字列表的删除 handleDelete (record, index) { this.dataSourceRight.splice(index, 1) this.selectedRowKeys = this.selectedRowKeys.filter(item => item !== record.id) - console.log(this.selectedRowKeys) }, handleOk () { this.$emit('change', this.selectedRowKeys.join(',')) @@ -353,23 +316,38 @@ export default { width: 100%; display: flex; justify-content: space-between; -&-left { - width: 58%; - } -&-right { - width: 40%; - } -&-title-div { - display: flex; - align-items: center; - height: 28px; - margin: 20px 0; -.modal-content-title { - color: #1D2129; - font-weight: 500; - margin-right: 12px; - margin-bottom: 0; -} + &-left { + width: 58%; + } + &-right { + width: 40%; + } + &-title-div { + display: flex; + align-items: center; + height: 28px; + margin: 20px 0; + .modal-content-title { + color: #1D2129; + font-weight: 500; + margin-right: 12px; + margin-bottom: 0; + } + } } +.name-content { + display: flex; + .name-div { + width: auto; + padding: 5px 16px; + margin-right: 12px; + background: rgba(213, 44, 38, 0.08); + border-radius: 4px 4px 4px 4px; + opacity: 1; + color: #D52C26; + /deep/ .anticon { + margin-left: 4px; + } + } } diff --git a/src/components/selection/UserSelection.vue b/src/components/selection/UserSelection.vue index 53fe13a6..db3aee7d 100644 --- a/src/components/selection/UserSelection.vue +++ b/src/components/selection/UserSelection.vue @@ -16,7 +16,7 @@ {{ $t('userSelect.select') }}
- + diff --git a/src/views/enterpriseStandardLibrary/plan/PlanList.vue b/src/views/enterpriseStandardLibrary/plan/PlanList.vue index 3024aac5..2de40065 100644 --- a/src/views/enterpriseStandardLibrary/plan/PlanList.vue +++ b/src/views/enterpriseStandardLibrary/plan/PlanList.vue @@ -210,7 +210,7 @@ export default { title: this.$t('enterpriseStandardLibrary.plan.revisionType'), align: 'center', width: 180, - dataIndex: 'applicationCategory', + dataIndex: 'applicationCategory_dictText', scopedSlots: { customRender: 'text' } }, { @@ -329,7 +329,7 @@ export default { title: this.$t('enterpriseStandardLibrary.plan.isAskForAdvice'), align: 'center', width: 180, - dataIndex: 'solicitationOpinionEnabled', + dataIndex: 'solicitationOpinionEnabled_dictText', scopedSlots: { customRender: 'text' } }, { @@ -364,14 +364,14 @@ export default { title: this.$t('enterpriseStandardLibrary.plan.projectStatus'), align: 'center', width: 180, - dataIndex: 'projectStatus', + dataIndex: 'projectStatus_dictText', scopedSlots: { customRender: 'text' } }, { title: this.$t('enterpriseStandardLibrary.plan.changeState'), align: 'center', width: 180, - dataIndex: 'changeStatus', + dataIndex: 'changeStatus_dictText', scopedSlots: { customRender: 'text' } }, { diff --git a/src/views/enterpriseStandardLibrary/plan/detail/PlanDetail.vue b/src/views/enterpriseStandardLibrary/plan/detail/PlanDetail.vue index 15268170..699d20a4 100644 --- a/src/views/enterpriseStandardLibrary/plan/detail/PlanDetail.vue +++ b/src/views/enterpriseStandardLibrary/plan/detail/PlanDetail.vue @@ -1,85 +1,260 @@ - diff --git a/src/views/enterpriseStandardLibrary/standard/modules/TemporaryPermissionSet.vue b/src/views/enterpriseStandardLibrary/standard/modules/TemporaryPermissionSet.vue index 19010196..bca81557 100644 --- a/src/views/enterpriseStandardLibrary/standard/modules/TemporaryPermissionSet.vue +++ b/src/views/enterpriseStandardLibrary/standard/modules/TemporaryPermissionSet.vue @@ -20,14 +20,16 @@ @@ -47,7 +49,7 @@ export default { components: { UserSelection }, data () { return { - title: '', + title: this.$t('enterpriseStandardLibrary.standard.temporaryPermissionSet'), visible: false, confirmLoading: false, form: this.$form.createForm(this), @@ -100,7 +102,7 @@ export default { if (!err) { this.confirmLoading = true const param = Object.assign({}, values) - param.standards = this.model.standards + param.standardNos = this.model.standards temporaryPermissionSet(param).then(res => { if (res.success) { this.$message.success(res.message)