From 9b7991c44e077c4370b9d2c5992efb502b7f265f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=AF=E8=88=AA=E8=80=81=E9=BD=90?= <280645618@qq.com>
Date: Thu, 2 Oct 2025 15:49:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=AC=E4=B8=9C=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/views/jd/order/index.vue | 52 +++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/vue/src/views/jd/order/index.vue b/vue/src/views/jd/order/index.vue
index 6b9538c1..f92de048 100644
--- a/vue/src/views/jd/order/index.vue
+++ b/vue/src/views/jd/order/index.vue
@@ -174,6 +174,14 @@
       <el-table-column label="下单时间" align="center" prop="orderStartTime" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button style="padding-right: 6px;padding-left: 6px"
+                     v-if="scope.row.auditStatus === 0"
+                     size="mini"
+                     type="success" plain
+                     icon="el-icon-success"
+                     @click="handleConfirm(scope.row)"
+                     v-hasPermi="['dou:order:edit']"
+          >确认订单</el-button>
           <el-button
             size="mini"
             :loading="pullLoading"
@@ -366,7 +374,49 @@ export default {
         this.$modal.msgSuccess(JSON.stringify(response));
         this.pullLoading = false
       })
-    }
+    },
+    handleConfirm(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getOrder(id).then(response => {
+        this.form = response.data;
+        this.form.provinces = []
+        this.form.provinces.push(response.data.provinceName)
+        this.form.provinces.push(response.data.cityName)
+        this.form.provinces.push(response.data.townName)
+        this.detailOpen = true;
+        this.detailTitle = "确认订单";
+        this.isAudit = true
+      });
+    },
+    submitConfirmForm(){
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          const form = {
+            orderId:this.form.id,
+            province:this.form.provinces[0],
+            city:this.form.provinces[1],
+            town:this.form.provinces[2],
+            address:this.form.maskPostAddress,
+            receiver:this.form.maskPostReceiver,
+            mobile:this.form.maskPostTel
+          }
+
+          confirmOrder(form).then(response => {
+            if(response.code===200){
+              this.$modal.msgSuccess("订单确认成功");
+              this.detailOpen = false;
+              this.isAudit = false
+              this.getList();
+            }else{
+              this.$modal.msgError(response.msg);
+            }
+
+          });
+
+        }
+      })
+    },
   }
 };
 </script>