Forráskód Böngészése

fix: 开发商品管理、BOM、生产管理、财务、调整出库入库部分字段

wuguojie 4 hónapja
szülő
commit
1952d0b399

+ 3 - 6
src/views/wms/basic/item/index.vue

@@ -20,9 +20,7 @@
         </el-form-item>
         <el-form-item label="商品类型" prop="itemType">
             <el-select v-model="queryParams.itemType" clearable filterable>
-                <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-form-item>
         <el-form-item>
@@ -172,9 +170,7 @@
                 <el-col :span="12">
                     <el-form-item label="商品类型" prop="itemType">
                         <el-select :disabled="dialog.title != '新增商品'" v-model="form.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-form-item>
                 </el-col>
@@ -426,6 +422,7 @@ const itemCategoryTreeOptionsList = computed(() => {
 
 const { conventional_units } = proxy.useDict('conventional_units')
 const { quantity_unit } = proxy.useDict('quantity_unit')
+const { item_type } = proxy.useDict('item_type')
 
 const buttonLoading = ref(false);
 const loading = ref(true);

+ 3 - 7
src/views/wms/basic/product/index.vue

@@ -172,9 +172,7 @@
                             <el-col :span="12">
                                 <el-form-item label="商品类型" prop="type">
                                     <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-form-item>
                             </el-col>
@@ -408,9 +406,7 @@
                     <el-col :span="8">
                         <el-form-item label="商品类型">
                             <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-form-item>
                     </el-col>
@@ -596,7 +592,7 @@ const barcode = ref(null)
 const route = useRoute()
 const {proxy} = getCurrentInstance();
 const { conventional_units } = proxy.useDict('conventional_units')
-console.log(1231232, conventional_units)
+const { item_type } = proxy.useDict('item_type')
 const itemList = ref([]);
 const itemCategoryTreeSelectList = computed(() => useWmsStore().itemCategoryTreeList);
 const itemCategoryTreeOptionsList = computed(() => {