diff --git a/package.json b/package.json
index beef902a..5d14edbf 100644
--- a/package.json
+++ b/package.json
@@ -17,9 +17,11 @@
 		"babylonjs": "^6.46.0",
 		"babylonjs-gui": "^6.46.0",
 		"babylonjs-loaders": "^6.46.0",
-		"cesium": "1.75",
+		"cesium": "^1.126.0",
 		"codemirror": "^5.65.17",
 		"codemirror-editor-vue3": "^2.7.0",
+		"compression-webpack-plugin": "^11.1.0",
+		"copy-webpack-plugin": "^12.0.2",
 		"core-js": "3.29.0",
 		"cropperjs": "1.5.13",
 		"crypto-browserify": "^3.12.0",
@@ -37,6 +39,7 @@
 		"moment": "^2.30.1",
 		"node-polyfill-webpack-plugin": "^4.0.0",
 		"nprogress": "0.2.0",
+		"path": "^0.12.7",
 		"print-js": "^1.6.0",
 		"qrcodejs2": "0.0.2",
 		"sortablejs": "1.15.0",
diff --git a/src/main.js b/src/main.js
index e55fa8bb..ec952eff 100644
--- a/src/main.js
+++ b/src/main.js
@@ -16,14 +16,11 @@ import jsBarCode from "./utils/jsBarCode";
 import DataVVue3 from "@kjgl77/datav-vue3";
 import htmlToPdf from "./utils/htmlToPdf";
 
-import * as Cesium from "cesium";
-
 const app = createApp(App);
 
 app.use(store);
 app.use(router);
 app.use(ElementPlus);
-app.use(Cesium);
 app.use(i18n);
 app.use(scui);
 app.use(xtui);
diff --git a/src/views/bigScreen/cesiumtest.vue b/src/views/bigScreen/cesiumtest.vue
index cabbd357..a0318585 100644
--- a/src/views/bigScreen/cesiumtest.vue
+++ b/src/views/bigScreen/cesiumtest.vue
@@ -269,9 +269,18 @@
 </template>
 <script>
 import tool from "@/utils/tool";
-import * as Cesium from "cesium";
 import * as echarts from "echarts";
 import cems from "./enpComponents/cems.vue";
