From 98f10a3182b8b535c0098e68f11c48f8d6bbad02 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 22 Jan 2024 17:05:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BA=A4=E6=8E=A5=E5=8D=95=E6=97=B6?=
 =?UTF-8?q?=E4=BF=9D=E7=95=992=E4=BD=8D=E6=95=B0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/mlog_hun.vue | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/views/wpm/mlog_hun.vue b/src/views/wpm/mlog_hun.vue
index c2a0aaf5..c481e0ef 100644
--- a/src/views/wpm/mlog_hun.vue
+++ b/src/views/wpm/mlog_hun.vue
@@ -9,7 +9,7 @@
                 </el-header>
                 <el-main class="nopadding">
                     <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="params">
-                        <el-table-column type="index" width="50"/>
+                        <el-table-column type="index" width="50" />
                         <el-table-column label="配料日期" prop="handle_date">
                         </el-table-column>
                         <el-table-column label="产物" prop="material" show-overflow-tooltip>
@@ -23,7 +23,8 @@
                         </el-table-column>
                         <el-table-column label="每桶重量/kg" prop="count_real_eweight">
                             <template #default="scope">
-                                <span v-if="scope.row.count_real_eweight"> {{ scope.row.count_real_eweight.toFixed(2) }}</span>
+                                <span v-if="scope.row.count_real_eweight"> {{ scope.row.count_real_eweight.toFixed(2)
+                                }}</span>
                             </template>
                         </el-table-column>
                         <el-table-column label="配料人" prop="handle_user_name">
@@ -146,8 +147,8 @@
                 </el-col>
                 <el-col :md="12" :sm="24">
                     <el-form-item label="每桶(kg)" prop="count_eweight">
-                        <el-input-number v-model="handoverForm.count_eweight" controls-position="right" :min="0" step="1"
-                        :precision="2" :step-strictly="true" style="width:100%" placeholder="每桶kg">
+                        <el-input-number v-model="handoverForm.count_eweight" controls-position="right" :min="0"
+                            :precision="2" style="width:100%" placeholder="每桶kg">
                         </el-input-number>
                     </el-form-item>
                 </el-col>
@@ -158,13 +159,8 @@
             <el-button type="primary" @click="submitHandover">提交</el-button>
         </el-footer>
     </el-dialog>
-    <save-dialog v-if="dialogSave" 
-        ref="saveDialog"
-        :mgroup="currentMgroup.id"
-        :mgroupShiftRule = "currentMgroup.shift_rule"
-        :activeType="activeName"
-        @success="handleSaveSuccess" 
-        @closed="dialogSave = false">
+    <save-dialog v-if="dialogSave" ref="saveDialog" :mgroup="currentMgroup.id" :mgroupShiftRule="currentMgroup.shift_rule"
+        :activeType="activeName" @success="handleSaveSuccess" @closed="dialogSave = false">
     </save-dialog>
 </template>
 <script>
@@ -175,7 +171,7 @@ export default {
     },
     data() {
         return {
-            activeName:'8车间',
+            activeName: '8车间',
             currentMgroup: {},
             apiObj: null,
             params: {},
@@ -183,7 +179,7 @@ export default {
             paramsHandover: {},
             handoverForm: {},
             handoverVisible: false,
-            dialogSave:false,
+            dialogSave: false,
             deptOptions: [],
             userList: [],
             userList2: []
@@ -220,7 +216,7 @@ export default {
                 });
             }).catch(() => { });
         },
-        handleSaveSuccess(){
+        handleSaveSuccess() {
             this.$refs.table.refresh();
         },
         getDepts() {
@@ -291,7 +287,7 @@ export default {
                         return err;
                     });
             })
-            .catch(() => { });
+                .catch(() => { });
         },
     }
 }

From 29b073759da3a1234e5a2e89d9d4c7c2be39c431 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 22 Jan 2024 17:07:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=207=E8=BD=A6=E9=97=B4=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=9F=A5=E8=AF=A2=E4=BD=BF=E7=94=A8=E5=8D=87=E9=99=8D?=
 =?UTF-8?q?=E5=BC=8F=E9=80=80=E7=81=AB=E7=82=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/worktask_form.vue | 877 +++++++-------------------------
 1 file changed, 187 insertions(+), 690 deletions(-)

