FEAT: 添加仓库

src/views/store/storeProduct/index.vue

@@ -37,16 +37,17 @@
               />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="状态" prop="isShow">
-         <el-select style="width: 240px" v-model="queryParams.isShow" placeholder="请选择状态" clearable size="small" >
-         <el-option
-                v-for="item in isShowOptions"
-                :key="item.dictValue"
-                :label="item.dictLabel"
-                :value="item.dictValue"
-              />
+
+      <el-form-item label="所属仓库" prop="productType">
+        <el-select v-model="queryParams.warehouseCode" placeholder="请选择仓库" clearable size="small">
+          <el-option
+            v-for="item in warehouseOptions"
+            :key="item.warehouseCode"
+            :label="item.warehouseName"
+            :value="item.warehouseCode"
+          />
         </el-select>
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -158,6 +159,7 @@
       </el-table-column>
       <el-table-column label="销量" align="center" prop="sales" />
       <el-table-column label="库存" align="center" prop="stock" />
+      <el-table-column label="仓库代码" align="center" prop="warehouseCode" />
       <el-table-column label="类型" align="center" prop="productType" >
           <template slot-scope="scope">
               <el-tag prop="productType" v-for="(item, index) in productTypeOptions"    v-if="scope.row.productType==item.dictValue">{{item.dictLabel}}</el-tag>

src/views/store/warehouses/index.vue

@@ -124,6 +124,7 @@
       <el-table-column label="仓库ID" align="center" prop="id" />
       <el-table-column label="仓库名称" align="center" prop="warehouseName" />
       <el-table-column label="仓库编码" align="center" prop="warehouseCode" />
+      <el-table-column  label="推送ERP" width="120"  align="center" prop="erpText" />
       <el-table-column label="仓库地址" align="center" prop="warehouseAddress" />
       <el-table-column label="联系人" align="center" prop="contactPerson" />
       <el-table-column label="联系电话" align="center" prop="contactPhone" />
@@ -176,6 +177,17 @@
         <el-form-item label="仓库编码" prop="warehouseCode">
           <el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
         </el-form-item>
+        <el-form-item label="ERP推送" prop="erp">
+          <el-select v-model="form.erp" placeholder="请选择" clearable size="small" >
+            <el-option
+              v-for="item in erpTypeOptions"
+              :key="item.dictValue"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+            />
+          </el-select>
+        </el-form-item>
+
         <el-form-item label="仓库地址" prop="warehouseAddress">
           <el-input v-model="form.warehouseAddress" placeholder="请输入仓库地址" />
         </el-form-item>
@@ -230,6 +242,7 @@ export default {
       // 仓库表格数据
       warehousesList: [],
       enableOptions: [],
+      erpTypeOptions: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -270,6 +283,10 @@ export default {
   created() {
     this.getList();
 
+    this.getDicts("erp_type").then((response)=>{
+      this.erpTypeOptions = response.data;
+    })
+
     getDicts('enable_options').then(response=>{
       this.enableOptions = response.data;
     })