修改 商品订单 和预约

src/views/system/goodsOrder/index.vue

@@ -16,14 +16,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="收货人" prop="receiver">
+      <!-- <el-form-item label="收货人" prop="receiver">
         <el-input
           v-model="queryParams.receiver"
           placeholder="请输入收货人"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="订单状态" prop="orderStatus">
         <el-select
           v-model="queryParams.orderStatus"
@@ -167,7 +167,7 @@
     />
     <!-- 查看商品信息弹框 -->
     <el-dialog
-      title="查看订单信息"
+      title="查看商品信息"
       :visible.sync="innerorder"
       append-to-body
       width="1200px"

src/views/system/order/index.vue

@@ -60,8 +60,13 @@
       :data="OrderDetailsList"
       @selection-change="handleSelectionChange"
     >
+      <el-table-column label="所属护理站" align="center" prop="nurseStationName" />
+      
+
       <el-table-column label="会员名称" align="center" prop="patientName" />
       <el-table-column label="订单编号" align="center" prop="orderNo" />
+     <el-table-column label="护理项目名称" align="center" prop="nurseItemName" />
+            <el-table-column label="订单总金额" align="center" prop="totalPrice" />
       <el-table-column label="订单状态" align="center" prop="orderStatus">
         <template slot-scope="scope">
           {{ scope.row.orderStatus == "WAIT_PAY" ? "待付款" : "" }}
@@ -91,7 +96,7 @@
             icon="el-icon-s-promotion"
             @click="dispatch(scope.row)"
             v-hasPermi="['system:nurseType:edit']"
-            v-if="scope.row.orderStatus==WAIT_DISPATCH"
+            v-if="scope.row.orderStatus=='WAIT_DISPATCH'"
             >派单</el-button
           >
           <el-button