From 69a5dfd1ee39a8581b1dfeb50417ec086b187eef Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 20 May 2025 16:16:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=A1=A8=E6=A0=BC=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/batch_statistics.vue | 442 +++++++++++-----------
 1 file changed, 229 insertions(+), 213 deletions(-)

diff --git a/src/views/statistics/batch_statistics.vue b/src/views/statistics/batch_statistics.vue
index a672bb9e..dcf12279 100644
--- a/src/views/statistics/batch_statistics.vue
+++ b/src/views/statistics/batch_statistics.vue
@@ -56,222 +56,238 @@
                     </scDegra>
                 </el-header>
                 <el-main style="height: 50%;background: #fff;"> 
-                    <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
-                        <el-tab-pane name="mlog" label="生产日志">
-                            <scTable
-                                ref="tableMlog"
-                                :apiObj="apiObj_mlog"
-                                row-key="id"
-                                :params="params"
-                                :query="params"
-                            >
-                                <el-table-column label="#" type="index" width="50" fixed></el-table-column>
-                                <el-table-column label="工艺路线" prop="material_out_name" min-width="130" 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="加工数" prop="count_real"></el-table-column>
-                                <el-table-column label="合格数" prop="count_ok"></el-table-column>
-                                <el-table-column label="类型">
-                                     <template #default="scope">
-                                        <el-tag v-if="scope.row.is_fix" type="warning">返修</el-tag>
-                                        <el-tag v-else type="primary">正常</el-tag>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="部门/工段">
-                                    <template #default="scope">
-                                        {{scope.row.belong_dept_name}}/{{scope.row.mgroup_name}}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column
-                                    label="处理人"
-                                    prop="handle_user_name"
-                                    width="80"
-                                ></el-table-column>
-                                <el-table-column label="保温剩余时间" v-if="mgroup_name=='黑化'||mgroup_name=='退火'">
-                                    <template #default="scope">
-                                        {{ getRemaTime(scope.row) }}
-                                    </template>
-                                </el-table-column>
-                                 <el-table-column
-                                    label="操作日期"
-                                    prop="handle_date"
-                                ></el-table-column>
-                                <el-table-column label="是否提交" prop="submit_time">
-                                    <template #default="scope">
-                                        <span v-if="scope.row.submit_time!==null" style="color: green;">是</span>
-                                         <span v-else>否</span>
-                                    </template>
-                                </el-table-column>
-                            </scTable>
-                        </el-tab-pane>
-                        <el-tab-pane name="handover" label="交接记录">
-                            <scTable
-                                ref="tableHandover"
-                                :apiObj="apiObj_handover"
-                                row-key="id"
-                                :query="params"
-                                :params="params"
-                            >
-                                <el-table-column
-                                    label="#"
-                                    type="index"
-                                    width="50"
-                                ></el-table-column>
-                                <el-table-column type="expand">
-                                    <template #default="props">
-                                        <div style="padding-left: 50px">
-                                            <template v-for="item in props.row.handoverb" :key="item.id">
-                                                <el-descriptions :column="3">
-                                                    <el-descriptions-item label="批次">
-                                                        {{item.batch}}
-                                                    </el-descriptions-item>
-                                                    <el-descriptions-item label="数量">
-                                                        {{item.count}}
-                                                    </el-descriptions-item>
-                                                    <el-descriptions-item label="不合格标记" v-if="item.defect_name!==null">
-                                                        {{item.defect_name}}
-                                                    </el-descriptions-item>
-                                                </el-descriptions>
+                    <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick" style="height: 100%;">
+                        <el-tab-pane name="mlog" label="生产日志" style="height: 100%;">
+                            <el-container>
+                                <el-main>
+                                    <scTable
+                                        ref="tableMlog"
+                                        :apiObj="apiObj_mlog"
+                                        row-key="id"
+                                        :params="params"
+                                        :query="params"
+                                    >
+                                        <el-table-column label="#" type="index" width="50" fixed></el-table-column>
+                                        <el-table-column label="工艺路线" prop="material_out_name" min-width="130" 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="加工数" prop="count_real"></el-table-column>
+                                        <el-table-column label="合格数" prop="count_ok"></el-table-column>
+                                        <el-table-column label="类型">
+                                            <template #default="scope">
+                                                <el-tag v-if="scope.row.is_fix" type="warning">返修</el-tag>
+                                                <el-tag v-else type="primary">正常</el-tag>
                                             </template>
