diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js index 229f11353..fd83b43bf 100644 --- a/src/api/unqualProcess.js +++ b/src/api/unqualProcess.js @@ -65,7 +65,7 @@ export function meetingByMonth(params) { export function addUn( closeState,standId, standSerialNumber, standName, itemsNum, itemsName, productType, - productLine, productName,productId,reason, responsibleUnit, + productLine, productName,productId,reason, dutyEngineer, authEngineer, qaEngineer, planCloseTime) { const data = { closeState, @@ -79,7 +79,6 @@ export function addUn( productName, //项目名称 productId, //项目编号 reason, //不合规项目 - responsibleUnit, //责任部门 dutyEngineer, //责任工程师 authEngineer, //认证工程师 qaEngineer, //质量工程师 @@ -96,7 +95,7 @@ export function addUn( export function editUn( closeState, standId, standSerialNumber, standName, itemsNum, itemsName, productType, - productLine, productName, reason, responsibleUnit, + productLine, productName, reason, dutyEngineer, authEngineer, qaEngineer, planCloseTime, id) { const data = { closeState, @@ -109,7 +108,6 @@ export function editUn( productLine, //产品线 productName, //项目名称 reason, //不合规项目 - responsibleUnit, //责任部门 dutyEngineer, //责任工程师 authEngineer, //认证工程师 qaEngineer, //质量工程师 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 6a1c92983..d087c5262 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -646,6 +646,7 @@ v-show="verifySarStandard" show-save show-submit + :submitLoading="isSubmit" :saveLoading="saveLoading" @save="handleSave" @submit="handleSubmit" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue index f6314e0e3..be38c88bc 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue @@ -1003,6 +1003,7 @@ }, loading: false, drawerModal: false, + taskInfo:'标准法规部部长审核', assigneeNewLoading: false, disabledState: true, userId:this.$store.getters.userInfo.userId, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index caa388024..2cf8d8026 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -188,11 +188,17 @@ prop="planStatus" label="计划状态" align="center"> + + + + - + @@ -37,7 +37,7 @@ - + @@ -216,11 +216,17 @@ prop="planStatus" label="计划状态" align="center"> + + + +
-
+
-
+
-
+
- - - - - - - - - - - - - - - - + + { inboundLiaisonDetail({ @@ -555,6 +577,7 @@ export default { xcxssrq: item.pepdtos[i].XCXSSRQ, zccssrq: item.pepdtos[i].ZCCSSRQ }); + this.total = this.listForm.breakdownList.length } } } else { @@ -579,7 +602,7 @@ export default { this.listForm.breakdownList[this.lsIndex].implementer = nameList; } else if (this.type === 2) { this.listForm.breakdownList.forEach(item => { - this.selectList.forEach(items => { + this.selectStandList.forEach(items => { if (item === items) { item.implementerId = idList; item.implementer = nameList; @@ -594,6 +617,7 @@ export default { this.modalshowflag = false; }, choiceZRRS(row, type, index) { + this.selectStandList = this.selectList this.type = type; if (type === 1) { this.drawerTitle = "选择责任人"; @@ -653,14 +677,13 @@ export default { }, //提交事件 handleSubmit() { + let standList = [] this.listForm.breakdownList.forEach(item => { - if (item.implementer === null || item.implementer === "" || item.implementer === undefined) { - this.sarFlag = false; - } else { - this.sarFlag = true; + if (item.implementer) { + standList.push(item) } }); - if (this.sarFlag === true) { + this.listForm.breakdownList = standList this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; @@ -684,9 +707,6 @@ export default { this.isSubmit = false; }, e => { }); - } else { - this.$message.warning("请选择落实人"); - } }, drawerCheck(data) { var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); @@ -699,6 +719,7 @@ export default { }, //标准表格选择框改变 selectStandChange(data) { + console.log(data); this.selectList = data; }, selectThree() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index 2f69511df..5ed40df6e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -598,47 +598,48 @@ export default { }) if(!fileFlag){ this.$message.warning('请选择分解单来源') + }else{ + if (this.listForm.dataList.length < 1) { + this.$message.warning("请选择带标准的项目"); + } else { + this.listForm.commentText = this.commentText; + var json = Object.assign(this.listForm, this.roleForm); + json.prcCreateUser = this.$store.getters.userInfo.userId; + json.prcCreateUserName = this.$store.getters.userInfo.userName; + json.standId = this.listForm.standId; + this.$refs["listForm"].validate((valid) => { + if (valid) { + this.$refs["roleForm"].validate((valid) => { + if (valid) { + this.isSubmit = true; + this.$http.get("lawss/activiti/startProcess", { type: "6" }, { + _this: this + }, res => { + if (res.ok) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: res.data, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }); + } + }); + } else { + return this.$message.warning("请完善人员信息"); + } + }); + } else { + return this.$message.warning("请完善基础信息"); + } + }); } - if (this.listForm.dataList.length < 1) { - this.$message.warning("请选择带标准的项目"); - } else { - this.listForm.commentText = this.commentText; - var json = Object.assign(this.listForm, this.roleForm); - json.prcCreateUser = this.$store.getters.userInfo.userId; - json.prcCreateUserName = this.$store.getters.userInfo.userName; - json.standId = this.listForm.standId; - this.$refs["listForm"].validate((valid) => { - if (valid) { - this.$refs["roleForm"].validate((valid) => { - if (valid) { - this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "6" }, { - _this: this - }, res => { - if (res.ok) { - this.$http.post("lawss/activiti/completeTask", { - taskIds: res.data, - userId: this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }); - } - }); - } else { - return this.$message.warning("请完善人员信息"); - } - }); - } else { - return this.$message.warning("请完善基础信息"); - } - }); } }, choiceZRR(type, title, id) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index ce0e2ae44..ccdd41aac 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -615,47 +615,48 @@ export default { }) if(!fileFlag){ this.$message.warning('请选择分解单来源') + }else{ + if (this.listForm.dataList.length < 1) { + this.$message.warning("请选择带标准的项目"); + } else { + this.listForm.commentText = this.commentText; + var json = Object.assign(this.listForm, this.roleForm); + json.prcCreateUser = this.$store.getters.userInfo.userId; + json.prcCreateUserName = this.$store.getters.userInfo.userName; + json.standId = this.listForm.standId; + this.$refs["listForm"].validate((valid) => { + if (valid) { + this.$refs["roleForm"].validate((valid) => { + if (valid) { + this.isSubmit = true; + this.$http.get("lawss/activiti/startProcess", { type: "6" }, { + _this: this + }, res => { + if (res.ok) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: res.data, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }); + } + }); + } else { + return this.$message.warning("请完善人员信息"); + } + }); + } else { + return this.$message.warning("请完善基础信息"); + } + }); } - if (this.listForm.dataList.length < 1) { - this.$message.warning("请选择带标准的项目"); - } else { - this.listForm.commentText = this.commentText; - var json = Object.assign(this.listForm, this.roleForm); - json.prcCreateUser = this.$store.getters.userInfo.userId; - json.prcCreateUserName = this.$store.getters.userInfo.userName; - json.standId = this.listForm.standId; - this.$refs["listForm"].validate((valid) => { - if (valid) { - this.$refs["roleForm"].validate((valid) => { - if (valid) { - this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "6" }, { - _this: this - }, res => { - if (res.ok) { - this.$http.post("lawss/activiti/completeTask", { - taskIds: res.data, - userId: this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }); - } - }); - } else { - return this.$message.warning("请完善人员信息"); - } - }); - } else { - return this.$message.warning("请完善基础信息"); - } - }); } }, // 点击查看 diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index b388d992c..38d19e256 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -121,10 +121,6 @@ align="center" label="在产车实施日期"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ historySeeForm.responsibleUnit }}
-
{{ historySeeForm.dutyEngineer }}
+
{{ historySeeForm.dutyEngineerName }}
{{ historySeeForm.authEngineer }}
@@ -418,8 +418,9 @@ @@ -487,14 +488,14 @@ placeholder="请输入项目编号" /> - - - + + + + + + + + - @@ -775,22 +776,22 @@ export default { }, //表单数据 formRules: { standSerialNumber: [ - { required: true, message: "请输入标准号", trigger: "blur" } + { required: true, message: "请输入标准号", trigger: "change" } ], standName: [ - { required: true, message: "请输入标准名称", trigger: "blur" } + { required: true, message: "请输入标准名称", trigger: "change" } + ], + itemsNum: [ + { required: true, message: "请输入条款号", trigger: "change" } + ], + itemsName: [ + { required: true, message: "请输入条款名称", trigger: "change" } ], - // itemsNum: [ - // { required: true, message: "请输入条款号", trigger: "blur" } - // ], - // itemsName: [ - // { required: true, message: "请输入条款名称", trigger: "blur" } - // ], productType: [ - { required: true, message: "请输入产品类型", trigger: "blur" } + { required: true, message: "请输入产品类型", trigger: "change" } ], productLine: [ - { required: true, message: "请输入产品线", trigger: "blur" } + { required: true, message: "请输入产品线", trigger: "change" } ], productName: [ { required: true, message: "请输入项目名称", trigger: "change" } @@ -799,16 +800,16 @@ export default { { required: true, message: "请输入项目编号", trigger: "change" } ], reason: [ - { required: true, message: "请输入不合规项目", trigger: "blur" } - ], - responsibleUnit: [ - { required: true, message: "请输入责任部门", trigger: "blur" } + { required: true, message: "请输入不合规项目", trigger: "change" } ], + // responsibleUnit: [ + // { required: true, message: "请输入责任部门", trigger: "change" } + // ], dutyEngineerName: [ - { required: true, message: "请输入责任工程师", trigger: "blur" } + { required: true, message: "请输入责任工程师", trigger: "change" } ], planCloseTime: [ - { required: true, message: "请选择计划关闭时间", trigger: "blur" } + { required: true, message: "请选择计划关闭时间", trigger: "change" } ] }, drawerTable: false, //表单模态窗 @@ -907,15 +908,18 @@ export default { }, //确认添加标准 okStand(){ - if(this.standList > 1){ + if(this.standList.length > 1){ this.$message.warning('您只能选择一条标准进行添加') - }else if(this.standList < 1){ + }else if(this.standList.length < 1){ this.$message.warning('请至少选择一条数据进行添加') }else{ this.addForm.standId = this.standList[0].id this.addForm.standName = this.standList[0].standName this.addForm.standSerialNumber = this.standList[0].standSort + '-' + this.standList[0].standNumber + '-' + this.standList[0].standYear this.dialogTableVisible = false + if(this.addForm.standName){ + this.$refs.addForm.validateField('standName'); + } } }, //添加标准select的改变 @@ -1094,7 +1098,7 @@ export default { const productName = this.addForm.productName; const productId = this.addForm.productId; const reason = this.addForm.reason; - const responsibleUnit = this.addForm.responsibleUnit; + // const responsibleUnit = this.addForm.responsibleUnit; const dutyEngineer = this.addForm.dutyEngineer; const authEngineer = this.addForm.authEngineer; const qaEngineer = this.addForm.qaEngineer; @@ -1107,7 +1111,7 @@ export default { closeState, standId, standSerialNumber, standName, itemsNum, itemsName, productType, productLine, productName, productId,reason, - responsibleUnit, dutyEngineer, + dutyEngineer, authEngineer, qaEngineer, planCloseTime).then(res => { if (res.ok) { this.submiting = false @@ -1128,7 +1132,7 @@ export default { editUn( closeState, standId, standSerialNumber, standName, itemsNum, itemsName, productType, - productLine, productName, reason, responsibleUnit, + productLine, productName, reason, dutyEngineer, authEngineer, qaEngineer, planCloseTime, id).then(res => { if (res.ok) { @@ -1197,8 +1201,8 @@ export default { this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", { standType: this.standardSearch.standType, standNumber: this.standardSearch.standNumber, - page: this.pageNo, - pageSize: this.pageSizeNo + page: this.page, + pageSize: this.pageSize }, { _this: this }, res => { @@ -1258,13 +1262,24 @@ export default { let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { - id: item.standId, - pageType: "FOREIGN_STAND" - // pageType: item.standType + '_STAND' + id: item.id, + pageType: "INLAND_STAND" } }); window.open(routeUrl.href, "_blank"); }, + // 点击查看 + // handlePreview(item) { + // let routeUrl = this.$router.resolve({ + // name: "OtherStandardDetails", + // params: { + // id: item.standId, + // pageType: "FOREIGN_STAND" + // // pageType: item.standType + '_STAND' + // } + // }); + // window.open(routeUrl.href, "_blank"); + // }, detailsStandard(item) { this.$http.post("lawss/sarTestItem/validateStandNumber", { standNumber: item.standNum @@ -1341,7 +1356,13 @@ export default { this.roleShowflag = true }, drawerCheck(data) { - this.addForm.dutyEngineer = data[0].name + // this.addForm.dutyEngineer = data[0].id + // this.addForm.dutyEngineerName = data[0].name + this.$set(this.addForm, 'dutyEngineer', data[0].id) + this.$set(this.addForm, 'dutyEngineerName', data[0].name) + if(this.addForm.dutyEngineerName){ + this.$refs.addForm.validateField('dutyEngineerName'); + } this.roleShowflag = false }, /** 选择认证工程师和质量工程师 */