+
+window.CESIUM_BASE_URL = '/cesium';
+let Cesium;
+const loadCesium = async () => {
+	if (Cesium) return;
+	await import("cesium/Build/Cesium/Widgets/widgets.css");
+	Cesium = await import('cesium');
+	Cesium.Ion.defaultAccessToken =
+			"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI1Yzg3ZDEzOS0zN2Q1LTQ2N2YtOWJhMy1mNWU4MWY5N2ExYzkiLCJpZCI6MjAxMzIsInNjb3BlcyI6WyJhc3IiLCJnYyJdLCJpYXQiOjE1NzY4MTIzNzR9.SfNeHedDyXWLIPiNbc4qSsHBACm7uvaqRsQprL2J4Cw";
+}
 export default {
 	name: "cesium",
 	props: ["activeIndex"],
@@ -442,17 +451,20 @@ export default {
 		};
 	},
 	created() {
-		const scriptInfo = document.createElement("script");
-		scriptInfo.setAttribute("data-callType", "callScript");
-		scriptInfo.src =
-			"https://cesium.com/downloads/cesiumjs/releases/1.75/Build/Cesium/Cesium.js";
-		document.head.appendChild(scriptInfo);
+		// const scriptInfo = document.createElement("script");
+		// scriptInfo.setAttribute("data-callType", "callScript");
+		// scriptInfo.src =
+		// 	"https://cesium.com/downloads/cesiumjs/releases/1.75/Build/Cesium/Cesium.js";
+		// document.head.appendChild(scriptInfo);
 	},
 	mounted() {
-		let that = this;
-		Cesium.Ion.defaultAccessToken =
-			"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI1Yzg3ZDEzOS0zN2Q1LTQ2N2YtOWJhMy1mNWU4MWY5N2ExYzkiLCJpZCI6MjAxMzIsInNjb3BlcyI6WyJhc3IiLCJnYyJdLCJpYXQiOjE1NzY4MTIzNzR9.SfNeHedDyXWLIPiNbc4qSsHBACm7uvaqRsQprL2J4Cw";
-
+		loadCesium().then(res=>{
+			this.initView();
+		})
+	},
+	methods: {
+		initView() {
+			let that = this;
 		const viewer = new Cesium.Viewer("cesiumContainer", {
 			animation: false, //动画小部件
 			baseLayerPicker: false, //地图图层组件
@@ -573,8 +585,7 @@ export default {
 				}
 			}
 		}, Cesium.ScreenSpaceEventType.LEFT_CLICK);
-	},
-	methods: {
+		},
 		//单独加载树
 		setTrees(viewer, orientation) {
 			this.modelPosition.forEach((item) => {
diff --git a/src/views/bigScreen/index_enm.vue b/src/views/bigScreen/index_enm.vue
index 17307494..21bfcc27 100644
--- a/src/views/bigScreen/index_enm.vue
+++ b/src/views/bigScreen/index_enm.vue
@@ -271,20 +271,27 @@
 </template>
 <script>
 import * as echarts from "echarts";
-import * as BABYLON from "babylonjs";
-import * as BABYLON_GUI from "babylonjs-gui";
-import * as BABYLON_GRID from "@/utils/gridMaterial";
-import * as BABYLON_MATERIAL from "@/utils/babylonMaterial";
 import value from "./../enm_energy/value.vue";
 import config from "@/config";
-BABYLON.DracoCompression.Configuration.decoder.wasmUrl =
-	"./draco_wasm_wrapper_gltf.js";
-BABYLON.DracoCompression.Configuration.decoder.wasmBinaryUrl =
-	"./draco_decoder_gltf.wasm";
-BABYLON.DracoCompression.Configuration.decoder.fallbackUrl =
-	"./draco_decoder_gltf.js";
-import "babylonjs-loaders";
 import "animate.css";
+
+let BABYLON, BABYLON_GUI, BABYLON_GRID, BABYLON_MATERIAL;
+// 需要时动态加载 Babylon.js 和其他依赖
+const loadBabylon = async () => {
+  if (BABYLON) return;
+  BABYLON = await import('babylonjs');
+  BABYLON_GUI = await import('babylonjs-gui');
+  BABYLON_GRID = await import('@/utils/gridMaterial');
+  BABYLON_MATERIAL = await import('@/utils/babylonMaterial');
+
+  // 配置 Draco 编解码器
+  BABYLON.DracoCompression.Configuration.decoder.wasmUrl = "./draco_wasm_wrapper_gltf.js";
+  BABYLON.DracoCompression.Configuration.decoder.wasmBinaryUrl = "./draco_decoder_gltf.wasm";
+  BABYLON.DracoCompression.Configuration.decoder.fallbackUrl = "./draco_decoder_gltf.js";
+  
+  // 加载 Babylon.js 加载器
+  await import('babylonjs-loaders');
+};
 export default {
 	beforeRouteLeave(to, from, next) {
 // 页面离开时刷新页面
@@ -640,7 +647,29 @@ export default {
 		};
 	},
 	mounted() {
-		let that = this;
+		loadBabylon().then(()=>{
+			this.initView()
+		})
+	},
+	beforeUnmount() {
+		// 清除所有定时器，避免内存泄漏
+		if (this.timerTime) {
+		clearInterval(this.timerTime);}
+		if (this.timerOther) {
+		clearInterval(this.timerOther);}
+		if(this.intervalId1!==null){
+			clearInterval(this.intervalId1);
+		}
+		if(this.intervalId2!==null){
+			clearInterval(this.intervalId2);
+		}
+		if(this.intervalId3!==null){
+			clearInterval(this.intervalId3);
+		}
+	},
+	methods: {
+		initView() {
+			let that = this;
 		that.bigScreenName =
 			that.$TOOL.data.get("BASE_INFO").base.bigScreen_name;
 		that.showTime();
@@ -689,24 +718,7 @@ export default {
 				that.initializeData();
 			}, 180000); // 3分钟更新一次
 		});
-	},
-	beforeUnmount() {
-		// 清除所有定时器，避免内存泄漏
-		if (this.timerTime) {
-		clearInterval(this.timerTime);}
-		if (this.timerOther) {
-		clearInterval(this.timerOther);}
-		if(this.intervalId1!==null){
-			clearInterval(this.intervalId1);
-		}
-		if(this.intervalId2!==null){
-			clearInterval(this.intervalId2);
-		}
-		if(this.intervalId3!==null){
-			clearInterval(this.intervalId3);
-		}
-	},
-	methods: {
+		},
 		backHome(){
 			// this.$router.push({ name: "user" });
 			this.$router.go(-1);
diff --git a/src/views/bigScreen/index_enm_ly.vue b/src/views/bigScreen/index_enm_ly.vue
index b0e7d760..1d4b3d10 100644
--- a/src/views/bigScreen/index_enm_ly.vue
+++ b/src/views/bigScreen/index_enm_ly.vue
@@ -294,19 +294,38 @@
 </template>
 <script>
 import * as echarts from "echarts";
-import * as BABYLON from "babylonjs";
-import * as BABYLON_GUI from "babylonjs-gui";
-import * as BABYLON_GRID from "@/utils/gridMaterial";
-import * as BABYLON_MATERIAL from "@/utils/babylonMaterial";
 import config from "@/config";
-BABYLON.DracoCompression.Configuration.decoder.wasmUrl =
-	"./draco_wasm_wrapper_gltf.js";
-BABYLON.DracoCompression.Configuration.decoder.wasmBinaryUrl =
-	"./draco_decoder_gltf.wasm";
-BABYLON.DracoCompression.Configuration.decoder.fallbackUrl =
-	"./draco_decoder_gltf.js";
-import "babylonjs-loaders";
 import "animate.css";
+
+// import * as BABYLON from "babylonjs";
+// import * as BABYLON_GUI from "babylonjs-gui";
+// import * as BABYLON_GRID from "@/utils/gridMaterial";
+// import * as BABYLON_MATERIAL from "@/utils/babylonMaterial";
+// BABYLON.DracoCompression.Configuration.decoder.wasmUrl =
+// 	"./draco_wasm_wrapper_gltf.js";
+// BABYLON.DracoCompression.Configuration.decoder.wasmBinaryUrl =
+// 	"./draco_decoder_gltf.wasm";
+// BABYLON.DracoCompression.Configuration.decoder.fallbackUrl =
+// 	"./draco_decoder_gltf.js";
+// import "babylonjs-loaders";
+
+let BABYLON, BABYLON_GUI, BABYLON_GRID, BABYLON_MATERIAL;
+// 需要时动态加载 Babylon.js 和其他依赖
+const loadBabylon = async () => {
+  if (BABYLON) return;
+  BABYLON = await import('babylonjs');
+  BABYLON_GUI = await import('babylonjs-gui');
+  BABYLON_GRID = await import('@/utils/gridMaterial');
+  BABYLON_MATERIAL = await import('@/utils/babylonMaterial');
+
+  // 配置 Draco 编解码器
+  BABYLON.DracoCompression.Configuration.decoder.wasmUrl = "./draco_wasm_wrapper_gltf.js";
+  BABYLON.DracoCompression.Configuration.decoder.wasmBinaryUrl = "./draco_decoder_gltf.wasm";
+  BABYLON.DracoCompression.Configuration.decoder.fallbackUrl = "./draco_decoder_gltf.js";
+  
+  // 加载 Babylon.js 加载器
+  await import('babylonjs-loaders');
+};
 export default {
 	data() {
 		return {
@@ -629,7 +648,14 @@ export default {
 		};
 	},
 	mounted() {
-		let that = this;
+		loadBabylon().then(() => {
+		    this.initView();
+		}
+		)
+	},
+	methods: {
+		initView() {
+			let that = this;
 		that.bigScreenName =
 			that.$TOOL.data.get("BASE_INFO").base.bigScreen_name;
 		that.showTime();
@@ -710,8 +736,7 @@ export default {
 			// 	that.dataCollect();
 			// }, 3600000);
 		});
-	},
-	methods: {
+		},
 		//熟料产量
 		productNum() {
 			let that = this;
diff --git a/src/views/bigScreen/index_enp_blue.vue b/src/views/bigScreen/index_enp_blue.vue
index e5a53eef..6a951f11 100644
--- a/src/views/bigScreen/index_enp_blue.vue
+++ b/src/views/bigScreen/index_enp_blue.vue
@@ -520,7 +520,6 @@ import carwash from "./enpComponents/smartg_carwash.vue";
 import carmanager from "./enpComponents/carManager.vue";
 import videowall from "./enpComponents/video.vue";
 import scScrollTavle from "@/components/scScrollTable.vue";
-// import 'babylonjs-loaders';
 import "animate.css";
 export default {
 	components: {
diff --git a/src/views/bigScreen/index_gx.vue b/src/views/bigScreen/index_gx.vue
index 3551cd2a..763ec6bf 100644
--- a/src/views/bigScreen/index_gx.vue
+++ b/src/views/bigScreen/index_gx.vue
@@ -341,21 +341,29 @@
 </template>
 <script>
 import * as echarts from "echarts";
-import * as BABYLON from "babylonjs";
-import * as BABYLON_GUI from "babylonjs-gui";
 import scEcharts from '@/components/scEcharts';
-import * as BABYLON_GRID from "@/utils/gridMaterial";
-import * as BABYLON_MATERIAL from "@/utils/babylonMaterial";
 import config from "@/config";
-BABYLON.DracoCompression.Configuration.decoder.wasmUrl =
-	"./draco_wasm_wrapper_gltf.js";
-BABYLON.DracoCompression.Configuration.decoder.wasmBinaryUrl =
-	"./draco_decoder_gltf.wasm";
-BABYLON.DracoCompression.Configuration.decoder.fallbackUrl =
-	"./draco_decoder_gltf.js";
-import "babylonjs-loaders";
 import "animate.css";
 import baseUrl from "@/config";
+
+let BABYLON, BABYLON_GUI, BABYLON_GRID, BABYLON_MATERIAL;
+// 需要时动态加载 Babylon.js 和其他依赖
+const loadBabylon = async () => {
+  if (BABYLON) return;
+  BABYLON = await import('babylonjs');
+  BABYLON_GUI = await import('babylonjs-gui');
+  BABYLON_GRID = await import('@/utils/gridMaterial');
+  BABYLON_MATERIAL = await import('@/utils/babylonMaterial');
+
+  // 配置 Draco 编解码器
+  BABYLON.DracoCompression.Configuration.decoder.wasmUrl = "./draco_wasm_wrapper_gltf.js";
+  BABYLON.DracoCompression.Configuration.decoder.wasmBinaryUrl = "./draco_decoder_gltf.wasm";
+  BABYLON.DracoCompression.Configuration.decoder.fallbackUrl = "./draco_decoder_gltf.js";
+  
+  // 加载 Babylon.js 加载器
+  await import('babylonjs-loaders');
+};
+
 const configData={
 	header : ['物料批次','未加工','进行中','已完成','合格数'],
 	headerBGC : '#0a3f44',
@@ -669,7 +677,15 @@ export default {
 		};
 	},
 	mounted() {
-		let that = this;
+		loadBabylon().then(()=>{
+			this.initView()
+		})
+	},
+	methods: {
+
+		//初始化视图
+		initView(){
+		    let that = this;
 		var windowHeight = window.innerHeight;
 		var windowWidth = window.innerWidth;
 		that.pieWidth =Math.round((windowWidth/100*33)/5)+'px';
@@ -733,8 +749,7 @@ export default {
 			that.showTime();
 			that.addListener();
 		})
-	},
-	methods: {
+		},
 		//获取公告和视频
 		getArticles(){
 			let that = this;
diff --git a/src/views/bigScreen/index_photon.vue b/src/views/bigScreen/index_photon.vue
index f44f7dd2..6828d4c1 100644
--- a/src/views/bigScreen/index_photon.vue
+++ b/src/views/bigScreen/index_photon.vue
@@ -394,19 +394,26 @@
 </template>
 <script>
 import * as echarts from "echarts";
-import * as BABYLON from "babylonjs";
-import * as BABYLON_GUI from "babylonjs-gui";
-import * as BABYLON_GRID from "@/utils/gridMaterial";
-import * as BABYLON_MATERIAL from "@/utils/babylonMaterial";
 import config from "@/config";
-BABYLON.DracoCompression.Configuration.decoder.wasmUrl =
-	"./draco_wasm_wrapper_gltf.js";
-BABYLON.DracoCompression.Configuration.decoder.wasmBinaryUrl =
-	"./draco_decoder_gltf.wasm";
-BABYLON.DracoCompression.Configuration.decoder.fallbackUrl =
-	"./draco_decoder_gltf.js";
-import "babylonjs-loaders";
 import "animate.css";
+
+let BABYLON, BABYLON_GUI, BABYLON_GRID, BABYLON_MATERIAL;
+// 需要时动态加载 Babylon.js 和其他依赖
+const loadBabylon = async () => {
+  if (BABYLON) return;
+  BABYLON = await import('babylonjs');
+  BABYLON_GUI = await import('babylonjs-gui');
+  BABYLON_GRID = await import('@/utils/gridMaterial');
+  BABYLON_MATERIAL = await import('@/utils/babylonMaterial');
+
+  // 配置 Draco 编解码器
+  BABYLON.DracoCompression.Configuration.decoder.wasmUrl = "./draco_wasm_wrapper_gltf.js";
+  BABYLON.DracoCompression.Configuration.decoder.wasmBinaryUrl = "./draco_decoder_gltf.wasm";
+  BABYLON.DracoCompression.Configuration.decoder.fallbackUrl = "./draco_decoder_gltf.js";
+  
+  // 加载 Babylon.js 加载器
+  await import('babylonjs-loaders');
+};
 export default {
 	data() {
 		return {
@@ -575,7 +582,13 @@ export default {
 		};
 	},
 	mounted() {
-		let that = this;
+		loadBabylon().then(() => {
+		    this.initView();
+		})
+	},
+	methods: {
+		initView() {
+		    let that = this;
 		let height = document.getElementById("mainBlock").clientHeight;
 		let height0 = height / 3 - 55;
 		let height1 = height0 - 20;
@@ -667,8 +680,7 @@ export default {
 		});
 		this.getPlanRate();
 		this.getMaterialList();
-	},
-	methods: {
+		},
 		//本周6车间交付数----棒管交付数
 		getsaleOut() {
 			let that = this;
diff --git a/src/views/bigScreen/textIndex.vue b/src/views/bigScreen/textIndex.vue
index 40a9b41d..22a42096 100644
--- a/src/views/bigScreen/textIndex.vue
+++ b/src/views/bigScreen/textIndex.vue
@@ -138,13 +138,25 @@
 </template>
 <script>
 import * as echarts from 'echarts';
-import * as BABYLON from "babylonjs";
-import * as BABYLON_GUI from "babylonjs-gui";
-import * as BABYLON_GRID from "@/utils/gridMaterial";
-import * as BABYLON_MATERIAL from "@/utils/babylonMaterial";
-
-import 'babylonjs-loaders';
 import 'animate.css';
+
+let BABYLON, BABYLON_GUI, BABYLON_GRID, BABYLON_MATERIAL;
+// 需要时动态加载 Babylon.js 和其他依赖
+const loadBabylon = async () => {
+  if (BABYLON) return;
+  BABYLON = await import('babylonjs');
+  BABYLON_GUI = await import('babylonjs-gui');
+  BABYLON_GRID = await import('@/utils/gridMaterial');
+  BABYLON_MATERIAL = await import('@/utils/babylonMaterial');
+
+  // 配置 Draco 编解码器
+  BABYLON.DracoCompression.Configuration.decoder.wasmUrl = "./draco_wasm_wrapper_gltf.js";
+  BABYLON.DracoCompression.Configuration.decoder.wasmBinaryUrl = "./draco_decoder_gltf.wasm";
+  BABYLON.DracoCompression.Configuration.decoder.fallbackUrl = "./draco_decoder_gltf.js";
+  
+  // 加载 Babylon.js 加载器
+  await import('babylonjs-loaders');
+};
 export default {
     data() {
         return {
@@ -203,6 +215,7 @@ export default {
         }
     },
     mounted() {
+        loadBabylon();
         let that = this;
         let height = document.getElementById('mainBlock').clientHeight;
         let height0 = height / 3 - 55;
diff --git a/src/views/fac_cal/mpointstat.vue b/src/views/fac_cal/mpointstat.vue
index 6b432289..7d69a3c7 100644
--- a/src/views/fac_cal/mpointstat.vue
+++ b/src/views/fac_cal/mpointstat.vue
@@ -184,11 +184,11 @@ export default {
 			paramsM2: {page: 0},
 			apiObj: this.$API.enm.mpoint.stat,
             params: {
-				type: "day_s",
+				// type: "day",
 			},
 			query: {
                 mpoint: null,
-                type: "day_s",
+                type: "day",
                 start_time: null,
                 end_time: null,
             },
diff --git a/src/views/inm/mioitem_check.vue b/src/views/inm/mioitem_check.vue
index 8f6537da..c8705c0d 100644
--- a/src/views/inm/mioitem_check.vue
+++ b/src/views/inm/mioitem_check.vue
@@ -757,7 +757,7 @@
 					<el-table-column label="操作" fixed="right" width="130">
 						<template #default="scope">
 							<el-button @click="changeCheckItem(scope.row)" type="text">检验</el-button>
-							<el-button @click="changeCheckRecord(scope.row)" type="text">检验记录</el-button>
+							<el-button v-if="scope.row.wpr" @click="changeCheckRecord(scope.row)" type="text">检验记录</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue
index 90bf35c5..43c23d5c 100644
--- a/src/views/login/components/passwordForm.vue
+++ b/src/views/login/components/passwordForm.vue
@@ -67,8 +67,6 @@ export default {
       visitorsdialog: false,
       visitorform: {},
       form: {
-        user: "admin",
-        password: "admin",
         autologin: false,
       },
       rules: {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 3ccf9604..e9fd89ce 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -241,7 +241,7 @@ export default {
 }
 
 .login_adv {
-	width: 40%;
+	width: 50%;
 	background-color: #555;
 	background-size: cover;
 	background-position: center center;
@@ -329,12 +329,14 @@ export default {
 
 .login-header {
 	margin-bottom: 40px;
-	width: 460px;
+	/* width: 460px; */
+	width: 100%;
 }
 
 .login-header .logo {
 	display: flex;
 	align-items: center;
+	justify-content: center;
 }
 
 /* .login-header .logo img {width: 130px;vertical-align: bottom;margin-right: 10px;} */
diff --git a/src/views/mtm/routepack_form.vue b/src/views/mtm/routepack_form.vue
index 35a9b309..1a0e6584 100644
--- a/src/views/mtm/routepack_form.vue
+++ b/src/views/mtm/routepack_form.vue
@@ -231,10 +231,10 @@ export default {
 		},
 		getMaterials() {
 			let that = this;
-			this.$API.mtm.material.list
-				.req({ page: 0, type__in: "10,20", is_hidden: false })
+			that.$API.mtm.material.list
+				.req({ page: 0, type__in: "10,20"})
 				.then((res) => {
-					this.materials = res;
+					that.materials = res;
 				});
 		},
 		handleStep(val) {
diff --git a/src/views/qm/behavior.vue b/src/views/qm/behavior.vue
index 2a0280bf..a523a449 100644
--- a/src/views/qm/behavior.vue
+++ b/src/views/qm/behavior.vue
@@ -11,7 +11,7 @@
 				>
 			</div>
 			<div class="right-panel">
-				<el-select
+				<!-- <el-select
 					v-model="query.testitem"
 					clearable
 					style="width: 150px"
@@ -24,7 +24,7 @@
 						:value="item.id"
 					>
 					</el-option>
-				</el-select>
+				</el-select> -->
 				<el-date-picker
 					v-model="query.test_date"
 					type="date"
@@ -45,156 +45,131 @@
 				>
 			</div>
 		</el-header>
-		<scTable
-			ref="table"
-			:data="tableData"
-			:apiObj="apiObj"
-			row-key="id"
-			stripe
-			:params="query"
-			:query="query"
-		>
-			<el-table-column type="index" width="50" />
-			<el-table-column
-				label="实验日期"
-				prop="test_date"
-				show-overflow-tooltip
+		<el-main class="nopadding">
+			<scTable
+				ref="table"
+				:data="tableData"
+				:apiObj="apiObj"
+				row-key="id"
+				stripe
+				:params="query"
+				:query="query"
 			>
-			</el-table-column>
-			<el-table-column label="样品编号" prop="sample_number">
-			</el-table-column>
-			<el-table-column
-				label="样品厚度/mm"
-				prop="val_hd"
-				v-if="activeName == '透过率'"
-			>
-			</el-table-column>
-			<el-table-column
-				label="型号规格"
-				prop="specification"
-				v-if="
-					activeName == '中温粘度' || activeName == '膨胀'
-				"
-			>
-			</el-table-column>
-			<el-table-column
-				label="样品数量"
-				prop="sample_count"
-				v-if="activeName == '析晶'"
-			>
-			</el-table-column>
-			<el-table-column
-				label="样品密度"
-				prop="sample_density"
-				v-if="activeName == '高温粘度'"
-			>
-			</el-table-column>
-			<el-table-column
-				label="检验员"
-				prop="test_user_name"
-				show-overflow-tooltip
-			>
-			</el-table-column>
-			<el-table-column
-				label="实验温度及保温时间"
-				prop="sample_number"
-				v-if="activeName == '析晶'"
-			>
-			</el-table-column>
-			<el-table-column
-				label="升至最高温度/℃"
-				prop="val_zgwd"
-				v-if="activeName == '高温粘度'"
-			>
-			</el-table-column>
-			<el-table-column
-				label="仪器状态"
-				prop="factory"
-				show-overflow-tooltip
-			>
-				<template #default="scope">
-					<el-tag>{{
-						state_[scope.row.equip_state]
-					}}</el-tag>
-				</template>
-			</el-table-column>
-			<el-table-column
-				label="折射率(589nm)"
-				prop="val_zsl"
-				v-if="activeName == '折射率'"
-			>
-			</el-table-column>
-			<el-table-column
-				label="透过率(550nm)"
-				prop="val_tgl"
-				v-if="activeName == '透过率'"
-			>
-			</el-table-column>
-			<el-table-column
-				label="Ts/℃"
-				prop="val_ts"
-				v-if="activeName == '中温粘度'"
-			>
-			</el-table-column>
-			<el-table-column
-				label="30-300℃膨胀系数"
-				prop="val_pzxs"
-				v-if="activeName == '膨胀'"
-			>
-			</el-table-column>
-			<el-table-column
-				label="Tg/℃"
-				prop="val_tg"
-				v-if="activeName == '膨胀'"
-			>
-			</el-table-column>
-			<el-table-column
-				label="Tf/℃"
-				prop="val_tf"
-				v-if="activeName == '膨胀'"
-			>
-			</el-table-column>
-			<el-table-column
-				label="析晶"
-				prop="val_xj"
-				v-if="activeName == '析晶'"
-			>
-				<template #default="scope">
-					<el-tag>{{
-						state_xj[scope.row.val_xj]
-					}}</el-tag>
-				</template>
-			</el-table-column>
-			<el-table-column label="操作" fixed="right" width="160">
-				<template #default="scope">
-					<el-link
-						type="primary"
-						@click="table_edit(scope.row)"
-						v-auth="'ptest.update'"
-						>编辑</el-link
-					>
-					<el-divider
-						direction="vertical"
-						v-auth="'ptest.update'"
-					></el-divider>
-					<el-link
-						type="primary"
-						@click="table_show(scope.row)"
-						>查看</el-link
-					>
-					<el-divider
-						direction="vertical"
-						v-auth="'ptest.delete'"
-					></el-divider>
-					<el-link
-						type="danger"
-						@click="table_del(scope.row)"
-						v-auth="'ptest.delete'"
-						>删除</el-link
-					>
-				</template>
-			</el-table-column>
-		</scTable>
+				<el-table-column type="index" width="50" />
+				<el-table-column label="样品编号" prop="sample_number" show-overflow-tooltip>
+				</el-table-column>
+				<el-table-column label="实验日期" prop="test_date" show-overflow-tooltip>
+				</el-table-column>
+				<el-table-column
+					label="仪器状态"
+					prop="factory"
+					show-overflow-tooltip
+				>
+					<template #default="scope">
+						<el-tag>{{state_[scope.row.equip_state]}}</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column
+					label="折射率(589nm)"
+					prop="val_zsl"
+				>
+				</el-table-column>
+				<el-table-column
+					label="样品厚度/mm"
+					prop="val_hd"
+				>
+				</el-table-column>
+				<el-table-column
+					label="透过率(550nm)"
+					prop="val_tgl"
+				>
+				</el-table-column>
+				<el-table-column
+					label="Ts/℃"
+					prop="val_ts"
+				>
+				</el-table-column>
+				<el-table-column
+					label="型号规格"
+					prop="specification"
+				>
+				</el-table-column>
+				<el-table-column
+					label="30-300℃膨胀系数"
+					prop="val_pzxs"
+				>
+				</el-table-column>
+				<el-table-column
+					label="Tg/℃"
+					prop="val_tg"
+				>
+				</el-table-column>
+				<el-table-column
+					label="Tf/℃"
+					prop="val_tf"
+				>
+				</el-table-column>
+				<el-table-column
+					label="样品数量"
+					prop="sample_count"
+				>
+				</el-table-column>
+				<el-table-column
+					label="析晶"
+					prop="val_xj"
+				>
+					<template #default="scope">
+						<el-tag>{{state_xj[scope.row.val_xj]}}</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column
+					label="样品密度"
+					prop="sample_density"
+				>
+				</el-table-column>
+				<el-table-column
+					label="升至最高温度/℃"
+					prop="val_zgwd"
+				>
+				</el-table-column>
+				<el-table-column
+					label="检验员"
+					prop="test_user_name"
+					show-overflow-tooltip
+				>
+				</el-table-column>
+				<el-table-column label="操作" fixed="right" width="160">
+					<template #default="scope">
+						<el-link
+							type="primary"
+							@click="table_edit(scope.row)"
+							v-auth="'ptest.update'"
+							>编辑</el-link
+						>
+						<el-divider
+							direction="vertical"
+							v-auth="'ptest.update'"
+						></el-divider>
+						<el-link
+							type="primary"
+							@click="table_show(scope.row)"
+							>查看</el-link
+						>
+						<el-divider
+							direction="vertical"
+							v-auth="'ptest.delete'"
+						></el-divider>
+						<el-link
+							type="danger"
+							@click="table_del(scope.row)"
+							v-auth="'ptest.delete'"
+							>删除</el-link
+						>
+					</template>
+				</el-table-column>
+			</scTable>
+		</el-main>
+		
 		<save-dialog
 			v-if="visible"
 			ref="saveDialog"
@@ -269,7 +244,7 @@ export default {
 					},
 				],
 			},
-			activeName: "折射率",
+			// activeName: "折射率",
 			visible: false,
 			isSaveing: false,
 			selection: [],
@@ -288,7 +263,7 @@ export default {
 				.get({ tags__contains: "performance", page: 0 })
 				.then((res) => {
 					that.behaviors = res;
-					that.query.testitem = res[0].id;
+					// that.query.testitem = res[0].id;
 					that.apiObj = that.$API.qm.ptest.list;
 				});
 		},
diff --git a/src/views/qm/behavior_form.vue b/src/views/qm/behavior_form.vue
index aba5e66f..e1e06d22 100644
--- a/src/views/qm/behavior_form.vue
+++ b/src/views/qm/behavior_form.vue
@@ -15,24 +15,6 @@
 					label-width="160px"
 				>
 					<el-row>
-						<el-col :md="12" :sm="24">
-							<el-form-item label="检验类型" prop="testitem">
-								<el-select
-									v-model="form.testitem"
-									placeholder="检验类型"
-									clearable
-									style="width: 100%"
-									@change="testitemChange"
-								>
-									<el-option
-										v-for="item in behaviors"
-										:key="item.id"
-										:label="item.name"
-										:value="item.id"
-									/>
-								</el-select>
-							</el-form-item>
-						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="实验日期" prop="test_date">
 								<el-date-picker
@@ -50,101 +32,6 @@
 								></el-input>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24" v-if="activeName == '透过率'">
-							<el-form-item label="样品厚度/mm" prop="val_hd">
-								<el-input-number
-									v-model="form.val_hd"
-									:min="0"
-									style="width: 100%"
-									controls-position="right"
-								>
-								</el-input-number>
-							</el-form-item>
-						</el-col>
-						<el-col
-							:md="12"
-							:sm="24"
-							v-if="
-								activeName == '中温粘度' || activeName == '膨胀'
-							"
-						>
-							<el-form-item label="规格型号" prop="specification">
-								<el-input
-									v-model="form.specification"
-								></el-input>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24" v-if="activeName == '析晶'">
-							<el-form-item label="样品数量" prop="sample_count">
-								<el-input-number
-									v-model="form.sample_count"
-									:min="0"
-									style="width: 100%"
-									controls-position="right"
-								>
-								</el-input-number>
-							</el-form-item>
-						</el-col>
-						<el-col
-							:md="12"
-							:sm="24"
-							v-if="activeName == '高温粘度'"
-						>
-							<el-form-item
-								label="样品密度"
-								prop="sample_density"
-							>
-								<el-input
-									v-model="form.sample_density"
-								></el-input>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24">
-							<el-form-item label="检验员" prop="test_user">
-								<el-select
-									v-model="form.test_user"
-									placeholder="检验员"
-									clearable
-									filterable
-									style="width: 100%"
-								>
-									<el-option
-										v-for="item in userList"
-										:key="item.id"
-										:label="item.name"
-										:value="item.id"
-									/>
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24" v-if="activeName == '析晶'">
-							<el-form-item
-								label="实验温度及保温时间"
-								prop="sample_density"
-							>
-								<el-input
-									v-model="form.sample_number"
-								></el-input>
-							</el-form-item>
-						</el-col>
-						<el-col
-							:md="12"
-							:sm="24"
-							v-if="activeName == '高温粘度'"
-						>
-							<el-form-item
-								label="升至最高温度/℃"
-								prop="val_zgwd"
-							>
-								<el-input-number
-									v-model="form.val_zgwd"
-									:min="0"
-									style="width: 100%"
-									controls-position="right"
-								>
-								</el-input-number>
-							</el-form-item>
-						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="仪器状态" prop="equip_state">
 								<el-select
@@ -163,7 +50,43 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24" v-if="activeName == '折射率'">
+						<el-col :md="12" :sm="24">
+							<el-form-item label="检验员" prop="test_user">
+								<el-select
+									v-model="form.test_user"
+									placeholder="检验员"
+									clearable
+									filterable
+									style="width: 100%"
+								>
+									<el-option
+										v-for="item in userList"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="样品厚度/mm" prop="val_hd">
+								<el-input-number
+									v-model="form.val_hd"
+									:min="0"
+									style="width: 100%"
+									controls-position="right"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="规格型号" prop="specification">
+								<el-input
+									v-model="form.specification"
+								></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
 							<el-form-item label="折射率(589nm)" prop="val_zsl">
 								<el-input-number
 									v-model="form.val_zsl"
@@ -174,7 +97,7 @@
 								</el-input-number>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24" v-if="activeName == '透过率'">
+						<el-col :md="12" :sm="24">
 							<el-form-item label="透过率(550nm)" prop="val_tgl">
 								<el-input-number
 									v-model="form.val_tgl"
@@ -185,11 +108,18 @@
 								</el-input-number>
 							</el-form-item>
 						</el-col>
-						<el-col
-							:md="12"
-							:sm="24"
-							v-if="activeName == '中温粘度'"
-						>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="30-300℃膨胀系数" prop="val_pzxs">
+								<el-input-number
+									v-model="form.val_pzxs"
+									:min="0"
+									style="width: 100%"
+									controls-position="right"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
 							<el-form-item label="Ts/℃" prop="val_ts">
 								<el-input-number
 									v-model="form.val_ts"
@@ -200,21 +130,8 @@
 								</el-input-number>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24" v-if="activeName == '膨胀'">
-							<el-form-item
-								label="30-300℃膨胀系数"
-								prop="val_pzxs"
-							>
-								<el-input-number
-									v-model="form.val_pzxs"
-									:min="0"
-									style="width: 100%"
-									controls-position="right"
-								>
-								</el-input-number>
-							</el-form-item>
-						</el-col>
-						<el-col :md="12" :sm="24" v-if="activeName == '膨胀'">
+						
+						<el-col :md="12" :sm="24">
 							<el-form-item label="Tg/℃" prop="val_tg">
 								<el-input-number
 									v-model="form.val_tg"
@@ -225,7 +142,7 @@
 								</el-input-number>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24" v-if="activeName == '膨胀'">
+						<el-col :md="12" :sm="24">
 							<el-form-item label="Tf/℃" prop="val_tf">
 								<el-input-number
 									v-model="form.val_tf"
@@ -236,7 +153,7 @@
 								</el-input-number>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24" v-if="activeName == '析晶'">
+						<el-col :md="12" :sm="24">
 							<el-form-item label="析晶状态" prop="val_xj">
 								<el-select
 									v-model="form.val_xj"
@@ -254,6 +171,51 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="样品数量" prop="sample_count">
+								<el-input-number
+									v-model="form.sample_count"
+									:min="0"
+									style="width: 100%"
+									controls-position="right"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<!-- <el-col :md="12" :sm="24">
+							<el-form-item
+								label="实验温度及保温时间"
+								prop="sample_density"
+							>
+								<el-input
+									v-model="form.sample_number"
+								></el-input>
+							</el-form-item>
+						</el-col> -->
+						<el-col :md="12" :sm="24">
+							<el-form-item
+								label="样品密度"
+								prop="sample_density"
+							>
+								<el-input
+									v-model="form.sample_density"
+								></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item
+								label="升至最高温度/℃"
+								prop="val_zgwd"
+							>
+								<el-input-number
+									v-model="form.val_zgwd"
+									:min="0"
+									style="width: 100%"
+									controls-position="right"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="备注">
 								<el-input
@@ -283,7 +245,8 @@ export default {
 	data() {
 		return {
 			loading: false,
-			form: {},
+			form: {
+			},
 			rules: {
 				belong_dept: [
 					{
@@ -354,7 +317,6 @@ export default {
 	mounted() {
 		console.log(this.activeId);
 		console.log(this.activeName);
-		this.form.testitem = this.activeId;
 		this.getTextItem();
 		this.getProcess();
 		this.getUserList();
@@ -371,7 +333,7 @@ export default {
 		getTextItem() {
 			let that = this;
 			that.$API.qm.getTestItem
-				.get({ tag: "performance", page: 0 })
+				.get({ tags__contains: "performance", page: 0 })
 				.then((res) => {
 					that.behaviors = res;
 				});
@@ -416,14 +378,9 @@ export default {
 					try {
 						var res;
 						if (this.mode == "add") {
-							res = await this.$API.qm.ptest.create.req(
-								this.form
-							);
+							res = await this.$API.qm.ptest.create.req(this.form);
 						} else if (this.mode == "edit") {
-							res = await this.$API.qm.ptest.update.req(
-								this.form.id,
-								this.form
-							);
+							res = await this.$API.qm.ptest.update.req(this.form.id,this.form);
 						}
 						this.isSaveing = false;
 						this.$emit("success");
diff --git a/src/views/statistics/statistics_bang.vue b/src/views/statistics/statistics_bang.vue
index fa415af0..81dcfc56 100644
--- a/src/views/statistics/statistics_bang.vue
+++ b/src/views/statistics/statistics_bang.vue
@@ -79,11 +79,6 @@
 								<span v-if="scope.row.data">{{ scope.row.data.棒料成型_count_n_zw }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="气泡">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.棒料成型_count_n_qp }}</span>
-							</template>
-						</el-table-column>
 						<el-table-column label="炸头">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.棒料成型_count_n_zt }}</span>
@@ -94,24 +89,14 @@
 								<span v-if="scope.row.data">{{ scope.row.data.棒料成型_count_n_tw }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="弯曲">
+						<el-table-column label="气泡">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.棒料成型_count_n_wq }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.棒料成型_count_n_qp }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="断">
+						<el-table-column label="扁">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.棒料成型_count_n_d }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="粘料">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.棒料成型_count_n_nl }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="杂质">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.棒料成型_count_n_zz }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.棒料成型_count_n_b }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="其他">
@@ -156,7 +141,17 @@
 								<span v-if="scope.row.data">{{ scope.row.data.七车间入库_合格率 }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="纹">
+						<el-table-column label="炸纹">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.七车间入库_count_n_zw }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="炸头">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.七车间入库_count_n_zt }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="条纹">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.七车间入库_count_n_tw }}</span>
 							</template>
@@ -166,34 +161,14 @@
 								<span v-if="scope.row.data">{{ scope.row.data.七车间入库_count_n_qp }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="裂">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.七车间入库_count_n_l }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="弯">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.七车间入库_count_n_w }}</span>
-							</template>
-						</el-table-column>
 						<el-table-column label="扁">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.七车间入库_count_n_b }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="青">
+						<el-table-column label="其他">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.七车间入库_count_n_q }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="杂质">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.七车间入库_count_n_zz }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="矫正">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.七车间入库_count_n_jz }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.七车间入库_count_n_qt }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="交送人">
@@ -229,14 +204,120 @@
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_real }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="摔断">
+						<el-table-column label="合格率">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_sd }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_合格率 }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="少">
+						<!-- 不合格原因及数量 -->
+						<el-table-column label="划伤">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_s }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_hs }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="挫伤">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_cs }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="杂质">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_zz }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="条纹">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_tw }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="锥度大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_zdd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="短">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_d }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="炸纹">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_zw }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="断裂">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_dl }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="气泡">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_qp }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="不亮">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_bl }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="横纹">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_hw }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="有皮">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_yp }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="爆皮">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_bp }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="色差">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_sc }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="直径大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_zjd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="直径小">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_zjx }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="气线">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_qx }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="结石">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_js }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="椭圆度大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_tydd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="水雾">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_sw }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="壁厚偏差大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_bhpcd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="弯">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_平头_count_n_w }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="加工日期">
@@ -255,14 +336,119 @@
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_use }}</span>
 							</template>
 						</el-table-column>
