diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index 418c899..058dd8f 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -6,8 +6,23 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      label-width="90px"
     >
+    <el-form-item label="所属护理站" prop="nurseStationName">
+        <el-select
+          v-model="queryParams.nurseStationId"
+          placeholder="请选择护理站"
+          v-loadmore="loadMore"
+        >
+          <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="orderNo">
         <el-input
           v-model="queryParams.orderNo"
@@ -16,6 +31,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
       <el-form-item label="订单状态" prop="orderStatus">
         <el-select
           v-model="queryParams.orderStatus"
@@ -50,6 +66,11 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="所属护理站"
+        align="center"
+        prop="nurseStationName"
+      />
       <el-table-column
         label="订单编号"
         align="center"
@@ -125,7 +146,7 @@
             type="text"
             icon="el-icon-edit"
             @click="seelogistics(scope.row)"
-            v-hasPermi="['system:nurseType:edit']"
+            v-hasPermi="['system:goodsOrder:editExpressNo']"
             >修改物流单号</el-button
           >
           <el-button
@@ -134,7 +155,7 @@
             type="text"
             icon="el-icon-edit"
             @click="seelogistics(scope.row)"
-            v-hasPermi="['system:nurseType:edit']"
+            v-hasPermi="['system:goodsOrder:editExpressNo']"
             >录入物流单号</el-button
           >
           <el-button
@@ -143,7 +164,7 @@
             type="text"
             icon="el-icon-edit"
             @click="seelogistics(scope.row)"
-            v-hasPermi="['system:nurseType:edit']"
+            v-hasPermi="['system:goodsOrder:editExpressNo']"
             >录入物流单号</el-button
           >
            <el-button
@@ -152,7 +173,7 @@
             type="text"
             icon="el-icon-edit"
             disabled
-            v-hasPermi="['system:nurseType:edit']"
+            v-hasPermi="['system:goodsOrder:editExpressNo']"
             >不可录入物流单号</el-button
           >
         </template>
@@ -168,7 +189,7 @@
             type="text"
             icon="el-icon-edit"
             @click="seeOrder(scope.row)"
-            v-hasPermi="['system:nurseType:edit']"
+            v-hasPermi="['system:goodsOrder:goodsOrderByOrder']"
             >查看商品信息</el-button
           >
 
@@ -178,7 +199,7 @@
             type="text"
             icon="el-icon-edit"
             @click="refund(scope.row.id)"
-            v-hasPermi="['system:nurseType:edit']"
+            v-hasPermi="['system:goodsOrder:goodsOrderRefund']"
             >确认退款</el-button
           >
           <el-button
@@ -187,7 +208,7 @@
             type="text"
             icon="el-icon-edit"
             disabled
-            v-hasPermi="['system:nurseType:edit']"
+            v-hasPermi="['system:goodsOrder:goodsOrderRefund']"
             >确认退款</el-button
           >
         </template>
@@ -562,6 +583,7 @@ import {
   goodsOrderrefund,
   weChatRefundOrderApply,
 } from "@/api/system/goodsOrder";
+import { getListByUser } from "@/api/system/userlist.js";
 
 export default {
   name: "GoodsOrder",
@@ -575,6 +597,7 @@ export default {
       innerrefund: false,
       orderList: [],
       refundlist: [],
+      nurseStationlist: [],
       orderStatuslist: [
         {
           value: "WAIT_PAY",
@@ -650,6 +673,11 @@ export default {
       queryexpressNo: {
         id: "",
         expressNo: null,
+      },
+        //权限查询
+      getListByUserquery: {
+        pageNum: 1,
+        pageSize: 10,
       },
       refundinfo: {
         id: "",
@@ -662,6 +690,7 @@ export default {
   },
   created() {
     this.getList();
+    this.info();
   },
   methods: {
     // 退款类型
@@ -760,7 +789,7 @@ export default {
         this.queryexpressNo.expressNo = "";
          this.getList();
         this.innerlogistics = false;
-       
+
       });
     },
     // 取消按钮
@@ -792,7 +821,7 @@ export default {
         }
         this.getList();
         this.innerrefund = false;
-         
+
       });
     },
     // refund(id){
@@ -872,8 +901,20 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.reset();
-      this.resetForm("queryForm");
+      if (this.nurseStationlist[0].isAdmin == '1') {
+        this.resetForm("queryForm");
+        this.queryParams = {
+          pageNum: 1,
+          pageSize: 10
+        }
+      } else {
+        this.queryParams.pageNum = 1;
+        this.queryParams.pageSize = 10
+        this.queryParams.orderNo = null
+        this.queryParams.orderStatus = null
+
+
+      }
       this.handleQuery();
     },
 
@@ -942,6 +983,40 @@ export default {
         },
         `goodsOrder_${new Date().getTime()}.xlsx`
       );
