修改仓库管理菜单

src/api/wms/base/stock.js

@@ -2,87 +2,87 @@ import request from "@/utils/request";
 
 // 创建仓库
 export function createStock(data) {
-    return request({
-        url: "/rtkerp/stock/create",
-        method: "post",
-        data: data,
-    });
+  return request({
+    url: "/rtkerp/stock/create",
+    method: "post",
+    data: data,
+  });
 }
 
 // 更新仓库
 export function updateStock(data) {
-    return request({
-        url: "/rtkerp/stock/update",
-        method: "put",
-        data: data,
-    });
+  return request({
+    url: "/rtkerp/stock/update",
+    method: "post",
+    data: data,
+  });
 }
 
 // 删除仓库
 export function deleteStock(id) {
-    return request({
-        url: "/rtkerp/stock/delete?id=" + id,
-        method: "delete",
-    });
+  return request({
+    url: "/rtkerp/stock/delete?id=" + id,
+    method: "delete",
+  });
 }
 
 // 获得仓库
 export function getStock(id) {
-    return request({
-        url: "/rtkerp/stock/get?id=" + id,
-        method: "get",
-    });
+  return request({
+    url: "/rtkerp/stock/get?id=" + id,
+    method: "get",
+  });
 }
 
 // 获得仓库分页
 export function getStockPage(query) {
-    return request({
-        url: "/rtkerp/stock/page",
-        method: "get",
-        params: query,
-    });
+  return request({
+    url: "/rtkerp/stock/page",
+    method: "get",
+    params: query,
+  });
 }
 
 // 获得仓库下拉列表
 export function getStockPageList(query) {
-    return request({
-        url: "/rtkerp/stock/dropDownList",
-        method: "get",
-        params: query,
-    });
+  return request({
+    url: "/rtkerp/stock/dropDownList",
+    method: "get",
+    params: query,
+  });
 }
 
 // 获得倒冲仓下拉列表
 export function getReverseStockListPage(query) {
-    return request({
-        url: "/rtkerp/stock/reverseStockList",
-        method: "get",
-        params: query,
-    });
+  return request({
+    url: "/rtkerp/stock/reverseStockList",
+    method: "get",
+    params: query,
+  });
 }
 
 // 导出仓库 Excel
 export function exportStockExcel(query) {
-    return request({
-        url: "/rtkerp/stock/export-excel",
-        method: "get",
-        params: query,
-        responseType: "blob",
-    });
+  return request({
+    url: "/rtkerp/stock/export-excel",
+    method: "get",
+    params: query,
+    responseType: "blob",
+  });
 }
 // 获得工厂管理分页
 export function getFactoryPage(query) {
-    return request({
-        url: "/rtkwms/factory/page",
-        method: "get",
-        params: query,
-    });
+  return request({
+    url: "/rtkwms/factory/page",
+    method: "get",
+    params: query,
+  });
 }
 // 获得用户列表
 export function getUserList(query) {
-    return request({
-        url: "/rtkerp/stock/userList",
-        method: "get",
-        params: query,
-    });
-}
+  return request({
+    url: "/rtkerp/stock/userList",
+    method: "get",
+    params: query,
+  });
+}

src/utils/dict.js

@@ -70,6 +70,7 @@ export const DICT_TYPE = {
   MES_ERP: "mes_erp", //ERP标识
   WMS_STOCK_CATEGORIES: "wms_stock_categories", //仓库类别
   WMS_STOCK_MODES: "wms_stock_modes", //仓库模式
+  STOCK_PLACE: "stock_place", //仓库位置
   WMS_SUPPLIER_TYPES: "wms_supplier_types", //供应商类型
   MES_MATERIAL_CATEGORIES: "mes_material_categories", //物料类别
   MES_RECEIVE_MATERIALS_ORDER_STATUS: "mes_receive_materials_order_status", //单据状态

src/views/wms/base/stock.vue

@@ -263,6 +263,29 @@
               />
             </template>
           </el-table-column>
+          <el-table-column
+            v-if="columnsList[8].visible"
+            :key="Math.random()"
+            label="仓库位置"
+            align="center"
+            prop="stockPlace"
+            width="130"
+          />
+          <!-- <el-table-column
+            v-if="columnsList[8].visible"
+            :key="Math.random()"
+            label="仓库位置"
+            align="center"
+            prop="stockPlace"
+            width="130"
+          >
+            <template slot-scope="scope">
+              <dict-tag
+                :type="DICT_TYPE.STOCK_PLACE"
+                :value="scope.row.stockPlace"
+              />
+            </template>
+          </el-table-column> -->
           <el-table-column
             v-if="columnsList[7].visible"
             :key="Math.random()"
@@ -424,6 +447,21 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="仓库位置" prop="stockPlace">
+          <el-select
+            v-model="form.stockPlace"
+            placeholder="请选择仓库位置"
+            clearable
+            size="small"
+          >
+            <el-option
+              v-for="dict in getDictDatas(DICT_TYPE.STOCK_PLACE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取消</el-button>
@@ -501,6 +539,7 @@ export default {
         { key: 5, label: "管理员", visible: true },
         { key: 6, label: "所属工厂", visible: true },
         { key: 7, label: "创建时间", visible: true },
+        { key: 8, label: "仓库位置", visible: true },
       ],
       // 显示隐藏持久化参数
       columnsList: [],
@@ -518,6 +557,7 @@ export default {
         address: null,
         stockModel: null,
         stockCategory: null,
+        stockPlace: null,
         adminUser: null,
         factoryCode: null,
         factoryName: null,
@@ -533,18 +573,21 @@ export default {
         name: [
           { required: true, message: "仓库名称不能为空", trigger: "blur" },
         ],
-        stockCategory: [
-          { required: true, message: "仓库类别不能为空", trigger: "change" },
-        ],
-        stockModel: [
-          { required: true, message: "仓库模式不能为空", trigger: "change" },
-        ],
-        factoryCode: [
-          { required: true, message: "所属工厂不能为空", trigger: "change" },
-        ],
+        // stockCategory: [
+        //   { required: true, message: "仓库类别不能为空", trigger: "change" },
+        // ],
+        // stockModel: [
+        //   { required: true, message: "仓库模式不能为空", trigger: "change" },
+        // ],
+        // factoryCode: [
+        //   { required: true, message: "所属工厂不能为空", trigger: "change" },
+        // ],
         locationQty: [
           { required: true, message: "货位数量不能为空", trigger: "blur" },
         ],
+        stockPlace: [
+          { required: true, message: "仓库位置不能为空", trigger: "blur" },
+        ],
       },
       filterList: [],
     };
@@ -616,6 +659,7 @@ export default {
         address: undefined,
         stockModel: undefined,
         stockCategory: undefined,
+        stockPlace: undefined,
         adminUser: undefined,
         factoryCode: undefined,
         docunentStatus: undefined,