diff --git a/src/views/qm/products_form.vue b/src/views/qm/products_form.vue
index 898503e3..b62f1c0e 100644
--- a/src/views/qm/products_form.vue
+++ b/src/views/qm/products_form.vue
@@ -78,6 +78,17 @@
 								></el-input>
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="B类合格数">
+								<el-input-number
+									controls-position="right"
+									v-model="count_ok_b"
+									style="width: 100%"
+									precision="0"
+									disabled
+								></el-input-number>
+							</el-form-item>
+						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="不合格数量">
 								<el-input-number
@@ -156,6 +167,74 @@
 					</el-row>
 					<el-divider style="margin-top:0"></el-divider>
 					<el-row v-if="mode=='sizeAdd'||mode=='sizeEdit'||mode=='sizeShow'">
+						<el-col><div>合格B类</div></el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="准合格">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_zhg"
+									style="width: 100%"
+									precision="0"
+									:disabled="mode=='sizeShow'"
+									@change="handleCountbChange"
+								></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_notok_json.count_n_yz"
+									style="width: 100%"
+									precision="0"
+									:disabled="mode=='sizeShow'"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row v-else>
+						<el-col><div>合格B类</div></el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="浅水纹">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_qsw"
+									style="width: 100%"
+									precision="0"
+									:disabled="mode=='facadeShow'"
+									@change="handleCountChange"
+								></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_notok_json.count_n_xbb"
+									style="width: 100%"
+									precision="0"
+									:disabled="mode=='facadeShow'"
+									@change="handleCountChange"
+								></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_notok_json.count_n_qhm"
+									style="width: 100%"
+									precision="0"
+									:disabled="mode=='facadeShow'"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-divider style="margin-top:0"></el-divider>
+					<el-row v-if="mode=='sizeAdd'||mode=='sizeEdit'||mode=='sizeShow'">
+						<el-col><div>不合格</div></el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="黑圈内径">
 								<el-input-number
@@ -163,7 +242,7 @@
 									v-model="count_notok_json.count_n_hqnj"
 									style="width: 100%"
 									precision="0"
-									:disabled="mode=='sizeShow'||mode=='facadeShow'"
+									:disabled="mode=='sizeShow'"
 									@change="handleCountChange"
 								></el-input-number>
 							</el-form-item>
@@ -175,7 +254,7 @@
 									v-model="count_notok_json.count_n_hqnjyd"
 									style="width: 100%"
 									precision="0"
-									:disabled="mode=='sizeShow'||mode=='facadeShow'"
+									:disabled="mode=='sizeShow'"
 									@change="handleCountChange"
 								></el-input-number>
 							</el-form-item>
@@ -187,7 +266,7 @@
 									v-model="count_notok_json.count_n_hqwj"
 									style="width: 100%"
 									precision="0"
-									:disabled="mode=='sizeShow'||mode=='facadeShow'"
+									:disabled="mode=='sizeShow'"
 									@change="handleCountChange"
 								></el-input-number>
 							</el-form-item>
@@ -199,7 +278,7 @@
 									v-model="count_notok_json.count_n_hqwjyd"
 									style="width: 100%"
 									precision="0"
-									:disabled="mode=='sizeShow'||mode=='facadeShow'"
+									:disabled="mode=='sizeShow'"
 									@change="handleCountChange"
 								></el-input-number>
 							</el-form-item>
@@ -211,19 +290,19 @@
 									v-model="count_notok_json.count_n_wj"
 									style="width: 100%"
 									precision="0"
-									:disabled="mode=='sizeShow'||mode=='facadeShow'"
+									:disabled="mode=='sizeShow'"
 									@change="handleCountChange"
 								></el-input-number>
 							</el-form-item>
 						</el-col>
 						<el-col :md="12" :sm="24">
-							<el-form-item label="产品圆度">
+							<el-form-item label="产品外径圆度">
 								<el-input-number
 									controls-position="right"
 									v-model="count_notok_json.count_n_yd"
 									style="width: 100%"
 									precision="0"
