diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index ad7e4df9d..c75e17d9b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -451,6 +451,8 @@ export default { listForm: { standNumber: "", //标准编号 standName: "",//标准名称 + XCXSSRQ: "", //新车型实施日期 + ZCCSSRQ: "", //在产车实施日期 certifiedEngineer: "", //认证工程师 qualityEngineer: "", //质量工程师 breakdownList: [{ @@ -655,6 +657,7 @@ export default { if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) { this.$message.warning("请选择分发责任人"); } else { + this.isSubmit = true var json = Object.assign(this.listForm, this.roleForm); this.$refs["listForm"].validate((valid) => { if (valid) { @@ -708,9 +711,11 @@ export default { //选择拆分标准确定事件 OkDrawer() { - if (this.selectedList.length == 1) { + if (this.selectedList.length === 1) { this.listForm.standNumber = this.selectedList[0].standSortShow + '-' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ; this.listForm.standName = this.selectedList[0].standName; + this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj + this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj this.listForm.id = this.selectedList[0].id; this.$http.get("SarStandItems/sar-stand-items/findAllItems", { ids: this.listForm.id, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 283e74541..e3362d266 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -57,7 +57,7 @@
- 批量分发落实人 + 批量分发落实人
{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }} - + @@ -260,6 +259,8 @@ export default { tabValue: "listOfCountries", selectedList: [], //选择清单的选择框 selectList: [], //选择标准的选择框 + lsIndex: '', + lsType: '', bringData: [], commentText: "", //填写会签意见 page: 1, @@ -346,7 +347,7 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { - console.log(res); + console.log(res.mesg) if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); @@ -355,11 +356,6 @@ export default { }); }); }, - - createItemId() { - return Number(Math.random().toString().substr(3,18) + Date.now()).toString(36); - }, - /** * @description: 动态表单读取 */ @@ -373,7 +369,6 @@ export default { for (let i = 0; i < item.pepdtos.length; i++) { for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) { this.listForm.breakdownList.push({ - itemId: this.createItemId(), itemsName: item.pepdtos[i].breakdownList[j].itemsName, itemNum: item.pepdtos[i].breakdownList[j].itemsNum, responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer, @@ -395,46 +390,47 @@ export default { }); } } + console.log(this.listForm.breakdownList); }, - //批量操作按钮 - batchOperation(id) { - if (this.selectList.length === 0) { - this.$message.warning("请至少选择一条数据进行批量分发"); - } else { - this.nodeList = []; - this.nodeList.push(id); - this.modalshowflag = true; + checkedRole (data) { + if (this.type === 1) { + this.listForm.breakdownList[this.lsIndex].implementerId = data[0].id + this.listForm.breakdownList[this.lsIndex].implementer = data[0].name + } else if(this.type === 2) { + this.listForm.breakdownList.forEach( item => { + this.selectList.forEach( items => { + if (item === items) { + item.implementerId = data[0].id + item.implementer = data[0].name + } + }) + }) } - }, - checkedRole(data) { - // 选取负责人时的操作 - let mis = []; - let miss = []; - this.selectList.forEach(item => { - item.implementer = data[0].name; - item.implementerId = data[0].id; - mis.push(item.projectNumber); - miss.push(item.itemNum) - }); - this.listForm.breakdownList.forEach(item => { - if (!mis.includes(item.projectNumber) && !miss.includes(item.itemsNum)) { - this.selectList.push(item); - } - }); - this.listForm.breakdownList = this.selectList; - this.$refs.selection.clearSelection(); - this.modalshowflag = false; + this.modalshowflag = false }, cancleUserInfo() { this.modalshowflag = false; }, - choiceZRRS(scope) { - if (scope != null) this.dsadadadsada = scope.$index; - this.nodeList = []; - if (this.roleForm.implementer.length > 0) { - this.nodeList = this.roleForm.implementer.split(","); + choiceZRRS (row, type, index) { + this.type = type + if (type === 1) { + this.drawerTitle = '选择责任人' + this.nodeList = [] + this.lsIndex = index + this.lsType = type + this.nodeList.push(row) + this.modalshowflag = true + } else if (type === 2) { + // 批量 + if (this.selectList.length > 0) { + this.lsType = type + this.nodeList = [] + this.modalshowflag = true + this.drawerTitle = '批量选择责任人' + } else { + this.$message.warning('请选择要分发的数据') + } } - this.modalshowflag2 = true; }, getTree() { this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/test.vue b/src/pages/processCenter/pages/creatProcess/xmpg/test.vue new file mode 100644 index 000000000..daa015930 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg/test.vue @@ -0,0 +1,595 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index ff4dd93eb..120de5f7b 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -178,6 +178,7 @@ export default { let row = {...this.detailData[index]} row.taskIds = row.id row.taskInfo = row.name + console.log(row.name) row.tabsName = this.$route.query.tabsName let prcType = this.detailData[index].prcType // 流程类型 // 判断当前流程是否已全部办理完成 @@ -205,7 +206,7 @@ export default { this.toProcessDetail('bzqdfbStep4',row) }else if (prcType === '5'){ //标准项目合规评估 标准维度 - if(row.taskInfo === '标准法规部部长审批'){ + if(row.taskInfo === '标准法规部领导审核'){ this.toProcessDetail('xmpgStep7',row) }else{ this.toProcessDetail('xmpgStep2',row) diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 3e3f73c32..1a8c3c2a8 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -4,22 +4,22 @@
- - - - - - + + + + + + + + + + + + + + + +