Merge branch 'master' into 测试

src/views/production/warehouse/check/index.vue

@@ -55,6 +55,7 @@ import byTable from "/src/components/byTable/index";
 const { proxy } = getCurrentInstance();
 const activeName = ref("first");
 const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const warehouseList = ref([]);
 const status = ref([
   { dictKey: "0", dictValue: "正常" },
   { dictKey: "1", dictValue: "异常" },
@@ -97,9 +98,10 @@ const searchConfig = computed(() => {
       label: "事业部",
     },
     {
-      type: "input",
-      prop: "warehouseName",
-      label: "仓库名称",
+      type: "select",
+      prop: "warehouseId",
+      data: warehouseList.value,
+      label: "仓库",
     },
     {
       type: "select",
@@ -133,9 +135,10 @@ const searchConfigTwo = computed(() => {
       label: "事业部",
     },
     {
-      type: "input",
-      prop: "warehouseName",
-      label: "仓库名称",
+      type: "select",
+      prop: "warehouseId",
+      data: warehouseList.value,
+      label: "仓库",
     },
     {
       type: "select",
@@ -349,6 +352,16 @@ const getDemandData = () => {
       );
     }
   });
+  proxy.post("/warehouse/page", { pageNum: 1, pageSize: 999 }).then((res) => {
+    if (res.rows && res.rows.length > 0) {
+      warehouseList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
+    }
+  });
 };
 getDemandData();
 const clickModal = () => {

src/views/production/warehouse/flow-record/index.vue

@@ -24,6 +24,7 @@ import byTable from "/src/components/byTable/index";
 
 const { proxy } = getCurrentInstance();
 const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const warehouseList = ref([]);
 const sourceList = ref({
   data: [],
   pagination: {
@@ -66,9 +67,10 @@ const searchConfig = computed(() => {
       label: "事业部",
     },
     {
-      type: "input",
-      prop: "warehouseName",
-      label: "仓库名称",
+      type: "select",
+      prop: "warehouseId",
+      data: warehouseList.value,
+      label: "仓库",
     },
     {
       type: "select",
@@ -229,6 +231,16 @@ const getDemandData = () => {
       );
     }
   });
+  proxy.post("/warehouse/page", { pageNum: 1, pageSize: 999 }).then((res) => {
+    if (res.rows && res.rows.length > 0) {
+      warehouseList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
+    }
+  });
 };
 getDemandData();
 const deriveExcel = () => {

src/views/production/warehouse/inventory/index.vue

@@ -263,7 +263,7 @@ const getDemandData = () => {
       }
     });
     proxy.post("/warehouse/page", { pageNum: 1, pageSize: 999 }).then((res) => {
-      warehouseList.value[0].children = res.rows;
+      warehouseList.value[0].children = res.rows.filter((item) => item.type !== "1");
       if (!(route.query && route.query.backupDate)) {
         proxy.post("/inventory/getQuantityByWarehouse", { departmentId: sourceList.value.pagination.departmentId }).then((res) => {
           if (warehouseList.value[0].children && warehouseList.value[0].children.length > 0) {

src/views/production/warehouse/outbound/index.vue

@@ -62,6 +62,7 @@ import byTable from "/src/components/byTable/index";
 const { proxy } = getCurrentInstance();
 const activeName = ref("first");
 const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const warehouseList = ref([]);
 const sourceList = ref({
   data: [],
   pagination: {
@@ -111,9 +112,10 @@ const searchConfig = computed(() => {
       label: "事业部",
     },
     {
-      type: "input",
-      prop: "warehouseName",
-      label: "仓库名称",
+      type: "select",
+      prop: "warehouseId",
+      data: warehouseList.value,
+      label: "仓库",
     },
     {
       type: "select",
@@ -157,9 +159,10 @@ const searchConfigTwo = computed(() => {
       label: "事业部",
     },
     {
-      type: "input",
-      prop: "warehouseName",
-      label: "仓库名称",
+      type: "select",
+      prop: "warehouseId",
+      data: warehouseList.value,
+      label: "仓库",
     },
     {
       type: "select",
@@ -401,6 +404,16 @@ const getDemandData = () => {
       );
     }
   });
+  proxy.post("/warehouse/page", { pageNum: 1, pageSize: 999 }).then((res) => {
+    if (res.rows && res.rows.length > 0) {
+      warehouseList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
+    }
+  });
 };
 getDemandData();
 const clickCode = (row) => {

src/views/production/warehouse/putInStorage/index.vue

@@ -58,6 +58,7 @@ import byTable from "/src/components/byTable/index";
 const { proxy } = getCurrentInstance();
 const activeName = ref("first");
 const departmentList = ref([{ dictKey: "0", dictValue: "胜德体育" }]);
+const warehouseList = ref([]);
 const sourceList = ref({
   data: [],
   pagination: {
@@ -106,9 +107,10 @@ const searchConfig = computed(() => {
       label: "事业部",
     },
     {
-      type: "input",
-      prop: "warehouseName",
-      label: "仓库名称",
+      type: "select",
+      prop: "warehouseId",
+      data: warehouseList.value,
+      label: "仓库",
     },
     {
       type: "select",
@@ -152,9 +154,10 @@ const searchConfigTwo = computed(() => {
       label: "事业部",
     },
     {
-      type: "input",
-      prop: "warehouseName",
-      label: "仓库名称",
+      type: "select",
+      prop: "warehouseId",
+      data: warehouseList.value,
+      label: "仓库",
     },
     {
       type: "select",
@@ -396,6 +399,16 @@ const getDemandData = () => {
       );
     }
   });
+  proxy.post("/warehouse/page", { pageNum: 1, pageSize: 999 }).then((res) => {
+    if (res.rows && res.rows.length > 0) {
+      warehouseList.value = res.rows.map((item) => {
+        return {
+          dictKey: item.id,
+          dictValue: item.name,
+        };
+      });
+    }
+  });
 };
 getDemandData();
 const clickCode = (row) => {

src/views/subsidiary/warehouse/inventory/index.vue

@@ -222,7 +222,7 @@ const getDemandData = () => {
     });
   });
   proxy.post("/warehouse/page", { pageNum: 1, pageSize: 999 }).then((res) => {
-    warehouseList.value[0].children = res.rows;
+    warehouseList.value[0].children = res.rows.filter((item) => item.type !== "1");
     proxy.post("/inventory/getQuantityByWarehouse", { departmentId: sourceList.value.pagination.departmentId }).then((res) => {
       if (warehouseList.value[0].children && warehouseList.value[0].children.length > 0) {
         for (let i = 0; i < warehouseList.value[0].children.length; i++) {