弹框修改

src/api/system/order.js

@@ -11,11 +11,21 @@ export function appointmentOrderDetailsList(query) {
 
 export function Detailed(id) {
     return request({
-        url: `/system/appointmentOrderDetails/Detailed` + `?orderNo=${id}`,
+        url: `/system/appointmentOrderDetails/getCancelOrderInfo` + `?orderNo=${id}`,
         method: 'get',
 
     })
 }
+
+// 确定按钮
+export function xylWeChatRefundNotify(data) {
+    return request({
+
+        url: '/nurseApp/weChatPayment/weChatRefundOrderApply',
+        method: 'post',
+        data: data
+    })
+}
 //删除
 export function deldetailed(appointmentOrderId) {
     return request({
@@ -50,4 +60,4 @@ export function confirmCancel(appointmentOrderId) {
         url: `/system/appointmentOrder/confirmCancel?appointmentOrderId=${appointmentOrderId}`,
         method: 'post'
     })
-}
+}

src/views/system/OperateGoodsInfo/index.vue

@@ -239,8 +239,34 @@
             style="width: 210px"
           />
         </el-form-item>
-        <el-form-item label="护理站名称">
+        <el-form-item label="护理站名称" prop="nurseStationId">
-          <el-select
+          <el-button
+            type=""
+            @click="clickinnerVisible"
+            v-if="StationName == '请选择所属护理站'"
+            style="
+              width: 200px;
+              text-align: left;
+              height: 36px;
+              color: #c0c4cc;
+              overflow: hidden;
+            "
+            >{{ StationName }}</el-button
+          >
+          <el-button
+            type=""
+            @click="clickinnerVisible"
+            v-else
+            style="
+              width: 200px;
+              text-align: left;
+              height: 36px;
+              padding-left: -10px;
+              overflow: hidden;
+            "
+            >{{ StationName }}</el-button
+          >
+          <!-- <el-select
             style="width: 210px"
             v-model="form.nurseStationId"
             clearable
@@ -253,7 +279,7 @@
               :value="item.id"
             >
             </el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <el-form-item label="商品分类名称" prop="goodsCategoryId">
           <el-select
@@ -390,6 +416,106 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 新增护理站名称弹框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="innerVisible"
+      width="1000px"
+      append-to-body
+       :before-close="addcancel"
+    >
+      <el-form
+        ref="queryForm"
+        :model="nurseStationqueryParams"
+        :rules="rules"
+        label-width="80px"
+        :inline="true"
+      >
+        <el-form-item
+          label="护理站编码"
+          prop="nurseStationCode"
+          label-width="120"
+        >
+          <el-input
+            v-model="nurseStationqueryParams.nurseStationCode"
+            placeholder="请输入护理站编码"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item
+          label="护理站名称"
+          prop="nurseStationName"
+          label-width="120"
+        >
+          <el-input
+            v-model="nurseStationqueryParams.nurseStationName"
+            placeholder="请输入护理站名称"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery2"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery2"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+      <el-table :data="nurseStationlist" @cell-dblclick="nurseclick">
+        <el-table-column label="请选择" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              style="width: 15px; height: 15px"
+              v-if="nurseStationId == scope.row.id"
+              circle
+              @click="nurseclick(scope.row)"
+            ></el-button>
+            <el-button
+              v-else
+              style="width: 15px; height: 15px"
+              circle
+              @click="nurseclick(scope.row)"
+            ></el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          property="nurseStationCode"
+          label="护理站编码"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="nurseStationName"
+          label="护理站名称"
+          align="center"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+
+        <el-table-column property="phone" label="联系电话" align="center">
+        </el-table-column>
+        <el-table-column
+          property="address"
+          label="护理站地址"
+          align="center"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="nursetotal > 0"
+        :total="nursetotal"
+        :page.sync="nurseStationqueryParams.pageNum"
+        :limit.sync="nurseStationqueryParams.pageSize"
+        @pagination="handleQuery2"
+      />
+    </el-dialog>
     <!-- 查看商品详情 -->
     <!-- <el-dialog
       :title="title"
@@ -582,6 +708,10 @@ export default {
       // 是否显示弹出层
       open: false,
       // open2: false,
+      innerVisible: false,
+      StationName: "请选择所属护理站",
+      nursetotal: 0,
+      nurseStationId: null,
       goods: [
         {
           value: "BUSINESS",
@@ -610,6 +740,10 @@ export default {
         id: null,
         whetherShelf: null,
       },
+      nurseStationqueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
       queryParams: {
         id: null,
         pageNum: 1,
@@ -643,7 +777,7 @@ export default {
           { required: true, message: "请选择商品分类名称", trigger: "blur" },
         ],
         nurseStationId: [
-          { required: true, message: "请选择护理站名称", trigger: "blur" },
+          { required: true, message: "请选择所属护理站", trigger: "blur" },
         ],
         goodsPurpose: [
           { required: true, message: "请选择商品用途", trigger: "blur" },
@@ -702,6 +836,7 @@ export default {
         this.loading = false;
       });
     },
+
     // list() {
     //   listStation().then((res) => {
     //     console.log(res);
@@ -751,6 +886,7 @@ export default {
     cancel() {
       this.open = false;
       this.reset();
+      this.StationName = "请选择所属护理站";
       this.goodDetailsLists = [
         {
           attributeName: "",
@@ -765,6 +901,7 @@ export default {
         },
       ];
 
+
       // this.goodDetailsLists = [{
       //   attributeName: "",
       //   attributePitureUrl: "",
@@ -774,6 +911,49 @@ export default {
       //   ids: 1,
       // }]
     },
+    clickinnerVisible() {
+      this.innerVisible = true
+    },
+    nurseclick(row) {
+      console.log(this.form);
+      console.log(row);
+      this.form.nurseStationId = row.id;
+      this.StationName = row.nurseStationName;
+      this.innerVisible = false;
+    },
+    handleQuery2(){
+      this.queryParams.pageNum = 1;
+      this.getList2()
+    },
+    getList2(){
+       getListByUser(this.nurseStationqueryParams).then((res) => {
+        this.nursetotal = res.total;
+        this.nurseStationlist = res.rows;
+      });
+    },
+     resetQuery2() {
+      this.resetForm("queryForm");
+      this.nurseStationqueryParams={
+        pageNum:1,
+        pageSize:10
+      },
+      this.handleQuery2();
+
+    },
+      addcancel() {
+      this.innerVisible = false;
+      // this.innerVisiblexg = false;
+      this.resetQuery2();
+
+    },
+    // getList2() {
+    //   // 护理站名称
+    //   this.loading = true;
+    //   getListByUser(this.nurseStationqueryParams).then((res) => {
+    //     this.nursetotal = res.total;
+    //     this.nurseStationlist = res.rows;
+    //   });
+    // },
     // 表单重置
     reset() {
       this.form = {
@@ -826,22 +1006,26 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.nurseStationId=""
       this.title = "商品基本信息";
-      this.goodDetailsLists = [
+      // this.nurseName = "请选择护理员";
-        {
+      this.StationName = "请选择所属护理站";
-          attributePitureUrl: "",
+        this.goodDetailsLists = [
-          goodsPrice: "",
+          {
-          goodsStock: "",
+            attributePitureUrl: "",
-          sort: "",
+            goodsPrice: "",
-          ids: 9999999,
+            goodsStock: "",
-        },
+            sort: "",
-      ];
+            ids: 9999999,
+          },
+        ];
       this.open = true;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.goodsInfoId || this.ids;
+     this.StationName = row.nurseStationName;
       getGoodsInfo(id).then((response) => {
         this.form = response.data[0];
         if (response.data[0].goodAttributeDetailsLists) {
@@ -865,6 +1049,7 @@ export default {
     // },
     /** 提交按钮 */
     submitForm() {
+        console.log(this.form);
       console.log(this.goodDetailsLists);
       this.form.goodAttributeDetailsLists = [];
       this.form.goodDetailsLists = this.goodDetailsLists;
@@ -879,10 +1064,13 @@ export default {
               this.getList();
             });
           } else {
+            // this.nurseStationId=this.form.nurseStationId
             addGoodsInfo(this.form).then((response) => {
               console.log(this.form);
               this.$modal.msgSuccess("新增成功");
-              this.open = false;
+
+              this.StationName = "请选择所属护理站";
+                this.open = false;
               this.getList();
             });
           }
@@ -904,7 +1092,7 @@ export default {
             // console.log('this.OrderDetailsList :>> ', this.OrderDetailsList);
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     // handleDelete(row) {
     //   const ids = row.id || this.ids;

src/views/system/StationDepartment/index.vue

@@ -60,22 +60,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="科室负责人名称" prop="departmentPerson">
-        <el-input
-          v-model="queryParams.departmentPerson"
-          placeholder="请输入科室负责人名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </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"
@@ -138,7 +122,6 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
       <el-table-column
         label="护理站名称"
         align="center"
@@ -146,11 +129,6 @@
       />
       <el-table-column label="科室编码" align="center" prop="departmentCode" />
       <el-table-column label="科室名称" align="center" prop="departmentName" />
-      <!-- <el-table-column
-        label="科室负责人名称"
-        align="center"
-        prop="departmentPerson"
-      /> -->
       <el-table-column label="联系电话" align="center" prop="phone" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="创建人" align="center" prop="createBy" />
@@ -214,7 +192,7 @@
           >
             <el-button
               type=""
-              v-if="item.nurseStationName == '请选择护理站名称'"
+              v-if="item.nurseStationName == '请选择所属护理站'"
               @click="clickinnerVisible(item, index)"
               style="
                 width: 250px;
@@ -320,25 +298,11 @@
         <el-form-item label="所属护理站" prop="nurseStationId">
           <el-input
             v-model="form.nurseStationName"
-            placeholder="请选择护理站"
+            placeholder="请选择所属护理站"
             style="width: 250px"
             disabled
           />
-          <!-- <el-select
+
-            v-model="form.nurseStationId"
-            clearable
-            placeholder="请选择护理站"
-            style="width: 250px"
-            disabled
-          >
-            <el-option
-              v-for="item in nurseStationlist"
-              :key="item.id"
-              :label="item.nurseStationName"
-              :value="item.id"
-            >
-            </el-option>
-          </el-select> -->
         </el-form-item>
         <el-form-item label="科室名称" prop="departmentName">
           <el-input
@@ -452,21 +416,6 @@
           :show-overflow-tooltip="true"
         >
         </el-table-column>
-        <!-- <el-table-column
-          label="护理站类型"
-          align="center"
-          prop="nurseStationType"
-        >
-          <template slot-scope="scope">
-            {{
-              scope.row.nurseStationType == "LX202209140018" ? "生活护理" : ""
-            }}
-            {{
-              scope.row.nurseStationType == "LX202209140019" ? "医疗护理" : ""
-            }}
-          </template>
-        </el-table-column> -->
-
         <el-table-column property="phone" label="联系电话" align="center">
         </el-table-column>
         <el-table-column
@@ -564,7 +513,7 @@ export default {
           nurseStationId: [
             {
               required: true,
-              message: "请选择护理站",
+              message: "请选择所属护理站",
               trigger: "blur",
             },
           ],
@@ -594,7 +543,7 @@ export default {
         nurseStationId: [
           {
             required: true,
-            message: "请选择护理站",
+            message: "请选择所属护理站",
             trigger: "blur",
           },
         ],
@@ -659,7 +608,7 @@ export default {
         departmentName: "",
         departmentPerson: "",
         phone: "",
-        nurseStationName: "请选择护理站名称",
+        nurseStationName: "请选择所属护理站",
       };
       if (this.form.nurseStationDepartmentList.length == 5) {
         this.$message.error("最多只能5条");
@@ -731,7 +680,7 @@ export default {
             departmentName: "",
             departmentPerson: "",
             phone: "",
-            nurseStationName: "请选择护理站名称",
+            nurseStationName: "请选择所属护理站",
           },
         ],
       };

src/views/system/goodsOrder/index.vue

@@ -16,14 +16,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="收货人" prop="receiver">
-        <el-input
-          v-model="queryParams.receiver"
-          placeholder="请输入收货人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
       <el-form-item label="订单状态" prop="orderStatus">
         <el-select
           v-model="queryParams.orderStatus"
@@ -110,9 +102,7 @@
         </template>
       </el-table-column>
       <el-table-column label="订单总金额" align="center" prop="totalPrice" />
-      <!-- <el-table-column label="收货人" align="center" prop="receiver" />
+
-      <el-table-column label="收货地址" align="center" prop="receiveAddress" />
-      <el-table-column label="联系电话" align="center" prop="phone" /> -->
       <el-table-column
         label="下单时间"
         align="center"
@@ -776,6 +766,7 @@ export default {
         }
         this.queryexpressNo.expressNo = "";
         this.innerlogistics = false;
+
         this.getList();
       });
     },
@@ -805,8 +796,8 @@ export default {
         if (res.code == 200) {
           this.$modal.msgSuccess("退款成功");
         }
-        // console.log(obj)
         this.innerrefund = false;
+         this.getList();
       });
     },
     // refund(id){

src/views/system/order/index.vue

@@ -345,18 +345,18 @@
       title="取消预约"
       :visible.sync="innerrefund"
       append-to-body
-      width="900px"
+      width="500px"
     >
       <el-form :inline="true" :rules="rules" label-width="120px">
-        <el-form-item label="护理站名称" prop="nurseStationName">
+        <el-form-item label="订单编号" prop="orderNo">
           <el-input
             style="width: 260px"
-            v-model="query.nurseStationName"
+            v-model="query.orderNo"
             clearable
             :disabled="true"
           />
         </el-form-item>
-        <el-form-item label="护理项目名称" prop="nurseItemName">
+        <el-form-item label="服务项目" prop="nurseItemName">
           <el-input
             v-model="query.nurseItemName"
             style="width: 260px"
@@ -364,51 +364,28 @@
             :disabled="true"
           />
         </el-form-item>
-        <el-form-item label="服务时间" prop="time">
+        <el-form-item label="会员姓名" prop="time">
           <el-input
-            v-model="query.time"
+            v-model="query.patientName"
             style="width: 260px"
             clearable
             :disabled="true"
           />
         </el-form-item>
-        <el-form-item label="护理时长" prop="itemServeDurationUnit">
+         <el-form-item label="退款原因" prop="cancelAppointmentReason">
-          <el-input
-            v-model="query.itemServeDurationUnit"
-            clearable
-            style="width: 260px"
-            :disabled="true"
-          />
-        </el-form-item>
-        <el-form-item label="订单状态" prop="orderStatus">
-          <el-input
-            :value="switchOrderStatus(query.orderStatus)"
-            style="width: 260px"
-            disabled
-          >
-          </el-input>
-        </el-form-item>
-        <el-form-item label="总金额" prop="nurseItemPrice">
-          <el-input
-            v-model="query.nurseItemPrice"
-            clearable
-            style="width: 260px"
-            :disabled="true"
-          />
-        </el-form-item>
-        <el-form-item label="服务地址" prop="serviceAddress">
           <el-input
             style="width: 260px"
-            v-model="query.serviceAddress"
+            v-model="query.cancelAppointmentReason"
+            placeholder=""
             clearable
             type="textarea"
             :rows="5"
-            :disabled="true"
+            disabled
           />
-        </el-form-item>
+           </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button>取 消</el-button>
+        <el-button @click="cencelbtn">取 消</el-button>
         <el-button type="primary" @click="ordercacenl">确 定</el-button>
       </div>
     </el-dialog>
@@ -430,10 +407,10 @@
             v-model="querynursePersonname.nursePersonName"
             placeholder="请输入姓名"
             clearable
-          
+
           />
         </el-form-item>
-       
+
         <el-form-item>
           <el-button
             type="primary"
@@ -521,28 +498,50 @@ import {
   deldetailed,
   getPerson,
   dispatchsubmit,
+  xylWeChatRefundNotify,
 } from "@/api/system/order";
 import { weChatRefundOrderApply } from "@/api/system/goodsOrder";
 export default {
   name: "order",
   data() {
     return {
-      orderStatuslist: [
+       orderStatuslist: [
         {
           value: "WAIT_PAY",
           label: "待付款",
         },
         {
-          value: "WAIT_DISPATCH",
+          value: "PAY",
-          label: "待派单",
+          label: "已付款",
         },
         {
-          value: "NOT_FINISH",
+          value: "CANCEL",
-          label: "未完成",
+          label: "已取消",
         },
         {
-          value: "COMPLETE",
+          value: "WAIT_RECEIVED_GOODS",
-          label: "服务完成",
+          label: "待收货",
+        },
+
+        {
+          value: "RECEIVED_GOODS",
+          label: "已收货",
+        },
+        {
+          value: "WAIT_REFUND",
+          label: "退款中",
+        },
+        {
+          value: "REFUNDED",
+          label: "已退款",
+        },
+        {
+          value: "WAIT_RETURNED_GOODS",
+          label: "待退货",
+        },
+        {
+          value: "RETURNED_GOODS",
+          label: "已退货",
         },
       ],
       value: "",
@@ -597,7 +596,7 @@ export default {
         departmentName: null,
         pageNum: 1,
         pageSize: 10,
-    
+
       },
       query: [],
       // 表单参数
@@ -610,17 +609,26 @@ export default {
     this.getList();
   },
   methods: {
-    //取消预约
+    //取消预约确定按钮
     ordercacenl() {
       var obj = {
         orderNo: this.query.orderNo,
-        refundReason: this.query.cancelAppointmentReason,
         refundPrice: this.query.totalPrice,
-        goodsStatus: this.query.orderStatus,
+        refundReason: this.query.cancelAppointmentReason,
       };
-      weChatRefundOrderApply(obj).then((res) => {
+      xylWeChatRefundNotify(obj).then((res) => {
+        if (res.code == 200) {
+          this.$modal.msgSuccess("退款成功");
+        }
+        this.innerrefund=false
+        this.getList();
         console.log(res);
       });
+
+    },
+    // 取消按钮
+    cencelbtn(){
+ this.innerrefund = false;
     },
     switchOrderStatus(orderStatus) {
       switch (orderStatus) {
@@ -697,13 +705,7 @@ export default {
     // 确认取消预约
     cencel(row) {
       Detailed(row.orderNo).then((res) => {
-        res.data.forEach((e) => {
+        this.query = res.data;
-          if (e.serviceDate) {
-            e.time =
-              e.serviceDate + "-" + e.serviceStartTime + "-" + e.serviceEndTime;
-          }
-        });
-        this.query = res.data[0];
         this.innerrefund = true;
       });
     },

src/views/system/person/index.vue

@@ -125,17 +125,6 @@
           >导入</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:person:export']"
-          >导出</el-button
-        >
-      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -237,7 +226,7 @@
             <el-button
               type=""
               @click="clickinnerVisible(item, index)"
-              v-if="item.nurseStationName == '请选择护理站名称'"
+              v-if="item.nurseStationName == '请选择所属护理站'"
               style="
                 width: 200px;
                 text-align: left;
@@ -412,14 +401,6 @@
         label-width="80px"
         :inline="true"
       >
-        <!-- <el-form
-        :model="queryParams2"
-        ref="queryForm"
-        size="small"
-        :inline="true"
-        v-show="showSearch"
-        label-width="90px"
-      > -->
         <el-form-item
           label="护理站编码"
           prop="nurseStationCode"
@@ -429,7 +410,6 @@
             v-model="nurseStationqueryParams.nurseStationCode"
             placeholder="请输入护理站编码"
             clearable
-            @keyup.enter.native="handleQuery"
           />
         </el-form-item>
         <el-form-item
@@ -441,7 +421,6 @@
             v-model="nurseStationqueryParams.nurseStationName"
             placeholder="请输入护理站名称"
             clearable
-            @keyup.enter.native="handleQuery"
           />
         </el-form-item>
         <el-form-item>
@@ -488,20 +467,6 @@
           :show-overflow-tooltip="true"
         >
         </el-table-column>
-        <!-- <el-table-column
-          label="护理站类型"
-          align="center"
-          prop="nurseStationType"
-        >
-          <template slot-scope="scope">
-            {{
-              scope.row.nurseStationType == "LX202211070001" ? "生活护理" : ""
-            }}
-            {{
-              scope.row.nurseStationType == "LX202211070002" ? "医疗护理" : ""
-            }}
-          </template>
-        </el-table-column> -->
 
         <el-table-column property="phone" label="联系电话" align="center">
         </el-table-column>
@@ -514,8 +479,8 @@
         </el-table-column>
       </el-table>
       <pagination
-        v-show="total5 > 0"
+        v-show="nursetotal > 0"
-        :total="total5"
+        :total="nursetotal"
         :page.sync="nurseStationqueryParams.pageNum"
         :limit.sync="nurseStationqueryParams.pageSize"
         @pagination="handleQuery2"
@@ -531,29 +496,20 @@
     >
       <el-form
         ref="queryForm"
-        :model="queryParams2"
+       :model="nurseStationqueryParams"
         :rules="rules"
         label-width="80px"
         :inline="true"
       >
-        <!-- <el-form
-        :model="queryParams2"
-        ref="queryForm"
-        size="small"
-        :inline="true"
-        v-show="showSearch"
-        label-width="90px"
-      > -->
         <el-form-item
           label="护理站编码"
           prop="nurseStationCode"
           label-width="120"
         >
           <el-input
-            v-model="queryParams2.nurseStationCode"
+            v-model="nurseStationqueryParams.nurseStationCode"
             placeholder="请输入护理站编码"
             clearable
-            @keyup.enter.native="handleQuery"
           />
         </el-form-item>
         <el-form-item
@@ -562,10 +518,9 @@
           label-width="120"
         >
           <el-input
-            v-model="queryParams2.nurseStationName"
+            v-model="nurseStationqueryParams.nurseStationName"
             placeholder="请输入护理站名称"
             clearable
-            @keyup.enter.native="handleQuery"
           />
         </el-form-item>
         <el-form-item>
@@ -611,29 +566,14 @@
           align="center"
         >
         </el-table-column>
-        <!-- <el-table-column
-          label="护理站类型"
-          align="center"
-          prop="nurseStationType"
-        >
-          <template slot-scope="scope">
-            {{
-              scope.row.nurseStationType == "LX202209140018" ? "生活护理" : ""
-            }}
-            {{
-              scope.row.nurseStationType == "LX202209140019" ? "医疗护理" : ""
-            }}
-          </template>
-        </el-table-column> -->
-
         <el-table-column property="phone" label="联系电话" align="center">
         </el-table-column>
         <el-table-column property="address" label="护理站地址" align="center">
         </el-table-column>
       </el-table>
       <pagination
-        v-show="total5 > 0"
+        v-show="nursetotal > 0"
-        :total="total5"
+        :total="nursetotal"
         :page.sync="nurseStationqueryParams.pageNum"
         :limit.sync="nurseStationqueryParams.pageSize"
         @pagination="handleQuery2"
@@ -645,6 +585,7 @@
       :visible.sync="innerVisible2"
       width="1000px"
       append-to-body
+      :before-close="departcancel"
     >
       <el-form
         ref="queryForm"
@@ -658,7 +599,6 @@
             v-model="queryParams3.departmentCode"
             placeholder="请输入科室编码"
             clearable
-            @keyup.enter.native="handleQuery"
           />
         </el-form-item>
         <el-form-item label="科室名称" prop="" label-width="120">
@@ -666,7 +606,6 @@
             v-model="queryParams3.departmentName"
             placeholder="请输入科室名称"
             clearable
-            @keyup.enter.native="handleQuery"
           />
         </el-form-item>
         <el-form-item>
@@ -726,8 +665,8 @@
         </el-table-column>
       </el-table>
       <pagination
-        v-show="total3 > 0"
+        v-show="departtotal > 0"
-        :total="total3"
+        :total="departtotal"
         :page.sync="queryParams3.pageNum"
         :limit.sync="queryParams3.pageSize"
         @pagination="handleQuery3"
@@ -739,6 +678,7 @@
       :visible.sync="innerVisiblexg2"
       width="1000px"
       append-to-body
+      :before-close="departcancel"
     >
       <el-form
         ref="queryForm"
@@ -747,20 +687,12 @@
         label-width="80px"
         :inline="true"
       >
-        <!-- <el-form
-        :model="queryParams2"
-        ref="queryForm"
-        size="small"
-        :inline="true"
-        v-show="showSearch"
-        label-width="90px"
-      > -->
         <el-form-item label="科室编码" prop="departmentCode" label-width="120">
           <el-input
             v-model="queryParams3.departmentCode"
             placeholder="请输入科室编码"
             clearable
-            @keyup.enter.native="handleQuery"
+
           />
         </el-form-item>
         <el-form-item label="科室名称" prop="" label-width="120">
@@ -768,7 +700,7 @@
             v-model="queryParams3.departmentName"
             placeholder="请输入科室名称"
             clearable
-            @keyup.enter.native="handleQuery"
+
           />
         </el-form-item>
         <el-form-item>
@@ -828,8 +760,8 @@
         </el-table-column>
       </el-table>
       <pagination
-        v-show="total3 > 0"
+        v-show="departtotal > 0"
-        :total="total3"
+        :total="departtotal"
         :page.sync="queryParams3.pageNum"
         :limit.sync="queryParams3.pageSize"
         @pagination="handleQuery3"
@@ -847,7 +779,7 @@
           <el-button
             disabled
             type=""
-            v-if="nurseStationName == '请选择护理站名称'"
+            v-if="nurseStationName == '请选择所属护理站'"
             style="width: 362px; text-align: left; height: 36px; color: #c0c4cc"
             >{{ nurseStationName }}</el-button
           >
@@ -1084,12 +1016,9 @@ export default {
       // 显示搜索条件
       showSearch: true,
       // 总条数
-      // total:null,
       total: 0,
-      total2: 0,
+      departtotal: 0,
-      total3: 0,
+      nursetotal: 0,
-      total4: 0,
-      total5: 0,
       // 护理站人员信息表格数据
       nurseStationPersonList: [],
       // 护理站名称
@@ -1100,14 +1029,15 @@ export default {
       stationid: "",
       stationid2: "",
       departid: "",
-      nurseStationName: "请选择护理站名称",
+      nurseStationName: "请选择所属护理站",
       departmentName: "请选择所属科室",
       // 弹出层标题
       title: "",
       title2: "",
       title3: "",
-      // 是否显示弹出层
+      // 修改弹出层
       open: false,
+      // 添加弹出层
       open2: false,
       //权限查询
       // 查询参数
@@ -1155,9 +1085,7 @@ export default {
         departmentName: [
           { required: true, message: "所属科室不能为空", trigger: "blur" },
         ],
-        // nurseStationId: [
+
-        //   { required: true, message: "所属护理站不能为空", trigger: "blur" },
-        // ],
         nursePersonName: [
           { required: true, message: "护理人姓名不能为空", trigger: "blur" },
         ],
@@ -1180,7 +1108,7 @@ export default {
           nursePersonName: [
             {
               required: true,
-              message: "护理站人员名称不能为空",
+              message: "请选择所属护理站",
               trigger: "blur",
             },
           ],
@@ -1188,7 +1116,7 @@ export default {
             { required: true, message: "所属科室不能为空", trigger: "blur" },
           ],
           nurseStationId: [
-            { required: true, message: "所属护理站不能为空", trigger: "blur" },
+            { required: true, message: "请选择所属护理站", trigger: "blur" },
           ],
           nursePersonName: [
             { required: true, message: "护理人姓名不能为空", trigger: "blur" },
@@ -1208,22 +1136,13 @@ export default {
           address: [
             { required: true, message: "居住地址不能为空", trigger: "blur" },
           ],
-          // nurseStationPersonList: {
-          //   nursePersonName: [
-          //     {
-          //       required: true,
-          //       message: "请输入护理站人员名称",
-          //       trigger: "blur",
-          //     },
-          //   ],
-          // },
         },
       },
     };
   },
   created() {
     this.getList();
-    this.getList2();
+    // this.getList2();
     // this.nurselist();
     this.info();
   },
@@ -1239,10 +1158,9 @@ export default {
     departclick2() {
       StationDepartmentList(this.queryParams3).then((res) => {
         this.StationDepartmentLists = res.rows;
-        this.total3 = res.total;
+        this.departtotal = res.total;
         this.loading = false;
       });
-      // console.log(item);
       this.departid2 = this.form.departmentCode;
       this.innerVisiblexg2 = true;
       // this.index = index;
@@ -1253,33 +1171,6 @@ export default {
       this.innerVisible = true;
       this.index = index;
     },
-    //xialakuang
-    // loadMore() {
-    //   console.log("1");
-    //   var a = Math.ceil(this.total4 / 10);
-    //   console.log(this.nurseStationlist.length);
-    //   if (this.nurseStationlist.length + 1 >= this.total4) {
-    //   } else {
-    //     if (this.nurseStationqueryParams.pageNum >= a) {
-    //     } else {
-    //       this.nurseStationqueryParams.pageNum++;
-    //       stationList(this.nurseStationqueryParams).then((res) => {
-    //         console.log(res);
-    //         res.rows.forEach((e) => {
-    //           this.nurseStationlist.push(e);
-    //         });
-    //       });
-    //     }
-    //   }
-    // },
-    nurselist() {
-      stationList(this.nurseStationqueryParams).then((res) => {
-        console.log(res);
-        this.nurseStationlist = res.rows;
-        this.total4 = res.total;
-        console.log(this.nurseStationlist);
-      });
-    },
     //删除deldisease
     deldisease(index) {
       this.form.nurseStationPersonList.splice(index, 1);
@@ -1368,14 +1259,13 @@ export default {
     getList2() {
       // 护理站名称
       this.loading = true;
-      stationList(this.queryParams2).then((res) => {
+        getListByUser(this.nurseStationqueryParams).then((res) => {
-        this.stationLists = res.rows;
+        this.nursetotal = res.total;
-        this.total2 = res.total;
+        this.nurseStationlist = res.rows;
-        this.loading = false;
       });
       StationDepartmentList(this.queryParams3).then((res) => {
         this.StationDepartmentLists = res.rows;
-        this.total3 = res.total;
+        this.departtotal = res.total;
         this.loading = false;
       });
     },
@@ -1383,7 +1273,7 @@ export default {
     cancel() {
       this.open = false;
       this.open2 = false;
-      this.nurseStationName = "请选择护理站名称";
+      this.nurseStationName = "请选择所属护理站";
       this.departmentName = "请选择所属科室";
       // this.upload.open=false;
       this.reset();
@@ -1404,7 +1294,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        nurseStationName: "请选择护理站名称",
+        nurseStationName: "请选择所属护理站",
         departmentName: "请选择所属科室",
         nurseStationPersonList: [
           {
@@ -1414,7 +1304,7 @@ export default {
             nursePersonCode: "",
             nursePersonName: "",
             nursePersonType: "",
-            nurseStationName: "请选择护理站名称",
+            nurseStationName: "请选择所属护理站",
             phone: "",
             address: "",
             sex: "",
@@ -1426,41 +1316,31 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery2() {
-      getListByUser(this.nurseStationqueryParams).then((res) => {
+      this.nurseStationqueryParams.pageNum = 1;
-        this.total5 = res.total;
+      this.getList2()
-        this.nurseStationlist = res.rows;
-      });
     },
     handleQuery3() {
-      console.log(this.queryParams3);
+      this.queryParams3.pageNum = 1;
-      StationDepartmentList(this.queryParams3).then((response) => {
+      this.getList2()
-        this.StationDepartmentLists = response.rows;
+      // this.getList();
-        this.total3 = response.total;
-        this.loading = false;
-      });
-      this.queryParams.pageNum = 1;
-      this.getList();
     },
     handleQuery() {
-      // stationList(this.nurseStationqueryParams).then((res) => {
-      //   console.log(res);
-      //   this.nurseStationlist = res.rows;
-      //   this.total4 = res.total;
-      //   console.log(this.nurseStationlist);
-      // });
       this.queryParams.pageNum = 1;
       this.getList();
-      //  this.nurselist()
-      // this.stationList();
-      // this.nurseStationlist()
     },
     /** 重置按钮操作 */
     addcancel() {
       this.innerVisible = false;
       this.innerVisiblexg = false;
       this.resetQuery2();
-      this.resetQuery3();
+
     },
+    departcancel(){
+       this.innerVisible2 = false;
+       this.innerVisiblexg2=false;
+       this.resetQuery3();
+    },
+
     resetQuery2() {
       this.nurseStationqueryParams = {
         pageNum: 1,
@@ -1481,13 +1361,8 @@ export default {
         departmentName: null,
         nurseStationId: null,
       };
-      StationDepartmentList(this.queryParams3).then((response) => {
+       this.handleQuery3()
-        this.StationDepartmentLists = response.rows;
-        this.total3 = response.total;
-        this.loading = false;
-      });
     },
-
     resetQuery() {
       if (this.nurseStationlist[0].isAdmin == "1") {
         this.resetForm("queryForm");
@@ -1525,16 +1400,14 @@ export default {
       this.reset();
       this.open2 = true;
       this.title = "添加护理站人员信息";
-      this.title2 = "请选择护理站";
+      this.title2 = "请选择所属护理站";
       this.title3 = "请选择科室";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      // this.reset();
       const id = row.id || this.ids;
       getPerson(id).then((response) => {
         console.log(response);
-        // this.departmentName="请选择科室"
         this.departmentName = response.data.departmentName;
         this.nurseStationName = response.data.nurseStationName;
         this.form = response.data;
@@ -1551,8 +1424,6 @@ export default {
     submitForm() {
       console.log(this.form);
       this.$refs["form"].validate((valid) => {
-        // this.form.nursename = null;
-        // this.form.nurseStationId = null;
         if (valid) {
           if (this.form.id != null) {
             updatePerson(this.form).then((response) => {
@@ -1565,7 +1436,7 @@ export default {
               this.$modal.msgSuccess("新增成功");
               this.open2 = false;
               this.getList();
-              this.nurseStationName = "请选择护理站名称";
+              this.nurseStationName = "请选择所属护理站";
               this.departmentName = "请选择所属科室";
             });
           }
@@ -1641,9 +1512,9 @@ export default {
         if (res.rows[0].isAdmin == "1") {
           console.log(true);
           this.nurseStationlist = res.rows;
-          this.total5 = res.total;
+          this.nursetotal = res.total;
         } else {
-          this.total5 = res.total;
+          this.nursetotal = res.total;
           this.nurseStationlist = res.rows;
           this.queryParams.nurseStationId = res.rows[0].id;
           this.handleQuery();
@@ -1652,8 +1523,8 @@ export default {
     },
     //滑动下拉框
     loadMore() {
-      var a = Math.ceil(this.total5 / 10);
+      var a = Math.ceil(this.nursetotal / 10);
-      if (this.nurseStationlist.length + 1 >= this.total5) {
+      if (this.nurseStationlist.length + 1 >= this.nursetotal) {
       } else {
         if (this.nurseStationqueryParams.pageNum >= a) {
         } else {
@@ -1668,24 +1539,6 @@ export default {
         }
       }
     },
-    // loadMore() {
-    //   console.log("1");
-    //   var a = Math.ceil(this.total4 / 10);
-    //   console.log(this.nurseStationlist.length);
-    //   if (this.nurseStationlist.length + 1 >= this.total4) {
-    //   } else {
-    //     if (this.nurseStationqueryParams.pageNum >= a) {
-    //     } else {
-    //       this.nurseStationqueryParams.pageNum++;
-    //       stationList(this.nurseStationqueryParams).then((res) => {
-    //         console.log(res);
-    //         res.rows.forEach((e) => {
-    //           this.nurseStationlist.push(e);
-    //         });
-    //       });
-    //     }
-    //   }
-    // },
   },
 };
 </script>