Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2

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(() => { });
         },
     }
 }