From e719773fea0b238ff8bdca4f154eb46e00dc7d99 Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 27 Oct 2023 11:04:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=9D=83=E9=99=90=E6=8E=A7?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherLawsStandDetails/index.vue | 9 +- src/pages/policyRegulation/meeting/index.vue | 28 ++- .../policy/components/editDrawer.vue | 163 ------------------ .../policy/components/mainTable.vue | 110 ++---------- .../policy/components/policySearch.vue | 6 +- .../policy/components/policyTable.vue | 6 +- .../policyRegulation/policyTopics/index.vue | 27 ++- .../components/RegulatoryMaterialsMain.vue | 21 ++- .../creatProcess/policyWarehousing/step1.vue | 2 - 9 files changed, 93 insertions(+), 279 deletions(-) diff --git a/src/pages/details/otherLawsStandDetails/index.vue b/src/pages/details/otherLawsStandDetails/index.vue index 5014084e8..cb92f72ce 100644 --- a/src/pages/details/otherLawsStandDetails/index.vue +++ b/src/pages/details/otherLawsStandDetails/index.vue @@ -56,8 +56,13 @@

{{ sarStandardsInfoEO.lawsSycx || '-' }}

{{ sarStandardsInfoEO.isRelateAccess === '1' ? '是' : (sarStandardsInfoEO.isRelateAccess ? '否':'-')}}

{{ sarStandardsInfoEO.lawsYear || '-' }}

-

{{ sarStandardsInfoEO.lawsNotisyncNum || '-' }}

-

{{ sarStandardsInfoEO.notisyncNumLink || '-' }}

+

+ + {{ sarStandardsInfoEO.lawsNotisyncNum || '-' }} + + {{ sarStandardsInfoEO.lawsNotisyncNum || '-' }} +

+

{{ sarStandardsInfoEO.lawsBulletin || '-' }}

{{ sarStandardsInfoEO.lawsLabel || '-' }}

{{ sarStandardsInfoEO.lawsRemark || '-' }}

