Merge branch 'dev' into dev_tides

Crunchy

2025-03-17 0a26d58a3906b9e13946c7cb46fae51a0de98920

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

@@ -1,9 +1,7 @@
<template>
  <div>
    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false"
               :visible.sync="formDia"
               title="实施"
               width="60%" @close="closeCarryOutDia">
    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="formDia" title="实施"
      width="60%" @close="closeCarryOutDia">
      <el-steps :active="currentStep" align-center finish-status="success">
        <el-step title="实施"></el-step>
        <el-step title="批准"></el-step>
@@ -15,9 +13,7 @@
              <p>监控项目：</p>
            </td>
            <td colspan="3">
              <el-input v-if="currentStep === 0" v-model="form.monitorProject"
                        placeholder="请输入内容"
                        size="small">
              <el-input v-if="currentStep === 0" v-model="form.monitorProject" placeholder="请输入内容" size="small">
              </el-input>
              <span v-else class="td-info"> {{ form.monitorProject }}</span>
            </td>
@@ -25,9 +21,7 @@
              <p>监控时间：</p>
            </td>
            <td colspan="3">
              <el-input v-if="currentStep === 0" v-model="form.monitorData"
                        placeholder="请输入内容"
                        size="small">
              <el-input v-if="currentStep === 0" v-model="form.monitorData" placeholder="请输入内容" size="small">
              </el-input>
              <span v-else class="td-info"> {{ form.monitorData }}</span>
            </td>
@@ -38,11 +32,8 @@
                <p>监控目的：</p>
              </div>
              <div>
                <el-input v-if="currentStep === 0" v-model="form.monitorPurpose"
                          :rows="3"
                          placeholder="请输入内容"
                          size="small"
                          type="textarea">
                <el-input v-if="currentStep === 0" v-model="form.monitorPurpose" :rows="3" placeholder="请输入内容"
                  size="small" type="textarea">
                </el-input>
                <span v-else class="td-info2"> {{ form.monitorPurpose }}</span>
              </div>
@@ -54,11 +45,8 @@
                <p>监控方法：</p>
              </div>
              <div>
                <el-input v-if="currentStep === 0" v-model="form.monitorMethod"
                          :rows="4"
                          placeholder="请输入内容"
                          size="small"
                          type="textarea">
                <el-input v-if="currentStep === 0" v-model="form.monitorMethod" :rows="4" placeholder="请输入内容"
                  size="small" type="textarea">
                </el-input>
                <span v-else class="td-info2"> {{ form.monitorMethod }}</span>
              </div>
@@ -70,11 +58,8 @@
                <p>参加人员：</p>
              </div>
              <div>
                <el-input v-if="currentStep === 0" v-model="form.participant"
                          :rows="3"
                          placeholder="请输入内容"
                          size="small"
                          type="textarea">
                <el-input v-if="currentStep === 0" v-model="form.participant" :rows="3" placeholder="请输入内容" size="small"
                  type="textarea">
                </el-input>
                <span v-else class="td-info2"> {{ form.participant }}</span>
              </div>
@@ -86,11 +71,8 @@
                <p>过程控制：</p>
              </div>
              <div>
                <el-input v-if="currentStep === 0" v-model="form.processControl"
                          :rows="3"
                          placeholder="请输入内容"
                          size="small"
                          type="textarea">
                <el-input v-if="currentStep === 0" v-model="form.processControl" :rows="3" placeholder="请输入内容"
                  size="small" type="textarea">
                </el-input>
                <span v-else class="td-info2"> {{ form.processControl }}</span>
              </div>
@@ -102,11 +84,8 @@
                <p>结果评价标准（如何评价）：</p>
              </div>
              <div>
                <el-input v-if="currentStep === 0" v-model="form.howEvaluate"
                          :rows="3"
                          placeholder="请输入内容"
                          size="small"
                          type="textarea">
                <el-input v-if="currentStep === 0" v-model="form.howEvaluate" :rows="3" placeholder="请输入内容" size="small"
                  type="textarea">
                </el-input>
                <span v-else class="td-info2"> {{ form.howEvaluate }}</span>
              </div>
@@ -118,9 +97,7 @@
                <p>经费预算：</p>
              </div>
              <div>
                <el-input v-if="currentStep === 0" v-model="form.budget"
                          placeholder="请输入内容"
                          size="small">
                <el-input v-if="currentStep === 0" v-model="form.budget" placeholder="请输入内容" size="small">
                </el-input>
                <span v-else class="td-info2"> {{ form.budget }}</span>
              </div>
