添加不合格现象，检验记录不可编辑生产报工信息，生产报工记录加上生产时间字段

zhangwencui

5 天以前 77bb414c194741197a5c3718b71d7e5dffb4e6a7

 src/views/qualityManagement/finalInspection/components/formDia.vue

@@ -1,100 +1,140 @@
<template>
  <div>
    <el-dialog
        v-model="dialogFormVisible"
    <el-dialog v-model="dialogFormVisible"
        :title="operationType === 'add' ? '新增出厂检验' : '编辑出厂检验'"
        width="70%"
        @close="closeDia"
    >
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
               @close="closeDia">
      <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="productId">
              <el-tree-select
                  v-model="form.productId"
            <el-form-item label="产品名称："
                          prop="productId">
              <el-tree-select v-model="form.productId"
                  placeholder="请选择"
                  clearable
                              :disabled="operationType === 'edit'"
                  check-strictly
                  @change="getModels"
                  :data="productOptions"
                  :render-after-expand="false"
                              style="width: 100%" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="规格型号："
                          prop="model">
              <el-input v-model="form.model"
                        :disabled="operationType === 'edit'"
                        placeholder="请输入"
                        clearable />
            </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="请输入"
                        :disabled="operationType === 'edit'"
                        clearable />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="数量："
                          prop="quantity">
              <el-input-number :step="0.01"
                               :min="0"
                               :disabled="operationType === 'edit'"
                  style="width: 100%"
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="规格型号：" prop="model">
              <el-input v-model="form.model" placeholder="请输入" clearable/>
                               v-model="form.quantity"
                               placeholder="请输入"
                               clearable
                               :precision="2" />
            </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/>
            <el-form-item label="检测单位："
                          prop="checkCompany">
              <el-input v-model="form.checkCompany"
                        placeholder="请输入"
                        clearable />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="数量：" prop="quantity">
              <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.quantity" placeholder="请输入" clearable :precision="2"/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="检测单位：" prop="checkCompany">
              <el-input v-model="form.checkCompany" placeholder="请输入" clearable/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="检测结果：" prop="checkResult">
            <el-form-item label="检测结果："
                          prop="checkResult">
              <el-select v-model="form.checkResult">
                <el-option label="合格" value="合格" />
                <el-option label="不合格" value="不合格" />
                <el-option label="合格"
                           value="合格" />
                <el-option label="不合格"
                           value="不合格" />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row v-if="form.checkResult == '不合格'"
                :gutter="30">
          <el-col :span="12">
            <el-form-item label="不合格现象："
                          prop="defectivePhenomena">
              <el-input v-model="form.defectivePhenomena"
                        placeholder="请输入"
                        clearable />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="检验员：" prop="checkName">
                     <el-select v-model="form.checkName"               filterable
            <el-form-item label="检验员："
                          prop="checkName">
              <el-select v-model="form.checkName"
                         filterable
                         default-first-option
                         :reserve-keyword="false" placeholder="请选择" clearable>
                        <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
                         :reserve-keyword="false"
                         placeholder="请选择"
                         clearable>
                <el-option v-for="item in userList"
                           :key="item.nickName"
                           :label="item.nickName"
                                        :value="item.nickName"/>
                     </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="检测日期：" prop="checkTime">
              <el-date-picker
                  v-model="form.checkTime"
            <el-form-item label="检测日期："
                          prop="checkTime">
              <el-date-picker v-model="form.checkTime"
                  type="date"
                  placeholder="请选择日期"
                  value-format="YYYY-MM-DD"
                  format="YYYY-MM-DD"
                  clearable
                  style="width: 100%"
              />
                              style="width: 100%" />
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
         <PIMTable
            rowKey="id"
      <PIMTable rowKey="id"
            :column="tableColumn"
            :tableData="tableData"
            :tableLoading="tableLoading"
            height="400"
         >
                height="400">
            <template #slot="{ row }">
               <el-input v-model="row.testValue" clearable/>
          <el-input v-model="row.testValue"
                    clearable />
            </template>
         </PIMTable>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="submitForm">确认</el-button>
          <el-button type="primary"
                     @click="submitForm">确认</el-button>
          <el-button @click="closeDia">取消</el-button>
        </div>
      </template>
@@ -106,15 +146,18 @@
import {ref} from "vue";
import {getOptions} from "@/api/procurementManagement/procurementLedger.js";
import {productTreeList} from "@/api/basicData/product.js";
import {qualityInspectAdd, qualityInspectUpdate} from "@/api/qualityManagement/rawMaterialInspection.js";
  import {
    qualityInspectAdd,
    qualityInspectUpdate,
  } from "@/api/qualityManagement/rawMaterialInspection.js";