-									:disabled="mode=='sizeShow'||mode=='facadeShow'"
+									:disabled="mode=='sizeShow'"
 									@change="handleCountChange"
 								></el-input-number>
 							</el-form-item>
@@ -235,7 +314,7 @@
 									v-model="count_notok_json.count_n_txd"
 									style="width: 100%"
 									precision="0"
-									:disabled="mode=='sizeShow'||mode=='facadeShow'"
+									:disabled="mode=='sizeShow'"
 									@change="handleCountChange"
 								></el-input-number>
 							</el-form-item>
@@ -247,37 +326,26 @@
 									v-model="count_notok_json.count_n_hd"
 									style="width: 100%"
 									precision="0"
-									:disabled="mode=='sizeShow'||mode=='facadeShow'"
-									@change="handleCountChange"
-								></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_notok_json.count_n_zhg"
-									style="width: 100%"
-									precision="0"
-									:disabled="mode=='sizeShow'||mode=='facadeShow'"
-									@change="handleCountChange"
-								></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_notok_json.count_n_yz"
-									style="width: 100%"
-									precision="0"
-									:disabled="mode=='sizeShow'||mode=='facadeShow'"
+									:disabled="mode=='sizeShow'"
 									@change="handleCountChange"
 								></el-input-number>
 							</el-form-item>
 						</el-col>
 					</el-row>
 					<el-row v-else>
+						<el-col><div>不合格</div></el-col>
+						<!-- <el-col :md="12" :sm="24">
+							<el-form-item label="返修">
+								<el-input-number
+									controls-position="right"
+									v-model="count_notok_json.count_n_fx"
+									style="width: 100%"
+									precision="0"
+									:disabled="mode=='facadeShow'"
+									@change="handleCountChange"
+								></el-input-number>
+							</el-form-item>
+						</el-col> -->
 						<el-col :md="12" :sm="24">
 							<el-form-item label="脏">
 								<el-input-number
@@ -285,7 +353,7 @@
 									v-model="count_notok_json.count_n_z"
 									style="width: 100%"
 									precision="0"
-									:disabled="mode=='sizeShow'||mode=='facadeShow'"
+									:disabled="mode=='facadeShow'"
 									@change="handleCountChange"
 								></el-input-number>
 							</el-form-item>
@@ -297,79 +365,7 @@
 									v-model="count_notok_json.count_n_qp"
 									style="width: 100%"
 									precision="0"
-									:disabled="mode=='sizeShow'||mode=='facadeShow'"
-									@change="handleCountChange"
-								></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_notok_json.count_n_swen"
-									style="width: 100%"
-									precision="0"
-									:disabled="mode=='sizeShow'||mode=='facadeShow'"
-									@change="handleCountChange"
-								></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_notok_json.count_n_bb"
-									style="width: 100%"
-									precision="0"
-									:disabled="mode=='sizeShow'||mode=='facadeShow'"
-									@change="handleCountChange"
-								></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_notok_json.count_n_zb"
-									style="width: 100%"
-									precision="0"
-									:disabled="mode=='sizeShow'||mode=='facadeShow'"
-									@change="handleCountChange"
-								></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_notok_json.count_n_zq"
-									style="width: 100%"
-									precision="0"
-									:disabled="mode=='sizeShow'||mode=='facadeShow'"
-									@change="handleCountChange"
-								></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_notok_json.count_n_hs"
-									style="width: 100%"
-									precision="0"
-									:disabled="mode=='sizeShow'||mode=='facadeShow'"
-									@change="handleCountChange"
-								></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_notok_json.count_n_md"
-									style="width: 100%"
-									precision="0"
-									:disabled="mode=='sizeShow'||mode=='facadeShow'"
+									:disabled="mode=='facadeShow'"
 									@change="handleCountChange"
 								></el-input-number>
 							</el-form-item>
@@ -381,7 +377,45 @@
 									v-model="count_notok_json.count_n_hqbx"
 									style="width: 100%"
 									precision="0"