@@ -132,9 +109,7 @@
                <p>检测部门：</p>
              </div>
              <div>
                <el-input v-if="currentStep === 0" v-model="form.inspectionDepartment"
                          placeholder="请输入内容"
                          size="small">
                <el-input v-if="currentStep === 0" v-model="form.inspectionDepartment" placeholder="请输入内容" size="small">
                </el-input>
                <span v-else class="td-info2"> {{ form.inspectionDepartment }}</span>
              </div>
@@ -143,10 +118,9 @@
              <div v-if="currentStep === 0">
                <div>批准人：</div>
                <div>
                  <el-select v-if="currentStep === 0" v-model="form.ratifyUserId" clearable
                             filterable
                             placeholder="请选择" size="small">
                    <el-option v-for="(item,i) in personList" :key="i" :label="item.label" :value="item.value">
                  <el-select v-if="currentStep === 0" v-model="form.ratifyUserId" 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>
                  <span v-else class="td-info2"> {{ form.ratifyName }}</span>
@@ -157,11 +131,8 @@
                  <p>批准意见：</p>
                </div>
                <div>
                  <el-input v-if="currentStep === 1" v-model="form.ratifyOpinion"
                            :rows="3"
                            placeholder="请输入内容"
                            size="small"
                            type="textarea">
                  <el-input v-if="currentStep === 1" v-model="form.ratifyOpinion" :rows="3" placeholder="请输入内容"
                    size="small" type="textarea">
                  </el-input>
                  <span v-if="currentStep === 2" class="td-info2"> {{ form.ratifyOpinion }}</span>
                  <span v-if="currentStep !== 0" class="td-info3"> {{ '批准人：' + form.ratifyName }}</span>
@@ -185,7 +156,7 @@
  addQualityMonitorRatify, addQualityMonitorRatifyOpinion,
  getQualityMonitorRatify
} from "@/api/cnas/process/ensureResults/qualityMonitor";
import {selectUserCondition} from "@/api/business/inspectionTask";
import { selectUserCondition } from "@/api/business/inspectionTask";

export default {
  name: 'carryOutDialog',
@@ -224,8 +195,8 @@
      this.getAuthorizedPerson()
    },
    // 查询监控计划详情实施信息
    searchInfo (row) {
      getQualityMonitorRatify({qualityMonitorDetailsId: row.qualityMonitorDetailsId}).then(res => {
    searchInfo(row) {
      getQualityMonitorRatify({ qualityMonitorDetailsId: row.qualityMonitorDetailsId }).then(res => {
        // 有detailsRatifyId则说明提交过实施信息
        if (res.data.detailsRatifyId) {
          // 是否结束0:未结束, 1:已结束
@@ -256,10 +227,9 @@
      }
    },
    // 提交实施
    addInfo () {
    addInfo() {
      addQualityMonitorRatify(this.form).then(res => {
        this.editLoad = false
        if (res.code === 201) return
        this.$message.success('操作成功')
        this.closeCarryOutDia()
      }).catch(err => {
@@ -268,10 +238,9 @@
      })
    },
    // 提交批准
    editInfo () {
    editInfo() {
      addQualityMonitorRatifyOpinion(this.form).then(res => {
        this.editLoad = false
        if (res.code === 201) return
        this.$message.success('操作成功')
        this.closeCarryOutDia()
      }).catch(err => {
@@ -280,12 +249,12 @@
      })
    },
    // 关闭弹框
    closeCarryOutDia () {
    closeCarryOutDia() {
      this.formDia = false
      this.$emit('closeCarryOutDia')
    },
    getAuthorizedPerson() {
      selectUserCondition({ type: 1 }).then((res) => {
      selectUserCondition({ type: 2 }).then((res) => {
        let data = [];
        res.data.forEach((a) => {
          data.push({
@@ -306,6 +275,7 @@
  width: 100%;
  margin-top: 10px;
}

.td-title {
  height: 40px;
  width: 100px;
@@ -315,6 +285,7 @@
  white-space: normal;
  padding: 6px;
}

.td-info {
  display: inline-block;
  width: 100%;
@@ -323,6 +294,7 @@
  word-wrap: break-word;
  white-space: normal;
}

.td-info2 {
  display: inline-block;
  width: 90%;
@@ -332,6 +304,7 @@
  white-space: normal;
  margin-left: 20px;
}

.tables td {
  height: 40px;
  width: 100px;
@@ -340,6 +313,7 @@
  white-space: normal;
  padding: 6px;
}

.td-info3 {
  width: 90%;
  display: inline-block;