src/views/CNAS/process/ensureResults/qualityControlPlan/components/processingSheet.vue
@@ -82,12 +82,6 @@ <p><span class="required-span">* </span>被监督人：</p> </td> <td class="td-info"> <!-- <el-select v-if="currentStep === 0" v-model="form.supervisedUserId" clearable--> <!-- filterable--> <!-- placeholder="请选择" size="small">--> <!-- <el-option v-for="(item,i) in supervisedUserList" :key="i" :label="item.label" :value="item.value">--> <!-- </el-option>--> <!-- </el-select>--> <span class="td-info1"> {{ form.supervisedUserName }}</span> </td> <td class="td-title"> @@ -303,7 +297,10 @@ </div> <span slot="footer" class="dialog-footer"> <el-button @click="closeProcessingDia">取 消</el-button> <el-button v-if="currentStep !== 2" :loading="editLoad" type="primary" @click="handleEdit">提 交</el-button> <el-button v-if="currentStep === 0" :loading="editLoad" type="primary" @click="handleEdit">提 交</el-button> <el-button v-if="currentStep === 1" :loading="editLoad" @click="handleEdit(0)">不通过</el-button> <el-button v-if="currentStep === 1" :loading="editLoad" type="primary" @click="handleEdit(1)">通 过</el-button> </span> </el-dialog> </div> @@ -365,36 +362,34 @@ methods: { openDia (row) { this.formDia = true this.searchInfo(row) this.form.superviseDetailsId = row.superviseDetailsId this.searchInfo(row) this.form.approveId = row.approveId this.getAuthorizedPerson() // 获取人员列表 // this.getSupervisedUserList() // 获取当前部门人员 }, // 查询监控计划详情实施信息 searchInfo (row) { this.form.qualityMonitorDetailsId = row.qualityMonitorDetailsId getSuperviseDetailAccording({superviseDetailsId: row.superviseDetailsId}).then(res => { getSuperviseDetailAccording({superviseDetailsId: this.form.superviseDetailsId}).then(res => { this.form.supervisedUserId = res.data.supervisedUserId this.form.supervisedUserName = res.data.supervisedUserName if (res.data.superviseDetailsAccordingId === null) { if (!res.data.approverUserId) { this.currentStep = 0 } else { this.form = res.data if (res.data.isFinish === 0) { if (res.data.approverUserId) { this.currentStep = 1 } this.currentStep = 1 } else { this.currentStep = 2 } } this.form = res.data this.form.superviseDetailsId = row.superviseDetailsId }).catch(err => { console.log('err---', err); }) }, // 提交 handleEdit () { handleEdit (isFinish) { if (this.currentStep === 0) { if (this.form.findWay === null) { this.$message.warning('请选择不符合工作发现途径') @@ -416,10 +411,6 @@ this.$message.warning('请选择是否需要采取纠正措施') return } if (!this.form.approverUserId) { this.$message.warning('请选择批准人') return } } this.editLoad = true this.form.flowType = this.currentStep @@ -433,6 +424,7 @@ this.editLoad = false }) } else { this.form.isFinish = isFinish approverEquipSuperviseDetailAccording(this.form).then(res => { this.editLoad = false this.$message.success('批准成功') src/views/CNAS/process/ensureResults/qualityControlPlan/components/recordsDialog.vue
@@ -25,8 +25,8 @@ <p><span class="required-span">* </span>监督员：</p> </td> <td colspan="2"> <el-select v-if="currentStep === 0" @change="usePersonName" v-model="form.supervisorId" placeholder="请选择" size="small" style="width: 100%"> <el-option v-for="item in recordUserList" :key="item.userId" :label="item.userName" :value="item.userId"></el-option> <el-select v-if="currentStep === 0" @change="usePersonName" v-model="form.supervisor" placeholder="请选择" size="small" style="width: 100%"> <el-option v-for="item in recordUserList" :key="item.userName" :label="item.userName" :value="item.userName"></el-option> </el-select> <span v-else class="td-info"> {{ form.supervisor }}</span> </td> @@ -235,7 +235,10 @@ </div> <span slot="footer" class="dialog-footer"> <el-button @click="closeRecordsDia">取 消</el-button> <el-button v-if="currentStep !== 2" :loading="editLoad" type="primary" @click="handleEdit">提 交</el-button> <el-button v-if="currentStep === 0" :loading="editLoad" type="primary" @click="handleEdit">提 交</el-button> <el-button v-if="currentStep === 1" :loading="editLoad" @click="handleEdit(0)">不通过</el-button> <el-button v-if="currentStep === 1" :loading="editLoad" type="primary" @click="handleEdit(1)">通 过</el-button> </span> </el-dialog> </div> @@ -304,7 +307,7 @@ searchInfo (row) { getSuperviseDetailRecord({superviseDetailsId: row.superviseDetailsId}).then(res => { // 有superviseDetailsRecordId说明提交过记录 if (res.data.superviseDetailsRecordId) { if (res.data.ratifyUserId) { // 是否结束0:未结束, 1:已结束 if (res.data.isFinish === 0) { this.currentStep = 1 @@ -322,7 +325,7 @@ }) }, // 提交流程 handleEdit () { handleEdit (isFinish) { if (!this.form.testMember || !this.form.supervisor || !this.form.testItem || !this.form.sampleNumber || !this.form.testDate) { this.$message.warning('请填写完整') @@ -331,15 +334,11 @@ if (this.currentStep === 0) { this.addInfo() } else { this.editInfo() this.editInfo(isFinish) } }, // 提交记录 addInfo () { if (!this.form.ratifyUserId) { this.$message.warning('请选择下一步批准人') return } this.editLoad = true addSuperviseDetailRecord(this.form).then(res => { this.editLoad = false @@ -351,7 +350,7 @@ }) }, // 提交批准 editInfo () { editInfo (isFinish) { if (!this.form.ratifyOpinion) { this.$message.warning('请填写审批意见') return @@ -361,6 +360,7 @@ return } this.editLoad = true this.form.isFinish = isFinish addSuperviseRecordOpinion(this.form).then(res => { this.editLoad = false this.$message.success('操作成功') src/views/CNAS/process/ensureResults/qualityControlPlan/components/rectifyDialogNew.vue
@@ -38,18 +38,6 @@ <span v-if="currentStep !== 0" class="td-info1"> {{ form.raiseResult }}</span> </td> </tr> <!-- <tr v-if="showStep === 0">--> <!-- <td v-if="currentStep === 0" class="td-title">--> <!-- <p><span class="required-span">* </span>请选择下一步负责人：</p>--> <!-- </td>--> <!-- <td v-if="currentStep === 0" class="td-info" colspan="3">--> <!-- <el-select v-model="form.causeUserId" clearable filterable--> <!-- placeholder="请选择" size="small">--> <!-- <el-option v-for="(item,i) in personList" :key="i" :label="item.label" :value="item.value">--> <!-- </el-option>--> <!-- </el-select>--> <!-- </td>--> <!-- </tr>--> <tr v-if="currentStep !== 0"> <td class="td-title"> <p>提出人：</p> @@ -130,18 +118,6 @@ {{form.causeTime}} </td> </tr> <!-- <tr v-if="showStep === 0">--> <!-- <td v-if="currentStep === 0" class="td-title">--> <!-- <p><span class="required-span">* </span>请选择下一步负责人：</p>--> <!-- </td>--> <!-- <td v-if="currentStep === 0" class="td-info" colspan="3">--> <!-- <el-select v-model="form.correctUserId" clearable filterable--> <!-- placeholder="请选择" size="small">--> <!-- <el-option v-for="(item,i) in personList" :key="i" :label="item.label" :value="item.value">--> <!-- </el-option>--> <!-- </el-select>--> <!-- </td>--> <!-- </tr>--> <tr> <td class="td-title"> <p><span class="required-span">* </span>纠正措施：</p> @@ -266,7 +242,10 @@ </div> <span slot="footer" class="dialog-footer"> <el-button @click="closeRectifyDia">取 消</el-button> <el-button v-if="currentStep !== 2" :loading="editLoad" type="primary" @click="handleEdit">提 交</el-button> <el-button v-if="currentStep === 0" :loading="editLoad" type="primary" @click="handleEdit">提 交</el-button> <el-button v-if="currentStep === 1" :loading="editLoad" @click="handleEdit(0)">不通过</el-button> <el-button v-if="currentStep === 1" :loading="editLoad" type="primary" @click="handleEdit(1)">通 过</el-button> </span> </el-dialog> </div> @@ -289,7 +268,6 @@ return { formDia: false, currentStep: 0, showStep: 0, form: { superviseDetailsId: '', raiseResult: '', @@ -336,27 +314,22 @@ searchInfo (row) { this.form.qualityMonitorDetailsId = row.qualityMonitorDetailsId getSuperviseDetailCorrect({superviseDetailsId: row.superviseDetailsId}).then(res => { if (res.data.superviseDetailsCorrectId === null) { this.showStep = 0 if (!res.data.approverUserId) { this.currentStep = 0 } else { this.form = res.data if (res.data.isFinish === 0) { if (res.data.approverUserId) { this.showStep = 1 this.currentStep = 1 } this.currentStep = 1 } else { this.currentStep = 2 this.showStep = 1 } } this.form = res.data }).catch(err => { console.log('err---', err); }) }, // 提交 handleEdit () { handleEdit (isFinish) { if (this.currentStep === 0) { if (!this.form.raiseResult) { this.$message.warning('请填写不合格描述') @@ -387,6 +360,7 @@ this.editLoad = false }) } else { this.form.isFinish = isFinish approveEquipSuperviseDetailCorrect(this.form).then(res => { this.editLoad = false this.$message.success('批准成功')
