From f85312d3b459fd52a4a6162357d466282be101dd Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Thu, 27 Oct 2022 22:35:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E8=B4=A7=E7=89=A9=E6=91=86?=
 =?UTF-8?q?=E6=94=BE=E9=A1=B5=E9=9D=A2=E5=92=8C=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                       |  10 +-
 src/views/inventory/InvGoodsPlacement.vue | 200 ++++++++++++++++++++++
 src/views/inventory/invCountOrderNew.vue  |   3 -
 3 files changed, 205 insertions(+), 8 deletions(-)
 create mode 100644 src/views/inventory/InvGoodsPlacement.vue

diff --git a/src/router/index.js b/src/router/index.js
index 5ae62e6..f5b3009 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -86,8 +86,8 @@ import stockOrderDelete from "../views/business/stockOrderDelete";
 import invCountOrderNew from "@/views/inventory/invCountOrderNew";
 import invCountOrderAudit from "@/views/inventory/invCountOrderAudit";
 import invCountOrderCompleted from "@/views/inventory/invCountOrderCompleted";
-//货位管理
-import invSpaceManage from "@/views/inventory/InvSpaceManage";
+//货物摆放
+import invGoodsPlacement from "@/views/inventory/InvGoodsPlacement";
 
 
 //库存
@@ -1040,12 +1040,12 @@ export const asyncRouterMap = [
                         }
                     },
                     {
-                        path: "invStatistics",
-                        component: invStatistics,
+                        path: "invGoodsPlacement",
+                        component: invGoodsPlacement,
                         name: "货物摆放",
                         icon: "",
                         meta: {
-                            authRule: ["invManage/invStatistics"]
+                            authRule: ["invManage/invGoodsPlacement"]
                         }
                     },
                 ]
diff --git a/src/views/inventory/InvGoodsPlacement.vue b/src/views/inventory/InvGoodsPlacement.vue
new file mode 100644
index 0000000..c7cfe0a
--- /dev/null
+++ b/src/views/inventory/InvGoodsPlacement.vue
@@ -0,0 +1,200 @@
+<template>
+    <div>
+        <el-card>
+            <el-form :inline="true" :model="filterQuery" size="mini">
+                <el-row style="width: 100%">
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
+                                   @change="invChange" size="mini">
+                            <el-option
+                                v-for="item in storageList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                                   size="mini">
+                            <el-option
+                                v-for="item in subInvList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button-group>
+                            <el-button
+                                type="primary"
+                                icon="el-icon-refresh"
+                                @click="onReset"
+                            ></el-button>
+                            <el-button type="primary" icon="search" @click="onSubmit"
+                            >查询
+                            </el-button
+                            >
+                        </el-button-group>
+                    </el-form-item>
+                </el-row>
+            </el-form>
+
+            <el-table v-loading="loading" :data="list" style="width: 100%">
+                <el-table-column label="序号" type="index" fixed></el-table-column>
+                <el-table-column label="产品标识" prop="nameCode" width="120"></el-table-column>
+                <el-table-column label="产品名称" prop="cpmctymc" width="180">
+                </el-table-column>
+                <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
+                <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
+                <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
+                <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
+                <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
+
+                <el-table-column label="结余数量" prop="reCount" width="120">
+                    <template slot-scope="scope">
+                        {{ (scope.row.inCount - scope.row.outCount) }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
+                                 width="120"></el-table-column>
+                <el-table-column label="供应商" prop="companyName" v-if="showSup" show-overflow-tooltip
+                                 width="120"></el-table-column>
+            </el-table>
+        </el-card>
+
+        <el-pagination
+            :page-size="filterQuery.limit"
+            @current-change="handleCurrentChange"
+            layout="prev, pager, next"
+            :total="total"
+        ></el-pagination>
+    </div>
+</template>
+
+<script>
+import draggable from "vuedraggable";
+import codeDetail from "./InvProductsDetail";
+import store from "../../store";
+import {filterUplLocInv} from "@/api/basic/invWarehouse";
+import {filterSubByInv} from "@/api/basic/invSubWarehouse";
+
+
+export default {
+    data() {
+        return {
+            filterQuery: {
+                invWarehouseCode: null,
+                page: 1,
+                limit: 20,
+                customerId: null,
+                invStorageCode: null,
+            },
+            detailQuery: {
+                code: null,
+                productIdFk: null,
+                page: 1,
+                limit: 20,
+            },
+            list: [],
+            codeDetailVisible: false,
+            total: 0,
+            loading: false,
+            index: null,
+            dialogTableVisible: false,
+            formLoading: false,
+            dialogVisible: false,
+            deleteLoading: false,
+            idQuery: null,
+            showSup: false,
+            fromOptions: [],
+            storageOptions: [],
+            storageList: [],
+            subInvList: [],
+        };
+    },
+    components: {
+        draggable,
+        codeDetail,
+    },
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                invStorageCode: null,
+                customerId: null,
+                page: 1,
+                limit: 20,
+            };
+            this.getList();
+        },
+        onSubmit() {
+            this.getList();
+        },
+        handleSizeChange(val) {
+            this.filterQuery.limit = val;
+            this.getList();
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        handleUnitClick(row) {
+            this.curIndex = row.id;
+            this.dialogTableVisible = true;
+        },
+        closeDetailDialog(val) {
+            this.codeDetailVisible = false;
+        },
+        closeDialog() {
+            this.getList();
+        },
+        getList() {
+            this.filterQuery.customerId = store.getters.customerId;
+
+        },
+
+        intentDetail(row) {
+            this.idQuery = row;
+            this.idQuery.customerId = null;
+            this.codeDetailVisible = true;
+        },
+        getStorage() {
+            this.storageList = [];
+            filterUplLocInv()
+                .then((response) => {
+                    this.storageList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
+        invChange() {
+            this.filterQuery.invWarehouseCode = "";
+            this.subInvList = [];
+            let query = {
+                pcode: this.filterQuery.invStorageCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
+    },
+    created() {
+        this.getList();
+        this.getStorage();
+    },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
diff --git a/src/views/inventory/invCountOrderNew.vue b/src/views/inventory/invCountOrderNew.vue
index 76c6232..44e428b 100644
--- a/src/views/inventory/invCountOrderNew.vue
+++ b/src/views/inventory/invCountOrderNew.vue
@@ -285,9 +285,6 @@ export default {
     },
     created() {
         this.getStorage();
-        let query = this.$route.query;
-        this.filterQuery = Object.assign(this.filterQuery, query);
-        this.filterQuery.limit = parseInt(this.filterQuery.limit);
         // 加载表格数据
         //获取用户默认仓库信息
         userInfo().then((res) => {