Merge remote-tracking branch 'origin/dev' into dev

392f2254 · 李驰骋 · fbd596c0 · 0630240e · 392f2254
Commit 392f2254 authored Jan 28, 2024 by 李驰骋
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

proofingApply.vue src/views/mes/proofing/proofingApply.vue +3 -3

No files found.
--- a/src/views/mes/proofing/proofingApply.vue
+++ b/src/views/mes/proofing/proofingApply.vue
@@ -447,10 +447,10 @@ export default {

    // 审批
    handleFinish(row) {
-      row.prototypeRequestStatus = 1;
      this.$modal
-        .confirm("确认通过样品申请单？一旦完成，此工单将无法继续修改")
-        .then(function () {
+      .confirm("确认通过样品申请单？一旦完成，此工单将无法继续修改")
+      .then(function () {
+          row.prototypeRequestStatus = 1;
          return dofinish(row); //完成申请单审批
        })
        .then(() => {