diff --git a/src/views/wpm/worktask_form.vue b/src/views/wpm/worktask_form.vue
index e37d0d70..b5673062 100644
--- a/src/views/wpm/worktask_form.vue
+++ b/src/views/wpm/worktask_form.vue
@@ -1,20 +1,8 @@
 <template>
-  <el-dialog
-    :title="titleMap[mode]"
-    v-model="visible"
-    width="1000px"
-    :size="1000"
-    destroy-on-close
-    @closed="$emit('closed')"
-  >
+  <el-dialog :title="titleMap[mode]" v-model="visible" width="1000px" :size="1000" destroy-on-close
+    @closed="$emit('closed')">
     <!-- 混料工序 -->
-    <el-form
-      v-if="activeType == '8车间'"
-      ref="dialogForm"
-      :model="form"
-      :rules="rules"
-      label-width="80px"
-    >
+    <el-form v-if="activeType == '8车间'" ref="dialogForm" :model="form" :rules="rules" label-width="80px">
       <el-row>
         <!-- <el-col :md="12" :sm="24">
           <el-form-item label="工段" prop="material">
@@ -36,122 +24,58 @@
         </el-col> -->
         <el-col :md="12" :sm="24">
           <el-form-item label="生产路线" v-if="mode == 'add'">
-            <el-select
-              v-model="currentRoute"
-              value-key="id"
-              placeholder="生产路线"
-              clearable
-              filterable
-              style="width: 100%"
-              @change="routeChange"
-            >
-              <el-option
-                v-for="item in routeOptions"
-                :key="item.id"
-                :label="item.label"
-                :value="item"
-              ></el-option>
+            <el-select v-model="currentRoute" value-key="id" placeholder="生产路线" clearable filterable style="width: 100%"
+              @change="routeChange">
+              <el-option v-for="item in routeOptions" :key="item.id" :label="item.label" :value="item"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="生产路线" v-if="mode == 'edit'">
-            <span>{{ form.material_in_name}}->{{ form.material_out_name }}</span>
+            <span>{{ form.material_in_name }}->{{ form.material_out_name }}</span>
           </el-form-item>
         </el-col>
         <el-col :md="12" :sm="24">
           <el-form-item label="班次" prop="shift">
-            <el-select
-              v-model="form.shift"
-              placeholder="班次"
-              clearable
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in shiftOptions"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
+            <el-select v-model="form.shift" placeholder="班次" clearable style="width: 100%">
+              <el-option v-for="item in shiftOptions" :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="批次号" width="100">
-            <el-input
-              v-model="form.batch"
-              tyle="width:100%"
-              placeholder="批次号"
-            ></el-input>
+            <el-input v-model="form.batch" tyle="width:100%" placeholder="批次号"></el-input>
           </el-form-item>
         </el-col>
         <el-col :md="12" :sm="24">
           <el-form-item label="数量(桶数)" width="100">
-            <el-input-number
-              v-model="form.count_real"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="请输入数量"
-            >
+            <el-input-number v-model="form.count_real" 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="每桶(kg)" width="100">
-            <el-input-number
-              v-model="form.count_real_eweight"
-              controls-position="right"
-              :min="0"
-              :step="0.01"
-              :precision="2" 
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="请输入重量"
-            >
+            <el-input-number v-model="form.count_real_eweight" controls-position="right" :min="0" :step="0.01"
+              :precision="2" :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="配料人">
-            <el-select
-              v-model="form.handle_users"
-              placeholder="配料人"
-              clearable
-              multiple
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in userList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
+            <el-select v-model="form.handle_users" placeholder="配料人" clearable multiple 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="操作日期" prop="handle_date">
-            <el-date-picker
-              v-model="form.handle_date"
-              type="date"
-              placeholder="操作日期"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
-              style="width: 100%"
-            />
+            <el-date-picker v-model="form.handle_date" type="date" placeholder="操作日期" format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD" style="width: 100%" />
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <!-- 退火 -->
-    <el-form
-      v-if="activeType == '退火'"
-      ref="dialogForm"
-      :model="form"
-      :rules="rules"
-      label-width="120px"
-    >
+    <el-form v-if="activeType == '退火'" ref="dialogForm" :model="form" :rules="rules" label-width="120px">
       <el-row>
         <!-- <el-col :md="12" :sm="24">
           <el-form-item label="工段" prop="material">