-                                        </div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column
-                                    label="物料"
-                                    prop="material_name"
-                                    min-width="140"
-                                ></el-table-column>
-                                <el-table-column label="批次" prop="batch" min-width="80">
-                                    <template #default="scope">
-                                        <el-text v-if="scope.row.handoverb.length>0" type="primary">{{scope.row.handoverb.length}}批</el-text>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="数量" prop="count" min-width="80"></el-table-column>
-                                <el-table-column label="交接类型" prop="type" min-width="80">
-                                    <template #default="scope" v-if="mgroup_name=='size'||mgroup_name=='facade'">
-                                        <el-text v-if="scope.row.send_dept == deptId" type="primary">交送</el-text>
-                                        <el-text v-if="scope.row.recive_dept == deptId" type="success">接收</el-text>
-                                    </template>
-                                    <template #default="scope" v-else>
-                                        <el-text v-if="scope.row.send_mgroup == mgroupId" type="primary">交送</el-text>
-                                        <el-text v-if="scope.row.recive_mgroup == mgroupId" type="success">接收</el-text>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="交接工段" min-width="80">
-                                    <template #default="scope">
-                                        <el-text v-if="scope.row.send_mgroup == mgroupId">{{scope.row.send_mgroup_name}}</el-text>
-                                        <el-text v-if="scope.row.recive_mgroup == mgroupId">{{scope.row.recive_mgroup_name}}</el-text>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="交接类别" prop="type" width="80">
-                                    <template #default="scope">
-                                        <el-tag v-if="scope.row.type == 10" type="success"
-                                            >正常</el-tag
-                                        >
-                                        <el-tag v-if="scope.row.type == 20" type="warning"
-                                            >返工</el-tag
-                                        >
-                                        <el-tag v-if="scope.row.type == 30" type="primary"
-                                            >检验</el-tag
-                                        >
-                                        <el-tag v-if="scope.row.type == 40" type="danger"
-                                            >报废</el-tag
-                                        >
-                                    </template>
-                                </el-table-column>
-                                <el-table-column
-                                    label="交送人"
-                                    prop="send_user_name"
-                                    width="80"
-                                ></el-table-column>
-                                <el-table-column
-                                    label="接收人"
-                                    prop="recive_user_name"
-                                    width="80"
-                                ></el-table-column>
-                                <el-table-column
-                                    label="交接日期"
-                                    prop="send_date"
-                                    width="120"
-                                ></el-table-column>
-                            </scTable>
+                                        </el-table-column>
+                                        <el-table-column label="部门/工段">
+                                            <template #default="scope">
+                                                {{scope.row.belong_dept_name}}/{{scope.row.mgroup_name}}
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column
+                                            label="处理人"
+                                            prop="handle_user_name"
+                                            width="80"
+                                        ></el-table-column>
+                                        <el-table-column label="保温剩余时间" v-if="mgroup_name=='黑化'||mgroup_name=='退火'">
+                                            <template #default="scope">
+                                                {{ getRemaTime(scope.row) }}
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column
+                                            label="操作日期"
+                                            prop="handle_date"
+                                        ></el-table-column>
+                                        <el-table-column label="是否提交" prop="submit_time">
+                                            <template #default="scope">
+                                                <span v-if="scope.row.submit_time!==null" style="color: green;">是</span>
+                                                <span v-else>否</span>
+                                            </template>
+                                        </el-table-column>
+                                    </scTable>
+                                </el-main>
+                            </el-container>
                         </el-tab-pane>
