diff --git a/src/api/system/order.js b/src/api/system/order.js
index 5e41826..9755fc4 100644
--- a/src/api/system/order.js
+++ b/src/api/system/order.js
@@ -14,4 +14,11 @@ export function Detailed(id) {
         method: 'get',
        
     })
-}
\ No newline at end of file
+}
+//删除
+export function deldetailed(id) {
+    return request({
+        url: '/system/appointmentOrderDetails/' + id,
+        method: 'delete'
+    })
+}
diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index 4949483..073af12 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -8,6 +8,14 @@
       v-show="showSearch"
       label-width="100px"
     >
+      <el-form-item label="客户" prop="patientName">
+        <el-input
+          v-model="queryParams.patientName"
+          placeholder="请输入客户"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="订单编号" prop="orderNo">
         <el-input
           v-model="queryParams.orderNo"
@@ -16,23 +24,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="被护理人" prop="patientName">
-        <el-input
-          v-model="queryParams.patientName"
-          placeholder="请输入被护理人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
       <el-form-item label="订单状态" prop="orderStatus">
-        <el-input
+        <el-select
           v-model="queryParams.orderStatus"
-          placeholder="请输入订单状态"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+          placeholder="请选择订单状态"
+        >
+          <el-option
+            v-for="item in orderStatuslist"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
       </el-form-item>
-     
+
       <el-form-item>
         <el-button
           type="primary"
@@ -45,18 +52,16 @@
           >重置</el-button
         >
       </el-form-item>
-     
-        <right-toolbar
-          :showSearch.sync="showSearch"
-          @queryTable="getList"
-        ></right-toolbar>
-     
+
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
 
       <el-table
         v-loading="loading"
         :data="OrderDetailsList"
         @selection-change="handleSelectionChange"
-
       >
         <el-table-column label="客户" align="center" prop="patientName" />
         <el-table-column label="订单编号" align="center" prop="orderNo" />
@@ -87,7 +92,7 @@
               size="mini"
               type="text"
               icon="el-icon-delete"
-              @click="handleDelete"
+              @click="handleDelete(scope.row)"
               v-hasPermi="['system:nurseType:remove']"
               >删除</el-button
             >
@@ -102,150 +107,175 @@
         @pagination="getList"
       />
       <!-- 查看弹框 -->
+      <!-- <el-scrollbar style="height:1048px; overflow-y: scroll;"> -->
       <el-dialog
-        title="查看"
+        title="查看订单信息"
         :visible.sync="innerVisible4"
         append-to-body
         width="1048px"
