Merge branch 'dev' into dev_tides

Crunchy

2025-04-29 e5454b769d44a34af423bf87ac8a740bf8c20341

 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);