From bf433baf6e4f255b7ce5ac79c42961b5e495c2d9 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 25 Oct 2022 17:06:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E8=B4=A7=E4=BD=8D=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E8=B7=AF=E7=94=B1=E5=92=8C=E9=A1=B5=E9=9D=A2=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inventory/invSpace.js            |   3 +
 src/router/index.js                      |  11 ++
 src/views/inventory/InvSpaceManage.vue   | 240 +++++++++++++++++++++++
 src/views/inventory/invCountOrderNew.vue |  30 ++-
 4 files changed, 275 insertions(+), 9 deletions(-)
 create mode 100644 src/api/inventory/invSpace.js
 create mode 100644 src/views/inventory/InvSpaceManage.vue

diff --git a/src/api/inventory/invSpace.js b/src/api/inventory/invSpace.js
new file mode 100644
index 0000000..b85714d
--- /dev/null
+++ b/src/api/inventory/invSpace.js
@@ -0,0 +1,3 @@
+import axios from "../../utils/axios";
+
+
diff --git a/src/router/index.js b/src/router/index.js
index 7ea109d..a9335c6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -86,6 +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";
 
 
 //库存
@@ -1043,6 +1045,15 @@ export const asyncRouterMap = [
                     },
                 ]
             },
+            {
+                path: "invSpaceManage",
+                component: invSpaceManage,
+                name: "货位管理",
+                icon: "",
+                meta: {
+                    authRule: ["inv/invSpaceManage"]
+                }
+            },
             {
                 path: "/invCount",
                 component: Empty,
diff --git a/src/views/inventory/InvSpaceManage.vue b/src/views/inventory/InvSpaceManage.vue
new file mode 100644
index 0000000..0155dfd
--- /dev/null
+++ b/src/views/inventory/InvSpaceManage.vue
@@ -0,0 +1,240 @@
+<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-input v-model="filterQuery.key" placeholder="请输入查询内容" clearable></el-input>
+                    </el-form-item>
+                    <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"
+                                   :disabled="invWarehouseDisabled"
+                                   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 type="primary" icon="search" @click="addSpace">新增货位</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"></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="invStorageName" v-if="showSup"
+                                 show-overflow-tooltip width="120"></el-table-column>
+                <el-table-column label="所属分库" prop="invSubStorageName" v-if="showSup"
+                                 show-overflow-tooltip width="120"></el-table-column>
+                <el-table-column label="操作" width="120" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="editSpace(scope.row)"
+                        >编辑
+                        </el-button>
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="deleteDialog(scope.row.id)"
+                        >删除
+                        </el-button>
+                    </template>
+                </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 store from "../../store";
+import {filterUplLocInv} from "@/api/basic/invWarehouse";
+import {filterSubByInv} from "@/api/basic/invSubWarehouse";
+import {userInfo} from "@/api/auth/login";
+import {isBlank} from "@/utils/strUtil";
+
+
+export default {
+    data() {
+        return {
+            filterQuery: {
+                invWarehouseCode: null,
+                invStorageCode: null,
+                key: null,
+                page: 1,
+                limit: 20,
+                customerId: null,
+            },
+            list: [],
+            storageList: [],
+            subInvList: [],
+            codeDetailVisible: false,
+            total: 0,
+            loading: true,
+            index: null,
+            dialogTableVisible: false,
+            invWarehouseDisabled: true,
+            formLoading: false,
+            dialogVisible: false,
+            deleteLoading: false,
+            busTypes: [],
+            idQuery: null,
+            showSup: false,
+            fromOptions: [],
+        };
+    },
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                customerId: null,
+                invWarehouseCode: null,
+                invStorageCode: null,
+                page: 1,
+                limit: 20,
+            };
+            this.invChange();
+            this.getList();
+        },
+        onSubmit() {
+            this.loading = true;
+            this.filterQuery.page = 1;
+            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.loading = true;
+            this.filterQuery.customerId = store.getters.customerId;
+        },
+
+        deleteDialog(rowId) {
+            this.$confirm("此操作将永久删除该货位, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+
+                })
+                .catch(() => {
+                });
+        },
+        getStorage() {
+            this.storageList = [];
+            filterUplLocInv()
+                .then((response) => {
+                    this.storageList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
+        invChange() {
+            this.filterQuery.invWarehouseCode = "";
+            this.subInvList = [];
+            if (this.filterQuery.invStorageCode != null && this.filterQuery.invStorageCode != "") {
+                this.invWarehouseDisabled = false;
+                let query = {
+                    pcode: this.filterQuery.invStorageCode
+                };
+                filterSubByInv(query)
+                    .then((response) => {
+                        this.subInvList = response.data || [];
+                    })
+                    .catch(() => {
+                    });
+            } else {
+                this.invWarehouseDisabled = true;
+            }
+        },
+        editSpace(row) {
+
+        },
+        addSpace() {
+
+        },
+    },
+    mounted() {
+        document.body.ondrop = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        };
+    },
+    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) => {
+            if (res.code === 20000) {
+                if (!isBlank(res.data.locInvCode)) {
+                    this.filterQuery.invStorageCode = res.data.locInvCode;
+                    this.invChange();
+                    this.filterQuery.invWarehouseCode = res.data.locSubInvCode;
+                }
+                this.getList();
+            }
+        }).catch((error) => {
+        });
+    },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
diff --git a/src/views/inventory/invCountOrderNew.vue b/src/views/inventory/invCountOrderNew.vue
index 7f8b49e..f0d6094 100644
--- a/src/views/inventory/invCountOrderNew.vue
+++ b/src/views/inventory/invCountOrderNew.vue
@@ -49,24 +49,28 @@
                                 icon="el-icon-refresh"
                                 @click="onReset"
                             ></el-button>
