From 4f14b07bef8765d02712f6f815b72a59de3e576d Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Thu, 16 Nov 2023 14:45:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Middle/Mes/MesStock/MesStock/List.vue          | 9 +++------
 src/pages/Middle/Mes/MesStock/MesStock/OutIn/InEdit.vue  | 2 +-
 src/pages/Middle/Mes/MesStock/MesStock/OutIn/OutEdit.vue | 2 +-
 .../Mes/MesStock/MesStock/Position/PositionList.vue      | 4 ++--
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/pages/Middle/Mes/MesStock/MesStock/List.vue b/src/pages/Middle/Mes/MesStock/MesStock/List.vue
index 7152506..44ebfac 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/List.vue
+++ b/src/pages/Middle/Mes/MesStock/MesStock/List.vue
@@ -115,16 +115,13 @@ export default {
  
  
             { field: 'product_detail.mes_materials_sort.name', sortable: true, title: '料品分类', width: 100 }, // 产品详情
-            { field: 'product_detail.name', sortable: true, title: '料品名称', width: 250 }, // 产品详情
+            { field: 'product_detail.name',  sortable: true, title: '料品名称', width: 250 }, // 产品详情
             { field: 'product_detail.code', sortable: true, title: '料品编码', width: 120 }, // 产品详情
             { field: 'product_detail.spec', sortable: true, title: '规格型号', width: 150 }, // 规格型号
             { field: 'product_detail.size', sortable: true, title: '尺寸', width: 100 }, // 尺寸
             { field: 'product_detail.color', sortable: true, title: '颜色', width: 100 }, // 颜色
-            { field: 'stock', sortable: true, title: '库存数量', width: 100 }, // 库存数量
-            { field: 'create_time', formatter: 'formatDate', width: 100, sortable: true, title: '创建时间', showHeaderOverflow: true }, // 创建时间
-            { field: 'update_time', formatter: 'formatDate', width: 100, sortable: true, title: '更新时间', showHeaderOverflow: true }, // 更新时间
-
-            { field: 'id' ,slots:{default:'column1'}, sortable: true, title: '出入库操作', width: 160,fixed:"right" }, // 出入库操作
+            { field: 'stock', sortable: true, title: '库存数量', width: 100 }, // 库存数量 
+ 
  
 
 
diff --git a/src/pages/Middle/Mes/MesStock/MesStock/OutIn/InEdit.vue b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/InEdit.vue
index 204ac97..56bd504 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/OutIn/InEdit.vue
+++ b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/InEdit.vue
@@ -204,7 +204,7 @@ export default {
           closeRoute: "/MesStock/MesStockIn"
         });
       // 打开列表页面
-      this.$openPage('/MesStock/MesStockList')
+      this.$openPage('/MesStock/MesStockPositionList')
     },
 
 
diff --git a/src/pages/Middle/Mes/MesStock/MesStock/OutIn/OutEdit.vue b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/OutEdit.vue
index 5955404..de009be 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/OutIn/OutEdit.vue
+++ b/src/pages/Middle/Mes/MesStock/MesStock/OutIn/OutEdit.vue
@@ -204,7 +204,7 @@ export default {
           closeRoute: "/MesStock/MesStockOut"
         });
       // 打开列表页面
-      this.$openPage('/MesStock/MesStockList')
+      this.$openPage('/MesStock/MesStockPositionList')
     },
 
 
diff --git a/src/pages/Middle/Mes/MesStock/MesStock/Position/PositionList.vue b/src/pages/Middle/Mes/MesStock/MesStock/Position/PositionList.vue
index 0b3c3d9..cdb098f 100644
--- a/src/pages/Middle/Mes/MesStock/MesStock/Position/PositionList.vue
+++ b/src/pages/Middle/Mes/MesStock/MesStock/Position/PositionList.vue
@@ -2,8 +2,8 @@
   <basic-page-list :desc="desc" :options="pageOptions">
 
     <template v-slot:column1="{ row }">
-      <a-button class="in"  type="primary" @click="stockIn(row.stock_id)">入库</a-button>
-      <a-button class="out" @click="stockOut(row.stock_id)">出库</a-button>
+      <a-button class="in"  type="primary" @click="stockIn(row.id)">入库</a-button>
+      <a-button class="out" @click="stockOut(row.id)">出库</a-button>
     </template>