diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index a759791e9..df4797b8a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -559,8 +559,16 @@ export default { this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get('lawss/activiti/startProcess', { - type: '2' + this.$http.get('lawss/activiti/startProcessRollBack', { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '2', + json: JSON.stringify({ + form: this.form, + roleForm: this.roleForm, + commentText: this.commentText + }) }, {}, res => { if (res.ok) { var json = Object.assign(this.form, this.roleForm) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index 3ff87198d..42041d108 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -462,6 +462,8 @@ export default { comityOptionsOne: [], comityOptionsTwo: [], comityOptionsTree: [], + comityOpRole: '', + comityOpRoleId: '', }, comityRoleOptions: [ {value: '0', label: '委员'}, diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index 11615fc3c..b3d7f0df8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -113,8 +113,9 @@ @@ -212,6 +213,13 @@ @submit="handleSubmit" > + + @@ -257,7 +265,7 @@ export default { workPath: '', comityTel: [], comityOpRole: '', - comityInRoleId: '', + comityOpRoleId: '', }, roleForm: {}, commentText: '', @@ -317,7 +325,6 @@ export default { getFormFieldList(item) { this.$nextTick(() => { this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData - this.rh_pageData.comityOpRole = this.$store.getters.userInfo.userName this.roleForm = JSON.parse(JSON.stringify(item)).roleList this.infoSourcesLength = this.rh_pageData.infoSources.length // this.rh_pageData.comityFileNum = this.fileTextList @@ -371,6 +378,28 @@ export default { window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; } }, + + /** 选择入会人员 */ + choiceRole(id) { + this.nodeList = [] + this.nodeList.push(id) + this.roleShowflag = true + }, + drawerCheck(data) { + var idList = '' + var nameList = '' + data.forEach(item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id; + nameList += item.name; + }) + this.rh_pageData.comityOpRole = nameList + this.rh_pageData.comityOpRoleId = idList + this.roleShowflag = false + }, // 退回按钮 handleSubmitNo() { if (this.commentText === '') { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 8ad8410ea..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 @@ @@ -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: { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index f7f47e2ea..5efe18811 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -1185,8 +1185,18 @@ export default { this.$message.warning('请选择责任人') } else { this.isSubmit = true - this.$http.get('lawss/activiti/startProcess', { - type: '9' + this.$http.post('lawss/activiti/startProcessRollBack', { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '9', + json: JSON.stringify({ + form: this.form, + roleForm: this.roleForm, + commentText: this.commentText, + itemList: this.itemList, + sarType: this.sarType + }) }, {}, res => { if (res.ok) { var json = Object.assign(this.form, this.roleForm) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 6628a95d4..3cfe97df7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -140,7 +140,16 @@ 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 }, diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 49986e59d..707111fcd 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">
- - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + +
-
+
- + +
隐藏基础信息 展开基础信息 @@ -136,13 +137,18 @@
- 批量分发落实人 + 添加 + + 批量删除 + + + 批量分发落实人
- - + + + + + + + + 流程列表加载中
- + + +
+
+
+
+ + + + + + + + + + 查询 + + + + 清空 + + + +
+ + + + + + + + +
+ +
+
+
+ 取消 + 添加 +
+ { inboundLiaisonDetail({ @@ -539,53 +659,143 @@ export default { */ 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; + let ids = [] + projectLineList.forEach(item => { + ids.push(item.productLine); + }); + this.projectLineId = ids.join(',') + 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 +808,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 +823,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 +888,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 +932,8 @@ export default { console.log(data); this.selectList = data; }, - selectThree() { - + selectThree(data) { + this.selectProject = data; }, pageChange(page) { this.page = page; diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue index 641508646..b577a8962 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue @@ -162,10 +162,10 @@ > - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + {{'手动查找'}} + + + + + + + + + + + + + + + @@ -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 => {