From e7f45b81895d01f63b254fa8b023aea9697ee283 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 23 May 2025 13:38:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=89=B9=E6=AC=A1=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/batch_statistics.vue | 94 +++++++++++++++--------
 1 file changed, 62 insertions(+), 32 deletions(-)

diff --git a/src/views/statistics/batch_statistics.vue b/src/views/statistics/batch_statistics.vue
index dcf12279..42eed33b 100644
--- a/src/views/statistics/batch_statistics.vue
+++ b/src/views/statistics/batch_statistics.vue
@@ -56,9 +56,9 @@
                     </scDegra>
                 </el-header>
                 <el-main style="height: 50%;background: #fff;"> 
-                    <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick" style="height: 100%;">
+                    <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick" style="height: 100%;" lazy>
                         <el-tab-pane name="mlog" label="生产日志" style="height: 100%;">
-                            <el-container>
+                            <el-container v-if="activeName=='mlog'">
                                 <el-main>
                                     <scTable
                                         ref="tableMlog"
@@ -113,7 +113,7 @@
                             </el-container>
                         </el-tab-pane>
                         <el-tab-pane name="handover" label="交接记录" style="height: 100%;">
-                            <el-container>
+                            <el-container v-if="activeName=='handover'">
                                 <el-main>
                                     <scTable
                                         ref="tableHandover"
@@ -209,7 +209,7 @@
                             </el-container>
                         </el-tab-pane>
                         <el-tab-pane name="winm" label="车间库存" style="height: 100%;">
-                            <el-container>
+                            <el-container v-if="activeName == 'winm'">
                                 <el-main>
                                     <scTable
                                         ref="tableWinm"
@@ -247,15 +247,15 @@
                             </el-container>
                         </el-tab-pane>
                         <el-tab-pane name="binm" label="仓库库存" style="height: 100%;">
-                             <el-container>
+                             <el-container v-if="activeName == 'binm'">
                                 <el-main>
                                     <scTable
                                         ref="tableBinm"
                                         :apiObj="apiObj_binm"
                                         row-key="id"
                                         stripe
-                                        :query="params_binm"
-                                        :params="params_binm"
+                                        :query="params2"
+                                        :params="params2"
                                     >
                                         <el-table-column type="index" width="50" />
                                         <el-table-column label="批次" prop="batch">
@@ -289,6 +289,37 @@
                                 </el-main>
                             </el-container>
                         </el-tab-pane>
+                        <el-tab-pane name="mio" label="出入库记录" style="height: 100%;">
+                            <el-container v-if="activeName=='mio'">
+                                <el-main>
+                                    <scTable
+                                        ref="tableMio"
+                                        :apiObj="apiObj_mio"
+                                        row-key="id"
+                                        :query="params_mio"
+                                        :params="params_mio"
+                                    >
+                                        <el-table-column label="#" type="index" width="40"></el-table-column>
+                                        <el-table-column label="记录编号" prop="number" min-width="80"></el-table-column>
+                                        <el-table-column label="出入库类型" prop="type">
+                                            <template #default="scope">{{ typeDict[scope.row.type] }}</template>
+                                        </el-table-column>
+                                        <el-table-column label="执行部门" prop="belong_dept_name">
+                                        </el-table-column>
+                                        <el-table-column label="工段" prop="mgroup_name">
+                                        </el-table-column>
+                                        <el-table-column label="状态" prop="type" width="80">
+                                            <template #default="scope">
+                                               {{ stateDict[scope.row.state] }}
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column label="部门执行人" prop="do_user_name" ></el-table-column>
+                                        <el-table-column label="仓库执行人" prop="mio_user_name"></el-table-column>
+                                        <el-table-column label="日期" prop="inout_date"></el-table-column>
+                                    </scTable>
+                                </el-main>
+                            </el-container>
+                        </el-tab-pane>
                     </el-tabs>
                 </el-main>
             </el-container>
@@ -307,22 +338,36 @@ export default {
             apiObj_handover:null,
             apiObj_winm:null,
             apiObj_binm:null,
+            apiObj_mio:null,
             nodes: [],
             edges: [],
+            stateDict: {
+				10: "创建中",
+				20: "已提交",
+			},
+			typeDict: {
+				do_out: "生产领料",
+				sale_out: "销售发货",
+				pur_in: "采购入库",
+				do_in: "生产入库",
+				other_in: "其他入库",
+				other_out: "其他出库",
+			},
             //mlog\handover
             params:{
                 cbatch:'',
+                // query:" { id, name, code, last_data, gather_state }",
             },
             params2:{
                batch:'',
             },
+            params_mio:{
+                item_mio__batch:'',
+            },
             query:{
                 batch:'',
                 material_start__type:30,
             },
-            params_binm:{
-                search:''
-            },
             batch:'',
             activeName:'',
             limitedWatch:false,
@@ -357,40 +402,25 @@ export default {
             let that = this;
             that.params.cbatch = data;
             that.params2.batch = data;
-            that.params_binm.search = data;
+            that.params_mio.item_mio__batch=data;
             that.activeName = 'mlog';
             if( that.apiObj_mlog !==null){
-                that.$refs.tableMlog.queryData(that.params);
-                that.$refs.tableHandover.queryData(that.params);
-                that.$refs.tableWinm.queryData(that.params2);
-                that.$refs.tableBinm.queryData(that.params_binm);
+                that.activeName='mlog';
+                that.$nextTick(() => {
+                  that.$refs.tableMlog.queryData(that.params);  
+                })
             }else{
                 that.apiObj_mlog = that.$API.wpm.mlog.list;
                 that.apiObj_handover = that.$API.wpm.handover.list;
                 that.apiObj_winm = that.$API.wpm.wmaterial.list;
                 that.apiObj_binm = that.$API.inm.warehouse.batch;
+                that.apiObj_mio = that.$API.inm.mio.list;
             }
         },
         search(){
             this.$refs.tablets.queryData(this.query)
         },
-        handleClick(){
-            // switch (this.activeName) {
-            //     case 'mlog':
-            //         this.$refs.tableMlog.refresh();
-            //         break;
-            //     case 'handover':
-            //         this.$refs.tableHandover.refresh();
-            //         break;
-            //     case 'winm':
-            //         this.$refs.tableWinm.refresh();
-            //         break;
-            //     case 'binm':
-            //         this.$refs.tableBinm.refresh();
-            //         break;
-            // }
-
-        }
+        handleClick(){ }
 	},
 };
 </script>