+						<el-table-column label="合格率">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_合格率 }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="划伤">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_hs }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="挫伤">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_cs }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="杂质">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_zz }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="条纹">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_tw }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="锥度大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_zdd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="短">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_d }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="炸纹">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_zw }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="断裂">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_dl }}</span>
+							</template>
+						</el-table-column>
 						<el-table-column label="气泡">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_qp }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="少">
+						<el-table-column label="不亮">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_s }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_bl }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="横纹">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_hw }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="有皮">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_yp }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="爆皮">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_bp }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="色差">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_sc }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="直径大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_zjd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="直径小">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_zjx }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="气线">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_qx }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="结石">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_js }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="椭圆度大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_tydd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="水雾">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_sw }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="壁厚偏差大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_bhpcd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="弯">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粘铁头_count_n_w }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="加工日期">
@@ -286,14 +472,39 @@
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_合格率 }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="皮">
+						<el-table-column label="划伤">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_p }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_hs }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="掉头">
+						<el-table-column label="挫伤">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_dt }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_cs }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="杂质">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_zz }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="条纹">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_tw }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="锥度大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_zdd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="短">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_d }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="炸纹">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_zw }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="断裂">
@@ -301,19 +512,74 @@
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_dl }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="炸裂">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_zl }}</span>
-							</template>
-						</el-table-column>
 						<el-table-column label="气泡">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_qp }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="杂质">
+						<el-table-column label="不亮">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_zz }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_bl }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="横纹">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_hw }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="有皮">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_yp }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="爆皮">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_bp }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="色差">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_sc }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="直径大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_zjd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="直径小">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_zjx }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="气线">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_qx }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="结石">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_js }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="椭圆度大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_tydd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="水雾">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_sw }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="壁厚偏差大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_bhpcd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="弯">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_w }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="加工日期">
@@ -329,57 +595,137 @@
 						<!-- 抛光接收数 -->
 						<el-table-column label="抛光接收数">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_抛光_count_use }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_use }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="合格率">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_抛光_合格率 }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="掉头">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_抛光_count_n_dt }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="断裂">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_抛光_count_n_dl }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="气泡">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_抛光_count_n_qp }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_合格率 }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="划伤">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_抛光_count_n_hs }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_hs }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="少">
+						<el-table-column label="挫伤">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_抛光_count_n_s }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_cs }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="杂质">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_抛光_count_n_zz }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_zz }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="条纹">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_tw }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="锥度大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_zdd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="短">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_d }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="炸纹">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_zw }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="断裂">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_dl }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="气泡">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_qp }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="不亮">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_bl }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="横纹">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_hw }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="有皮">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_yp }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="爆皮">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_bp }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="色差">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_sc }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="直径大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_zjd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="直径小">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_zjx }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="气线">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_qx }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="结石">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_js }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="椭圆度大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_tydd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="水雾">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_sw }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="壁厚偏差大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_bhpcd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="弯">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_w }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="其他">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_抛光_count_n_qt }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_count_n_qt }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="加工日期">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_抛光_日期 }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_日期 }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="操作人">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_抛光_操作人 }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_粗中细磨_操作人 }}</span>
 							</template>
 						</el-table-column>
 						<!-- 开槽接收数 -->
@@ -388,14 +734,119 @@
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_use }}</span>
 							</template>
 						</el-table-column>
-						<!-- <el-table-column label="合格率" prop="合格率">
+						<el-table-column label="合格率">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_合格率 }}</span>
 							</template>
-						</el-table-column> -->
-						<el-table-column label="切割划伤">
+						</el-table-column>
+						<el-table-column label="划伤">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_hs }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_hs }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="挫伤">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_cs }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="杂质">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_zz }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="条纹">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_tw }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="锥度大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_zdd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="短">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_d }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="炸纹">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_zw }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="断裂">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_dl }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="气泡">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_qp }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="不亮">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_bl }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="横纹">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_hw }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="有皮">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_yp }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="爆皮">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_bp }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="色差">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_sc }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="直径大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_zjd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="直径小">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_zjx }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="气线">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_qx }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="结石">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_js }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="椭圆度大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_tydd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="水雾">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_sw }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="壁厚偏差大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_bhpcd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="弯">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_w }}</span>
 							</template>
 						</el-table-column>
 						<el-table-column label="加工日期">
@@ -409,54 +860,136 @@
 							</template>
 						</el-table-column>
 						<!-- 6车间自己的检验 -->
-						<!-- <el-table-column label="检测接收数" prop="检测接收数">
-							<template #default="scope" v-if="scope.row.data">{{ scope.row.data.产品批次编号 }}</template>
+						<el-table-column label="检测接收数">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count }}</span>
+							</template>
 						</el-table-column>
-						<el-table-column label="合格率" prop="合格率">
-							<template #default="scope" v-if="scope.row.data">{{ scope.row.data.产品批次编号 }}</template>
+						<el-table-column label="合格率">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_合格率 }}</span>
+							</template>
 						</el-table-column>
-						<el-table-column label="磕划" prop="磕划">
-							<template #default="scope" v-if="scope.row.data">{{ scope.row.data.产品批次编号 }}</template>
+						<el-table-column label="划伤">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_hs }}</span>
+							</template>
 						</el-table-column>
-						<el-table-column label="锥" prop="锥">
-							<template #default="scope" v-if="scope.row.data">{{ scope.row.data.产品批次编号 }}</template>
+						<el-table-column label="挫伤">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_cs }}</span>
+							</template>
 						</el-table-column>
-						<el-table-column label="皮" prop="皮">
-							<template #default="scope" v-if="scope.row.data">{{ scope.row.data.产品批次编号 }}</template>
+						<el-table-column label="杂质">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zz }}</span>
+							</template>
 						</el-table-column>
-						<el-table-column label="不亮" prop="不亮">
-							<template #default="scope" v-if="scope.row.data">{{ scope.row.data.产品批次编号 }}</template>
+						<el-table-column label="条纹">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_tw }}</span>
+							</template>
 						</el-table-column>
-						<el-table-column label="纹" prop="纹">
-							<template #default="scope" v-if="scope.row.data">{{ scope.row.data.产品批次编号 }}</template>
+						<el-table-column label="锥度大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zdd }}</span>
+							</template>
 						</el-table-column>
-						<el-table-column label="气泡" prop="气泡">
-							<template #default="scope" v-if="scope.row.data">{{ scope.row.data.产品批次编号 }}</template>
+						<el-table-column label="短">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_d }}</span>
+							</template>
 						</el-table-column>
-						<el-table-column label="小" prop="小">
-							<template #default="scope" v-if="scope.row.data">{{ scope.row.data.产品批次编号 }}</template>
+						<el-table-column label="炸纹">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zw }}</span>
+							</template>
 						</el-table-column>
-						<el-table-column label="少" prop="少">
-							<template #default="scope" v-if="scope.row.data">{{ scope.row.data.产品批次编号 }}</template>
+						<el-table-column label="断裂">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_dl }}</span>
+							</template>
 						</el-table-column>
-						<el-table-column label="杂质" prop="杂质">
-							<template #default="scope" v-if="scope.row.data">{{ scope.row.data.产品批次编号 }}</template>
+						<el-table-column label="气泡">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_qp }}</span>
+							</template>
 						</el-table-column>
-						<el-table-column label="裂" prop="裂">
-							<template #default="scope" v-if="scope.row.data">{{ scope.row.data.产品批次编号 }}</template>
+						<el-table-column label="不亮">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_bl }}</span>
+							</template>
 						</el-table-column>
-						<el-table-column label="色差" prop="色差">
-							<template #default="scope" v-if="scope.row.data">{{ scope.row.data.产品批次编号 }}</template>
+						<el-table-column label="横纹">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_hw }}</span>
+							</template>
 						</el-table-column>
-						<el-table-column label="碎" prop="碎">
-							<template #default="scope" v-if="scope.row.data">{{ scope.row.data.产品批次编号 }}</template>
+						<el-table-column label="有皮">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_yp }}</span>
+							</template>
 						</el-table-column>
-						<el-table-column label="加工日期" prop="加工日期">
-							<template #default="scope" v-if="scope.row.data">{{ scope.row.data.产品批次编号 }}</template>
+						<el-table-column label="爆皮">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_bp }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="色差">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_sc }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="直径大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zjd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="直径小">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zjx }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="气线">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_qx }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="结石">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_js }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="椭圆度大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_tydd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="水雾">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_sw }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="壁厚偏差大">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_bhpcd }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="弯">
+								<template #default="scope">
+									<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_w }}</span>
+								</template>
+						</el-table-column>
+						<el-table-column label="日期" prop="日期">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_日期 }}</span>
+							</template>
 						</el-table-column>
 						<el-table-column label="操作人" prop="操作人">
-							<template #default="scope" v-if="scope.row.data">{{ scope.row.data.产品批次编号 }}</template>
-						</el-table-column> -->
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_操作人 }}</span>
+							</template>
+						</el-table-column>
 					</el-table-column>
 					<el-table-column label="技术质量" align="center">
 						<el-table-column label="终检">
@@ -464,26 +997,16 @@
 								<span v-if="scope.row.data">{{ scope.row.data.成品检验_count }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="划伤">
+						<el-table-column label="合格率">
 							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_hs }}</span>
+								<span v-if="scope.row.data">{{ scope.row.data.成品检验_合格率 }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="其他">
-							<template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_qt }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="时间">
+						<el-table-column label="日期">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.成品检验_日期 }}</span>
 							</template>
 						</el-table-column>
-						<el-table-column label="合格重量/KG">
-							<!-- <template #default="scope">
-								<span v-if="scope.row.data">{{ scope.row.data.产品批次编号 }}</span>
-							</template> -->
-						</el-table-column>
 						<el-table-column label="检验人">
 							<template #default="scope">
 								<span v-if="scope.row.data">{{ scope.row.data.成品检验_操作人 }}</span>
diff --git a/src/views/statistics/statistics_guan.vue b/src/views/statistics/statistics_guan.vue
index d49b2073..69ef4a40 100644
--- a/src/views/statistics/statistics_guan.vue
+++ b/src/views/statistics/statistics_guan.vue
@@ -70,21 +70,16 @@
 							<span v-if="scope.row.data">{{ scope.row.data.管料成型_合格率 }}</span>
 						</template>
 					</el-table-column>
+					<el-table-column label="椭圆/弯曲">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.管料成型_count_n_wq }}</span>
+						</template>
+					</el-table-column>
 					<el-table-column label="条纹">
 						<template #default="scope">
 							<span v-if="scope.row.data">{{ scope.row.data.管料成型_count_n_tw }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="结石">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.管料成型_count_n_js }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="气线">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.管料成型_count_n_qx }}</span>
-						</template>
-					</el-table-column>
 					<el-table-column label="断裂">
 						<template #default="scope">
 							<span v-if="scope.row.data">{{ scope.row.data.管料成型_count_n_dl }}</span>
@@ -100,10 +95,19 @@
 							<span v-if="scope.row.data">{{ scope.row.data.管料成型_count_n_dxt }}</span>
 						</template>
 					</el-table-column>
