From 2ddcb496160ff6f874071e369f8e2cac551d7800 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 28 Nov 2023 08:03:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=80=E4=BA=9B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/route.js              | 66 ++++++++++++++++----------------
 src/views/inm/materialbatch.vue  | 19 ++++++++-
 src/views/inm/warehouse.vue      | 16 +++++---
 src/views/mtm/materials.vue      |  8 +++-
 src/views/mtm/materials_form.vue |  5 +++
 5 files changed, 71 insertions(+), 43 deletions(-)

diff --git a/src/config/route.js b/src/config/route.js
index 58f9fbdf..d9fe72c3 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -638,39 +638,6 @@ const routes = [
             }
           ]
         },
-        //设备
-        {
-          "name": "em",
-          "path": "/em",
-          "meta": {
-            "title": "设备管理",
-            "icon": "el-icon-grid",
-            "type": "menu",
-            "perms": ["em"]
-          },
-          "children": [
-            {
-              "name": "equipment",
-              "path": "/em/equipment",
-              "meta": {
-                "title": "生产设备",
-                "icon": "el-icon-cellphone",
-                "perms": ["equipment"]
-              },
-              "component": "em/equipment"
-            },
-            {
-              "name": "equipmentc",
-              "path": "/em/equipmentc",
-              "meta": {
-                "title": "计量设备",
-                "icon": "el-icon-cellphone",
-                "perms": ["equipment"]
-              },
-              "component": "em/equipmentc"
-            },
-          ]
-        },
         //制造管理 mtm
         {
           "name": "mtm",
@@ -1589,6 +1556,39 @@ const routes = [
             },
           ]
         },
+                //设备
+                {
+                  "name": "em",
+                  "path": "/em",
+                  "meta": {
+                    "title": "设备管理",
+                    "icon": "el-icon-grid",
+                    "type": "menu",
+                    "perms": ["em"]
+                  },
+                  "children": [
+                    {
+                      "name": "equipment",
+                      "path": "/em/equipment",
+                      "meta": {
+                        "title": "生产设备",
+                        "icon": "el-icon-cellphone",
+                        "perms": ["equipment"]
+                      },
+                      "component": "em/equipment"
+                    },
+                    {
+                      "name": "equipmentc",
+                      "path": "/em/equipmentc",
+                      "meta": {
+                        "title": "计量设备",
+                        "icon": "el-icon-cellphone",
+                        "perms": ["equipment"]
+                      },
+                      "component": "em/equipmentc"
+                    },
+                  ]
+                },
         //人事
         {
           "name": "hrm",
diff --git a/src/views/inm/materialbatch.vue b/src/views/inm/materialbatch.vue
index aaf5a1ae..6a3ec2d7 100644
--- a/src/views/inm/materialbatch.vue
+++ b/src/views/inm/materialbatch.vue
@@ -2,6 +2,10 @@
   <el-container>
     <el-header>
       <div class="left-panel">
+        <el-select v-model="query.warehouse" clearable placeholder="所在仓库"
+          @change="handleQuery">
+          <el-option v-for="item in warehouseOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+        </el-select>
       </div>
       <div class="right-panel">
         <el-input v-model="query.search" placeholder="物料名" clearable style="margin-right: 5px;"></el-input>
@@ -17,13 +21,15 @@
         </el-table-column>
         <el-table-column label="规格型号">
           <template #default="scope">
-            {{ scope.row.specification }}
+            {{ scope.row.specification }} {{ scope.row.model }}
           </template>
         </el-table-column>
         <el-table-column label="仓库" prop="warehouse_name">
         </el-table-column>
         <el-table-column label="物料存量" prop="count">
         </el-table-column>
+        <el-table-column label="有效期" prop="expiration_date">
+        </el-table-column>
       </scTable>
     </el-main>
   </el-container>
@@ -36,10 +42,19 @@ export default {
       apiObj: this.$API.inm.warehouse.batch,
       params: { count__gte: 1 },
       selection: [],
-      query: {}
+      query: {},
+      warehouseOptions: []
     };
   },
+  mounted() {
+    this.getWarehouse()
+  },
   methods: {
+    getWarehouse() {
+      this.$API.inm.warehouse.list.req({page:0}).then(res=>{
+        this.warehouseOptions = res
+      })
+    },
     handleQuery() {
       this.$refs.table.queryData(this.query)
     },
diff --git a/src/views/inm/warehouse.vue b/src/views/inm/warehouse.vue
index e5c27e8e..c19c1e1b 100644
--- a/src/views/inm/warehouse.vue
+++ b/src/views/inm/warehouse.vue
@@ -22,13 +22,15 @@
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="150px">
           <template #default="scope">
-            <el-link type="primary" @click="table_edit(scope.row)" v-auth="'warehouse.update'">
+            <el-button link type="primary" @click="toMb(scope.row)">
+              查看
+            </el-button>
+            <el-button link type="primary" @click="table_edit(scope.row)" v-auth="'warehouse.update'">
               编辑
-            </el-link>
-            <el-divider direction="vertical"></el-divider>
-            <el-link type="danger" @click="table_del(scope.row)" v-auth="'warehouse.delete'">
+            </el-button>
+            <el-button link type="danger" @click="table_del(scope.row)" v-auth="'warehouse.delete'">
               删除
-            </el-link>
+            </el-button>
           </template>
         </el-table-column>
       </scTable>
@@ -99,7 +101,9 @@ export default {
         });
       }).catch(() => { });
     },
-
+    toMb() {
+      this.$router.push({ name: "materialbatch" });
+    },
     //本地更新数据
     handleSaveSuccess(data, mode) {
       if (mode == "add") {
diff --git a/src/views/mtm/materials.vue b/src/views/mtm/materials.vue
index ab0581ed..0340ceb6 100644
--- a/src/views/mtm/materials.vue
+++ b/src/views/mtm/materials.vue
@@ -25,7 +25,7 @@
             </el-table-column>
             <el-table-column label="型号" prop="model">
             </el-table-column>
-            <el-table-column label="物料类别" prop="type">
+            <el-table-column label="物料类别" prop="type" width="200">
               <template #default="scope">
                 <span><el-tag>{{ typeOptions[scope.row.type] }}</el-tag>
                   <el-tag type="warning" v-if="scope.row.is_assemb">组</el-tag>
@@ -41,7 +41,11 @@
                 </el-icon>
               </template>
             </el-table-column>
-            <el-table-column label="计量单位" prop="unit">
+            <el-table-column label="计量单位" prop="unit" width="80">
+            </el-table-column>
+            <el-table-column label="总库存" prop="count" width="80">
+            </el-table-column>
+            <el-table-column label="安全库存" prop="count_safe" width="80">
             </el-table-column>
             <el-table-column label="操作" fixed="right" align="center" width="100">
               <template #default="scope">
diff --git a/src/views/mtm/materials_form.vue b/src/views/mtm/materials_form.vue
index 0828946b..347ff627 100644
--- a/src/views/mtm/materials_form.vue
+++ b/src/views/mtm/materials_form.vue
@@ -48,6 +48,11 @@
                 <el-switch v-model="form.need_route" />
               </el-form-item>
             </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="安全库存" prop="count_safe">
+                <el-input-number v-model="form.count_safe" :min="0"/> 
+              </el-form-item>
+            </el-col>
             <!-- <el-col :md="12" :sm="24">
               <el-form-item label="计量单位" prop="unit">
                 <el-select