+        class="orderInfo"
       >
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="订单编号" prop="orderNo">
-              <el-input
-                v-model="query.orderNo"
-                clearable
-                :disabled="true"
-                style="width: 150px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="订单状态" prop="orderStatus">
-              <el-input
-                v-model="query.orderStatus"
-                clearable
-                @keyup.enter.native="handleQuery"
-                :disabled="true"
-                style="width: 150px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="护理站名称" prop="nurseStationName">
-              <el-input
-                v-model="query.nurseStationName"
-                clearable
-                @keyup.enter.native="handleQuery"
-                :disabled="true"
-                style="width: 205px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="订单数量" prop="orderCount">
-              <el-input
-                v-model="query.orderCount"
-                clearable
-                @keyup.enter.native="handleQuery"
-                :disabled="true"
-                style="width: 150px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="服务时间" prop="serviceDate">
-              <el-input
-                v-model="query.serviceDate"
-                clearable
-                @keyup.enter.native="handleQuery"
-                :disabled="true"
-                style="width: 150px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="服务地址" prop="serviceAddress">
-              <el-input
-                v-model="query.serviceAddress"
-                clearable
-                @keyup.enter.native="handleQuery"
-                :disabled="true"
-                style="width: 225px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="护理项目名称" prop="nurseItemName">
-              <el-input
-                v-model="query.nurseItemName"
-                clearable
-                @keyup.enter.native="handleQuery"
-                :disabled="true"
-                style="width: 150px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="护理项目价格" prop="nurseItemPrice">
-              <el-input
-                v-model="query.nurseItemPrice"
-                clearable
-                @keyup.enter.native="handleQuery"
-                :disabled="true"
-                style="width: 150px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="护理项目时长" prop="itemServeDurationUnit">
-              <el-input
-                v-model="query.itemServeDurationUnit"
-                clearable
-                @keyup.enter.native="handleQuery"
-                :disabled="true"
-                style="width: 150px"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-table
-          :data="query.appointmentOrderConsumableList"
-          align="center"
-          style="margin-top: 10px"
-        >
-          <el-table-column
-            prop="orderConsumableName"
-            label="耗材包名称"
-            width="200"
+        <div v-for="(item, index) in query" :key="index">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="订单编号" prop="orderNo">
+                <el-input
+                  v-model="item.orderNo"
+                  :disabled="true"
+                  style="width: 180px"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="订单状态" prop="orderStatus">
+                <el-input
+                  :value="switchOrderStatus(item.orderStatus)"
+                  disabled
+                  style="width: 150px"
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="护理站名称" prop="nurseStationName">
+                <el-input
+                  v-model="item.nurseStationName"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                  :disabled="true"
+                  style="width: 225px"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="订单数量" prop="orderCount">
+                <el-input
+                  v-model="item.orderCount"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                  :disabled="true"
+                  style="width: 180px"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="服务时间" prop="serviceDate">
+                <el-input
+                  v-model="item.serviceDate"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                  :disabled="true"
+                  style="width: 150px"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="服务地址" prop="serviceAddress">
+                <el-input
+                  v-model="item.serviceAddress"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                  :disabled="true"
+                  style="width: 225px"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="护理项目名称" prop="nurseItemName">
+                <el-input
+                  v-model="item.nurseItemName"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                  :disabled="true"
+                  style="width: 180px"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="护理项目价格" prop="nurseItemPrice">
+                <el-input
+                  v-model="item.nurseItemPrice"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                  :disabled="true"
+                  style="width: 150px"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="护理项目时长" prop="itemServeDurationUnit">
+                <el-input
+                  v-model="item.itemServeDurationUnit"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                  :disabled="true"
+                  style="width: 225px"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-table
+            :data="item.appointmentOrderConsumableList"
             align="center"
+            style="margin: 10px 0 20px 0; padding-bottom: 20px"
           >
-          </el-table-column>
-          <el-table-column
-            prop="orderConsumableCount"
-    
-            label="耗材包数量"
-            width="200"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="orderConsumablePrice"
-            label="耗材包价格"
-            width="200"
-            align="center"
-          >
-          </el-table-column>
-        </el-table>
+            <el-table-column
+              prop="orderConsumableName"
+              label="耗材包名称"
+              width="200"
+              align="center"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="orderConsumableCount"
+              label="耗材包数量"
+              width="200"
+              align="center"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="orderConsumablePrice"
+              label="耗材包价格"
+              width="200"
+              align="center"
+            >
+            </el-table-column>
+          </el-table>
+        </div>
       </el-dialog>
+    <!-- </el-scrollbar> -->
     </el-form>
   </div>
 </template>
 <script>
