diff --git a/src/views/wpm/mlog6_form.vue b/src/views/wpm/mlog6_form.vue
index 085abf2d..c12e7c4b 100644
--- a/src/views/wpm/mlog6_form.vue
+++ b/src/views/wpm/mlog6_form.vue
@@ -232,10 +232,22 @@
             </el-input-number>
           </el-form-item>
         </el-col>
-      </el-row>
-      <!-- <el-row v-if="material_name=='光纤预制棒'"> -->
-      <el-row v-if="material_name.indexOf('棒')>-1">
         <el-col :md="12" :sm="24">
+          <el-form-item label="炸纹">
+            <el-input-number
+              v-model="form.count_n_zw"
+              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" v-if="material_name.indexOf('棒')>-1">
           <el-form-item label="断裂">
             <el-input-number
               v-model="form.count_n_dl"
@@ -250,7 +262,7 @@
             </el-input-number>
           </el-form-item>
         </el-col>
-        <el-col :md="12" :sm="24">
+        <el-col :md="12" :sm="24" v-if="material_name.indexOf('棒')>-1">
           <el-form-item label="气泡">
             <el-input-number
               v-model="form.count_n_qp"
@@ -265,7 +277,7 @@
             </el-input-number>
           </el-form-item>
         </el-col>
-        <el-col :md="12" :sm="24">
+        <el-col :md="12" :sm="24" v-if="material_name.indexOf('棒')>-1">
           <el-form-item label="不亮">
             <el-input-number
               v-model="form.count_n_bl"
@@ -280,7 +292,7 @@
             </el-input-number>
           </el-form-item>
         </el-col>
-        <el-col :md="12" :sm="24">
+        <el-col :md="12" :sm="24" v-if="material_name.indexOf('棒')>-1">
           <el-form-item label="横纹">
             <el-input-number
               v-model="form.count_n_hw"
@@ -295,7 +307,7 @@
             </el-input-number>
           </el-form-item>
         </el-col>
-        <el-col :md="12" :sm="24">
+        <el-col :md="12" :sm="24" v-if="material_name.indexOf('棒')>-1">
           <el-form-item label="有皮">
             <el-input-number
               v-model="form.count_n_yp"
@@ -310,7 +322,7 @@
             </el-input-number>
           </el-form-item>
         </el-col>
-        <el-col :md="12" :sm="24">
+        <el-col :md="12" :sm="24" v-if="material_name.indexOf('棒')>-1">
           <el-form-item label="爆皮">
             <el-input-number
               v-model="form.count_n_bp"
@@ -325,7 +337,7 @@
             </el-input-number>
           </el-form-item>
         </el-col>
-        <el-col :md="12" :sm="24">
+        <el-col :md="12" :sm="24" v-if="material_name.indexOf('棒')>-1">
           <el-form-item label="色差">
             <el-input-number
               v-model="form.count_n_sc"
@@ -340,10 +352,7 @@
             </el-input-number>
           </el-form-item>
         </el-col>
-      </el-row>
-      <!-- <el-row v-if="material_name=='光纤预制管'"> -->
-      <el-row v-if="material_name.indexOf('管')>-1">
-        <el-col :md="12" :sm="24">
+        <el-col :md="12" :sm="24" v-if="material_name.indexOf('管')>-1">
           <el-form-item label="气线">
             <el-input-number
               v-model="form.count_n_qx"
@@ -358,7 +367,7 @@
             </el-input-number>
           </el-form-item>
         </el-col>
-        <el-col :md="12" :sm="24">
+        <el-col :md="12" :sm="24" v-if="material_name.indexOf('管')>-1">
           <el-form-item label="结石">
             <el-input-number
               v-model="form.count_n_js"
@@ -373,7 +382,7 @@
             </el-input-number>
           </el-form-item>
         </el-col>
-        <el-col :md="12" :sm="24">
+        <el-col :md="12" :sm="24" v-if="material_name.indexOf('管')>-1">
           <el-form-item label="椭圆度大">
             <el-input-number
               v-model="form.count_n_tydd"
@@ -388,7 +397,7 @@
             </el-input-number>
           </el-form-item>
         </el-col>
-        <el-col :md="12" :sm="24">
+        <el-col :md="12" :sm="24" v-if="material_name.indexOf('管')>-1">
           <el-form-item label="水雾">
             <el-input-number
               v-model="form.count_n_sw"
@@ -403,7 +412,7 @@
             </el-input-number>
           </el-form-item>
         </el-col>
-        <el-col :md="12" :sm="24">
+        <el-col :md="12" :sm="24" v-if="material_name.indexOf('管')>-1">
           <el-form-item label="壁厚偏差大">
             <el-input-number
               v-model="form.count_n_bhpcd"
