Merge remote-tracking branch 'origin/ch' into sdl_20220916_护理站人员功能

# Conflicts:
#	.env.development

src/views/system/station/index.vue

@@ -208,7 +208,11 @@
           >
         </template>
       </el-table-column>
-      <el-table-column label="所属区域" align="center" prop="sysAreaVOList[0].streetName" />
+      <el-table-column
+        label="所属区域"
+        align="center"
+        prop="sysAreaVOList[0].streetName"
+      />
       <el-table-column label="护理站地址" align="center" prop="address" />
       <!-- <el-table-column
         label="护理站简介"
@@ -1087,7 +1091,7 @@ export default {
     liststationinfo() {
       listStation(this.queryParams).then((response) => {
         this.stationList = response.rows;
-        console.log('this.stationList :>> ', this.stationList);
+        console.log("this.stationList :>> ", this.stationList);
         this.total = response.total;
         this.loading = false;
       });

src/views/system/stationConsumable/index.vue

@@ -8,7 +8,11 @@
       v-show="showSearch"
       label-width="100px"
     >
-      <el-form-item label="护理站名称" prop=""  v-if="nurseStationlist.find((e) => e.isAdmin == '1')">
+      <el-form-item
+        label="护理站名称"
+        prop=""
+        v-if="nurseStationlist.find((e) => e.isAdmin == '1')"
+      >
         <el-select
           v-model="queryParams.nurseStationId"
           clearable
@@ -25,7 +29,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="所属护理站" prop=""   v-else>
+      <el-form-item label="所属护理站" prop="" v-else>
         <el-select
           v-model="queryParams.nurseStationId"
           placeholder="请选择护理站"
@@ -40,19 +44,6 @@
           </el-option>
         </el-select>
       </el-form-item>
-
-
-
-
-
-
-
-
-
-
-
-
-
       <el-form-item label="耗材包编号" prop="consumableCode">
         <el-input
           v-model="queryParams.consumableCode"
@@ -225,7 +216,7 @@
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
-      @pagination="handleQuery"
+      @pagination="listStationConsumableinfo"
     />
     <!-- 修改护理站耗材信息对话框 -->
     <el-dialog

src/views/system/stationItem/index.vue

@@ -1098,11 +1098,27 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams.pageNu = 1;
+      if (this.nurseStationlist[0].isAdmin == "1") {
-      this.queryParams.nurseTypeId = null;
+        this.queryParams = {
-      this.queryParams.nurseItemCode = null;
+          pageNum: 1,
-      this.queryParams.nurseItemName = null;
+          pageSize: 10,
-      this.handleQuery();
+          nurseStationId: null,
+          nurseTypeId: null,
+          userId: null,
+          nurseItemCode: null,
+          nurseItemName: null,
+          nurseItemContent: null,
+          advanceAppointDuration: null,
+          sort: null,
+        };
+        this.handleQuery();
+      } else {
+        this.queryParams.pageNu = 1;
+        this.queryParams.nurseTypeId = null;
+        this.queryParams.nurseItemCode = null;
+        this.queryParams.nurseItemName = null;
+        this.handleQuery();
+      }
     },
     // 多选框选中数据
     handleSelectionChange(selection) {