diff --git a/src/pages/policyRegulation/meeting/index.vue b/src/pages/policyRegulation/meeting/index.vue index 9b3209695..1bcebd206 100644 --- a/src/pages/policyRegulation/meeting/index.vue +++ b/src/pages/policyRegulation/meeting/index.vue @@ -78,11 +78,13 @@ ref="selection" :data="data" tooltip-effect="dark" - style="width:100%;" + style="width:100%;height: calc(100% - 57px)" + height="string" border class="drag-table" @sort-change="sortChange" - :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" + :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px', padding: 0}" + :cell-style="{padding: 0}" @selection-change="selectionChange" > @@ -158,6 +161,8 @@ import editDrawer from "./components/editDrawer"; import AdvancedSearch from './components/advancedSearch' import ImportZip from '@/components/hzwlComponents/importZip' import ExportDialog from '@/components/hzwlComponents/exportDialog' +import store from "@/store"; + export default { name: "meeting", components: { @@ -194,6 +199,21 @@ export default { this.getData() }, methods: { + isPermission (value) { + let hasCount = 0 + let set =new Set( value.split(",")) + let menuList = store.getters.getMenuList + if (menuList === '') { + return hasCount + } else { + menuList.map((menu) => { + if ( set.has(menu.id)|| value === undefined || value === '') { + hasCount++ + } + }) + } + return hasCount + }, async getData () { this.searchForm.pageSize = this.searchForm.pageSize || this.$store.getters.userInfo.configContent this.searchForm.page = this.searchForm.page || 1 diff --git a/src/pages/policyRegulation/policy/components/editDrawer.vue b/src/pages/policyRegulation/policy/components/editDrawer.vue index d1d908252..549769861 100644 --- a/src/pages/policyRegulation/policy/components/editDrawer.vue +++ b/src/pages/policyRegulation/policy/components/editDrawer.vue @@ -763,7 +763,6 @@ export default { {validator: this.verify.valiateEnName, trigger: 'change'} ], lawsNo: [ - {required: true, type: 'string', message: '政策文号不能为空', trigger: 'change'}, {type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change'} ], issueTime: [ @@ -812,7 +811,6 @@ export default { {validator: this.verify.valiateEnName, trigger: 'change'} ], lawsNo: [ - {required: true, type: 'string', message: '政策文号不能为空', trigger: 'change'}, {type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change'} ], issueCompany: [ @@ -857,168 +855,7 @@ export default { orgData: [], isSubmit: false, sarType: 'FOREIGN_LAWS', - //#region - // defaultAddFormFieldRules: { - // lawsType: [ - // {required: true, message: '政策分类不能为空', trigger: 'change'} - // ], - // lawsNumber: [ - // {required: true, type: 'string', message: '政策编号不能为空', trigger: 'change'}, - // {type: 'string', max: 100, message: '政策编号不能超过100个字符', trigger: 'change'} - // ], - // lawsName: [ - // {required: true, message: '中文名称不能为空', trigger: 'change'}, - // {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}, - // {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} - // ], - // lawsEnName: [ - // {required: false, message: '英文名称不能为空', trigger: 'change'}, - // {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}, - // {validator: this.verify.valiateEnName, trigger: 'change'} - // ], - // lawsNo: [ - // {required: true, type: 'string', message: '政策文号不能为空', trigger: 'change'}, - // {type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change'} - // ], - // issueCompany: [ - // {required: true, type: 'string', message: '发文单位不能为空', trigger: 'change'}, - // {type: 'string', max: 100, message: '发文单位不能超过100个字符', trigger: 'change'} - // ], - // lawsTextState: [ - // {required: true, message: '文本状态不能为空', trigger: 'change'} - // ], - // isRelateAccess: [ - // {required: true, message: '是否纳入认证清单不能为空', trigger: 'change'} - // ], - // lawsYear: [ - // {required: true, message: '年度不能为空', trigger: 'change'} - // ], - // lawsNotisyncNum: [ - // {type: 'string', max: 500, message: '福田转发通知文号不能超过500个字符', trigger: 'change'} - // ], - // lawsRemark: [ - // {type: 'string', max: 500, message: '备注不能超过500个字符', trigger: 'change'} - // ], - // }, - //#endregion dynamicFormField: [], - // defaultAddFormField: { - // regionShow: '亚洲', - // region: '2T8PFTSYE7', - // issueUnit: '', // 发布部门 - // assemClass: '', - // id: '', - // standType: 'INLAND', // 标准分类 - // country: 'CN', - // standSort: '', - // applyArctic: '', - // standNumber: '', - // standYear: '', - // standName: '', - // standEnName: '', - // standStatus: '', - // standCode: '', - // standNature: '', - // replaceStandNum: '', - // replaceStandNumId: '', - // // replaceStandNumCope: '', - // replaceStandNumList: [], - // replacedStandNum: '', - // interStandNum: '', - // adoptExtent: '', - // emergyKind: '', - // applyAuth: '', - // issueTime: '', - // putTime: '', - // newcarPutTime: '', - // productPutTime: '', - // newproductPutTime: '', - // draftingUnit: '', - // draftUser: '', - // standFile: '', - // standModifyFile: '', - // draftFile: '', - // opinionFile: '', - // sentScreenFile: '', - // approvalFile: '', - // relevanceFile: '', - // standFileList: [], - // standModifyFileList: [], - // draftFileList: [], - // wtoPublicFileList: [], - // finalizeFileList: [], - // opinionFileList: [], - // sentScreenFileList: [], - // approvalFileList: [], - // relevanceFileList: [], - // firstDraftFileList: [], - // lawsExplainFileList: [], - // tags: '', - // synopsis: '', - // responsibleUnit: '', - // category: '', - // remark: '', - // menuId: '', - // upReplaceNumFlag: 0, // 记录是否修改了代替政策编号 - // upNumFlag: 0, - // orgName: '', // 部门名称 - // registerPutTime: '', // 注册登记车实施日期 - // standExpirationTime: '', // 标准失效日期 - // issueTextTime: '', // 标准发布文本获得时间（印刷版） - // revisionProjectNo: '', // 标准修订立项号 - // recieveConfirmResult: '', // 已收到以下部门适法性确认结果 - // trialFirstCar: '', // 试验首款车 - // domainAssume: '', // 领域担当 - // budgetBenchmark: '', // 预算基准 - // planCompletionTime: '', // 制修订计划完成时间 - // enterNextStageTime: '', // 预测进入下制修订阶段时间 - // firstDraftFile: '', // 初稿 - // standAttribute: '', // 法规种类 - // isCertiStand: '', // 是否为认证标准 - // isNoticeApply: '', // 是否公告适用 - // isNationRing: '', - // isNorthRing: '', // 是否北环适用 - // isCccApply: '', // 是否CCC适用 - // isEnergyStand: '', // 是否为新能源专向标准 - // issueTimeCm: '', // 发布日期是否明确 - // newcarPutTimeCm: '', // 新车型实施日期 是否明确 - // productPutTimeCm: '', // 在产车实施日期 是否明确 - // isQuestion: '', // 是否结题 - // draftState: '', // 参与起草情况 - // reviseBasis: '', // 修订依据 - // unProjectTime: '', // 未立项—获稿时间 - // projectTime: '', // 立项—获稿时间 - // estimatedNextTime: '', // 预计进入下一阶段时间 - // finalizeTime: '', // 结题时间 - // wtoPublicFile: '', - // finalizeFile: '', // 结题附件 - // noticeCertPutTime: '', - // cccCertPutTime: '', - // nationCertPutTime: '', - // northCertPutTime: '', - // noticeProductPutTime: '', - // cccProductPutTime: '', - // nationProductPutTime: '', - // northProductPutTime: '', - // lawsExplainText: '', - // lawsExplainKeyword: '', - // lawsExplainFile: '', - // lawsExplainQuote: '', - // testItems: '', - // lawsExplainQuoteList: [], - // testItemsList: [], - // firstDraftFileTime: '', - // firstDraftFileFeedback: '', - // wtoPublicFileTime: '', - // wtoPublicFileFeedback: '', - // opinionFileTime: '', - // opinionFileFeedback: '', - // sentScreenFileTime: '', - // sentScreenFileFeedback: '', - // approvalFileTime: '', - // approvalFileFeedback: '', - // certPutTimeList: [] - // }, // 标准新增过程中用到的对象 choiceTitle: '', // 人员选择 modalShowRoleFlag: false, nodeList: [], diff --git a/src/pages/policyRegulation/policy/components/mainTable.vue b/src/pages/policyRegulation/policy/components/mainTable.vue index 083cb4a1c..d21a538e3 100644 --- a/src/pages/policyRegulation/policy/components/mainTable.vue +++ b/src/pages/policyRegulation/policy/components/mainTable.vue @@ -116,104 +116,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - item.value === value)?.label || value + return value.split(',').map(v => this.dict[dict].find(item => item.value === v)?.label || v).join(',') + // return this.dict[dict].find(item => item.value === value)?.label || value } else { return value } diff --git a/src/pages/policyRegulation/policy/components/policySearch.vue b/src/pages/policyRegulation/policy/components/policySearch.vue index 6ba3568b5..2d82cbb9d 100644 --- a/src/pages/policyRegulation/policy/components/policySearch.vue +++ b/src/pages/policyRegulation/policy/components/policySearch.vue @@ -46,18 +46,18 @@ type="primary" size="mini" class="common-button-primary" - v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbl'" + v-btn-permission="'776298201c756873ddc8000eb716e347'" @click="getBussionStandTableBtn(lawsStandInfoSearch)"> 查询 清空 高级检索 + v-btn-permission="'2e08f0dcb187e214127f971419f91174'" @click="selectMoreBtn">高级检索 diff --git a/src/pages/policyRegulation/policy/components/policyTable.vue b/src/pages/policyRegulation/policy/components/policyTable.vue index 6d8408beb..da77867f3 100644 --- a/src/pages/policyRegulation/policy/components/policyTable.vue +++ b/src/pages/policyRegulation/policy/components/policyTable.vue @@ -29,7 +29,7 @@ round @click="exportStandard" title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项" - v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbj'" + v-btn-permission="'15e322e28629ee9e55283d12e3167e21'" >导出 @@ -48,13 +48,13 @@ class="common-button-default" round @click="configurationStandard" - v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbf'" + v-btn-permission="'1a6c9118cd677304924f81e02d58ac06'" >配置政策 移除政策 diff --git a/src/pages/policyRegulation/policyTopics/index.vue b/src/pages/policyRegulation/policyTopics/index.vue index 6193637c2..967414dd0 100644 --- a/src/pages/policyRegulation/policyTopics/index.vue +++ b/src/pages/policyRegulation/policyTopics/index.vue @@ -91,11 +91,13 @@ ref="selection" :data="data" tooltip-effect="dark" - style="width:100%;" + style="width:100%;height: calc(100% - 57px)" + height="string" border class="drag-table" @sort-change="sortChange" - :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" + :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px', padding: 0}" + :cell-style="{padding: 0}" @selection-change="selectionChange" > @@ -161,6 +164,7 @@ import AdvancedSearch from './components/advancedSearch' import editDrawer from "./components/editDrawer"; import ImportZip from '@/components/hzwlComponents/importZip' import ExportDialog from '@/components/hzwlComponents/exportDialog' +import store from "@/store"; export default { name: "policyTopics", @@ -209,6 +213,21 @@ export default { this.getData() }, methods: { + isPermission (value) { + let hasCount = 0 + let set =new Set( value.split(",")) + let menuList = store.getters.getMenuList + if (menuList === '') { + return hasCount + } else { + menuList.map((menu) => { + if ( set.has(menu.id)|| value === undefined || value === '') { + hasCount++ + } + }) + } + return hasCount + }, async getData () { this.searchForm.pageSize = this.searchForm.pageSize || this.$store.getters.userInfo.configContent this.searchForm.page = this.searchForm.page || 1 diff --git a/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue b/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue index 3feba598a..953709c2e 100644 --- a/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue +++ b/src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue @@ -95,11 +95,13 @@ ref="tableRef" :data="data" tooltip-effect="dark" - style="width:100%;" + style="width:100%;height: calc(100% - 57px)" + height="string" border class="drag-table" @sort-change="sortChange" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px', padding: 0}" + :cell-style="{padding: 0}" @selection-change="selectionChange" > { + if ( set.has(menu.id)|| value === undefined || value === '') { + hasCount++ + } + }) + } + return hasCount + }, userToId (userStr) { return (userStr && userStr !== '') ? userStr.split(',').map(item => item.split('(')[1].split(')')[0]) : [] }, diff --git a/src/pages/processCenter/pages/creatProcess/policyWarehousing/step1.vue b/src/pages/processCenter/pages/creatProcess/policyWarehousing/step1.vue index 0004ca313..1ebb30371 100644 --- a/src/pages/processCenter/pages/creatProcess/policyWarehousing/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/policyWarehousing/step1.vue @@ -158,7 +158,6 @@ export default { {validator: this.verify.valiateEnName, trigger: 'change'} ], lawsNo: [ - {required: true, type: 'string', message: '政策文号不能为空', trigger: 'change'}, {type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change'} ], issueTime: [ @@ -211,7 +210,6 @@ export default { {validator: this.verify.valiateEnName, trigger: 'change'} ], lawsNo: [ - {required: true, type: 'string', message: '政策文号不能为空', trigger: 'change'}, {type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change'} ], issueCompany: [