From a62f990874d3c03c1148a631f4f1034ada615cd6 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 28 Sep 2022 12:14:22 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=EF=BC=8C=E8=B4=A3=E4=BB=BB?= =?UTF-8?q?=E4=BA=BA=E5=A1=AB=E5=86=99=E8=AF=84=E4=BC=B0=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=A1=E6=AC=BE=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step3.vue | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 1bb8eb380..d1c3403bf 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -112,6 +112,19 @@ align="center" label="条款名称"> + + + + + +
+
+ 关闭 +
+ @@ -513,7 +533,9 @@ export default { currentPage: 1, pageSize: 20, nodeList: [], + itemsTextDialogs:false, isTransfer: false, + itemsText:'', // 调整处理人抽屉状态 drawerModal: false, batchEditForm: { @@ -671,6 +693,10 @@ export default { }); window.open(routeUrl.href, "_blank"); }, + itemsTextDialog(itemsNum, text) { + this.itemsTextDialogs = true + this.itemsText = '

' + itemsNum + '

' + text.replace(/''/g, '\'') + }, //查询项目下的标准 getStandData() { this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", { @@ -764,6 +790,7 @@ export default { this.$set(items, "standYear", item.standYear); this.$set(items, "standSort", item.standSort); this.$set(items, "standNumber", item.standNumber); + this.$set(items, "termsConditions", item.termsConditions); } }) }) @@ -777,12 +804,28 @@ export default { if(index > -1){ dataListChildren.splice(index, 1) } + let idList = [] dataListChildren.forEach(item => { + idList.push(item.id) item.workPeople = this.$store.getters.userInfo.userName item.workPeopleId = this.$store.getters.userInfo.userId }) + this.$http.post("SarStandItems/sar-stand-items/findTermsConditions",{ + idList: idList + }, { + _this:this + }, res => { + res.data.forEach(val => { + dataListChildren.forEach(item => { + if(item.id == val.id){ + item.termsConditions = val.termsConditions + } + }) + }) + }) this.dataList = dataListChildren; this.total = this.dataList.length; + this.$forceUpdate() } else { let dataChildren = []; let dataListChildren = []; @@ -896,11 +939,21 @@ export default { this.$message.warning("请填写完整的不符合项信息"); this.comFlag = 0; } else { + this.listForm.breakdownList.forEach(item => { + if (item.termsConditions) { + item.termsConditions = '' + } + }); this.listForm.dataList.forEach(item => { // item.userId = this.$store.getters.userInfo.userId if (item.workPeople === "请选择责任人") { item.workPeople = ""; } + item.children.forEach(val => { + if(val.termsConditions){ + delete val.termsConditions + } + }) }); this.isSubmit = true; this.listForm.commentText = this.commentText; From 2bf2c704cbcf3ed25fb2e4535c089566f8140ede Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 28 Sep 2022 14:26:40 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=EF=BC=8C=E8=B4=A3=E4=BB=BB?= =?UTF-8?q?=E4=BA=BA=E5=A1=AB=E5=86=99=E8=AF=84=E4=BC=B0=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=A1=E6=AC=BE=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/xmpg/step3.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index d1c3403bf..449a81873 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -949,11 +949,13 @@ export default { if (item.workPeople === "请选择责任人") { item.workPeople = ""; } - item.children.forEach(val => { - if(val.termsConditions){ - delete val.termsConditions - } - }) + if(item.children){ + item.children.forEach(val => { + if(val.termsConditions){ + delete val.termsConditions + } + }) + } }); this.isSubmit = true; this.listForm.commentText = this.commentText; From 977d9aa7d29a41b9e5421b562f45815e1f5469a5 Mon Sep 17 00:00:00 2001 From: zhuangxinwei <1152856986@qq.com> Date: Fri, 30 Sep 2022 10:53:59 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=83=BD=E6=BA=90=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/searchCenter/pages/standardSearch.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index 4d9b9d378..b51b56f92 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -979,6 +979,12 @@ if (data.list && data.list.length > 0) { // 获取数值 let resultdata = data.list[0]['groupdata'] + let NYLXCLASS = resultdata['NYLXCLASS'] || {} + let NYLX = resultdata['NYLX'] || {} + if (NYLX && NYLXCLASS !== {}) { + NYLXCLASS = NYLX + } + resultdata['NYLXCLASS'] = NYLXCLASS for (let i = 0; i < seniortype.length; i++) { let nowdata = [{}] if (typeof this.searchOptions[seniortype[i]] !== 'undefined') { From 08bc80ecef1d2fb17a7024ff1a24a041d6b54285 Mon Sep 17 00:00:00 2001 From: zhuangxinwei <1152856986@qq.com> Date: Fri, 30 Sep 2022 11:06:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=83=BD=E6=BA=90=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/searchCenter/pages/standardSearch.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index b51b56f92..02b75580f 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -981,7 +981,7 @@ let resultdata = data.list[0]['groupdata'] let NYLXCLASS = resultdata['NYLXCLASS'] || {} let NYLX = resultdata['NYLX'] || {} - if (NYLX && NYLXCLASS !== {}) { + if (Object.keys(NYLX).length > 0 && Object.keys(NYLXCLASS).length === 0) { NYLXCLASS = NYLX } resultdata['NYLXCLASS'] = NYLXCLASS From ff7e9905d97e5ad7b84c7b27614d597b3c66dcbd Mon Sep 17 00:00:00 2001 From: zhuangxinwei <1152856986@qq.com> Date: Fri, 30 Sep 2022 13:23:45 +0800 Subject: [PATCH 5/5] =?UTF-8?q?tabs=E5=8A=A0tooltip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/phone/bzpg/step7.vue | 3 +++ src/pages/processCenter/pages/phone/bzpg/step8.vue | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/pages/processCenter/pages/phone/bzpg/step7.vue b/src/pages/processCenter/pages/phone/bzpg/step7.vue index f55215802..a9c2e1d93 100644 --- a/src/pages/processCenter/pages/phone/bzpg/step7.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step7.vue @@ -54,6 +54,9 @@ :label="item" :value="item" :name="item"> + + {{ item }} + + + {{ item }} +