来料检字段调整

zss

3 天以前 6832942f666ce50675911634754d693a49e85368

来料检字段调整

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

@@ -11,17 +11,8 @@
               ref="formRef">
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="供应商："
                          prop="supplier">
              <el-select v-model="form.supplier"
                         placeholder="请选择"
                         clearable
                         :disabled="supplierQuantityDisabled">
                <el-option v-for="item in supplierList"
                           :key="item.id"
                           :label="item.supplierName"
                           :value="item.supplierName" />
              </el-select>
            <el-form-item label="供应商：" prop="supplier">
             <el-input v-model="form.supplier" placeholder="请输入" clearable/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
@@ -40,6 +31,52 @@
              </div>
              <div v-else
                   class="text-gray-400">请选择产品</div>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="试样编号："
                          prop="sampleCode">
              <el-input v-model="form.sampleCode"
                        placeholder="请输入"
                        clearable />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="车牌号："
                          prop="licensePlateNumber">
              <el-input v-model="form.licensePlateNumber"
                        placeholder="请输入"
                        clearable />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="检测性质："
                          prop="inspectNature">
              <el-select v-model="form.inspectNature">
                <el-option label="日常检测"
                           value="日常检测" />
                <el-option label="入场验收"
                           value="入场验收" />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="试样状态："
                          prop="sampleState">
              <el-select v-model="form.sampleState">
                <el-option label="固体"
                           value="固体" />
                <el-option label="颗粒"
                           value="颗粒" />
                <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>
@@ -107,6 +144,18 @@
            <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%" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="取样日期："
                          prop="sampleTime">
              <el-date-picker v-model="form.sampleTime"
                              type="date"
                              placeholder="请选择日期"
                              value-format="YYYY-MM-DD"
@@ -190,9 +239,14 @@
      quantity: "",
      checkCompany: "",
      checkResult: "",
      inspectNature: "",
      sampleCode: "",
      sampleState: "",
      licensePlateNumber: "",
      sampleTime: "",
    },
    rules: {
      checkTime: [{ required: true, message: "请输入", trigger: "blur" }],
      checkTime: [{ required: false, message: "请输入", trigger: "blur" }],
      supplier: [{ required: true, message: "请输入", trigger: "blur" }],
      checkName: [{ required: false, message: "请输入", trigger: "blur" }],
      productId: [{ required: true, message: "请输入", trigger: "blur" }],
@@ -206,8 +260,17 @@
      quantity: [{ required: true, message: "请输入", trigger: "blur" }],
      checkCompany: [{ required: false, message: "请输入", trigger: "blur" }],
      checkResult: [
        { required: true, message: "请选择检测结果", trigger: "change" },
        { required: false, message: "请选择检测结果", trigger: "change" },
      ],
      inspectNature: [
        { required: false, message: "请选择检测性质", trigger: "change" },
      ],
      sampleState: [
        { required: false, message: "请选择试样状态", trigger: "change" },
      ],
      sampleCode: [{ required: false, message: "请输入", trigger: "blur" }],
      licensePlateNumber: [{ required: false, message: "请输入", trigger: "blur" }],
      sampleTime: [{ required: false, message: "请输入", trigger: "blur" }],
    },
  });
  const tableColumn = ref([
@@ -270,7 +333,6 @@
    form.value = {
      checkTime: "",
      supplier: "",
      checkName: "",
      productName: "",
      productId: "",
      productModelId: "",
@@ -533,4 +595,4 @@
</script>

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

 src/views/qualityManagement/rawMaterialInspection/index.vue

@@ -98,14 +98,9 @@
    width: 120
  },
  {
    label: "采购订单号",
    prop: "purchaseContractNo",
    width: 120
  },
  {
    label: "供应商",
    prop: "supplier",
    width: 230
    width: 130
  },
  {
    label: "检验员",
@@ -122,6 +117,7 @@
  {
    label: "单位",
    prop: "unit",
     width: 80
  },
  {
    label: "数量",
@@ -129,9 +125,24 @@
    width: 120
  },
  {
    label: "试样编号",
    prop: "sampleCode",
  },
  {
    label: "试样状态",
    prop: "sampleState",
  },
  {
    label: "检测性质",
    prop: "inspectNature",
  },
   {
    label: "取样日期",
    prop: "sampleTime",
  },
  {
    label: "检测单位",
    prop: "checkCompany",
    width: 120
  },
  {
    label: "检测结果",