From 0b9ccff93569b4633c78dc0e691e18ed3b5cbe16 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 10 Nov 2021 14:57:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=20-=20?= =?UTF-8?q?=E9=87=8D=E7=82=B9=E9=97=AE=E9=A2=98=E7=AE=A1=E6=8E=A7=20-=20?= =?UTF-8?q?=E4=BA=8B=E4=B8=9A=E9=83=A8=20-=20=E5=88=86=E9=A1=B5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/businessDivision.vue | 383 +++++++++++------- 1 file changed, 235 insertions(+), 148 deletions(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue b/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue index 163ca9815..6f5610492 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue @@ -3,189 +3,221 @@
- + - + + + - - - - - - - - -
- - -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + type="primary" + class="common-button-primary" + size="mini" + v-btn-permission="'aff4a409c3c3856986c535a5f4782b13'" + @click="searchSarAccessBtn('')"> 查询 清空 + class="common-button-default" + size="mini" + v-btn-permission="'66fa37fc93e298b03d272fe17aeca6de'" + @click="clearAllSearch">清空 +
导出 + class="common-button-primary" + type="primary" + size="mini" + v-btn-permission="'620e6da5808bf104e576c763546a33b6'" + title="不勾选时默认导出所有筛选项;勾选时仅导出勾选项" + >导出 + 批量关闭 + @click="userCloAll" + class="common-button-primary" + type="primary" + size="mini" + v-btn-permission="'fde586188a364382cf67a0efa62a586c'" + >批量关闭 + 历史数据 + class="common-button-primary" + size="mini" + type="primary" + v-btn-permission="'9b68b46455c5af042d430e05e6579b27'" + @click="historyClick" + style="float: right; margin-right: 10px" + >历史数据 +
数据获取中....
+ type="selection" + width="55" + fixed="left" + align="center"> + prop="lawNumber" + fixed="left" + width="180" + label="标准编号/政策编号"> + prop="lawName" + fixed="left" + width="180" + label="标准名称/政策名称"> + prop="productType" + width="180" + label="产品类型"> + prop="implTime" + width="180" + sortable="custom" + label="实施时间"> + prop="implRequire" + width="180" + label="实施要求"> + prop="conformSituation" + width="180" + label="资源符合情况"> + prop="devScheme" + width="150" + label="开发计划"> + prop="responseDept" + width="150" + label="责任部门"> + prop="responsePeople" + width="150" + label="责任人"> - + prop="sopTime" + width="150" + sortable="custom" + label="SOP时间"> + - - + + + + + + + + + + + + + + +
@@ -196,16 +228,29 @@ export default { name: "businessDivision", data() { return { + sarAccessListTotal: 0, + sarAccessListDatas: [], + // 查询相关参数 + sarSarAccessEOSearch: { + lawNumOrName: '', // 编号/名称 + productType: '', // 产品类型 + responseDept: '', // 责任部门 + lawNumber: '', + lawName: '', + accessContent: '', + energyKind: '', + applyArctic: '', + region: '', + page: 1, + pageSize: this.$store.getters.userInfo.configContent, + validFlag: 0 + }, loading: false, - // 总数 - total: 0, - // 当前页数 - pageNo: 1, causeList: [], //事业部数据 nonConformitySearch: { standNumOrName: '', // 编号/名称 productName: '', // 产品类型 - responseUnit: '' // 责任部门 + responseDept: '' // 责任部门 }, // 产品类型下拉列表数据 productNameList: [], @@ -213,26 +258,41 @@ export default { } }, methods: { + lawNumOrNameKeyup() { + this.sarSarAccessEOSearch.lawName = this.sarSarAccessEOSearch.lawNumOrName + this.sarSarAccessEOSearch.lawNumber = this.sarSarAccessEOSearch.lawNumOrName + }, //点击批量关闭按钮事件 userCloAll() { console.log('至少选择一条数据'); }, //点击历史数据按钮事件 - historyClick (){ - this.$router.push({ - name:'BusinessDetails' - }) + historyClick() { + this.$router.push({ + name: 'BusinessDetails' + }) }, // 清空 查询条件 - clearAllSearch (search = true) { - this.nonConformitySearch = { - standNumOrName: '', - productName: '', - responseUnit: '' + clearAllSearch(search = true) { + this.sarSarAccessEOSearch = { + lawNumOrName: '', // 编号/名称 + productType: '', // 产品类型 + responseDept: '', // 责任部门 + lawNumber: '', + lawName: '', + accessContent: '', + energyKind: '', + applyArctic: '', + region: '', + page: 1, + pageSize: this.$store.getters.userInfo.configContent, + validFlag: 0 } + this.searchSarAccessBtn() + console.log(this.sarSarAccessEOSearch) }, // 更多 - handleCommand (command) { + handleCommand(command) { switch (command[1]) { case '查看': this.showUser(command[0]) @@ -257,15 +317,40 @@ export default { userClo(row) { console.log(row) }, - // 分页事件 - pageChange (page) { - this.pageNo = page - this.getTableByPage() + pageChange(page) { + this.sarSarAccessEOSearch.page = page + this.searchSarAccess() }, - pageSizeChange (pageSize) { - this.pageSize = this.$store.getters.userInfo.configContent - this.getTableByPage() + pageSizeChange(pageSize) { + this.sarSarAccessEOSearch.page = 1 + this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent + this.searchSarAccess() }, + // 搜索 + searchSarAccessBtn() { + this.sarSarAccessEOSearch.page = 1 + this.searchSarAccess() + }, + //未整改项抽屉中的查询按钮 + searchSarAccess() {//多条件和模糊查询 + this.$http.get("sarStandUnqualified/businessDeptIssue", { + current: this.sarSarAccessEOSearch.page, + pageSize: this.$store.getters.userInfo.configContent, + ...this.sarSarAccessEOSearch, + }, { + _this: this + }, res => { + let arr = res.data.records; + this.sarAccessListDatas = arr + this.tableLoading = false + this.sarAccessListTotal = res.data.total + }, e => { + }); + }, + }, + mounted() { + // 分页查询数据 + this.searchSarAccess() }, }; @@ -275,10 +360,12 @@ export default { height: 100%; display: flex; flex-direction: column; - .content-center { - margin-left: 10px; - margin-bottom: 10px; - } + + .content-center { + margin-left: 10px; + margin-bottom: 10px; + } + .container { flex: 1; overflow: hidden; From 9b45e863d3943c58db52715d3b6d5ac549785b68 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 10 Nov 2021 15:03:28 +0800 Subject: [PATCH 2/2] feat: There is no way the,table width --- .../components/EnterpriseStandardDatabase.vue | 8 +++++--- .../foreignRegulationsDatabase/index.vue | 8 +++++--- .../foreignStandardsAndRegulations/index.vue | 5 +++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 9e33d9b48..ab14af1e9 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -311,6 +311,7 @@ show-overflow-tooltip prop="standName" label="中文名称" + width="200" >