From 1c46cfbae419e0b82eb661a521ac6a27164de09e Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Wed, 13 Sep 2023 16:55:20 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E5=BA=93=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/enterpriseStandardLibraryApi.js | 6 +- src/components/customField/Search.vue | 58 ----------- .../check/CheckList.vue | 62 ++++++++++-- .../check/modules/DeferredCheckModal.vue | 99 +++++++------------ .../plan/PlanList.vue | 15 ++- .../publicize/EnterpriseStandardPublicize.vue | 16 +-- .../reviewMeeting/ReviewMeetingList.vue | 7 +- .../reviewPlan/ReviewPlanList.vue | 11 ++- .../standard/EnterpriseStandardList.vue | 9 +- 9 files changed, 126 insertions(+), 157 deletions(-) diff --git a/src/api/enterpriseStandardLibraryApi.js b/src/api/enterpriseStandardLibraryApi.js index c31fc14d..73f9316e 100644 --- a/src/api/enterpriseStandardLibraryApi.js +++ b/src/api/enterpriseStandardLibraryApi.js @@ -30,8 +30,8 @@ const setQualityStandard = (params) => getAction('/enterprise/reviewMeeting/setQ // 获取评分详情 const getScoreDetail = (params) => getAction('/enterprise/reviewMeeting/evaluateDetail/' + `${params.id}`, params) -// 企标稽查-延期稽查 -const deferredCheck = (params) => getAction('', params) +// 企标稽查-获取延期稽查数据 +const getDeferredCheck = (params) => getAction('/enterprise/inspect/delayInspect', params) // 企标稽查-根据id获取稽查报告详情 const getCheckReportById = (params) => getAction('', params) // 企标稽查-根据id获取整改计划 @@ -60,7 +60,7 @@ export { setQualityStandard, getScoreDetail, - deferredCheck, + getDeferredCheck, getCheckReportById, getRectificationPlanById, diff --git a/src/components/customField/Search.vue b/src/components/customField/Search.vue index 48bcda38..cb88eb73 100644 --- a/src/components/customField/Search.vue +++ b/src/components/customField/Search.vue @@ -190,64 +190,6 @@ export default { mounted () { this.getSysCategoryTree() this.getSearch() - // this.searchList = [ - // { - // dbFieldName: 'serial_number', - // dbFieldTxt: '编号', - // dict_field: '', - // fieldShowType: '1', - // tree: [] - // }, - // { - // dbFieldName: 'title', - // dbFieldTxt: '标题', - // dict_field: '', - // fieldShowType: '1', - // tree: [] - // }, - // { - // dbFieldName: 'state', - // dbFieldTxt: '状态', - // dict_field: 'state', - // fieldShowType: '3', - // tree: [] - // }, - // { - // dbFieldName: 'region', - // dbFieldTxt: '适用地区', - // dict_field: 'region', - // fieldShowType: '4', - // tree: [] - // }, - // { - // dbFieldName: 'technology_territory', - // dbFieldTxt: '技术领域', - // dict_field: 'technology_territory', - // fieldShowType: '0', - // tree: [] - // }, - // { - // dbFieldName: 'issue_time', - // dbFieldTxt: '发布日期', - // dict_field: '', - // fieldShowType: '5', - // tree: [] - // }, - // { - // dbFieldName: 'xin1_che1_xing2_shi2_shi1_ri4_qi1', - // dbFieldTxt: '新车型实施日期', - // dict_field: '', - // fieldShowType: '5', - // tree: [] - // }, - // { - // dbFieldName: 'implement_time', - // dbFieldTxt: '在产车实施日期', - // dict_field: '', - // fieldShowType: '5', - // tree: [] - // } - // ] }, methods: { searchQuery () { diff --git a/src/views/enterpriseStandardLibrary/check/CheckList.vue b/src/views/enterpriseStandardLibrary/check/CheckList.vue index 6a0b593f..a4f02bc3 100644 --- a/src/views/enterpriseStandardLibrary/check/CheckList.vue +++ b/src/views/enterpriseStandardLibrary/check/CheckList.vue @@ -66,7 +66,7 @@ {{ toggleSearchStatus ? $t('putAway') : $t('open') }} - {{ $t('query') }} + {{ $t('query') }} {{ $t('reset') }} @@ -77,15 +77,18 @@
- + {{ $t('export') }} - + {{ $t('enterpriseStandardLibrary.check.exportPostponeData') }} - + {{ $t('enterpriseStandardLibrary.check.exportRectificationPlan') }}
@@ -122,9 +125,25 @@
- {{ $t('enterpriseStandardLibrary.check.deferredCheck') }} - {{ $t('enterpriseStandardLibrary.check.checkReport') }} - {{ $t('enterpriseStandardLibrary.check.rectificationPlan') }} + +
@@ -143,6 +162,7 @@ import '@assets/less/common.less' import { queryDepartTreeList } from '@/api/api' import { JeroListMixin } from '@/mixins/JeroListMixin' import { downFile } from '@/api/manage' +import { isHasPermission } from '@/utils/hasPermission' import JTable from '@/components/jero/JTable' // 延期稽查弹框 import DeferredCheckModal from './modules/DeferredCheckModal' @@ -157,6 +177,12 @@ export default { data () { return { categoryTreeList: [], // 组织机构查询的组织机构树数据 + labelCol: { + span: 4 + }, + wrapperCol: { + span: 14 + }, columns: [ { title: this.$t('serialNumber'), @@ -186,7 +212,7 @@ export default { title: this.$t('enterpriseStandardLibrary.check.planCheckTarget'), align: 'center', width: 180, - dataIndex: 'planCheckTarget', + dataIndex: 'planInspectObject', scopedSlots: { customRender: 'text' } }, { @@ -263,13 +289,31 @@ export default { list: '/enterprise/inspect/page', exportPostponeDataUrl: '', // 导出延期数据 exportRectificationPlanUrl: '' // 导出整改计划 - } + }, + operationList: [ + { + text: this.$t('enterpriseStandardLibrary.check.deferredCheck'), + clickEvent: 'handleDeferredCheck', + has: 'enterpriseStandardLibrary.check.deferredCheck' + }, + { + text: this.$t('enterpriseStandardLibrary.check.checkReport'), + clickEvent: 'handleCheckReport', + has: 'enterpriseStandardLibrary.check.checkReport' + }, + { + text: this.$t('enterpriseStandardLibrary.check.rectificationPlan'), + clickEvent: 'handleRectificationPlan', + has: 'enterpriseStandardLibrary.check.rectificationPlan' + } + ] } }, mounted () { this.getSysCategoryTree() }, methods: { + isHasPermission, // 获取组织机构树 getSysCategoryTree () { queryDepartTreeList().then((res) => { diff --git a/src/views/enterpriseStandardLibrary/check/modules/DeferredCheckModal.vue b/src/views/enterpriseStandardLibrary/check/modules/DeferredCheckModal.vue index 0e49791f..243ce7b7 100644 --- a/src/views/enterpriseStandardLibrary/check/modules/DeferredCheckModal.vue +++ b/src/views/enterpriseStandardLibrary/check/modules/DeferredCheckModal.vue @@ -5,35 +5,23 @@ :width="800" :closable="true" @cancel="handleCancel" - @ok="handleOk" + :footer="true" :visible="visible"> - - - - - - - - - + - diff --git a/src/views/enterpriseStandardLibrary/plan/PlanList.vue b/src/views/enterpriseStandardLibrary/plan/PlanList.vue index 724f4217..52b58b5d 100644 --- a/src/views/enterpriseStandardLibrary/plan/PlanList.vue +++ b/src/views/enterpriseStandardLibrary/plan/PlanList.vue @@ -118,7 +118,7 @@ {{ toggleSearchStatus ? $t('putAway') : $t('open') }} - {{ $t('query') }} + {{ $t('query') }} {{ $t('reset') }} @@ -129,7 +129,8 @@
- + {{ $t('export') }}
@@ -174,8 +175,8 @@ @@ -196,6 +197,12 @@ export default { data () { return { categoryTreeList: [], // 组织机构下拉框数据 + labelCol: { + span: 4 + }, + wrapperCol: { + span: 14 + }, columns: [ { title: this.$t('enterpriseStandardLibrary.plan.revisionType'), diff --git a/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue b/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue index a8de8466..9e22b40c 100644 --- a/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue +++ b/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue @@ -37,7 +37,7 @@ {{ toggleSearchStatus ? $t('putAway') : $t('open') }} - {{ $t('query') }} + {{ $t('query') }} {{ $t('reset') }} @@ -47,12 +47,15 @@
- + {{ $t('export') }} - {{ $t('exportWithFile') }} + {{ $t('exportWithFile') }} - + {{ $t('templateDownload') }}
@@ -90,8 +93,8 @@ @@ -172,7 +175,6 @@ export default { title: this.$t('enterpriseStandardLibrary.publicize.relatedMaterial'), align: 'center', width: 180, - dataIndex: 'declareFileName', scopedSlots: { customRender: 'relatedMaterial' } } ], diff --git a/src/views/enterpriseStandardLibrary/reviewMeeting/ReviewMeetingList.vue b/src/views/enterpriseStandardLibrary/reviewMeeting/ReviewMeetingList.vue index 08ae69fa..332e08ad 100644 --- a/src/views/enterpriseStandardLibrary/reviewMeeting/ReviewMeetingList.vue +++ b/src/views/enterpriseStandardLibrary/reviewMeeting/ReviewMeetingList.vue @@ -26,7 +26,7 @@
- {{ $t('query') }} + {{ $t('query') }} {{ $t('reset') }}
@@ -37,7 +37,7 @@
- + {{ $t('enterpriseStandardLibrary.reviewMeeting.setQualityStandard') }}
@@ -66,7 +66,8 @@ diff --git a/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue b/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue index 6ee0009b..7a127478 100644 --- a/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue +++ b/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue @@ -42,7 +42,7 @@ {{ toggleSearchStatus ? $t('putAway') : $t('open') }} - {{ $t('query') }} + {{ $t('query') }} {{ $t('reset') }} @@ -53,7 +53,8 @@
- + {{ $t('enterpriseStandardLibrary.reviewPlan.initReview') }}
@@ -165,6 +166,12 @@ export default { scopedSlots: { customRender: 'text' } } ], + labelCol: { + span: 4 + }, + wrapperCol: { + span: 14 + }, url: { list: '/enterprise/recheckPlan/page' } diff --git a/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue b/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue index 8e8590f9..098792b6 100644 --- a/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue +++ b/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue @@ -1,12 +1,8 @@