质量监控、监督计划-流程修改

gaoluyang

2025-03-29 e728c55c65d943ad90a6cf6e1c619003b4c9a077

质量监控、监督计划-流程修改

 src/views/CNAS/process/ensureResults/ensureResultsValidity/components/carryOutDialog.vue

@@ -146,8 +146,8 @@
      <span slot="footer" class="dialog-footer">
        <el-button @click="closeCarryOutDia">取 消</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 v-if="currentStep === 1 && userId == ratifyUserId" :loading="editLoad" @click="handleEdit(0)">不通过</el-button>
        <el-button v-if="currentStep === 1 && userId == ratifyUserId" :loading="editLoad" type="primary" @click="handleEdit(1)">通
          过</el-button>
      </span>
    </el-dialog>
@@ -161,6 +161,7 @@
  getQualityMonitorRatify
} from "@/api/cnas/process/ensureResults/qualityMonitor";
import { selectUserCondition } from "@/api/business/inspectionTask";
import {mapGetters} from "vuex";

export default {
  name: 'carryOutDialog',
@@ -189,7 +190,11 @@
      personList: [],
      editLoad: false,
      isCarryOut: false, // 是否为实施
      ratifyUserId: ''
    };
  },
  computed: {
    ...mapGetters(["userId"]),
  },
  // 方法集合
  methods: {
@@ -204,7 +209,7 @@
        // 有detailsRatifyId则说明提交过实施信息
        if (res.data.ratifyUserId) {
          // 是否结束0:未结束, 1:已结束
          if (res.data.isFinish == 0) {
          if (res.data.isFinish != 1) {
            this.currentStep = 1
          } else if (res.data.isFinish == 1) {
            this.currentStep = 2
@@ -213,6 +218,7 @@
          this.currentStep = 0
        }
        this.form = res.data
        this.ratifyUserId = res.data.ratifyUserId
      }).catch(err => {
        console.log('err---', err);
      })

 src/views/CNAS/process/ensureResults/ensureResultsValidity/index.vue

@@ -387,8 +387,10 @@
            if (params === 0) {
              return '未开始';
            } else if (params === 1) {
              return '待批准';
            } else if (params === 2) {
              return '待评价';
            }  else if (params === 2) {
              return '不批准';
            } else if (params === 3) {
              return '已批准';
            } else {
              return null;
@@ -400,6 +402,8 @@
            } else if (params === 1) {
              return 'warning';
            } else if (params === 2) {
              return 'danger';
            }  else if (params === 3) {
              return 'success';
            } else {
              return null;

 src/views/CNAS/process/ensureResults/qualityControlPlan/components/processingSheet.vue

@@ -297,9 +297,9 @@
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="closeProcessingDia">取 消</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 v-if="currentStep === 0 && userId == supervisedUserId" :loading="editLoad" type="primary" @click="handleEdit">提 交</el-button>
        <el-button v-if="currentStep === 1 && userId == approverUserId" :loading="editLoad" @click="handleEdit(0)">不通过</el-button>
        <el-button v-if="currentStep === 1 && userId == approverUserId" :loading="editLoad" type="primary" @click="handleEdit(1)">通
          过</el-button>
      </span>
    </el-dialog>
@@ -312,6 +312,7 @@
  getSuperviseDetailAccording
} from "@/api/cnas/process/ensureResults/qualitySupervise";
import {selectUserCondition} from "@/api/business/inspectionTask";
import {mapGetters} from "vuex";

export default {
  name: 'processingSheet',
@@ -356,13 +357,19 @@
      editLoad: false,
      personList: [],
      supervisedUserList: [],
      supervisedUserId: '',
      approverUserId: ''
    };
  },
  computed: {
    ...mapGetters(["userId"]),
  },
  // 方法集合
  methods: {
    openDia (row) {
      this.formDia = true
      this.form.superviseDetailsId = row.superviseDetailsId
      this.supervisedUserId = row.supervisedUserId
      this.searchInfo(row)
      this.form.approveId = row.approveId
      this.getAuthorizedPerson() // 获取人员列表
@@ -373,17 +380,19 @@
      getSuperviseDetailAccording({superviseDetailsId: this.form.superviseDetailsId}).then(res => {
        this.form.supervisedUserId = res.data.supervisedUserId
        this.form.supervisedUserName = res.data.supervisedUserName
        if (!res.data.approverUserId) {
          this.currentStep = 0
        } else {
          if (res.data.isFinish === 0) {
        if (res.data.approverUserId) {
          // 是否结束0:未结束, 1:已结束
          if (res.data.isFinish != 1) {
            this.currentStep = 1
          } else {
          } else if (res.data.isFinish == 1) {
            this.currentStep = 2
          }
        } else {
          this.currentStep = 0
        }
        this.form = res.data
        this.form.superviseDetailsId = row.superviseDetailsId
        this.approverUserId = res.data.approverUserId
      }).catch(err => {
        console.log('err---', err);
      })

 src/views/CNAS/process/ensureResults/qualityControlPlan/components/recordsDialog.vue

@@ -235,9 +235,9 @@
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="closeRecordsDia">取 消</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 v-if="currentStep === 0 && userId == supervisedUserId" :loading="editLoad" type="primary" @click="handleEdit">提 交</el-button>
        <el-button v-if="currentStep === 1 && userId == ratifyUserId" :loading="editLoad" @click="handleEdit(0)">不通过</el-button>
        <el-button v-if="currentStep === 1 && userId == ratifyUserId" :loading="editLoad" type="primary" @click="handleEdit(1)">通
          过</el-button>
      </span>
    </el-dialog>
@@ -251,6 +251,7 @@
  getSuperviseDetailRecord
} from "@/api/cnas/process/ensureResults/qualitySupervise";
import {selectUserCondition} from "@/api/business/inspectionTask";
import {mapGetters} from "vuex";

export default {
  name: 'recordsDialog',
@@ -288,12 +289,18 @@
      editLoad: false,
      personList: [],
      recordUserList: [],
      supervisedUserId: '',
      ratifyUserId: '',
    };
  },
  computed: {
    ...mapGetters(["userId"]),
  },
  // 方法集合
  methods: {
    openDia(row) {
      this.formDia = true
      this.supervisedUserId = row.supervisedUserId
      this.searchInfo(row)
      this.getAuthorizedPerson()
    },
@@ -309,9 +316,9 @@
        // 有superviseDetailsRecordId说明提交过记录
        if (res.data.ratifyUserId) {
          // 是否结束0:未结束, 1:已结束
          if (res.data.isFinish === 0) {
          if (res.data.isFinish != 1) {
            this.currentStep = 1
          } else if (res.data.isFinish === 1) {
          } else if (res.data.isFinish == 1) {
            this.currentStep = 2
          }
        } else {
@@ -319,6 +326,7 @@
        }
        this.form = res.data
        this.form.superviseDetailsId = row.superviseDetailsId
        this.ratifyUserId = res.data.ratifyUserId
        this.getRecordUser()
      }).catch(err => {
        console.log('err---', err);

 src/views/CNAS/process/ensureResults/qualityControlPlan/components/rectifyDialogNew.vue

@@ -242,9 +242,9 @@
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="closeRectifyDia">取 消</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 v-if="currentStep === 0 && userId == supervisedUserId" :loading="editLoad" type="primary" @click="handleEdit">提 交</el-button>
        <el-button v-if="currentStep === 1 && userId == approverUserId" :loading="editLoad" @click="handleEdit(0)">不通过</el-button>
        <el-button v-if="currentStep === 1 && userId == approverUserId" :loading="editLoad" type="primary" @click="handleEdit(1)">通
          过</el-button>
      </span>
    </el-dialog>
@@ -258,6 +258,7 @@
} from "@/api/cnas/process/ensureResults/qualitySupervise";
import {selectUserCondition} from "@/api/business/inspectionTask";
import {getThisYearTrainingDetailed} from "@/api/cnas/systemManagement/correctiveAction";
import {mapGetters} from "vuex";

export default {
  name: 'rectifyDialog',
@@ -298,7 +299,12 @@
      editLoad: false,
      personList: [],
      yearTrainingDetailed: [],
      supervisedUserId: '',
      approverUserId: ''
    };
  },
  computed: {
    ...mapGetters(["userId"]),
  },
  // 方法集合
  methods: {
@@ -307,6 +313,7 @@
      this.searchInfo(row)
      this.form.superviseDetailsId = row.superviseDetailsId
      this.form.approveId = row.approveId
      this.supervisedUserId = row.supervisedUserId
      this.getAuthorizedPerson() // 获取人员列表
      this.getYearTrainingDetailed() // 获取培训计划
    },
@@ -314,16 +321,18 @@
    searchInfo (row) {
      this.form.qualityMonitorDetailsId = row.qualityMonitorDetailsId
      getSuperviseDetailCorrect({superviseDetailsId: row.superviseDetailsId}).then(res => {
        if (!res.data.approverUserId) {
          this.currentStep = 0
        } else {
          if (res.data.isFinish === 0) {
        if (res.data.approverUserId) {
          // 是否结束0:未结束, 1:已结束
          if (res.data.isFinish != 1) {
            this.currentStep = 1
          } else {
          } else if (res.data.isFinish == 1) {
            this.currentStep = 2
          }
        } else {
          this.currentStep = 0
        }
        this.form = res.data
        this.approverUserId = res.data.approverUserId
      }).catch(err => {
        console.log('err---', err);
      })

 src/views/CNAS/process/ensureResults/qualityControlPlan/index.vue

@@ -280,8 +280,10 @@
            if (params === 0) {
              return '未开始';
            } else if (params === 1) {
              return '待批准';
            } else if (params === 2) {
              return '待评价';
            }  else if (params === 2) {
              return '不批准';
            } else if (params === 3) {
              return '已批准';
            } else {
              return null;
@@ -293,6 +295,8 @@
            } else if (params === 1) {
              return 'warning';
            } else if (params === 2) {
              return 'danger';
            }  else if (params === 3) {
              return 'success';
            } else {
              return null;
@@ -307,8 +311,10 @@
            if (params === 0) {
              return '未开始';
            } else if (params === 1) {
              return '待批准';
            } else if (params === 2) {
              return '待评价';
            }  else if (params === 2) {
              return '不批准';
            } else if (params === 3) {
              return '已批准';
            } else {
              return null;
@@ -320,6 +326,8 @@
            } else if (params === 1) {
              return 'warning';
            } else if (params === 2) {
              return 'danger';
            }  else if (params === 3) {
              return 'success';
            } else {
              return null;
@@ -334,8 +342,10 @@
            if (params === 0) {
              return '未开始';
            } else if (params === 1) {
              return '待批准';
            } else if (params === 2) {
              return '待评价';
            }  else if (params === 2) {
              return '不批准';
            } else if (params === 3) {
              return '已批准';
            } else {
              return null;
@@ -347,6 +357,8 @@
            } else if (params === 1) {
              return 'warning';
            } else if (params === 2) {
              return 'danger';
            }  else if (params === 3) {
              return 'success';
            } else {
              return null;