Merge remote-tracking branch 'origin/dev_JLMY' into dev_JLMY

maven

8 天以前 4cc27f93a1901e12eb12a198029911c483dd991f

 src/views/procureMent/components/ProductionDialog.vue

@@ -30,6 +30,20 @@
            />
          </el-select>
        </el-form-item>
        <el-form-item label="煤料类型" prop="type">
          <el-select
              v-model="form.type"
              placeholder="请选择煤种"
              :disabled="isViewMode"
          >
            <el-option
                :label="item.label"
                v-for="item in typeList"
                :key="item.value"
                :value="item.value"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="煤种" prop="coalId">
          <el-select
            v-model="form.coalId"
@@ -198,6 +212,16 @@
  required: true,
  type: Boolean,
});
const typeList = [
  {
    value: 1,
    label: "成品",
  },
  {
    value: 2,
    label: "原料",
  },
];
const form = defineModel("form", {
  required: true,
  type: Object,
@@ -367,6 +391,7 @@
  supplierName: [
    { required: true, message: "请输入供应商名称", trigger: "blur" },
  ],
  type: [{ required: true, message: "请选择类型", trigger: "change" }],
  coal: [{ required: true, message: "请输入煤种", trigger: "blur" }],
  purchaseQuantity: [
    { required: true, message: "请输入采购数量", trigger: "blur" },