+    },
+        //权限列表
+    info() {
+      // goodsCategory().then((res) => {
+      //   console.log(this.form);
+      //   this.goodsCategorylist = res.rows;
+      // });
+      getListByUser(this.getListByUserquery).then((res) => {
+        if (res.rows[0].isAdmin == "1") {
+          this.nurseStationlist = res.rows;
+          this.total2 = res.total;
+        } else {
+          this.total2 = res.total;
+          this.nurseStationlist = res.rows;
+          this.queryParams.nurseStationId = res.rows[0].id;
+          this.handleQuery();
+        }
+      });
+    },
+    //滑动下拉框
+    loadMore() {
+      var a = Math.ceil(this.total2 / 10);
+      if (this.nurseStationlist.length + 1 >= this.total2) {
+      } else {
+        if (this.getListByUserquery.pageNum >= a) {
+        } else {
+          this.getListByUserquery.pageNum++;
+          getListByUser(this.getListByUserquery).then((res) => {
+            res.rows.forEach((e) => {
+              this.nurseStationlist.push(e);
+            });
+          });
+        }
+      }
     },
     // orderStatus(code) {
     //   var obj = {
diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index f8f43e0..721c1d3 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -135,7 +135,7 @@
             type="text"
             icon="el-icon-zoom-in"
             @click="seeLook(scope.row)"
-            v-hasPermi="['system:nurseType:edit']"
+            v-hasPermi="['system:appointmentOrder:query']"
             >查看</el-button
           >
           <el-button
@@ -143,7 +143,7 @@
             type="text"
             icon="el-icon-s-promotion"
             @click="dispatch(scope.row)"
-            v-hasPermi="['system:nurseType:edit']"
+            v-hasPermi="['system:appointmentOrder:dispatch']"
             v-if="scope.row.orderStatus == 'WAIT_DISPATCH'"
             >派单</el-button
           >
@@ -162,7 +162,7 @@
             icon="el-icon-error"
             v-if="scope.row.orderStatus == 'WAIT_REFUND'"
             @click="cencel(scope.row)"
-            v-hasPermi="['system:nurseType:edit']"
+            v-hasPermi="['system:appointmentOrder:confirmCancel']"
             >取消预约</el-button
           >
           <el-button
@@ -171,7 +171,7 @@
             icon="el-icon-error"
             v-else
             disabled
-            v-hasPermi="['system:nurseType:edit']"
+            v-hasPermi="['system:appointmentOrder:confirmCancel']"
             >取消预约</el-button
           >
           <el-button
@@ -534,7 +534,7 @@ export default {
           value: "CANCEL",
           label: "已取消",
         },
-        
+
         // {
         //   value: "WAIT_RECEIVED_GOODS",
         //   label: "待收货",
@@ -548,7 +548,7 @@ export default {
           value: "WAIT_DISPATCH",
           label: "待派单",
         },
-     
+
         {
           value: "WAIT_REFUND",
           label: "退款中",
diff --git a/src/views/system/person/index.vue b/src/views/system/person/index.vue
index 120a2c3..347168a 100644
--- a/src/views/system/person/index.vue
+++ b/src/views/system/person/index.vue
@@ -1323,10 +1323,12 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery2() {
+      this.StationqueryParams.pageNum = 1;
       this.getList2();
     },
     // 修改护理站弹框的搜索
     handleQuery4() {
+      this.StationqueryParams.pageNum = 1;
       this.getList2();
     },
     //修改所属科室
@@ -1349,7 +1351,6 @@ export default {
       this.innerVisiblexg2 = false;
       this.resetQuery3();
     },
-
     resetQuery2() {
       this.resetForm("queryForm");
       this.StationqueryParams = {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 956afc1..9364937 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -822,6 +822,7 @@ export default {
     },
     /** 重置密码按钮操作 */
     handleResetPwd(row) {
+
       this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -930,4 +931,4 @@ export default {
     },
   },
 };
-</script>
\ No newline at end of file
+</script>