maven
7 小时以前 7ffa19f1fe3b37519e83ed1f86715154b13c00f3
src/views/warehouseManagement/index.vue
@@ -82,6 +82,11 @@
            width="180"
            sortable
          />
          <el-table-column prop="type" label="煤料类型">
            <template #default="scope">
              {{scope.row.type === 1 ? '成品' : '原料'}}
            </template>
          </el-table-column>
          <el-table-column prop="coal" label="煤种" sortable />
          <el-table-column prop="unit" label="单位" width="70" />
          <el-table-column
@@ -440,6 +445,22 @@
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="煤料类型" prop="type">
              <el-select
                  v-model="mergeForm.type"
                  placeholder="请选择煤料类型"
                  :disabled="operationType === 'view'"
              >
                <el-option
                    :label="item.label"
                    v-for="item in typeList"
                    :key="item.value"
                    :value="item.value"
                />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-divider></el-divider>
        <el-row>
@@ -499,6 +520,16 @@
// 合并弹框
const mergeVisible = ref(false);
const operationType = ref("");
const typeList = ref([
    {
      label: "成品",
      value: 1,
    },
    {
      label: "原料",
      value: 2,
    },
]);
const data = reactive({
  form: {
    supplierName: "",