-                        <el-tab-pane name="winm" label="车间库存">
-                            <scTable
-                                ref="tableWinm"
-                                :apiObj="apiObj_winm"
-                                row-key="id"
-                                :query="params2"
-                                :params="params2"
-                            >
-                            <el-table-column type="selection"></el-table-column>
-                            <el-table-column label="状态" prop="state">
-                                <template #default="scope">
-                                    <el-tag :type="wmState[scope.row.state]?.type">
-                                        {{wmState[scope.row.state]?.text}}
-                                        </el-tag>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="物料名称" min-width="150">
-                                    <template #default="scope">
-                                        {{ scope.row.material_name }}
-                                        <span v-if="scope.row.material_origin != null">（{{ scope.row.material_origin_name }}）</span>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="批次号" prop="batch" min-width="120"></el-table-column>
-                                <el-table-column label="部门/工段">
-                                    <template #default="scope">
-                                        {{scope.row.belong_dept_name}}/{{scope.row.mgroup_name}}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="数量" prop="count"></el-table-column>
-                                <el-table-column label="生产中" prop="count_working"></el-table-column>
-                                <el-table-column label="不合格标记" prop="defect_name"></el-table-column>
-                                <el-table-column label="创建时间" prop="create_time"  width="150"></el-table-column>
-                            </scTable>
+                        <el-tab-pane name="handover" label="交接记录" style="height: 100%;">
+                            <el-container>
+                                <el-main>
+                                    <scTable
+                                        ref="tableHandover"
+                                        :apiObj="apiObj_handover"
+                                        row-key="id"
+                                        :query="params"
+                                        :params="params"
+                                    >
+                                        <el-table-column
+                                            label="#"
+                                            type="index"
+                                            width="50"
+                                        ></el-table-column>
+                                        <el-table-column type="expand">
+                                            <template #default="props">
+                                                <div style="padding-left: 50px">
+                                                    <template v-for="item in props.row.handoverb" :key="item.id">
+                                                        <el-descriptions :column="3">
+                                                            <el-descriptions-item label="批次">
+                                                                {{item.batch}}
+                                                            </el-descriptions-item>
+                                                            <el-descriptions-item label="数量">
+                                                                {{item.count}}
+                                                            </el-descriptions-item>
+                                                            <el-descriptions-item label="不合格标记" v-if="item.defect_name!==null">
+                                                                {{item.defect_name}}
+                                                            </el-descriptions-item>
+                                                        </el-descriptions>
+                                                    </template>
+                                                </div>
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column
+                                            label="物料"
+                                            prop="material_name"
+                                            min-width="140"
+                                        ></el-table-column>
+                                        <el-table-column label="批次" prop="batch" min-width="80">
+                                            <template #default="scope">
+                                                <el-text v-if="scope.row.handoverb.length>0" type="primary">{{scope.row.handoverb.length}}批</el-text>
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column label="数量" prop="count" min-width="80"></el-table-column>
+                                        <el-table-column label="交接类型" prop="type" min-width="80">
+                                            <template #default="scope" v-if="mgroup_name=='size'||mgroup_name=='facade'">
+                                                <el-text v-if="scope.row.send_dept == deptId" type="primary">交送</el-text>
+                                                <el-text v-if="scope.row.recive_dept == deptId" type="success">接收</el-text>
+                                            </template>
+                                            <template #default="scope" v-else>
+                                                <el-text v-if="scope.row.send_mgroup == mgroupId" type="primary">交送</el-text>
+                                                <el-text v-if="scope.row.recive_mgroup == mgroupId" type="success">接收</el-text>
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column label="交接工段" min-width="80">
+                                            <template #default="scope">
+                                                <el-text v-if="scope.row.send_mgroup == mgroupId">{{scope.row.send_mgroup_name}}</el-text>
+                                                <el-text v-if="scope.row.recive_mgroup == mgroupId">{{scope.row.recive_mgroup_name}}</el-text>
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column label="交接类别" prop="type" width="80">
+                                            <template #default="scope">
+                                                <el-tag v-if="scope.row.type == 10" type="success"
+                                                    >正常</el-tag
+                                                >
+                                                <el-tag v-if="scope.row.type == 20" type="warning"
+                                                    >返工</el-tag
+                                                >
+                                                <el-tag v-if="scope.row.type == 30" type="primary"
+                                                    >检验</el-tag
+                                                >
+                                                <el-tag v-if="scope.row.type == 40" type="danger"
+                                                    >报废</el-tag
+                                                >
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column
+                                            label="交送人"
+                                            prop="send_user_name"
+                                            width="80"
+                                        ></el-table-column>
+                                        <el-table-column
+                                            label="接收人"
+                                            prop="recive_user_name"
+                                            width="80"
+                                        ></el-table-column>
+                                        <el-table-column
+                                            label="交接日期"
+                                            prop="send_date"
+                                            width="120"
+                                        ></el-table-column>
+                                    </scTable>
+                                </el-main>
+                            </el-container>
                         </el-tab-pane>
