Merge remote-tracking branch 'origin/zhairh' into busUser

3 years ago · 0a26978d3a
parent 31bfb201e1 167920855d
commit 0a26978d3a
9 changed files with 69 additions and 17 deletions
--- a/src/router/index.js
+++ b/src/router/index.js
@ -1436,6 +1436,55 @@ export const asyncRouterMap = [
                            authRule: ["invManage/invGoodsPlacement"]
                        }
                    },
+                    {
+                        path: "/invMaintenance",
+                        component: Empty,
+                        name: "库存养护",
+                        icon: "",
+                        meta: {
+                            authRule: ["invMaintenance/manage"]
+                        },
+                        children: [
+                            {
+                                path: "/maintenanceOrder",
+                                component: Empty,
+                                name: "养护记录",
+                                icon: "",
+                                meta: {
+                                    authRule: ["invMaintenance/order"]
+                                },
+                                children: [
+                                    {
+                                        path: "maintenanceOrderNew",
+                                        component: invGoodsPlacement,
+                                        name: "新增养护记录",
+                                        icon: "",
+                                        meta: {
+                                            authRule: ["invMaintenance/orderNew"]
+                                        },
+                                    },
+                                    {
+                                        path: "maintenanceOrderAudit",
+                                        component: invGoodsPlacement,
+                                        name: "审核养护记录",
+                                        icon: "",
+                                        meta: {
+                                            authRule: ["invMaintenance/orderAudit"]
+                                        },
+                                    }
+                                ]
+                            },
+                            {
+                                path: "maintenanceOrderCompleted",
+                                component: invGoodsPlacement,
+                                name: "养护记录查询",
+                                icon: "",
+                                meta: {
+                                    authRule: ["invMaintenance/orderCompleted"]
+                                }
+                            }
+                        ]
+                    },
                ]
            },
            {
--- a/src/views/inout/IOCheckErrorOrder.vue
+++ b/src/views/inout/IOCheckErrorOrder.vue
@ -531,7 +531,8 @@ export default {
                "6": "缺量补录单据",
                "7": "UDI供应商平台",
                "8": "平衡补录单据",
-                "10":"手动补单"
+                "10":"手动补单",
+                "11": "仓库盘点"
            },
            busTypes: [],
            enableDept: false,
--- a/src/views/inout/IOCheckWaitOrder.vue
+++ b/src/views/inout/IOCheckWaitOrder.vue
@ -436,7 +436,8 @@ export default {
                "6": "缺量补录单据",
                "7": "UDI供应商平台",
                "8": "平衡补录单据",
-                "10":"手动补单"
+                "10":"手动补单",
+                "11": "仓库盘点"
            },
            exportQuery: {
                orderId: "",
--- a/src/views/inout/IOErrorOrder.vue
+++ b/src/views/inout/IOErrorOrder.vue
@ -333,7 +333,8 @@ export default {
                "6": "缺量补录单据",
                "7": "UDI供应商平台",
                "8": "平衡补录单据",
-                "10": "手动补单"
+                "10": "手动补单",
+                "11": "仓库盘点"
            },
            storageList: [],
            subInvList: [],
--- a/src/views/inout/IOFinishOrder.vue
+++ b/src/views/inout/IOFinishOrder.vue
@ -448,7 +448,8 @@ export default {
                "6": "缺量补录单据",
                "7": "UDI供应商平台",
                "8": "平衡补录单据",
-                "10": "手动补单"
+                "10": "手动补单",
+                "11": "仓库盘点"
            },
            //往来单位
            unitquery: {key: "", page: 1, limit: 20},
--- a/src/views/inout/IONewOrder.vue
+++ b/src/views/inout/IONewOrder.vue
@ -351,7 +351,8 @@ export default {
                "6": "缺量补录单据",
                "7": "UDI供应商平台",
                "8": "平衡补录单据",
-                "10": "手动补单"
+                "10": "手动补单",
+                "11": "仓库盘点"
            },
            deleteData: {
                id: "",
--- a/src/views/inventory/countOrderCodes.vue
+++ b/src/views/inventory/countOrderCodes.vue
@ -22,6 +22,12 @@
                width="500"
                show-overflow-tooltip
            ></el-table-column>
+            <el-table-column
+                label="扫码数量"
+                prop="count"
+                width="120"
+                show-overflow-tooltip
+            ></el-table-column>
            <el-table-column
                label="操作"
                width="120"
--- a/src/views/inventory/invCountOrderAudit.vue
+++ b/src/views/inventory/invCountOrderAudit.vue
@ -116,8 +116,7 @@
        <el-card>
            <el-table v-loading="loading" :data="detailList" style="width: 100%">
                <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column label="盘点单号" prop="orderIdFk" width="180"></el-table-column>
-                <el-table-column label="产品名称" prop="productName" width="180"></el-table-column>
+                <el-table-column label="产品名称" prop="productName" width="220"></el-table-column>
                <el-table-column label="批次号" prop="batchNo" width="180"
                                 show-overflow-tooltip></el-table-column>
                <el-table-column label="生产日期" prop="produceDate" width="120"></el-table-column>
@ -142,14 +141,6 @@
                        >详情
                        </el-button
                        >
-
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native.stop="deleteDialog(scope.row.id)"
-                        >删除
-                        </el-button
-                        >
                    </template>
                </el-table-column>
            </el-table>
@ -400,6 +391,7 @@ export default {
            this.codeQuery = {
                orderIdFk: row.orderIdFk,
                productId: row.productId,
+                batchNo: row.batchNo,
                edit: false
            };
            this.codesVisible = true;
--- a/src/views/inventory/invCountOrderCompleted.vue
+++ b/src/views/inventory/invCountOrderCompleted.vue
@ -98,8 +98,7 @@
        <el-card>
            <el-table v-loading="loading" :data="detailList" style="width: 100%">
                <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column label="盘点单号" prop="orderIdFk" width="180"></el-table-column>
-                <el-table-column label="产品名称" prop="productName" width="180"></el-table-column>
+                <el-table-column label="产品名称" prop="productName" width="220"></el-table-column>
                <el-table-column label="批次号" prop="batchNo" width="180"
                                 show-overflow-tooltip></el-table-column>
                <el-table-column label="生产日期" prop="produceDate" width="120"></el-table-column>
@ -371,6 +370,7 @@ export default {
            this.codeQuery = {
                orderIdFk: row.orderIdFk,
                productId: row.productId,
+                batchNo: row.batchNo,
                edit: false
            };
            this.codesVisible = true;