fix:光芯生产日志中产出物详情展开

src/views/wpm_gx/mlog_detail.vue

@@ -135,6 +135,35 @@
 					hidePagination
 				>
 					<el-table-column type="index" width="50" />
+					<el-table-column type="expand">
+						<template #default="props">
+							<div style="padding-left: 50px">
+								<el-descriptions :column="4">
+									<el-descriptions-item label="划伤">{{
+										props.row.count_n_hs
+									}}</el-descriptions-item>
+									<el-descriptions-item label="气泡">{{
+										props.row.count_n_qp
+									}}</el-descriptions-item>
+									<el-descriptions-item label="水纹">{{
+										props.row.count_n_swen
+									}}</el-descriptions-item>
+									<el-descriptions-item label="崩边">{{
+										props.row.count_n_bb
+									}}</el-descriptions-item>
+									<el-descriptions-item label="雾面">{{
+										props.row.count_n_wm
+									}}</el-descriptions-item>
+									<el-descriptions-item label="麻点">{{
+										props.row.count_n_md
+									}}</el-descriptions-item>
+									<el-descriptions-item label="线痕">{{
+										props.row.count_n_xh
+									}}</el-descriptions-item>
+								</el-descriptions>
+							</div>
+						</template>
+					</el-table-column>
 					<el-table-column
 						label="产出物料"
 						prop="material_out_name"
@@ -144,6 +173,8 @@
 					</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="不合格数量" prop="count_notok">
 					</el-table-column>
 					<el-table-column
@@ -167,18 +198,6 @@
 							>
 								检验
 							</el-button>
-
-							<el-button
-								link
-								type="danger"
-								@click="check_reSet(scope.row)"
-								:disabled="
-									mlogItem.submit_time !== null &&
-									scope.row.test_date !== null
-								"
-							>
-								撤回
-							</el-button>
 						</template>
 					</el-table-column>
 				</scTable>
@@ -242,6 +261,7 @@
 			<edit-dialog
 				v-if="dialog.edit"
 				ref="editDialog"
+				:dept="deptId"
 				@success="handleEditSuccess"
 				@closed="dialog.edit = false"
 			>
@@ -293,6 +313,7 @@ export default {
 				count_use: 0,
 				count_break: 0,
 			},
+			deptId: "",
 			visible: false,
 			isSaveing: false,
 			options: [],
@@ -332,7 +353,7 @@ export default {
 				that.mlogItem = res;
 				that.mgroup = res.mgroup;
 				that.materialIn = res.material_in;
-				that.belongDeptId = res.belong_dept;
+				that.deptId = res.belong_dept;
 			});
 		},
 		//表单注入数据