修改

src/api/system/order.js

@@ -87,4 +87,11 @@ export function edit(data) {
         method: "post",
         data
     })
+}
+//确认完成
+export function updateCompanionStatus(orderStatus, orderNo) {
+    return request({
+        url: `/system/appointmentOrder/updateCompanionStatus?orderStatus=${orderStatus}&orderNo=${orderNo}`,
+        method: "post"
+    })
 }

src/views/system/order/index.vue

@@ -101,9 +101,16 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.orderType=='COMPANION_IN_HOSPITAL'"
+            v-if="scope.row.orderType=='COMPANION_IN_HOSPITAL'&&scope.row.orderStatus == 'WAIT_DISPATCH'"
             @click="seeedit(scope.row)"
           >编辑</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            v-if="scope.row.orderType=='COMPANION_IN_HOSPITAL'&&scope.row.orderStatus == 'WAIT_DISPATCH'"
+            @click="Confirmcompletion(scope.row)"
+          >确认完成</el-button>
           <el-button
             size="mini"
             type="text"
@@ -569,7 +576,8 @@ import {
   xylWeChatRefundNotify,
   appointmentOrderDetails,
   getPersonInfo,
-  edit
+  edit,
+  updateCompanionStatus
 } from "@/api/system/order";
 import { getListByUser } from "@/api/system/userlist.js";
 
@@ -832,6 +840,21 @@ export default {
       this.query.companionStartDate = this.formatDate(new Date(e[0]).getTime());
       this.query.companionEndDate = this.formatDate(new Date(e[1]).getTime());
     },
+    //确认完成
+    Confirmcompletion(row) {
+      this.$confirm("确认完成此陪诊陪护订单？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          updateCompanionStatus(row.orderStatus, row.orderNo).then(res => {
+            this.$modal.msgSuccess("订单已完成");
+            this.getList();
+          });
+        })
+        .catch(() => {});
+    },
     //编辑
     seeedit(row) {
       this.loading = true;

src/views/system/station/index.vue

@@ -222,7 +222,6 @@
           <template>
             <el-button
               @click="clickinnerVisible()"
-              type
               style="
                 width: 208px;
                 text-align: left;
@@ -237,7 +236,6 @@
             >{{ form.classifyNameList }}</el-button>
             <el-button
               @click="clickinnerVisible()"
-              type
               style="
                 width: 208px;
                 text-align: left;