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

# Conflicts:
#	src/views/system/order/index.vue

src/views/login.vue

@@ -6,7 +6,7 @@
       :rules="loginRules"
       class="login-form"
     >
-      <h3 class="title">欢迎登录</h3>
+      <h3 class="title">泉医到家运营管理平台</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"

src/views/system/goodsOrder/index.vue

@@ -16,15 +16,15 @@
           @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="orderStatusinfo">
+      <el-form-item label="订单状态" prop="orderStatus">
         <el-select
           v-model="queryParams.orderStatus"
           placeholder="请选择订单状态"
@@ -167,7 +167,7 @@
     />
     <!-- 查看商品信息弹框 -->
     <el-dialog
-      title="查看订单信息"
+      title="查看商品信息"
       :visible.sync="innerorder"
       append-to-body
       width="1200px"
@@ -339,7 +339,7 @@
 
     <!-- 查看物流信息弹框 -->
     <el-dialog
-      title="查看物流信息"
+      title="录入物流单号"
       :visible.sync="innerlogistics"
       append-to-body
       width="500px"
@@ -729,6 +729,9 @@ seelogistics(id) {
 searchlogistics() {
   console.log(this.queryexpressNo)
   editExpressNo(this.queryexpressNo).then(res => {
+     if(res.code == 200){
+          this.$modal.msgSuccess("录入成功");
+        }
     this.queryexpressNo.expressNo = ""
     this.innerlogistics = false
     console.log(res)
@@ -759,6 +762,9 @@ submitRefundOrder() {
   obj.remark = this.refundlist.refundReasonRemark
   obj.goodsStatus = this.refundlist.orderStatus
   weChatRefundOrderApply(obj).then(res => {
+     if(res.code == 200){
+          this.$modal.msgSuccess("退款成功");
+        }
     // console.log(obj)
     this.innerrefund = false
   })
@@ -800,12 +806,25 @@ refundcancel() {
 },
 // 表单重置
 reset() {
+   this.queryParams={
+        pageNum: 1,
+        pageSize: 10,
+        nurseStationId: null,
+        patientId: null,
+        orderNo: null,
+        orderStatus: null,
+        totalPrice: null,
+        receiver: null,
+        receiveAddress: null,
+        phone: null,
+        orderTime: null,
+        orderChannel: null,
+      }
   this.form = {
     id: null,
     nurseStationId: null,
     patientId: null,
     orderNo: null,
-    orderStatus: "0",
     totalPrice: null,
     receiver: null,
     receiveAddress: null,
@@ -817,9 +836,10 @@ reset() {
     createBy: null,
     createTime: null,
     updateBy: null,
-    updateTime: null
+    updateTime: null,
+    orderStatus: "",
   };
-  this.resetForm("form");
+  this.resetForm("queryParams");
 },
 /** 搜索按钮操作 */
 handleQuery() {
@@ -828,10 +848,11 @@ handleQuery() {
 },
 /** 重置按钮操作 */
 resetQuery() {
+  this.reset();
   this.resetForm("queryForm");
   this.handleQuery();
-  //  this.getList();
 },
+
 // 多选框选中数据
 handleSelectionChange(selection) {
   this.ids = selection.map(item => item.id)

src/views/system/order/index.vue

@@ -8,7 +8,7 @@
       v-show="showSearch"
       label-width="100px"
     >
-      <el-form-item label="客户" prop="patientName" style="margin-left: -4%">
+      <el-form-item label="客户" prop="patientName">
         <el-input
           v-model="queryParams.patientName"
           placeholder="请输入客户"
@@ -58,8 +58,11 @@
       :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">
   <el-button                  v-if="scope.row.orderStatus=='WAIT_PAY'">待付款</el-button>
@@ -83,7 +86,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-zoom-in"
             @click="seeLook(scope.row)"
             v-hasPermi="['system:nurseType:edit']"
             >查看</el-button
@@ -91,15 +94,16 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-s-promotion"
             @click="dispatch(scope.row)"
             v-hasPermi="['system:nurseType:edit']"
+            v-if="scope.row.orderStatus=='WAIT_DISPATCH'"
             >派单</el-button
           >
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-error"
             @click="cencel(scope.row.appointmentOrderId)"
             v-hasPermi="['system:nurseType:edit']"
             >取消预约</el-button
@@ -304,27 +308,27 @@
     >
       <el-form
         ref="queryForm"
-        :model="querynursePerson"
+        :model="querynursePersonname"
         :rules="rules"
         label-width="80px"
         :inline="true"
       >
         <el-form-item label="姓名" prop="nursePersonName" label-width="120">
           <el-input
-            v-model="querynursePerson.nursePersonName"
+            v-model="querynursePersonname.nursePersonName"
             placeholder="请输入姓名"
             clearable
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="手机号" prop="phone" label-width="120">
+        <!-- <el-form-item label="手机号" prop="phone" label-width="120">
           <el-input
-            v-model="querynursePerson.phone"
+            v-model="querynursePersonname.phone"
             placeholder="请输入手机号"
             clearable
             @keyup.enter.native="handleQuery"
           />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item>
           <el-button
             type="primary"
@@ -333,7 +337,7 @@
             @click="handleQuery2"
             >搜索</el-button
           >
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery2"
             >重置</el-button
           >
         </el-form-item>
@@ -342,9 +346,9 @@
         <el-table-column label="请选择" width="70" align="center">
           <template slot-scope="scope">
             <el-button
-              type="primary"
+               type="primary"
               style="width: 15px; height: 15px; overflow: hidden"
-              v-if="nursePersonid == scope.row.id"
+              v-if="nursePersonid == scope.row.nurseStationPersonId"
               circle
               @click="nursePersonclick(scope.row)"
             ></el-button>
@@ -365,7 +369,7 @@
         </el-table-column>
         <el-table-column
           property="nursePersonName"
-          label="会员姓名"
+          label="护理站人员姓名"
           width="150"
           align="center"
         >
@@ -395,13 +399,13 @@
           </template>
         </el-table-column>
       </el-table>
-      <!-- <pagination
+      <pagination
         v-show="total2 > 0"
         :total="total2"
-        :page.sync="querynursePerson.pageNum"
+        :page.sync="querynursePersonname.pageNum"
-        :limit.sync="querynursePerson.pageSize"
+        :limit.sync="querynursePersonname.pageSize"
         @pagination="handleQuery2"
-      /> -->
+      />
     </el-dialog>
   </div>
 </template>
@@ -412,7 +416,7 @@ import {
   deldetailed,
   getPerson,
   dispatchsubmit,
-  confirmCancel,
+  confirmCancel
 } from "@/api/system/order";
 export default {
   name: "order",
@@ -461,10 +465,12 @@ export default {
       dispatchlist: [],
       nurseName: "请选择护理员",
       nursePersonid: "",
-      querynursecencel: {
+      // querynursecencel:{
-        appointmentOrderId: "",
+      //   appointmentOrderId:"",
-      },
+      // },
-      // total2: 0,
+      appointmentOrderId:"",
+      nurseStationPersonId :"",
+      total2: 0,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -479,17 +485,21 @@ export default {
         pageNum: 1,
         pageSize: 10,
       },
-      querynursePerson: {
+      // querynursePerson: {
-        nursePersonName: null,
+      //   nursePersonName: null,
-        phone: null,
+      //   phone: null,
-        pageNum: 1,
+      //   pageNum: 1,
-        pageSize: 10,
+      //   pageSize: 10,
-      },
+      // },
       querynursePersonname: {
-        detailsId: "",
+        orderNo:"",
-        nursePersonName: null,
+        nursePersonName:null,
         nursePersonType: null,
         departmentName: null,
+        pageNum: 1,
+        pageSize: 10,
+        // detailsId: "",
+        // nursePersonName: null,
       },
       query: [],
 
@@ -537,42 +547,53 @@ export default {
 
     // 派单
     dispatch(row) {
-      console.log(row);
+      console.log(row)
-      this.querynursePersonname.detailsId = row.detailsId;
+      this.querynursePersonname.orderNo = row.orderNo
-      console.log(this.querynursePersonname.detailsId);
+      console.log(this.querynursePersonname.orderNo);
       // console.log(row)
       this.nurseName = "请选择护理员";
       this.innerdispatch = true;
+       this.nursePersonid =""
     },
     // 姓名弹框
     clicknursePersonName() {
       // console.log(this.dispatchlist);
       getPerson(this.querynursePersonname).then((res) => {
         this.dispatchlist = res.rows;
-        // this.total2 = res.total;
+        this.total2 = res.total;
         console.log(this.dispatchlist);
         this.nursePersonNameinfo = true;
       });
     },
     // 姓名弹框确定按钮
     submitForm() {
-      console.log(this.dispatchlist);
+      // console.log(this.querynursePersonname)
-      var obj = {};
+      // var obj = {}
-      obj.id = this.nursePersonid;
+      // obj.nurseStationPersonId = nurseStationPersonId
-      obj.nurseStationPersonId = this.querynursePersonname.detailsId;
+      // obj.orderNo = this.querynursePersonname.orderNo
-      dispatchsubmit(obj).then((res) => {
+       let params={
+            nurseStationPersonId:this.nursePersonid,
+            orderNo:this.querynursePersonname.orderNo
+          }
+      dispatchsubmit(params).then((res) => {
+        if(res.code == 200){
+          this.$modal.msgSuccess("派单成功");
+        }
         this.nurseName = "请选择护理员";
         this.innerdispatch = false;
-      });
+        // this.nursePersonid =""
+
+      })
     },
     // 选择姓名按钮
     nursePersonclick(row) {
-      this.nursePersonid = row.id;
+      this.nursePersonid = row.nurseStationPersonId
-      this.nurseName = row.nursePersonName;
+      this.nurseName = row.nursePersonName
       this.nursePersonNameinfo = false;
-      console.log(row);
+      console.log(row)
+
     },
-    // 确认取消预约
+
     // cencel(appointmentOrderId) {
     //   confirmCancel(appointmentOrderId).then((res) => {
     //     //  this.nurseName="请选择护理员";
@@ -581,25 +602,37 @@ export default {
     //   })
     //   console.log(appointmentOrderId)
     // },
-
+       // console.log(row.appointmentOrderId)
-    cencel(row) {
+  //  this.appointmentOrderId = row.appointmentOrderId
-      console.log("row :>> ", this.querynursecencel.appointmentOrderId);
+    // console.log('row :>> ', this.querynursecencel.appointmentOrderId);
-      this.querynursecencel.appointmentOrderId = row.appointmentOrderId;
       // obj.appointmentOrderId=row.appointmentOrderId
-      this.$confirm("是否确认取消订单", "提示", {
+
-        confirmButtonText: "确定",
+
-        cancelButtonText: "取消",
+   // 确认取消预约
-        type: "warning",
+    cencel(appointmentOrderId) {
-      })
+      this.$confirm(
+        '是否确认取消订单',
+        "提示",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
         .then(() => {
-          confirmCancel(this.querynursecencel).then((res) => {
+          console.log(appointmentOrderId)
+          let params={
+            appointmentOrderId:appointmentOrderId
+          }
+          confirmCancel(params).then((res) => {
             this.$message.success("取消成功");
-            this.getList();
+            // this.getList();
             // console.log('this.OrderDetailsList :>> ', this.OrderDetailsList);
           });
+
         })
-        .catch(() => {});
+        .catch(() => { });
-    },
+   },
     /** 查询护理类型信息列表 */
     getList() {
       this.loading = true;
@@ -630,16 +663,20 @@ export default {
       this.getList();
     },
     handleQuery2() {
-      getPerson(this.querynursePerson).then((res) => {
+      getPerson(this.querynursePersonname).then((res) => {
-        this.dispatchlist = res.data;
+        this.dispatchlist = res.rows;
-        console.log(this.dispatchlist);
+        console.log(this.querynursePersonname);
-        this.innerdispatch = true;
+        // this.innerdispatch = true;
       });
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
       this.handleQuery();
+    },
+     resetQuery2() {
+      this.resetForm("queryForm");
+      this.handleQuery2();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {