From 7285c160d2bab2545993f9bee2dd6a8520638287 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 29 Dec 2021 09:36:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8B=86=E5=88=86=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=B8=8E=E7=BC=96=E8=BE=91=E6=A1=86=E4=B8=80?= =?UTF-8?q?=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standAutoSplit/pages/itemSplitInfo.vue | 215 +++++++++++++++--- 1 file changed, 179 insertions(+), 36 deletions(-) diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index 7291d830e..e996b9f6f 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -319,7 +319,7 @@ @close="showItemInfoModal = false" class="demo-drawer" > -
+ +
+ --> +
+ + + + + + + + + + 内容简介 +
+
+ + + + + + +
+ +
{{item.itemContent}}
+
+ + +
+ +
+
+
+ + +
+
+
@@ -1873,35 +1989,6 @@ export default { }) } }, - // 获取关联文件名称 - getFileName (row) { - this.referanceStandList = [] - if (row.referenceStand != null && row.referenceStand !== '') { - this.referanceStandList = row.referenceStand.split(',') - } - if (row.relevanceFile === null) { - this.standItemEO.FileNameList = [] - this.showItemInfoModal = true - return false - } else { - this.$http.get('att/attFile/getMultiFileInfos', { - fileIds: row.relevanceFile - }, { - _this: this - }, res => { - // let fileNameList = [] - // this.standItemEO.relevanceFileName = '' - // res.data.map((item) => { - // fileNameList.push(item.oldFileName) - // }) - // this.standItemEO.relevanceFileName = fileNameList.join('；') - this.standItemEO.FileNameList = res.data - this.showItemInfoModal = true - }, e => { - this.showItemInfoModal = true - }) - } - }, addSpecialRequest (item, index) { let specialObj = { description: '', @@ -2084,7 +2171,7 @@ export default { // this.clause(command[0]) // break case '属性': - this.attribute(command[0]) + this.attribute(command[2], command[0]) break case '编辑': this.editLawsInfo(command[2], command[0]) @@ -2154,9 +2241,65 @@ export default { this.showItemRequestDetails() }, // 点击表格 属性按钮事件 - attribute (row) { - this.getFileName(row) - this.showItemInfoEO = JSON.parse(JSON.stringify(row)) + attribute (index, row) { + this.isSubmit = false + this.standItemEO.id = row.id + this.showItemInfoModal = true + this.saveEditItemIndex = index + this.standItemEO = JSON.parse(JSON.stringify(row)) + if (this.standItemEO.applyArctic && !(this.standItemEO.applyArctic instanceof Array)) { + let a = this.standItemEO.applyArctic.split(',') + this.standItemEO.applyArctic = a // 适用车型 + } + if (this.standItemEO.newcarPutTime != null && this.standItemEO.newcarPutTime !== '') { + this.standItemEO.newcarPutTime = this.standItemEO.newcarPutTime.replace(new RegExp(/-/gm), '/') + this.standItemEO.newcarPutTime = new Date(this.standItemEO.newcarPutTime) + } + if (this.standItemEO.productPutTime != null && this.standItemEO.productPutTime !== '') { + this.standItemEO.productPutTime = this.standItemEO.productPutTime.replace(new RegExp(/-/gm), '/') + this.standItemEO.productPutTime = new Date(this.standItemEO.productPutTime) + } + if (this.standItemEO.paramsList == null || this.standItemEO.paramsList.length < 1) { + let specialObj = { + description: '', + figure: '' + } + this.standItemEO.paramsList.push(specialObj) + } + this.standItemEO.ZRBM = this.standItemEO.responsibleUnit + this.saveItemId = row.id + this.showUpdateItemInfo() + // this.getFileName(row) + // this.showItemInfoEO = JSON.parse(JSON.stringify(row)) + }, + // 获取关联文件名称 + getFileName (row) { + this.referanceStandList = [] + if (row.referenceStand != null && row.referenceStand !== '') { + this.referanceStandList = row.referenceStand.split(',') + } + if (row.relevanceFile === null) { + this.standItemEO.FileNameList = [] + this.showItemInfoModal = true + return false + } else { + this.$http.get('att/attFile/getMultiFileInfos', { + fileIds: row.relevanceFile + }, { + _this: this + }, res => { + // let fileNameList = [] + // this.standItemEO.relevanceFileName = '' + // res.data.map((item) => { + // fileNameList.push(item.oldFileName) + // }) + // this.standItemEO.relevanceFileName = fileNameList.join('；') + this.standItemEO.FileNameList = res.data + this.showItemInfoModal = true + }, e => { + this.showItemInfoModal = true + }) + } }, getDicTypeName(opt, type) { const _type = type ? type.split(',') : [] From 54c50bd0b637cbec6cb1676efc4015f3ea1ac4f6 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 29 Dec 2021 09:54:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg2/step1-12.vue | 29 ++++--------------- .../pages/creatProcess/xmpg2/step10.vue | 5 ++++ .../pages/creatProcess/xmpg2/step11.vue | 5 ++++ .../pages/creatProcess/xmpg2/step12.vue | 5 ++++ .../pages/creatProcess/xmpg2/step7.vue | 29 ++++--------------- .../pages/creatProcess/xmpg2/step8.vue | 5 ++++ .../pages/creatProcess/xmpg2/step9.vue | 5 ++++ 7 files changed, 35 insertions(+), 48 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue index b69e1ff75..0e6f8e884 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue @@ -155,6 +155,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -297,30 +299,6 @@ export default { }); window.open(routeUrl.href, "_blank"); }, - //查询项目下的标准 - getStandData() { - this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", { - standType: this.standardSearch.standType, - standNumber: this.standardSearch.standNumber, - page: this.pageNo, - pageSize: this.pageSizeNo - }, { - _this: this - }, res => { - this.standardData = res.data.list; - this.standardData.forEach(item => { - if(item.attrInfoMap === null){ - this.$set(item, "ZCCSSRQ", ''); - this.$set(item, "XCXSSRQ", ''); - }else{ - this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); - this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); - } - }) - this.totalNo = res.data.count; - }, e => { - }); - }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -398,6 +376,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, //驳回事件 beforeBack() { if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index 89d261398..d53a543b5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -200,6 +200,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -551,6 +553,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue index 4df5c1836..984ad8d2b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue @@ -200,6 +200,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -526,6 +528,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, }, computed: { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index 775f91db2..fba54c8cb 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -200,6 +200,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -551,6 +553,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue index 70d0b79c0..2e7651a5d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -158,6 +158,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -367,30 +369,6 @@ export default { }); window.open(routeUrl.href, "_blank"); }, - //查询项目下的标准 - getStandData() { - this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", { - standType: this.standardSearch.standType, - standNumber: this.standardSearch.standNumber, - page: this.pageNo, - pageSize: this.pageSizeNo - }, { - _this: this - }, res => { - this.standardData = res.data.list; - this.standardData.forEach(item => { - if (item.attrInfoMap === null) { - this.$set(item, "ZCCSSRQ", ""); - this.$set(item, "XCXSSRQ", ""); - } else { - this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); - this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); - } - }); - this.totalNo = res.data.count; - }, e => { - }); - }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -509,6 +487,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue index e2f7bb78a..8efce2454 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -198,6 +198,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -549,6 +551,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue index ccb983998..9fac7b4aa 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -200,6 +200,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -551,6 +553,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, }, computed: { listNoDataText() {