Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材

yuan

3 天以前 ecd118aebc9f3dde0aa8c8457d802188ea8bda39

Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材

 src/views/qualityManagement/nonconformingManagement/components/inspectionFormDia.vue

@@ -6,7 +6,13 @@
        width="70%"
        @close="closeDia"
    >
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
      <el-form
        :model="form"
        label-width="140px"
        label-position="top"
        :rules="rules"
        ref="formRef"
      >
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="类别：" prop="inspectType">
@@ -36,19 +42,34 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="规格型号：" prop="model">
              <el-input v-model="form.model" placeholder="请输入" clearable disabled/>
              <el-input
                v-model="form.model"
                placeholder="请输入"
                clearable
                disabled
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="单位：" prop="unit">
              <el-input v-model="form.unit" placeholder="请输入" clearable disabled/>
              <el-input
                v-model="form.unit"
                placeholder="请输入"
                clearable
                disabled
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="数量：" prop="quantity">
              <el-input v-model="form.quantity" placeholder="请输入" clearable disabled/>
              <el-input
                v-model="form.quantity"
                placeholder="请输入"
                clearable
                disabled
              />
            </el-form-item>
          </el-col>
        </el-row>
@@ -58,11 +79,25 @@
              <el-input v-model="form.batchNo" placeholder="—" disabled />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="生产日期：" prop="productionDate">
              <el-input
                v-model="form.productionDate"
                placeholder="—"
                disabled
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="检验员：" prop="checkName">
              <el-input v-model="form.checkName" placeholder="请输入" clearable disabled/>
              <el-input
                v-model="form.checkName"
                placeholder="请输入"
                clearable
                disabled
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
@@ -83,13 +118,26 @@
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="不合格现象：" prop="defectivePhenomena">
              <el-input v-model="form.defectivePhenomena" placeholder="请输入" clearable/>
              <el-input
                v-model="form.defectivePhenomena"
                placeholder="请输入"
                clearable
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="处理结果：" prop="dealResult">
              <el-select v-model="form.dealResult" placeholder="请选择" clearable>
                <el-option :label="item.label" :value="item.value" v-for="item in filteredRejectionHandling" :key="item.value" />
              <el-select
                v-model="form.dealResult"
                placeholder="请选择"
                clearable
              >
                <el-option
                  :label="item.label"
                  :value="item.value"
                  v-for="item in filteredRejectionHandling"
                  :key="item.value"
                />
              </el-select>
            </el-form-item>
          </el-col>
@@ -97,8 +145,18 @@
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="处理人：" prop="dealName">
              <el-select v-model="form.dealName" placeholder="请选择" clearable style="width: 100%">
                <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
              <el-select
                v-model="form.dealName"
                placeholder="请选择"
                clearable
                style="width: 100%"
              >
                <el-option
                  v-for="item in userList"
                  :key="item.nickName"
                  :label="item.nickName"
                  :value="item.nickName"
                />
              </el-select>
            </el-form-item>
          </el-col>
@@ -132,15 +190,15 @@
import {productTreeList} from "@/api/basicData/product.js";
import {
  getQualityUnqualifiedInfo,
  qualityUnqualifiedDeal
  qualityUnqualifiedDeal,
} from "@/api/qualityManagement/nonconformingManagement.js";
import {userListNoPage} from "@/api/system/user.js";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
const { proxy } = getCurrentInstance();
const emit = defineEmits(["close"]);

const { rejection_handling } = proxy.useDict("rejection_handling")
const { rejection_handling } = proxy.useDict("rejection_handling");
const dialogFormVisible = ref(false);
const operationType = ref('')
const operationType = ref("");
const data = reactive({
  form: {
    checkTime: "",
@@ -150,19 +208,20 @@
    productId: "",
    model: "",
    batchNo: "",
    productionDate: "",
    unit: "",
    quantity: "",
    checkCompany: "",
    checkResult: "",
    inspectType: '',
    defectivePhenomena: '',
    dealResult: '',
    dealName: '',
    dealTime: '',
    method: undefined
    inspectType: "",
    defectivePhenomena: "",
    dealResult: "",
    dealName: "",
    dealTime: "",
    method: undefined,
  },
  rules: {
    checkTime: [{ required: false, message: "请输入", trigger: "blur" },],
    checkTime: [{ required: false, message: "请输入", trigger: "blur" }],
    process: [{ required: false, message: "请输入", trigger: "blur" }],
    checkName: [{ required: false, message: "请输入", trigger: "blur" }],
    productId: [{ required: false, message: "请输入", trigger: "blur" }],
@@ -171,7 +230,9 @@
    quantity: [{ required: false, message: "请输入", trigger: "blur" }],
    checkCompany: [{ required: false, message: "请输入", trigger: "blur" }],
    checkResult: [{ required: false, message: "请输入", trigger: "blur" }],
    defectivePhenomena: [{ required: true, message: "请输入", trigger: "blur" }],
    defectivePhenomena: [
      { required: true, message: "请输入", trigger: "blur" },
    ],
    dealResult: [{ required: true, message: "请输入", trigger: "blur" }],
    dealName: [{ required: true, message: "请选择处理人", trigger: "change" }],
    dealTime: [{ required: true, message: "请输入", trigger: "change" }],
@@ -184,11 +245,13 @@
const filteredRejectionHandling = computed(() => {
  const data = rejection_handling.value;
  if (form.value.method) {
    return data.filter(item => item && item.label && item.label !== '返工' && item.label !== '返修')
    return data.filter(
      (item) =>
        item && item.label && item.label !== "返工" && item.label !== "返修"
    );
  }
  return data
})

  return data;
});

// 打开弹框
const openDialog = async (type, row) => {
@@ -204,14 +267,14 @@
  dialogFormVisible.value = true;
  form.value = {};
  getProductOptions();
  if (operationType.value === 'edit') {
    getQualityUnqualifiedInfo(row.id).then(res => {
      const { inspectState, ...rest } = (res.data || {})
  if (operationType.value === "edit") {
    getQualityUnqualifiedInfo(row.id).then((res) => {
      const { inspectState, ...rest } = res.data || {};
      // 有数据就显示默认值，没有就不显示
      form.value = { ...rest }
    })
      form.value = { ...rest };
    });
  }
}
};
const getProductOptions = () => {
  productTreeList().then((res) => {
    productOptions.value = convertIdToValue(res);
@@ -250,28 +313,26 @@
}
// 提交产品表单
const submitForm = () => {
  proxy.$refs.formRef.validate(valid => {
  proxy.$refs.formRef.validate((valid) => {
    if (valid) {
      // 状态字段不在表单填写，也不传给后端；处理统一走 /deal 接口
      const { inspectState, ...payload } = (form.value || {})
      const { inspectState, ...payload } = form.value || {};
      qualityUnqualifiedDeal(payload).then(() => {
        proxy.$modal.msgSuccess("提交成功");
        closeDia();
      })
      });
    }
  })
}
  });
};
// 关闭弹框
const closeDia = () => {
  proxy.resetForm("formRef");
  dialogFormVisible.value = false;
  emit('close')
  emit("close");
};
defineExpose({
  openDialog,
});
</script>

<style scoped>

</style>
<style scoped></style>