diff --git a/src/views/wpm/mlog6_form.vue b/src/views/wpm/mlog6_form.vue
index 9586779b..4f386cfa 100644
--- a/src/views/wpm/mlog6_form.vue
+++ b/src/views/wpm/mlog6_form.vue
@@ -257,11 +257,7 @@
 						</el-input-number>
 					</el-form-item>
 				</el-col>
-				<el-col
-					:md="12"
-					:sm="24"
-					v-if="material_name.indexOf('棒') > -1"
-				>
+				<el-col :md="12" :sm="24">
 					<el-form-item label="断裂">
 						<el-input-number
 							v-model="form.count_n_dl"
@@ -276,11 +272,7 @@
 						</el-input-number>
 					</el-form-item>
 				</el-col>
-				<el-col
-					:md="12"
-					:sm="24"
-					v-if="material_name.indexOf('棒') > -1"
-				>
+				<el-col :md="12" :sm="24">
 					<el-form-item label="气泡">
 						<el-input-number
 							v-model="form.count_n_qp"
@@ -295,11 +287,7 @@
 						</el-input-number>
 					</el-form-item>
 				</el-col>
-				<el-col
-					:md="12"
-					:sm="24"
-					v-if="material_name.indexOf('棒') > -1"
-				>
+				<el-col :md="12" :sm="24">
 					<el-form-item label="不亮">
 						<el-input-number
 							v-model="form.count_n_bl"
@@ -314,11 +302,7 @@
 						</el-input-number>
 					</el-form-item>
 				</el-col>
-				<el-col
-					:md="12"
-					:sm="24"
-					v-if="material_name.indexOf('棒') > -1"
-				>
+				<el-col :md="12" :sm="24">
 					<el-form-item label="横纹">
 						<el-input-number
 							v-model="form.count_n_hw"
@@ -333,11 +317,7 @@
 						</el-input-number>
 					</el-form-item>
 				</el-col>
-				<el-col
-					:md="12"
-					:sm="24"
-					v-if="material_name.indexOf('棒') > -1"
-				>
+				<el-col :md="12" :sm="24">
 					<el-form-item label="有皮">
 						<el-input-number
 							v-model="form.count_n_yp"
@@ -352,11 +332,7 @@
 						</el-input-number>
 					</el-form-item>
 				</el-col>
-				<el-col
-					:md="12"
-					:sm="24"
-					v-if="material_name.indexOf('棒') > -1"
-				>
+				<el-col :md="12" :sm="24">
 					<el-form-item label="爆皮">
 						<el-input-number
 							v-model="form.count_n_bp"
@@ -371,11 +347,7 @@
 						</el-input-number>
 					</el-form-item>
 				</el-col>
-				<el-col
-					:md="12"
-					:sm="24"
-					v-if="material_name.indexOf('棒') > -1"
-				>
+				<el-col :md="12" :sm="24">
 					<el-form-item label="色差">
 						<el-input-number
 							v-model="form.count_n_sc"
@@ -390,11 +362,37 @@
 						</el-input-number>
 					</el-form-item>
 				</el-col>
-				<el-col
-					:md="12"
-					:sm="24"
-					v-if="material_name.indexOf('管') > -1"
-				>
+				<el-col :md="12" :sm="24">
+					<el-form-item label="直径大">
+						<el-input-number
+							v-model="form.count_n_zjd"
+							controls-position="right"
+							:min="0"
+							:step="1"
+							:step-strictly="true"
+							style="width: 100%"
+							placeholder="直径大"
+							@change="countNotOkSun"
+						>
+						</el-input-number>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24">
+					<el-form-item label="直径小">
+						<el-input-number
+							v-model="form.count_n_zjx"
+							controls-position="right"
+							:min="0"
+							:step="1"
+							:step-strictly="true"
+							style="width: 100%"
+							placeholder="直径小"
+							@change="countNotOkSun"
+						>
+						</el-input-number>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24">
 					<el-form-item label="气线">
 						<el-input-number
 							v-model="form.count_n_qx"
@@ -409,11 +407,7 @@
 						</el-input-number>
 					</el-form-item>
 				</el-col>
-				<el-col
-					:md="12"
-					:sm="24"
-					v-if="material_name.indexOf('管') > -1"
-				>
+				<el-col :md="12" :sm="24">
 					<el-form-item label="结石">
 						<el-input-number
 							v-model="form.count_n_js"