@@ -173,86 +97,41 @@
         </el-col> -->
         <el-col :md="12" :sm="24">
           <el-form-item label="生产路线" v-if="mode == 'add'">
-            <el-select
-              v-model="currentRoute"
-              value-key="id"
-              placeholder="生产路线"
-              filterable
-              clearable
-              style="width: 100%"
-              @change="routeChange"
-            >
-              <el-option
-                v-for="item in routeOptions"
-                :key="item.id"
-                :label="item.label"
-                :value="item"
-              ></el-option>
+            <el-select v-model="currentRoute" value-key="id" placeholder="生产路线" filterable clearable style="width: 100%"
+              @change="routeChange">
+              <el-option v-for="item in routeOptions" :key="item.id" :label="item.label" :value="item"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="生产路线" v-if="mode == 'edit'">
-            <span>{{ form.material_in_name}}->{{ form.material_out_name }}</span>
+            <span>{{ form.material_in_name }}->{{ form.material_out_name }}</span>
           </el-form-item>
         </el-col>
         <el-col :md="12" :sm="24">
           <el-form-item label="班次" prop="shift">
-            <el-select
-              v-model="form.shift"
-              placeholder="班次"
-              clearable
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in shiftOptions"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
+            <el-select v-model="form.shift" placeholder="班次" clearable style="width: 100%">
+              <el-option v-for="item in shiftOptions" :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="合格数">
-            <el-input-number
-              v-model="form.count_ok"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="请输入合格数"
-            >
+            <el-input-number v-model="form.count_ok" 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="不合格数">
-            <el-input-number
-              v-model="form.count_notok"
-              controls-position="right"
-              style="width: 100%"
-              placeholder="不合格数"
-              disabled
-            >
+            <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-col :md="12" :sm="24">
           <el-form-item label="批次号" prop="material_in">
-            <el-select
-              v-model="form.batch"
-              placeholder="批次号"
-              filterable
-              clearable
-              allow-create
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in wMaterialOptions"
-                :key="item.batch"
-                :label="item.batch"
-                :value="item.batch"
-              ></el-option>
+            <el-select v-model="form.batch" placeholder="批次号" filterable clearable allow-create style="width: 100%">
+              <el-option v-for="item in wMaterialOptions" :key="item.batch" :label="item.batch"
+                :value="item.batch"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -275,14 +154,8 @@
         </el-col> -->
         <el-col :md="12" :sm="24">
           <el-form-item label="退火时间" prop="material">
-            <el-date-picker
-              v-model="form.handle_date"
-              type="date"
-              placeholder="退火时间"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
-              style="width: 100%"
-            />
+            <el-date-picker v-model="form.handle_date" type="date" placeholder="退火时间" format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD" style="width: 100%" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -290,118 +163,57 @@
       <el-row>
         <el-col :md="12" :sm="24">
           <el-form-item label="椭圆/弯曲">
-            <el-input-number
-              v-model="form.count_n_wq"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="椭圆/弯曲"
-              @change="countNotOkSun"
-            >
+            <el-input-number v-model="form.count_n_wq" 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_tw"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="条纹"
-              @change="countNotOkSun"
-            >
+            <el-input-number v-model="form.count_n_tw" 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_dl"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="断裂"
-              @change="countNotOkSun"
-            >
+            <el-input-number v-model="form.count_n_dl" 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_pb"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="偏壁"
-              @change="countNotOkSun"
-            >
+            <el-input-number v-model="form.count_n_pb" 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_dxt"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="大小头"
-              @change="countNotOkSun"
-            >
+            <el-input-number v-model="form.count_n_dxt" 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_js"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="结石"
-              @change="countNotOkSun"
-            >
+            <el-input-number v-model="form.count_n_js" 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"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="气线"
-              @change="countNotOkSun"
-            >
+            <el-input-number v-model="form.count_n_qx" 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_break"
-              controls-position="right"
-              style="width: 100%"
-              placeholder="箱中破"
-              @change="countNotOkSun"
-            >
+            <el-input-number v-model="form.count_break" controls-position="right" style="width: 100%" placeholder="箱中破"
+              @change="countNotOkSun">
             </el-input-number>
           </el-form-item>
         </el-col>
