Merge branch 'master' of http://git.echepei.com/zhujiawei/Warehouse_management_ui

src/views/basicdata/goods/index.vue

@@ -267,9 +267,16 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <!--<el-form-item label="删除状态" prop="delFlag">
-              <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
-            </el-form-item>-->
+            <el-form-item label="商品类别" prop="fTypeid">
+              <el-select v-model="form.fTypeid" placeholder="请选择商品类别">
+                <el-option
+                  v-for="dict in fTypeidOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
         </el-row>
 
@@ -316,6 +323,8 @@
         fIdOptions: [],
         // 状态数据字典
         statusOptions: [],
+        // 数据字典
+        fTypeidOptions: [],
         // 删除状态字典
         delFlagOptions: [],
         // 查询参数
@@ -360,6 +369,9 @@
       this.getDicts("sys_normal_disable").then(response => {
         this.statusOptions = response.data;
       });
+      this.getDicts("data_goods_category").then(response => {
+        this.fTypeidOptions = response.data;
+      });
     },
     methods: {
       /** 查询商品详情列表 */