From 619f89e504760e93aed01e9fec9825f65960c0e1 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 20 Dec 2021 16:25:50 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=8F=82=E4=BC=9A=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=8D=8F=E4=BC=9A=E9=A2=84=E8=AE=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzhHy-ch/step1.vue | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 8ad8410ea..f0c75b9f1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -452,7 +452,22 @@ export default { type: 0 } workGroup(type).then(res => { - this.ch_pageData.associaOptionsOne = res.data.children + if (res.data.children !== null) { + this.ch_pageData.associaOptionsOne = res.data.children + this.ch_pageData.associaName = this.ch_pageData.associaOptionsOne[0].id + this.ch_pageData.associaOptionsOne.forEach(item => { + if (item.children !== null && item.id === this.ch_pageData.associaName) { + this.ch_pageData.associaOptionsTwo = item.children + this.ch_pageData.associaNameOne = this.ch_pageData.associaOptionsTwo[0].id + } + }) + this.ch_pageData.associaOptionsTwo.forEach(item => { + if (item.children !== null && item.id === this.ch_pageData.associaNameOne) { + this.ch_pageData.associaOptionsTree = item.children + this.ch_pageData.associaNameTwo = this.ch_pageData.associaOptionsTree[0].id + } + }) + } }) }, methods: { From adbced0aad41ab9720f08b3feb0df18ee5f477f6 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 20 Dec 2021 17:07:53 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=8F=82=E4=BC=9A=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=97=B6=E5=88=86=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index f0c75b9f1..30289bc72 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -78,8 +78,8 @@ From c986a34e2c0e2736ff2ed245163184a9343a3b0b 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, 20 Dec 2021 17:23:12 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step3.vue | 316 +++++++++++++++--- 1 file changed, 261 insertions(+), 55 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index d703bce4e..6b91e8d2f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -136,13 +136,18 @@
- 批量分发落实人 + 添加 + + 批量删除 + + + 批量分发落实人
- + /> 流程列表加载中 - + + +
+
+
+
+ + + + + + + + + + 查询 + + + + 清空 + + + +
+ + + + + + + + +
+ +
+
+
+ 取消 + 添加 +
+ { inboundLiaisonDetail({ @@ -538,54 +657,141 @@ export default { * @description: 动态表单读取 */ getFormFieldList(item) { - console.log(item); + this.projectJson = JSON.parse(JSON.stringify(item)); this.listForm = JSON.parse(JSON.stringify(item)); if (item.form === undefined) { this.listForm.prcNum = this.prcNum; this.listForm.prcName = this.prcName; this.listForm["id"] = item.id; this.listForm = JSON.parse(JSON.stringify(item.pepdtos[0])); - this.listForm.breakdownList = []; - for (let i = 0; i < item.pepdtos.length; i++) { - for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) { - if (item.pepdtos[i].xcxssrq === null) { - item.pepdtos[i].xcxssrq = ""; - } - if (item.pepdtos[i].zccssrq === null) { - item.pepdtos[i].zccssrq = ""; - } - this.listForm.breakdownList.push({ - itemsName: item.pepdtos[i].breakdownList[j].itemsName, - itemNum: item.pepdtos[i].breakdownList[j].itemsNum, - technicalRequir: item.pepdtos[i].breakdownList[j].technicalRequir, - changePoint: item.pepdtos[i].breakdownList[j].changePoint, - responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer, - responsibleUnit: item.pepdtos[i].breakdownList[j].responsibleUnit, - productLine: item.pepdtos[i].sarStandProjectLibraries.productLine, - projectNumber: item.pepdtos[i].sarStandProjectLibraries.projectNumber, - projectName: item.pepdtos[i].sarStandProjectLibraries.projectName, - implementer: item.pepdtos[i].breakdownList[j].implementer || null, - distributePerson: item.pepdtos[i].distributePerson, - distributePersonId: item.pepdtos[i].distributePersonId, - uname: item.pepdtos[i].uname, - projectManager: item.pepdtos[i].projectManager, - certifiedEngineerName: item.pepdtos[i].certifiedEngineerName, - qualityEngineerName: item.pepdtos[i].qualityEngineerName, - standNumber: item.pepdtos[i].standNumber, - standName: item.pepdtos[i].standName, - id: item.pepdtos[0].id, - xcxssrq: item.pepdtos[i].XCXSSRQ, - zccssrq: item.pepdtos[i].ZCCSSRQ - }); - this.total = this.listForm.breakdownList.length - } - } + let projectLineList = item.pepdtos[0].dataList; + projectLineList.forEach(item => { + this.projectLineId = item.productLine; + }); + this.getProject(); } else { this.listForm = item.form; - this.listForm.breakdownList = item.form.breakdownList; + this.breakdownList = item.form.breakdownList; } }, + getProject() { + this.$http.get("sarStandProjectLibrary/queryProjectUnderLine", { + productLine: this.projectLineId, + current: this.pageNo, + pageSize: this.pageSizeNo, + projectName: this.standardSearch.projectName, + projectNumber: this.standardSearch.projectNumber + }, { + _this: this + }, res => { + this.projectData = res.data.records; + this.totalNo = res.data.total; + }); + }, + clearStandSearch() { + this.standardSearch = { + projectName: "", + projectNumber: "" + }; + this.getProject(); + }, + okStand() { + if (!this.selectProject.length) { + this.$message.warning("请至少选择一条产品线进行添加"); + } else { + let proList = this.projectJson.pepdtos[0].dataList; + this.selectProject.map(item => { + proList.forEach(items => { + if (item.productLine === items.productLine) { + items.sarStandProjectLibraries.push(item); + } + }); + }); + this.projectJson.pepdtos[0].dataList = proList; + this.$http.post("activityData/backData", { + json: JSON.stringify(this.projectJson.pepdtos[0]) + }, { + _this: this + }, res => { + let item = JSON.parse(res.data); + for (let i = 0; i < item.pepdtos.length; i++) { + for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) { + if (item.pepdtos[i].xcxssrq === null) { + item.pepdtos[i].xcxssrq = ""; + } + if (item.pepdtos[i].zccssrq === null) { + item.pepdtos[i].zccssrq = ""; + } + this.breakdownList.push({ + itemsName: item.pepdtos[i].breakdownList[j].itemsName, + itemNum: item.pepdtos[i].breakdownList[j].itemsNum, + technicalRequir: item.pepdtos[i].breakdownList[j].technicalRequir, + changePoint: item.pepdtos[i].breakdownList[j].changePoint, + responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer, + responsibleUnit: item.pepdtos[i].breakdownList[j].responsibleUnit, + productLine: item.pepdtos[i].sarStandProjectLibraries.productLine, + projectNumber: item.pepdtos[i].sarStandProjectLibraries.projectNumber, + projectName: item.pepdtos[i].sarStandProjectLibraries.projectName, + implementer: item.pepdtos[i].breakdownList[j].implementer || null, + distributePerson: item.pepdtos[i].distributePerson, + distributePersonId: item.pepdtos[i].distributePersonId, + uname: item.pepdtos[i].uname, + projectManager: item.pepdtos[i].projectManager, + certifiedEngineerName: item.pepdtos[i].certifiedEngineerName, + qualityEngineerName: item.pepdtos[i].qualityEngineerName, + standNumber: item.pepdtos[i].standNumber, + standName: item.pepdtos[i].standName, + id: item.pepdtos[0].id, + xcxssrq: item.pepdtos[i].XCXSSRQ, + zccssrq: item.pepdtos[i].ZCCSSRQ + }); + this.total = this.breakdownList.length; + } + } + }); + this.projectModel = false; + } + + }, + //批量删除 + deleteList() { + if (!this.selectList.length) { + this.$message.warning("请至少选择一条数据进行删除"); + } else { + this.$confirm("您确认删除这些数据?", "提示", { + confirmButtonText: "确认", + confirmButtonClass: "common-button-primary", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + let exits = []; + this.selectList.map(item => { + let index; + index = this.breakdownList.findIndex(items => { + return items.itemsName === item.itemsName; + }); + if (index > -1) { + this.breakdownList.splice(index, 1); + } + exits.push(item); + }); + this.selectList = []; + }).catch(() => { + }); + } + }, + cancelStand() { + this.projectModel = false; + }, + pageChangeNo(page) { + this.pageNo = page; + this.getProject(); + }, + pageSizeChangeNo(pageSize) { + this.pageSizeNo = pageSize; + this.getProject(); + }, checkedRole(data) { var idList = ""; var nameList = ""; @@ -598,10 +804,10 @@ export default { nameList += item.name; }); if (this.type === 1) { - this.listForm.breakdownList[this.lsIndex].implementerId = idList; - this.listForm.breakdownList[this.lsIndex].implementer = nameList; + this.breakdownList[this.lsIndex].implementerId = idList; + this.breakdownList[this.lsIndex].implementer = nameList; } else if (this.type === 2) { - this.listForm.breakdownList.forEach(item => { + this.breakdownList.forEach(item => { this.selectStandList.forEach(items => { if (item === items) { item.implementerId = idList; @@ -613,20 +819,20 @@ export default { } this.modalshowflag = false; }, - cancleUserInfo() { - this.modalshowflag = false; + addProject() { + this.projectModel = true; }, choiceZRRS(row, type, index) { - this.selectStandList = this.selectList + this.selectStandList = this.selectList; this.type = type; if (type === 1) { this.drawerTitle = "选择责任人"; this.nodeList = []; this.lsIndex = index; this.lsType = type; - if(row.implementerId){ + if (row.implementerId) { this.nodeList = row.implementerId.split(","); - }else{ + } else { this.nodeList.push(row); } this.modalshowflag = true; @@ -678,9 +884,9 @@ export default { //提交事件 handleSubmit() { let standList = [] - this.listForm.breakdownList.forEach(item => { + this.breakdownList.forEach(item => { if (item.implementer) { - standList.push(item) + standList.push(item); } }); this.listForm.breakdownList = standList @@ -722,8 +928,8 @@ export default { console.log(data); this.selectList = data; }, - selectThree() { - + selectThree(data) { + this.selectProject = data; }, pageChange(page) { this.page = page; From cc5265b4582fb1f937163538918ae9f62214b3de Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 21 Dec 2021 09:53:50 +0800 Subject: [PATCH 04/12] commit --- .../pages/creatProcess/bzjd/step2.vue | 24 ++++++++++++------ .../pages/creatProcess/bzjd/step3.vue | 25 ++++++++++--------- 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 6628a95d4..6283b88ff 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -140,7 +140,6 @@ label="在产车型实施日期" align="center"> - { - this.zxIdList.forEach( items => { - if (item.id === items) { - item.zxUserId = data[0].id - item.zxUserIdName = data[0].name + for (let a = 0; a < this.itemList.length; a++) { + for (let b = 0; b < this.zxIdList.length; b++) { + if (this.itemList[a].id === this.zxIdList[b]) { + this.itemList[a].zxUserId = data[0].id + this.itemList[a].zxUserIdName = data[0].name + let row = JSON.parse(JSON.stringify(this.itemList[a])) + row.zxUserId = data[0].id + row.zxUserIdName = data[0].name + this.$set(this.itemList, a, row) } - }) - }) + } + } } this.modalshowflag = false }, @@ -488,6 +495,7 @@ item.zxUserIdName = item.zxUserIdName || '' }) this.itemList = arr + console.log(this.itemList); this.loading = false }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 49986e59d..b12aa421e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -836,18 +836,19 @@ } else { itemList = data.itemList } - itemList.forEach(item => { - item.unitDeptName = this.$store.getters.userInfo.institutionName - item.onlineData = item.onlineData || '' - item.newData = item.newData || '' - item.complianceState = item.complianceState || '' - item.oldNumber = item.oldNumber || '' - item.complianceRequir = item.complianceRequir || '1' - item.changePoint = item.changePoint || '' - item.technicalRequir = item.technicalRequir || '' - item.itemsTitle = item.itermsConditions - item.applyArctic = item.applyArctic || [] - }) + console.log(itemList); + // itemList.forEach(item => { + // item.unitDeptName = this.$store.getters.userInfo.institutionName + // item.onlineData = item.onlineData || '' + // item.newData = item.newData || '' + // item.complianceState = item.complianceState || '' + // item.oldNumber = item.oldNumber || '' + // item.complianceRequir = item.complianceRequir || '1' + // item.changePoint = item.changePoint || '' + // item.technicalRequir = item.technicalRequir || '' + // item.itemsTitle = item.itermsConditions + // item.applyArctic = item.applyArctic || [] + // }) this.getBDList() this.itemList = itemList this.loading = false From dba6c6dbaed6941faae3126369c812e5f1f49fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 21 Dec 2021 10:39:32 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step3.vue | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 6b91e8d2f..cb4584e91 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -10,13 +10,13 @@
审批历史
-
+
- + +
隐藏基础信息 展开基础信息 @@ -147,7 +148,7 @@
- + + + + + + + + { - this.projectLineId = item.productLine; + ids.push(item.productLine); }); + this.projectLineId = ids.join(',') this.getProject(); } else { this.listForm = item.form; @@ -679,7 +683,7 @@ export default { this.$http.get("sarStandProjectLibrary/queryProjectUnderLine", { productLine: this.projectLineId, current: this.pageNo, - pageSize: this.pageSizeNo, + PageSize: this.pageSizeNo, projectName: this.standardSearch.projectName, projectNumber: this.standardSearch.projectNumber }, { From 05ae32825daf3177a9ce33bc3777b4faca537f31 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 21 Dec 2021 11:00:43 +0800 Subject: [PATCH 06/12] feat: There is no way the, --- src/pages/processCenter/pages/creatProcess/qbrk/step1.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index d6b350f39..cb1830288 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -977,7 +977,7 @@ width = "500" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" - :nodeKey="nodeKey" @popoverHide="popoverHide"> + :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> + :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel">
From 6877bdd749b00ad91a4defd8e5ea2c23bcb26d84 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 21 Dec 2021 11:09:44 +0800 Subject: [PATCH 07/12] commit --- .../pages/creatProcess/bzjd/step2.vue | 11 +- .../pages/creatProcess/bzjd/step3.vue | 216 +++++++++--------- .../pages/creatProcess/bzjd/step4.vue | 2 +- .../pages/creatProcess/bzjd/step5.vue | 2 +- .../pages/creatProcess/bzjd/step6.vue | 2 +- 5 files changed, 123 insertions(+), 110 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 6283b88ff..3cfe97df7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -140,6 +140,16 @@ label="在产车型实施日期" align="center"> + + + { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index b12aa421e..42c8cae67 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -178,7 +178,7 @@ @@ -292,27 +292,27 @@ size="800px">
- - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + +
+ + + + + + + + + + + + {{'手动查找'}} + + + + + + + + + + + + + + + @@ -651,7 +658,7 @@ @@ -694,12 +701,11 @@ { @@ -1881,20 +1887,15 @@ }) } this.selectedListRep.map((item) => { - let texts = '' - if (item.standYear != null && item.standYear !== '') { - texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear - } else { - texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber - } + let texts = item.lawsNumber textArr.push(texts) textArr = [...new Set(textArr)] this.replaceLawsNumModel = false }) // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖 - if(this.replaceLawType === 'dtbjh'){ - this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',') + if(this.replaceLawType === 'YYBZZCLAWS'){ + this.form.YYBZZCLAWS = this.form.YYBZZCLAWS ? this.form.YYBZZCLAWS + ',' + textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'yybj'){ this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'cbbh'){ @@ -1949,7 +1950,7 @@ this.replaceLawsNumForm.quoteIdList = '' } this.replaceLawsNumForm.standType = this.form.standInData === '1' ? 'FOREIGN' : 'INLAND' - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, { + this.$http.get('lawss/sarLawsInfo/page', this.replaceLawsNumForm, { _this: this, loading: 'replaceLoading' }, res => {