@@ -410,90 +222,45 @@
       <el-row>
         <el-col :md="12" :sm="24">
           <el-form-item label="检测数">
-            <el-input-number
-              v-model="form.count"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="请输入检测数"
-            >
+            <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="检测合格数">
-            <el-input-number
-              v-model="form.count"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="请输入检测合格数"
-            >
+            <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="检测不合格数">
-            <el-input-number
-              v-model="form.count"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="请输入检测不合格数"
-            >
+            <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="备注">
-            <el-input
-              v-model="form.note"
-              tyle="width:100%"
-              placeholder="备注"
-            ></el-input>
+            <el-input v-model="form.note" tyle="width:100%" placeholder="备注"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <!-- 七车间 -->
-    <el-form
-      v-if="activeType == '7车间'"
-      ref="dialogForm"
-      :model="form"
-      :rules="rules"
-      label-width="120px"
-    >
+    <el-form v-if="activeType == '7车间'" ref="dialogForm" :model="form" :rules="rules" label-width="120px">
       <el-row>
         <el-col :md="12" :sm="24">
           <el-form-item label="产品名称">
-            <el-select
-              v-model="form.material_out"
-              placeholder="产品名称"
-              disabled
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in materialOptions"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
+            <el-select v-model="form.material_out" placeholder="产品名称" disabled style="width: 100%">
+              <el-option v-for="item in materialOptions" :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="批次号">
-            <el-input
-              v-model="form.batch"
-              tyle="width:100%"
-              placeholder="批次号"
-            ></el-input>
+            <el-input v-model="form.batch" tyle="width:100%" placeholder="批次号"></el-input>
           </el-form-item>
         </el-col>
         <!-- <el-col :md="12" :sm="24">
@@ -515,34 +282,16 @@
         </el-col> -->
         <el-col :md="12" :sm="24">
           <el-form-item label="炉号">
-            <el-select
-              v-model="form.equipment"
-              placeholder="炉号"
-              clearable
-              style="width: 100%"
-              @change="equipmenChange"
-            >
-              <el-option
-                v-for="item in equipmentOptions1"
-                :key="item.id"
-                :label="item.full_name"
-                :value="item.id"
-              ></el-option>
+            <el-select v-model="form.equipment" placeholder="炉号" clearable style="width: 100%" @change="equipmenChange">
+              <el-option v-for="item in equipmentOptions1" :key="item.id" :label="item.full_name"
+                :value="item.id"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :md="12" :sm="24">
           <el-form-item label="第几锅">
-            <el-input-number
-              v-model="form.index"
-              controls-position="right"
-              :min="1"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="第几锅"
-              @change="indexChange"
-            >
+            <el-input-number v-model="form.index" controls-position="right" :min="1" :step="1" :step-strictly="true"
+              style="width: 100%" placeholder="第几锅" @change="indexChange">
             </el-input-number>
             <!-- <el-select v-model="form.index" placeholder="第几锅" clearable style="width:100%">
                             <el-option v-for="item in 8" :key="item" :label="item" :value="item"></el-option>
@@ -551,60 +300,30 @@
         </el-col>
         <el-col :md="12" :sm="24">
           <el-form-item label="应出量">
-            <el-input-number
-              v-model="form.count_real"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="生产量"
-              @change="countChange"
-            >
+            <el-input-number v-model="form.count_real" controls-position="right" :min="0" :step="1" :step-strictly="true"
+              style="width: 100%" placeholder="生产量" @change="countChange">
             </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_ok"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="合格量"
-              @change="countChange"
-            >
+            <el-input-number v-model="form.count_ok" controls-position="right" :min="0" :step="1" :step-strictly="true"
+              style="width: 100%" placeholder="合格量" @change="countChange">
             </el-input-number>
           </el-form-item>
         </el-col>
         <el-col :md="12" :sm="24">
           <el-form-item label="合格率">
             <!-- <span>{{ form.count_ok/form.count_real }}</span> -->
-            <el-input
-              v-model="form.rate"
-              style="width: 100%"
-              disabled
-              placeholder="合格率"
-            >
+            <el-input v-model="form.rate" style="width: 100%" disabled placeholder="合格率">
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :md="12" :sm="24">
           <el-form-item label="退火炉号">
-            <el-select
-              v-model="form.equipment_2"
-              placeholder="退火炉号"
-              clearable
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in equipmentOptions2"
-                :key="item.id"
-                :label="item.full_name"
-                :value="item.id"
-              ></el-option>
+            <el-select v-model="form.equipment_2" placeholder="退火炉号" clearable style="width: 100%">
+              <el-option v-for="item in equipmentOptions2" :key="item.id" :label="item.full_name"
+                :value="item.id"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -627,35 +346,15 @@
                 </el-col> -->
         <el-col :md="12" :sm="24">
           <el-form-item prop="type" label="成型人">
-            <el-select
-              v-model="form.handle_user"
-              placeholder="成型人"
-              clearable
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in userList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
+            <el-select v-model="form.handle_user" placeholder="成型人" clearable 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 prop="type" label="切料人">
-            <el-select
-              v-model="form.handle_user_2"
-              placeholder="切料人"
-              clearable
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in userList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
+            <el-select v-model="form.handle_user_2" placeholder="切料人" clearable 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>
@@ -664,88 +363,43 @@
       <el-row>
         <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 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">
           <el-form-item label="条纹">
-            <el-input-number
-              v-model="form.count_n_tw"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="条纹"
-              @change="countNotOkSun"
-            >
+            <el-input-number v-model="form.count_n_tw" 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_qp"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="气泡"
-              @change="countNotOkSun"
-            >
+            <el-input-number v-model="form.count_n_qp" 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_wq"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="弯曲"
-              @change="countNotOkSun"
-            >
+            <el-input-number v-model="form.count_n_wq" 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_qt"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="其他"
-              @change="countNotOkSun"
-            >
+            <el-input-number v-model="form.count_n_qt" 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_notok"
-              controls-position="right"
-              style="width: 100%"
-              placeholder="合计"
-              disabled
-            >
+            <el-input-number v-model="form.count_notok" controls-position="right" style="width: 100%" placeholder="合计"
+              disabled>
             </el-input-number>
           </el-form-item>
         </el-col>
@@ -757,141 +411,65 @@
       </el-row>
     </el-form>
     <!-- 十车间 -->
-    <el-form
-      v-if="activeType == '10车间'"
-      ref="dialogForm"
-      :model="form"
-      :rules="rules"
-      label-width="80px"
-    >
+    <el-form v-if="activeType == '10车间'" ref="dialogForm" :model="form" :rules="rules" label-width="80px">
       <el-row>
         <el-col :md="12" :sm="24">
           <el-form-item label="产品名称" prop="material">
-            <el-select
-              v-model="form.material_out"
-              placeholder="产品名称"
-              disabled
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in materialOptions"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
+            <el-select v-model="form.material_out" placeholder="产品名称" disabled style="width: 100%">
+              <el-option v-for="item in materialOptions" :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="material">
-            <el-select
-              v-model="form.shift"
-              placeholder="班次"
-              clearable
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in shiftOptions"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
+            <el-select v-model="form.shift" placeholder="班次" clearable style="width: 100%">
+              <el-option v-for="item in shiftOptions" :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="出管总数">
-            <el-input-number
-              v-model="form.count_real"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="出管总数"
-              @change="countChange"
-            >
+            <el-input-number v-model="form.count_real" controls-position="right" :min="0" :step="1" :step-strictly="true"
+              style="width: 100%" placeholder="出管总数" @change="countChange">
             </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_ok"
-              controls-position="right"
-              style="width: 100%"
-              placeholder="合计"
-              :disabled="brothersList.length > 0"
-              @change="countChange"
-            ></el-input-number>
+            <el-input-number v-model="form.count_ok" controls-position="right" style="width: 100%" placeholder="合计"
+              :disabled="brothersList.length > 0" @change="countChange"></el-input-number>
           </el-form-item>
         </el-col>
         <el-col :md="12" :sm="24">
           <el-form-item label="合格率">
-            <el-input
-              v-model="form.rate"
-              style="width: 100%"
-              disabled
-              placeholder="合格率"
-            >
+            <el-input v-model="form.rate" style="width: 100%" disabled placeholder="合格率">
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :md="12" :sm="24">
           <el-form-item prop="type" label="成型人">
