diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js index c51fad700..229f11353 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, reason, responsibleUnit, + productLine, productName,productId,reason, responsibleUnit, dutyEngineer, authEngineer, qaEngineer, planCloseTime) { const data = { closeState, @@ -77,6 +77,7 @@ export function addUn( productType, productLine, //产品线 productName, //项目名称 + productId, //项目编号 reason, //不合规项目 responsibleUnit, //责任部门 dutyEngineer, //责任工程师 diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue index 30cb0f9ab..9a33fbf29 100644 --- a/src/pages/details/complianceDetails/index.vue +++ b/src/pages/details/complianceDetails/index.vue @@ -1,6 +1,7 @@ - + + @@ -78,13 +82,13 @@ > diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 035149198..6fb9806c1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1835,7 +1835,6 @@ const json = Object.assign(bringData, bringData.attrInfoCaseMap); this.form = JSON.parse(JSON.stringify(json)) - this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : [] this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : [] this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : [] @@ -1854,6 +1853,7 @@ this.key3++ this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : '' + this.form.ssrq = this.$moment(this.form.ssrq).format("YYYY-MM-DD") this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = bringData.id diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 8b6ad145e..3288047f5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -592,6 +592,7 @@ export default { } }); }); + this.$refs.multipleTable.clearSelection(); } this.modalshowflag = false; }, @@ -616,11 +617,16 @@ export default { if (this.selectList.length > 0) { this.lsType = type; this.nodeList = []; - if(row.implementerId){ - this.nodeList = row.implementerId.split(","); - } this.modalshowflag = true; this.drawerTitle = "批量选择责任人"; + this.selectList.forEach(item =>{ + if(item.implementerId){ + this.nodeList = item.implementerId.split(","); + } + }) + // if(row.implementerId){ + // this.nodeList = row.implementerId.split(","); + // } } else { this.$message.warning("请选择要分发的数据"); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index b90337067..76572cf45 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -135,6 +135,11 @@
+
+ 批量编辑 + +
{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }} - - - - @@ -306,6 +308,7 @@ :disabled="acceptShow" class="datePickLen" clearable + value-format="yyyy-MM-dd HH:mm:ss" v-model="dataList[scope.$index].completionTime" type="date" placeholder="请选择日期"> @@ -313,104 +316,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -521,6 +426,96 @@ @checkedRole="checkedTransferRole" :nodeList="nodeList" > + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ + 确定 + + 取消 + +
+
@@ -542,11 +537,24 @@ export default { return { //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, + comFlag: 0, nodeList:[], drawerTitle:'', isTransfer: false, // 调整处理人抽屉状态 drawerModal: false, + modalShowFlag: false, // 批量编辑开关 + batchEditForm: { + // 在研产品 + // 合规 + complianceReasons: "", + // 不合规 + noCompliance: "", + // 应对措施 + countermeasures: "", + // 完成时间 + completionTime: "", + }, detailData: [], sarProStateTableHeight: null, // 项目列表高度 // 当前流程类型(1待办/2已办) @@ -720,6 +728,7 @@ export default { * @description: 动态表单读取 */ getFormFieldList(item) { + console.log(item); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); if (item.form === undefined) { @@ -729,6 +738,12 @@ export default { item.implementer = this.$store.getters.userInfo.userName; }); this.dataList = item.step3DTOS; + this.dataList.forEach(item => { + this.$set(item,'complianceReasons', '') + this.$set(item,'noCompliance', '') + this.$set(item,'countermeasures', '') + this.$set(item,'completionTime', '') + }) } else { this.dataList = item.dataList; @@ -792,30 +807,80 @@ export default { this.isSubmit = false }) }, + handlePrice(){ + for (let i = 0; i < this.dataList.length; i++) { + if (this.dataList[i].complianceReasons !== '' || (this.dataList[i].noCompliance !== '' && this.dataList[i].countermeasures !== '' && this.dataList[i].completionTime !== '') || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){ + }else { + this.comFlag ++ + } + } + }, //提交事件 handleSubmit() { - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.commentText = this.commentText; - this.listForm.approvalOpinion = ""; - this.listForm.signFlag = ""; - this.listForm.dataList = this.dataList; - const json = JSON.stringify(this.listForm); - this.isSubmit = true; - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }, e => { + this.handlePrice() + if(this.comFlag > 0) { + this.$message.warning('请填写完整的不符合项信息') + this.comFlag = 0 + }else{ + this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; + this.listForm.commentText = this.commentText; + this.listForm.approvalOpinion = ""; + this.listForm.signFlag = ""; + this.listForm.dataList = this.dataList; + const json = JSON.stringify(this.listForm); + this.isSubmit = true; + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }, e => { + }); + } + }, + //批量编辑 + batchEdit() { + if (this.selectList.length > 0) { + //合规 + this.batchEditForm.complianceReasons = ""; + //不合规 + this.batchEditForm.noCompliance = ""; + //应对措施 + this.batchEditForm.countermeasures = ""; + //完成时间 + this.batchEditForm.completionTime = ""; + this.modalShowFlag = true; + } else { + this.$message.warning("请选择要编辑的数据"); + } + }, + //批量编辑确定按钮事件 + saveBatchEditForm() { + this.dataList.forEach(item => { + this.selectList.forEach(items => { + if (item.id === items) { + item.complianceReasons = this.batchEditForm.complianceReasons; + //不合规 + item.noCompliance = this.batchEditForm.noCompliance; + //应对措施 + item.countermeasures = this.batchEditForm.countermeasures; + //完成时间 + item.completionTime = this.batchEditForm.completionTime; + } + }); }); + this.modalShowFlag = false; + }, + cancelBatchEditForm() { + this.modalShowFlag = false; }, //标准表格选择框改变 selectStandChange(data) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue index 4a2f6a388..f48224c89 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue @@ -110,10 +110,6 @@ {{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }} - - - - - - - - - - - - - - - 0) { this.zrType = type; this.nodeList = []; - if (row.workPeopleId) { - this.nodeList = row.workPeopleId.split(","); - } this.modalshowflag = true; this.drawerTitle = "批量选择责任人"; + this.selectList.forEach(item =>{ + if(item.workPeopleId){ + this.nodeList = item.workPeopleId.split(","); + } + }) } else { this.$message.warning("请选择要分发的数据"); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 16cfd87e2..90222f38a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -142,7 +142,6 @@ > @@ -195,7 +193,6 @@ @@ -220,7 +217,6 @@ :disabled="acceptShow" class="datePickLen" clearable - @click.native="handlePrice(scope.row)" v-model="scope.row.completionTime" type="date" value-format="yyyy-MM-dd HH:mm:ss" @@ -456,7 +452,7 @@ >
@@ -527,36 +523,11 @@ clearable v-model="batchEditForm.completionTime" type="date" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期">
- - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -587,7 +558,7 @@ export default { }, data() { return { - comFlag: true, + comFlag: 0, total: 0, currentPage: 1, pageSize: 20, @@ -628,7 +599,7 @@ export default { todoId: "", showColumn: true, drawerTitle: "", //drawer标题 - modalshowflag: false, // drawer开关 + modalShowFlag: false, // drawer开关 selectList: [], treeData: [], // 人员数据 roleForm: { @@ -723,10 +694,10 @@ export default { } }); }); - this.modalshowflag = false; + this.modalShowFlag = false; }, cancelBatchEditForm() { - this.modalshowflag = false; + this.modalShowFlag = false; }, //批量编辑 batchEdit() { @@ -739,15 +710,7 @@ export default { this.batchEditForm.countermeasures = ""; //完成时间 this.batchEditForm.completionTime = ""; - //合规 - this.batchEditForm.zcComplianceReasons = ""; - //不合规 - this.batchEditForm.zcNoCompliance = ""; - //应对措施 - this.batchEditForm.zcCountermeasures = ""; - //完成时间 - this.batchEditForm.zcCompletionTime = ""; - this.modalshowflag = true; + this.modalShowFlag = true; } else { this.$message.warning("请选择要编辑的数据"); } @@ -932,17 +895,20 @@ export default { this.isSubmit = false; }); }, - handlePrice(row){ - if(row.complianceReasons !== '' || (row.noCompliance !== '' && row.countermeasures !== '' && row.completionTime !== '') || (row.complianceReasons === '' && row.noCompliance === '' && row.countermeasures === '' && row.completionTime === '')){ - this.comFlag = true - }else{ - this.comFlag = false + handlePrice(){ + for (let i = 0; i < this.dataList.length; i++) { + if (this.dataList[i].complianceReasons !== '' || (this.dataList[i].noCompliance !== '' && this.dataList[i].countermeasures !== '' && this.dataList[i].completionTime !== undefined) || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === undefined)){ + }else { + this.comFlag ++ + } } }, //提交事件 handleSubmit() { - if(!this.comFlag){ + this.handlePrice() + if(this.comFlag > 0) { this.$message.warning('请填写完整的不符合项信息') + this.comFlag = 0 }else{ this.isSubmit = true; this.listForm.commentText = this.commentText; diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 193910268..d17405e5b 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -510,12 +510,12 @@ -