diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 1bb8eb380..449a81873 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,23 @@ 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 = ""; } + if(item.children){ + item.children.forEach(val => { + if(val.termsConditions){ + delete val.termsConditions + } + }) + } }); this.isSubmit = true; this.listForm.commentText = this.commentText; 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 }} + 0) { // 获取数值 let resultdata = data.list[0]['groupdata'] + let NYLXCLASS = resultdata['NYLXCLASS'] || {} + let NYLX = resultdata['NYLX'] || {} + if (Object.keys(NYLX).length > 0 && Object.keys(NYLXCLASS).length === 0) { + NYLXCLASS = NYLX + } + resultdata['NYLXCLASS'] = NYLXCLASS for (let i = 0; i < seniortype.length; i++) { let nowdata = [{}]