-            <el-select
-              v-model="form.handle_user"
-              placeholder="成型人"
-              clearable
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in userList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
+            <el-select v-model="form.handle_user" placeholder="成型人" clearable 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 prop="type" label="带班人">
-            <el-select
-              v-model="form.handle_leader"
-              placeholder="带班人"
-              clearable
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in userList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
+            <el-select v-model="form.handle_leader" placeholder="带班人" clearable 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="碎料">
-            <el-input-number
-              v-model="form.count_break"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="碎料"
-            >
+            <el-input-number v-model="form.count_break" 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="批次号">
-            <el-input
-              v-model="form.batch"
-              tyle="width:100%"
-              placeholder="批次号"
-            ></el-input>
+            <el-input v-model="form.batch" tyle="width:100%" placeholder="批次号"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -900,33 +478,15 @@
         <el-row v-for="item in mlogb" :key="item">
           <el-col :md="12" :sm="24">
             <el-form-item label="生产任务">
-              <el-select
-                v-model="item.material_out"
-                placeholder="产品名称"
-                disabled
-                style="width: 100%"
-              >
-                <el-option
-                  v-for="item in materialOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                ></el-option>
+              <el-select v-model="item.material_out" placeholder="产品名称" disabled style="width: 100%">
+                <el-option v-for="item in materialOptions" :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="合格数">
-              <el-input-number
-                v-model="item.count_ok"
-                controls-position="right"
-                :min="0"
-                :step="1"
-                :step-strictly="true"
-                style="width: 100%"
-                placeholder="合格数"
-                @change="countOkSun"
-              >
+              <el-input-number v-model="item.count_ok" controls-position="right" :min="0" :step="1" :step-strictly="true"
+                style="width: 100%" placeholder="合格数" @change="countOkSun">
               </el-input-number>
             </el-form-item>
           </el-col>
@@ -937,118 +497,57 @@
       <el-row>
         <el-col :md="12" :sm="24">
           <el-form-item label="椭圆/弯曲">
-            <el-input-number
-              v-model="form.count_n_wq"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="椭圆/弯曲"
-              @change="countNotOkSun"
-            >
+            <el-input-number v-model="form.count_n_wq" 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_tw"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="条纹"
-              @change="countNotOkSun"
-            >
+            <el-input-number v-model="form.count_n_tw" 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_dl"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="断裂"
-              @change="countNotOkSun"
-            >
+            <el-input-number v-model="form.count_n_dl" 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_pb"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="偏壁"
-              @change="countNotOkSun"
-            >
+            <el-input-number v-model="form.count_n_pb" 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_dxt"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="大小头"
-              @change="countNotOkSun"
-            >
+            <el-input-number v-model="form.count_n_dxt" 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_js"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="结石"
-              @change="countNotOkSun"
-            >
+            <el-input-number v-model="form.count_n_js" 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"
-              controls-position="right"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-              style="width: 100%"
-              placeholder="气线"
-              @change="countNotOkSun"
-            >
+            <el-input-number v-model="form.count_n_qx" 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_notok"
-              controls-position="right"
-              style="width: 100%"
-              placeholder="合计"
-              disabled
-            >
+            <el-input-number v-model="form.count_notok" controls-position="right" style="width: 100%" placeholder="合计"
+              disabled>
             </el-input-number>
           </el-form-item>
         </el-col>
@@ -1060,9 +559,7 @@
       </el-row>
     </el-form>
     <el-footer>
-      <el-button type="primary" v-loading="isSaveing" @click="submit"
-        >确定</el-button
-      >
+      <el-button type="primary" v-loading="isSaveing" @click="submit">确定</el-button>
       <el-button @click="visible = false">取消</el-button>
     </el-footer>
   </el-dialog>
