From c0d9d895154547dcaeeb1a0799a916b257a46469 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 1 Aug 2024 17:54:00 +0800 Subject: [PATCH 001/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug87439?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=98=AF=E5=90=A6=E8=AF=95=E8=A1=8C=E7=9A=84?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standard/modules/EnterpriseStandardModal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue b/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue index 66fa2db..a52c990 100644 --- a/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue +++ b/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue @@ -15,7 +15,7 @@ Date: Thu, 1 Aug 2024 18:36:15 +0800 Subject: [PATCH 002/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug87951?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/lang/enterpriseStandardLibrary/en.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/lang/enterpriseStandardLibrary/en.js b/src/common/lang/enterpriseStandardLibrary/en.js index 493551b..705a2d7 100644 --- a/src/common/lang/enterpriseStandardLibrary/en.js +++ b/src/common/lang/enterpriseStandardLibrary/en.js @@ -23,10 +23,10 @@ module.exports = { submitQuestion: 'Submit a question', standardResolutionSheet: 'Standard interpretation', nodeName: 'Node name', - subjectToClause: 'Section clause', - standardContentOrRequirements: 'Standard content or requirements', - rectificationDepartment: 'Rectification department', - auditContent: 'Monitoring content', + subjectToClause: 'Article', + standardContentOrRequirements: 'Enterprise Standard Content', + rectificationDepartment: 'Rectification Dept.', + auditContent: 'Supervisory Contents', disabledBatchDel: 'If the selected data has no operation permission, select another data', pleaseSelectUserOrDepart: 'The authorized department and authorized person must select at least one', youNot: "You didn't", From c4429ca0230b27440071fdfc187e2063e2454f9e Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 1 Aug 2024 18:43:07 +0800 Subject: [PATCH 003/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug87964?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/lang/standardRegulationLibrary/en-us.js | 5 +++-- src/common/lang/standardRegulationLibrary/zh-cn.js | 3 ++- .../marketRegulationsList/MarketRegulationsDetailPage.vue | 2 +- .../marketRegulationsList/MarketRegulationsFormPage.vue | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/common/lang/standardRegulationLibrary/en-us.js b/src/common/lang/standardRegulationLibrary/en-us.js index 1a2d478..f7379ff 100644 --- a/src/common/lang/standardRegulationLibrary/en-us.js +++ b/src/common/lang/standardRegulationLibrary/en-us.js @@ -89,7 +89,7 @@ module.exports = { applicableVehicleType: 'Vehicle Catagory', authenticationObject: 'Certification Item', certifiedDeliverables: 'Verification', - type: 'Type', + type: 'Requirement Category', dynamicType: 'Power Propulsion Type', mainControlDepartment: 'Main Responsible Dept.', masterControlDepartmentProfessionalModule: 'Module of Main Responsible Dept. ', @@ -97,7 +97,8 @@ module.exports = { associateDepartmentSpecializedModules: 'Module of Related Dept. ', batchRestriction: 'Production Amount', automaticDrivingLevel: 'Automatic Driving Level', - requirementType: 'Optional/Compulsory' + requirementType: 'Optional/Compulsory', + remarks: 'Note' }, // 标准主计划 standardMasterPlan: { diff --git a/src/common/lang/standardRegulationLibrary/zh-cn.js b/src/common/lang/standardRegulationLibrary/zh-cn.js index 62b6cc2..120cfb8 100644 --- a/src/common/lang/standardRegulationLibrary/zh-cn.js +++ b/src/common/lang/standardRegulationLibrary/zh-cn.js @@ -97,7 +97,8 @@ module.exports = { associateDepartmentSpecializedModules: '关联部门专业模块', batchRestriction: '批量限制', automaticDrivingLevel: '自动驾驶等级', - requirementType: '要求类型' + requirementType: '要求类型', + remarks: '备注' }, // 标准主计划 standardMasterPlan: { diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue index c56a11b..c736e00 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue @@ -334,7 +334,7 @@ export default { scopedSlots: { customRender: 'text' } }, { // 备注 - title: this.$t('remarks'), + title: this.$t('standardRegulationLibrary.marketListField.remarks'), align: 'center', width: 180, dataIndex: 'remark', diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue index 2736ace..45026c9 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue @@ -452,7 +452,7 @@ export default { scopedSlots: { customRender: 'text' } }, { // 备注 - title: this.$t('remarks'), + title: this.$t('standardRegulationLibrary.marketListField.remarks'), align: 'center', width: 180, dataIndex: 'remark', From 9b67504fe224071b7e0f56acfbe16d20b30d62cd Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Thu, 1 Aug 2024 18:59:28 +0800 Subject: [PATCH 004/194] =?UTF-8?q?[fix=20bug]=20=E6=8A=BD=E5=B1=89?= =?UTF-8?q?=E3=80=81modal=20=E4=B8=ADlabel=E5=85=A8=E9=83=A8=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E3=80=82=20=E6=97=A5=E6=9C=9F=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E8=BE=B9=E6=A1=86=E5=A2=9E=E5=A4=A7=20?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E9=87=8D=E5=8F=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/less/common.less | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/assets/less/common.less b/src/assets/less/common.less index f1c2f68..efd8c2c 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -203,6 +203,11 @@ } } +.ant-drawer-content-wrapper .ant-form-item-label, +.j-modal-box .ant-form-item-label { + overflow: hidden; + text-overflow: ellipsis; +} .box-title-text { line-height: 1.4; display: flex; @@ -988,4 +993,8 @@ } /deep/ .ant-table-hide-scrollbar { scrollbar-color: unset; +} +// 日期选择框 右侧重叠的问题 +.ant-calendar-picker-input.ant-input { + padding-right: 30px; } \ No newline at end of file From 2273ce0489719d29f8f5cd743f66837be8d7ecca Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 1 Aug 2024 19:00:31 +0800 Subject: [PATCH 005/194] =?UTF-8?q?[update]=20=E5=AD=97=E5=85=B8=E5=92=8C?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=A4=9A=E9=80=89=E5=A2=9E=E5=8A=A0=E5=8F=8C?= =?UTF-8?q?=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/dict/JDictSelectTag.vue | 7 +++++-- src/components/dict/JMultiSelectTag.vue | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/dict/JDictSelectTag.vue b/src/components/dict/JDictSelectTag.vue index c6143ef..2f21fe5 100644 --- a/src/components/dict/JDictSelectTag.vue +++ b/src/components/dict/JDictSelectTag.vue @@ -24,8 +24,8 @@ > 请选择 - - {{ item.text || item.label }} + + {{ $i18n.locale === EN ? item.enText : (item.text || item.label) }} @@ -56,6 +56,7 @@ export default { }, data () { return { + EN: 'en-us', dictOptions: [], tagType: '' } @@ -105,6 +106,7 @@ export default { // 优先从缓存中读取字典配置 if (getDictItemsFromCache(this.dictCode)) { this.dictOptions = getDictItemsFromCache(this.dictCode) + console.log('-----------缓存获取', this.dictCode, this.dictOptions) return } @@ -112,6 +114,7 @@ export default { ajaxGetDictItems(this.dictCode, null).then((res) => { if (res.success) { this.dictOptions = res.result + console.log('-----------接口获取', this.dictCode, this.dictOptions) } }) }, diff --git a/src/components/dict/JMultiSelectTag.vue b/src/components/dict/JMultiSelectTag.vue index 1c713b7..0c52f6c 100644 --- a/src/components/dict/JMultiSelectTag.vue +++ b/src/components/dict/JMultiSelectTag.vue @@ -20,7 +20,7 @@ :class="(openSelectedAll && arrayValue[0] === selectedAllValue) ? 'multi-select-tag-check-all' : ''" v-bind="$attrs"> {{ $t('checkedAll') }} - {{ item.text || item.label }} + {{ $i18n.locale === EN ? item.enText : (item.text || item.label) }} @@ -61,6 +61,7 @@ export default { }, data () { return { + EN: 'en-us', // 全选的value selectedAllValue, dictOptions: [], From 1f07d6488a57d852686f6b13cc45fbfed29cadcf Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 1 Aug 2024 19:06:54 +0800 Subject: [PATCH 006/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug87940?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/selection/UserSelectModal.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/selection/UserSelectModal.vue b/src/components/selection/UserSelectModal.vue index e4a6dc5..f4f10c3 100644 --- a/src/components/selection/UserSelectModal.vue +++ b/src/components/selection/UserSelectModal.vue @@ -544,4 +544,8 @@ export default { /deep/ .ant-form-item-label{ min-width: 70px !important; } + +/deep/ .ant-table-header { + margin-right: -8px; +} From b55114dae4e031680a0c2e1860ebe967c86bcd86 Mon Sep 17 00:00:00 2001 From: danshihao Date: Thu, 1 Aug 2024 19:12:20 +0800 Subject: [PATCH 007/194] =?UTF-8?q?[update=20=E6=A0=87=E5=87=86=E4=B8=BB?= =?UTF-8?q?=E8=AE=A1=E5=88=92]=20=E6=9F=A5=E7=9C=8B=E5=B8=82=E5=9C=BA?= =?UTF-8?q?=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardMasterPlan/modules/StandardMasterPlanModal.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue b/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue index c862e6d..ef69563 100644 --- a/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue +++ b/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue @@ -402,7 +402,7 @@
+ :disabled="!data[5].associationId"> {{ $t('standardRegulationLibrary.standardMasterPlan.viewMarketList') }}
@@ -468,7 +468,7 @@
+ :disabled="!data[6].actualCompletionDate"> {{ $t('standardRegulationLibrary.standardMasterPlan.viewTroubleshootingResults') }}
@@ -907,7 +907,7 @@ export default { path: '/standardRegulationLibrary/marketRegulationsList/marketRegulationsDetailPage', query: { title: this.$t('view'), - ids: this.model.marketStandardId + ids: this.data[5].associationId } }) }, From 1431148c16cfe005a74fb98cf8b1d817c83ad1b5 Mon Sep 17 00:00:00 2001 From: danshihao Date: Thu, 1 Aug 2024 19:16:46 +0800 Subject: [PATCH 008/194] =?UTF-8?q?[fix=2087240]=20=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=87=8D=E7=BD=AE=E5=8E=BB=E6=8E=89=E5=8B=BE?= =?UTF-8?q?=E9=80=89=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/RoleUserList.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue index 7416bd0..1e0b880 100644 --- a/src/views/system/RoleUserList.vue +++ b/src/views/system/RoleUserList.vue @@ -532,6 +532,7 @@ export default { }, searchReset2 () { this.queryParam2 = {} + this.onClearSelected2() this.loadData2(1) }, handleTableChange2 (pagination, filters, sorter) { From b5e1722da3d9e41fc469d94a1ebed60ca808ed05 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 1 Aug 2024 19:19:55 +0800 Subject: [PATCH 009/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug87985?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standard/EnterpriseStandardList.vue | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue b/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue index d8499fc..b858d8d 100644 --- a/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue +++ b/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue @@ -526,12 +526,6 @@ export default { this.$message.warning(this.$t('selectARecord')) return } - console.log(this.selectionRows) - if (this.selectionRows.find(item => !item.editFlag)) { - // 有没有查看权限的数据 - this.$message.warning(this.$t('enterpriseStandardLibrary.standard.disabledBatchDel')) - return - } const ids = this.selectedRowKeys.join(',') this.$confirm({ title: this.$t('confirmBatchDeletion'), From 48ff553f4e1d8f9541a1cd7463d8e6d249fb5740 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 1 Aug 2024 19:33:04 +0800 Subject: [PATCH 010/194] =?UTF-8?q?[update]=20=E7=94=A8=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=8E=BB=E6=8E=89=E4=B8=8A=E4=BC=A0=E6=89=8B=E5=86=99?= =?UTF-8?q?=E7=AB=A0=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E8=BA=AB=E4=BB=BD=E5=92=8C=E7=AE=A1=E7=90=86=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/UserList.vue | 10 ++++---- src/views/system/modules/UserModal.vue | 34 +++++++++++++------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue index b778b08..cd6e353 100644 --- a/src/views/system/UserList.vue +++ b/src/views/system/UserList.vue @@ -344,11 +344,11 @@ export default { } }, // 上传手写章 - { - text: this.$t('user.uploadHandStamp'), - clickEvent: 'handleUploadHandStamp', - has: 'user:uploadHandStamp' - } + // { + // text: this.$t('user.uploadHandStamp'), + // clickEvent: 'handleUploadHandStamp', + // has: 'user:uploadHandStamp' + // } ] } }, diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue index 78be78c..e4a838f 100644 --- a/src/views/system/modules/UserModal.vue +++ b/src/views/system/modules/UserModal.vue @@ -99,23 +99,23 @@ --> - - - {{ $t('user.ordinaryUsers') }} - {{ $t('user.superior') }} - - - - - - + + + + + + + + + + + + + + + + + From 1154993a211cb7791be75ea31af9b9ad293737e8 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 1 Aug 2024 19:40:53 +0800 Subject: [PATCH 011/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug87789?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/EngineerInitBaseInfo.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue index c7a5141..ce5e7a8 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue @@ -116,8 +116,8 @@ :placeholder="$t('pleaseSelect')+$t('applicableMarket')" /> - -
+ +
* @@ -287,6 +287,7 @@ export default { data () { return { StandardSource, + DecompositionSource, loading: false, formInline: {}, splitFileSourceList: [], // 标准分解单下拉 From ed43f4913c00b10e7f974c18fef09ea6ea8bf0b1 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 1 Aug 2024 19:53:57 +0800 Subject: [PATCH 012/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug87973?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/search/AdvancedSearch.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/dashboard/search/AdvancedSearch.vue b/src/views/dashboard/search/AdvancedSearch.vue index d61ec9f..8fc346a 100644 --- a/src/views/dashboard/search/AdvancedSearch.vue +++ b/src/views/dashboard/search/AdvancedSearch.vue @@ -12,7 +12,7 @@ {{ $t('dashboard.advancedSearch.retrieveCategories') }}
- {{ $t('dashboard.advancedSearch.searchType') }} + {{ $t('dashboard.advancedSearch.searchType') }}
{{ item.label }} @@ -963,6 +963,9 @@ export default { .label-col { text-align: left; color: #86909c; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } .option-col { width: calc(100% - 200px); From 56183f56d4cab46086524db8b837a592aea98862 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Thu, 1 Aug 2024 20:00:06 +0800 Subject: [PATCH 013/194] =?UTF-8?q?[fix=20bug]=20=E8=B5=84=E6=96=99?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../profileCenter/modules/ProfileCenterModal.vue | 2 +- .../profileCenter/modules/ProfileCenterTreeModal.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/standardRegulationLibrary/profileCenter/modules/ProfileCenterModal.vue b/src/views/standardRegulationLibrary/profileCenter/modules/ProfileCenterModal.vue index 73d0a2c..83dcf14 100644 --- a/src/views/standardRegulationLibrary/profileCenter/modules/ProfileCenterModal.vue +++ b/src/views/standardRegulationLibrary/profileCenter/modules/ProfileCenterModal.vue @@ -63,7 +63,7 @@ export default { data () { return { title: this.$t('newlyAdded'), - width: 600, + width: 800, visible: false, confirmLoading: false, modal: {}, diff --git a/src/views/standardRegulationLibrary/profileCenter/modules/ProfileCenterTreeModal.vue b/src/views/standardRegulationLibrary/profileCenter/modules/ProfileCenterTreeModal.vue index 4e7b11b..8a9d216 100644 --- a/src/views/standardRegulationLibrary/profileCenter/modules/ProfileCenterTreeModal.vue +++ b/src/views/standardRegulationLibrary/profileCenter/modules/ProfileCenterTreeModal.vue @@ -71,11 +71,11 @@ export default { model: {}, labelCol: { xs: { span: 24 }, - sm: { span: 4 } + sm: { span: 5 } }, wrapperCol: { xs: { span: 24 }, - sm: { span: 20 } + sm: { span: 18 } }, validatorRules: { // 节点名称 From e5ae7b0b30e9b50d05cfd0386a56edc44b8c5e36 Mon Sep 17 00:00:00 2001 From: danshihao Date: Thu, 1 Aug 2024 20:29:47 +0800 Subject: [PATCH 014/194] =?UTF-8?q?[fix=2087965]=20=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=81=AE=E6=8C=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dynamicMessage/DynamicMessageFormPage.vue | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/views/standardRegulationLibrary/dynamicMessage/DynamicMessageFormPage.vue b/src/views/standardRegulationLibrary/dynamicMessage/DynamicMessageFormPage.vue index 957c5d3..91b04ab 100644 --- a/src/views/standardRegulationLibrary/dynamicMessage/DynamicMessageFormPage.vue +++ b/src/views/standardRegulationLibrary/dynamicMessage/DynamicMessageFormPage.vue @@ -106,19 +106,19 @@ export default { form: this.$form.createForm(this), labelCol: { xs: { span: 24 }, - sm: { span: 4 } + sm: { span: 6 } }, wrapperCol: { xs: { span: 24 }, - sm: { span: 18 } + sm: { span: 16 } }, lineLabelCol: { xs: { span: 24 }, - sm: { span: 2 } + sm: { span: 3 } }, lineWrapperCol: { xs: { span: 24 }, - sm: { span: 21 } + sm: { span: 20 } }, ueContent: '', // UE编辑器配置 @@ -369,5 +369,13 @@ export default { box-sizing: border-box; overflow: auto; padding: 32px 0; + + /deep/ .ant-form-item-label { + margin-right: 10px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + word-break: break-all; + } } From 773eb592134a7b83c1260eb18ecbed70d8735901 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 1 Aug 2024 20:42:09 +0800 Subject: [PATCH 015/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug87969?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../selection/StandardSelection.vue | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/src/components/selection/StandardSelection.vue b/src/components/selection/StandardSelection.vue index 899a99d..c6e1370 100644 --- a/src/components/selection/StandardSelection.vue +++ b/src/components/selection/StandardSelection.vue @@ -11,8 +11,9 @@ - - {{ $t('standardSelect.standardSelection') }} + + S + {{ $t('standardSelect.standardSelection') }}
= 0 && offsetWidth <= 300) { + this.isSmall = true + } + }, + data () { + return { + EN: 'en-us', + isSmall: false + } + }, methods: { // 点击选择标准按钮 standardClick () { @@ -134,4 +147,15 @@ export default { .close-icon:hover { color: rgba(0, 0, 0, 0.45); } + +//.small-btn { +// max-width: 60px; +// span { +// display: inline-block; +// width: 40px; +// overflow-x: hidden; +// text-overflow: ellipsis; +// white-space: nowrap; +// } +//} From 155879360ae9b03eff9ffe87e01175bd4a6c7f01 Mon Sep 17 00:00:00 2001 From: danshihao Date: Thu, 1 Aug 2024 20:44:03 +0800 Subject: [PATCH 016/194] =?UTF-8?q?[fix=2087598]=20=E6=8B=86=E5=88=86-?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8B=86=E5=88=86=E7=BB=93=E6=9E=9C-?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A0=87=E5=87=86=E6=9D=A5=E6=BA=90=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../selection/StandardSelectionModal.vue | 75 ++++++++++++++++++- .../modules/ImportSplitResultModal.vue | 4 +- .../documentSplit/modules/SplitText.vue | 29 +++++-- 3 files changed, 100 insertions(+), 8 deletions(-) diff --git a/src/components/selection/StandardSelectionModal.vue b/src/components/selection/StandardSelectionModal.vue index eb30525..a9d299a 100644 --- a/src/components/selection/StandardSelectionModal.vue +++ b/src/components/selection/StandardSelectionModal.vue @@ -12,7 +12,7 @@
- + + + + + + + { return {} } + }, + // 是否拆分的搜索(来源换成外部标准结构树) + splitSearch: { + type: Boolean, + required: false, + default: false } }, data () { @@ -189,7 +214,15 @@ export default { } ], dataList: [], - sourceOptions: [] + sourceOptions: [], + // 标准结构树 + standardStructureTree: [] + } + }, + created () { + // 拆分的需要加载标准结构树 + if (this.splitSearch) { + this.loadStandardStructureTree() } }, methods: { @@ -210,6 +243,38 @@ export default { } }) }, + // 加载标准结构树 + loadStandardStructureTree () { + // option 不传显示我的收藏，1不显示我的收藏, 2只能选二级中国及中国下三级,和欧盟EU + getForeignStandardTree({ option: 2 }).then(res => { + if (res.success) { + const data = res.result || [] + this.standardStructureTree = data.map(item => { + item.disabled = true + return item + }) + } + }) + }, + // tree-select搜索 + filterTreeOption (input, option) { + const text = option.componentOptions.propsData.title || option.componentOptions.propsData.label + return text.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }, + // 获取树结构没有被禁用的value值 + getValuesWhereNotDisabled (tree = []) { + const values = [] + function traverse (node) { + if (!node.disabled) { // 只处理 disabled 不为 true 的节点 + values.push(node.value) + } + if (node.children && node.children.length > 0) { + node.children.forEach(child => traverse(child)) + } + } + tree.forEach(node => traverse(node)) + return values + }, // 获取表格数据 replacePage (arg) { if (arg === 1) { @@ -222,6 +287,12 @@ export default { pageSize: this.ipagination.pageSize, excludeStandardNumbers: this.excludeStandardNumbers } + // 标准结构树 + if (Array.isArray(query.standardSystem) && query.standardSystem.length) { + query.standardSystem = query.standardSystem.map(item => item.value).join(',') + } else { + query.standardSystem = this.getValuesWhereNotDisabled(this.standardStructureTree).join(',') + } // 清空在可选范围内进行查询 if (!query.source && this.canSelectedSource.length < 3) { query.source = this.canSelectedSource.join(',') diff --git a/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue b/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue index 78f9cfa..c4ce785 100644 --- a/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue +++ b/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue @@ -17,9 +17,11 @@ diff --git a/src/views/documentTool/documentSplit/modules/SplitText.vue b/src/views/documentTool/documentSplit/modules/SplitText.vue index dd3b902..fdb62eb 100644 --- a/src/views/documentTool/documentSplit/modules/SplitText.vue +++ b/src/views/documentTool/documentSplit/modules/SplitText.vue @@ -151,6 +151,20 @@ export default { this.loadStandardStructureTree() }, methods: { + // 获取树结构没有被禁用的value值 + getValuesWhereNotDisabled (tree = []) { + const values = [] + function traverse (node) { + if (!node.disabled) { // 只处理 disabled 不为 true 的节点 + values.push(node.value) + } + if (node.children && node.children.length > 0) { + node.children.forEach(child => traverse(child)) + } + } + tree.forEach(node => traverse(node)) + return values + }, getQueryParams () { // 获取查询条件 const sqp = {} @@ -162,18 +176,23 @@ export default { param.field = this.getQueryField() param.pageNo = this.ipagination.current param.pageSize = this.ipagination.pageSize - if (Array.isArray(param.standardSystem)) { + if (Array.isArray(param.standardSystem) && param.standardSystem.length) { param.standardSystem = param.standardSystem.map(item => item.value).join(',') + } else { + param.standardSystem = this.getValuesWhereNotDisabled(this.standardStructureTree).join(',') } return filterObj(param) }, // 加载标准结构树 loadStandardStructureTree () { - // option 不传显示我的收藏，1不显示我的收藏 - getForeignStandardTree({ option: 1 }).then(res => { + // option 不传显示我的收藏，1不显示我的收藏, 2只能选二级中国及中国下三级,和欧盟EU + getForeignStandardTree({ option: 2 }).then(res => { if (res.success) { - console.log(res.result) - this.standardStructureTree = res.result || [] + const data = res.result || [] + this.standardStructureTree = data.map(item => { + item.disabled = true + return item + }) } }) }, From 1788fcc9281a32c7f460a28e7c497128e5d24d59 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 1 Aug 2024 20:45:26 +0800 Subject: [PATCH 017/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug87969?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/selection/StandardSelection.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/selection/StandardSelection.vue b/src/components/selection/StandardSelection.vue index c6e1370..836cac0 100644 --- a/src/components/selection/StandardSelection.vue +++ b/src/components/selection/StandardSelection.vue @@ -12,7 +12,7 @@ - S + {{$t('standardSelect.standardSelection').charAt(0)}} {{ $t('standardSelect.standardSelection') }}
From 35512dbb0d3db8771e115274355149831b0708b8 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 2 Aug 2024 09:38:37 +0800 Subject: [PATCH 018/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug87995?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/customField/AddForm.vue | 22 +++++++++ .../selection/StandardSelectionModal.vue | 49 +++++++++++++++---- .../modules/EnterpriseStandardModal.vue | 1 + .../modules/ForeignStandardModal.vue | 1 + 4 files changed, 63 insertions(+), 10 deletions(-) diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue index 5548de9..69bde66 100644 --- a/src/components/customField/AddForm.vue +++ b/src/components/customField/AddForm.vue @@ -57,6 +57,7 @@ :disabledSourceSearch="!selectStandardCanUpdateTypeField.includes(item.dbFieldName)" :disabled="disabled || disabledFieldList.includes(item.dbFieldName)" :exclude-standard-numbers="excludeStandardFields.includes(item.dbFieldName) ? excludeStandardNumbers : null" + :is-value-have-name="selectStandardValueNeedNameField.includes(item.dbFieldName)" v-model="formInline[item.dbFieldName]" /> + + + + + + + +
@@ -173,10 +182,12 @@ import TreeSelection from '../selection/TreeSelection' import STreeSelect from '../STreeSelect' import { isHasPermission } from '../../utils/hasPermission' import { mapGetters } from 'vuex' +import TreeDataSelection from '../selection/TreeDataSelection' export default { name: 'AddForm', components: { + TreeDataSelection, UserSelection, JMultipleDatePicker, StandardSelection, @@ -295,6 +306,14 @@ export default { default: () => { return [] } + }, + // 选标准字段需要在value里面加标准名称的字段 + selectStandardValueNeedNameField: { + type: Array, + required: false, + default: () => { + return [] + } } }, data () { @@ -577,6 +596,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/StandardSelectionModal.vue b/src/components/selection/StandardSelectionModal.vue index a9d299a..df4f05e 100644 --- a/src/components/selection/StandardSelectionModal.vue +++ b/src/components/selection/StandardSelectionModal.vue @@ -56,7 +56,7 @@
this.selectedRowList.length) { // 说明是增加了数据 - for (const rowIndex in selectedRows) { - if (!this.selectedRowList.find(item => (item.standardNumber + '|' + item.standardName) === (selectedRows[rowIndex].standardNumber + '|' + selectedRows[rowIndex].standardName))) { - // 不存在，追加 - this.selectedRowList.push(selectedRows[rowIndex]) + if (this.isValueHaveName) { + // value里面要带标准名称 + for (const rowIndex in selectedRows) { + if (!this.selectedRowList.find(item => (item.standardNumber + '|' + item.standardName) === (selectedRows[rowIndex].standardNumber + '|' + selectedRows[rowIndex].standardName))) { + // 不存在，追加 + this.selectedRowList.push(selectedRows[rowIndex]) + } + } + } else { + // value不带标准名称 + for (const rowIndex in selectedRows) { + if (!this.selectedRowList.find(item => item.standardNumber === selectedRows[rowIndex].standardNumber)) { + // 不存在，追加 + this.selectedRowList.push(selectedRows[rowIndex]) + } } } } else { // 说明是删除了数据 if (selectedRowKeys && selectedRowKeys.length > 0) { // 没有选中数据，说明这一页没有选中数据了 - for (let i = 0; i < this.selectedRowList.length; i++) { - if (!selectedRowKeys.find(item => item === this.selectedRowList[i].standardNumber + '|' + this.selectedRowList[i].standardName)) { - // 表格选中中没有找到这一条数据，说明已经被删了 - this.selectedRowList.splice(i, 1) - i-- + if (this.isValueHaveName) { + // value里面要带标准名称 + for (let i = 0; i < this.selectedRowList.length; i++) { + if (!selectedRowKeys.find(item => item === this.selectedRowList[i].standardNumber + '|' + this.selectedRowList[i].standardName)) { + // 表格选中中没有找到这一条数据，说明已经被删了 + this.selectedRowList.splice(i, 1) + i-- + } + } + } else { + for (let i = 0; i < this.selectedRowList.length; i++) { + if (!selectedRowKeys.find(item => item === this.selectedRowList[i].standardNumber)) { + // 表格选中中没有找到这一条数据，说明已经被删了 + this.selectedRowList.splice(i, 1) + i-- + } } } + } else { this.selectedRowList = [] } diff --git a/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue b/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue index a52c990..02b33f0 100644 --- a/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue +++ b/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue @@ -23,6 +23,7 @@ :get-form-func="getFormFunc" :get-document-info-func="getDocumentInfoFunc" :exclude-standard-fields="['substitute_standard_number', 'reference_standard']" + :selectStandardValueNeedNameField="['substitute_standard_number', 'reference_standard']" @submitFormData="submitFormData" />
diff --git a/src/views/standardRegulationLibrary/foreignStandard/modules/ForeignStandardModal.vue b/src/views/standardRegulationLibrary/foreignStandard/modules/ForeignStandardModal.vue index 11ccd48..93287dc 100644 --- a/src/views/standardRegulationLibrary/foreignStandard/modules/ForeignStandardModal.vue +++ b/src/views/standardRegulationLibrary/foreignStandard/modules/ForeignStandardModal.vue @@ -22,6 +22,7 @@ :open-selected-all-field-list="openSelectedAllFieldList" :exclude-standard-fields="excludeStandardFields" :flag-by-field="{associated_enterprise_standard: StandardSource.ENTERPRISE.value, associated_standard: StandardSource.FOREIGN.value}" + :selectStandardValueNeedNameField="['substitute_standard_number', 'reference_standard']" @submitFormData="submitFormData" />
From 23a964cf08c0d351e625831ad4c7bf9a2cb966d3 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 2 Aug 2024 09:48:33 +0800 Subject: [PATCH 019/194] =?UTF-8?q?[update]=20=E6=B3=A8=E9=87=8Aaddform?= =?UTF-8?q?=E7=9A=84=E6=A0=91=E5=BD=A2=E5=BC=B9=E6=A1=86=E5=BC=95=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/customField/AddForm.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue index 69bde66..5ea1d9d 100644 --- a/src/components/customField/AddForm.vue +++ b/src/components/customField/AddForm.vue @@ -182,12 +182,12 @@ import TreeSelection from '../selection/TreeSelection' import STreeSelect from '../STreeSelect' import { isHasPermission } from '../../utils/hasPermission' import { mapGetters } from 'vuex' -import TreeDataSelection from '../selection/TreeDataSelection' +// import TreeDataSelection from '../selection/TreeDataSelection' export default { name: 'AddForm', components: { - TreeDataSelection, + // TreeDataSelection, UserSelection, JMultipleDatePicker, StandardSelection, From 23b164271063e1b95f30281463cee994586e0cf7 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 2 Aug 2024 10:16:23 +0800 Subject: [PATCH 020/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug87939?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/dict/JDictSelectTag.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/dict/JDictSelectTag.vue b/src/components/dict/JDictSelectTag.vue index 2f21fe5..1b83fe3 100644 --- a/src/components/dict/JDictSelectTag.vue +++ b/src/components/dict/JDictSelectTag.vue @@ -22,7 +22,7 @@ :filter-option="filterOption" @change="handleInput" > - 请选择 + {{ $t('pleaseSelect') }} {{ $i18n.locale === EN ? item.enText : (item.text || item.label) }} From e2d9a76b6a36fa711a54b8880351c6633013cfd9 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 2 Aug 2024 10:45:29 +0800 Subject: [PATCH 021/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9Search?= =?UTF-8?q?=E4=B8=AD=E6=A0=91=E5=BD=A2=E5=BC=B9=E6=A1=86=EF=BC=88=E5=B8=A6?= =?UTF-8?q?=E5=87=BA=E5=AD=90=E9=9B=86=E5=92=8C=E5=8D=95=E7=BA=BF=E7=88=B6?= =?UTF-8?q?=E7=BA=A7=EF=BC=89=E5=89=8D=E7=AB=AF=E4=B8=8D=E7=88=B6=E5=AD=90?= =?UTF-8?q?=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/customField/Search.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/customField/Search.vue b/src/components/customField/Search.vue index 6e29c1c..971b659 100644 --- a/src/components/customField/Search.vue +++ b/src/components/customField/Search.vue @@ -142,6 +142,7 @@ :tree-data="optionsData[item.dbFieldName]" :replaceFields="{key: 'id', value: 'id', title: 'name', children: 'childPartNameList'}" tree-checkable + treeCheckStrictly show-search allowClear :filterTreeNode="filterTreeOption" @@ -285,6 +286,7 @@ :tree-data="optionsData[item.dbFieldName]" :replaceFields="{key: 'id', value: 'id', title: 'name', children: 'childPartNameList'}" tree-checkable + treeCheckStrictly show-search allowClear :filterTreeNode="filterTreeOption" From cd0fe26b0a10bea1b97fb5a80cd7ee1297c80315 Mon Sep 17 00:00:00 2001 From: danshihao Date: Fri, 2 Aug 2024 10:51:09 +0800 Subject: [PATCH 022/194] =?UTF-8?q?[update=20=E9=AB=98=E7=BA=A7=E6=90=9C?= =?UTF-8?q?=E7=B4=A2]=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/search/AdvancedSearch.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/dashboard/search/AdvancedSearch.vue b/src/views/dashboard/search/AdvancedSearch.vue index 8fc346a..c3ca176 100644 --- a/src/views/dashboard/search/AdvancedSearch.vue +++ b/src/views/dashboard/search/AdvancedSearch.vue @@ -133,6 +133,7 @@ :tree-data="optionsData[item.dbFieldName]" :replaceFields="{key: 'id', value: 'id', title: 'name', children: 'childPartNameList'}" tree-checkable + tree-check-strictly show-search allowClear :filterTreeNode="filterTreeOption" @@ -615,16 +616,17 @@ export default { path = '/enterpriseStandardLibrary/enterpriseStandardDetail' } else if (this.currStandardType === '5') { // 全部的话,就判断是企标还是外部 - if (record.resource_type === StandardSource.FOREIGN.value) { + if (record.resource_type + '' === StandardSource.FOREIGN.value) { path = '/standardRegulationLibrary/foreignStandardDetailPage' - } else if (record.resource_type === StandardSource.ENTERPRISE.value) { + } else if (record.resource_type + '' === StandardSource.ENTERPRISE.value) { path = '/enterpriseStandardLibrary/enterpriseStandardDetail' } } this.$openPageNewSheet({ path: path, query: { - id: record.id + id: record.id, + standardNumber: record.standard_number } }) }, From f98a242d9ad5bcdf83e9f710be4b9ddb3b2a8583 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 2 Aug 2024 11:22:38 +0800 Subject: [PATCH 023/194] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5=E7=9B=91=E5=AF=9F=E5=86=85=E5=AE=B9=E6=94=B9?= =?UTF-8?q?=E6=88=90=E5=8F=8C=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standard/detail/EnterpriseStandardDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue index 22db262..d910210 100644 --- a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue +++ b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue @@ -89,7 +89,7 @@
- 稽查内容 + {{ $t('enterpriseStandardLibrary.standard.auditContent') }}
Date: Fri, 2 Aug 2024 11:32:34 +0800 Subject: [PATCH 024/194] =?UTF-8?q?[update]=20=E7=94=A8=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E6=9D=A5=E6=BA=90=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E4=B8=94=E5=88=A4=E6=96=AD=E6=9D=A5=E6=BA=90=E6=98=AFIAM?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/enums/commonEnums.js | 6 ++++++ src/views/system/UserList.vue | 24 ++++++++++++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index 7e79ffc..028b5e5 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -253,6 +253,12 @@ export const OcrConvertStateEnums = { CONVERTED: { text: '转换完成', value: '2' } } +// 用户管理来源 +export const UserSource = { + IAM: { text: 'IAM', value: '1' }, + SYSTEMADD: { text: '系统新增', value: '2' } +} + /** * 展示区域管理 * TODO 标签管理要改了，这里也要同步一下 diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue index cd6e353..8d805c6 100644 --- a/src/views/system/UserList.vue +++ b/src/views/system/UserList.vue @@ -172,6 +172,7 @@ import JTable from '@/components/jero/JTable' import JSearchSelectTag from '@/components/dict/JSearchSelectTag' import UploadHandStampModal from './modules/UploadHandStampModal' import { isHasPermission } from '../../utils/hasPermission' +import { UserSource } from '../../enums/commonEnums' export default { name: 'UserList', @@ -302,7 +303,11 @@ export default { { text: this.$t('edit'), clickEvent: 'handleEdit', - has: 'user:edit' + has: 'user:edit', + show: (record) => { + // IAM同步过来的不能编辑 + return record.source !== UserSource.IAM.value + } }, // 详情 { @@ -316,14 +321,19 @@ export default { clickEvent: 'handleChangePassword', has: '', show: (record) => { - return this.isDev + // IAM同步过来的不能编辑 + return record.source !== UserSource.IAM.value } }, // 删除 { text: this.$t('delete'), clickEvent: 'handleDelete', - has: 'sys:user:sel' + has: 'sys:user:sel', + show: (record) => { + // IAM同步过来的不能删除 + return record.source !== UserSource.IAM.value + } }, // 冻结 { @@ -331,7 +341,8 @@ export default { clickEvent: 'handleFrozen', has: 'user:edit', show: (record) => { - return this.isDev && (record.status + '') === '1' + // IAM同步过来的不能编辑 + return (record.status + '') === '1' && record.source !== UserSource.IAM.value } }, // 解冻 @@ -340,9 +351,10 @@ export default { clickEvent: 'handleFrozen', has: 'user:edit', show: (record) => { - return this.isDev && (record.status + '') === '2' + // IAM同步过来的不能编辑 + return (record.status + '') === '2' && record.source !== UserSource.IAM.value } - }, + } // 上传手写章 // { // text: this.$t('user.uploadHandStamp'), From 5c71ee4225b6bfa96b016e7f36632039b5675d2c Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Fri, 2 Aug 2024 14:14:18 +0800 Subject: [PATCH 025/194] =?UTF-8?q?[fix=20bug]=E6=A0=91=E5=BD=A2=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=20=E4=B8=8B=E6=8B=89=E6=A1=86=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/tags/modules/TagContentDictItemModal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/system/tags/modules/TagContentDictItemModal.vue b/src/views/system/tags/modules/TagContentDictItemModal.vue index 2bc80ba..bb0ddde 100644 --- a/src/views/system/tags/modules/TagContentDictItemModal.vue +++ b/src/views/system/tags/modules/TagContentDictItemModal.vue @@ -233,7 +233,7 @@ export default { dictId: this.dictId, isTagDict: 1, pageNo: 1, - pageSize: 10 + pageSize: 1000 } getDictTreeList(params).then(res => { if (res.success) { From fe057163fe12fd55d7dacbc7cfde74b94ff3fd29 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Fri, 2 Aug 2024 14:25:16 +0800 Subject: [PATCH 026/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E5=A5=87?= =?UTF-8?q?=E7=91=9E=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95=E7=9A=84=E9=93=BE?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 ++-- .env.rsm | 5 +++++ .env.srms | 5 ----- 3 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 .env.rsm delete mode 100644 .env.srms diff --git a/.env.production b/.env.production index 9f83072..6577fe0 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ NODE_ENV=production VUE_APP_TAG_FLAG=1 -VUE_APP_LOGIN_PAGE='https://iam.sinotruk.com:7012/idp/oauth2/authorize?redirect_uri=http://srms.sinotruk.com/dashboard/analysis&state=123&client_id=SRMS&response_type=code' +VUE_APP_LOGIN_PAGE='https://iamuat.mychery.com:5443/idp/oauth2/authorize?redirect_uri=http://srms.sinotruk.com/dashboard/analysis&state=123&client_id=CGRSM&response_type=code' VUE_APP_CURRENT_SYSTEM='IAM' -VUE_APP_LOGOUT_PAGE='https://iam.sinotruk.com:7012/idp/profile/OAUTH2/Redirect/GLO?redirctToUrl=http://srms.sinotruk.com/dashboard/analysis&redirectToLogin=true&entityId=SRMS' \ No newline at end of file +VUE_APP_LOGOUT_PAGE='https://iamuat.mychery.com:5443/idp/profile/OAUTH2/Redirect/GLO?redirctToUrl=http://srms.sinotruk.com/dashboard/analysis&redirectToLogin=true&entityId=CGRSM' \ No newline at end of file diff --git a/.env.rsm b/.env.rsm new file mode 100644 index 0000000..83c2f1f --- /dev/null +++ b/.env.rsm @@ -0,0 +1,5 @@ +NODE_ENV=production +VUE_APP_TAG_FLAG=1 +VUE_APP_LOGIN_PAGE='https://iamuat.mychery.com:5443/idp/oauth2/authorize?redirect_uri=http://10.2.16.8:3344/dashboard/analysis&state=123&client_id=CGRSM&response_type=code' +VUE_APP_CURRENT_SYSTEM='IAM' +VUE_APP_LOGOUT_PAGE='https://iamuat.mychery.com:5443/idp/profile/OAUTH2/Redirect/GLO?redirctToUrl=http://10.2.16.8:3344/dashboard/analysis&redirectToLogin=true&entityId=CGRSM' \ No newline at end of file diff --git a/.env.srms b/.env.srms deleted file mode 100644 index 210993f..0000000 --- a/.env.srms +++ /dev/null @@ -1,5 +0,0 @@ -NODE_ENV=production -VUE_APP_TAG_FLAG=1 -VUE_APP_LOGIN_PAGE='https://iam-uat-new.sinotruk.com/idp/oauth2/authorize?redirect_uri=http://srms-test.sinotruk.com/dashboard/analysis&state=123&client_id=SRMS&response_type=code' -VUE_APP_CURRENT_SYSTEM='IAM' -VUE_APP_LOGOUT_PAGE='https://iam-uat-new.sinotruk.com/idp/profile/OAUTH2/Redirect/GLO?redirctToUrl=http://srms-test.sinotruk.com/dashboard/analysis&redirectToLogin=true&entityId=SRMS' \ No newline at end of file From f197fabd95922731b2e1d7bb5c2a91d6aade0afc Mon Sep 17 00:00:00 2001 From: danshihao Date: Fri, 2 Aug 2024 14:35:17 +0800 Subject: [PATCH 027/194] =?UTF-8?q?[update=20=E4=B8=80=E8=88=AC=E6=90=9C?= =?UTF-8?q?=E7=B4=A2]=20=E6=A0=87=E9=A2=98=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/search/GeneralSearch.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/dashboard/search/GeneralSearch.vue b/src/views/dashboard/search/GeneralSearch.vue index 0565acb..3d73756 100644 --- a/src/views/dashboard/search/GeneralSearch.vue +++ b/src/views/dashboard/search/GeneralSearch.vue @@ -908,7 +908,7 @@ export default { line-height: 28px; margin-right: 20px; max-height: calc(100% - 340px); - max-width: 50%; + max-width: 30%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; From 0ef8fad83ccc0446e1e0ca6419e24d74a0cd59ac Mon Sep 17 00:00:00 2001 From: danshihao Date: Fri, 2 Aug 2024 15:05:00 +0800 Subject: [PATCH 028/194] =?UTF-8?q?[update=20ueditor]=20=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/ueditor/lang/en/en.js | 2 +- public/ueditor/lang/zh-cn/zh-cn.js | 2 +- src/components/uEditor/UEditor.vue | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/public/ueditor/lang/en/en.js b/public/ueditor/lang/en/en.js index c9ef275..ac6ed08 100644 --- a/public/ueditor/lang/en/en.js +++ b/public/ueditor/lang/en/en.js @@ -74,7 +74,7 @@ UE.I18N['en'] = { 'jsonEncodeError': 'Server Return Format Error', 'loading':"loading...", 'loadError':"load error", - 'errorLoadConfig': 'Server config not loaded, upload can not work.', + 'errorLoadConfig': 'Cannot upload images by pasting or dragging.', }, 'simpleupload':{ 'exceedSizeError': 'File Size Exceed', diff --git a/public/ueditor/lang/zh-cn/zh-cn.js b/public/ueditor/lang/zh-cn/zh-cn.js index b71af48..79d60a8 100644 --- a/public/ueditor/lang/zh-cn/zh-cn.js +++ b/public/ueditor/lang/zh-cn/zh-cn.js @@ -74,7 +74,7 @@ UE.I18N['zh-cn'] = { 'jsonEncodeError': '服务器返回格式错误', 'loading':"正在上传...", 'loadError':"上传错误", - 'errorLoadConfig': '后端配置项没有正常加载，上传插件不能正常使用！' + 'errorLoadConfig': '不支持通过粘贴或拖拽上传图片！' }, 'simpleupload':{ 'exceedSizeError': '文件大小超出限制', diff --git a/src/components/uEditor/UEditor.vue b/src/components/uEditor/UEditor.vue index 3315c12..adca935 100644 --- a/src/components/uEditor/UEditor.vue +++ b/src/components/uEditor/UEditor.vue @@ -62,6 +62,16 @@ export default { } }, mounted () { + // 首次加载完所有语言包后，浅拷贝存备份（没有找到正常切换语言的api，暂时先这么处理） + if (Object.keys(UE.I18N).length > 1) { + window.__COPY_UE_I18N__ = { ...UE.I18N } + } + // 更新语言包（将备份语言包浅拷贝回来，只保留需要的一个需要的语言包） + if (localStorage.getItem('language') === 'en-us') { + UE.I18N = { en: window.__COPY_UE_I18N__.en } + } else { + UE.I18N = { ['zh-cn']: window.__COPY_UE_I18N__['zh-cn'] } + } UEDITOR_CONFIG.UEDITOR_HOME_URL = '../../../public/ueditor/' // 初始化UE this.editor = UE.delEditor('editor') From f6e647a3ae717086b68bc6227ae0598369b7ec24 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 2 Aug 2024 15:16:29 +0800 Subject: [PATCH 029/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E6=A0=91?= =?UTF-8?q?=E5=BD=A2=E5=BC=B9=E6=A1=86=E6=94=B9=E6=88=90=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/customField/AddForm.vue | 40 +-- .../selection/TreeDataSelectModal.vue | 320 ++++++++++++++++++ .../selection/TreeDataSelection.vue | 151 +++++++++ 3 files changed, 491 insertions(+), 20 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 5ea1d9d..d143133 100644 --- a/src/components/customField/AddForm.vue +++ b/src/components/customField/AddForm.vue @@ -133,24 +133,24 @@ :label-in-value="false" :placeholder="$t('pleaseSelect')+item.dbFieldTxt" /> - - - - - - - - - + + + + + + + + + + +
@@ -182,12 +182,12 @@ import TreeSelection from '../selection/TreeSelection' import STreeSelect from '../STreeSelect' import { isHasPermission } from '../../utils/hasPermission' import { mapGetters } from 'vuex' -// import TreeDataSelection from '../selection/TreeDataSelection' +import TreeDataSelection from '../selection/TreeDataSelection' export default { name: 'AddForm', components: { - // TreeDataSelection, + TreeDataSelection, UserSelection, JMultipleDatePicker, StandardSelection, diff --git a/src/components/selection/TreeDataSelectModal.vue b/src/components/selection/TreeDataSelectModal.vue new file mode 100644 index 0000000..1686455 --- /dev/null +++ b/src/components/selection/TreeDataSelectModal.vue @@ -0,0 +1,320 @@ + + + + + diff --git a/src/components/selection/TreeDataSelection.vue b/src/components/selection/TreeDataSelection.vue new file mode 100644 index 0000000..47e0cc7 --- /dev/null +++ b/src/components/selection/TreeDataSelection.vue @@ -0,0 +1,151 @@ + + + + + From 1a552226e5ac24a218e82eaab9e10826cbb2f2cf Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 2 Aug 2024 16:00:30 +0800 Subject: [PATCH 030/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug87648?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/dict/JDictSelectTag.vue | 4 ++++ .../modules/DesignEngineerEvaluation.vue | 14 ++++++++++++++ .../modules/MainFinderDistributesBaseInfo.vue | 14 ++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/src/components/dict/JDictSelectTag.vue b/src/components/dict/JDictSelectTag.vue index 1b83fe3..f28a26c 100644 --- a/src/components/dict/JDictSelectTag.vue +++ b/src/components/dict/JDictSelectTag.vue @@ -20,6 +20,7 @@ v-bind="$attrs" show-search :filter-option="filterOption" + @dropdownVisibleChange="dropdownVisibleChange" @change="handleInput" > {{ $t('pleaseSelect') }} @@ -143,6 +144,9 @@ export default { }, getCurrentDictOptions () { return this.dictOptions + }, + dropdownVisibleChange (open) { + this.$emit('dropdownVisibleChange', open) } }, model: { diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue index eca30a7..ddf58ac 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue @@ -31,6 +31,7 @@ dict-code="evaluation_result" :disabled="disabled" @change="resultChange(record)" + @dropdownVisibleChange="resultDropdownVisibleChange" v-model="record.result"> @@ -298,6 +299,19 @@ export default { } return data }, + // 点击评估结果,滚动条滚动到最后 + resultDropdownVisibleChange (open) { + if (!open) { + return + } + const table = this.$refs.expandTable + if (table) { + const scrollBox = table.$el.querySelector('.ant-table-body') + if (scrollBox) { + scrollBox.scrollLeft = scrollBox.scrollWidth + } + } + }, // 评估结果改变，清空备注和佐证材料,不满足要求的现状,整改方案,整改周期,整改费用,与其他项目共用性,共用后本项目所需费用 resultChange (record) { const index = this.dataSource.findIndex(item => item.id === record.id) diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue index e16c28f..5bf5f99 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue @@ -104,6 +104,7 @@ dict-code="evaluation_result" :disabled="disabled" @change="resultChange(record)" + @dropdownVisibleChange="resultDropdownVisibleChange" v-model="record.result"> @@ -860,6 +861,19 @@ export default { // 显示条款内容弹框 showContent (val) { this.$refs.splitClauseDetail.open(val) + }, + // 点击评估结果,滚动条滚动到最后 + resultDropdownVisibleChange (open) { + if (!open) { + return + } + const table = this.$refs.expandTable + if (table) { + const scrollBox = table.$el.querySelector('.ant-table-body') + if (scrollBox) { + scrollBox.scrollLeft = scrollBox.scrollWidth + } + } } } } From cd03df20eadf82958e34f9ad2f9eef17fbff8601 Mon Sep 17 00:00:00 2001 From: danshihao Date: Fri, 2 Aug 2024 16:44:11 +0800 Subject: [PATCH 031/194] =?UTF-8?q?[fix=2088015]=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E4=B8=BB=E8=AE=A1=E5=88=92=E5=AD=97=E6=AE=B5=E6=9C=AA=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/StandardMasterPlanModal.vue | 45 ++++++++++++++++--- 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue b/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue index ef69563..9aaa547 100644 --- a/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue +++ b/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue @@ -600,8 +600,9 @@ import StandardResolutionSheetModal from '@views/standardRegulationLibrary/foreignStandard/detail/modules/StandardResolutionSheetModal' import { getFormDictTreeList } from '@api/api' import STreeSelect from '@comp/STreeSelect' -import { filterObj } from '@/utils/util' +// 初始化data数组，默认9个对象中有type，1-9 +const initDataArr = () => new Array(9).fill(0).map((_, i) => ({ type: i + 1 })) export default { name: 'StandardMasterPlanModal', components: { STreeSelect, StandardResolutionSheetModal, UserSelection, StandardSelection }, @@ -615,7 +616,7 @@ export default { disableSubmit: false, model: {}, // 默认9个对象，type 1：信息输入 2：文本入库 3：导入通知 4：法规解读 5：法规宣贯 6：市场法规清单更新 7：法规符合性排查 8：通用文件整改计划 9：车型整改 - data: new Array(9).fill(0).map((_, i) => ({ type: i + 1 })), + data: initDataArr(), modelType: '', validatorRules: { // 标准编号 @@ -698,29 +699,61 @@ export default { } }, methods: { - // 回显页面信息 + // 新增回显页面信息 updatePageInfo () { + if (this.confirmLoading) { + return + } const formData = this.form.getFieldsValue() if (formData.base.applicableMarket && this.model.standardId) { + this.confirmLoading = true getStandardMasterPlanAddEcho({ applicableMarket: formData.base.applicableMarket, standardId: this.model.standardId }).then(res => { if (res.success) { const data = res.result || [] + // 保留可输入字段 data.forEach(item => { + const canInputField = this.getCanInputField(Number(item.type)) const index = Number(item.type) - 1 + // 删除可填写字段，防止覆盖 + canInputField.forEach(field => delete item[field]) // 回显表单 this.form.setFieldsValue({ - [`data[${index}]`]: Object.assign(formData.data[index], filterObj(item)) + [`data[${index}]`]: Object.assign(formData.data[index], item) }) // 存到页面 - this.data[index] = Object.assign(this.data[index], filterObj(item)) + this.data[index] = Object.assign(this.data[index], item) }) } + }).finally(() => { + this.confirmLoading = false }) } }, + /** + * 根据type获取可输入的字段 + * @param type - 类型 + */ + getCanInputField (type) { + switch (type) { + // 导入通知：是否涉及、责任人、计划完成日期 + case 3: + return ['isInvolved', 'responsiblePerson', 'responsiblePerson_dictText', 'plannedCompletionDate'] + // 导入通知：是否涉及、计划完成日期 + case 4: + return ['isInvolved', 'plannedCompletionDate'] + // 市场法规清单更新：是否涉及、计划完成日期 + case 6: + return ['isInvolved', 'plannedCompletionDate'] + // 法规符合性排查：是否涉及、责任人、计划完成日期 + case 7: + return ['isInvolved', 'responsiblePerson', 'responsiblePerson_dictText', 'plannedCompletionDate'] + default: + return [] + } + }, // 获取国家地区、也是适用市场下拉 getCountryOption () { getFormDictTreeList({ dictId: '1801130851452059649' }).then(res => { @@ -787,7 +820,7 @@ export default { close () { this.form.resetFields() this.model = {} - this.data = new Array(9).fill(0).map((_, i) => ({ type: i + 1 })) + this.data = initDataArr() this.modelType = '' this.disableSubmit = false this.visible = false From 569ef8bc7b6afced954443db51ad4b8700abca64 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 2 Aug 2024 16:50:14 +0800 Subject: [PATCH 032/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug87487?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/customField/AddForm.vue | 8 ++------ .../standard/detail/EnterpriseStandardDetail.vue | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue index 5ea1d9d..7983bdf 100644 --- a/src/components/customField/AddForm.vue +++ b/src/components/customField/AddForm.vue @@ -380,12 +380,8 @@ export default { }, fileIsDownload () { // 文件是否可下载 if (Object.keys(this.filePerm).includes(this.uploadName)) { - // 系统管理员可下载 - if (this.isSystemAdmin) { - return true - } else { - return false - } + // 需要特殊判断的字段不可下载 + return false } else { // 不是需要特殊判断的字段正常可下载 return true diff --git a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue index d910210..8416de8 100644 --- a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue +++ b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue @@ -218,12 +218,8 @@ export default { methods: { fileIsDownload (fieldName) { // 文件是否可下载 if (Object.keys(this.filePerm).includes(fieldName)) { - // 系统管理员可下载 - if (this.isSystemAdmin) { - return true - } else { - return false - } + // 需要特殊判断的字段不可下载 + return false } else { // 不是需要特殊判断的字段正常可下载 return true From 92b9869b27911f075530b19202e81c687dde2edc Mon Sep 17 00:00:00 2001 From: danshihao Date: Fri, 2 Aug 2024 17:02:03 +0800 Subject: [PATCH 033/194] =?UTF-8?q?[fix=2088020]=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E4=B8=BB=E8=AE=A1=E5=88=92-=E5=A2=9E=E5=8A=A0=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardMasterPlan/StandardMasterPlanList.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue b/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue index 768ae4e..7f1feb2 100644 --- a/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue +++ b/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue @@ -142,10 +142,17 @@ export default { text: this.$t('view'), clickEvent: 'handleShow', has: 'standardMasterPlan:detail' + }, + // 删除 + { + text: this.$t('delete'), + clickEvent: 'handleDelete', + has: 'standardMasterPlan:delete' } ], url: { list: '/laws/StandardMasterPlan/queryByPage', + delete: '/laws/StandardMasterPlan/delete', exportXlsUrl: '/laws/StandardMasterPlan/exportExcel' }, // 适用市场下拉 From 0ca39c434c3c823b0a01f15e35de3bcc539a78ad Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Fri, 2 Aug 2024 17:38:39 +0800 Subject: [PATCH 034/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug87486?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/selection/StandardSelectionModal.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/selection/StandardSelectionModal.vue b/src/components/selection/StandardSelectionModal.vue index df4f05e..8970dd0 100644 --- a/src/components/selection/StandardSelectionModal.vue +++ b/src/components/selection/StandardSelectionModal.vue @@ -56,7 +56,7 @@
(item.standardNumber + '|' + item.standardName) === (selectedRows[rowIndex].standardNumber + '|' + selectedRows[rowIndex].standardName))) { + if (!this.selectedRowList.find(item => (item.standardNumber + '《' + item.standardName + '》') === (selectedRows[rowIndex].standardNumber + '《' + selectedRows[rowIndex].standardName + '》'))) { // 不存在，追加 this.selectedRowList.push(selectedRows[rowIndex]) } @@ -360,7 +360,7 @@ export default { if (this.isValueHaveName) { // value里面要带标准名称 for (let i = 0; i < this.selectedRowList.length; i++) { - if (!selectedRowKeys.find(item => item === this.selectedRowList[i].standardNumber + '|' + this.selectedRowList[i].standardName)) { + if (!selectedRowKeys.find(item => item === this.selectedRowList[i].standardNumber + '《' + this.selectedRowList[i].standardName + '》')) { // 表格选中中没有找到这一条数据，说明已经被删了 this.selectedRowList.splice(i, 1) i-- From 30f046aa09636a54247eecbe86f3fee5c7836b7e Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Mon, 5 Aug 2024 10:10:26 +0800 Subject: [PATCH 035/194] =?UTF-8?q?[fix=20bug87860]=20=E6=9D=A1=E6=AC=BE?= =?UTF-8?q?=E6=8B=86=E5=88=86=20=E6=96=B0=E5=A2=9E=E7=9A=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=8F=AF=E4=BB=A5=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/tags/pages/ClauseSplittingList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/system/tags/pages/ClauseSplittingList.vue b/src/views/system/tags/pages/ClauseSplittingList.vue index 864f97d..7e01624 100644 --- a/src/views/system/tags/pages/ClauseSplittingList.vue +++ b/src/views/system/tags/pages/ClauseSplittingList.vue @@ -127,7 +127,7 @@ export default { width: 170 } ], - canOpeFlag: process.env.VUE_APP_TAG_FLAG === '0', // 是否可以操作编辑和删除，开发环境可以 + canOpeFlag: true, // process.env.VUE_APP_TAG_FLAG === '0', // 是否可以操作编辑和删除，开发环境可以 operationList: [ // 编辑 { From 7e738d05c8d7cfe5dee9a1f4b21625f58fcdb353 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 5 Aug 2024 13:37:44 +0800 Subject: [PATCH 036/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug87964?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../marketRegulationsList/modules/MarketRegulationsModal.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue b/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue index 6f36c49..976adb2 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue @@ -136,8 +136,8 @@ v-decorator.trim="[ 'requireType', validatorRules.requireType ]" /> - - + From 44e5a6d9ac84e6b4d667c80cdcb50cc460786edf Mon Sep 17 00:00:00 2001 From: danshihao Date: Mon, 5 Aug 2024 14:08:36 +0800 Subject: [PATCH 037/194] =?UTF-8?q?[update=20=E6=8B=86=E5=88=86]=20?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=B6=89=E5=8F=8A=E7=B3=BB=E7=BB=9F/?= =?UTF-8?q?=E9=83=A8=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/documentTool/documentSplit/modules/SplitAddForm.vue | 2 +- .../documentSplit/modules/SplitDetailBatchEditDrawer.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue index 5b09a16..d563e04 100644 --- a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue +++ b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue @@ -151,7 +151,7 @@ @change="updateDom" :placeholder="$t('pleaseSelect')+item.dbFieldTxt + getPlaceholderSuffix(item)" /> - - Date: Mon, 5 Aug 2024 14:09:22 +0800 Subject: [PATCH 038/194] =?UTF-8?q?[update=20=E6=A0=87=E5=87=86=E8=A7=A3?= =?UTF-8?q?=E8=AF=BB=E7=BB=84=E4=BB=B6]=20=E6=90=9C=E7=B4=A2=E5=90=8E?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E9=80=89=E4=B8=AD=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/StandardResolutionSheet.vue | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/components/StandardResolutionSheet.vue b/src/components/StandardResolutionSheet.vue index 00b1303..be1a788 100644 --- a/src/components/StandardResolutionSheet.vue +++ b/src/components/StandardResolutionSheet.vue @@ -298,6 +298,12 @@ export default { this.queryParam = {} this.initDetailInfo() }, + // 清除选中状态 + clearSelect () { + this.selectedTreeKeys = [] + this.hightMenuId = null + this.clauseLabelInfo = {} + }, /** * 拖拽回调 * @param min - 拖拽最小宽度 @@ -349,10 +355,14 @@ export default { } previewDocSplit(params).then(res => { if (res.success) { + // 清除选中状态 + this.clearSelect() const data = res.result || {} this.treeData = data.sarFileSplitMenuEO || [] this.spiltInfo = data.documentSplitInfo || {} this.clauseContentList = data.documentSplitDetail || [] + } else { + this.$message.warn(res.message) } }).finally(() => { this.loading = false From 83672551f2fea176ef18b9efe0aa44e174e78bf0 Mon Sep 17 00:00:00 2001 From: danshihao Date: Mon, 5 Aug 2024 14:10:00 +0800 Subject: [PATCH 039/194] =?UTF-8?q?[update=20=E9=AB=98=E7=BA=A7=E6=90=9C?= =?UTF-8?q?=E7=B4=A2]=20=E5=8E=BB=E6=8E=89=E9=80=82=E7=94=A8=E9=9B=B6?= =?UTF-8?q?=E9=83=A8=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/search/AdvancedSearch.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/dashboard/search/AdvancedSearch.vue b/src/views/dashboard/search/AdvancedSearch.vue index c3ca176..ae399f3 100644 --- a/src/views/dashboard/search/AdvancedSearch.vue +++ b/src/views/dashboard/search/AdvancedSearch.vue @@ -386,13 +386,13 @@ export default { dataIndex: 'item_content', scopedSlots: { customRender: 'item_content' } }, - { // 适用零部件 - title: this.$t('dashboard.advancedSearch.applicableComponents'), - align: 'center', - width: 180, - dataIndex: 'applicable_components', - scopedSlots: { customRender: 'text' } - }, + // { // 适用零部件 + // title: this.$t('dashboard.advancedSearch.applicableComponents'), + // align: 'center', + // width: 180, + // dataIndex: 'applicable_components', + // scopedSlots: { customRender: 'text' } + // }, { // 新生产车实施日期 title: this.$t('dashboard.advancedSearch.newProduceVehiclesImplementationDate'), align: 'center', From d67cb44cb1cc34159b938ce4a11dde213529a71e Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 5 Aug 2024 15:09:20 +0800 Subject: [PATCH 040/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug88088,?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=96=B0=E5=A2=9E=E4=B8=8A=E4=BC=A0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=8C=89=E9=92=AE=E6=9C=89=E9=81=AE=E6=8C=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standard/modules/EnterpriseStandardModal.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue b/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue index 02b33f0..dcd0755 100644 --- a/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue +++ b/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue @@ -100,7 +100,7 @@ export default { StandardSource, visible: false, title: '', - width: 800, + width: '50%', // 存储表单的数据 form: {}, confirmLoading: false, @@ -252,4 +252,8 @@ export default { .check-content-table { padding-bottom: 40px; } + +/deep/ .ant-drawer-content-wrapper { + min-width: 800px; +} From c18bf8fd7d87b537daba0f255215321b845737c5 Mon Sep 17 00:00:00 2001 From: danshihao Date: Mon, 5 Aug 2024 15:19:28 +0800 Subject: [PATCH 041/194] =?UTF-8?q?[update=2088021]=20=E9=80=82=E7=94=A8?= =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=9B=B4=E6=96=B0=E5=90=8E=E5=86=8D=E5=8E=BB?= =?UTF-8?q?=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardMasterPlan/modules/StandardMasterPlanModal.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue b/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue index 9aaa547..45e11b0 100644 --- a/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue +++ b/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue @@ -705,6 +705,7 @@ export default { return } const formData = this.form.getFieldsValue() + console.log('2适用市场', formData.base.applicableMarket) if (formData.base.applicableMarket && this.model.standardId) { this.confirmLoading = true getStandardMasterPlanAddEcho({ @@ -881,7 +882,10 @@ export default { * 适用市场改变 */ changeApplicableMarket (value) { - this.updatePageInfo() + console.log('1适用市场', value) + this.$nextTick(() => { + this.updatePageInfo() + }) }, /** * 选择用户得到用户名 From 076e178f1128793842432cab03158af4f62e7ea2 Mon Sep 17 00:00:00 2001 From: danshihao Date: Mon, 5 Aug 2024 15:31:53 +0800 Subject: [PATCH 042/194] =?UTF-8?q?[update=2088093]=20=E8=A7=A3=E8=AF=BB?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=A1=A8=E5=8D=95=E6=8F=90=E7=A4=BA=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/InterpretationClauseTableModal.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal.vue index 39fa820..65299cd 100644 --- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal.vue +++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal.vue @@ -65,7 +65,7 @@ - - - - - @@ -160,7 +160,7 @@ Date: Mon, 5 Aug 2024 17:05:42 +0800 Subject: [PATCH 043/194] =?UTF-8?q?[update=20=E9=A3=9E=E4=B9=A6=E5=8D=95?= =?UTF-8?q?=E7=82=B9=E7=99=BB=E5=BD=95]=20=E8=A7=A3=E5=86=B3=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=8A=9E=E7=90=86=E5=AE=8Cgo(-1)=E4=BC=9A=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E4=B8=AD=E8=BD=AC=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/permission.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/permission.js b/src/permission.js index fcbead3..8d90252 100644 --- a/src/permission.js +++ b/src/permission.js @@ -37,7 +37,11 @@ router.beforeEach(async (to, from, next) => { } else if (to.query.code && to.query.state === 'feishu') { // 如果没有登录，state是飞书，并且有code，就请求飞书单点登录 await store.dispatch('FeiShuLogin', to.query.code).catch((e) => { - this.$message.warn(e.message) + // 从飞书跳转进来，正常提示，系统内跳转进来不提示（解决用了replace,但是go(-1)还会跳转回来） + if (from.path === '/') { + Vue.prototype.$message.warning(e.message, 3) + } + next({ path: '/user/login', replace: true }) }) } else if (to.query.code) { // 研发大前台单点登录 From 16511cd88f1e3a55204b2ea04da9d4ee05955c20 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 5 Aug 2024 17:22:38 +0800 Subject: [PATCH 044/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug87997?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/enums/commonEnums.js | 4 ++-- src/views/system/UserList.vue | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index 028b5e5..0701038 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -255,8 +255,8 @@ export const OcrConvertStateEnums = { // 用户管理来源 export const UserSource = { - IAM: { text: 'IAM', value: '1' }, - SYSTEMADD: { text: '系统新增', value: '2' } + IAM: { text: 'IAM', value: '2' }, + SYSTEMADD: { text: '系统新增', value: '1' } } /** diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue index 8d805c6..38482cf 100644 --- a/src/views/system/UserList.vue +++ b/src/views/system/UserList.vue @@ -305,8 +305,8 @@ export default { clickEvent: 'handleEdit', has: 'user:edit', show: (record) => { - // IAM同步过来的不能编辑 - return record.source !== UserSource.IAM.value + // 系统新增的才可以修改 + return record.source === UserSource.SYSTEMADD.value } }, // 详情 @@ -321,8 +321,8 @@ export default { clickEvent: 'handleChangePassword', has: '', show: (record) => { - // IAM同步过来的不能编辑 - return record.source !== UserSource.IAM.value + // 系统新增的才可以修改 + return record.source === UserSource.SYSTEMADD.value } }, // 删除 @@ -331,8 +331,8 @@ export default { clickEvent: 'handleDelete', has: 'sys:user:sel', show: (record) => { - // IAM同步过来的不能删除 - return record.source !== UserSource.IAM.value + // 系统新增的才可以删除 + return record.source === UserSource.SYSTEMADD.value } }, // 冻结 From c1dcb53015652d426d45076460f1db14b1d20e89 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 5 Aug 2024 17:24:04 +0800 Subject: [PATCH 045/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug87997?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/UserList.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue index 38482cf..8d805c6 100644 --- a/src/views/system/UserList.vue +++ b/src/views/system/UserList.vue @@ -305,8 +305,8 @@ export default { clickEvent: 'handleEdit', has: 'user:edit', show: (record) => { - // 系统新增的才可以修改 - return record.source === UserSource.SYSTEMADD.value + // IAM同步过来的不能编辑 + return record.source !== UserSource.IAM.value } }, // 详情 @@ -321,8 +321,8 @@ export default { clickEvent: 'handleChangePassword', has: '', show: (record) => { - // 系统新增的才可以修改 - return record.source === UserSource.SYSTEMADD.value + // IAM同步过来的不能编辑 + return record.source !== UserSource.IAM.value } }, // 删除 @@ -331,8 +331,8 @@ export default { clickEvent: 'handleDelete', has: 'sys:user:sel', show: (record) => { - // 系统新增的才可以删除 - return record.source === UserSource.SYSTEMADD.value + // IAM同步过来的不能删除 + return record.source !== UserSource.IAM.value } }, // 冻结 From 7c99a60a63a45de552e6c333f36737f70308f79f Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 5 Aug 2024 17:37:08 +0800 Subject: [PATCH 046/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug87734?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/DictList.vue | 3 ++- src/views/system/RoleUserList.vue | 4 ++-- src/views/system/UserList.vue | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/views/system/DictList.vue b/src/views/system/DictList.vue index 5437976..a16e9d9 100644 --- a/src/views/system/DictList.vue +++ b/src/views/system/DictList.vue @@ -158,7 +158,8 @@ export default { // 字典配置 { text: this.$t('system.tag.dictionaryConfiguration'), - clickEvent: 'editDictItem' + clickEvent: 'editDictItem', + has: 'sys:dict:set' }, // 编辑 { diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue index 1e0b880..896dcbc 100644 --- a/src/views/system/RoleUserList.vue +++ b/src/views/system/RoleUserList.vue @@ -277,13 +277,13 @@ export default { { text: this.$t('roleManage.userBtn'), clickEvent: 'handleOpen', - has: '' + has: 'sys:role:user' }, // 授权 { text: this.$t('roleManage.toGrantAuthorization'), clickEvent: 'handlePerssion', - has: '' + has: 'sys:role:permission' }, // 编辑 { diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue index 8d805c6..e73646e 100644 --- a/src/views/system/UserList.vue +++ b/src/views/system/UserList.vue @@ -313,13 +313,13 @@ export default { { text: this.$t('details'), clickEvent: 'handleDetail', - has: '' + has: 'user:detail' }, // 密码 { text: this.$t('user.password'), clickEvent: 'handleChangePassword', - has: '', + has: 'user:password', show: (record) => { // IAM同步过来的不能编辑 return record.source !== UserSource.IAM.value From 8e838a334a0cb1f6b477a42a9fcd47e6406fad11 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 5 Aug 2024 17:42:53 +0800 Subject: [PATCH 047/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug87727?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/EngineerInitBaseInfo.vue | 2 +- .../regulatoryComplianceCheckProcess/modules/ManualAddModal.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue index ce5e7a8..167c256 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/EngineerInitBaseInfo.vue @@ -91,7 +91,7 @@ diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/ManualAddModal.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/ManualAddModal.vue index 2067773..a06355e 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/ManualAddModal.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/ManualAddModal.vue @@ -62,7 +62,7 @@ :label="$t('workCenter.regulatoryComplianceCheckProcess.resolutionAttachment')"> Date: Mon, 5 Aug 2024 17:44:22 +0800 Subject: [PATCH 048/194] =?UTF-8?q?[update=2088055]=20=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E6=A3=80=E7=B4=A2=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/search/AdvancedSearch.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/dashboard/search/AdvancedSearch.vue b/src/views/dashboard/search/AdvancedSearch.vue index ae399f3..0883213 100644 --- a/src/views/dashboard/search/AdvancedSearch.vue +++ b/src/views/dashboard/search/AdvancedSearch.vue @@ -418,7 +418,7 @@ export default { title: this.$t('dashboard.advancedSearch.keywords'), align: 'center', width: 180, - dataIndex: 'keywords', + dataIndex: 'part_name_dictText', scopedSlots: { customRender: 'text' } }, { // 责任部门 From ad7562389eb973faad4d5aee76e2f8c25de84cc2 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Mon, 5 Aug 2024 17:45:23 +0800 Subject: [PATCH 049/194] =?UTF-8?q?[update]=20=E9=83=A8=E7=BD=B2=20?= =?UTF-8?q?=E5=8D=95=E7=82=B9=E7=99=BB=E5=BD=95=E8=B7=B3=E8=BD=AC=E7=9A=84?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.production b/.env.production index 6577fe0..83c2f1f 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ NODE_ENV=production VUE_APP_TAG_FLAG=1 -VUE_APP_LOGIN_PAGE='https://iamuat.mychery.com:5443/idp/oauth2/authorize?redirect_uri=http://srms.sinotruk.com/dashboard/analysis&state=123&client_id=CGRSM&response_type=code' +VUE_APP_LOGIN_PAGE='https://iamuat.mychery.com:5443/idp/oauth2/authorize?redirect_uri=http://10.2.16.8:3344/dashboard/analysis&state=123&client_id=CGRSM&response_type=code' VUE_APP_CURRENT_SYSTEM='IAM' -VUE_APP_LOGOUT_PAGE='https://iamuat.mychery.com:5443/idp/profile/OAUTH2/Redirect/GLO?redirctToUrl=http://srms.sinotruk.com/dashboard/analysis&redirectToLogin=true&entityId=CGRSM' \ No newline at end of file +VUE_APP_LOGOUT_PAGE='https://iamuat.mychery.com:5443/idp/profile/OAUTH2/Redirect/GLO?redirctToUrl=http://10.2.16.8:3344/dashboard/analysis&redirectToLogin=true&entityId=CGRSM' \ No newline at end of file From 39a84c6408c1fc5566992439a25c8882579fd763 Mon Sep 17 00:00:00 2001 From: danshihao Date: Mon, 5 Aug 2024 19:43:05 +0800 Subject: [PATCH 050/194] =?UTF-8?q?[update=2087469]=20=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/page/GlobalLayout.vue | 6 +- src/views/dashboard/Analysis.vue | 75 ++++++++----- .../dashboard/modules/FriendLinkCard.vue | 22 ++-- .../dashboard/modules/QuickEnterCard.vue | 16 ++- src/views/dashboard/modules/RetrievalCard.vue | 33 +++--- .../modules/SearchAndWarningCard.vue | 105 +++++++++++++++++- src/views/dashboard/modules/ToDoTaskCard.vue | 12 +- 7 files changed, 199 insertions(+), 70 deletions(-) diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue index d089bdd..d5cc494 100644 --- a/src/components/page/GlobalLayout.vue +++ b/src/components/page/GlobalLayout.vue @@ -285,9 +285,9 @@ body { } .trigger { - font-size: 22px; - line-height: 42px; - padding: 0 18px; + font-size: 12px; + //line-height: 42px; + padding: 22px; cursor: pointer; transition: color 300ms, background 300ms; diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue index 762288b..e38f062 100644 --- a/src/views/dashboard/Analysis.vue +++ b/src/views/dashboard/Analysis.vue @@ -3,26 +3,16 @@
- - - - - - - - - - - - - - - - - - - - + + + + + + + + + +
@@ -46,14 +36,45 @@ export default { @import '~@assets/less/common.less'; .all-wrapper { - padding: 20px 8px 0; -} -.flex-item { - margin: 10px; -} -.mb-20 { - margin-bottom: 20px; + padding: 8px 8px 0; + display: grid; + width: 100%; + height: calc(100vh - 60px - 8px - 20px); + grid-gap: 20px; + grid-template-columns: 0.4fr 0.6fr; + grid-template-rows: 56px 180px minmax(200px, auto) 180px; + grid-template-areas: 'Search Search' + 'QuickEntrance QuickEntrance' + 'Todo Table' + 'Link Table'; + + .home-search, + .home-quick-entrance, + .home-todo, + .home-link, + .home-table{ + height: 100%; + overflow: hidden; + border-radius: 8px; + } + .home-search { + grid-area: Search; + overflow: visible; + } + .home-quick-entrance { + grid-area: QuickEntrance; + } + .home-todo { + grid-area: Todo; + } + .home-link { + grid-area: Link; + } + .home-table { + grid-area: Table; + } } + /deep/ .top-wrapper { display: flex; align-items: center; diff --git a/src/views/dashboard/modules/FriendLinkCard.vue b/src/views/dashboard/modules/FriendLinkCard.vue index 10264ad..f084d0c 100644 --- a/src/views/dashboard/modules/FriendLinkCard.vue +++ b/src/views/dashboard/modules/FriendLinkCard.vue @@ -1,5 +1,5 @@ diff --git a/src/views/dashboard/modules/SearchAndWarningCard.vue b/src/views/dashboard/modules/SearchAndWarningCard.vue index 8fe1108..6c6233f 100644 --- a/src/views/dashboard/modules/SearchAndWarningCard.vue +++ b/src/views/dashboard/modules/SearchAndWarningCard.vue @@ -12,7 +12,7 @@ size="middle" :rowKey="(_, index) => index" class="table" - :scroll="{ x: '100%', y: '40vh' }" + :scroll="{ x: '100%', y: 'calc(100vh - 550px)' }" :columns="showColumns" :dataSource="dataSource" :pagination="ipagination" @@ -32,6 +32,14 @@
{{ global.emptyLine }}
+ + From e123769247b79cbaec41f8700b3a8a84197d2499 Mon Sep 17 00:00:00 2001 From: danshihao Date: Wed, 7 Aug 2024 19:18:05 +0800 Subject: [PATCH 085/194] =?UTF-8?q?[update=2088199]=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/documentToolApi.js | 7 ++- src/components/StandardResolutionSheet.vue | 50 ++++++++++++++++++---- 2 files changed, 48 insertions(+), 9 deletions(-) diff --git a/src/api/documentToolApi.js b/src/api/documentToolApi.js index b9f25ce..0fc8448 100644 --- a/src/api/documentToolApi.js +++ b/src/api/documentToolApi.js @@ -103,6 +103,9 @@ const editMaintainList = (params) => postAction('/customCompare/lawsCustomCompar // 自定义比对-对比分析结果保存 const editComparsionResult = (params) => postAction('/customCompare/lawsCustomCompareInfo/saveCellCompareResult', params) +// 涉及系统部件下拉 +const getInvolvedSystem = (params) => getAction('/laws/standard/partName/', params) + export { // 文档拆分 releaseSplitStandard, @@ -159,5 +162,7 @@ export { getTableData, getMaintainList, editMaintainList, - editComparsionResult + editComparsionResult, + + getInvolvedSystem } diff --git a/src/components/StandardResolutionSheet.vue b/src/components/StandardResolutionSheet.vue index 5a76a21..74a8bbc 100644 --- a/src/components/StandardResolutionSheet.vue +++ b/src/components/StandardResolutionSheet.vue @@ -4,18 +4,30 @@
- + - - + + - + + + @@ -111,7 +123,7 @@
-
+
diff --git a/src/components/selection/TreeDataSelection.vue b/src/components/selection/TreeDataSelection.vue index 33aeb5f..d0bdd22 100644 --- a/src/components/selection/TreeDataSelection.vue +++ b/src/components/selection/TreeDataSelection.vue @@ -1,18 +1,19 @@ @@ -38,35 +39,13 @@ export default { required: false, default: false }, - // 自定义返回字段，默认返回 id - customReturnField: { - type: String, - default: '' - }, // 获取数据的接口 optionsHref: { type: String, required: false, default: '' }, - // 是否返回选中的对象 - backObj: { - type: Boolean, - default: false, - required: false - }, - // 存储字段 [key field] - storeField: { - type: String, - default: 'id', - required: false - }, - // 显示字段 [label field] - textField: { - type: String, - default: 'name', - required: false - }, + // 名称字符串 nameStr: { type: String, required: false, @@ -83,66 +62,40 @@ export default { default: '' } }, + watch: { + nameStr: { + immediate: true, + handler (val) { + console.log('----------nameStr', val) + } + } + }, data () { return { visible: false, - confirmLoading: false, - storeVals: '', // [key values] - textVals: '' // [label values] - } - }, - mounted () { - this.storeVals = this.value - }, - watch: { - value (val) { - this.storeVals = val + confirmLoading: false } }, methods: { - // 返回选中的部门信息 - backObjInfo () { - if (this.backObj === true) { - if (this.storeVals && this.storeVals.length > 0) { - const arr1 = this.storeVals.split(',') - const arr2 = this.textVals.split(',') - const info = [] - for (let i = 0; i < arr1.length; i++) { - info.push({ - value: arr1[i], - text: arr2[i] - }) - } - this.$emit('back', info) - } - } - }, openModal () { this.$refs.selectModal.show() }, - handleOK (rows) { - if (!rows && rows.length <= 0) { - this.textVals = '' - this.storeVals = '' - } else { - const arr1 = [] - const arr2 = [] - for (const dep of rows) { - arr1.push(dep[this.storeField]) - arr2.push(dep[this.textField]) - } - this.storeVals = arr1.join(',') - this.textVals = arr2.join(',') - } - this.$emit('change', this.storeVals) - this.$emit('nameChange', this.textVals, this.fieldName) - this.backObjInfo() + handleChange (value) { + this.$emit('change', value, this.fieldName) + }, + nameChange (value) { + this.$emit('nameChange', value, this.fieldName) + }, + listChange (value) { + this.$emit('listChange', value, this.fieldName) }, handleEmpty () { if (this.disabled) { return } - this.handleOK('') + this.handleChange('') + this.nameChange('') + this.listChange([]) } }, model: { From f77d0096052711495c677bd709ad8ca24a880f20 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Wed, 7 Aug 2024 21:57:48 +0800 Subject: [PATCH 091/194] =?UTF-8?q?[fix=20bug]=20=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E5=9B=9E=E6=98=BE=E7=9A=84?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/lang/businessSupport/en.js | 2 +- src/common/lang/en-us.js | 6 +++--- src/store/modules/user.js | 6 +++--- src/views/system/RoleUserList.vue | 3 ++- src/views/system/UserAnnouncementList.vue | 2 +- src/views/system/UserList.vue | 6 ++++-- src/views/system/modules/SelectUserModal.vue | 3 ++- src/views/system/tags/pages/ClauseSplittingList.vue | 2 +- src/views/system/tags/pages/StandardList.vue | 2 +- src/views/system/tags/pages/TagContent.vue | 2 +- 10 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/common/lang/businessSupport/en.js b/src/common/lang/businessSupport/en.js index 6a0fa03..9aa013a 100644 --- a/src/common/lang/businessSupport/en.js +++ b/src/common/lang/businessSupport/en.js @@ -45,7 +45,7 @@ module.exports = { poster: 'Poster', answerNum: 'replies', top: '【top】', - cancelTop: 'untop', + cancelTop: 'Cancel Top up', setTop: 'Set To Top', answerQuestion: 'reply to a question', word: 'word', diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 8c1f7e9..a17eab1 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -621,7 +621,7 @@ module.exports = { // OCR文本识别 ocrTextRecognition: { upload: 'Upload', - getFile: 'Get files', + getFile: 'Get Files', standardCategory: 'Regulation Category', standardNumber: 'Regulation No.', standardName: 'Regulation Name', @@ -646,9 +646,9 @@ module.exports = { // 我的消息 my: { myMessage: 'My Message', - title: 'title', + title: 'Title', publisher: 'publisher', - readingStatus: 'readingStatus', + readingStatus: 'Reading Status', messageContent: 'Message Content', messageType: 'Message Type', allLabelsRead: 'All Mark as Read', diff --git a/src/store/modules/user.js b/src/store/modules/user.js index cdc24bd..bf7194f 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -144,9 +144,9 @@ const user = { GetPermissionList ({ commit }) { return new Promise((resolve, reject) => { queryPermissionsByUser().then(response => { - const menuData = response.result.menu - const authData = response.result.auth - const allAuthData = response.result.allAuth + const menuData = (response.result || {}).menu || [] + const authData = (response.result || {}).auth || [] + const allAuthData = (response.result || {}).allAuth // Vue.ls.set(USER_AUTH,authData); sessionStorage.setItem(USER_AUTH, JSON.stringify(authData)) sessionStorage.setItem(SYS_BUTTON_AUTH, JSON.stringify(allAuthData)) diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue index 896dcbc..6e1f3cb 100644 --- a/src/views/system/RoleUserList.vue +++ b/src/views/system/RoleUserList.vue @@ -247,7 +247,8 @@ export default { title: this.$t('status'), align: 'center', width: 80, - dataIndex: 'status_dictText' + dataIndex: 'status_dictText', + scopedSlots: { customRender: 'dictText' } }, { diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue index 29d01d2..bf035f4 100644 --- a/src/views/system/UserAnnouncementList.vue +++ b/src/views/system/UserAnnouncementList.vue @@ -142,7 +142,7 @@ export default { align: 'center', dataIndex: 'msgCategory_dictText', width: 150, - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'dictText' } }, { title: this.$t('message.my.publisher'), diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue index e73646e..d7dbd1d 100644 --- a/src/views/system/UserList.vue +++ b/src/views/system/UserList.vue @@ -239,7 +239,8 @@ export default { align: 'center', width: 90, dataIndex: 'sex_dictText', - sorter: true + sorter: true, + scopedSlots: { customRender: 'dictText' } }, { title: this.$t('phoneNumber'), @@ -275,7 +276,8 @@ export default { title: this.$t('status'), align: 'center', width: 80, - dataIndex: 'status_dictText' + dataIndex: 'status_dictText', + scopedSlots: { customRender: 'dictText' } }, { title: this.$t('operation'), diff --git a/src/views/system/modules/SelectUserModal.vue b/src/views/system/modules/SelectUserModal.vue index c8ef27b..040bc30 100644 --- a/src/views/system/modules/SelectUserModal.vue +++ b/src/views/system/modules/SelectUserModal.vue @@ -100,7 +100,8 @@ export default { title: this.$t('user.gender'), align: 'center', width: 100, - dataIndex: 'sex_dictText' + dataIndex: 'sex_dictText', + scopedSlots: { customRender: 'dictText' } }, { title: this.$t('phoneNumber'), diff --git a/src/views/system/tags/pages/ClauseSplittingList.vue b/src/views/system/tags/pages/ClauseSplittingList.vue index 7e01624..4c1a90e 100644 --- a/src/views/system/tags/pages/ClauseSplittingList.vue +++ b/src/views/system/tags/pages/ClauseSplittingList.vue @@ -103,7 +103,7 @@ export default { align: 'center', width: 100, dataIndex: 'fieldShowType_dictText', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'dictText' } }, { title: this.$t('system.tag.fieldLength'), diff --git a/src/views/system/tags/pages/StandardList.vue b/src/views/system/tags/pages/StandardList.vue index 6d4e80b..a96ee18 100644 --- a/src/views/system/tags/pages/StandardList.vue +++ b/src/views/system/tags/pages/StandardList.vue @@ -136,7 +136,7 @@ export default { title: this.$t('system.tag.attributeType'), width: 100, dataIndex: 'fieldShowType_dictText', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'dictText' } }, { title: this.$t('system.tag.fieldLength'), diff --git a/src/views/system/tags/pages/TagContent.vue b/src/views/system/tags/pages/TagContent.vue index 28e98c7..083b185 100644 --- a/src/views/system/tags/pages/TagContent.vue +++ b/src/views/system/tags/pages/TagContent.vue @@ -96,7 +96,7 @@ export default { align: 'center', width: 100, dataIndex: 'attributeType_dictText', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'dictText' } }, { title: this.$t('system.tag.describe'), From c6304795ae9f8aabc0d800144826db3faaa7200d Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Wed, 7 Aug 2024 22:13:33 +0800 Subject: [PATCH 092/194] =?UTF-8?q?[fix=20bug]=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=20=E6=8D=A2=E6=8E=89?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=A7=92=E8=89=B2=E5=92=8C=E6=80=A7=E5=88=AB?= =?UTF-8?q?=E7=9A=84=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/lang/en-us.js | 2 +- src/views/system/modules/UserModal.vue | 45 +++++++++++++++++++------- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index a17eab1..765cab3 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -83,7 +83,7 @@ module.exports = { expandAll: 'Expand All', mergeAll: 'Drop All', treeOperation: 'Tree Operation', - creator: 'Created by', + creator: 'Creator', sort: 'Order', address: 'Address', remarks: 'Comments', diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue index e4a838f..03f2005 100644 --- a/src/views/system/modules/UserModal.vue +++ b/src/views/system/modules/UserModal.vue @@ -65,12 +65,24 @@ :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!roleDisabled"> - + + + + + + - + mode="tags" + :filter-option="filterOption" + > + + {{ item.label }} + + @@ -128,13 +140,21 @@ - - {{ $t('user.male') }} - {{ $t('user.female') }} - + + + + + + + + + @@ -270,6 +290,9 @@ export default { } }, methods: { + filterOption (input, option) { + return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }, add () { this.refresh() this.validatorRules.phone = [{ validator: this.validatePhone }] @@ -283,7 +306,7 @@ export default { // 根据屏幕宽度自适应抽屉宽度 this.resetScreenSize() that.model = Object.assign({}, { - selectedroles: '', + selectedroles: undefined, selecteddeparts: '' }, record) // 身份为上级显示负责部门，否则不显示 From 3b7532aaa67144495a345765adf2cecc6af54b54 Mon Sep 17 00:00:00 2001 From: danshihao Date: Thu, 8 Aug 2024 08:56:56 +0800 Subject: [PATCH 093/194] =?UTF-8?q?[update=20=E9=A6=96=E9=A1=B5]=20?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/search/AdvancedSearch.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/dashboard/search/AdvancedSearch.vue b/src/views/dashboard/search/AdvancedSearch.vue index 9709ec1..92951e0 100644 --- a/src/views/dashboard/search/AdvancedSearch.vue +++ b/src/views/dashboard/search/AdvancedSearch.vue @@ -63,7 +63,6 @@ From b78de96fdcc4dc8a07dae1eaae7cf11054efb7b0 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 8 Aug 2024 09:15:18 +0800 Subject: [PATCH 094/194] =?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/selection/TreeDataSelectModal.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/selection/TreeDataSelectModal.vue b/src/components/selection/TreeDataSelectModal.vue index 34abbdd..ae1a996 100644 --- a/src/components/selection/TreeDataSelectModal.vue +++ b/src/components/selection/TreeDataSelectModal.vue @@ -136,7 +136,7 @@ export default { immediate: true, handler (val) { console.log('-------------optionsHref', val) - if (val === '/laws/standard/partName/') { + if (val === '/laws/standard/partName/queryFirstList') { // 是涉及系统/部件 this.replaceFields = { children: 'childPartNameList', title: 'name', key: 'id' } this.lazyLoadHref = '/laws/standard/partName/getChild' @@ -416,7 +416,7 @@ export default { } let url // 涉及系统/部件 - if (this.optionsHref === '/laws/standard/partName/') { + if (this.optionsHref === '/laws/standard/partName/queryFirstList') { url = '/laws/standard/partName/echo' } else { // 标签库 // url = '/laws/lawsLabelDatabase/queryByCodes' From 39216c71dcf17c35f36af07c7c27c7a95c0f329a Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 8 Aug 2024 09:18:48 +0800 Subject: [PATCH 095/194] =?UTF-8?q?[update]=20=E9=A6=96=E9=A1=B5=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E5=85=A5=E5=BA=93=E4=BC=81=E6=A0=87=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E4=BB=A3=E6=9B=BF=E6=A0=87=E5=87=86=E7=BC=96=E5=8F=B7=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/modules/SearchAndWarningCard.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/dashboard/modules/SearchAndWarningCard.vue b/src/views/dashboard/modules/SearchAndWarningCard.vue index 26162eb..31c04d9 100644 --- a/src/views/dashboard/modules/SearchAndWarningCard.vue +++ b/src/views/dashboard/modules/SearchAndWarningCard.vue @@ -231,7 +231,7 @@ export default { { // 代替标准编号 title: this.$t('dashboard.tableList.substituteStandardNumber'), align: 'left', - dataIndex: 'substituteStandardNumber', + dataIndex: 'replacedByStandardNumber', width: 100, scopedSlots: { customRender: 'text' }, show: () => { From acb4840c8e96509366f1a695c550228573b5e489 Mon Sep 17 00:00:00 2001 From: danshihao Date: Thu, 8 Aug 2024 09:45:45 +0800 Subject: [PATCH 096/194] =?UTF-8?q?[update=20=E5=8F=8B=E6=83=85=E9=93=BE?= =?UTF-8?q?=E6=8E=A5]=20=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/firendshipLinkManage/FriendshipLinkList.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/system/firendshipLinkManage/FriendshipLinkList.vue b/src/views/system/firendshipLinkManage/FriendshipLinkList.vue index c66ff57..1d7364a 100644 --- a/src/views/system/firendshipLinkManage/FriendshipLinkList.vue +++ b/src/views/system/firendshipLinkManage/FriendshipLinkList.vue @@ -89,6 +89,11 @@ export default { mixins: [JeroListMixin], data () { return { + /* 排序参数 */ + isorter: { + column: 'sort', + order: 'asc' + }, columns: [ { title: this.$t('serialNumber'), From b27d9987a2cf89134c1a4fb42ea17b64f7f20d01 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 8 Aug 2024 09:48:47 +0800 Subject: [PATCH 097/194] =?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 --- .../selection/TreeDataSelectModal.vue | 28 +++++++++---------- .../selection/TreeDataSelection.vue | 1 - 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/components/selection/TreeDataSelectModal.vue b/src/components/selection/TreeDataSelectModal.vue index ae1a996..8101047 100644 --- a/src/components/selection/TreeDataSelectModal.vue +++ b/src/components/selection/TreeDataSelectModal.vue @@ -48,15 +48,16 @@ + + + + + + + + + @@ -144,10 +154,11 @@ import NonmatchItemCloseModal from './modules/NonmatchItemCloseModal' import NonmatchItemLookModal from './modules/NonmatchItemLookModal' import { queryDepartTreeList } from '../../../api/api' import UploadFile from '@/components/UploadFile' +import SplitClauseDetail from '../../documentTool/documentSplit/modules/SplitClauseDetail' export default { name: 'NonmatchItemList', - components: { JTable, NonmatchItemCloseModal, NonmatchItemLookModal, UploadFile }, + components: { JTable, NonmatchItemCloseModal, NonmatchItemLookModal, UploadFile, SplitClauseDetail }, mixins: [JeroListMixin], data () { return { @@ -194,7 +205,7 @@ export default { align: 'center', width: 180, dataIndex: 'termContent', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'item_content' } }, { // 责任部门 title: this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.responsibleDepartment'), @@ -320,6 +331,10 @@ export default { } }) }, + // 显示条款内容弹框 + showContent (val) { + this.$refs.splitClauseDetail.open(val) + }, // 批量关闭 batchClose () { if (this.selectedRowKeys.length <= 0) { diff --git a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue index e541e6b..9f2e88c 100644 --- a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue +++ b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue @@ -91,6 +91,14 @@ + + + @@ -115,10 +125,11 @@ import { JeroListMixin } from '@/mixins/JeroListMixin' import { queryDepartTreeList } from '../../../../api/api' import UploadFile from '@/components/UploadFile' +import SplitClauseDetail from '../../../documentTool/documentSplit/modules/SplitClauseDetail' export default { name: 'AssessmentLookModal', - components: { UploadFile }, + components: { UploadFile, SplitClauseDetail }, mixins: [JeroListMixin], data () { return { @@ -148,7 +159,7 @@ export default { align: 'center', width: 180, dataIndex: 'termContent', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'item_content' } }, { // 车型 title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.vehicleType'), @@ -269,6 +280,10 @@ export default { } }) }, + // 显示条款内容弹框 + showContent (val) { + this.$refs.splitClauseDetail.open(val) + }, filterTreeOption (input, option) { const text = option.componentOptions.propsData.title || option.componentOptions.propsData.label return text.toLowerCase().indexOf(input.toLowerCase()) >= 0 From 9e37dbeab92716dd8f15eddae89f17fa5b2fd11e Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 12 Aug 2024 10:57:23 +0800 Subject: [PATCH 164/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug88407?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/jero/JUpload.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/jero/JUpload.vue b/src/components/jero/JUpload.vue index 8bdb352..bd79009 100644 --- a/src/components/jero/JUpload.vue +++ b/src/components/jero/JUpload.vue @@ -375,7 +375,7 @@ export default { if (!info.file.status && this.uploadGoOn === false) { info.fileList.pop() } - let fileList = info.fileList + let fileList = info.fileList.filter(item => item.uploadGoOn) if (info.file.status === 'done') { if (this.number > 0) { fileList = fileList.slice(-this.number) From 981d062d1221d3e9ced28ce2aa6a050e63ec0a7f Mon Sep 17 00:00:00 2001 From: danshihao Date: Mon, 12 Aug 2024 11:56:05 +0800 Subject: [PATCH 165/194] =?UTF-8?q?[update=20=E6=A0=87=E5=87=86=E8=A7=A3?= =?UTF-8?q?=E8=AF=BB]=20=E5=8F=96=E6=9C=80=E6=96=B0=E7=9A=84=E8=A7=A3?= =?UTF-8?q?=E8=AF=BB=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/StandardResolutionSheet.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/StandardResolutionSheet.vue b/src/components/StandardResolutionSheet.vue index 914815e..73bf0a5 100644 --- a/src/components/StandardResolutionSheet.vue +++ b/src/components/StandardResolutionSheet.vue @@ -287,7 +287,9 @@ export default { this.loading = true getStandardInterpretation({ standard_id: this.spiltInfo.standardId }).then(res => { if (res.success) { - this.standardInterpret = res.result[0] || {} + const list = res.result || [] + // 后端说id是随时间递增的，取最新数据也就是取id最大的数据 + this.standardInterpret = list.sort((a, b) => b - a)[0] || {} this.selectedTreeKeys = [] this.hightMenuId = null this.clauseLabelInfo = this.standardInterpret From 1d1e445372055c64a730db63a7e88a18430101ea Mon Sep 17 00:00:00 2001 From: danshihao Date: Mon, 12 Aug 2024 13:36:58 +0800 Subject: [PATCH 166/194] =?UTF-8?q?[update=2088398]=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=AF=94=E5=AF=B9=EF=BC=8C=E5=8F=91=E5=B8=83=E6=97=B6=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/lang/en-us.js | 1 + src/common/lang/zh-cn.js | 1 + .../documentTool/documentComparison/DocumentComparison.vue | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 19773d0..1a2fa9d 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -125,6 +125,7 @@ module.exports = { confirmWithdraw: 'Confirm to Withdraw?', confirmWithdrawContent: 'Confirm the withdrawal of this data？', doNotHavePermissionDeleteData: 'Do not have permission to delete this data', + publishedAndCannotDeleted: 'Published and cannot be deleted', noData: 'No Data', dataLoading: 'Data loading...', confirmDelete: 'Confirm the listing title you want to delete?', diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 579c39d..9e98c2c 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -125,6 +125,7 @@ module.exports = { confirmWithdraw: '确认撤回？', confirmWithdrawContent: '确认撤回该条数据？', doNotHavePermissionDeleteData: '没有权限删除此数据', + publishedAndCannotDeleted: '已发布不能删除', noData: '暂无数据', dataLoading: '数据加载中...', confirmDelete: '确定删除?', diff --git a/src/views/documentTool/documentComparison/DocumentComparison.vue b/src/views/documentTool/documentComparison/DocumentComparison.vue index 55289a5..ea70380 100644 --- a/src/views/documentTool/documentComparison/DocumentComparison.vue +++ b/src/views/documentTool/documentComparison/DocumentComparison.vue @@ -259,6 +259,11 @@ export default { onOk: () => { const idList = [] const selectionRows = JSON.parse(JSON.stringify(this.selectionRows)) + // 发布状态不能删除 + if (selectionRows.some(item => item.releaseState !== 'draft')) { + this.$message.warning(this.$t('publishedAndCannotDeleted')) + return + } for (let i = 0; i < selectionRows.length; i++) { if (selectionRows[i].createBy === this.userInfo.username && selectionRows[i].releaseState === 'draft') { From d9889bf91acbb71be3ca8da5b559bd009dd32f54 Mon Sep 17 00:00:00 2001 From: danshihao Date: Mon, 12 Aug 2024 13:55:19 +0800 Subject: [PATCH 167/194] =?UTF-8?q?[update=20=E6=A0=87=E5=87=86=E8=A7=A3?= =?UTF-8?q?=E8=AF=BB]=20=E5=8F=96=E6=9C=80=E6=96=B0=E7=9A=84=E8=A7=A3?= =?UTF-8?q?=E8=AF=BB=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/StandardResolutionSheet.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/StandardResolutionSheet.vue b/src/components/StandardResolutionSheet.vue index 73bf0a5..42b0f11 100644 --- a/src/components/StandardResolutionSheet.vue +++ b/src/components/StandardResolutionSheet.vue @@ -289,7 +289,7 @@ export default { if (res.success) { const list = res.result || [] // 后端说id是随时间递增的，取最新数据也就是取id最大的数据 - this.standardInterpret = list.sort((a, b) => b - a)[0] || {} + this.standardInterpret = list.sort((a, b) => b.id - a.id)[0] || {} this.selectedTreeKeys = [] this.hightMenuId = null this.clauseLabelInfo = this.standardInterpret From 3bd169f59dd5331a537132c44a29069d89368fa2 Mon Sep 17 00:00:00 2001 From: danshihao Date: Mon, 12 Aug 2024 14:36:55 +0800 Subject: [PATCH 168/194] =?UTF-8?q?[update=20=E6=A0=87=E5=87=86=E8=AF=A6?= =?UTF-8?q?=E6=83=85]=20=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=9D=A0=E5=B7=A6=E4=BE=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/less/common.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/assets/less/common.less b/src/assets/less/common.less index 5e54454..fd41903 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -762,7 +762,8 @@ color: #86909C; display: flex; align-items: center; - justify-content: space-between; + justify-content: flex-start; + gap: 20px; margin-bottom: 16px; } From 8a4e64aa79ff586673255832e5f64023fba8e5b5 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 12 Aug 2024 15:54:12 +0800 Subject: [PATCH 169/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug88448?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandard/detail/ForeignStandardDetailPage.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/standardRegulationLibrary/foreignStandard/detail/ForeignStandardDetailPage.vue b/src/views/standardRegulationLibrary/foreignStandard/detail/ForeignStandardDetailPage.vue index 58188a0..a12e87e 100644 --- a/src/views/standardRegulationLibrary/foreignStandard/detail/ForeignStandardDetailPage.vue +++ b/src/views/standardRegulationLibrary/foreignStandard/detail/ForeignStandardDetailPage.vue @@ -79,8 +79,8 @@
-
-
+
+
{{ formItem.dbFieldTxt }} From ad0afd3e967b59ea430e5f00e04d9847ed719437 Mon Sep 17 00:00:00 2001 From: danshihao Date: Mon, 12 Aug 2024 17:39:24 +0800 Subject: [PATCH 170/194] =?UTF-8?q?[update=20=E6=B5=81=E7=A8=8B=E8=BF=94?= =?UTF-8?q?=E5=9B=9E]=20=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E4=B8=8A?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E9=A1=B5=E9=9D=A2=E5=B0=B1=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E5=88=B0=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mixins/WorkCenterMixin.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/mixins/WorkCenterMixin.js b/src/mixins/WorkCenterMixin.js index 6b2896c..f78f5e3 100644 --- a/src/mixins/WorkCenterMixin.js +++ b/src/mixins/WorkCenterMixin.js @@ -1,6 +1,7 @@ import { getProcessNodeList, queryTaskNameByTaskId } from '../api/workCenter' import Vue from 'vue' import { USER_INFO } from '../store/mutation-types' +import { findFirstRoute } from '@/utils/util' export const WorkCenterMixin = { data () { @@ -89,7 +90,12 @@ export const WorkCenterMixin = { let timer = setTimeout(() => { clearTimeout(timer) timer = null - this.$router.go(-1) + // 有上个页面就返回，否则就返回第一个页面 + if (history.length > 1) { + this.$router.go(-1) + } else { + this.$router.replace({ path: findFirstRoute(this.$store.state.user.permissionList) }) + } }, 700) }, switchChange (value) { @@ -104,7 +110,7 @@ export const WorkCenterMixin = { */ beforeRouteEnter (to, from, next) { if (to.query.taskId) { - queryTaskNameByTaskId({taskId: to.query.taskId}).then(res => { + queryTaskNameByTaskId({ taskId: to.query.taskId }).then(res => { if (res.success) { to.query.taskName = res.result.taskName } From 067b2fe003de52bea2e5f7240ee3f4f0d80c0973 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 12 Aug 2024 17:49:03 +0800 Subject: [PATCH 171/194] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug87605?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/selection/TreeDataSelectModal.vue | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/components/selection/TreeDataSelectModal.vue b/src/components/selection/TreeDataSelectModal.vue index 8bdc67a..0e2f4d3 100644 --- a/src/components/selection/TreeDataSelectModal.vue +++ b/src/components/selection/TreeDataSelectModal.vue @@ -23,9 +23,11 @@ @check="onCheck" @select="onSelect" @expand="onExpand" + @load="onLoad" :loadData="loadData" :expandedKeys="expandedKeys" :checkedKeys="checkedKeys" + :loadedKeys="loadedKeys" :selectedKeys.sync="selectedKeys">