From 97e02f1231eb97fdc689ace5ea23dc91c3f580c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Thu, 12 Jan 2023 15:22:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/goodsOrder/index.vue | 24 ++++++++++++++++++------
 src/views/system/order/index.vue      |  1 +
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index 87273e9..de6cdfd 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -30,7 +30,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
       <el-form-item label="订单状态" prop="orderStatus">
         <el-select
           v-model="queryParams.orderStatus"
@@ -45,6 +44,14 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="联系电话" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入联系电话"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -124,6 +131,12 @@
           >
         </template>
       </el-table-column>
+      <el-table-column
+        label="联系电话"
+        align="center"
+        prop="phone"
+        width="180"
+      />
       <el-table-column
         label="下单时间"
         align="center"
@@ -137,7 +150,7 @@
           {{ scope.row.orderChannel == "ALI_PAY_APPLET" ? "支付宝小程序" : "" }}
         </template>
       </el-table-column>
-      <el-table-column label="备注信息" align="center" prop="remark" />
+      <!-- <el-table-column label="备注信息" align="center" prop="remark" /> -->
       <el-table-column label="录入物流单号" align="center" prop="remark">
         <template slot-scope="scope">
           <el-button
@@ -310,7 +323,7 @@
             style="width: 240px"
           />
         </el-form-item>
-              <el-form-item label="综合评分" v-if="orderList.compositeScore">
+        <el-form-item label="综合评分" v-if="orderList.compositeScore">
           <div style="width: 240px">
             <el-rate
               v-if="orderList.compositeScore"
@@ -348,7 +361,7 @@
             "
           >
             <img
-               style="width: 23%;height:100%;margin:1%"
+              style="width: 23%; height: 100%; margin: 1%"
               v-for="(item, index) in ratelist"
               :src="baseurl + item.evaluatePictureUrl"
               alt=""
@@ -881,13 +894,12 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      console.log(this.nurseStationlist);
-      console.log(this.nurseStationlist);
       if (this.nurseStationlist[0]) {
         this.queryParams.pageNum = 1;
         this.queryParams.pageSize = 10;
         this.queryParams.orderNo = null;
         this.queryParams.orderStatus = null;
+        this.queryParams.phone = null;
       }
 
       // this.queryParams = {
diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index 5b01306..20c6e01 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -119,6 +119,7 @@
       </el-table-column>
       <el-table-column label="下单时间" align="center" prop="createTime" />
       <el-table-column label="会员名称" align="center" prop="patientName" />
+      <el-table-column label="护理员" align="center" prop="nursePersonName" />
       <el-table-column
         label="操作"
         align="center"