-									:disabled="mode=='sizeShow'||mode=='facadeShow'"
+									:disabled="mode=='facadeShow'"
+									@change="handleCountChange"
+								></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_notok_json.count_n_md"
+									style="width: 100%"
+									precision="0"
+									:disabled="mode=='facadeShow'"
+									@change="handleCountChange"
+								></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_notok_json.count_n_swen"
+									style="width: 100%"
+									precision="0"
+									:disabled="mode=='facadeShow'"
+									@change="handleCountChange"
+								></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_notok_json.count_n_zb"
+									style="width: 100%"
+									precision="0"
+									:disabled="mode=='facadeShow'"
 									@change="handleCountChange"
 								></el-input-number>
 							</el-form-item>
@@ -393,19 +427,31 @@
 									v-model="count_notok_json.count_n_dj"
 									style="width: 100%"
 									precision="0"
-									:disabled="mode=='sizeShow'||mode=='facadeShow'"
+									:disabled="mode=='facadeShow'"
 									@change="handleCountChange"
 								></el-input-number>
 							</el-form-item>
 						</el-col>
 						<el-col :md="12" :sm="24">
-							<el-form-item label="破损">
+							<el-form-item label="大崩">
 								<el-input-number
 									controls-position="right"
-									v-model="count_notok_json.count_n_ps"
+									v-model="count_notok_json.count_n_bb"
 									style="width: 100%"
 									precision="0"
-									:disabled="mode=='sizeShow'||mode=='facadeShow'"
+									:disabled="mode=='facadeShow'"
+									@change="handleCountChange"
+								></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_notok_json.count_n_zq"
+									style="width: 100%"
+									precision="0"
+									:disabled="mode=='facadeShow'"
 									@change="handleCountChange"
 								></el-input-number>
 							</el-form-item>
@@ -417,7 +463,43 @@
 									v-model="count_notok_json.count_n_lq"
 									style="width: 100%"
 									precision="0"
-									:disabled="mode=='sizeShow'||mode=='facadeShow'"
+									:disabled="mode=='facadeShow'"
+									@change="handleCountChange"
+								></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_notok_json.count_n_ps"
+									style="width: 100%"
+									precision="0"
+									:disabled="mode=='facadeShow'"
+									@change="handleCountChange"
+								></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_notok_json.count_n_lg"
+									style="width: 100%"
+									precision="0"
+									:disabled="mode=='facadeShow'"
+									@change="handleCountChange"
+								></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_notok_json.count_n_ccx"
+									style="width: 100%"
+									precision="0"
+									:disabled="mode=='facadeShow'"
 									@change="handleCountChange"
 								></el-input-number>
 							</el-form-item>
@@ -462,7 +544,14 @@ export default {
 				count_notok: 0,
 				count_notok_json:{}
 			},
