diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index 38c63eb..073af12 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -107,11 +107,13 @@
         @pagination="getList"
       />
       <!-- 查看弹框 -->
+      <!-- <el-scrollbar style="height:1048px; overflow-y: scroll;"> -->
       <el-dialog
         title="查看订单信息"
         :visible.sync="innerVisible4"
         append-to-body
         width="1048px"
+        class="orderInfo"
       >
         <div v-for="(item, index) in query" :key="index">
           <el-row>
@@ -120,7 +122,7 @@
                 <el-input
                   v-model="item.orderNo"
                   :disabled="true"
-                  style="width: 160px"
+                  style="width: 180px"
                 />
               </el-form-item>
             </el-col>
@@ -152,7 +154,7 @@
                   clearable
                   @keyup.enter.native="handleQuery"
                   :disabled="true"
-                  style="width: 160px"
+                  style="width: 180px"
                 />
               </el-form-item>
             </el-col>
@@ -185,7 +187,7 @@
                   clearable
                   @keyup.enter.native="handleQuery"
                   :disabled="true"
-                  style="width: 160px"
+                  style="width: 180px"
                 />
               </el-form-item>
             </el-col>
@@ -241,6 +243,7 @@
           </el-table>
         </div>
       </el-dialog>
+    <!-- </el-scrollbar> -->
     </el-form>
   </div>
 </template>
@@ -408,4 +411,11 @@ export default {
     },
   },
 };
-</script>
\ No newline at end of file
+</script>
+<style scoped>
+::v-deep .el-dialog__body{
+    
+    height: 500px;
+    overflow-y: scroll;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/system/person/index.vue b/src/views/system/person/index.vue
index a8fca36..5f67f60 100644
--- a/src/views/system/person/index.vue
+++ b/src/views/system/person/index.vue
@@ -8,58 +8,6 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <!-- <el-form-item label="护理站表id" prop="nurseStationId">
-        <el-input
-          v-model="queryParams.nurseStationId"
-          placeholder="请输入护理站表id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="所属科室编码" prop="departmentCode">
-        <el-input
-          v-model="queryParams.departmentCode"
-          placeholder="请输入所属科室编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="创建人id" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入创建人id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item label="护理站人员编码" prop="nursePersonCode">
-        <el-input
-          v-model="queryParams.nursePersonCode"
-          placeholder="请输入护理站人员编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
-      <!-- <el-form-item
-        label="所属护理站"
-        prop="nursePersonName"
-        label-width="90px"
-      >
-        <el-select
-          v-model="queryParams.nursePersonName"
-          clearable
-          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="departmentName">
         <el-select
           v-model="queryParams.nurseStationId"
@@ -143,6 +91,17 @@
           >删除</el-button
         >
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['system:person:export']"
+          >导入</el-button
+        >
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -166,19 +125,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="护理站表id" align="center" prop="nurseStationId" /> -->
-      <!-- <el-table-column
-        label="所属科室编码"
-        align="center"
-        prop="departmentCode"
-      /> -->
-      <!-- <el-table-column label="创建人id" align="center" prop="userId" /> -->
-      <!-- <el-table-column
-        label="护理站人员编码"
-        align="center"
-        prop="nursePersonCode"
-      /> -->
       <el-table-column
         label="护理站名称"
         align="center"
@@ -434,7 +380,6 @@
             icon="el-icon-circle-plus-outline"
             @click="adddisease"
             v-if="index == 0"
-           
           ></el-button>
 
           <el-button
@@ -443,7 +388,6 @@
             circle
             plain
             @click="deldisease(index)"
-          
             v-if="index != 0"
           ></el-button>
         </div>
@@ -634,7 +578,10 @@
           >
         </el-form-item>
       </el-form>
-      <el-table :data="StationDepartmentLists"  @cell-dblclick="StationDepartmentclick">
+      <el-table
+        :data="StationDepartmentLists"
+        @cell-dblclick="StationDepartmentclick"
+      >
         <el-table-column label="请选择" width="70" align="center">
           <template slot-scope="scope">
             <el-button
@@ -710,7 +657,7 @@
         </el-form-item>
         <el-form-item label="姓名" prop="nursePersonName">
           <el-input
-          maxlength="15"
+            maxlength="15"
             v-model="form.nursePersonName"
             placeholder="请输入护理站人姓名"
           />
@@ -753,11 +700,19 @@
           </el-select>
         </el-form-item>
         <el-form-item label="联系电话" prop="phone">
-          <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11"/>
+          <el-input
+            v-model="form.phone"
+            placeholder="请输入联系电话"
+            maxlength="11"
+          />
         </el-form-item>
 
         <el-form-item label="居住地址" prop="address">
-          <el-input v-model="form.address" placeholder="请输入居住地址" maxlength="50"/>
+          <el-input
+            v-model="form.address"
+            placeholder="请输入居住地址"
+            maxlength="50"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -765,6 +720,43 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 导入 -->
+    <el-dialog
+      :title="upload.title"
+      :visible.sync="upload.open"
+      width="400px"
+      append-to-body
+    >
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link
+            type="primary"
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate"
+            >下载模板</el-link
+          >
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -777,7 +769,9 @@ import {
   updatePerson,
   stationList,
   StationDepartmentList,
+ 
 } from "@/api/system/person";
+import { getToken } from "@/utils/auth";
 
 export default {
   name: "Person",
@@ -809,6 +803,22 @@ export default {
       innerVisible2: false,
       // 遮罩层
       loading: true,
+      
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url:
+          process.env.VUE_APP_BASE_API +
+          "/system/person/insertNurseStationPersonImportList",
+      },
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -829,7 +839,6 @@ export default {
       stationLists: [],
       // 所属科室
       StationDepartmentLists: [],
-
       nurseStationlist: [],
       stationid: "",
       departid: "",
@@ -1064,6 +1073,7 @@ export default {
       this.open2 = false;
       this.nurseStationName = "请选择护理站名称";
       this.departmentName = "请选择所属科室";
+      // this.upload.open=false;
       this.reset();
     },
     // 表单重置
@@ -1100,6 +1110,7 @@ export default {
       };
       this.resetForm("form");
     },
+
     /** 搜索按钮操作 */
     handleQuery2() {
       this.queryParams.pageNum = 1;
@@ -1262,6 +1273,44 @@ export default {
         })
         .catch(() => {});
     },
+    /** 导入按钮操作 */
+    handleImport() {
+        this.upload.open = true;
+        this.upload.title = "用户导入";
+    },
+   
+     /** 下载模板操作 */
+     importTemplate() {
+      this.download(
+        "/system/station/downloadTemplate?fileType=3",
+        {},
+        `护理站人员基本信息导入模板.xlsx`
+      );
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(
+        "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+          response.msg +
+          "</div>",
+        "导入结果",
+        { dangerouslyUseHTMLString: true }
+      );
+      this.getList();
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+ 
+
     /** 导出按钮操作 */
     handleExport() {
       this.download(