-import { appointmentOrderDetailsList, Detailed } from "@/api/system/order";
+import {
+  appointmentOrderDetailsList,
+  Detailed,
+  deldetailed,
+} from "@/api/system/order";
 export default {
   name: "order",
   data() {
     return {
+      orderStatuslist: [
+        {
+          value: "WAIT_PAY",
+          label: "待付款",
+        },
+        {
+          value: "WAIT_DISPATCH",
+          label: "待派单",
+        },
+        {
+          value: "NOT_FINISH",
+          label: "未完成",
+        },
+        {
+          value: "COMPLETE",
+          label: "服务完成",
+        },
+      ],
+      value: "",
       // 遮罩层
       loading: true,
       innerVisible4: false,
@@ -276,32 +306,8 @@ export default {
         orderStatus: "",
         pageNum: 1,
         pageSize: 10,
-     
       },
-     query:{
-        appointOrderDetailsId: null,
-        patientName: null,
-        orderNo: "",
-        orderStatus: "",
-        createTime: null,
-        nurseStationName: "",
-        nurseItemName: "",
-        orderCount: "",
-        serviceDate: "",
-        serviceStartTime: "",
-        serviceEndTime: "",
-        serviceAddress: "",
-        nurseItemPrice: "",
-        itemServeDurationUnit: "",
-        appointmentOrderConsumableList: [
-            {
-                orderConsumableName: "",
-                orderConsumablePrice: "",
-                orderConsumableCount: null,
-            },
-        ]
-    },
-
+      query: [],
       // 表单参数
       form: {},
       // 表单校验
@@ -312,14 +318,31 @@ export default {
     this.getList();
   },
   methods: {
+    switchOrderStatus(orderStatus) {
+      switch (orderStatus) {
+        case "WAIT_PAY":
+          return "待付款";
+        case "WAIT_DISPATCH":
+          return "待派单";
+        case "NOT_FINISH":
+          return "未完成";
+        case "COMPLETE":
+          return "服务完成";
+        default:
+          break;
+      }
+    },
+
     seeLook(row) {
       this.innerVisible4 = true;
       const id = row.orderNo;
-      console.log(row);
+      // console.log(row);
       Detailed(id).then((res) => {
         this.OrderDetailsLists = res.data;
-        this.query=res.data;
-        console.log(res);
+        // console.log(this.OrderDetailsLists)
+        this.query = res.data;
+        console.log(this.query);
+        // console.log(res);
       });
     },
     /** 查询护理类型信息列表 */
@@ -362,25 +385,19 @@ export default {
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
-    // 查看
-    // handleAdd() {
-    //   this.reset();
-    //   this.open2 = true;
-    //   this.title = "添加护理类型信息";
-    // },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal
-        .confirm('是否确认删除订单编号为"' + ids + '"的数据项？')
-        .then(function () {
-          return appointmentOrderDetailsList(ids);
+      this.$confirm('是否确认删除订单编号为"' + row.orderNo + '"的数据项？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deldetailed(row.appointOrderDetailsId).then((res) => {
+            this.$message.success("删除成功");
+            this.getList();
+          })
         })
-        .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        })
-        .catch(() => {});
+        .catch(() => {}); 
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -394,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 d83bab2..9919920 100644
--- a/src/views/system/person/index.vue
+++ b/src/views/system/person/index.vue
@@ -143,6 +143,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"
@@ -436,7 +447,6 @@
             icon="el-icon-circle-plus-outline"
             @click="adddisease"
             v-if="index == 0"
-
           ></el-button>
 
           <el-button
@@ -445,8 +455,6 @@
             circle
             plain
             @click="deldisease(index)"
-
-
             v-if="index != 0"
           ></el-button>
         </div>
@@ -637,7 +645,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
@@ -713,7 +724,7 @@
         </el-form-item>
         <el-form-item label="姓名" prop="nursePersonName">
           <el-input
-          maxlength="15"
+            maxlength="15"
             v-model="form.nursePersonName"
             placeholder="请输入护理站人姓名"
           />
@@ -756,11 +767,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">
@@ -768,6 +787,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>
 
@@ -781,6 +837,7 @@ import {
   stationList,
   StationDepartmentList,
 } from "@/api/system/person";
+import { getToken } from "@/utils/auth";
 
 export default {
   name: "Person",
@@ -832,6 +889,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: [],
       // 非单个禁用
@@ -852,7 +925,6 @@ export default {
       stationLists: [],
       // 所属科室
       StationDepartmentLists: [],
-
       nurseStationlist: [],
       stationid: "",
       departid: "",
@@ -1100,6 +1172,7 @@ export default {
       this.open2 = false;
       this.nurseStationName = "请选择护理站名称";
       this.departmentName = "请选择所属科室";
+      // this.upload.open=false;
       this.reset();
     },
     // 表单重置
@@ -1136,6 +1209,7 @@ export default {
       };
       this.resetForm("form");
     },
+
     /** 搜索按钮操作 */
     handleQuery2() {
       this.queryParams.pageNum = 1;
@@ -1288,6 +1362,44 @@ export default {
         })
         .catch(() => {});
     },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.open = true;
+      this.upload.title = "用户导入";
+    },
+
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download(
+        "/system/station/downloadTemplate?fileType=nurseStationPerson",
+        {},
+        `护理站人员基本信息导入模板.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(