-					
-					<el-table-column label="变形椭圆">
+					<el-table-column label="结石">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.管料成型_count_n_ty }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.管料成型_count_n_js }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="气线">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.管料成型_count_n_qx }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="其他">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.管料成型_count_n_qt }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="备注">
@@ -128,19 +132,14 @@
 							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_抽检合格率 }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="偏壁">
+					<el-table-column label="椭圆/弯曲">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_pb }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_wq }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="结石">
+					<el-table-column label="条纹">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_js }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="脏料">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_zl }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_tw }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="断裂">
@@ -148,19 +147,9 @@
 							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_dl }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="椭圆">
+					<el-table-column label="偏壁">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_ty }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="炸裂">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_zl }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="锥">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_z }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_pb }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="大小头">
@@ -168,9 +157,9 @@
 							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_dxt }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="划伤">
+					<el-table-column label="结石">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_hs }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_js }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="气线">
@@ -178,11 +167,6 @@
 							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_qx }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="炸纹">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_zw }}</span>
-						</template>
-					</el-table-column>
 					<el-table-column label="其他">
 						<template #default="scope">
 							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_qt }}</span>
@@ -215,6 +199,31 @@
 							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_合格率 }}</span>
 						</template>
 					</el-table-column>
+					<el-table-column label="椭圆/弯曲">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_wq }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="条纹">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_tw }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="断裂">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_dl }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="偏壁">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_pb }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="大小头">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_dxt }}</span>
+						</template>
+					</el-table-column>
 					<el-table-column label="结石">
 						<template #default="scope">
 							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_js }}</span>
@@ -225,26 +234,6 @@
 							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_qx }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="断裂">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_dl }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="划伤">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_hs }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="碎">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_s }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="内径小">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_njx }}</span>
-						</template>
-					</el-table-column>
 					<el-table-column label="其他">
 						<template #default="scope">
 							<span v-if="scope.row.data">{{ scope.row.data.十车间入库_count_n_qt }}</span>
@@ -280,9 +269,29 @@
 							<span v-if="scope.row.data">{{ scope.row.data.管料退火_合格率 }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="碎">
+					<el-table-column label="箱中破">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.管料退火_count_n_s }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.管料退火_count_n_xzp }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="退火后碎">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.管料退火_count_n_thhs }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="划伤">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.管料退火_count_n_hs }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="结石">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.管料退火_count_n_js }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="气线">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.管料退火_count_n_qx }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="其他">
@@ -323,7 +332,7 @@
 						</template>
 					</el-table-column>
 				</el-table-column>
-				<el-table-column label="开管" align="center">
+				<el-table-column label="6号生产" align="center">
 					<el-table-column label="开槽">
 						<template #default="scope">
 							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_real }}</span>
@@ -334,14 +343,39 @@
 							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_合格率 }}</span>
 						</template>
 					</el-table-column>
+					<el-table-column label="划伤">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_hs }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="挫伤">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_cs }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="杂质">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_zz }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="条纹">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_tw }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="锥度大">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_zdd }}</span>
+						</template>
+					</el-table-column>
 					<el-table-column label="短">
 						<template #default="scope">
 							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_d }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="少">
+					<el-table-column label="炸纹">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_s }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_zw }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="断裂">
@@ -349,15 +383,75 @@
 							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_dl }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="红锈">
+					<el-table-column label="气泡">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_hx }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_qp }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="开槽前检验不合格">
-						<!-- <template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.开槽前检验不合格 }}</span>
-						</template> -->
+					<el-table-column label="不亮">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_bl }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="横纹">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_hw }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="有皮">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_yp }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="爆皮">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_bp }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="色差">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_sc }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="直径大">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_zjd }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="直径小">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_zjx }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="气线">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_qx }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="结石">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_js }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="椭圆度大">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_tydd }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="水雾">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_sw }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="壁厚偏差大">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_bhpcd }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="弯">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_count_n_w }}</span>
+							</template>
 					</el-table-column>
 					<el-table-column label="加工日期">
 						<template #default="scope">
@@ -374,101 +468,277 @@
 							<span v-if="scope.row.data">{{ scope.row.data.六车间_开槽_备注 }}</span>
 						</template>
 					</el-table-column>
-				</el-table-column>
-				<el-table-column label="检验" align="center">
-					<el-table-column label="检验">
+					<el-table-column label="倒角">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_real }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="合格率">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_合格率 }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_合格率 }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="划伤">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_hs }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_hs }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="气线">
+					<el-table-column label="挫伤">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_qx }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_cs }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="炸纹">
+					<el-table-column label="杂质">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_zw }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_zz }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="偏壁">
+					<el-table-column label="条纹">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_bp }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_tw }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="弯">
+					<el-table-column label="锥度大">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_w }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="大小头">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_dxt }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="结子">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_jz }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="锥">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_z }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="椭">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_ty }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_zdd }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="短">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_d }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_d }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="少">
+					<el-table-column label="炸纹">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_s }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_zw }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="多">
+					<el-table-column label="断裂">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_d }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_dl }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="碎裂">
+					<el-table-column label="气泡">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_sl }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_qp }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="其他">
+					<el-table-column label="不亮">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_qt }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_bl }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="日期">
+					<el-table-column label="横纹">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_日期 }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_hw }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="有皮">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_yp }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="爆皮">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_bp }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="色差">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_sc }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="直径大">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_zjd }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="直径小">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_zjx }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="气线">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_qx }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="结石">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_js }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="椭圆度大">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_tydd }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="水雾">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_sw }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="壁厚偏差大">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_bhpcd }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="弯">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_count_n_w }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="加工日期">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_日期 }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="操作人">
 						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_检验人 }}</span>
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_操作人 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="备注">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间_倒角_备注 }}</span>
+						</template>
+					</el-table-column>
+				</el-table-column>
+				<!-- 六车间中检 -->
+				<el-table-column label="检验" align="center">
+					<el-table-column label="检验">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="合格率">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_合格率 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="划伤">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_hs }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="挫伤">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_cs }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="杂质">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zz }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="条纹">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_tw }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="锥度大">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zdd }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="短">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_d }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="炸纹">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zw }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="断裂">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_dl }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="气泡">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_qp }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="不亮">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_bl }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="横纹">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_hw }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="有皮">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_yp }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="爆皮">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_bp }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="色差">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_sc }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="直径大">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zjd }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="直径小">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_zjx }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="气线">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_qx }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="结石">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_js }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="椭圆度大">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_tydd }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="水雾">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_sw }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="壁厚偏差大">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_bhpcd }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="弯">
+							<template #default="scope">
+								<span v-if="scope.row.data">{{ scope.row.data.六车间中检_count_n_w }}</span>
+							</template>
+					</el-table-column>
+					<el-table-column label="日期">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_日期 }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="操作人">
+						<template #default="scope">
+							<span v-if="scope.row.data">{{ scope.row.data.六车间中检_检验人 }}</span>
 						</template>
 					</el-table-column>
 				</el-table-column>
 				<el-table-column label="终检" align="center">
-					<el-table-column label="终检">
+					<el-table-column label="终检数">
 						<template #default="scope">
 							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count }}</span>
 						</template>
@@ -478,31 +748,6 @@
 							<span v-if="scope.row.data">{{ scope.row.data.成品检验_合格率 }}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="划伤">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_hs }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="炸纹">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_zw }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="气线">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_qx }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="结子">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_jz }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="其他">
-						<template #default="scope">
-							<span v-if="scope.row.data">{{ scope.row.data.成品检验_count_n_qt }}</span>
-						</template>
-					</el-table-column>
 					<el-table-column label="日期">
 						<template #default="scope">
 							<span v-if="scope.row.data">{{ scope.row.data.成品检验_日期 }}</span>
diff --git a/src/views/statistics/total_statistics.vue b/src/views/statistics/total_statistics.vue
index a934534f..55c5dab3 100644
--- a/src/views/statistics/total_statistics.vue
+++ b/src/views/statistics/total_statistics.vue
@@ -65,13 +65,13 @@
 									<el-table-column label="配管" prop="配管">
 									</el-table-column>
 								</el-table-column>
-
+								<el-table-column label="成品库" prop="成品库">
+								</el-table-column>
 								<el-table-column label="合计" prop="合计">
 								</el-table-column>
-								<el-table-column
-									label="检验合格数"
-									prop="检验合格数"
-								>
+								<el-table-column label="中检合格数" prop="中检合格数">
+								</el-table-column>
+								<el-table-column label="检验合格数" prop="检验合格数">
 								</el-table-column>
 							</el-table>
 						</el-main>
@@ -110,6 +110,7 @@
 									</el-table-column>
 								</el-table-column>
 								<el-table-column label="6号">
+									<!-- 6车间 管成型退火 -->
 									<el-table-column label="库存" prop="库存">
 									</el-table-column>
 									<el-table-column label="开槽" prop="开槽">
@@ -119,12 +120,13 @@
 									<el-table-column label="配棒" prop="配棒">
 									</el-table-column>
 								</el-table-column>
+								<el-table-column label="成品库" prop="成品库">
+								</el-table-column>
 								<el-table-column label="合计" prop="合计">
 								</el-table-column>
-								<el-table-column
-									label="检验合格数"
-									prop="检验合格数"
-								>
+								<el-table-column label="中检合格数" prop="中检合格数">
+								</el-table-column>
+								<el-table-column label="检验合格数" prop="检验合格数">
 								</el-table-column>
 							</el-table>
 						</el-main>
@@ -149,6 +151,8 @@ export default {
 				date: "",
 			},
 			currentDate: "",