@@ -428,11 +422,7 @@
 						</el-input-number>
 					</el-form-item>
 				</el-col>
-				<el-col
-					:md="12"
-					:sm="24"
-					v-if="material_name.indexOf('管') > -1"
-				>
+				<el-col :md="12" :sm="24">
 					<el-form-item label="椭圆度大">
 						<el-input-number
 							v-model="form.count_n_tydd"
@@ -447,11 +437,7 @@
 						</el-input-number>
 					</el-form-item>
 				</el-col>
-				<el-col
-					:md="12"
-					:sm="24"
-					v-if="material_name.indexOf('管') > -1"
-				>
+				<el-col :md="12" :sm="24">
 					<el-form-item label="水雾">
 						<el-input-number
 							v-model="form.count_n_sw"
@@ -466,11 +452,7 @@
 						</el-input-number>
 					</el-form-item>
 				</el-col>
-				<el-col
-					:md="12"
-					:sm="24"
-					v-if="material_name.indexOf('管') > -1"
-				>
+				<el-col :md="12" :sm="24">
 					<el-form-item label="壁厚偏差大">
 						<el-input-number
 							v-model="form.count_n_bhpcd"
@@ -485,11 +467,7 @@
 						</el-input-number>
 					</el-form-item>
 				</el-col>
-				<el-col
-					:md="12"
-					:sm="24"
-					v-if="material_name.indexOf('管') > -1"
-				>
+				<el-col :md="12" :sm="24">
 					<el-form-item label="弯">
 						<el-input-number
 							v-model="form.count_n_wq"
@@ -526,12 +504,6 @@
 					</el-form-item>
 				</el-col>
 			</el-row>
-			<!-- <el-row v-if="material_name=='光纤预制棒'"> -->
-			<!-- <el-row v-if="material_name.indexOf('棒')>-1">
-      </el-row> -->
-			<!-- <el-row v-if="material_name=='光纤预制管'"> -->
-			<!-- <el-row v-if="material_name.indexOf('管')>-1"> 
-      </el-row> -->
 		</el-form>
 		<el-footer>
 			<el-button type="primary" v-loading="isSaveing" @click="submit"
@@ -575,6 +547,7 @@ export default {
 				count_n_zdd: 0, //锥度大
 				count_n_d: 0, //短
 				count_n_zw: 0, //炸文
+				count_n_tydd: 0, //椭圆度大          共8个
 				//棒
 				count_n_dl: 0, //断裂
 				count_n_qp: 0, //气泡
@@ -583,13 +556,14 @@ export default {
 				count_n_yp: 0, //有皮
 				count_n_bp: 0, //爆皮
 				count_n_sc: 0, //色差
+				count_n_zjx: 0, //直径大
+				count_n_zjd: 0, //直径小       共9个
 				//管
 				count_n_qx: 0, //气线
 				count_n_js: 0, //结石
-				count_n_tydd: 0, //椭圆度大
 				count_n_sw: 0, //水雾
 				count_n_bhpcd: 0, //壁厚偏差大
-				count_n_wq: 0, //弯
+				count_n_wq: 0, //弯   共5个
 
 				handle_user: "",
 			},
@@ -615,11 +589,6 @@ export default {
 		this.getEquipment();
 		this.getWMaterial();
 		this.getShiftOptions();
-		// let date = new Date();
-		// let year = date.getFullYear();
-		// let month = date.getMonth() + 1;
-		// let day = date.getDate();
-		// this.form.handle_date = year + "-" + month + "-" + day;
 		this.form.material_out = this.material_out;
 		this.form.handle_date = this.handle_date;
 		this.form.mgroup = this.mgroup;
@@ -656,7 +625,6 @@ export default {
 					if (res.length > 0) {
 						let arr = [];
 						res.forEach((item) => {
-							// if(item.count>0){}
 							arr.push(item.batch);
 						});
 						this.wmaterialOptions = arr;
@@ -710,6 +678,8 @@ export default {
 				Number(this.form.count_n_yp) +
 				Number(this.form.count_n_bp) +
 				Number(this.form.count_n_sc) +
+				Number(this.form.count_n_zjd) +
+				Number(this.form.count_n_zjx) +
 				Number(this.form.count_n_qx) +
 				Number(this.form.count_n_js) +
 				Number(this.form.count_n_tydd) +