-                            <el-button type="primary" icon="search" @click="onSubmit"
-                            >查询
-                            </el-button
-                            >
+                            <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
+                            <el-button type="primary" icon="search" @click="addCountOrder">新增盘点单</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"></el-table-column>
-                <el-table-column label="盘点单号" prop="orderId" width="120"></el-table-column>
+                <el-table-column label="盘点单号" prop="orderId" width="180"></el-table-column>
                 <el-table-column label="仓库" prop="invStorageName" width="180"></el-table-column>
                 <el-table-column label="分库" prop="invSubStorageName" width="180"
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column label="货位" prop="invSpaceName" width="120"></el-table-column>
                 <el-table-column label="盘点人" prop="createUser" width="120"></el-table-column>
                 <el-table-column label="盘点时间" prop="createTime" width="120"></el-table-column>
-                <el-table-column label="状态" prop="status" width="120"></el-table-column>
+                <el-table-column label="状态" prop="status" width="120">
+                    <template slot-scope="scope">
+                        <el-tag>
+                            {{ statusMap[scope.row.status] }}
+                        </el-tag>
+                    </template>
+                </el-table-column>
                 <el-table-column label="操作" width="120" fixed="right">
                     <template slot-scope="scope">
                         <el-button
@@ -77,12 +81,12 @@
                         </el-button
                         >
 
-                        <el-button
+                        <el-buttons
                             type="text"
                             size="small"
                             @click.native.stop="deleteDialog(scope.row.id)"
                         >删除
-                        </el-button
+                        </el-buttons
                         >
                     </template>
                 </el-table-column>
@@ -146,7 +150,12 @@ export default {
             idQuery: null,
             showSup: false,
             fromOptions: [],
-            spaceCodeList: []
+            spaceCodeList: [],
+            statusMap: {
+                0: "未提交",
+                1: "未审核",
+                2: "已审核"
+            }
         };
     },
     components: {
@@ -301,6 +310,9 @@ export default {
         },
         submitAudit(row) {
 
+        },
+        addCountOrder() {
+
         },
     },
     filters: {