@@ -418,7 +427,7 @@
             </el-input-number>
           </el-form-item>
         </el-col>
-        <el-col :md="12" :sm="24">
+        <el-col :md="12" :sm="24" v-if="material_name.indexOf('管')>-1">
           <el-form-item label="弯">
             <el-input-number
               v-model="form.count_n_w"
@@ -433,22 +442,25 @@
             </el-input-number>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
         <el-col :md="12" :sm="24">
-            <el-form-item label="合计">
-              <el-input-number
-                v-model="form.count_notok"
-                controls-position="right"
-                style="width: 100%"
-                placeholder="合计"
-                disabled
-              >
-              </el-input-number>
-            </el-form-item>
-          </el-col>
-          
+          <el-form-item label="合计">
+            <el-input-number
+              v-model="form.count_notok"
+              controls-position="right"
+              style="width: 100%"
+              placeholder="合计"
+              disabled
+            >
+            </el-input-number>
+          </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"
@@ -490,6 +502,7 @@ export default {
         count_n_tw:0,//条纹
         count_n_zdd:0,//锥度大
         count_n_d:0,//短
+        count_n_zw:0,//炸文
         //棒
         count_n_dl:0,//断裂
         count_n_qp:0,//气泡
diff --git a/src/views/wpm/mlog_dept10.vue b/src/views/wpm/mlog_dept10.vue
index 63dbc423..35542a36 100644
--- a/src/views/wpm/mlog_dept10.vue
+++ b/src/views/wpm/mlog_dept10.vue
@@ -418,16 +418,33 @@ export default {
             }
         },
         table_submit(row) {
-            this.$API.pm.mtask.submit.req(row.id).then(res => {
-                this.$message.success('操作成功')
-                if (row.id == this.currentMtask.id) {
-                    this.mtaskClick(row)
-                }
-                this.$refs.table_mtask.refresh()
-            }).catch(err => {
-
+            let lengths = row.mlogs.length,infoText = '';
+            if(lengths>0){
+                infoText = '该任务有'+lengths+'条日志，确定提交吗？';
+            }else{
+                infoText = '该任务没有日志，确定提交吗？';
+            }
+            this.$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 => {})
             })
         },
+        // table_submit(row) {
+        //     this.$API.pm.mtask.submit.req(row.id).then(res => {
+        //         this.$message.success('操作成功')
+        //         if (row.id == this.currentMtask.id) {
+        //             this.mtaskClick(row)
+        //         }
+        //         this.$refs.table_mtask.refresh()
+        //     }).catch(err => {
+
+        //     })
+        // },
         table_show(row) {
             this.mlogId = row.id;
             this.visibleDrawer = true;
diff --git a/src/views/wpm/mlog_dept6.vue b/src/views/wpm/mlog_dept6.vue
index fa1b4277..e18bc280 100644
--- a/src/views/wpm/mlog_dept6.vue
+++ b/src/views/wpm/mlog_dept6.vue
@@ -230,10 +230,21 @@ export default {
       this.$refs.table.queryData(this.queryMtask);
     },
     table_submit(row) {
-      this.$API.pm.mtask.submit.req(row.id).then(res => {
-        this.$message.success('操作成功')
-        this.rowClick(row);
-      }).catch(err => { })
+      let lengths = row.mlogs.length,infoText = '';
+      if(lengths>0){
+          infoText = '该任务有'+lengths+'条日志，确定提交吗？';
+      }else{
+          infoText = '该任务没有日志，确定提交吗？';
+      }
+      this.$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 => {})
+      })
     },
     handover_submit(row) {
       this.$API.wpm.handover.submit.req(row.id).then(res => {
diff --git a/src/views/wpm/mlog_dept7.vue b/src/views/wpm/mlog_dept7.vue
index b8ad28d8..3500fbb2 100644
--- a/src/views/wpm/mlog_dept7.vue
+++ b/src/views/wpm/mlog_dept7.vue
@@ -402,11 +402,20 @@ export default {
             this.getMlogs()
         },
         mtask_submit(row) {
-            this.$API.pm.mtask.submit.req(row.id).then(res => {
-                this.$message.success('操作成功')
-                this.$refs.table_mtask.refresh()
-                this.mtaskClick(this.currentMtask)
-            }).catch(err => {
+            let lengths = row.mlogs.length,infoText = '';
+            if(lengths>0){
+                infoText = '该任务有'+lengths+'条日志，确定提交吗？';
+            }else{
+                infoText = '该任务没有日志，确定提交吗？';
+            }
+            this.$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 => {})
             })
         },
         handleSaveSuccess() {