From a53d3e4989b5a561cc8c094f7815fd09cbc36526 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 3 Jul 2025 15:03:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=89=B9=E6=AC=A1=E8=BF=BD=E8=B8=AA?=
 =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E5=88=97=E8=A1=A8=E5=8E=BB=E6=8E=89=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=AD=9B=E9=80=89=EF=BC=8C=E5=8E=BB=E9=99=A4=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=88=97=EF=BC=8C=E6=97=A5=E5=BF=97=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/batch_statistics.vue | 36 +++++++++++++++--------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/views/statistics/batch_statistics.vue b/src/views/statistics/batch_statistics.vue
index 03b9b871..44aeac89 100644
--- a/src/views/statistics/batch_statistics.vue
+++ b/src/views/statistics/batch_statistics.vue
@@ -3,7 +3,7 @@
 		<el-side>
             <el-container>
                 <el-header style="height: 40px;">
-                    <el-select 
+                    <!-- <el-select 
                         v-model="query.material_start__type" 
                         placeholder="请选择"
                         style="width: 90px;"
@@ -11,7 +11,7 @@
                         <el-option label="原料" :value="30"></el-option>
                         <el-option label="半成品" :value="20"></el-option>
                         <el-option label="成品" :value="10"></el-option>
-                    </el-select>
+                    </el-select> -->
                     <el-input
                         v-model="query.batch"
                         placeholder="请输入批次号"
@@ -34,7 +34,7 @@
                         :paginationLayout="'total, sizes, jumper'"
                     >
                 <el-table-column prop="batch" label="批次号"></el-table-column>
-                <el-table-column prop="version" label="版本" width="60"></el-table-column>
+                <!-- <el-table-column prop="version" label="版本" width="60"></el-table-column> -->
             </scTable>
                 </el-main>
             </el-container>
@@ -64,17 +64,25 @@
                                         ref="tableMlog"
                                         :apiObj="apiObj_mlog"
                                         row-key="id"
-                                        :params="params"
-                                        :query="params"
+                                        :params="params_mlog"
+                                        :query="params_mlog"
                                     >
                                         <el-table-column label="#" type="index" width="50" fixed></el-table-column>
-                                        <el-table-column label="工艺路线" prop="material_out_name" min-width="130" fixed>
+                                        <el-table-column label="工艺路线" prop="material_out_name" min-width="150" fixed>
                                         <template #default="scope">
                                             <span v-if="scope.row.material_out_name!==null">{{scope.row.material_out_name}}</span>
                                             <span v-else>返工</span>
                                         </template>
                                         </el-table-column>
-                                        <el-table-column label="生产设备" prop="equipment_name" min-width="150"></el-table-column>
+                                        <el-table-column label="生产物料" min-width="250">
+                                            <template #default="scope">
+                                                <div v-if="scope.row.mlogb_full!==null">
+                                                    <span v-for="item in scope.row.mlogb_full" :key="item.id">
+                                                        <span v-if="item.material_in!==null">{{ item.batch }}({{Number(item.count_use)}})、</span>
+                                                    </span>
+                                                </div>
+                                            </template>
+                                        </el-table-column>
                                         <el-table-column label="加工数" prop="count_real"></el-table-column>
                                         <el-table-column label="合格数" prop="count_ok"></el-table-column>
                                         <el-table-column label="类型">
@@ -102,7 +110,7 @@
                                             label="操作日期"
                                             prop="handle_date"
                                         ></el-table-column>
-                                        <el-table-column label="是否提交" prop="submit_time">
+                                        <el-table-column label="是否提交" prop="submit_time" width="80">
                                             <template #default="scope">
                                                 <span v-if="scope.row.submit_time!==null" style="color: green;">是</span>
                                                 <span v-else>否</span>
@@ -342,9 +350,13 @@ export default {
 				other_out: "其他出库",
 			},
             //mlog\handover
+            params_mlog:{
+                cbatch:'',
+                with_mlogb:'yes',
+                query: " { id,material_out_name,mlogb_full,count_real,count_ok,is_fix,belong_dept_name,mgroup_name,handle_user_name,handle_date,reminder_interval_list,mstate_json,work_start_time,work_end_time,oinfo_json,submit_time,submit_user_name}"
+            },
             params:{
                 cbatch:'',
-                // query:" { id, name, code, last_data, gather_state }",
             },
             params2:{
                batch:'',
@@ -354,7 +366,7 @@ export default {
             },
             query:{
                 batch:'',
-                material_start__type:30,
+                // material_start__type:30,
             },
             batch:'',
             activeName:'',
@@ -365,12 +377,11 @@ export default {
 	},
 	methods: {
         rowClick(row){
-            console.log('row',row)
             let that = this;
             that.nodes =[];
             that.edges = [];
             that.limitedWatch = false;
-			that.$API.wpm.batchlog.dag.req({batch:row.batch,version:row.version}).then((res) => {
+			that.$API.wpm.batchlog.dag.req({batch:row.batch,method:'direct'}).then((res) => {
                 res.nodes.forEach(item => {
                     let obj = {};
                     obj.id = item.id;
@@ -389,6 +400,7 @@ export default {
         nodeClick(data){
             let that = this;
             that.params.cbatch = data;
+            that.params_mlog.cbatch = data;
             that.params2.batch = data;
             that.params_mio.item_mio__batch=data;
             that.activeName = 'mlog';