From f8536448e79883f908788be76c1f38b046284386 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Mon, 19 Jul 2021 10:45:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E6=8C=89=E9=92=AE=EF=BC=8C=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home1/index.vue | 57 ++++++++++++------- src/pages/localTool/standAutoSplit/index.vue | 26 ++++----- .../pages/creatProcess/wfhxzg/step1.vue | 6 +- .../pages/creatProcess/wfhxzg/step5.vue | 16 +++++- .../pages/otherAddEit.vue | 2 +- .../pages/projectAddEit.vue | 17 +++--- src/router/index.js | 2 +- 7 files changed, 77 insertions(+), 49 deletions(-) diff --git a/src/pages/home1/index.vue b/src/pages/home1/index.vue index c7e545203..b622318c8 100644 --- a/src/pages/home1/index.vue +++ b/src/pages/home1/index.vue @@ -16,27 +16,29 @@
+ MORE - - - - - - - - - - - - - - - - + v-model="activeName" + class="home-tabs" + @tab-click="handleTabClick" + > + + + + + + + + + + + + + + + + +
@@ -106,6 +108,9 @@ export default { }, e => {}) }).catch(() => { }) + }, + MORE() { + this.$router.push({name: 'standardForComments'}) } }, } @@ -172,8 +177,20 @@ export default { width: 60vw; height: 100%; margin-right: 10px; + .more { + float: right; + color: #FFFFFF; + margin: 0px 15px; + &:hover { + color: red; + cursor: pointer; + } + } .home-tabs { margin-left: 2.34vw; + ::v-deep.el-tabs__header{ + margin: 0 70px 15px 0px + } ::v-deep { .el-tabs__item { font-size: 16px; diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index 7d0ecdbcc..e4306b6ee 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -28,8 +28,8 @@
- 拆分 - 删除 + 拆分 + 删除
@@ -542,16 +542,17 @@ + 搜索 + >清空
@@ -594,11 +595,11 @@ {{ scope.row.lawsName }} - - - - - + @@ -931,7 +932,7 @@ export default { _this: this }, res => { this.addSpiltStandList = res.data.list - this.addFileStandtotal = res.data.count + this.addFileStandtotal = res.data.list.length this.loadData = false }, e => { this.loadData = false @@ -1359,10 +1360,7 @@ export default { name: 'ItemSplitInfo', query: { infoId: row.id, - // standNumSplit: row.standNumSplit === null ? row.showNumber : row.standNumSplit, - // standNameSplit: row.standNameSplit === null ? row.standName : row.standNameSplit, result: row.result, - // fileType: row.fileType } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 8e443909d..9c9831194 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -340,7 +340,7 @@ export default { // 点击批量删除事件 deleteList() { - if (this.selectList.length < 1) { + if (this.selectedList.length < 1) { this.$message.warning("请选择一条数据进行删除"); } else { this.$confirm("您确认删除这些数据?", "提示", { @@ -350,7 +350,7 @@ export default { type: "warning" }).then(() => { let exits = []; - this.selectList.map(item => { + this.selectedList.map(item => { let index; index = this.dataList.findIndex(items => { return items.id = item; @@ -360,7 +360,7 @@ export default { } exits.push(item); }); - this.selectList = []; + this.selectedList = []; }).catch(() => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 9407ee22c..2fbc81167 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -92,8 +92,10 @@ - -
{{ 11 || '暂无数据' }}
+ + @@ -263,6 +265,16 @@ export default { } this.getData() }, + download(row) { + // window.open(process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + tPath) + var name = row.fileText; + var url = row.fileTextPath; + const a = document.createElement('a') + a.setAttribute('download', name) + a.setAttribute('target', '_blank') + a.setAttribute('href', process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + url) + a.click() + }, // 分页事件 pageChange (page) { this.pageNo = page diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 1356728b8..aece23601 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -462,7 +462,7 @@ export default { // 新增、编辑 基础信息字段 sarAccessEO: { id: '', - sortKey: 1, + sortKey: 4, detailedList: '', detailedListName: '', energyKind: '', diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 96ac0b5fe..7b9220a28 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -10,8 +10,8 @@ - - + + { if (valid) { let rowlist = [] diff --git a/src/router/index.js b/src/router/index.js index 4ab6e1b9d..8d295b2a8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -702,7 +702,7 @@ const routes = [ meta: { requireAuth: false, // parentPath: '/standAutoSplit', - title: '标准分解单' + title: '拆分结果' } }, // 标准编号申领 From 959ab65acd54cc5161ad636ab018b3ca88939fbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 19 Jul 2021 10:57:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1.vue | 77 +++++++++++++++- .../pages/creatProcess/bzqdfb/step2.vue | 42 --------- .../pages/creatProcess/bzqdfb/step3.vue | 2 - .../pages/creatProcess/bzqdfb/step4.vue | 2 - .../pages/creatProcess/xmpg/step1.vue | 89 +++++++++++++++++-- .../pages/creatProcess/xmpg/step2.vue | 2 - .../pages/creatProcess/xmpg/step3.vue | 2 - .../pages/creatProcess/xmpg/step4.vue | 2 - .../pages/creatProcess/xmpg/step5.vue | 2 - .../pages/creatProcess/xmpg/step6.vue | 2 - .../pages/creatProcess/xmpg/step7.vue | 2 - src/sysConfig/index.js | 2 +- 12 files changed, 158 insertions(+), 68 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index a3b48f73e..10019cd87 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -577,6 +577,51 @@
+
+ + + + + + + + + + + + + 查询 + + + + 清空 + + + +
-
-
- - - -

标准/政策法规工程师

-
- -
- - - - -

责任人

-
- - - -
- - - - -

标准/政策法规工程师

-
- -
- - - - -

业务经理

-
- -
- - - -
-
新增 - 批量删除 + 批量删除
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { + this.selectList.map(item => { + let index; + index = this.dataList.findIndex(items => { + return items.productLine = item + }) + if (index > -1) { + this.dataList.splice(index, 1); + } + }); + this.selectList = []; + }).catch(() => { + }) + } + }, //取消添加事件 cancelStand() { this.standModel = false; @@ -590,6 +660,7 @@ export default { }, { _this: this }, res => { + console.log(res.data); this.listForm.breakdownList = res.data; this.ListModel = false; }, e => { @@ -609,7 +680,7 @@ export default { selectStandChange(data) { this.selectList = []; for (let i = 0; i < data.length; i++) { - this.selectList.push(data[i].id); + this.selectList.push(data[i].productLine); } }, //添加产品线select的改变 @@ -655,7 +726,7 @@ export default { }, { _this: this }, res => { - this.productData = res.data; + this.productData = res.data.records; this.totalNo = res.data.total; }, e => { @@ -663,20 +734,24 @@ export default { }, //获取标准数据 getStandData() { - console.log(this.page); - console.log(this.pageSize); this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", { page: this.page, pageSize: this.pageSize, }, { _this: this }, res => { - console.log(res.data); this.sarAccessListDatas = res.data.list; this.total = res.data.count; }, e => { }); - } + }, + clearSearch() { + this.sarSarAccessEOSearch = { + standName: "", + standNumber: "" + }; + this.getStandData(); + }, }, computed: {}, mounted() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index d9e41a3e0..5d6473957 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -132,14 +132,12 @@ prop="name" label="任务步骤" align="center" - sortable="custom" >