Merge remote-tracking branch 'origin/master'

ui/src/views/production/daily/index.vue

@@ -26,7 +26,7 @@
           type="success"
           icon="el-icon-check"
           size="mini"
-          @click="handleConfirm"
+          @click="handleConfirmUpdate"
           v-hasPermi="['production:report:edit']"
         >{{ $t('保存') }}</el-button>
       </el-form-item>
@@ -85,7 +85,7 @@
             <td class="no-border" colspan="3">Material Balance</td>
             <td class="no-border" colspan="14"></td>
             <td class="no-border">Unit: </td>
-            <td class="no-border">Ton</td>
+            <td class="no-border">Ton</td>d uid
             <td class="no-border">Date: </td>
             <td class="no-border bg-blue">{{reportData.reportDate}}</td>
           </tr>
@@ -3877,14 +3877,22 @@ export default {
       //   this.title = "修改每日生产报告";
       // });
     },
-
-    /** 确定按钮操作 */
-    handleConfirm(row) {
+    /** 确定修改按钮操作 */
+    handleConfirmUpdate(row) {
       this.updating = false;
+      updateReport(this.reportData).then(response => {
+        if (response.code == 200) {
+          this.$message.success("修改成功");
+        } else {
+          this.$message.error("未知错误，请联系管理员！");
+        }
+        this.getReport();
+      });
     },
-    /** 取消按钮操作 */
+    /** 取消修改按钮操作 */
     handleCancelUpdate(row) {
       this.updating = false;
+      this.getReport();
     },
     /** 设置日期 */
     setDateAsToday() {