+			models_b:[],
+			models_g:[],
 		};
 	},
 	mounted() {
@@ -170,45 +174,60 @@ export default {
 	},
 	created() {},
 	methods: {
-		getCountOk() {
+		getCountOk(type,models) {
 			let that = this;
 			let params = {
 				query: {
 					start_date: that.query.date,
 					end_date: that.query.date,
-
-					// start_date: "2024-01-16",
-					// end_date: "2024-01-16",
 				},
 			};
-			that.$API.bi.dataset.exec
-				.req("count_ok_day", params)
-				.then((res) => {
-					let datas = res.data2.ds0;
-					if(datas.length>0){
+			that.$API.bi.dataset.exec.req("count_ok_day", params).then((res) => {
+				let datas = res.data2.ds0;
+				if(datas.length>0){
+					if(type=="b"){
 						datas.forEach((item) => {
-						let bang_model = "",
-							guan_model = "";
-						if (item.型号.indexOf("+") > -1) {
-							bang_model = item.型号.split("+")[0];
-							guan_model = item.型号.split("+")[1];
-						} else {
-							bang_model = guan_model = item.型号;
-						}
-						that.tableData11.forEach((item1) => {
-							if (item1.版型 == bang_model) {
-								item1.检验合格数 += item.合格数;
+							let b_model = "";
+							if (item.型号.indexOf("+") > -1) {
+								b_model = item.型号.split("+")[0];
+							} else {
+								b_model = guan_model = item.型号;
+							}
+							let index = models.indexOf(b_model);
+							if(index>-1){
+								if(item.检验类型=='prod'){
+									that.tableData11[index].中检合格数 += item.合格数;
+								}else if(item.检验类型=='process'){
+									that.tableData11[index].检验合格数 += item.合格数;
+								}
 							}
 						});
-						that.tableData22.forEach((item2) => {
-							if (item2.版型 == guan_model) {
-								item2.检验合格数 += item.合格数;
+					}else if(type=="g"){
+						datas.forEach((item) => {
+							let g_model = "",g_spec = "";
+							if (item.型号.indexOf("+") > -1) {
+								g_model = item.型号.split("+")[1];
+							} else {
+								g_model = item.型号;
+							}
+							if (item.规格.indexOf("+") > -1) {
+								g_spec = item.规格.split("+")[1];
+							} else {
+								g_spec = item.规格;
+							}
+							let msitem = g_model+g_spec;
+							let index = models.indexOf(msitem);
+							if(index>-1){
+								if(item.检验类型=='prod'){
+									that.tableData22[index].中检合格数 += item.合格数;
+								}else if(item.检验类型=='process'){
+									that.tableData22[index].检验合格数 += item.合格数;
+								}
 							}
 						});
-					});
 					}
-					
-				});
+				}
+			});
 		},
 		//获取表格原始数据
 		getSourceData() {
@@ -219,7 +238,6 @@ export default {
 			obj.timex__day = that.day;
 			obj.page = 0;
 			that.$API.bi.dataset.record.req(obj).then((res) => {
-				// let res = that.mockData;
 				let datas = res[0].result.data2;
 				let data_b = [...datas.ds0, ...datas.ds2];
 				let data_g = [...datas.ds1, ...datas.ds3];
@@ -227,14 +245,12 @@ export default {
 				that.data_g = data_g;
 				that.getDataB(data_b);
 				that.getDataG(data_g);
-				that.getCountOk();
 			});
 		},
 		//棒数据
 		getDataB(data) {
 			let that = this;
-			let models = [],
-				dataArr = [];
+			let models = [],dataArr = [];
 			//按版型（型号）分组
 			data.forEach((item) => {
 				let index = 0;
@@ -268,20 +284,17 @@ export default {
 					抛光: 0,
 					开槽: 0,
 					配管: 0,
+					成品库:0,
 					合计: 0,
+					中检合格数: 0,
 					检验合格数: 0,
 				};
 				itemArr.forEach((item1) => {
 					obj.版型 = item1.型号;
 					let key = "";
-					if (item1.车间 == "7车间" && item1.工序 == "棒料成型") {
+					if (item1.车间 == "7车间") {
 						key = "合格数";
-					} else if (!item1.车间) {
-						key = "仓库库存";
-					} else if (
-						item1.车间 == "6车间" &&
-						item1.工序 == "棒料成型"
-					) {
+					} else if (item1.车间 == "6车间" &&item1.工序 == "棒料成型") {
 						key = "库存";
 					} else if (item1.车间 == "6车间" && item1.工序 == "平头") {
 						key = "平头";
@@ -293,9 +306,18 @@ export default {
 						key = "抛光";
 					} else if (item1.车间 == "6车间" && item1.工序 == "开槽") {
 						key = "开槽";
-					} else if (item1.工序 == "配管") {
-						key = "配管";
 					}
+					if (item1.车间==null||item1.车间==undefined) {
+						console.log( '仓库库存',item1);
+						console.log( item1.工序 !== "配管"&&item1.类型==10);
+						if (item1.工序 == "配管") {
+							key = "配管";
+						}else if(item1.工序 !== "配管"&&item1.类型==10){
+							key = "成品库";
+						}else if(item1.工序 !== "配管"&&item1.类型==20){
+							key = "仓库库存";
+						}
+					} 
 					obj[key] += item1.数量;
 				});
 				obj.合计 =
@@ -307,9 +329,12 @@ export default {
 					obj.粗中细 +
 					obj.抛光 +
 					obj.开槽 +
-					obj.配管;
+					obj.配管+
+					obj.成品库;
 				that.tableData11[index] = obj;
 			});
+			that.models_b = models;
+			that.getCountOk('b',models);
 		},
 		//管数据
 		getDataG(data) {
@@ -363,6 +388,7 @@ export default {
 			});
 			//specArr已将同型号的数组中按规格分组
 			specArr.forEach((item3, index3) => {
+				let modelsspec = [];
 				item3.forEach((item4) => {
 					let obj = {
 						版型: "",
@@ -374,52 +400,44 @@ export default {
 						开槽: 0,
 						倒角: 0,
 						配棒: 0,
+						成品库:0,
 						合计: 0,
+						中检合格数: 0,
 						检验合格数: 0,
 					};
 					item4.forEach((item5) => {
 						let key = "";
 						obj.版型 = item5.型号;
-						obj.规格 = item5.规格;
-
-						if (
-							item5.车间 == "10车间" &&
-							item5.工序 == "管料成型"
-						) {
-							key = "合格数";
-						} else if (!item5.车间 && item5.工序 == "管料成型") {
-							key = "仓库库存";
-						} else if (
-							item5.车间 == "8车间" &&
-							item5.工序 == "管料成型"
-						) {
-							key = "仓库库存";
-						} else if (
-							item5.车间 == "8车间" &&
-							item5.工序 == "管料退火"
-						) {
-							key = "退火";
-						} else if (
-							item5.车间 == "6车间" &&
-							item5.工序 == "管料退火"
-						) {
-							key = "库存";
-						} else if (
-							item5.车间 == "6车间" &&
-							item5.工序 == "开槽"
-						) {
-							key = "开槽";
-						} else if (
-							item5.车间 == "6车间" &&
-							item5.工序 == "倒角"
-						) {
-							key = "倒角";
-						} else if (
-							item5.车间 == "6车间" &&
-							item5.工序 == "配棒"
-						) {
-							key = "配棒";
+						if (item5.规格.indexOf("+") > -1) {
+							let spec = item5.规格.split("+")[1];
+							obj.规格 = spec;
+						}else{
+							obj.规格 = item5.规格;
 						}
+						if (item5.车间 == "10车间") {
+							key = "合格数";
+						}else if (item5.车间 == "8车间" &&item5.工序 == "管料成型") {
+							key = "仓库库存";
+						} else if (item5.车间 == "8车间" &&item5.工序 == "管料退火") {
+							key = "退火";
+						} else if (item5.车间 == "6车间" &&item5.工序 == "管料退火") {
+							key = "库存";
+						} else if (item5.车间 == "6车间" &&item5.工序 == "开槽") {
+							key = "开槽";
+						} else if (item5.车间 == "6车间" &&item5.工序 == "倒角") {
+							key = "倒角";
+						}
+						if (item5.车间==null||item5.车间==undefined) {
+							console.log( '仓库库存',item5);
+							console.log( item5.工序 !== "配管"&&item5.类型==10);
+							if (item5.工序 == "配管") {
+								key = "配棒";
+							}else if(item5.工序 !== "配管"&&item5.类型==10){
+								key = "成品库";
+							}else if(item5.工序 !== "配管"&&item5.类型==20){
+								key = "仓库库存";
+							}
+						} 
 						obj[key] = obj[key] + item5.数量;
 					});
 					obj.合计 =
@@ -429,10 +447,15 @@ export default {
 						obj.库存 +
 						obj.开槽 +
 						obj.倒角 +
-						obj.配棒;
+						obj.配棒+
+						obj.成品库;
 					that.tableData22.push(obj);
+					let modelsspecitem = obj.版型+obj.规格;
+					modelsspec.push(modelsspecitem);
 				});
 			});
+			that.models_g = models;
+			that.getCountOk('g',models);
 		},
 		handleQuery() {
 			let that = this;
diff --git a/src/views/wpm/check_drawer.vue b/src/views/wpm/check_drawer.vue
new file mode 100644
index 00000000..f37b0896
--- /dev/null
+++ b/src/views/wpm/check_drawer.vue
@@ -0,0 +1,223 @@
+<template>
+	<el-drawer
+		v-model="visible"
+		title="检验记录"
+		:size="'90%'"
+		destroy-on-close
+		@closed="$emit('closed')"
+	>
+		<el-container>
+			<el-main>
+				<scTable
+					ref="drawer_table"
+					:apiObj="apiObj"
+					row-key="id"
+					stripe
+					:params="paramsObj"
+				>
+					<el-table-column type="expand" v-if="deptName=='6车间'">
+						<template #default="props">
+							<el-descriptions title="不合格列表" :column="5" border>
+								<el-descriptions-item label="划伤" width="150px">
+									{{props.row.count_notok_json.count_n_hs}}
+								</el-descriptions-item>
+								<el-descriptions-item label="挫伤" width="150px">
+									{{props.row.count_notok_json.count_n_hs}}
+								</el-descriptions-item>
+								<el-descriptions-item label="杂质" width="150px">
+									{{props.row.count_notok_json.count_n_zz}}
+								</el-descriptions-item>
+								<el-descriptions-item label="条纹" width="150px">
+									{{props.row.count_notok_json.count_n_tw}}
+								</el-descriptions-item>
+								<el-descriptions-item label="锥度大" width="150px">
+									{{props.row.count_notok_json.count_n_zdd}}
+								</el-descriptions-item>
+								<el-descriptions-item label="短" width="150px">
+									{{props.row.count_notok_json.count_n_d}}
+								</el-descriptions-item>
+								<el-descriptions-item label="炸纹" width="150px">
+									{{props.row.count_notok_json.count_n_zw}}
+								</el-descriptions-item>
+								<el-descriptions-item label="断裂" width="150px">
+									{{props.row.count_notok_json.count_n_dl}}
+								</el-descriptions-item>
+								<el-descriptions-item label="气泡" width="150px">
+									{{props.row.count_notok_json.count_n_qp}}
+								</el-descriptions-item>
+								<el-descriptions-item label="不亮" width="150px">
+									{{props.row.count_notok_json.count_n_bl}}
+								</el-descriptions-item>
+								<el-descriptions-item label="横纹" width="150px">
+									{{props.row.count_notok_json.count_n_hw}}
+								</el-descriptions-item>
+								<el-descriptions-item label="有皮" width="150px">
+									{{props.row.count_notok_json.count_n_yp}}
+								</el-descriptions-item>
+								<el-descriptions-item label="爆皮" width="150px">
+									{{props.row.count_notok_json.count_n_bp}}
+								</el-descriptions-item>
+								<el-descriptions-item label="色差" width="150px">
+									{{props.row.count_notok_json.count_n_sc}}
+								</el-descriptions-item>
+								<el-descriptions-item label="直径大" width="150px">
+									{{props.row.count_notok_json.count_n_zjd}}
+								</el-descriptions-item>
+								<el-descriptions-item label="直径小" width="150px">
+									{{props.row.count_notok_json.count_n_zjx}}
+								</el-descriptions-item>
+								<el-descriptions-item label="气线" width="150px">
+									{{props.row.count_notok_json.count_n_qx}}
+								</el-descriptions-item>
+								<el-descriptions-item label="结石" width="150px">
+									{{props.row.count_notok_json.count_n_js}}
+								</el-descriptions-item>
+								<el-descriptions-item label="椭圆度大" width="150px">
+									{{props.row.count_notok_json.count_n_tydd}}
+								</el-descriptions-item>
+								<el-descriptions-item label="水雾" width="150px">
+									{{props.row.count_notok_json.count_n_sw}}
+								</el-descriptions-item>
+								<el-descriptions-item label="壁厚偏差大" width="150px">
+									{{props.row.count_notok_json.count_n_bhpcd}}
+								</el-descriptions-item>
+								<el-descriptions-item label="弯" width="150px">
+									{{props.row.count_notok_json.count_n_wq}}
+								</el-descriptions-item>
+							</el-descriptions>
+						</template>
+					</el-table-column>
+					<el-table-column type="expand" v-if="deptName=='7车间'">
+						<template #default="props">
+							<el-descriptions title="不合格列表" :column="5" border>
+								<el-descriptions-item label="炸纹" width="150px">
+									{{props.row.count_notok_json.count_n_zw}}
+								</el-descriptions-item>
+								<el-descriptions-item label="炸头" width="150px">
+									{{props.row.count_notok_json.count_n_zt}}
+								</el-descriptions-item>
+								<el-descriptions-item label="条纹" width="150px">
+									{{props.row.count_notok_json.count_n_tw}}
+								</el-descriptions-item>
+								<el-descriptions-item label="气泡" width="150px">
+									{{props.row.count_notok_json.count_n_qp}}
+								</el-descriptions-item>
+
+								<el-descriptions-item label="扁" width="150px">
+									{{props.row.count_notok_json.count_n_b}}
+								</el-descriptions-item>
+								<el-descriptions-item label="其他" width="150px">
+									{{props.row.count_notok_json.count_n_qt}}
+								</el-descriptions-item>
+							</el-descriptions>
+						</template>
+					</el-table-column>
+					<el-table-column type="expand" v-if="deptName=='10车间'">
+						<template #default="props">
+							<el-descriptions title="不合格列表" :column="5" border>
+								<el-descriptions-item label="椭圆/弯曲" width="150px">
+									{{props.row.count_notok_json.count_n_wq}}
+								</el-descriptions-item>
+								<el-descriptions-item label="条纹" width="150px">
+									{{props.row.count_notok_json.count_n_tw}}
+								</el-descriptions-item>
+								<el-descriptions-item label="断裂" width="150px">
+									{{props.row.count_notok_json.count_n_dl}}
+								</el-descriptions-item>
+								<el-descriptions-item label="偏壁" width="150px">
+									{{props.row.count_notok_json.count_n_pb}}
+								</el-descriptions-item>
+								<el-descriptions-item label="大小头" width="150px">
+									{{props.row.count_notok_json.count_n_dxt}}
+								</el-descriptions-item>
+								<el-descriptions-item label="结石" width="150px">
+									{{props.row.count_notok_json.count_n_js}}
+								</el-descriptions-item>
+								<el-descriptions-item label="气线" width="150px">
+									{{props.row.count_notok_json.count_n_qx}}
+								</el-descriptions-item>
+								<el-descriptions-item label="其他" width="150px">
+									{{props.row.count_notok_json.count_n_qt}}
+								</el-descriptions-item>
+							</el-descriptions>
+						</template>
+					</el-table-column>
+					<el-table-column label="检验类型">
+						<template #default="scope">
+							<el-tag v-if="scope.row.type2 == 10">
+								{{ type2_[scope.row.type2] }}
+							</el-tag>
+							<el-tag v-else type="success">
+								{{ type2_[scope.row.type2] }}
+							</el-tag>
+						</template>
+					</el-table-column>
+					<el-table-column label="物料批次" prop="batch">
+					</el-table-column>
+					<el-table-column label="总数" prop="count">
+					</el-table-column>
+					<el-table-column label="检验数">
+						<template #default="scope">
+							<span v-if="scope.row.type2 == 10">{{ scope.row.count_sampling }}</span>
+							<span v-else>{{ scope.row.count }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="合格数">
+						<template #default="scope">
+							<span v-if="scope.row.type2 == 10">{{ scope.row.count_sampling_ok }}</span>
+							<span v-else>{{ scope.row.count_ok }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="不合格数" prop="count_notok">
+					</el-table-column>
+					<el-table-column label="合格率">
+						<template #default="scope">
+							<span v-if="scope.row.type2 == 10">{{ scope.row.count_sampling_ok/scope.row.count_sampling*100 }}%</span>
+							<span v-else>{{ scope.row.count_ok/scope.row.count*100 }}%</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="检验日期" prop="test_date">
+					</el-table-column>
+					<el-table-column label="检验人" prop="test_user_name">
+					</el-table-column>
+				</scTable>
+			</el-main>
+		</el-container>
+	</el-drawer>
+</template>
+<script>
+export default {
+	emits: ["closed"],
+	props: {
+		deptName: { type: String, default: "" },
+		wm: { type: String, default: "" },
+	},
+	data() {
+		return {
+			visible: false,
+			apiObj: null,
+			paramsObj: {},
+			form: {},
+			type2_: {
+				10: "抽检",
+				20: "全检",
+			},
+			isSaveing: false,
+		};
+	},
+	mounted() {},
+	methods: {
+		open() {
+			this.visible = true;
+			this.paramsObj.wm = this.wm;
+			this.apiObj = this.$API.qm.ftestwork.list;
+			return this;
+		},
+		table_del(row){
+			this.$API.qm.ftestwork.delete.req(row.id).then((res) => {
+				this.$refs.drawer_table.fetch();
+			});
+		},
+	},
+};
+</script>
diff --git a/src/views/wpm/middle_test.vue b/src/views/wpm/middle_test.vue
new file mode 100644
index 00000000..7b28226a
--- /dev/null
+++ b/src/views/wpm/middle_test.vue
@@ -0,0 +1,929 @@
+<template>
+	<el-dialog
+		title="中检"
+		v-model="visible"
+		:size="1000"
+		destroy-on-close
+		@closed="$emit('closed')"
+	>
+		<el-container v-loading="loading">
+			<el-main style="padding: 0 20px 20px 20px">
+				<el-form
+					ref="dialogForm"
+					:model="form"
+					:rules="rules"
+					label-width="100px"
+				>
+					<el-row>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="检验类型">
+								<el-select
+									v-model="form.type2"
+									placeholder="检验类型"
+									style="width: 100%"
+									@testType="handleTypeChange"
+								>
+								<el-option
+										v-for="item in typeOption"
+										:key="item.value"
+										:label="item.name"
+										:value="item.value"
+									></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="物料批次">
+								<el-input v-model="wm_batch" disabled></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24" v-if="form.type2==20">
+							<el-form-item label="检验数量">
+								<el-input-number
+									:max="originData.count"
+									controls-position="right"
+									v-model="form.count"
+									style="width: 100%"
+									:precision="0"
+									@change="handleCountNotokChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24" v-if="form.type2==20">
+							<el-form-item label="合格数量">
+								<el-input v-model="form.count_ok" disabled></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24" v-if="form.type2==10">
+							<el-form-item label="抽检数量">
+								<el-input-number
+									:max="batchCount"
+									controls-position="right"
+									v-model="form.count_sampling"
+									style="width: 100%"
+									:precision="0"
+									@change="handleCountNotokChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24" v-if="form.type2==10">
+							<el-form-item label="抽检合格数">
+								<el-input-number
+									controls-position="right"
+									v-model="form.count_sampling_ok"
+									style="width: 100%"
+									disabled
+									:precision="0"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="不合格数量">
+								<el-input-number
+									controls-position="right"
+									v-model="form.count_notok"
+									style="width: 100%"
+									:precision="0"
+									disabled
+									@change="handleCountNotokChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="合格率(%)">
+								<el-input-number
+									controls-position="right"
+									v-model="count_rate"
+									style="width: 100%"
+									:precision="0"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="检验日期" prop="test_date">
+								<el-date-picker
+									v-model="form.test_date"
+									type="date"
+									value-format="YYYY-MM-DD"
+									style="width: 100%"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="检验人" prop="test_user">
+								<el-select
+									v-model="form.test_user"
+									placeholder="检验人"
+									clearable
+									filterable
+									style="width: 100%"
+								>
+									<el-option
+										v-for="item in userList"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									/>
+								</el-select>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<div class="formTitle">不合格原因及数量:</div>
+					<!-- 7车间 -->
+					<el-row v-if="deptName == '7车间'">
+						<el-col :md="12" :sm="24">
+							<el-form-item label="炸纹">
+								<el-input-number
+									v-model="count_notok_json.count_n_zw"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="炸纹"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="炸头">
+								<el-input-number
+									v-model="count_notok_json.count_n_zt"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="炸头"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="条纹">
+								<el-input-number
+									v-model="count_notok_json.count_n_tw"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="条纹"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="气泡">
+								<el-input-number
+									v-model="count_notok_json.count_n_qp"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="气泡"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						
+						<el-col :md="12" :sm="24">
+							<el-form-item label="扁">
+								<el-input-number
+									v-model="count_notok_json.count_n_b"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="扁"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="其他">
+								<el-input-number
+									v-model="count_notok_json.count_n_qt"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="其他"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="备注">
+								<el-input
+									v-model="form.note"
+									tyle="width:100%"
+									placeholder="备注"
+								></el-input>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<!-- 10车间 -->
+					<el-row v-if="deptName == '10车间'">
+						<el-col :md="12" :sm="24">
+							<el-form-item label="椭圆/弯曲">
+								<el-input-number
+									v-model="count_notok_json.count_n_wq"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="椭圆/弯曲"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="条纹">
+								<el-input-number
+									v-model="count_notok_json.count_n_tw"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="条纹"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="断裂">
+								<el-input-number
+									v-model="count_notok_json.count_n_dl"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="断裂"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						
+						<el-col :md="12" :sm="24">
+							<el-form-item label="偏壁">
+								<el-input-number
+									v-model="count_notok_json.count_n_pb"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="偏壁"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="大小头">
+								<el-input-number
+									v-model="count_notok_json.count_n_dxt"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="大小头"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="结石">
+								<el-input-number
+									v-model="count_notok_json.count_n_js"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="结石"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="气线">
+								<el-input-number
+									v-model="count_notok_json.count_n_qx"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="气线"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="其他">
+								<el-input-number
+									v-model="count_notok_json.count_n_qt"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="其他"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="备注">
+								<el-input
+									v-model="form.note"
+									tyle="width:100%"
+									placeholder="备注"
+								></el-input>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<!-- 6车间 -->
+					<el-row v-if="deptName == '6车间'">
+						<el-col :md="12" :sm="24">
+							<el-form-item label="划伤">
+								<el-input-number
+									v-model="count_notok_json.count_n_hs"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="划伤"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="挫伤">
+								<el-input-number
+									v-model="count_notok_json.count_n_cs"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="挫伤"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="杂质">
+								<el-input-number
+									v-model="count_notok_json.count_n_zz"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="杂质"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="条纹">
+								<el-input-number
+									v-model="count_notok_json.count_n_tw"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="条纹"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="锥度大">
+								<el-input-number
+									v-model="count_notok_json.count_n_zdd"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="锥度大"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="短">
+								<el-input-number
+									v-model="count_notok_json.count_n_d"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="短"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="炸纹">
+								<el-input-number
+									v-model="count_notok_json.count_n_zw"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="炸纹"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="断裂">
+								<el-input-number
+									v-model="count_notok_json.count_n_dl"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="断裂"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="气泡">
+								<el-input-number
+									v-model="count_notok_json.count_n_qp"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="气泡"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="不亮">
+								<el-input-number
+									v-model="count_notok_json.count_n_bl"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="不亮"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="横纹">
+								<el-input-number
+									v-model="count_notok_json.count_n_hw"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="横纹"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="有皮">
+								<el-input-number
+									v-model="count_notok_json.count_n_yp"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="有皮"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="爆皮">
+								<el-input-number
+									v-model="count_notok_json.count_n_bp"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="爆皮"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="色差">
+								<el-input-number
+									v-model="count_notok_json.count_n_sc"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="色差"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="直径大">
+								<el-input-number
+									v-model="count_notok_json.count_n_zjd"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="直径大"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="直径小">
+								<el-input-number
+									v-model="count_notok_json.count_n_zjx"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="直径小"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="气线">
+								<el-input-number
+									v-model="count_notok_json.count_n_qx"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="气线"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="结石">
+								<el-input-number
+									v-model="count_notok_json.count_n_js"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="结石"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="椭圆度大">
+								<el-input-number
+									v-model="count_notok_json.count_n_tydd"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="椭圆度大"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="水雾">
+								<el-input-number
+									v-model="count_notok_json.count_n_sw"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="水雾"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="壁厚偏差大">
+								<el-input-number
+									v-model="count_notok_json.count_n_bhpcd"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="壁厚偏差大"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="弯">
+								<el-input-number
+									v-model="count_notok_json.count_n_wq"
+									controls-position="right"
+									:min="0"
+									:step="1"
+									:step-strictly="true"
+									style="width: 100%"
+									placeholder="弯"
+									@change="handleCountChange"
+								>
+								</el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="备注">
+								<el-input
+									v-model="form.note"
+									tyle="width:100%"
+									placeholder="备注"
+								></el-input>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+			</el-main>
+			<el-footer>
+				<el-button type="primary" 
+					:loading="isSaveing" 
+					@click="submit"
+					>提交</el-button>
+				<el-button @click="visible = false">取消</el-button>
+			</el-footer>
+		</el-container>
+	</el-dialog>
+</template>
+<script>
+export default {
+	emits: ["success", "closed"],
+	data() {
+		return {
+			deptName: "",
+			mode:'',
+			loading: false,
+			form: {
+				type:'process',
+				type2:20,
+				test_date: "",
+				count: 0,
+				count_ok: 0,
+				count_notok: 0,
+				count_notok_json:{},
+				ftestworkdefect:[],
+			},
+			count_rate:100,
+			count_notok_json:{
+				count_n_hs: 0,
+				count_n_cs:0,
+				count_n_zz: 0,
+				count_n_tw: 0,
+				count_n_zdd: 0,
+				count_n_d: 0,
+				count_n_zw: 0,
+				count_n_dl: 0,
+				count_n_qp:0,
+				count_n_bl:0,
+				count_n_hw: 0,
+				count_n_yp: 0,
+				count_n_bp: 0,
+				count_n_sc: 0,
+				count_n_zjd: 0,
+				count_n_zjx: 0,
+				count_n_qx: 0,
+				count_n_js: 0,
+				count_n_tydd: 0,
+				count_n_sw: 0,
+				count_n_bhpcd: 0,
+				count_n_wq: 0,
+				//7
+				count_n_zt:0,
+				count_n_b:0,
+				count_n_qt:0,
+				//10
+				count_n_pb:0,
+				count_n_dxt:0,
+			},
+			rules: {
+				test_date: [{required: true,message: "请选择检验日期",trigger: "blur"}],
+				batch: [{required: true,message: "请选择物料批次",trigger: "blur"}],
+				test_user: [{required: true,message: "请选择物料批次",trigger: "blur"}],
+			},
+			typeOption:[
+				{name:'全检',value:20},
+				{name:'抽检',value:10},
+			],
+			originData:{},
+			userList : [],
+			selectionFilters: [],
+			batchCount:null,
+			formCount:null,
+			visible: false,
+			supplier:null,
+			isSaveing: false,
+		};
+	},
+	mounted() {
+		this.getUsers();
+	},
+	methods: {
+		//显示
+		open(deptName) {
+			this.deptName = deptName;
+			this.visible = true;
+			return this;
+		},
+        //表单注入数据
+		setData(data,) {
+			let that = this;
+			Object.assign(that.originData, data);
+			that.form.wm = data.id;
+            that.count_rate = 100;
+			that.wm_batch = data.batch;
+			that.form.count_notok = 0;
+			that.form.count = that.form.count_ok = data.count;
+		},
+		handleTypeChange(){
+			if(this.form.type2==10){//抽检
+				this.form.count_sampling = this.originData.count;
+				this.form.count_sampling_ok = this.originData.count;
+			}else if(this.form.type2==20){
+				this.form.count = this.originData.count;
+				this.form.count_ok = this.originData.count;
+			}
+		},
+		getUsers(){
+			let that = this;
+			that.$API.system.user.list.req({ page: 0, depts__name: "6车间" }).then((res) => {
+				that.userList = res ;
+			});
+		},
+		handleCountChange(){
+			this.form.count_notok = 
+			this.count_notok_json.count_n_hs+
+			this.count_notok_json.count_n_cs+
+			this.count_notok_json.count_n_zz+
+			this.count_notok_json.count_n_tw+
+			this.count_notok_json.count_n_zdd+
+			this.count_notok_json.count_n_d+
+			this.count_notok_json.count_n_zw+
+			this.count_notok_json.count_n_dl+
+			this.count_notok_json.count_n_qp+
+			this.count_notok_json.count_n_bl+
+			this.count_notok_json.count_n_hw+
+			this.count_notok_json.count_n_yp+
+			this.count_notok_json.count_n_bp+
+			this.count_notok_json.count_n_sc+
+			this.count_notok_json.count_n_zjd+
+			this.count_notok_json.count_n_zjx+
+			this.count_notok_json.count_n_qx+
+			this.count_notok_json.count_n_js+
+			this.count_notok_json.count_n_tydd+
+			this.count_notok_json.count_n_sw+
+			this.count_notok_json.count_n_bhpcd+
+			this.count_notok_json.count_n_wq
+			this.count_notok_json.count_n_zt
+			this.count_notok_json.count_n_b
+			this.count_notok_json.count_n_qt
+			this.count_notok_json.count_n_pb
+			this.count_notok_json.count_n_dxt;
+			this.handleCountNotokChange();
+		},
+		handleCountNotokChange(){
+			if(this.form.type2==10){//抽检
+				this.form.count_sampling_ok = this.form.count_sampling - this.form.count_notok;
+				this.count_rate = ((this.form.count_sampling_ok/this.form.count_sampling)*100).toFixed(2);
+			}else if(this.form.type2==20){//全检
+				this.form.count_ok = this.form.count - this.form.count_notok;
+				this.count_rate = ((this.form.count_ok/this.form.count)*100).toFixed(2);
+			}
+		},
+		//提交
+		submit() {
+			let that = this;
+			this.$refs.dialogForm.validate(async (valid) => {
+				if (valid) {
+					that.isSaveing = true;
+					let count_notok = 
+					that.count_notok_json.count_n_hs+
+					that.count_notok_json.count_n_cs+
+					that.count_notok_json.count_n_zz+
+					that.count_notok_json.count_n_tw+
+					that.count_notok_json.count_n_zdd+
+					that.count_notok_json.count_n_d+
+					that.count_notok_json.count_n_zw+
+					that.count_notok_json.count_n_dl+
+					that.count_notok_json.count_n_qp+
+					that.count_notok_json.count_n_bl+
+					that.count_notok_json.count_n_hw+
+					that.count_notok_json.count_n_yp+
+					that.count_notok_json.count_n_bp+
+					that.count_notok_json.count_n_sc+
+					that.count_notok_json.count_n_zjd+
+					that.count_notok_json.count_n_zjx+
+					that.count_notok_json.count_n_qx+
+					that.count_notok_json.count_n_js+
+					that.count_notok_json.count_n_tydd+
+					that.count_notok_json.count_n_sw+
+					that.count_notok_json.count_n_bhpcd+
+					that.count_notok_json.count_n_wq+
+					that.count_notok_json.count_n_zt
+					that.count_notok_json.count_n_b
+					that.count_notok_json.count_n_qt
+					that.count_notok_json.count_n_pb
+					that.count_notok_json.count_n_dxt;
+					if(count_notok>that.form.count_notok){
+						that.$notify.error("不合格数量有问题");
+						that.isSaveing = false;
+					}else{
+						if(that.form.type2==10){//抽检
+							that.form.count_sampling_ok = that.form.count_sampling - that.form.count_notok;
+						}else{//全检
+							that.form.count_ok = that.form.count - that.form.count_notok;
+						}
+						that.form.count_notok_json = that.count_notok_json;
+						console.log('that.form',that.form)
+						that.$API.qm.ftestwork.create.req(that.form).then((res) => {
+							that.$API.qm.ftestwork.submit.req(res.id).then((res) => {
+								that.isSaveing = false;
+								that.visible = false;
+								that.$emit("success");
+								that.$message.success("操作成功");
+							})	
+						}).catch( err=>{
+							that.isSaveing = false;
+                        })
+					}
+				}
+			});
+		},
+	},
+};
+</script>
+
+<style></style>
diff --git a/src/views/wpm/mlog_dept10.vue b/src/views/wpm/mlog_dept10.vue
index 3b66e668..9a1885e6 100644
--- a/src/views/wpm/mlog_dept10.vue
+++ b/src/views/wpm/mlog_dept10.vue
@@ -180,13 +180,9 @@
 											type="primary"
 											icon="el-icon-plus"
 											@click="addMlog"
-											v-if="
-												currentMtask &&
-												currentMtask.state == 20
-											"
+											v-if="currentMtask &&currentMtask.state == 20"
 											v-auth="'mlog.create'"
-											>新增</el-button
-										>
+										>新增</el-button>
 									</div>
 								</el-header>
 								<el-main class="nopadding">
@@ -218,40 +214,19 @@
 											width="300"
 										>
 											<template #default="scope">
-												<div
-													v-if="
-														scope.row.mlogb.length >
-														0
-													"
-												>
+												<div v-if="scope.row.mlogb.length >0">
 													<div
-														v-for="item in scope.row
-															.mlogb"
+														v-for="item in scope.row.mlogb"
 														:key="item"
 														class="cateItem"
 														style=""
 													>
-														<span
-															>{{
-																item.material_out_name
-															}}|</span
-														>
-														<span
-															style="
-																color: darkblue;
-																font-weight: bold;
-															"
-															>{{
-																item.count_ok
-															}}</span
-														>
+														<span>{{item.material_out_name}}|</span>
+														<span style="color: darkblue;font-weight: bold;">{{item.count_ok}}</span>
 													</div>
 												</div>
 												<div v-else>
-													{{
-														scope.row
-															.material_out_name
-													}}
+													{{scope.row.material_out_name}}
 												</div>
 											</template>
 										</el-table-column>
@@ -265,17 +240,7 @@
 											prop="count"
 										>
 											<template #default="scope">
-												<span
-													>{{
-														Math.floor(
-															(scope.row
-																.count_ok /
-																scope.row
-																	.count_real) *
-																100
-														)
-													}}%</span
-												>
+												<span>{{Math.floor((scope.row.count_ok /scope.row.count_real) *100)}}%</span>
 											</template>
 										</el-table-column>
 										<el-table-column
@@ -348,66 +313,37 @@
 												<el-button
 													link
 													type="primary"
-													@click="
-														table_edit(scope.row)
-													"
+													@click="table_edit(scope.row)"
 													v-auth="'mlog.update'"
-													v-if="
-														scope.row.submit_time ==
-														null
-													"
+													v-if="scope.row.submit_time ==null"
 													>编辑
 												</el-button>
 												<el-button
 													link
 													type="danger"
-													@click="
-														table_del(scope.row)
-													"
+													@click="table_del(scope.row)"
 													v-auth="'mlog.delete'"
-													v-if="
-														scope.row.submit_time ==
-														null
-													"
+													v-if="scope.row.submit_time ==null"
 													>删除
 												</el-button>
 												<el-button
 													link
 													type="primary"
-													@click="
-														mlog_submit(scope.row)
-													"
+													@click="mlog_submit(scope.row)"
 													v-auth="'mlog.submit'"
-													v-if="
-														scope.row.submit_time ==
-														null
-													"
+													v-if="scope.row.submit_time ==null"
 													:loading="mlogHandleLoading"
 													>提交
 												</el-button>
 												<el-button
 													link
 													type="danger"
-													@click="
-														mlog_revert(scope.row)
-													"
+													@click="mlog_revert(scope.row)"
 													v-auth="'mlog.submit'"
-													v-if="
-														scope.row.submit_time !=
-														null
-													"
+													v-if="scope.row.submit_time !=null"
 													:loading="mlogHandleLoading"
 													>撤回
 												</el-button>
-												<!-- <el-button
-													link
-													type="success"
-													@click="
-														table_show(scope.row)
-													"
-												>
-													日志记录
-												</el-button> -->
 											</template>
 										</el-table-column>
 									</scTable>
@@ -568,7 +504,6 @@
 								row-key="id"
 								:params="paramsWm"
 								stripe
-								hidePagination
 							>
 								<el-table-column label="物料名" prop="material">
 									<template #default="scope">{{
@@ -601,6 +536,12 @@
 									width="80"
 								>
 								</el-table-column>
+								<!-- <el-table-column label="操作" fixed="right" align="right" width="55">
+									<template #default="scope">
+										<el-link link type="primary" @click.stop="inm_test(scope.row)">检验</el-link>
+										<el-link link type="success" @click.stop="inm_record(scope.row)">记录</el-link>
+									</template>
+								</el-table-column> -->
 							</scTable>
 						</el-main>
 					</el-container>
@@ -666,6 +607,19 @@
 				@choseChange="choseChange"
 			></materials>
 		</el-dialog>
+		<middle-dialog
+			ref="inmTestDialog"
+			v-if="dialogInmTest"
+			@closed="dialogInmTest = false">
+		</middle-dialog>
+		<check-drawer
+			ref="checkDrawers"
+			v-if="visibleCheckDrawer"
+			:wm="wm"
+			:deptName="activeName"
+			@closed="visibleCheckDrawer = false"
+		>
+		</check-drawer>
 	</el-container>
 </template>
 
@@ -674,12 +628,16 @@ import handoverDialog from "./handover_form.vue";
 import saveDialog from "./worktask_form.vue";
 import showDrawer from "./mlog_drawer.vue";
 import materials from "./../mtm/materials.vue";
+import checkDrawer from "./check_drawer.vue";
+import middleDialog from "./middle_test.vue";
 export default {
 	components: {
 		saveDialog,
 		showDrawer,
 		materials,
-		handoverDialog
+		handoverDialog,
+		middleDialog,
+		checkDrawer,
 	},
 	data() {
 		return {
@@ -717,6 +675,7 @@ export default {
 				material: "",
 			},
 			materialType: "wm",
+			wm:'',
 			mgroup: "",
 			mlogId: "",
 			mtaskDate: "",
@@ -725,6 +684,8 @@ export default {
 			queryMtaskState: false,
 			materialsVisible: false,
 			dialogHandover:false,
+			dialogInmTest:false,
+			visibleCheckDrawer:false,
 		};
 	},
 	mounted() {
@@ -818,13 +779,12 @@ export default {
 			this.$refs.table_mtask.queryData(this.queryMtask);
 		},
 		handover_submit(row) {
-			this.$API.wpm.handover.submit
-				.req(row.id)
-				.then((res) => {
-					this.$refs.table_handover.refresh();
-					this.$message.success("操作成功");
-				})
-				.catch((e) => {});
+			let that = this;
+			that.$API.wpm.handover.submit.req(row.id).then((res) => {
+				that.$refs.table_wm.refresh();
+				that.$refs.table_handover.refresh();
+				that.$message.success("操作成功");
+			}).catch((e) => {});
 		},
 		getMlogs() {
 			this.$API.wpm.mlog.list
@@ -870,6 +830,7 @@ export default {
 			}
 		},
 		table_submit(row) {
+			let that = this;
 			let lengths = row.mlogs.length,
 				infoText = "";
 			if (lengths > 0) {
@@ -877,18 +838,16 @@ export default {
 			} else {
 				infoText = "该任务没有日志，确定提交吗？";
 			}
-			this.$confirm(infoText, "提示", {
+			that.$confirm(infoText, "提示", {
 				type: "warning",
 			}).then(() => {
-				this.$API.pm.mtask.submit
-					.req(row.id)
-					.then((res) => {
-						this.$message.success("操作成功");
-						this.$refs.table_wm.refresh();
-						this.$refs.table_mtask.refresh();
-						this.mtaskClick(this.currentMtask);
-					})
-					.catch((err) => {});
+				that.$API.pm.mtask.submit.req(row.id).then((res) => {
+					that.$message.success("操作成功");
+					that.$refs.table_wm.refresh();
+					that.$refs.table_mtask.refresh();
+					that.mtaskClick(that.currentMtask);
+					that.currentMtask.state = 20
+				}).catch((err) => {});
 			});
 		},
 		// table_submit(row) {
@@ -940,18 +899,19 @@ export default {
 			this.getMlogs();
 		},
 		mlog_submit(row) {
-			this.mlogHandleLoading = true;
-			this.$API.wpm.mlog.submit
+			let that = this;
+			that.mlogHandleLoading = true;
+			that.$API.wpm.mlog.submit
 				.req(row.id)
 				.then((res) => {
-					this.$message.success("操作成功");
-					this.mtaskClick(this.currentMtask);
-					this.$refs.table_wm.refresh();
-					this.$refs.table_mtask.refresh();
-					this.mlogHandleLoading = false;
+					that.$message.success("操作成功");
+					that.mtaskClick(that.currentMtask);
+					that.$refs.table_wm.refresh();
+					that.$refs.table_mtask.refresh();
+					that.mlogHandleLoading = false;
 				})
 				.catch((err) => {
-					this.mlogHandleLoading = false;
+					that.mlogHandleLoading = false;
 				});
 		},
 		//从生产日志生成交接记录
@@ -962,6 +922,20 @@ export default {
 			})
 		},
 		handleHandoverSuccess(){},
+		//获取当前车间物料的检验记录
+		inm_record(row){
+			this.wm = row.id;
+			this.visibleCheckDrawer = true;
+			this.$nextTick(() => {
+				this.$refs.checkDrawers.open();
+			});
+		},
+		inm_test(row){
+			this.dialogInmTest = true;
+			this.$nextTick(() => {
+				this.$refs.inmTestDialog.open('10车间').setData(row);
+			})
+		},
 	},
 };
 </script>
diff --git a/src/views/wpm/mlog_dept6.vue b/src/views/wpm/mlog_dept6.vue
index adb4fd13..cdcf1076 100644
--- a/src/views/wpm/mlog_dept6.vue
+++ b/src/views/wpm/mlog_dept6.vue
@@ -90,8 +90,8 @@
 								ref="tableprocess"
 								row-key="id"
 								stripe
-								:hideDo="hideDo"
-								:data="processList"
+								:params="paramsProcess"
+								:apiObj="apiObjProcess"
 								@row-click="itemClick"
 							>
 								<el-table-column
@@ -131,9 +131,7 @@
 									<template #default="scope">
 										<el-link
 											type="primary"
-											@click.stop="
-												table_submit(scope.row)
-											"
+											@click.stop="table_submit(scope.row)"
 											v-auth="'mtask.submit'"
 											v-if="
 												scope.row.state != 40 &&
@@ -223,9 +221,7 @@
 									prop="submit_time"
 								>
 									<template #default="scope">
-										<span v-if="scope.row.submit_time"
-											>是</span
-										>
+										<span v-if="scope.row.submit_time">是</span>
 										<span v-else>否</span>
 									</template>
 								</el-table-column>
@@ -233,14 +229,13 @@
 									label="操作"
 									fixed="right"
 									align="left"
+									width="60"
 								>
 									<template #default="scope">
 										<el-button
 											link
 											type="primary"
-											@click.stop="
-												handover_submit(scope.row)
-											"
+											@click.stop="handover_submit(scope.row)"
 											v-auth="'handover.submit'"
 											v-if="scope.row.submit_time == null"
 										>
@@ -298,7 +293,6 @@
 								:params="paramsWm"
 								:query="queryWm"
 								stripe
-								hidePagination
 							>
 								<el-table-column label="物料名" prop="material">
 									<template #default="scope">
@@ -315,21 +309,20 @@
 										{{ scope.row.material_.model }}
 									</template>
 								</el-table-column>
-								<el-table-column
-									label="已到工序"
-									prop="material"
-								>
-									<template #default="scope">{{
-										scope.row.material_.process_name
-									}}</template>
+								<el-table-column label="已到工序" prop="material">
+									<template #default="scope">
+										{{scope.row.material_.process_name}}
+									</template>
 								</el-table-column>
-								<el-table-column label="批次" prop="batch">
+								<el-table-column label="批次" prop="batch" show-overflow-tooltip>
 								</el-table-column>
-								<el-table-column
-									label="数量"
-									prop="count"
-									width="80"
-								>
+								<el-table-column label="数量" prop="count" width="80">
+								</el-table-column>
+								<el-table-column label="操作" fixed="right" align="right" width="55">
+									<template #default="scope">
+										<el-link link type="primary" @click.stop="inm_test(scope.row)">检验</el-link>
+										<el-link link type="success" @click.stop="inm_record(scope.row)">记录</el-link>
+									</template>
 								</el-table-column>
 							</scTable>
 						</el-main>
@@ -338,13 +331,26 @@
 			</el-container>
 		</el-main>
 	</el-container>
+	<middle-dialog
+		ref="inmTestDialog"
+		v-if="dialogInmTest"
+		@closed="dialogInmTest = false">
+	</middle-dialog>
 	<showDrawer
 		ref="showDrawer"
 		v-if="visibleDrawer"
 		:mtaskId="mtaskId"
-		@closed="visibleDrawer = false"
+		@closed="showDrawerClose"
 	>
 	</showDrawer>
+	<check-drawer
+		ref="checkDrawers"
+		v-if="visibleCheckDrawer"
+		:wm="wm"
+		deptName="6车间"
+		@closed="visibleCheckDrawer = false"
+	>
+	</check-drawer>
 	<el-dialog title="选择物料" v-model="materialsVisible" width="90%">
 		<materials
 			style="height: 500px"
@@ -363,14 +369,19 @@
 </template>
 
 <script>
+import checkDrawer from "./check_drawer.vue";
+import middleDialog from "./middle_test.vue";
 import handoverDialog from "./handover_form.vue";
 import showDrawer from "./mlog_dept6_detail.vue";
 import materials from "./../mtm/materials.vue";
 export default {
 	components: {
-		showDrawer,
 		materials,
-		handoverDialog
+		showDrawer,
+		middleDialog,
+		checkDrawer,
+		handoverDialog,
+		
 	},
 	data() {
 		return {
@@ -387,6 +398,7 @@ export default {
 				34: "已终止",
 				40: "已提交",
 			},
+			clickRow:{},
 			wmaterials: [],
 			hideDo: true,
 			materialsVisible: false,
@@ -399,6 +411,13 @@ export default {
 			paramsHandover: {
 				recive_dept__name: "6车间",
 			},
+			apiObjProcess:null,
+			paramsProcess:{
+				start_date: "",
+				end_date: "",
+				mgroup__belong_dept__name: "6车间",
+				utask: "",
+			},
 			queryHandover: {
 				search: "",
 				material: "",
@@ -406,7 +425,6 @@ export default {
 			paramsWm: {
 				belong_dept__name: "6车间",
 				count__gte: 1,
-				page: 0,
 			},
 			queryWm: {
 				search: "",
@@ -427,6 +445,8 @@ export default {
 			materialType: "wm",
 			visibleDrawer: false,
 			dialogHandover:false,
+			dialogInmTest:false,
+			visibleCheckDrawer:false,
 		};
 	},
 	mounted() {
@@ -469,16 +489,12 @@ export default {
 		//点击任务
 		rowClick(row) {
 			let that = this;
-			this.$API.pm.mtask.list
-				.req({
-					start_date: row.start_date,
-					end_date: row.end_date,
-					mgroup__belong_dept__name: "6车间",
-					utask: row.utask,
-				})
-				.then((res) => {
-					that.processList = res.results;
-				});
+			that.clickRow = row;
+			that.paramsProcess.start_date = row.start_date;
+			that.paramsProcess.end_date = row.end_date;
+			that.paramsProcess.utask = row.utask;
+			that.apiObjProcess = that.$API.pm.mtask.list;
+			that.$refs.tableprocess.refresh();
 		},
 		//工序详情
 		itemClick(row) {
@@ -508,26 +524,23 @@ export default {
 			that.$confirm(infoText, "提示", {
 				type: "warning",
 			}).then(() => {
-				that.$API.pm.mtask.submit
-					.req(row.id)
-					.then((res) => {
-						that.$message.success("操作成功");
-						that.$refs.table_mtask.refresh();
-						that.mtaskClick(that.currentMtask);
-					})
-					.catch((err) => {});
+				that.$API.pm.mtask.submit.req(row.id).then((res) => {
+					that.$message.success("操作成功");
+					that.$refs.table.refresh();
+					that.$refs.table_wm.refresh();
+					that.$refs.tableprocess.refresh();
+					that.$refs.table_handover.refresh();
+					that.mtaskClick(that.currentMtask);
+				}).catch((err) => {});
 			});
 		},
 		handover_submit(row) {
 			let that = this;
-			that.$API.wpm.handover.submit
-				.req(row.id)
-				.then((res) => {
-					that.$message.success("操作成功");
-					that.$refs.table_handover.refresh();
-					that.$refs.table_wm.refresh();
-				})
-				.catch((err) => {});
+			that.$API.wpm.handover.submit.req(row.id).then((res) => {
+				that.$message.success("操作成功");
+				that.$refs.table_handover.refresh();
+				that.$refs.table_wm.refresh();
+			}).catch((err) => {});
 		},
 		//从生产日志生成交接记录
 		addHandover() {
@@ -536,6 +549,28 @@ export default {
 				this.$refs.handoverDialog.open('add');
 			})
 		},
+		inm_test(row){
+			this.dialogInmTest = true;
+			this.$nextTick(() => {
+				this.$refs.inmTestDialog.open('6车间').setData(row);
+			})
+		},
+		//获取当前车间物料的检验记录
+		inm_record(row){
+			this.wm = row.id;
+			this.visibleCheckDrawer = true;
+			this.$nextTick(() => {
+				this.$refs.checkDrawers.open();
+			});
+		},
+		showDrawerClose(){
+			let that = this;
+			that.visibleDrawer = false;
+			that.$refs.table.refresh();
+			that.$refs.table_wm.refresh();
+			that.$refs.tableprocess.refresh();
+			that.$refs.table_handover.refresh();
+		},
 	},
 };
 </script>
diff --git a/src/views/wpm/mlog_dept7.vue b/src/views/wpm/mlog_dept7.vue
index 2c9bb9eb..f9e635e8 100644
--- a/src/views/wpm/mlog_dept7.vue
+++ b/src/views/wpm/mlog_dept7.vue
@@ -164,10 +164,7 @@
 											type="primary"
 											icon="el-icon-plus"
 											@click="addMlog"
-											v-if="
-												currentMtask &&
-												currentMtask.state == 20
-											"
+											v-if="currentMtask &&currentMtask.state == 20"
 											v-auth="'mlog.create'"
 											>新增</el-button
 										>
@@ -193,15 +190,7 @@
 											min-width="120"
 										>
 											<template #default="scope">
-												<span
-													v-if="
-														scope.row.material_out_
-													"
-													>{{
-														scope.row.material_out_
-															.name
-													}}</span
-												>
+												<span v-if="scope.row.material_out_">{{scope.row.material_out_.name}}</span>
 											</template>
 										</el-table-column>
 										<el-table-column
@@ -215,14 +204,8 @@
 										>
 											<template #default="scope">
 												<span
-													v-if="
-														scope.row.material_out_
-													"
-													>{{
-														scope.row.material_out_
-															.specification
-													}}</span
-												>
+													v-if="scope.row.material_out_"
+													>{{scope.row.material_out_.specification}}</span>
 											</template>
 										</el-table-column>
 										<el-table-column
@@ -240,17 +223,7 @@
 											prop="count"
 										>
 											<template #default="scope">
-												<span
-													>{{
-														Math.floor(
-															(scope.row
-																.count_ok /
-																scope.row
-																	.count_real) *
-																100
-														)
-													}}%</span
-												>
+												<span>{{Math.floor((scope.row.count_ok /scope.row.count_real) *100)}}%</span>
 											</template>
 										</el-table-column>
 										<el-table-column
@@ -318,66 +291,37 @@
 												<el-button
 													link
 													type="primary"
-													@click="
-														table_edit(scope.row)
-													"
+													@click="table_edit(scope.row)"
 													v-auth="'mlog.update'"
-													v-if="
-														scope.row.submit_time ==
-														null
-													"
+													v-if="scope.row.submit_time ==null"
 													>编辑
 												</el-button>
 												<el-button
 													link
 													type="danger"
-													@click="
-														table_del(scope.row)
-													"
+													@click="table_del(scope.row)"
 													v-auth="'mlog.delete'"
-													v-if="
-														scope.row.submit_time ==
-														null
-													"
+													v-if="scope.row.submit_time ==null"
 													>删除
 												</el-button>
 												<el-button
 													link
 													type="primary"
-													@click="
-														mlog_submit(scope.row)
-													"
+													@click="mlog_submit(scope.row)"
 													v-auth="'mlog.submit'"
-													v-if="
-														scope.row.submit_time ==
-														null
-													"
+													v-if="scope.row.submit_time ==null"
 													:loading="mlogHandleLoading"
 													>提交
 												</el-button>
 												<el-button
 													link
 													type="danger"
-													@click="
-														mlog_revert(scope.row)
-													"
+													@click="mlog_revert(scope.row)"
 													v-auth="'mlog.submit'"
-													v-if="
-														scope.row.submit_time !=
-														null
-													"
+													v-if="scope.row.submit_time !=null"
 													:loading="mlogHandleLoading"
 													>撤回
 												</el-button>
-												<!-- <el-button
-													link
-													type="success"
-													@click="
-														table_show(scope.row)
-													"
-												>
-													日志记录
-												</el-button> -->
 											</template>
 										</el-table-column>
 									</scTable>
@@ -538,7 +482,6 @@
 								row-key="id"
 								:params="paramsWm"
 								stripe
-								hidePagination
 							>
 								<el-table-column label="物料名" prop="material">
 									<template #default="scope">{{
@@ -571,6 +514,12 @@
 									width="80"
 								>
 								</el-table-column>
+								<!-- <el-table-column label="操作" fixed="right" align="right" width="55">
+									<template #default="scope">
+										<el-link link type="primary" @click.stop="inm_test(scope.row)">检验</el-link>
+										<el-link link type="success" @click.stop="inm_record(scope.row)">记录</el-link>
+									</template>
+								</el-table-column> -->
 							</scTable>
 						</el-main>
 					</el-container>
@@ -613,9 +562,25 @@
 				@choseChange="choseChange"
 			></materials>
 		</el-dialog>
+		<middle-dialog
+			ref="inmTestDialog"
+			v-if="dialogInmTest"
+			@closed="dialogInmTest = false">
+		</middle-dialog>
+		<check-drawer
+			ref="checkDrawers"
+			v-if="visibleCheckDrawer"
+			:wm="wm"
+			:deptName="activeName"
+			@closed="visibleCheckDrawer = false"
+		>
+		</check-drawer>
 	</el-container>
+
 </template>
 <script>
+import checkDrawer from "./check_drawer.vue";
+import middleDialog from "./middle_test.vue";
 import handoverDialog from "./handover_form.vue";
 import saveDialog from "./worktask_form.vue";
 import showDrawer from "./mlog_drawer.vue";
@@ -626,6 +591,8 @@ export default {
 		saveDialog,
 		showDrawer,
 		materials,
+		middleDialog,
+		checkDrawer,
 	},
 	data() {
 		return {
@@ -661,11 +628,14 @@ export default {
 			},
 			materialType: "wm",
 			mlogs: [],
+			wm:'',
 			mlogId: "",
 			mgroup: "",
 			material_out: "",
 			material_model: "",
+			dialogInmTest:false,
 			materialsVisible: false,
+			visibleCheckDrawer:false,
 		};
 	},
 	mounted() {
@@ -787,13 +757,12 @@ export default {
 			this.$refs.table_mtask.queryData(this.queryMtask);
 		},
 		handover_submit(row) {
-			this.$API.wpm.handover.submit
-				.req(row.id)
-				.then((res) => {
-					this.$refs.table_handover.refresh();
-					this.$message.success("操作成功");
-				})
-				.catch((e) => {});
+			let that = this;
+			that.$API.wpm.handover.submit.req(row.id).then((res) => {
+				that.$refs.table_handover.refresh();
+				that.$refs.table_wm.refresh();
+				that.$message.success("操作成功");
+			}).catch((e) => {});
 		},
 		getMlogs() {
 			this.$API.wpm.mlog.list
@@ -813,6 +782,7 @@ export default {
 			this.getMlogs();
 		},
 		mtask_submit(row) {
+			let that = this;
 			let lengths = row.mlogs.length,
 				infoText = "";
 			if (lengths > 0) {
@@ -820,17 +790,16 @@ export default {
 			} else {
 				infoText = "该任务没有日志，确定提交吗？";
 			}
-			this.$confirm(infoText, "提示", {
+			that.$confirm(infoText, "提示", {
 				type: "warning",
 			}).then(() => {
-				this.$API.pm.mtask.submit
-					.req(row.id)
-					.then((res) => {
-						this.$message.success("操作成功");
-						this.$refs.table_mtask.refresh();
-						this.mtaskClick(this.currentMtask);
-					})
-					.catch((err) => {});
+				that.$API.pm.mtask.submit.req(row.id).then((res) => {
+					that.$message.success("操作成功");
+					that.$refs.table_mtask.refresh();
+					that.$refs.table_wm.refresh();
+					that.mtaskClick(that.currentMtask);
+					that.currentMtask.state = 20
+				}).catch((err) => {});
 			});
 		},
 		handleSaveSuccess() {
@@ -845,17 +814,19 @@ export default {
 			});
 		},
 		mlog_submit(row) {
-			this.mlogHandleLoading = true;
-			this.$API.wpm.mlog.submit
+			let that = this;
+			that.mlogHandleLoading = true;
+			that.$API.wpm.mlog.submit
 				.req(row.id)
 				.then((res) => {
-					this.$message.success("操作成功");
-					this.mtaskClick(this.currentMtask);
-					this.$refs.table_wm.refresh();
-					this.mlogHandleLoading = false;
+					that.$message.success("操作成功");
+					that.mtaskClick(that.currentMtask);
+					that.$refs.table_wm.refresh();
+					that.getMlogs();
+					that.mlogHandleLoading = false;
 				})
 				.catch((err) => {
-					this.mlogHandleLoading = false;
+					that.mlogHandleLoading = false;
 				});
 		},
 		//从生产日志生成交接记录
@@ -865,6 +836,20 @@ export default {
 				this.$refs.handoverDialog.open('add');
 			})
 		},
+		//获取当前车间物料的检验记录
+		inm_record(row){
+			this.wm = row.id;
+			this.visibleCheckDrawer = true;
+			this.$nextTick(() => {
+				this.$refs.checkDrawers.open();
+			});
+		},
+		inm_test(row){
+			this.dialogInmTest = true;
+			this.$nextTick(() => {
+				this.$refs.inmTestDialog.open('7车间').setData(row);
+			})
+		},
 	},
 };
 </script>
diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue
index 0ed3beaf..8680b343 100644
--- a/src/views/wpm_bx/handover_form.vue
+++ b/src/views/wpm_bx/handover_form.vue
@@ -26,20 +26,6 @@
 						/>
 					</el-form-item>
 				</el-col>
-				<!-- <el-col :md="12" :sm="24">
-					<el-form-item label="交接数量" width="100">
-						<el-input-number
-							v-model="form.count"
-							controls-position="right"
-							:min="0"
-							step="1"
-							:step-strictly="true"
-							style="width: 100%"
-							placeholder="交接数量"
-						>
-						</el-input-number>
-					</el-form-item>
-				</el-col> -->
 				<el-col :md="12" :sm="24">
 					<el-form-item label="交送人" prop="send_user">
 						<el-select
@@ -58,61 +44,6 @@
 						</el-select>
 					</el-form-item>
 				</el-col>
-				<!-- <el-col :md="12" :sm="24" v-if="type==30">
-					<el-form-item label="接收部门" prop="recive_dept">
-						<el-select
-							v-model="form.recive_dept"
-							placeholder="接收部门"
-							clearable
-							style="width: 100%"
-							@change="getUserList3"
-						>
-							<el-option
-								v-for="item in deptOptions"
-								:key="item.id"
-								:label="item.name"
-								:value="item.id"
-							></el-option>
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :md="12" :sm="24" v-else>
-					<el-form-item label="接收工段" prop="recive_mgroup">
-						<el-select
-							v-model="form.recive_mgroup"
-							placeholder="接收工段"
-							clearable
-							style="width: 100%"
-							:disabled="type==40"
-							@change="getUserList2"
-						>
-							<el-option
-								v-for="item in mgroupOptions"
-								:key="item.id"
-								:label="item.name"
-								:value="item.id"
-							></el-option>
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :md="12" :sm="24">
-					<el-form-item label="接收人" prop="recive_user">
-						<el-select
-							v-model="form.recive_user"
-							placeholder="接收人"
-							clearable
-							filterable
-							style="width: 100%"
-						>
-							<el-option
-								v-for="item in userList2"
-								:key="item.id"
-								:label="item.name"
-								:value="item.id"
-							/>
-						</el-select>
-					</el-form-item>
-				</el-col> -->
 				<el-col :md="12" :sm="24">
 					<el-form-item label="更改批次">	
 						<el-switch v-model="change_batch"></el-switch>
@@ -428,18 +359,23 @@ export default {
 		let day = date.getDate();
 		that.form.handle_date = year + "-" + month + "-" + day;
 		that.form.send_mgroup = that.mgroupId;
+		// type=10 物料交接   物料都可交接，接收工段有限制
+		// type=20 物料返工 不合格品交接，接收工段为该工艺流程中的工段
+		// type=30 物料检验   合格品交接，检验部接收
+		// type=40 废品入库   不合格品交接，接收工段固定为废品库
+		// type=50 改版       灵活无限制
+		//获取当前工段/部门交送人
 		if(that.mgroupName=="size"||that.mgroupName=="facade"){//检验部交接
-			that.$API.system.user.list
-				.req({ page: 0, posts__code__contains: "check" })
-				.then((res) => {
-					that.userList = res;
-				});
+			that.$API.system.user.list.req({ page: 0, posts__code__contains: "check" }).then((res) => {
+				that.userList = res;
+			});
 		}else if(that.type==20&&that.mgroupName=='废品库'){//废品交接
 			that.getCkUserList();
 		}else{
 			that.deptID = that.$TOOL.data.get('gx_deptID');
 			that.getUserList();
 		}
+		//获取交送物料
 		if((that.type==20&&that.mgroupName!=='废品库')||that.type==40){
 			that.getMaterialNotok();
 		}else if(that.type==20&&that.mgroupName=='废品库'){
@@ -447,7 +383,10 @@ export default {
 		}else{
 			that.getMaterial();
 		}
-		that.getDeptOptions();
+		if(that.type==30){
+			that.getDeptOptions();
+		}
+		
 		that.getMgroupOptions();
 	},
 	methods: {
@@ -464,11 +403,9 @@ export default {
 		},
 		//获取部门列表
 		getDeptOptions() {
-			this.$API.system.dept.list
-				.req({ page: 0, type: "dept" })
-				.then((res) => {
-					this.deptOptions = res;
-				});
+			this.$API.system.dept.list.req({ page: 0, type: "dept" }).then((res) => {
+				this.deptOptions = res;
+			});
 		},
 		//获取工段列表
 		getMgroupOptions() {
@@ -484,8 +421,6 @@ export default {
 					that.getCkUserList();//废品库接收人
 				}else if(that.type==30){
 					this.getUserList3();
-				}else{
-					this.getUserList2();
 				}
 			});
 		},
@@ -555,23 +490,28 @@ export default {
 		//获取接收工段人员
 		getUserList2() {
 			let that = this;
-			this.mgroupOptions.forEach(item => {
-				if(item.id==that.form.recive_mgroup){
-					let deptID = item.belong_dept;
-					this.$API.system.user.list.req({ belong_dept: deptID, page: 0 }).then((res) => {
+			if(that.mode=="add"){
+				that.$API.mtm.mgroup.item.req(that.form.recive_mgroup).then((res) => {
+					this.$API.system.user.list.req({ depts: res.belong_dept, page: 0 }).then((res) => {
 						that.userList2 = res;
 					});
-				}
-			});
+				})
+			}else{
+				this.mgroupOptions.forEach(item => {
+					if(item.id==that.form.recive_mgroup){
+						this.$API.system.user.list.req({ depts: item.belong_dept, page: 0 }).then((res) => {
+							that.userList2 = res;
+						});
+					}
+				});
+			}
 		},
 		//获取接收部门人员
 		getUserList3() {
 			let that = this;
-			this.$API.system.user.list
-				.req({ depts: that.form.recive_dept, page: 0 })
-				.then((res) => {
-					that.userList2 = res;
-				});
+			this.$API.system.user.list.req({ depts: that.form.recive_dept, page: 0 }).then((res) => {
+				that.userList2 = res;
+			});
 		},
 		addMaterial(){
 			this.addShow = true;
@@ -679,12 +619,27 @@ export default {
 		},
 		//表单注入数据
 		setData(data) {
+			let that = this;
 			this.totalCount = data.count?data.count:data.handoverb.count;
 			Object.assign(this.form, data);
 			if(data.type==30){
 				this.getUserList3();
 			}else{
-				this.getUserList2();
+				this.$API.system.user.list.req({ depts: data.recive_dept, page: 0 }).then((res) => {
+					that.userList2 = res;
+				});
+				setTimeout(() => {
+				    let arr =that.userList2.filter((item) => {
+						return item.id == data.recive_user
+					})
+					if(arr.length>0){}else{
+						let obj = {};
+						obj.id = data.recive_user;
+						obj.name = data.recive_user_name;
+						that.userList2.push(obj);
+					}
+				},500)
+				
 			}
 			if(data.new_batch!==''&&data.new_batch!==undefined&&data.new_batch!==null){
 				this.change_batch = true;
diff --git a/src/views/wpm_bx/inm.vue b/src/views/wpm_bx/inm.vue
index 318a0535..bfbcf994 100644
--- a/src/views/wpm_bx/inm.vue
+++ b/src/views/wpm_bx/inm.vue
@@ -168,13 +168,13 @@
 			@success="handleinmSuccess"
 		>
 		</save-dialog>
-		<el-drawer v-model="wprVisibleDrawer" :size="'50%'">
+		<el-drawer v-model="wprVisibleDrawer" :size="'70%'">
 			<template #header>
 				<h4>关联产品</h4>
 			</template>
 			<template #default>
 				<scTable ref="wprTable" hidePagination :data="wprList">
-					<el-table-column label="产品编号" prop="number"></el-table-column>
+					<el-table-column label="产品编号" prop="number" min-width="100px"></el-table-column>
 					<el-table-column label="记录数据" prop="oinfo">
 						<template #default="scope">
 							<div v-for="(item,index) in scope.row.oinfo" :key="item.id">
@@ -183,7 +183,7 @@
 							</div>
 						</template>
 					</el-table-column>
-					<el-table-column label="缺陷项">
+					<el-table-column label="缺陷项"  min-width="200px">
 						<template #default="scope">
 							<span v-for="item in scope.row.wprdefect" :key="item.id">
 								<el-tag
@@ -199,7 +199,7 @@
 						width="120"
 					>
 						<template #default="scope">
-							<el-link :underline="false"  @click="printMaterial(scope.row,'wpr')" type="primary">物料标签</el-link>
+							<el-link :underline="false"  @click="printMaterial(scope.row,'wpr')" type="primary">打印标签</el-link>
 						</template>
 					</el-table-column>
 				</scTable>
diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue
index fdc7ed37..75fa6c89 100644
--- a/src/views/wpm_bx/mlog_detail.vue
+++ b/src/views/wpm_bx/mlog_detail.vue
@@ -300,7 +300,7 @@
 							<el-link
 								:underline="false"
 								type="primary"
-								v-if="mlogItem.submit_time == null&&mlogItem.material_out_&&mlogItem.material_out_.tracking==20"
+								v-if="mlogItem.material_out_&&mlogItem.material_out_.tracking==20"
 								@click="table_out_check_single(scope.row,'outs')"
 							>详情</el-link>
 						</template>
@@ -356,6 +356,7 @@
 				ref="checkDialogSingle"
 				:mlogb="mlogb"
 				:wm = "wm"
+				:isSubmit="isSubmit"
 				:batchNumber="batchNumber"
 				:handle_user="handle_user"
 				:handle_date="handle_date"
@@ -482,6 +483,7 @@ export default {
 			qct:null,
 			defectlist:[],
 			batchNumber:'',
+			isSubmit:false,
 		};
 	},
 	mounted() {
@@ -597,6 +599,7 @@ export default {
 			let that = this;
 			that.mlogb = row.id;
 			that.wm = row.wm_in;
+			that.isSubmit = that.mlogItem.submit_time == null ? false : true;
 			that.batchNumber = row.batch;
 			that.handle_date=that.mlogItem.handle_date;
 			that.handle_user = that.mlogItem.handle_user;
diff --git a/src/views/wpm_bx/mlog_form.vue b/src/views/wpm_bx/mlog_form.vue
index a967ce1b..012d8b1f 100644
--- a/src/views/wpm_bx/mlog_form.vue
+++ b/src/views/wpm_bx/mlog_form.vue
@@ -17,7 +17,7 @@
 					style="padding: 0 10px"
 				>
 					<el-row>
-						<el-col :md="12" :sm="24">
+						<el-col :md="12" :sm="12" :xs="24">
 							<el-form-item label="生产类型" prop="mtype">
 								<el-select
 									v-model="form.mtype"
@@ -35,7 +35,7 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24" v-if="form.mtype == 20">
+						<el-col  :md="12" :sm="12" :xs="24" v-if="form.mtype == 20">
 							<el-form-item
 								label="外协单位"
 								prop="supplier"
@@ -57,7 +57,7 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24" v-if="mode=='add'">
+						<el-col :md="12" :sm="12" :xs="24" v-if="mode=='add'">
 							<el-form-item label="关联任务" prop="mtask">
 								<el-select
 									v-model="form.mtask"
@@ -76,7 +76,7 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24">
+						<el-col :md="12" :sm="12" :xs="24">
 							<el-form-item label="工艺路线">
 								<el-select
 									v-model="form.route"
@@ -97,7 +97,7 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24">
+						<el-col :md="12" :sm="12" :xs="24">
 							<el-form-item label="生产设备">
 								<el-select
 									v-model="form.equipment"
@@ -119,7 +119,7 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24" v-for="item in testitems" :key="item.id">
+						<el-col :md="12" :sm="12" :xs="24" v-for="item in testitems" :key="item.id">
 							<el-form-item :label="item.name">
 								<el-input-number
 									v-if="item.field_type=='input-number'"
@@ -174,7 +174,7 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24">
+						<el-col :md="12" :sm="12" :xs="24">
 							<el-form-item
 								label="开始时间"
 								prop="work_start_time"
@@ -185,11 +185,12 @@
 									type="datetime"
 									value-format="YYYY-MM-DD HH:mm:ss"
 									style="width: 100%"
+									popper-append-to-body
 								/>
 							</el-form-item>
 						</el-col>
 
-						<el-col :md="12" :sm="24">
+						<el-col :md="12" :sm="12" :xs="24">
 							<el-form-item label="结束时间" prop="work_end_time">
 								<el-date-picker
 									v-model="form.work_end_time"
@@ -197,10 +198,11 @@
 									value-format="YYYY-MM-DD HH:mm:ss"
 									style="width: 100%"
 									:disabledDate="disabledDateFn"
+									popper-append-to-body
 								/>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24">
+						<el-col :md="12" :sm="12" :xs="24">
 							<el-form-item label="操作人">
 								<ehsSelect
 									v-model="form.handle_user"
@@ -210,7 +212,7 @@
 								></ehsSelect>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24">
+						<el-col :md="12" :sm="12" :xs="24">
 							<el-form-item label="备注">
 								<el-input
 									v-model="form.note"
diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue
index 2f0bb8d6..1e8d1ba4 100644
--- a/src/views/wpm_bx/mlogbw_check.vue
+++ b/src/views/wpm_bx/mlogbw_check.vue
@@ -16,7 +16,7 @@
 				:addTemplate="addTemplate"
 				placeholder="暂无数据"
 			>
-				<el-table-column prop="number" label="物料编号">
+				<el-table-column prop="number" label="物料编号" fixed min-width="120px">
 					<template #default="scope">
 						<span v-if="!scope.row.isEdit">{{ scope.row.number }}</span>
 						<el-input v-if="scope.row.isEdit&&mode == 'outs'" v-model="scope.row.number" placeholder="物料编号"></el-input>
@@ -38,7 +38,7 @@
 						</el-select>
 					</template>
 				</el-table-column>
-				<el-table-column prop="note" :label="item.testitem_name" v-for="item in qct_testitems" :key="item.id">
+				<el-table-column prop="note" :label="item.testitem_name" v-for="item in qct_testitems" :key="item.id" width="150px">
 					<template #default="scope">
 						<el-input-number
 							v-if="item.testitem_field_type=='input-number'"
@@ -103,7 +103,7 @@
 						</el-select>
 					</template>
 				</el-table-column>
-				<el-table-column prop="note" :label="item.defect_name" v-for="item in qct_defects" :key="item.id" width="70px">
+				<el-table-column prop="note" :label="item.defect_name" v-for="item in qct_defects" :key="item.id" width="80px">
 					<template #default="scope">
 						<el-switch 
 							:disabled="!scope.row.isEdit"
@@ -119,39 +119,37 @@
 						<el-input v-else v-model="scope.row.note" placeholder="备注"></el-input>
 					</template>
 				</el-table-column>
-				<el-table-column prop="open" label="操作" width="60" align="center">
+				<el-table-column prop="open" label="操作" width="90" align="center" fixed="right" v-if="!isSubmit">
 					<template #default="scope">
-						<el-button
+						<el-link
 							v-if="scope.row.isEdit"
-							text
 							type="primary"
 							size="small"
 							@click="formTableSave(scope.row)"
-							>保存</el-button
+							>保存</el-link
 						>
-						<el-button
+						<el-link
 							v-if="scope.row.isEdit"
-							text
-							type="primary"
+							type="danger"
 							size="small"
+							style="margin-left: 5px;"
 							@click="formTableCancel(scope.row)"
-							>取消</el-button
+							>取消</el-link
 						>
-						<el-button
+						<el-link
 							v-else
-							text
 							type="primary"
 							size="small"
 							@click="formTableEdit(scope.row)"
-							>编辑</el-button
+							>编辑</el-link
 						>
-						<el-button
+						<el-link
 							v-if="!scope.row.isEdit"
-							text
 							type="danger"
 							size="small"
+							style="margin-left: 5px;"
 							@click="formTableDel(scope.row.id)"
-							>删除</el-button
+							>删除</el-link
 						>
 					</template>
 				</el-table-column>
@@ -185,6 +183,10 @@ export default {
 			type: String,
 			default: "",
 		},
+		isSubmit:{
+			type: Boolean,
+			default: false,
+		},
 	},
 	emits: ["success", "closed"],
 	data() {
diff --git a/src/views/wpm_bx/mlogs.vue b/src/views/wpm_bx/mlogs.vue
index d8dca1ab..03d336a5 100644
--- a/src/views/wpm_bx/mlogs.vue
+++ b/src/views/wpm_bx/mlogs.vue
@@ -37,11 +37,13 @@
 					label="#"
 					type="index"
 					width="50"
+					fixed
 				></el-table-column>
 				<el-table-column
 					label="工艺路线"
 					prop="material_out_name"
 					min-width="130"
+					fixed
 				>
 				</el-table-column>
 				<el-table-column
@@ -85,13 +87,12 @@
 					label="结束时间"
 					prop="work_end_time"
 				></el-table-column>
-				<el-table-column label="是否提交">
+				<!-- <el-table-column label="是否提交">
 					<template #default="scope">
-						<el-icon v-if="scope.row.submit_time != null" color="green">
-							<CircleCheckFilled />
-						</el-icon>
+						<el-tag  v-if="scope.row.submit_time == null" type="warning">未提交</el-tag>
+						<el-tag  v-else type="success">已提交</el-tag>
 					</template>
-				</el-table-column>
+				</el-table-column> -->
 				<el-table-column
 					label="提交时间"
 					prop="submit_time"
diff --git a/vue.config.js b/vue.config.js
index 8275c803..5b468cee 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,5 +1,11 @@
 const { defineConfig } = require('@vue/cli-service')
 const NodePolyfillPlugin = require("node-polyfill-webpack-plugin");
+const CopyWebpackPlugin = require('copy-webpack-plugin');
+const cesiumSource = 'node_modules/cesium/Source';
+const cesiumWorkers = '../Build/Cesium/Workers';
+const path = require('path');
+const webpack = require('webpack');
+const cesiumBaseUrl = "cesium"
 module.exports = defineConfig({
 	//设置为空打包后不分更目录还是多级目录
 	publicPath:'',
@@ -48,6 +54,7 @@ module.exports = defineConfig({
 				chunks: "all",
 				automaticNameDelimiter: '~',
 				name: "scuiChunks",
+				maxSize: 4000000, // 限制每个代码块的最大体积，防止生成太大的块
 				cacheGroups: {
 					//第三方库抽离
 					vendor: {
@@ -74,6 +81,14 @@ module.exports = defineConfig({
 					codemirror: {
 						name: "codemirror",
 						test: /[\\/]node_modules[\\/]codemirror[\\/]/
+					},
+					babylonjs: {
+						name: "babylonjs",
+						test: /[\\/]node_modules[\\/]babylon[\\/]/
+					},
+					cesium: {
+						name: "cesium",
+						test: /[\\/]node_modules[\\/]cesium[\\/]/
 					}
 				}
 			}
@@ -85,10 +100,24 @@ module.exports = defineConfig({
 				stream: false,
 			}
 		},
-		plugins: [new NodePolyfillPlugin()],
+		plugins: [
+			new NodePolyfillPlugin(),
+			new CopyWebpackPlugin({
+				patterns: [
+				  { from: path.join(cesiumSource, cesiumWorkers), to: `${cesiumBaseUrl}/Workers`, },
+				  { from: path.join(cesiumSource, "ThirdParty"), to: `${cesiumBaseUrl}/ThirdParty`, },
+				  { from: path.join(cesiumSource, "Assets"), to: `${cesiumBaseUrl}/Assets`, },
+				  { from: path.join(cesiumSource, "Widgets"), to: `${cesiumBaseUrl}/Widgets`, },
+				],
+			  }),
+			  new webpack.DefinePlugin({
+				// Define relative base path in cesium for loading assets
+				CESIUM_BASE_URL: JSON.stringify(cesiumBaseUrl),
+			  }),
+	],
 		externals:{
 			'./cptable':'var cptable'
-		}
+		},
 	},
 	pluginOptions: {
 		'style-resources-loader': {