Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

src/views/statistics/batch_statistics.vue

@@ -3,15 +3,6 @@
 		<el-aside>
             <el-container>
                 <el-header style="height: 40px;">
-                    <!-- <el-select 
-                        v-model="query.material_start__type" 
-                        placeholder="请选择"
-                        style="width: 90px;"
-                    >
-                        <el-option label="原料" :value="30"></el-option>
-                        <el-option label="半成品" :value="20"></el-option>
-                        <el-option label="成品" :value="10"></el-option>
-                    </el-select> -->
                     <el-input
                         v-model="query.batch"
                         placeholder="请输入批次号"
@@ -34,7 +25,6 @@
                         :paginationLayout="'total, sizes, jumper'"
                     >
                 <el-table-column prop="batch" label="批次号"></el-table-column>
-                <!-- <el-table-column prop="version" label="版本" width="60"></el-table-column> -->
             </scTable>
                 </el-main>
             </el-container>
@@ -137,6 +127,7 @@
                                         <el-table-column type="expand">
                                             <template #default="props">
                                                 <div style="padding-left: 50px">
+                                                    <p v-if="props.row.new_batch!==null" style="color: #5f9ea0;font-size: 16px;margin-bottom: 5px;">新批次号：{{ props.row.new_batch }}</p>
                                                     <template v-for="item in props.row.handoverb" :key="item.id">
                                                         <el-descriptions :column="3">
                                                             <el-descriptions-item label="批次">