|
@@ -187,7 +187,7 @@
|
|
|
<el-row :gutter="24">
|
|
<el-row :gutter="24">
|
|
|
<el-col :span="12">
|
|
<el-col :span="12">
|
|
|
<el-form-item label="商品单位" prop="unit">
|
|
<el-form-item label="商品单位" prop="unit">
|
|
|
- <el-select style="width: 100%" v-model="form.unit" placeholder="请选择商品单位">
|
|
|
|
|
|
|
+ <el-select style="width: 100%" v-model="form.itemUnit" placeholder="请选择商品单位">
|
|
|
<el-option :value="item.value" :label="item.label" v-for="(item, index) in conventional_units"></el-option>
|
|
<el-option :value="item.value" :label="item.label" v-for="(item, index) in conventional_units"></el-option>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -239,7 +239,7 @@
|
|
|
<template #default="scope">
|
|
<template #default="scope">
|
|
|
<div class="flex-center">
|
|
<div class="flex-center">
|
|
|
<el-select :disabled="scope.row.isMultiUom" v-model="scope.row.unit">
|
|
<el-select :disabled="scope.row.isMultiUom" v-model="scope.row.unit">
|
|
|
- <el-option :value="item.value" :label="item.label" v-for="(item, index) in quantity_unit"></el-option>
|
|
|
|
|
|
|
+ <el-option :value="item.value" :label="item.label" v-for="(item, index) in conventional_units"></el-option>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</div>
|
|
</div>
|
|
|
<div class="flex-center mt5">
|
|
<div class="flex-center mt5">
|
|
@@ -480,7 +480,7 @@ const initFormData = {
|
|
|
itemCode: undefined,
|
|
itemCode: undefined,
|
|
|
itemName: undefined,
|
|
itemName: undefined,
|
|
|
itemCategory: undefined,
|
|
itemCategory: undefined,
|
|
|
- unit: undefined,
|
|
|
|
|
|
|
+ itemUnit: undefined,
|
|
|
itemBrand: undefined,
|
|
itemBrand: undefined,
|
|
|
remark: undefined,
|
|
remark: undefined,
|
|
|
itemType: undefined
|
|
itemType: undefined
|
|
@@ -524,7 +524,7 @@ const data = reactive({
|
|
|
itemType: [
|
|
itemType: [
|
|
|
{required: true, message: "商品类型不能为空", trigger: "change"}
|
|
{required: true, message: "商品类型不能为空", trigger: "change"}
|
|
|
],
|
|
],
|
|
|
- unit: [
|
|
|
|
|
|
|
+ itemUnit: [
|
|
|
{required: true, message: "商品单位不能为空", trigger: "change"}
|
|
{required: true, message: "商品单位不能为空", trigger: "change"}
|
|
|
]
|
|
]
|
|
|
}
|
|
}
|