|
@@ -172,9 +172,7 @@
|
|
|
<el-col :span="12">
|
|
<el-col :span="12">
|
|
|
<el-form-item label="商品类型" prop="type">
|
|
<el-form-item label="商品类型" prop="type">
|
|
|
<el-select v-model="form.type" clearable filterable style="width: 100%">
|
|
<el-select v-model="form.type" clearable filterable style="width: 100%">
|
|
|
- <el-option value="1" label="成品"></el-option>
|
|
|
|
|
- <el-option value="2" label="原料"></el-option>
|
|
|
|
|
- <el-option value="3" label="包材"></el-option>
|
|
|
|
|
|
|
+ <el-option v-for="item in item_type" :value="item.value" :label="item.label"></el-option>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
@@ -408,9 +406,7 @@
|
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
|
<el-form-item label="商品类型">
|
|
<el-form-item label="商品类型">
|
|
|
<el-select disabled v-model="BOMDataForm.itemType" clearable filterable style="width: 100%">
|
|
<el-select disabled v-model="BOMDataForm.itemType" clearable filterable style="width: 100%">
|
|
|
- <el-option value="1" label="成品"></el-option>
|
|
|
|
|
- <el-option value="2" label="原料"></el-option>
|
|
|
|
|
- <el-option value="3" label="包材"></el-option>
|
|
|
|
|
|
|
+ <el-option v-for="item in item_type" :value="item.value" :label="item.label"></el-option>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
@@ -596,7 +592,7 @@ const barcode = ref(null)
|
|
|
const route = useRoute()
|
|
const route = useRoute()
|
|
|
const {proxy} = getCurrentInstance();
|
|
const {proxy} = getCurrentInstance();
|
|
|
const { conventional_units } = proxy.useDict('conventional_units')
|
|
const { conventional_units } = proxy.useDict('conventional_units')
|
|
|
-console.log(1231232, conventional_units)
|
|
|
|
|
|
|
+const { item_type } = proxy.useDict('item_type')
|
|
|
const itemList = ref([]);
|
|
const itemList = ref([]);
|
|
|
const itemCategoryTreeSelectList = computed(() => useWmsStore().itemCategoryTreeList);
|
|
const itemCategoryTreeSelectList = computed(() => useWmsStore().itemCategoryTreeList);
|
|
|
const itemCategoryTreeOptionsList = computed(() => {
|
|
const itemCategoryTreeOptionsList = computed(() => {
|