-                        <el-tab-pane name="binm" label="仓库库存">
-                            <scTable
-                                ref="tableBinm"
-                                :apiObj="apiObj_binm"
-                                row-key="id"
-                                stripe
-                                :query="params_binm"
-                                :params="params_binm"
-                            >
-                                <el-table-column type="index" width="50" />
-                                <el-table-column label="批次" prop="batch">
-                                </el-table-column>
-                                <el-table-column label="物料名称" prop="material_name">
-                                </el-table-column>
-                                <el-table-column label="规格型号">
-                                    <template #default="scope">
-                                        <span v-if="scope.row.material_">
-                                            {{ scope.row.material_.specification }}
-                                            {{ scope.row.material_.model }}
-                                        </span>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="已完成工序">
-                                    <template #default="scope">
-                                        <span v-if="scope.row.material_">
-                                            {{ scope.row.material_.process_name }}
-                                        </span>
-                                    </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>
-                                <el-table-column label="更新时间" prop="update_time">
-                                </el-table-column>
-                            </scTable>
+                        <el-tab-pane name="winm" label="车间库存" style="height: 100%;">
+                            <el-container>
+                                <el-main>
+                                    <scTable
+                                        ref="tableWinm"
+                                        :apiObj="apiObj_winm"
+                                        row-key="id"
+                                        :query="params2"
+                                        :params="params2"
+                                    >
+                                    <el-table-column type="selection"></el-table-column>
+                                    <el-table-column label="状态" prop="state">
+                                        <template #default="scope">
+                                            <el-tag :type="wmState[scope.row.state]?.type">
+                                                {{wmState[scope.row.state]?.text}}
+                                                </el-tag>
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column label="物料名称" min-width="150">
+                                            <template #default="scope">
+                                                {{ scope.row.material_name }}
+                                                <span v-if="scope.row.material_origin != null">（{{ scope.row.material_origin_name }}）</span>
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column label="批次号" prop="batch" min-width="120"></el-table-column>
+                                        <el-table-column label="部门/工段">
+                                            <template #default="scope">
+                                                {{scope.row.belong_dept_name}}/{{scope.row.mgroup_name}}
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column label="数量" prop="count"></el-table-column>
+                                        <el-table-column label="生产中" prop="count_working"></el-table-column>
+                                        <el-table-column label="不合格标记" prop="defect_name"></el-table-column>
+                                        <el-table-column label="创建时间" prop="create_time"  width="150"></el-table-column>
+                                    </scTable>
+                                </el-main>
+                            </el-container>
+                        </el-tab-pane>
+                        <el-tab-pane name="binm" label="仓库库存" style="height: 100%;">
+                             <el-container>
+                                <el-main>
+                                    <scTable
+                                        ref="tableBinm"
+                                        :apiObj="apiObj_binm"
+                                        row-key="id"
+                                        stripe
+                                        :query="params_binm"
+                                        :params="params_binm"
+                                    >
+                                        <el-table-column type="index" width="50" />
+                                        <el-table-column label="批次" prop="batch">
+                                        </el-table-column>
+                                        <el-table-column label="物料名称" prop="material_name">
+                                        </el-table-column>
+                                        <el-table-column label="规格型号">
+                                            <template #default="scope">
+                                                <span v-if="scope.row.material_">
+                                                    {{ scope.row.material_.specification }}
+                                                    {{ scope.row.material_.model }}
+                                                </span>
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column label="已完成工序">
+                                            <template #default="scope">
+                                                <span v-if="scope.row.material_">
+                                                    {{ scope.row.material_.process_name }}
+                                                </span>
+                                            </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>
+                                        <el-table-column label="更新时间" prop="update_time">
+                                        </el-table-column>
+                                    </scTable>
+                                </el-main>
+                            </el-container>
                         </el-tab-pane>
                     </el-tabs>
                 </el-main>