优化

src/views/material/product/components/MaterialModal.vue

@@ -255,11 +255,11 @@ export default {
                 },
 
                 {
-                    label: '重量',
+                    label: '数量',
                     prop: 'netWeight'
                 },
                 {
-                    label: '重量单位',
+                    label: '单位',
                     prop: 'weightUnit'
                 },
             ],
@@ -358,13 +358,25 @@ export default {
         },
 
         removeTab(targetName) {
-            this.tabsList.forEach(e => {
-                if (e.id == targetName) {
-                    bomTaskDelete([e.oldId]).then(res => {
-                        this.taskListHead()
-                    })
-                }
+
+            this.$confirm('是否删除当前工序?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
             })
+                .then(() => {
+
+                    this.tabsList.forEach(e => {
+                        if (e.id == targetName) {
+                            bomTaskDelete([e.oldId]).then(res => {
+                                this.taskListHead()
+                            })
+                        }
+                    })
+                })
+                .catch(() => { });
+
+
 
 
         },

src/views/workforceManagement/classes/components/timeTable.vue

@@ -36,7 +36,7 @@
           trigger: 'change'
         }">
           <el-time-picker style="width: 100%" format="HH:mm" value-format="HH:mm:ss" placeholder="结束时间"
-            v-model="scope.row.endTime"  @change="changeEndTime">
+            v-model="scope.row.endTime" @change="changeEndTime">
           </el-time-picker>
           <!-- :picker-options="{
               selectableRange: setEndTime(scope)
@@ -212,11 +212,20 @@ export default {
         (reDate.test(s2) ? s2 : '1970-01-01 ' + s2).replace(/-/g, '/')
       );
       var ms = s2.getTime() - s1.getTime();
-      if (ms < 0) return 0;
-      result = Math.floor(ms / 1000 / 60 / 60); //小时
-      row.workHour = result;
-      this.$emit('timeAll', this.gettimeAll());
-      return result;
+      console.log(ms)
+      if (ms < 0) {
+         let time = 86400000 - s1.getTime() + s2.getTime()
+         result = (time / 1000 / 60 / 60).toFixed(1); //小时
+        row.workHour = result;
+        this.$emit('timeAll', this.gettimeAll());
+        return result
+      } else {
+        result = (ms / 1000 / 60 / 60).toFixed(1); //小时
+        row.workHour = result;
+        this.$emit('timeAll', this.gettimeAll());
+        return result;
+      }
+
     },
     // 获取工作日时常
     gettimeAll() {