+			count_ok_b:0,
 			count_notok_json:{
+				//合格B类
+				count_n_zhg: 0,//准合格
+				count_n_yz: 0,//圆准
+				count_n_xbb: 0,//小崩边
+				count_n_qsw: 0,//浅水纹
+				count_n_qhm: 0,//浅划麻
 				//尺寸
 				count_n_hqnj: 0,
 				count_n_hqnjyd: 0,
@@ -472,21 +561,20 @@ export default {
 				count_n_yd: 0,
 				count_n_txd: 0,
 				count_n_hd: 0,
-				count_n_zhg: 0,
-				count_n_yz: 0,
 				//外观和内质
 				count_n_z:0,
 				count_n_qp: 0,
-				count_n_swen: 0,
-				count_n_bb: 0,
-				count_n_zb: 0,
-				count_n_zq: 0,
-				count_n_hs: 0,
-				count_n_md: 0,
 				count_n_hqbx: 0,
+				count_n_hs: 0,//双面划麻
+				count_n_swen: 0,//重水纹
+				count_n_zb: 0,//棕边、棕点
 				count_n_dj: 0,
-				count_n_ps: 0,
+				count_n_bb: 0,//大崩
+				count_n_zq: 0,//棕圈
 				count_n_lq: 0,
+				count_n_ps: 0,
+				count_n_lg: 0,//漏光
+				count_n_ccx: 0,//尺寸小
 			},
 			rules: {
 				test_date: [
@@ -536,7 +624,6 @@ export default {
 		},
 		getUsers(){
 			let that = this;
-			let userList = [];
 			that.$API.system.user.list
 			.req({ page: 0, posts__code__contains: "check" })
 			.then((res) => {
@@ -552,6 +639,15 @@ export default {
 		handleCheckChange(){
 			this.form.count_ok  = this.form.count-this.form.count_notok;
 		},
+		handleCountbChange(){
+			this.count_ok_b = 
+			this.count_notok_json.count_n_zhg+
+			 this.count_notok_json.count_n_yz+
+			 this.count_notok_json.count_n_xbb+
+			 this.count_notok_json.count_n_qsw+
+			 this.count_notok_json.count_n_qhm;
+			 this.count_notok_json.count_ok = this.form.count-this.form.count_notok;
+		},
 		handleCountChange(type){
 			if(type == 'notok'){
 				this.count_notok_json.count_n_hqnj=
@@ -562,17 +658,20 @@ export default {
 				this.count_notok_json.count_n_yd=
 				this.count_notok_json.count_n_txd=
 				this.count_notok_json.count_n_hd=
+
+				this.count_notok_json.count_n_z=
 				this.count_notok_json.count_n_qp=
+				this.count_notok_json.count_n_hqbx=
+				this.count_notok_json.count_n_hs=
 				this.count_notok_json.count_n_swen=
 				this.count_notok_json.count_n_zb=
+				this.count_notok_json.count_n_dj=
 				this.count_notok_json.count_n_bb=
 				this.count_notok_json.count_n_zq=
-				this.count_notok_json.count_n_hs=
-				this.count_notok_json.count_n_md=
-				this.count_notok_json.count_n_hqbx=
-				this.count_notok_json.count_n_dj=
+				this.count_notok_json.count_n_lq=
 				this.count_notok_json.count_n_ps=
-				this.count_notok_json.count_n_lq=0;
+				this.count_notok_json.count_n_lg=
+				this.count_notok_json.count_n_ccx=0;
 			}else{
 				this.form.count_notok = 
 				this.count_notok_json.count_n_hqnj+
@@ -583,20 +682,19 @@ export default {
 				this.count_notok_json.count_n_yd+
 				this.count_notok_json.count_n_txd+
 				this.count_notok_json.count_n_hd+
-				this.count_notok_json.count_n_zhg+
-				this.count_notok_json.count_n_yz+
-				this.count_notok_json.count_n_qp+
 				this.count_notok_json.count_n_z+
+				this.count_notok_json.count_n_qp+
+				this.count_notok_json.count_n_hqbx+
+				this.count_notok_json.count_n_hs+
 				this.count_notok_json.count_n_swen+
 				this.count_notok_json.count_n_zb+
+				this.count_notok_json.count_n_dj+
 				this.count_notok_json.count_n_bb+
 				this.count_notok_json.count_n_zq+
-				this.count_notok_json.count_n_hs+
-				this.count_notok_json.count_n_md+
-				this.count_notok_json.count_n_hqbx+
-				this.count_notok_json.count_n_dj+
+				this.count_notok_json.count_n_lq+
 				this.count_notok_json.count_n_ps+
-				this.count_notok_json.count_n_lq;
+				this.count_notok_json.count_n_lg+
+				this.count_notok_json.count_n_ccx;
 			}
 			this.form.count_ok = this.form.count - this.form.count_notok;
 		},
@@ -694,6 +792,12 @@ export default {
 			Object.assign(this.form, data);
 			this.formCount = this.form.count;
 			this.form.count_notok = data.count_notok;
+			this.count_ok_b = 
+				data.count_notok_json.count_n_zhg +
+				data.count_notok_json.count_n_yz +
+				data.count_notok_json.count_n_qsw +
+				data.count_notok_json.count_n_xbb +
+				data.count_notok_json.count_n_qhm ;
 			this.count_notok_json = data.count_notok_json;
 		},
 		scanClose(data){