import {userListNoPage} from "@/api/system/user.js";
import {qualityInspectDetailByProductId} from "@/api/qualityManagement/metricMaintenance.js";
import {qualityInspectParamInfo} from "@/api/qualityManagement/qualityInspectParam.js";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
  const { proxy } = getCurrentInstance();
  const emit = defineEmits(["close"]);

const dialogFormVisible = ref(false);
const operationType = ref('')
  const operationType = ref("");
const data = reactive({
  form: {
    checkTime: "",
@@ -127,9 +170,10 @@
    quantity: "",
    checkCompany: "",
    checkResult: "",
      defectivePhenomena: "",
  },
  rules: {
    checkTime: [{ required: true, message: "请输入", trigger: "blur" },],
      checkTime: [{ required: true, message: "请输入", trigger: "blur" }],
    process: [{ required: true, message: "请输入", trigger: "blur" }],
    checkName: [{ required: false, message: "请输入", trigger: "blur" }],
    productId: [{ required: true, message: "请输入", trigger: "blur" }],
@@ -163,8 +207,8 @@
   {
      label: "检验值",
      prop: "testValue",
      dataType: 'slot',
      slot: 'slot',
      dataType: "slot",
      slot: "slot",
   },
]);
const tableData = ref([]);
@@ -176,26 +220,26 @@
const openDialog = async (type, row) => {
  operationType.value = type;
  dialogFormVisible.value = true;
  getOptions().then((res) => {
    getOptions().then(res => {
    supplierList.value = res.data;
  });
   let userLists = await userListNoPage();
   userList.value = userLists.data;
   form.value = {}
    form.value = {};
  getProductOptions();
  if (operationType.value === 'edit') {
    form.value = {...row}
      currentProductId.value = row.productId || 0
      getQualityInspectParamList(row.id)
    if (operationType.value === "edit") {
      form.value = { ...row };
      currentProductId.value = row.productId || 0;
      getQualityInspectParamList(row.id);
  }
}
  };
const getProductOptions = () => {
  productTreeList().then((res) => {
    productTreeList().then(res => {
    productOptions.value = convertIdToValue(res);
  });
};
const getModels = (value) => {
   currentProductId.value = value
  const getModels = value => {
    currentProductId.value = value;
  form.value.productName = findNodeById(productOptions.value, value);
   if (currentProductId) {
      getList();
@@ -216,7 +260,7 @@
  return null; // 没有找到节点，返回null
};
function convertIdToValue(data) {
  return data.map((item) => {
    return data.map(item => {
    const { id, children, ...rest } = item;
    const newItem = {
      ...rest,
@@ -231,44 +275,47 @@
}
// 提交产品表单
const submitForm = () => {
    if (form.value.checkResult == "合格") {
      form.value.defectivePhenomena = "";
    }
  proxy.$refs.formRef.validate(valid => {
    if (valid) {
      form.value.inspectType = 2
        form.value.inspectType = 2;
         if (operationType.value === "add") {
            tableData.value.forEach((item) => {
               delete item.id
            })
          tableData.value.forEach(item => {
            delete item.id;
          });
         }
         const data = {...form.value, qualityInspectParams: tableData.value}
        const data = { ...form.value, qualityInspectParams: tableData.value };
      if (operationType.value === "add") {
        qualityInspectAdd(data).then(res => {
          proxy.$modal.msgSuccess("提交成功");
          closeDia();
        })
          });
      } else {
        qualityInspectUpdate(data).then(res => {
          proxy.$modal.msgSuccess("提交成功");
          closeDia();
        })
          });
      }
    }
  })
}
    });
  };
const getList = () => {
   qualityInspectDetailByProductId(currentProductId.value).then(res => {
      tableData.value = res.data;
   })
}
const getQualityInspectParamList = (id) => {
    });
  };
  const getQualityInspectParamList = id => {
   qualityInspectParamInfo(id).then(res => {
      tableData.value = res.data;
   })
}
    });
  };
// 关闭弹框
const closeDia = () => {
  proxy.resetForm("formRef");
  dialogFormVisible.value = false;
  emit('close')
    emit("close");
};
defineExpose({
  openDialog,
@@ -276,5 +323,4 @@
</script>

<style scoped>

</style>