@@ -1071,8 +568,8 @@
 export default {
   emits: ["success", "closed"],
   props: {
-    mgroupShiftRule:{ type: String, default: "" },
-    mgroup:{ type: String, default: "" },
+    mgroupShiftRule: { type: String, default: "" },
+    mgroup: { type: String, default: "" },
     mtask: { type: String, default: "" },
     mgroupId: { type: String, default: "" },
     activeType: { type: String, default: "" },
@@ -1093,8 +590,8 @@ export default {
       },
       handle_user: [],
       form: {
-        shift:'',
-        batch:'',
+        shift: '',
+        batch: '',
         count_ok: 0,
         count_real: 0,
         count_n_zw: 0,
@@ -1107,7 +604,7 @@ export default {
         count_n_js: 0,
         count_n_qx: 0,
         count_n_qt: 0,
-        count_break:0,
+        count_break: 0,
         mlogb: [],
       },
       mlogb: [],
@@ -1119,7 +616,7 @@ export default {
       equipmentOptions2: [],
       wMaterialOptions: [],
       shiftOptions: [],
-      routeOptions:[],
+      routeOptions: [],
       visible: false,
       isSaveing: false,
       setFiltersVisible: false,
@@ -1127,7 +624,7 @@ export default {
       leader_name: "",
       count_n_all: null,
       equipment_number: "",
-      rules:{
+      rules: {
 
       },
     };
@@ -1139,15 +636,15 @@ export default {
     let day = date.getDate();
     month = month < 10 ? "0" + month : month;
     day = day < 10 ? "0" + day : day;
-    let handle_date =  year + "-" + month + "-" + day;
-    let dateNow =  ''+year+month +day;
+    let handle_date = year + "-" + month + "-" + day;
+    let dateNow = '' + year + month + day;
     this.dateNow = dateNow;
     this.form.material_out = this.material_out;
     this.form.material_in = this.material_in;
     this.form.mtask = this.mtask;
     this.form.mgroup = this.mgroup;
     this.form.handle_date = handle_date;
-    this.form.batch = this.material_model+'-'+dateNow;
+    this.form.batch = this.material_model + '-' + dateNow;
     this.getMaterial();
     this.getUserList();
     this.getEquipment();
@@ -1156,19 +653,19 @@ export default {
     this.getWorkShopMaterial();
     if (this.activeType == "10车间") {
       let mlogb = [];
-        this.brothersList.forEach((item) => {
-          let obj = {};
-          obj.material_out = item.material_out;
-          obj.count_ok = item.count_ok;
-          mlogb.push(obj);
-        });
-        this.mlogb = mlogb;
+      this.brothersList.forEach((item) => {
+        let obj = {};
+        obj.material_out = item.material_out;
+        obj.count_ok = item.count_ok;
+        mlogb.push(obj);
+      });
+      this.mlogb = mlogb;
+    }
+    if (this.activeType == "10车间") {
+      this.getMaterial(0);
+    } else {
+      this.getMaterial(this.mgroup);
     }
-    if(this.activeType == "10车间"){
-        this.getMaterial(0);
-      }else{
-        this.getMaterial(this.mgroup);
-      }
   },
   methods: {
     routeChange(item) {
@@ -1180,12 +677,12 @@ export default {
     },
     getRouteOptions() {
       let mgroup__name = '';
-      if(this.activeType=='8车间'){
+      if (this.activeType == '8车间') {
         mgroup__name = '混料';
-      }else if(this.activeType=='退火'){
+      } else if (this.activeType == '退火') {
         mgroup__name = '管料退火';
-      }else{return}
-      this.$API.mtm.route.list.req({ page: 0, mgroup__name:mgroup__name}).then(res => {
+      } else { return }
+      this.$API.mtm.route.list.req({ page: 0, mgroup__name: mgroup__name }).then(res => {
         for (var i = 0; i < res.length; i++) {
           if (res[i].material_in == null) {
             res[i].material_in_name = ''
@@ -1200,37 +697,37 @@ export default {
     },
     getShiftOptions() {
       let that = this;
-      let req_dict = {page: 0}
+      let req_dict = { page: 0 }
       console.log(this.mgroupShiftRule)
-      if(this.mgroupShiftRule != null && this.mgroupShiftRule != undefined){
+      if (this.mgroupShiftRule != null && this.mgroupShiftRule != undefined) {
         req_dict.rule = this.mgroupShiftRule
       }
       this.$API.mtm.shift.list.req(req_dict).then((res) => {
         that.shiftOptions = res;
-          let list = res.filter(item => 
-            item.rule == '长白班'
-          );
-          if(that.activeType !== '10车间'){
-            that.form.shift=list[0].id;
-          }
+        let list = res.filter(item =>
+          item.rule == '长白班'
+        );
+        if (that.activeType !== '10车间') {
+          that.form.shift = list[0].id;
+        }
       });
     },
-    equipmenChange(val){
+    equipmenChange(val) {
       let that = this;
-      that.equipmentOptions1.forEach(item=>{
-        if(item.id == val){
+      that.equipmentOptions1.forEach(item => {
+        if (item.id == val) {
           let number = item.number;
           that.equipment_number = number.substring(number.length - 1);
-          let index= that.form.index;
-          if(index==undefined||index==''||index==null){
-            index=''
+          let index = that.form.index;
+          if (index == undefined || index == '' || index == null) {
+            index = ''
           }
-          that.form.batch=that.material_model+'-'+that.equipment_number+'-'+that.dateNow+'-'+index;
+          that.form.batch = that.material_model + '-' + that.equipment_number + '-' + that.dateNow + '-' + index;
         }
       })
     },
-    indexChange(val){
-      this.form.batch=this.material_model+'-'+this.equipment_number+'-'+this.dateNow+'-'+val;
+    indexChange(val) {
+      this.form.batch = this.material_model + '-' + this.equipment_number + '-' + this.dateNow + '-' + val;
     },
     getUserList() {
       let that = this;
@@ -1250,9 +747,9 @@ export default {
     getMgroupList() {
       let that = this;
       let activeDeptName = ''
-      if (this.activeType=='退火'){
+      if (this.activeType == '退火') {
         activeDeptName = '8车间'
-      }else{
+      } else {
         activeDeptName = this.activeType
       }
       this.$API.mtm.mgroup.list
@@ -1263,10 +760,10 @@ export default {
     },
     //获取设备列表
     getEquipment() {
-      this.$API.em.equipment.list.req({ page: 0, type: 10,name__contains:'单坩埚熔化炉' }).then((res1) => {
+      this.$API.em.equipment.list.req({ page: 0, type: 10, name__contains: '单坩埚熔化炉' }).then((res1) => {
         this.equipmentOptions1 = res1;
-      });	
-      this.$API.em.equipment.list.req({ page: 0, type: 10,name__contains:'网带式退火炉' }).then((res2) => {
+      });
+      this.$API.em.equipment.list.req({ page: 0, type: 10, name__contains: '升降式退火炉' }).then((res2) => {
         this.equipmentOptions2 = res2;
       });
     },
@@ -1296,8 +793,8 @@ export default {
     },
     getWorkShopMaterial() {
       let that = this;
-      if(this.form.material_in){
-          this.$API.wpm.wmaterial.list
+      if (this.form.material_in) {
+        this.$API.wpm.wmaterial.list
           .req({ material: this.form.material_in, page: 0, count__gte: 1 })
           .then((res) => {
             that.wMaterialOptions = res;
@@ -1326,7 +823,7 @@ export default {
           this.form.count_n_dl +
           this.form.count_n_pb +
           this.form.count_n_dxt +
-          this.form.count_n_js+
+          this.form.count_n_js +
           this.form.count_n_qx;
       } else if (this.activeType == "退火") {
         this.form.count_notok =
@@ -1398,11 +895,11 @@ export default {
             });
             this.form.mlogb = newArr;
           }
-          let sun = this.form.count_ok+this.form.count_notok;
-          if ((this.activeType == "7车间"||this.activeType == "10车间")&&sun!=this.form.count_real) {
-              this.isSaveing = false;
-              this.$message.error("合格总数与不合格总数与生产量/出管总数不对等");
-          }else{
+          let sun = this.form.count_ok + this.form.count_notok;
+          if ((this.activeType == "7车间" || this.activeType == "10车间") && sun != this.form.count_real) {
+            this.isSaveing = false;
+            this.$message.error("合格总数与不合格总数与生产量/出管总数不对等");
+          } else {
             if (this.mode == "add") {
               this.$API.wpm.mlog.create
                 .req(this.form)
@@ -1433,7 +930,7 @@ export default {
                 });
             }
           }
-          
+
         }
       });
     },
@@ -1479,8 +976,8 @@ export default {
     },
     //选择
     materialInChange(val) {
-      for(let i=0;i<this.materialOptions.length;i++){
-        if(this.materialOptions[i].id==val){
+      for (let i = 0; i < this.materialOptions.length; i++) {
+        if (this.materialOptions[i].id == val) {
           this.form.material_out = data[0].material_out;
         }
       }