diff --git a/src/api/system/order.js b/src/api/system/order.js
index b6b3568..711661d 100644
--- a/src/api/system/order.js
+++ b/src/api/system/order.js
@@ -13,7 +13,7 @@ export function Detailed(id) {
     return request({
         url: `/system/appointmentOrderDetails/getCancelOrderInfo` + `?orderNo=${id}`,
         method: 'get',
- 
+
     })
 }
 
@@ -69,3 +69,12 @@ export function confirmCancel(appointmentOrderId) {
         method: 'post'
     })
 }
+
+//派单点击护理员获取信息
+
+export function getPersonInfo(nurseStationPersonId) {
+    return request({
+        url: `/system/appointmentOrder/getPersonInfo?nurseStationPersonId=${nurseStationPersonId}`,
+        method: 'get'
+    })
+}
\ No newline at end of file
diff --git a/src/api/system/person.js b/src/api/system/person.js
index c046256..7623f6e 100644
--- a/src/api/system/person.js
+++ b/src/api/system/person.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询护理站人员信息列表
 export function listPerson(query) {
     return request({
-        url: 'system/person/getNurseStationPersonList',
+        url: '/system/person/getNurseStationPersonList',
         method: 'get',
         params: query
     })
@@ -11,7 +11,7 @@ export function listPerson(query) {
 // 查询护理站名称
 export function stationList(query) {
     return request({
-        url: 'system/station/list',
+        url: '/system/station/list',
         method: 'get',
         params: query
     })
@@ -20,7 +20,7 @@ export function stationList(query) {
 // 查询所属科室
 export function StationDepartmentList(query) {
     return request({
-        url: 'system/StationDepartment/list',
+        url: '/system/StationDepartment/list',
         method: 'get',
         params: query
     })
@@ -36,7 +36,7 @@ export function getPerson(id) {
 // 新增护理站人员信息
 export function addPerson(data) {
     return request({
-        url: 'system/person/add',
+        url: '/system/person/add',
         method: 'post',
         data: data
     })
@@ -45,7 +45,7 @@ export function addPerson(data) {
 // 修改护理站人员信息
 export function updatePerson(data) {
     return request({
-        url: 'system/person/edit',
+        url: '/system/person/edit',
         method: 'post',
         data: data
     })
@@ -58,3 +58,21 @@ export function delPerson(id) {
         method: 'delete'
     })
 }
+
+// 审核接口根据id查询护理站人员信息以及未审核的证书
+export function getNurseStationPersonCheck(id) {
+    return request({
+        url: '/system/person/getNurseStationPersonCheck/' + id,
+        method: 'get'
+    })
+}
+
+
+//审核确定接口
+export function updateNurseStationPersonChecks(data) {
+    return request({
+        url: '/system/person/updateNurseStationPersonChecks',
+        method: 'post',
+        data: data
+    })
+}
\ No newline at end of file
diff --git a/src/api/system/revenue.js b/src/api/system/revenue.js
new file mode 100644
index 0000000..b4d8e1e
--- /dev/null
+++ b/src/api/system/revenue.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询护理员订单佣金收益信息列表
+export function listRevenue(query) {
+    return request({
+        url: '/system/revenue/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询护理员订单佣金收益信息详细
+export function getRevenue(id) {
+    return request({
+        url: '/system/revenue/' + id,
+        method: 'get'
+    })
+}
+
+// 新增护理员订单佣金收益信息
+export function addRevenue(data) {
+    return request({
+        url: '/system/revenue',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改护理员订单佣金收益信息
+export function updateRevenue(data) {
+    return request({
+        url: '/system/revenue',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除护理员订单佣金收益信息
+export function delRevenue(id) {
+    return request({
+        url: '/system/revenue/' + id,
+        method: 'delete'
+    })
+}
diff --git a/src/views/system/OperateGoodsInfo/indexjs.js b/src/views/system/OperateGoodsInfo/indexjs.js
index 767978a..a55ff8f 100644
--- a/src/views/system/OperateGoodsInfo/indexjs.js
+++ b/src/views/system/OperateGoodsInfo/indexjs.js
@@ -383,7 +383,6 @@ export default {
                 if (response.data.goodAttributeDetailsLists) {
                     this.goodDetailsLists = response.data.goodAttributeDetailsLists;
                 }
-                // console.log(this.form.parentIdList)
                 // this.form.goodsCategoryId = this.form.goodsCategoryName
                 // this.form.value = this.form.goodsCategoryId
                 // this.form.label = this.form.goodsCategoryName
diff --git a/src/views/system/StationDepartment/index.vue b/src/views/system/StationDepartment/index.vue
index d3a11a3..c1f4265 100644
--- a/src/views/system/StationDepartment/index.vue
+++ b/src/views/system/StationDepartment/index.vue
@@ -718,7 +718,6 @@ export default {
           this.form.nurseStationDepartmentList[0].nurseStationName;
         this.form.phone = this.form.nurseStationDepartmentList[0].phone;
       }
-      console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
diff --git a/src/views/system/classifyItem/index.vue b/src/views/system/classifyItem/index.vue
index 978bcf8..285ba5f 100644
--- a/src/views/system/classifyItem/index.vue
+++ b/src/views/system/classifyItem/index.vue
@@ -535,7 +535,6 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      console.log(row);
       this.$modal
         .confirm("是否确认删除？")
         .then(function() {
diff --git a/src/views/system/communityInfo/index.vue b/src/views/system/communityInfo/index.vue
index b5270ae..d8dfde5 100644
--- a/src/views/system/communityInfo/index.vue
+++ b/src/views/system/communityInfo/index.vue
@@ -23,21 +23,16 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item> -->
+      </el-form-item>-->
       <el-form-item label="所属区域" prop="areaCode">
-        <el-select
-          v-model="queryParams.province"
-          clearable
-          placeholder="请选择省"
-        >
+        <el-select v-model="queryParams.province" clearable placeholder="请选择省">
           <el-option
             v-for="item in arealist"
             :key="item.id"
             :label="item.areaName"
             :value="item.id"
             @click.native="province(item)"
-          >
-          </el-option>
+          ></el-option>
         </el-select>
 
         <el-select
@@ -52,8 +47,7 @@
             :label="item.areaName"
             :value="item.areaCode"
             @click.native="clickcity(item)"
-          >
-          </el-option>
+          ></el-option>
         </el-select>
         <el-select
           v-model="queryParams.area"
@@ -67,8 +61,7 @@
             :label="item.areaName"
             :value="item.areaCode"
             @click.native="clickarea(item)"
-          >
-          </el-option>
+          ></el-option>
         </el-select>
         <el-select
           v-model="queryParams.areaCode"
@@ -82,15 +75,10 @@
             :label="item.areaName"
             :value="item.areaCode"
             @click.native="clickstreet(item)"
-          >
-          </el-option>
+          ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item
-        label="社区名称"
-        prop="communityName"
-        style="margin-left: 20px"
-      >
+      <el-form-item label="社区名称" prop="communityName" style="margin-left: 20px">
         <el-input
           v-model="queryParams.communityName"
           placeholder="请输入社区名称"
@@ -100,16 +88,8 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -122,8 +102,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:communityInfo:add']"
-          >新增</el-button
-        >
+        >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -134,8 +113,7 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:communityInfo:edit']"
-          >修改</el-button
-        >
+        >修改</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -146,8 +124,7 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:communityInfo:remove']"
-          >删除</el-button
-        >
+        >删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -157,13 +134,9 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['system:communityInfo:export']"
-          >导出</el-button
-        >
+        >导出</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table
@@ -174,24 +147,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
       <!-- <el-table-column label="所属区域编码" align="center" prop="areaCode" />
-      <el-table-column label="社区编码" align="center" prop="communityCode" /> -->
-      <el-table-column label="所属区域" align="center" prop="area" width="300"/>
+      <el-table-column label="社区编码" align="center" prop="communityCode" />-->
+      <el-table-column label="所属区域" align="center" prop="area" width="300" />
       <el-table-column label="社区名称" align="center" prop="communityName" />
-      <el-table-column
-        label="社区经度"
-        align="center"
-        prop="communityLongitude"
-      />
-      <el-table-column
-        label="社区纬度"
-        align="center"
-        prop="communityLatitude"
-      />
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="社区经度" align="center" prop="communityLongitude" />
+      <el-table-column label="社区纬度" align="center" prop="communityLatitude" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -199,16 +160,14 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:communityInfo:edit']"
-            >修改</el-button
-          >
+          >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:communityInfo:remove']"
-            >删除</el-button
-          >
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -221,19 +180,8 @@
       @pagination="liststationinfo"
     />
     <!-- 添加居住社区信息对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open2"
-      width="1060px"
-      append-to-body
-    >
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-        :inline="true"
-      >
+    <el-dialog :title="title" :visible.sync="open2" width="1060px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
         <div
           v-for="(item, index) in form.communityInfoList"
           :key="index"
@@ -251,54 +199,35 @@
                 :label="item.areaName"
                 :value="item.areaCode"
                 @click.native="province2(item, index)"
-              >
-              </el-option>
+              ></el-option>
             </el-select>
 
-            <el-select
-              v-model="item.city"
-              clearable
-              placeholder="请选择市"
-              style="margin-left: 10px"
-            >
+            <el-select v-model="item.city" clearable placeholder="请选择市" style="margin-left: 10px">
               <el-option
                 v-for="item in citylist"
                 :key="item.areaCode"
                 :label="item.areaName"
                 :value="item.areaCode"
                 @click.native="clickcity2(item, index)"
-              >
-              </el-option>
+              ></el-option>
             </el-select>
-            <el-select
-              v-model="item.area"
-              clearable
-              placeholder="请选择区"
-              style="margin-left: 10px"
-            >
+            <el-select v-model="item.area" clearable placeholder="请选择区" style="margin-left: 10px">
               <el-option
                 v-for="item in arealists"
                 :key="item.areaCode"
                 :label="item.areaName"
                 :value="item.areaCode"
                 @click.native="clickarea2(item, index)"
-              >
-              </el-option>
+              ></el-option>
             </el-select>
-            <el-select
-              v-model="item.code"
-              clearable
-              placeholder="请选择街道"
-              style="margin-left: 10px"
-            >
+            <el-select v-model="item.code" clearable placeholder="请选择街道" style="margin-left: 10px">
               <el-option
                 v-for="item in streetlist"
                 :key="item.areaCode"
                 :label="item.areaName"
                 :value="item.areaCode"
                 @click.native="clickcode(item, index)"
-              >
-              </el-option>
+              ></el-option>
             </el-select>
           </el-form-item>
           <el-form-item
@@ -306,11 +235,7 @@
             :rules="rules.communityInfoList.communityName"
             :prop="`communityInfoList.${index}.communityName`"
           >
-            <el-input
-              v-model="item.communityName"
-              placeholder="请输入社区名称"
-              maxlength="30"
-            />
+            <el-input v-model="item.communityName" placeholder="请输入社区名称" maxlength="30" />
           </el-form-item>
           <el-form-item
             label="社区经度"
@@ -322,7 +247,7 @@
               placeholder="请输入社区经度"
               maxlength="20"
               type="number"
-            oninput=" if(value.length>10){value=value.slice(0,20)}"
+              oninput=" if(value.length>10){value=value.slice(0,20)}"
             />
           </el-form-item>
           <el-form-item
@@ -334,8 +259,8 @@
               v-model="item.communityLatitude"
               placeholder="请输入社区纬度"
               maxlength="20"
-                 type="number"
-            oninput=" if(value.length>10){value=value.slice(0,20)}"
+              type="number"
+              oninput=" if(value.length>10){value=value.slice(0,20)}"
             />
           </el-form-item>
           <el-button
@@ -366,26 +291,15 @@
     </el-dialog>
 
     <!-- 修改居住社区信息对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="1060px"
-      append-to-body
-    >
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-        :inline="true"
-      >
+    <el-dialog :title="title" :visible.sync="open" width="1060px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
         <!-- <el-form-item label="所属区域" prop="areaCode">
           <el-input
             v-model="form.areaName"
             placeholder="请输入所属区域"
             maxlength="20"
           />
-        </el-form-item> -->
+        </el-form-item>-->
         <el-form-item label="所属区域" prop="areaCode">
           <el-select v-model="form.province" clearable placeholder="请选择省">
             <el-option
@@ -394,54 +308,35 @@
               :label="item.areaName"
               :value="item.areaCode"
               @click.native="province3(item)"
-            >
-            </el-option>
+            ></el-option>
           </el-select>
 
-          <el-select
-            v-model="form.city"
-            clearable
-            placeholder="请选择市"
-            style="margin-left: 10px"
-          >
+          <el-select v-model="form.city" clearable placeholder="请选择市" style="margin-left: 10px">
             <el-option
               v-for="item in citylist"
               :key="item.areaCode"
               :label="item.areaName"
               :value="item.areaCode"
               @click.native="clickcity3(item)"
-            >
-            </el-option>
+            ></el-option>
           </el-select>
-          <el-select
-            v-model="form.area"
-            clearable
-            placeholder="请选择区"
-            style="margin-left: 10px"
-          >
+          <el-select v-model="form.area" clearable placeholder="请选择区" style="margin-left: 10px">
             <el-option
               v-for="item in arealists"
               :key="item.areaCode"
               :label="item.areaName"
               :value="item.areaCode"
               @click.native="clickarea3(item)"
-            >
-            </el-option>
+            ></el-option>
           </el-select>
-          <el-select
-            v-model="form.code"
-            clearable
-            placeholder="请选择街道"
-            style="margin-left: 10px"
-          >
+          <el-select v-model="form.code" clearable placeholder="请选择街道" style="margin-left: 10px">
             <el-option
               v-for="item in streetlist"
               :key="item.areaCode"
               :label="item.areaName"
               :value="item.areaCode"
-              @click.native='clickcode2(item)'
-            >
-            </el-option>
+              @click.native="clickcode2(item)"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="社区名称" prop="communityName">
@@ -458,7 +353,7 @@
             placeholder="请输入社区经度"
             maxlength="20"
             style="width: 200px"
-               type="number"
+            type="number"
             oninput=" if(value.length>10){value=value.slice(0,20)}"
           />
         </el-form-item>
@@ -468,7 +363,7 @@
             placeholder="请输入社区纬度"
             maxlength="20"
             style="width: 200px"
-               type="number"
+            type="number"
             oninput=" if(value.length>10){value=value.slice(0,20)}"
           />
         </el-form-item>
@@ -490,7 +385,7 @@ import {
   updateCommunityInfo,
   FirstLevels,
   SecondaryLevelInfo,
-  SubordinateRegions,
+  SubordinateRegions
 } from "@/api/system/communityInfo";
 
 export default {
@@ -518,10 +413,10 @@ export default {
             {
               provinceName: null,
               cityName: null,
-              streetName: null,
-            },
-          ],
-        },
+              streetName: null
+            }
+          ]
+        }
       ],
       // 所属区域
       arealist: [],
@@ -547,7 +442,7 @@ export default {
         city: "",
         area: "",
         areaCode: "",
-        province: "",
+        province: ""
         // areaCode: null,
         // communityCode: null,
         // communityName: null,
@@ -557,7 +452,7 @@ export default {
       getProvincequeryParams: {
         pageNum: 1,
         pageSize: 10,
-        pageNum: 1,
+        pageNum: 1
         // pageSize: 10,
         // searchValue: null,
         // createBy: null,
@@ -573,7 +468,7 @@ export default {
       getProvincequeryParams2: {
         pageNum: 1,
         pageSize: 10,
-        pageNum: 1,
+        pageNum: 1
         // pageSize: 10,
         // searchValue: null,
         // createBy: null,
@@ -593,12 +488,12 @@ export default {
         areaCode: {
           required: true,
           message: "所属区域不能为空",
-          trigger: "blur",
+          trigger: "blur"
         },
         communityName: {
           required: true,
           message: "社区名称不能为空",
-          trigger: "blur",
+          trigger: "blur"
         },
         // communityLongitude: {
         //   required: true,
@@ -614,13 +509,13 @@ export default {
           areaCode: {
             required: true,
             message: "所属区域不能为空",
-            trigger: "blur",
+            trigger: "blur"
           },
           communityName: {
             required: true,
             message: "社区名称不能为空",
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
           // communityLongitude: {
           //   required: true,
           //   message: "经度不能为空",
@@ -631,8 +526,8 @@ export default {
           //   message: "纬度不能为空",
           //   trigger: "blur",
           // },
-        },
-      },
+        }
+      }
     };
   },
   created() {
@@ -640,30 +535,22 @@ export default {
     this.Provincelist();
   },
   methods: {
-     clickcode2(item) {
+    clickcode2(item) {
       this.form.areaCode = Number(item.areaCode);
-      console.log(this.form);
-      this.$forceUpdate()
-
+      this.$forceUpdate();
     },
     clickcode(item, index) {
-      console.log(item);
       this.form.communityInfoList[index].areaCode = Number(item.areaCode);
       // this.form.communityInfoList[index].areaCode = Number(this.form.communityInfoList[index].areaCode);
-
-      console.log(this.form);
     },
     // 查询省事件
     province(item) {
       // this.form.xxx[index].code=''
-      console.log(item);
       this.queryParams.city = "";
       this.queryParams.area = "";
       this.queryParams.areaCode = "";
-      SecondaryLevelInfo(item.id).then((res) => {
-        console.log(res);
+      SecondaryLevelInfo(item.id).then(res => {
         // this.SecondaryLevelInfolist = res.data;
-        // console.log(this.SecondaryLevelInfolist);
         this.citylist = res.data;
       });
     },
@@ -672,35 +559,27 @@ export default {
       this.form.communityInfoList[index].city = "";
       this.form.communityInfoList[index].area = "";
       this.form.communityInfoList[index].areaCode = "";
-      console.log(item);
-      SecondaryLevelInfo(item.id).then((res) => {
-        console.log(res);
+      SecondaryLevelInfo(item.id).then(res => {
         // this.SecondaryLevelInfolist = res.data;
-        // console.log(this.SecondaryLevelInfolist);
         this.citylist = res.data;
       });
     },
     // 修改
     province3(item) {
       // this.form.xxx[index].code=''
-      console.log(item);
       this.form.city = "";
       this.form.area = "";
       this.form.code = "";
-      SecondaryLevelInfo(item.id).then((res) => {
-        console.log(res);
+      SecondaryLevelInfo(item.id).then(res => {
         // this.SecondaryLevelInfolist = res.data;
-        // console.log(this.SecondaryLevelInfolist);
         this.citylist = res.data;
       });
     },
     // 点击市
     clickcity(item) {
-      console.log(item);
-      SecondaryLevelInfo(item.id).then((res) => {
+      SecondaryLevelInfo(item.id).then(res => {
         this.queryParams.area = "";
         this.queryParams.areaCode = "";
-        console.log(res);
         this.arealists = res.data;
       });
     },
@@ -712,19 +591,15 @@ export default {
       // this.value3 = "";
       this.form.communityInfoList[index].area = "";
       this.form.communityInfoList[index].areaCode = "";
-      console.log(item);
-      SecondaryLevelInfo(item.id).then((res) => {
-        console.log(res);
+      SecondaryLevelInfo(item.id).then(res => {
         this.arealists = res.data;
       });
     },
     // 修改
     clickcity3(item) {
-      console.log(item);
-      SecondaryLevelInfo(item.id).then((res) => {
+      SecondaryLevelInfo(item.id).then(res => {
         this.form.area = "";
-       this.form.code = "";
-        console.log(res);
+        this.form.code = "";
         this.arealists = res.data;
       });
     },
@@ -733,9 +608,7 @@ export default {
       this.queryParams.areaCode = "";
       //  this.queryParams.areaCode = "";
       // this.value3 = "";
-      console.log(item);
-      SecondaryLevelInfo(item.id).then((res) => {
-        console.log(res);
+      SecondaryLevelInfo(item.id).then(res => {
         this.streetlist = res.data;
       });
     },
@@ -745,64 +618,51 @@ export default {
       // this.value3 = "";
 
       this.form.communityInfoList[index].areaCode = "";
-      console.log(item);
-      SecondaryLevelInfo(item.id).then((res) => {
-        console.log(res);
+      SecondaryLevelInfo(item.id).then(res => {
         this.streetlist = res.data;
       });
     },
 
     clickarea3(item) {
-     this.form.code = "";
+      this.form.code = "";
       //  this.queryParams.areaCode = "";
       // this.value3 = "";
-      console.log(item);
-      SecondaryLevelInfo(item.id).then((res) => {
-        console.log(res);
+      SecondaryLevelInfo(item.id).then(res => {
         this.streetlist = res.data;
       });
     },
     //点击街道
     clickstreet(item) {
       this.form.areaCode = item.areaCode;
-      console.log(this.form);
     },
     //  clickstreet3(item) {
     //   this.form.areaCode = item.areaCode;
-    //   // console.log(this.queryParams);
     // },
     // 所属省下拉框
     loadMore() {
-      console.log("1");
       var a = Math.ceil(this.total2 / 10);
-      console.log(this.arealist.length);
       if (this.arealist.length + 1 >= this.total2) {
       } else {
         if (this.getProvincequeryParams.pageNum >= a) {
         } else {
           this.getProvincequeryParams.pageNum++;
-          FirstLevels(this.getProvincequeryParams).then((res) => {
-            console.log(res);
-            res.rows.forEach((e) => {
+          FirstLevels(this.getProvincequeryParams).then(res => {
+            res.rows.forEach(e => {
               this.arealist.push(e);
-              console.log(this.arealist);
             });
           });
         }
       }
     },
     Provincelist() {
-      FirstLevels(this.getProvincequeryParams).then((res) => {
-        console.log(res);
+      FirstLevels(this.getProvincequeryParams).then(res => {
         this.arealist = res.data;
         this.total2 = res.total;
-        console.log(this.arealist);
       });
     },
     //删除delcommunity
     delcommunity(index) {
       this.form.communityInfoList.splice(index, 1);
-      console.log(this.form.communityInfoList);
     },
     //添加addcommunity
     addcommunity() {
@@ -811,7 +671,7 @@ export default {
         communityCode: "",
         communityName: "",
         communityLongitude: "",
-        communityLatitude: "",
+        communityLatitude: ""
         // diseaseName: "",
         // description: "",
         // sort: "",
@@ -852,16 +712,16 @@ export default {
             communityCode: "",
             communityName: "",
             communityLongitude: "",
-            communityLatitude: "",
-          },
-        ],
+            communityLatitude: ""
+          }
+        ]
       };
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
     liststationinfo() {
-      listCommunityInfo(this.queryParams).then((response) => {
-        response.rows.forEach((e) => {
+      listCommunityInfo(this.queryParams).then(response => {
+        response.rows.forEach(e => {
           if (e.sysAreaVOList == []) {
           } else if (e.sysAreaVOList == null) {
           } else if (!e.sysAreaVOList) {
@@ -924,13 +784,13 @@ export default {
         area: null,
         areaCode: null,
         areaName: null,
-        areaLevel: null,
+        areaLevel: null
       };
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -944,16 +804,13 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      console.log(row);
       const id = row.id || this.ids;
-      getCommunityInfo(id).then((response) => {
+      getCommunityInfo(id).then(response => {
         this.form = response.data;
 
         this.title = "修改居住社区信息";
         this.form.code = null;
-        console.log(1);
-        SubordinateRegions(response.data.areaCode).then((res) => {
-          console.log(res);
+        SubordinateRegions(response.data.areaCode).then(res => {
           if (res.data !== null) {
             this.form.province = String(res.data.provinceCode);
             // this.form.province = res.data.provinceCode;
@@ -961,7 +818,6 @@ export default {
             this.form.area = res.data.regionName;
             // this.form.areaCode = res.data.streetName;
             this.form.code = res.data.streetName;
-            console.log(this.form);
             this.open = true;
           }
         });
@@ -969,21 +825,21 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           // let newStr = JSON.stringify(this.form.areaCode);
           // let newObj = JSON.parse(newStr);
 
           if (this.form.id != null) {
-            updateCommunityInfo(this.form).then((response) => {
+            updateCommunityInfo(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
-               this.open2 = false;
+              this.open2 = false;
               this.open = false;
-             
+
               this.getList();
             });
           } else {
-            addCommunityInfo(this.form).then((response) => {
+            addCommunityInfo(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.open2 = false;
@@ -998,7 +854,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除居住社区信息的数据项？")
-        .then(function () {
+        .then(function() {
           return delCommunityInfo(ids);
         })
         .then(() => {
@@ -1012,11 +868,11 @@ export default {
       this.download(
         "system/communityInfo/export",
         {
-          ...this.queryParams,
+          ...this.queryParams
         },
         `communityInfo_${new Date().getTime()}.xlsx`
       );
-    },
-  },
+    }
+  }
 };
 </script>
diff --git a/src/views/system/diseaseInfo/index.vue b/src/views/system/diseaseInfo/index.vue
index 9fd0496..5219a43 100644
--- a/src/views/system/diseaseInfo/index.vue
+++ b/src/views/system/diseaseInfo/index.vue
@@ -321,7 +321,6 @@ export default {
     //删除deldisease
     deldisease(index) {
       this.form.diseaseInfoList.splice(index, 1);
-      console.log(this.form.diseaseInfoList);
     },
     //添加adddisease
     adddisease() {
diff --git a/src/views/system/goodsCategory/index.vue b/src/views/system/goodsCategory/index.vue
index 1172895..f14bd90 100644
--- a/src/views/system/goodsCategory/index.vue
+++ b/src/views/system/goodsCategory/index.vue
@@ -12,7 +12,7 @@
             prefix-icon="el-icon-search"
             style="margin-bottom: 20px"
           />
-        </div> -->
+        </div>-->
         <div class="head-container" style="height: 580px; overflow-y: auto">
           <el-tree
             :data="deptOptions"
@@ -55,18 +55,10 @@
               clearable
               @keyup.enter.native="handleQuery"
             />
-          </el-form-item> -->
+          </el-form-item>-->
           <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleQuery"
-              >搜索</el-button
-            >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-              >重置</el-button
-            >
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
         <el-row :gutter="10" class="mb8">
@@ -78,8 +70,7 @@
               size="mini"
               @click="handleAdd"
               v-hasPermi="['system:goodsCategory:add']"
-              >新增</el-button
-            >
+            >新增</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -90,8 +81,7 @@
               :disabled="single"
               @click="handleUpdate"
               v-hasPermi="['system:goodsCategory:edit']"
-              >修改</el-button
-            >
+            >修改</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -102,8 +92,7 @@
               :disabled="multiple"
               @click="handleDelete"
               v-hasPermi="['system:goodsCategory:remove']"
-              >删除</el-button
-            >
+            >删除</el-button>
           </el-col>
           <!-- <el-col :span="1.5">
         <el-button
@@ -115,11 +104,8 @@
           v-hasPermi="['system:goodsCategory:export']"
           >导出</el-button
         >
-      </el-col> -->
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-          ></right-toolbar>
+          </el-col>-->
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
         <el-table
@@ -134,11 +120,7 @@
             align="center"
             prop="goodsCategoryName"
           />
-          <el-table-column
-            label="商品分类编码"
-            align="center"
-            prop="goodsCategoryCode"
-          />
+          <el-table-column label="商品分类编码" align="center" prop="goodsCategoryCode" />
           <!-- <el-table-column label="商品分类图片地址" align="center" prop="goodsCategoryPicture" /> -->
           <el-table-column
             label="分类概述"
@@ -147,11 +129,7 @@
             :show-overflow-tooltip="true"
           />
           <el-table-column label="显示顺序" align="center" prop="sort" />
-          <el-table-column
-            label="操作"
-            align="center"
-            class-name="small-padding fixed-width"
-          >
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
                 size="mini"
@@ -159,16 +137,14 @@
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['system:goodsCategory:edit']"
-                >修改</el-button
-              >
+              >修改</el-button>
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['system:goodsCategory:remove']"
-                >删除</el-button
-              >
+              >删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -192,12 +168,7 @@
       :before-close="cancel"
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item
-          label="父级分类名称"
-          prop="parentName"
-          :required="true"
-          v-if="form.parentId"
-        >
+        <el-form-item label="父级分类名称" prop="parentName" :required="true" v-if="form.parentId">
           <el-cascader
             :props="treeOption"
             @change="change"
@@ -206,21 +177,16 @@
             ref="cascader"
             :key="isResouceShow"
             :placeholder="form.parentName ? form.parentName : ''"
-          >
-          </el-cascader>
+          ></el-cascader>
           <!-- <el-input
             v-model="form.parentName"
             placeholder="请输入父级分类名称"
             maxlength="10"
             disabled
-          /> -->
+          />-->
         </el-form-item>
         <el-form-item label="商品分类名称" prop="goodsCategoryName">
-          <el-input
-            v-model="form.goodsCategoryName"
-            placeholder="请输入商品分类名称"
-            maxlength="10"
-          />
+          <el-input v-model="form.goodsCategoryName" placeholder="请输入商品分类名称" maxlength="10" />
         </el-form-item>
         <!-- <el-form-item label="商品分类编码" prop="goodsCategoryCode">
           <el-input
@@ -228,7 +194,7 @@
             placeholder="请输入商品分类编码"
             maxlength="20"
           />
-        </el-form-item> -->
+        </el-form-item>-->
         <el-form-item label="商品分类图片" prop="goodsCategoryPicture">
           <stationAcatar
             @imgUrl="imgUrl"
@@ -238,11 +204,7 @@
           <!-- <img :src="form.goodsCategoryPicture" alt="" /> -->
         </el-form-item>
         <el-form-item label="分类概述" prop="categoryRemark">
-          <el-input
-            v-model="form.categoryRemark"
-            placeholder="请输入分类概述"
-            maxlength="300"
-          />
+          <el-input v-model="form.categoryRemark" placeholder="请输入分类概述" maxlength="300" />
         </el-form-item>
         <el-form-item label="显示顺序" prop="sort">
           <el-input
@@ -269,7 +231,7 @@ import {
   updatePicture,
   addGoodsCategory,
   updateGoodsCategory,
-  getStationCategoryList,
+  getStationCategoryList
 } from "@/api/system/goodsCategory";
 import stationAcatar from "../stationAvatar/index.vue";
 import baseurl from "@/api/baseurl";
@@ -286,22 +248,22 @@ export default {
         lazyLoad(node, resolve) {
           const id = node.level === 0 ? 0 : node.data.id;
           setTimeout(() => {
-            getStationCategoryList(id).then((res) => {
+            getStationCategoryList(id).then(res => {
               // 接口请求
-              res.data.forEach((e) => {
+              res.data.forEach(e => {
                 e.value = e.id;
                 e.label = e.goodsCategoryName;
               });
               resolve(
-                res.data.map((item) => {
+                res.data.map(item => {
                   return {
-                    ...item,
+                    ...item
                   };
                 })
               );
             });
           }, 300);
-        },
+        }
       },
       imgone: "",
       baseurl: "",
@@ -333,35 +295,33 @@ export default {
         categoryRemark: null,
         sort: null,
         parentId: 0,
-        parentName: "",
+        parentName: ""
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         goodsCategoryName: [
-          { required: true, message: "商品分类名称不能为空", trigger: "blur" },
+          { required: true, message: "商品分类名称不能为空", trigger: "blur" }
         ],
         goodsCategoryCode: [
-          { required: true, message: "商品分类编码不能为空", trigger: "blur" },
+          { required: true, message: "商品分类编码不能为空", trigger: "blur" }
         ],
         goodsCategoryPicture: [
-          { required: true, message: "商品分类图片不能为空", trigger: "blur" },
+          { required: true, message: "商品分类图片不能为空", trigger: "blur" }
         ],
         categoryRemark: [
-          { required: true, message: "分类概述不能为空", trigger: "blur" },
-        ],
-        sort: [
-          { required: true, message: "显示顺序不能为空", trigger: "blur" },
+          { required: true, message: "分类概述不能为空", trigger: "blur" }
         ],
+        sort: [{ required: true, message: "显示顺序不能为空", trigger: "blur" }]
       },
       // 树选项
       deptOptions: undefined,
       categoryLevel: null,
       defaultProps: {
         children: "children",
-        label: "goodsCategoryName",
-      },
+        label: "goodsCategoryName"
+      }
     };
   },
 
@@ -383,12 +343,12 @@ export default {
       this.queryParams.parentName = data.goodsCategoryName;
       // this.categoryLevel = data.categoryLevel;
       this.handleQuery();
-      getStationCategoryList(data.id).then((res) => {
-        res.data.forEach((e) => {
+      getStationCategoryList(data.id).then(res => {
+        res.data.forEach(e => {
           e.children = [
             {
-              goodsCategoryName: "",
-            },
+              goodsCategoryName: ""
+            }
           ];
         });
         this.loading = false;
@@ -398,20 +358,20 @@ export default {
     /** 查询商品分类信息列表 */
     info() {
       this.loading = true;
-      getStationCategoryList(0).then((res) => {
-        res.data.forEach((e) => {
+      getStationCategoryList(0).then(res => {
+        res.data.forEach(e => {
           e.children = [
             {
-              goodsCategoryName: "",
-            },
+              goodsCategoryName: ""
+            }
           ];
         });
         var obj = [
           {
             goodsCategoryName: "商品分类名称",
             children: res.data,
-            id: 0,
-          },
+            id: 0
+          }
         ];
         this.deptOptions = obj;
         this.loading = false;
@@ -419,7 +379,7 @@ export default {
     },
     getList() {
       this.loading = true;
-      listGoodsCategory(this.queryParams).then((response) => {
+      listGoodsCategory(this.queryParams).then(response => {
         this.goodsCategoryList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -433,7 +393,7 @@ export default {
         obj.pictureUrlList.push(this.form.goodsCategoryPicture);
       }
       if (obj.pictureUrlList.length > 0) {
-        updatePicture(obj).then((res) => {});
+        updatePicture(obj).then(res => {});
       }
       this.open = false;
       this.reset();
@@ -452,7 +412,7 @@ export default {
         updateBy: null,
         updateTime: null,
         parentId: null,
-        parentName: null,
+        parentName: null
       };
       this.resetForm("form");
     },
@@ -466,14 +426,14 @@ export default {
       this.queryParams = {
         pageNum: 1,
         pageSize: 10,
-        parentId: 0,
+        parentId: 0
       };
       this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -482,7 +442,6 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加商品分类信息";
-      console.log(this.queryParams);
       // if (this.queryParams.parentId != 0) {
       this.form.parentId = this.queryParams.parentId;
       // }
@@ -493,26 +452,25 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getGoodsCategory(id).then((response) => {
+      getGoodsCategory(id).then(response => {
         this.form = response.data;
         this.imgone = this.form.goodsCategoryPicture;
         this.open = true;
         this.title = "修改商品分类信息";
-        console.log(this.form);
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateGoodsCategory(this.form).then((response) => {
+            updateGoodsCategory(this.form).then(response => {
               var obj = { pictureUrlList: [] };
               if (this.imgone != this.form.goodsCategoryPicture) {
                 obj.pictureUrlList.push(this.imgone);
               }
               if (obj.pictureUrlList.length > 0) {
-                updatePicture(obj).then((res) => {});
+                updatePicture(obj).then(res => {});
               }
               this.$modal.msgSuccess("修改成功");
               ++this.isResouceShow;
@@ -521,7 +479,7 @@ export default {
               this.info();
             });
           } else {
-            addGoodsCategory(this.form).then((response) => {
+            addGoodsCategory(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               ++this.isResouceShow;
               this.open = false;
@@ -534,20 +492,17 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      console.log(row);
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除？")
-        .then(function () {
+        .then(function() {
           return delGoodsCategory(ids);
         })
         .then(() => {
           var obj = { pictureUrlList: [] };
           obj.pictureUrlList.push(row.goodsCategoryPicture);
           if (obj.pictureUrlList.length > 0) {
-            updatePicture(obj).then((res) => {
-              console.log(res);
-            });
+            updatePicture(obj).then(res => {});
           }
           this.getList();
           this.$modal.msgSuccess("删除成功");
@@ -559,15 +514,15 @@ export default {
       this.download(
         "system/goodsCategory/export",
         {
-          ...this.queryParams,
+          ...this.queryParams
         },
         `goodsCategory_${new Date().getTime()}.xlsx`
       );
     },
     imgUrl(imgUrl) {
       this.form.goodsCategoryPicture = imgUrl;
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/system/goodsCategoryAcatar/index.vue b/src/views/system/goodsCategoryAcatar/index.vue
index b272437..744a190 100644
--- a/src/views/system/goodsCategoryAcatar/index.vue
+++ b/src/views/system/goodsCategoryAcatar/index.vue
@@ -210,7 +210,6 @@ export default {
     },
     // 上传图片
     uploadImg() {
-      // console.log(this.types);
       this.$refs.cropper.getCropBlob((data) => {
         let formData = new FormData();
         formData.append("file", data);
diff --git a/src/views/system/goodsInfo/goodsInfojs.js b/src/views/system/goodsInfo/goodsInfojs.js
index ceb0587..8772e2e 100644
--- a/src/views/system/goodsInfo/goodsInfojs.js
+++ b/src/views/system/goodsInfo/goodsInfojs.js
@@ -73,8 +73,7 @@ export default {
                     label: "是",
                 },
             ],
-            integraloption: [
-                {
+            integraloption: [{
                     value: 0,
                     label: "否",
                 },
@@ -83,7 +82,7 @@ export default {
                     label: "是",
                 },
             ],
-            value:"",
+            value: "",
             // goodAttributeDetailsLists:[],
             goodDetailsLists: [],
             ids: [],
@@ -183,7 +182,6 @@ export default {
             this.imgsurl.pictureUrlList.push(item);
         },
         upwhetherShelf(row) {
-            console.log(row);
             if (row.whetherShelf == false) {
                 var obj = {
                     id: row.goodsInfoId,
@@ -196,7 +194,6 @@ export default {
                 };
             }
             editGoodsWhetherShelf(obj).then((res) => {
-                console.log(obj);
                 if (obj.whetherShelf == 0) {
                     this.$modal.msgSuccess("已修改上架状态为未上架");
                 } else {
@@ -217,14 +214,12 @@ export default {
                     }
                 });
                 this.goodsInfoList = response.rows;
-                console.log(this.goodsInfoList);
                 this.total = response.total;
                 this.loading = false;
             });
         },
         // 添加
         addgoodAttributeDetail() {
-            console.log(this.goodDetailsLists);
             if (this.goodDetailsLists.length == 5) {
                 this.$message.error("最多只能5条");
             } else {
@@ -234,9 +229,9 @@ export default {
                     goodsPrice: "",
                     goodsStock: "",
                     sort: null,
-                    integralExchangeCount:null,
-                    integralExchangeFlag:null,
-                    integralExchangeSill:null,
+                    integralExchangeCount: null,
+                    integralExchangeFlag: null,
+                    integralExchangeSill: null,
                     idd: this.idd,
                 };
                 this.goodDetailsLists.push(obj);
@@ -270,9 +265,7 @@ export default {
                 obj.pictureUrlList.push(this.form.goodsPictureUrl);
             }
             if (obj.pictureUrlList.length > 0) {
-                updatePicture(obj).then((res) => {
-                    console.log(res);
-                });
+                updatePicture(obj).then((res) => {});
             }
             if (this.imgsurl.pictureUrlList.length > 0) {
                 updatePicture(this.imgsurl).then((res) => {});
@@ -337,9 +330,9 @@ export default {
                 attributePitureUrl: "",
                 goodsPrice: "",
                 goodsStock: "",
-                integralExchangeCount:null,
-                integralExchangeFlag:null,
-                integralExchangeSill:null,
+                integralExchangeCount: null,
+                integralExchangeFlag: null,
+                integralExchangeSill: null,
                 sort: null,
                 idd: 9999999,
             }, ];
@@ -367,7 +360,6 @@ export default {
         },
         // 多选框选中数据
         handleSelectionChange(selection) {
-            console.log(selection);
             this.ids = selection.map((item) => item.goodsInfoId);
             this.single = selection.length !== 1;
             this.multiple = !selection.length;
@@ -383,9 +375,9 @@ export default {
                 attributePitureUrl: "",
                 goodsPrice: "",
                 goodsStock: "",
-                integralExchangeCount:null,
-                integralExchangeFlag:null,
-                integralExchangeSill:null,
+                integralExchangeCount: null,
+                integralExchangeFlag: null,
+                integralExchangeSill: null,
                 sort: null,
                 idd: 9999999,
             }, ];
@@ -396,7 +388,6 @@ export default {
             // this.reset();
             const id = row.goodsInfoId || this.ids;
             getGoodsInfo(id).then((response) => {
-                console.log(response);
                 this.form = response.data;
                 this.form.nurseStationName = row.nurseStationName;
                 this.imgone = this.form.goodsPictureUrl;
@@ -409,21 +400,18 @@ export default {
         },
         /** 提交按钮 */
         submitForm() {
-            console.log(this.form);
-            console.log(this.goodDetailsLists);
             this.form.goodAttributeDetailsLists = [];
             this.form.goodDetailsLists = this.goodDetailsLists;
             if (!this.form.goodDetailsLists.integralExchangeFlag) {
                 this.form.goodDetailsLists.integralExchangeFlag = null
             }
-            if (this.form.goodDetailsLists.integralExchangeSill=="") {
+            if (this.form.goodDetailsLists.integralExchangeSill == "") {
                 this.form.goodDetailsLists.integralExchangeSill = null
 
-            } 
+            }
             if (this.form.goodDetailsLists.integralExchangeCount == "") {
                 this.form.goodDetailsLists.integralExchangeCount = null
             }
-            console.log(this.form);
             this.$refs["form"].validate((valid) => {
                 if (valid) {
                     if (this.form.goodsInfoId != null) {
@@ -437,9 +425,7 @@ export default {
                                 obj.pictureUrlList.push(this.imgone);
                             }
                             if (obj.pictureUrlList.length > 0) {
-                                updatePicture(obj).then((res) => {
-                                    console.log(res);
-                                });
+                                updatePicture(obj).then((res) => {});
                             }
                             this.imgsurl = { pictureUrlList: [] };
                             ++this.isResouceShow;
@@ -464,7 +450,6 @@ export default {
         },
         /** 删除按钮操作 */
         handleDelete(row) {
-            console.log("row :>> ", row);
             this.$confirm("是否确认删除订单信息的数据项？", "提示", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
@@ -473,14 +458,11 @@ export default {
                 .then(() => {
                     var obj = { pictureUrlList: [] };
                     obj.pictureUrlList.push(row.goodsPictureUrl);
-                    updatePicture(obj).then((res) => {
-                        console.log(res);
-                    });
+                    updatePicture(obj).then((res) => {});
 
                     delGoodsInfo(row.goodsInfoId).then((res) => {
                         this.$message.success("删除成功");
                         this.getList();
-                        // console.log('this.OrderDetailsList :>> ', this.OrderDetailsList);
                     });
                 })
                 .catch(() => {});
@@ -509,11 +491,9 @@ export default {
         //   );
         // },
         imgUrl(imgUrl) {
-            console.log(imgUrl);
             this.form.goodsPictureUrl = imgUrl;
         },
         attributePitureUrl(imgUrl) {
-            console.log(imgUrl);
             // this.form.attributePitureUrl = imgUrl;
         },
         attributePitureitem(item) {
@@ -535,12 +515,9 @@ export default {
         //权限列表
         info() {
             goodsCategory().then((res) => {
-                console.log(res);
-                console.log(this.form);
                 this.goodsCategorylist = res.rows;
             });
             getListByUser(this.getListByUserquery).then((res) => {
-                console.log(res);
                 this.total2 = res.total;
                 this.nurseStationlist = res.rows;
                 this.queryParams.nurseStationId = res.rows[0].id;
@@ -558,7 +535,6 @@ export default {
                 pageSize: 9999,
             };
             getListByUser(queryFor).then((res) => {
-                console.log(res)
                 this.handstationlist = res.rows;
             });
         },
diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index e38bebb..5d5401c 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -708,14 +708,12 @@ export default {
     },
     // 查看录入物流单号弹框
     seelogistics(row) {
-      // console.log(id);
       // this.queryexpressNo.id = row.id;
       this.queryexpressNo = JSON.parse(JSON.stringify(row));
       this.innerlogistics = true;
     },
     // 确定按钮
     searchlogistics() {
-      console.log(this.queryexpressNo);
       editExpressNo(this.queryexpressNo).then(res => {
         if (res.code == 200) {
           this.$modal.msgSuccess("录入成功");
@@ -732,10 +730,8 @@ export default {
     },
     // 确认退款
     refund(id) {
-      console.log(id);
       goodsOrderRefundinfo(id).then(res => {
         this.refundlist = res.data;
-        console.log(this.refundlist);
         this.innerrefund = true;
         // this.getList();
       });
@@ -758,7 +754,6 @@ export default {
       });
     },
     // refund(id){
-    //     console.log(id);
     //    this.$confirm('是否确认退款?', '提示', {
     //       confirmButtonText: '确定',
     //       cancelButtonText: '取消',
@@ -937,7 +932,6 @@ export default {
         pageSize: 9999
       };
       getListByUser(queryFor).then(res => {
-        console.log(res);
         this.handstationlist = res.rows;
       });
     }
diff --git a/src/views/system/nurseType/index.vue b/src/views/system/nurseType/index.vue
index 1337659..189710b 100644
--- a/src/views/system/nurseType/index.vue
+++ b/src/views/system/nurseType/index.vue
@@ -284,7 +284,6 @@ export default {
     //删除deldisease
     deldisease(index) {
       this.form.nurseTypeList.splice(index, 1);
-      console.log(this.form.nurseTypeList);
     },
     adddisease() {
       var obj = {
diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index 16a3bcc..023e378 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -63,6 +63,7 @@
           <el-button v-if="scope.row.orderStatus == 'WAIT_PAY'">待付款</el-button>
           <el-button type="primary" v-if="scope.row.orderStatus == 'PAY'">已付款</el-button>
           <el-button type="primary" v-if="scope.row.orderStatus == 'WAIT_DISPATCH'">待派单</el-button>
+          <el-button type="primary" v-if="scope.row.orderStatus == 'WAIT_RECEIVE'">待接单</el-button>
           <el-button type="primary" v-if="scope.row.orderStatus == 'NOT_FINISH'">未完成</el-button>
           <el-button type="primary" v-if="scope.row.orderStatus == 'COMPLETE'">待评价</el-button>
           <el-button type="success" v-if="scope.row.orderStatus == 'EVALUATED'">服务完成</el-button>
@@ -121,31 +122,62 @@
     <el-dialog title="查看预约订单信息" :visible.sync="innerVisible4" append-to-body width="1280px">
       <el-form :inline="true" ref="form" :model="query" :rules="rules" label-width="130px">
         <el-form-item label="订单编号" prop="orderNo">
-          <el-input v-model="query.orderNo" disabled style="width: 250px" />
+          <div class="text">{{query.orderNo}}</div>
         </el-form-item>
         <el-form-item label="订单状态" prop="orderStatus">
-          <el-input :value="switchOrderStatus(query.orderStatus)" style="width: 250px" disabled></el-input>
+          <div class="text">{{switchOrderStatus(query.orderStatus)}}</div>
         </el-form-item>
         <el-form-item label="订单总金额" prop="totalPrice">
-          <el-input v-model="query.totalPrice" disabled style="width: 250px" />
+          <div class="text">{{query.totalPrice}}</div>
         </el-form-item>
         <el-form-item label="订单数量" prop="orderCount">
-          <el-input v-model="query.orderCount" disabled style="width: 250px" />
+          <div class="text">{{query.orderCount}}</div>
+        </el-form-item>
+        <el-form-item label="佣金金额" prop="orderCount">
+          <div class="text">{{query.orderCommissionAmount}}</div>
         </el-form-item>
         <el-form-item label="护理项目名称" prop="nurseItemName">
-          <el-input v-model="query.nurseItemName" disabled style="width: 250px" />
+          <div class="text">{{query.nurseItemName}}</div>
         </el-form-item>
+        <!-- <el-form-item label="护理员名称" prop="nursePersonName">
+          <div class="text">{{query.nursePersonName}}</div>
+        </el-form-item>-->
         <el-form-item label="服务时间" prop="time">
-          <el-input v-model="query.time" disabled style="width: 250px" />
+          <div class="text">{{query.time}}</div>
         </el-form-item>
         <el-form-item label="护理项目时长" prop="itemServeDurationUnit">
-          <el-input v-model="query.itemServeDurationUnit" disabled style="width: 250px" />
+          <div class="text">{{query.itemServeDurationUnit}}</div>
         </el-form-item>
         <el-form-item label="护理站名称" prop="nurseStationName">
-          <el-input v-model="query.nurseStationName" disabled style="width: 250px" />
+          <div class="text">{{query.nurseStationName}}</div>
+        </el-form-item>
+        <el-form-item label="评价星级" prop="compositeScore" v-if="query.orderStatus =='EVALUATED'">
+          <div class="text">{{query.compositeScore}}</div>
+        </el-form-item>
+        <el-form-item
+          label="评价满意度"
+          prop="evaluateSatisfaction"
+          v-if="query.orderStatus == 'EVALUATED'"
+        >
+          <div class="text">{{query.evaluateSatisfaction}}</div>
+        </el-form-item>
+        <el-form-item label="是否失能" prop="disablingCondition">
+          <div class="text">{{query.disablingCondition}}</div>
+        </el-form-item>
+        <el-form-item label="失能情况" prop="disablingReason">
+          <div class="text">{{query.disablingReason}}</div>
+        </el-form-item>
+        <el-form-item label="健康状况" prop="diseaseName">
+          <div
+            class="text"
+            style="height:100px;line-height:26px;overflow: scroll"
+          >{{query.diseaseName}}</div>
         </el-form-item>
         <el-form-item label="服务地址" prop="serviceAddress">
-          <el-input v-model="query.serviceAddress" disabled style="width: 250px" />
+          <div
+            class="text"
+            style="height:100px;line-height:26px;overflow: scroll"
+          >{{query.serviceAddress}}</div>
         </el-form-item>
         <el-form-item
           label="服务到岗照片"
@@ -174,13 +206,6 @@
         >
           <img class="img" :src="baseurl + query.userSignaturePictureUrl" alt />
         </el-form-item>
-        <el-form-item
-          label="评价满意度"
-          prop="evaluateSatisfaction"
-          v-if="query.orderStatus == 'EVALUATED'"
-        >
-          <el-input v-model="query.evaluateSatisfaction" disabled style="width: 250px" />
-        </el-form-item>
         <el-table
           :data="query.appointmentOrderConsumableList"
           align="center"
@@ -207,46 +232,6 @@
         "
       ></div>
     </el-dialog>
-    <!-- 派单弹框 -->
-    <el-dialog title="派单" :visible.sync="innerdispatch" append-to-body width="500px" height="100px">
-      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
-        <el-form-item label="护理员姓名" prop="nursePersonName">
-          <el-button
-            type
-            v-if="nurseName == '请选择护理员'"
-            style="width: 300px; text-align: left; height: 36px; color: #c0c4cc"
-            @click="clicknursePersonName()"
-          >{{ nurseName }}</el-button>
-          <el-button
-            type
-            @click="clicknursePersonName()"
-            v-else
-            style="
-              width: 300px;
-              text-align: left;
-              height: 36px;
-              padding-left: -10px;
-            "
-          >{{ nurseName }}</el-button>
-        </el-form-item>
-        <!-- <el-button
-              type=""
-              @click="departclick(item, index)"
-              v-else
-              style="
-                width: 200px;
-                text-align: left;
-                height: 36px;
-                padding-left: -10px;
-              "
-              >{{ item.departmentName }}</el-button
-        >-->
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <!-- <el-button @click="cancel">取 消</el-button> -->
-      </div>
-    </el-dialog>
     <!-- 取消预约弹框 -->
     <el-dialog title="取消预约" :visible.sync="innerrefund" append-to-body width="500px">
       <el-form :inline="true" :rules="rules" label-width="120px">
@@ -276,8 +261,8 @@
         <el-button type="primary" @click="ordercacenl">确 定</el-button>
       </div>
     </el-dialog>
-    <!-- 姓名弹框 -->
-    <el-dialog :visible.sync="nursePersonNameinfo" width="1000px" append-to-body>
+    <!-- 派单护理员弹框 -->
+    <el-dialog :visible.sync="nursePersonNameinfo" width="1300px" append-to-body title="派单">
       <el-form
         ref="queryForm"
         :model="querynursePersonname"
@@ -285,49 +270,87 @@
         label-width="80px"
         :inline="true"
       >
-        <el-form-item label="姓名" prop="nursePersonName" label-width="120">
-          <el-input v-model="querynursePersonname.nursePersonName" placeholder="请输入姓名" clearable />
+        <el-form-item label="护理人员姓名" prop="nursePersonName" label-width="120">
+          <el-input
+            v-model="querynursePersonname.nursePersonName"
+            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="dispatchlist" @cell-dblclick="nursePersonclick">
-        <el-table-column label="请选择" width="70" align="center">
+      <el-table :data="dispatchlist" @cell-dblclick="submitForm">
+        <el-table-column label="请选择" align="center">
           <template slot-scope="scope">
             <el-button
               type="primary"
               style="width: 15px; height: 15px; overflow: hidden"
-              v-if="nursePersonid == scope.row.nurseStationPersonId"
+              v-if="nursePersonlist.nurseStationPersonId == scope.row.nurseStationPersonId"
               circle
-              @click="nursePersonclick(scope.row)"
+              @click="submitForm(scope.row)"
             ></el-button>
             <el-button
               v-else
               style="width: 15px; height: 15px; overflow: hidden"
               circle
-              @click="nursePersonclick(scope.row)"
+              @click="submitForm(scope.row)"
             ></el-button>
           </template>
         </el-table-column>
-        <el-table-column property="nursePersonCode" label="护理员编号" width="150" align="center"></el-table-column>
-        <el-table-column property="nursePersonName" label="护理站人员姓名" width="150" align="center"></el-table-column>
-        <el-table-column property="nursePersonType" label="护理站人员类型" width="150" align="center">
+        <el-table-column property="nurseStationName" label="所属护理站" align="center"></el-table-column>
+        <!-- <el-table-column property="nursePersonCode" label="护理员编号"  align="center"></el-table-column> -->
+        <el-table-column property="nursePersonName" label="护理人员姓名" align="center"></el-table-column>
+        <el-table-column property="workStatus" label="在线状态" align="center">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.workStatus == 'ONLINE'" type="success">在线</el-button>
+            <el-button v-if="scope.row.workStatus == 'BE_BUSY'" type="warning">忙碌</el-button>
+            <el-button v-if="scope.row.workStatus == 'OFFLINE'" type="info">离线</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column property="evaluateStarCount" label="星级评价" align="center" width="180">
+          <template slot-scope="scope">
+            <el-rate :value="scope.row.evaluateStarCount" disabled></el-rate>
+          </template>
+        </el-table-column>
+        <el-table-column property="nursePersonType" label="护理人员类型" align="center">
           <template slot-scope="scope">
             {{ scope.row.nursePersonType == "NURSE" ? "护士" : "" }}
             {{ scope.row.nursePersonType == "NURSE_TEACHER" ? "护理师" : "" }}
           </template>
         </el-table-column>
-        <el-table-column property="phone" label="手机号" width="150" align="center"></el-table-column>
+        <el-table-column property="positionalTitleLevel" label="职称级别" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.positionalTitleLevel == "PRIMARY_LEVEL" ? "初级" : "" }}
+            {{ scope.row.positionalTitleLevel == "MIDDLE_LEVEL" ? "中级" : "" }}
+            {{ scope.row.positionalTitleLevel == "HIGH_LEVEL" ? "高级" : "" }}
+          </template>
+        </el-table-column>
+        <el-table-column property="phone" label="手机号" align="center"></el-table-column>
         <el-table-column label="性别" align="center" prop="sex">
           <template slot-scope="scope">
             {{ scope.row.sex == "MALE" ? "男" : "" }}
             {{ scope.row.sex == "FEMALE" ? "女" : "" }}
           </template>
         </el-table-column>
+        <el-table-column property="nursePersonName" label="查看证书" align="center">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-zoom-in"
+              @click="nursePersonclick(scope.row)"
+              v-hasPermi="['system:appointmentOrder:query']"
+            >查看</el-button>
+          </template>
+        </el-table-column>
       </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="nursePersonNameinfocancel">关 闭</el-button>
+        <el-button type="primary" @click="submitFormclick">确 定</el-button>
+      </div>
       <pagination
         v-show="total2 > 0"
         :total="total2"
@@ -336,6 +359,20 @@
         @pagination="handleQuery2"
       />
     </el-dialog>
+    <!-- 查看证书 -->
+    <el-dialog :visible.sync="certificateshow" width="1000px" append-to-body title="查看证书">
+      <el-table :data="PersonChecksrcList">
+        <el-table-column property="certificateUrl" label="证书图片" align="center">
+          <template slot-scope="scope">
+            <img :src="baseurl+scope.row.certificateUrl" alt style="width:100px;height:100px" />
+          </template>
+        </el-table-column>
+        <el-table-column property="certificateName" label="证书名称" align="center"></el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="certificateshow=false">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -346,7 +383,8 @@ import {
   getPerson,
   dispatchsubmit,
   xylWeChatRefundNotify,
-  appointmentOrderDetails
+  appointmentOrderDetails,
+  getPersonInfo
 } from "@/api/system/order";
 import { getListByUser } from "@/api/system/userlist.js";
 import baseurl from "@/api/baseurl.js";
@@ -402,8 +440,12 @@ export default {
       innerrefund: false,
       // 派单弹框
       innerdispatch: false,
-      // 姓名弹框
+      // 护理员姓名弹框
       nursePersonNameinfo: false,
+      certificateshow: false,
+      //护理员list
+      nursePersonlist: {},
+      PersonChecksrcList: [],
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -521,7 +563,6 @@ export default {
         }
         this.getList();
         this.innerrefund = false;
-        console.log(res);
       });
     },
     // 取消按钮
@@ -538,6 +579,8 @@ export default {
           return "待派单";
         case "NOT_FINISH":
           return "未完成";
+        case "WAIT_RECEIVE":
+          return "待接单";
         case "COMPLETE":
           return "待评价";
         case "EVALUATED":
@@ -558,20 +601,77 @@ export default {
       const id = row.orderNo;
       this.map = null;
       appointmentOrderDetails(id).then(res => {
-        res.data.forEach(e => {
-          if (e.serviceDate) {
-            e.time = e.serviceDate + "-" + e.serviceStartTime;
-          }
-        });
-        this.query = res.data[0];
+        res.data.time = res.data.serviceDate + "-" + res.data.serviceStartTime;
+        this.query = res.data;
+        res.data.disablingCondition == "DISABLED"
+          ? (res.data.disablingCondition = "是")
+          : "";
+        res.data.disablingCondition == "NOT_DISABLED"
+          ? (res.data.disablingCondition = "否")
+          : "";
         if (row.orderStatus == "EVALUATED") {
           if (res.data) {
-            if (res.data[0].evaluateSatisfaction == "COMMONLY") {
+            if (res.data.evaluateSatisfaction == "COMMONLY") {
               this.query.evaluateSatisfaction = "一般";
-            } else if (res.data[0].evaluateSatisfaction == "SATISFIED") {
+            } else if (res.data.evaluateSatisfaction == "SATISFIED") {
               this.query.evaluateSatisfaction = "满意";
-            } else if (res.data[0].evaluateSatisfaction == "DISSATISFIED") {
+            } else if (res.data.evaluateSatisfaction == "DISSATISFIED") {
               this.query.evaluateSatisfaction = "不满意";
+            } else if (res.data.evaluateSatisfaction == "VERYSATISFIED") {
+              this.query.evaluateSatisfaction = "非常满意";
+            } else if (res.data.evaluateSatisfaction == "VERYDISSATISFIED") {
+              this.query.evaluateSatisfaction = "非常不满意";
+            }
+            this.loading = false;
+            this.innerVisible4 = true;
+            setTimeout(() => {
+              this.init(this.query);
+            }, 500);
+          } else {
+            this.loading = false;
+            this.innerVisible4 = true;
+            setTimeout(() => {
+              this.init(this.query);
+            }, 500);
+          }
+        } else if (row.orderStatus == "COMPLETE") {
+          this.loading = false;
+          this.innerVisible4 = true;
+          setTimeout(() => {
+            this.init(this.query);
+          }, 500);
+        } else {
+          this.loading = false;
+          this.innerVisible4 = true;
+        }
+      });
+    },
+    // 查看
+    seeLook(row) {
+      this.loading = true;
+      const id = row.orderNo;
+      this.map = null;
+      appointmentOrderDetails(id).then(res => {
+        res.data.time = res.data.serviceDate + "-" + res.data.serviceStartTime;
+        this.query = res.data;
+        res.data.disablingCondition == "DISABLED"
+          ? (res.data.disablingCondition = "是")
+          : "";
+        res.data.disablingCondition == "NOT_DISABLED"
+          ? (res.data.disablingCondition = "否")
+          : "";
+        if (row.orderStatus == "EVALUATED") {
+          if (res.data) {
+            if (res.data.evaluateSatisfaction == "COMMONLY") {
+              this.query.evaluateSatisfaction = "一般";
+            } else if (res.data.evaluateSatisfaction == "SATISFIED") {
+              this.query.evaluateSatisfaction = "满意";
+            } else if (res.data.evaluateSatisfaction == "DISSATISFIED") {
+              this.query.evaluateSatisfaction = "不满意";
+            } else if (res.data.evaluateSatisfaction == "VERYSATISFIED") {
+              this.query.evaluateSatisfaction = "非常满意";
+            } else if (res.data.evaluateSatisfaction == "VERYDISSATISFIED") {
+              this.query.evaluateSatisfaction = "非常不满意";
             }
             this.loading = false;
             this.innerVisible4 = true;
@@ -600,40 +700,41 @@ export default {
     // 派单
     dispatch(row) {
       this.querynursePersonname.orderNo = row.orderNo;
-      this.nurseName = "请选择护理员";
-      this.innerdispatch = true;
-      this.nursePersonid = "";
-    },
-    // 姓名弹框
-    clicknursePersonName() {
       getPerson(this.querynursePersonname).then(res => {
         this.dispatchlist = res.rows;
         this.total2 = res.total;
-        console.log(this.dispatchlist);
         this.nursePersonNameinfo = true;
       });
     },
-    // 姓名弹框确定按钮
-    submitForm() {
+    //派单护理员
+    nursePersonNameinfocancel() {
+      this.nursePersonNameinfo = false;
+      this.nursePersonlist = {};
+    },
+    // 护理员姓名弹框确定按钮
+    submitFormclick() {
       let params = {
-        nurseStationPersonId: this.nursePersonid,
+        nurseStationPersonId: this.nursePersonlist.nurseStationPersonId,
         orderNo: this.querynursePersonname.orderNo
       };
       dispatchsubmit(params).then(res => {
         if (res.code == 200) {
           this.$modal.msgSuccess("派单成功");
         }
-        this.innerdispatch = false;
+        this.nursePersonNameinfo = false;
         this.getList();
-        this.nurseName = "请选择护理员";
       });
     },
-    // 选择姓名按钮
+    submitForm(row) {
+      this.nursePersonlist = row;
+    },
+    // 查看护理员证书按钮
     nursePersonclick(row) {
-      this.nursePersonid = row.nurseStationPersonId;
-      this.nurseName = row.nursePersonName;
-      this.nursePersonNameinfo = false;
-      console.log(row);
+      this.PersonChecksrcList = [];
+      getPersonInfo(row.nurseStationPersonId).then(res => {
+        this.PersonChecksrcList = res.data;
+        this.certificateshow = true;
+      });
     },
     // 确认取消预约
     cencel(row) {
@@ -674,7 +775,6 @@ export default {
     handleQuery2() {
       getPerson(this.querynursePersonname).then(res => {
         this.dispatchlist = res.rows;
-        console.log(this.querynursePersonname);
         // this.innerdispatch = true;
       });
     },
@@ -713,7 +813,6 @@ export default {
         pageSize: 9999
       };
       getListByUser(queryFor).then(res => {
-        console.log(res);
         this.handstationlist = res.rows;
       });
     },
@@ -729,7 +828,6 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      // console.log('row :>> ', row);
       this.$confirm("是否确认删除订单信息的数据项？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -766,5 +864,21 @@ export default {
   width: 100%;
   height: 600px;
 }
+.text {
+  width: 250px;
+  height: 36px;
+  line-height: 36px;
+  padding-left: 15px;
+  font-size: 14px;
+  border-radius: 4px;
+  padding: 0 15px;
+  border: 1px solid #e6ebf5;
+}
+::v-deep .el-dialog {
+  margin-top: 30px !important;
+}
+::v-deep .el-dialog__body {
+  padding: 0 20px 20px !important;
+}
 </style>
 
diff --git a/src/views/system/patientArchives/index.vue b/src/views/system/patientArchives/index.vue
index 5162d49..477544d 100644
--- a/src/views/system/patientArchives/index.vue
+++ b/src/views/system/patientArchives/index.vue
@@ -602,9 +602,7 @@ export default {
   methods: {
     // 重置密码
     handleResetPwd(row) {
-      console.log(row)
       const id= row.id
-      console.log(id)
       // const id=row.userId
       this.$prompt('请输入新的密码', "提示", {
         confirmButtonText: "确定",
@@ -614,7 +612,6 @@ export default {
         inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
       })
         .then((res) => {
-          console.log(res)
           const params = {
             id,
             password: res.value
@@ -627,7 +624,6 @@ export default {
     },
     // 查询省事件
     province(item) {
-      console.log(item);
       this.queryParams.city = "";
       this.queryParams.area = "";
       this.queryParams.areaCode = "";
@@ -635,9 +631,7 @@ export default {
       //  this.value2 = "";
       // this.value3 = "";
       SecondaryLevelInfo(item.id).then((res) => {
-        console.log(res);
         this.SecondaryLevelInfolist = res.data;
-        // console.log(this.SecondaryLevelInfolist);
         this.citylist = res.data;
       });
     },
@@ -647,41 +641,32 @@ export default {
       this.queryParams.areaCode = "";
       // this.value2 = "";
       // this.value3 = "";
-      console.log(item);
       SecondaryLevelInfo(item.id).then((res) => {
-        console.log(res);
         this.arealists = res.data;
       });
     },
     //点击区县城
     clickarea(item) {
       // this.value3 = "";
-      console.log(item);
       SecondaryLevelInfo(item.id).then((res) => {
-        console.log(res);
         this.streetlist = res.data;
       });
     },
     //点击街道
     clickstreet(item) {
       this.form.areaCode = item.areaCode;
-      console.log(this.form);
     },
     // 所属省下拉框
     loadMore() {
-      console.log("1");
       var a = Math.ceil(this.total2 / 10);
-      console.log(this.arealist.length);
       if (this.arealist.length + 1 >= this.total2) {
       } else {
         if (this.getProvincequeryParams.pageNum >= a) {
         } else {
           this.getProvincequeryParams.pageNum++;
           FirstLevel(this.getProvincequeryParams).then((res) => {
-            console.log(res);
             res.rows.forEach((e) => {
               this.arealist.push(e);
-              console.log(this.arealist);
             });
           });
         }
@@ -689,10 +674,8 @@ export default {
     },
     Provincelist() {
       FirstLevel(this.getProvincequeryParams).then((res) => {
-        console.log(res);
         this.arealist = res.data;
         this.total2 = res.total;
-        console.log(this.arealist);
       });
     },
     /** 查询被护理人基本信息列表 */
diff --git a/src/views/system/person/index.vue b/src/views/system/person/index.vue
index 199fc97..f3af762 100644
--- a/src/views/system/person/index.vue
+++ b/src/views/system/person/index.vue
@@ -6,29 +6,24 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      label-width="70px"
     >
       <el-form-item label="护理站" prop="nurseStationId">
         <el-select
           v-model="queryParams.nurseStationId"
           placeholder="请选择护理站"
           @keyup.enter.native="handleQuery"
-          @change='handleQuery'
+          @change="handleQuery"
         >
           <el-option
             v-for="item in handstationlist"
             :key="item.id"
             :label="item.nurseStationName"
             :value="item.id"
-          >
-          </el-option>
+          ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item
-        label="所属科室"
-        prop="departmentName"
-        style="margin-left: 25px"
-      >
+      <el-form-item label="所属科室" prop="departmentName">
         <el-input
           v-model="queryParams.departmentName"
           placeholder="请输入所属科室"
@@ -44,20 +39,39 @@
           @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 label="职称级别" prop="positionalTitleLevel">
+        <el-select v-model="queryParams.positionalTitleLevel" clearable>
+          <el-option
+            v-for="item in positionalTitleLevellist"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="审核状态" prop="modifyCheckStatus">
+        <el-select v-model="queryParams.modifyCheckStatus" clearable>
+          <el-option
+            v-for="item in modifyCheckStatuslist"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -67,8 +81,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:person:add']"
-          >新增</el-button
-        >
+        >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -79,8 +92,7 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:person:edit']"
-          >修改</el-button
-        >
+        >修改</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -91,8 +103,7 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:person:remove']"
-          >删除</el-button
-        >
+        >删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -102,22 +113,16 @@
           size="mini"
           @click="handleImport"
           v-hasPermi="['system:person:importStationPerson']"
-          >导入</el-button
-        >
+        >导入</el-button>
       </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-
     <el-table
       v-loading="loading"
       :data="nurseStationPersonList"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-
       <el-table-column
         label="护理站名称"
         align="center"
@@ -126,50 +131,43 @@
       />
       <el-table-column label="科室名称" align="center" prop="departmentName" />
       <el-table-column label="姓名" align="center" prop="nursePersonName" />
-
       <el-table-column label="性别" align="center" prop="sex">
         <template slot-scope="scope">
           {{ scope.row.sex == "MALE" ? "男" : "" }}
           {{ scope.row.sex == "FEMALE" ? "女" : "" }}
         </template>
       </el-table-column>
-
       <el-table-column label="联系电话" align="center" prop="phone" />
-      <el-table-column
-        label="居住地址"
-        align="center"
-        prop="address"
-        :show-overflow-tooltip="true"
-      />
+      <el-table-column label="居住地址" align="center" prop="address" :show-overflow-tooltip="true" />
+      <el-table-column label="星级评价" align="center" prop="evaluateStarCount" />
       <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
-
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-s-check"
+            @click="handshenhe(scope.row)"
+            v-if="scope.row.modifyInfoFlag==1"
+          >审核</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:person:edit']"
-            >修改</el-button
-          >
+          >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:person:remove']"
-            >删除</el-button
-          >
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-
     <pagination
       v-show="total > 0"
       :total="total"
@@ -177,282 +175,7 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 添加护理站人员信息对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open2"
-      width="1048px"
-      append-to-body
-    >
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-        :inline="true"
-      >
-        <div
-          v-for="(item, index) in form.nurseStationPersonList"
-          :key="index"
-          style="margin-top: 10px"
-        >
-          <el-form-item
-            label="所属护理站"
-            label-width="120px"
-            :rules="rules.nurseStationPersonList.nurseStationId"
-            :prop="`nurseStationPersonList.${index}.nurseStationId`"
-          >
-            <el-button
-              type=""
-              @click="clickinnerVisible(item, index)"
-              v-if="item.nurseStationName == '请选择所属护理站'"
-              style="
-                width: 200px;
-                text-align: left;
-                height: 36px;
-                color: #c0c4cc;
-                overflow: hidden;
-              "
-              >{{ item.nurseStationName }}</el-button
-            >
-            <el-button
-              type=""
-              @click="clickinnerVisible(item, index)"
-              v-else
-              style="
-                width: 200px;
-                text-align: left;
-                height: 36px;
-                padding-left: -10px;
-                overflow: hidden;
-              "
-              >{{ item.nurseStationName }}</el-button
-            >
-          </el-form-item>
-
-          <el-form-item
-            label="所属科室"
-            label-width="120px"
-            :rules="rules.nurseStationPersonList.departmentCode"
-            :prop="`nurseStationPersonList.${index}.departmentCode`"
-          >
-            <el-button
-              type=""
-              @click="departclick(item, index)"
-              v-if="item.departmentName == '请选择所属科室'"
-              style="
-                width: 200px;
-                text-align: left;
-                height: 36px;
-                color: #c0c4cc;
-              "
-              >{{ item.departmentName }}</el-button
-            >
-            <el-button
-              type=""
-              @click="departclick(item, index)"
-              v-else
-              style="
-                width: 200px;
-                text-align: left;
-                height: 36px;
-                padding-left: -10px;
-              "
-              >{{ item.departmentName }}</el-button
-            >
-          </el-form-item>
-          <el-form-item
-            label="护理人姓名"
-            label-width="120px"
-            :rules="rules.nurseStationPersonList.nursePersonName"
-            :prop="`nurseStationPersonList.${index}.nursePersonName`"
-          >
-            <el-input
-              maxlength="15"
-              v-model="item.nursePersonName"
-              placeholder="请输入护理人姓名"
-            />
-          </el-form-item>
-          <el-form-item
-            label="护理人职称"
-            label-width="120px"
-            :rules="rules.nurseStationPersonList.nursePersonType"
-            :prop="`nurseStationPersonList.${index}.nursePersonType`"
-          >
-            <el-select
-              v-model="item.nursePersonType"
-              clearable
-              placeholder="请选择"
-              style="width: 200px"
-            >
-              <el-option
-                v-for="item in nursePersonTypes"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item
-            label="性别"
-            style="margin-left: 42px"
-            :rules="rules.nurseStationPersonList.sex"
-            :prop="`nurseStationPersonList.${index}.sex`"
-          >
-            <el-select
-              v-model="item.sex"
-              clearable
-              placeholder="请选择"
-              style="width: 200px"
-            >
-              <el-option
-                v-for="item in sexs"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item
-            label="联系电话"
-            label-width="120px"
-            :rules="rules.nurseStationPersonList.phone"
-            :prop="`nurseStationPersonList.${index}.phone`"
-          >
-            <el-input
-              v-model="item.phone"
-              placeholder="请输入联系电话"
-              maxlength="11"
-            />
-          </el-form-item>
-          <el-form-item
-            label="居住地址"
-            label-width="120px"
-            :rules="rules.nurseStationPersonList.address"
-            :prop="`nurseStationPersonList.${index}.address`"
-          >
-            <el-input
-              v-model="item.address"
-              placeholder="请输入居住地址"
-              maxlength="50"
-              style="width: 200px"
-            />
-          </el-form-item>
-        </div>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-    <!-- 新增护理站名称弹框 -->
-    <el-dialog
-      :title="title2"
-      :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"
-        v-loading="loading"
-      >
-        <el-table-column label="请选择" width="100" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 15px; height: 15px"
-              v-if="stationid == 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="info"
-      />
-    </el-dialog>
-    <!-- 修改护理站名称弹框 -->
+    <!-- 护理站弹框 -->
     <el-dialog
       :title="title2"
       :visible.sync="innerVisiblexg"
@@ -467,22 +190,14 @@
         label-width="80px"
         :inline="true"
       >
-        <el-form-item
-          label="护理站编码"
-          prop="nurseStationCode"
-          label-width="120"
-        >
+        <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-form-item label="护理站名称" prop="nurseStationName" label-width="120">
           <el-input
             v-model="nurseStationqueryParams.nurseStationName"
             placeholder="请输入护理站名称"
@@ -490,16 +205,8 @@
           />
         </el-form-item>
         <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleQuery4"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery4"
-            >重置</el-button
-          >
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery4">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery4">重置</el-button>
         </el-form-item>
       </el-form>
       <el-table :data="nurseStationlist" @cell-dblclick="nurseclick2">
@@ -520,22 +227,10 @@
             ></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"
-        >
-        </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-column property="nurseStationCode" label="护理站编码" align="center"></el-table-column>
+        <el-table-column property="nurseStationName" label="护理站名称" align="center"></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="nursetotal > 0"
@@ -546,105 +241,6 @@
       />
     </el-dialog>
     <!-- 所属科室弹框 -->
-    <el-dialog
-      :title="title3"
-      :visible.sync="innerVisible2"
-      width="1000px"
-      append-to-body
-      :before-close="departcancel"
-    >
-      <el-form
-        ref="queryForm"
-        :model="queryParams3"
-        :rules="rules"
-        label-width="80px"
-        :inline="true"
-      >
-        <el-form-item label="科室编码" prop="departmentCode" label-width="120">
-          <el-input
-            v-model="queryParams3.departmentCode"
-            placeholder="请输入科室编码"
-            clearable
-          />
-        </el-form-item>
-        <el-form-item label="科室名称" prop="" label-width="120">
-          <el-input
-            v-model="queryParams3.departmentName"
-            placeholder="请输入科室名称"
-            clearable
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleQuery3"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery3"
-            >重置</el-button
-          >
-        </el-form-item>
-      </el-form>
-      <el-table
-        :data="StationDepartmentLists"
-        @cell-dblclick="StationDepartmentclick"
-      >
-        <el-table-column label="请选择" width="100" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 15px; height: 15px; overflow: hidden"
-              v-if="departid == scope.row.departmentCode"
-              circle
-              @click="StationDepartmentclick(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px; overflow: hidden"
-              circle
-              @click="StationDepartmentclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="nurseStationName"
-          label="护理站名称"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="departmentCode"
-          label="科室编码"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="departmentName"
-          label="科室名称"
-          align="center"
-        >
-        </el-table-column>
-
-        <el-table-column
-          property="departmentPerson"
-          label="科室负责人"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column property="phone" label="联系电话" align="center">
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="departtotal > 0"
-        :total="departtotal"
-        :page.sync="queryParams3.pageNum"
-        :limit.sync="queryParams3.pageSize"
-        @pagination="getList3"
-      />
-    </el-dialog>
-    <!-- 修改所属科室弹框 -->
     <el-dialog
       :title="title3"
       :visible.sync="innerVisiblexg2"
@@ -660,36 +256,17 @@
         :inline="true"
       >
         <el-form-item label="科室编码" prop="departmentCode" label-width="120">
-          <el-input
-            v-model="queryParams3.departmentCode"
-            placeholder="请输入科室编码"
-            clearable
-          />
+          <el-input v-model="queryParams3.departmentCode" placeholder="请输入科室编码" clearable />
         </el-form-item>
-        <el-form-item label="科室名称" prop="" label-width="120">
-          <el-input
-            v-model="queryParams3.departmentName"
-            placeholder="请输入科室名称"
-            clearable
-          />
+        <el-form-item label="科室名称" prop label-width="120">
+          <el-input v-model="queryParams3.departmentName" placeholder="请输入科室名称" clearable />
         </el-form-item>
         <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleQuery3"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery3"
-            >重置</el-button
-          >
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery3">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery3">重置</el-button>
         </el-form-item>
       </el-form>
-      <el-table
-        :data="StationDepartmentLists"
-        @cell-dblclick="StationDepartmentclick2"
-      >
+      <el-table :data="StationDepartmentLists" @cell-dblclick="StationDepartmentclick2">
         <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
             <el-button
@@ -707,33 +284,12 @@
             ></el-button>
           </template>
         </el-table-column>
-        <el-table-column
-          property="nurseStationName"
-          label="护理站名称"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="departmentCode"
-          label="科室编码"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="departmentName"
-          label="科室名称"
-          align="center"
-        >
-        </el-table-column>
+        <el-table-column property="nurseStationName" label="护理站名称" align="center"></el-table-column>
+        <el-table-column property="departmentCode" label="科室编码" align="center"></el-table-column>
+        <el-table-column property="departmentName" label="科室名称" align="center"></el-table-column>
 
-        <el-table-column
-          property="departmentPerson"
-          label="科室负责人"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column property="phone" label="联系电话" align="center">
-        </el-table-column>
+        <el-table-column property="departmentPerson" label="科室负责人" align="center"></el-table-column>
+        <el-table-column property="phone" label="联系电话" align="center"></el-table-column>
       </el-table>
       <pagination
         v-show="departtotal > 0"
@@ -743,115 +299,159 @@
         @pagination="getList3"
       />
     </el-dialog>
-    <!-- 修改 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item
-          label="所属护理站"
-          label-width="120px"
-          prop="nurseStationId"
-          style="margin-left: -20px"
-        >
+    <!-- 新增修改 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="900px"
+      append-to-body
+      :before-close="cancel"
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
+        <el-form-item label="所属护理站" prop="nurseStationId">
           <el-button
-            type=""
+            type
             @click="departclickxg"
             v-if="nurseStationName == '请选择所属护理站'"
-            style="width: 362px; text-align: left; height: 36px; color: #c0c4cc"
-            >{{ nurseStationName }}</el-button
-          >
+            style="width: 300px; text-align: left; height: 36px; color: #c0c4cc"
+          >{{ nurseStationName }}</el-button>
           <el-button
-            type=""
+            type
             @click="departclickxg()"
             v-else
             style="
-              width: 362px;
+              width: 300px;
               text-align: left;
               height: 36px;
-              padding-left: -10px;
             "
-            >{{ nurseStationName }}</el-button
-          >
+          >{{ nurseStationName }}</el-button>
         </el-form-item>
-
-        <el-form-item
-          label="所属科室"
-          label-width="120px"
-          style="margin-left: -20px"
-          prop="departmentName"
-        >
+        <el-form-item label="所属科室" prop="departmentName">
           <el-button
-            type=""
+            type
             @click="departclick2"
             v-if="departmentName == '请选择所属科室'"
-            style="width: 362px; text-align: left; height: 36px; color: #c0c4cc"
-            >{{ departmentName }}</el-button
-          >
+            style="width: 300px; text-align: left; height: 36px; color: #c0c4cc"
+          >{{ departmentName }}</el-button>
           <el-button
-            type=""
+            type
             @click="departclick2()"
             v-else
             style="
-              width: 362px;
+              width: 300px;
               text-align: left;
               height: 36px;
-              padding-left: -10px;
             "
-            >{{ departmentName }}</el-button
-          >
+          >{{ departmentName }}</el-button>
         </el-form-item>
         <el-form-item label="姓名" prop="nursePersonName">
           <el-input
             maxlength="15"
             v-model="form.nursePersonName"
             placeholder="请输入姓名"
+            style="width: 300px"
           />
         </el-form-item>
+        <el-form-item label="出生日期" prop="birthDate">
+          <el-date-picker
+            v-model="form.birthDate"
+            format="yyyy 年 MM 月 dd 日"
+            value-format="yyyy-MM-dd"
+            type="date"
+            placeholder="选择日期"
+            style="width: 300px"
+          ></el-date-picker>
+        </el-form-item>
         <el-form-item label="护理人职称" prop="nursePersonType">
           <el-select
             v-model="form.nursePersonType"
             clearable
             placeholder="请选择"
-            style="width: 363px"
+            style="width: 300px"
           >
             <el-option
               v-for="item in nursePersonTypes"
               :key="item.value"
               :label="item.label"
               :value="item.value"
-            >
-            </el-option>
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="性别" prop="sex">
-          <el-select
-            v-model="form.sex"
-            clearable
-            placeholder="请选择"
-            style="width: 363px"
-          >
+          <el-select v-model="form.sex" clearable placeholder="请选择" style="width: 300px">
             <el-option
               v-for="item in sexs"
               :key="item.value"
               :label="item.label"
               :value="item.value"
-            >
-            </el-option>
+            ></el-option>
           </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" style="width: 300px" />
         </el-form-item>
         <el-form-item label="居住地址" prop="address">
           <el-input
             v-model="form.address"
             placeholder="请输入居住地址"
             maxlength="50"
+            style="width: 300px"
           />
         </el-form-item>
+        <el-form-item label="职称级别">
+          <el-select v-model="form.positionalTitleLevel" style="width: 300px" clearable>
+            <el-option
+              v-for="item in positionalTitleLevellist"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="擅长项目">
+          <el-input
+            maxlength="300"
+            v-model="form.geniusItem"
+            placeholder="请输入擅长项目"
+            style="width: 300px"
+          />
+        </el-form-item>
+        <el-form-item label="证书资质" required>
+          <el-table :data="form.nurseStationPersonCertificateList" style="width: 850px">
+            <el-table-column property="consumableCount" label="证书名称" align="center">
+              <template slot-scope="scope">
+                <el-input maxlength="100" v-model="scope.row.certificateName" placeholder="请输入证书名称"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column property="certificateUrl" label="证书图片" align="center">
+              <template slot-scope="scope">
+                <stationAcatar
+                  @imgUrl="imgUrl"
+                  @item="imgclassifyItem"
+                  :img="scope.row.certificateUrl"
+                  :item="scope.row"
+                  :type="'personCertificateUrl'"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column property="sort" label="证书排序" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  maxlength="5"
+                  v-model.number="scope.row.sort"
+                  placeholder="请输入排序(只能输入数字)"
+                  oninput="value=value.replace(/[^\d]/g,'')"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scope">
+                <el-button size="mini" type="text" @click="addCertificate">新增</el-button>
+                <el-button size="mini" type="text" @click="delCertificate(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -859,12 +459,7 @@
       </div>
     </el-dialog>
     <!-- 导入 -->
-    <el-dialog
-      :title="upload.title"
-      :visible.sync="upload.open"
-      width="400px"
-      append-to-body
-    >
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
       <el-upload
         ref="upload"
         :limit="1"
@@ -878,7 +473,10 @@
         drag
       >
         <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__text">
+          将文件拖到此处，或
+          <em>点击上传</em>
+        </div>
         <div class="el-upload__tip text-center" slot="tip">
           <span>仅允许导入xls、xlsx格式文件。</span>
           <el-link
@@ -886,8 +484,7 @@
             :underline="false"
             style="font-size: 12px; vertical-align: baseline"
             @click="importTemplate"
-            >下载模板</el-link
-          >
+          >下载模板</el-link>
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -895,6 +492,85 @@
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 审核 -->
+    <el-dialog
+      title="审核"
+      :visible.sync="templeopen"
+      width="900px"
+      append-to-body
+      :before-close="templeopenfalse"
+    >
+      <el-form ref="form" :model="form" label-width="100px" :inline="true">
+        <!-- <el-form-item label="所属护理站">
+          <div class="text">{{ form.nurseStationName }}</div>
+        </el-form-item>
+        <el-form-item label="所属科室">
+          <div class="text">{{ form.departmentName }}</div>
+        </el-form-item>-->
+        <el-form-item label="姓名">
+          <div class="text">{{ form.nursePersonName }}</div>
+        </el-form-item>
+        <!-- <el-form-item label="护理人职称">
+          <div class="text">
+            {{ form.nursePersonType=='NURSE'?"护士":'' }}
+            {{ form.nursePersonType=='NURSE_TEACHER'?"护理师":'' }}
+          </div>
+        </el-form-item>
+        <el-form-item label="性别">
+          <div class="text">
+            {{ form.sex=='MALE'?'男':'' }}
+            {{ form.sex=='FEMALE'?'女':'' }}
+          </div>
+        </el-form-item>
+        <el-form-item label="联系电话">
+          <div class="text">{{ form.phone }}</div>
+        </el-form-item>
+        <el-form-item label="居住地址">
+          <div class="text">{{ form.address }}</div>
+        </el-form-item>-->
+        <el-form-item label="职称级别">
+          <div class="text">
+            {{ form.positionalTitleLevelCheck=='PRIMARY_LEVEL'?'初级':'' }}
+            {{ form.positionalTitleLevelCheck=='MIDDLE_LEVEL'?'中级':'' }}
+            {{ form.positionalTitleLevelCheck=='HIGH_LEVEL'?'高级':'' }}
+          </div>
+        </el-form-item>
+        <el-form-item label="擅长项目">
+          <div
+            class="text"
+            style="width:400px;height:100px;line-height:26px;overflow: scroll"
+          >{{form.geniusItemCheck}}</div>
+        </el-form-item>
+        <el-form-item label="证书资质">
+          <el-table :data="form.nurseStationPersonCheckList" style="width: 850px">
+            <el-table-column property="consumableCount" label="证书名称" align="center" width="500px">
+              <template slot-scope="scope">
+                <div
+                  style="text-align:left;width:480px"
+                  class="text"
+                >{{ scope.row.certificateName }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column property="certificateUrl" label="证书图片" align="center">
+              <template slot-scope="scope">
+                <img :src="baseurl+scope.row.certificateUrl" alt style="width:100px;height:100px" />
+                <!-- <stationAcatar
+                  @imgUrl="imgUrl"
+                  @item="imgclassifyItem"
+                  :img="scope.row.certificateUrl"
+                  :item="scope.row"
+                  :type="'personCertificateUrl'"
+                />-->
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
+      </el-form>
+      <div style="display: flex;justify-content: space-evenly;">
+        <el-button type="primary" @click="templesubmit">同意</el-button>
+        <el-button @click="templeopen=false">取消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -902,3 +578,15 @@
 import personjs from "./personjs";
 export default personjs;
 </script>
+<style scoped>
+.text {
+  width: 300px;
+  height: 40px;
+  overflow: hidden;
+  font-size: 14px;
+  line-height: 40px;
+  border-radius: 4px;
+  padding-left: 20px;
+  border: 1px solid #e6ebf5;
+}
+</style>
diff --git a/src/views/system/person/personjs.js b/src/views/system/person/personjs.js
index 73be277..e786dc9 100644
--- a/src/views/system/person/personjs.js
+++ b/src/views/system/person/personjs.js
@@ -6,11 +6,15 @@ import {
     updatePerson,
     stationList,
     StationDepartmentList,
+    getNurseStationPersonCheck,
+    updateNurseStationPersonChecks
 } from "@/api/system/person";
 import { getToken } from "@/utils/auth";
 import { getListByUser } from "@/api/system/userlist.js";
-
+import stationAcatar from "../stationAvatar/index.vue";
+import baseurl from '@/api/baseurl'
 export default {
+    components: { stationAcatar },
     name: "Person",
     data() {
         // 验证手机号的规则
@@ -34,7 +38,25 @@ export default {
             cb(new Error("请输入正确的联系电话"));
         };
         return {
+            baseurl: null,
             //男女选择
+            positionalTitleLevellist: [{
+                label: "初级",
+                value: "PRIMARY_LEVEL",
+            }, {
+                label: "中级",
+                value: "MIDDLE_LEVEL",
+            }, {
+                label: "高级",
+                value: "HIGH_LEVEL",
+            }],
+            modifyCheckStatuslist: [{
+                label: "已审核",
+                value: "CHECKED",
+            }, {
+                label: "未审核",
+                value: "NOT_CHECK",
+            }],
             sexs: [{
                     label: "男",
                     value: "MALE",
@@ -53,15 +75,12 @@ export default {
                     value: "NURSE_TEACHER",
                 },
             ],
-
             innerVisible: false,
             innerVisible2: false,
             innerVisiblexg: false,
             innerVisiblexg2: false,
-
             // 遮罩层
             loading: true,
-
             // 用户导入参数
             upload: {
                 // 是否显示弹出层（用户导入）
@@ -107,8 +126,8 @@ export default {
             title3: "",
             // 修改弹出层
             open: false,
+            templeopen: false,
             // 添加弹出层
-            open2: false,
             //权限查询
             // 查询参数
             queryParams: {
@@ -132,7 +151,6 @@ export default {
                 id: null,
                 nurseStationId: null,
             },
-
             queryParams3: {
                 pageNum: 1,
                 pageSize: 10,
@@ -150,12 +168,21 @@ export default {
                 pageNum: 1,
                 pageSize: 10,
             },
-
             // 表单参数
             form: {},
             index: "",
+            idd: 1,
             // 表单校验
             rules: {
+                geniusItem: [
+                    { required: true, message: "请输入擅长项目", trigger: "blur" },
+                ],
+                birthDate: [
+                    { required: true, message: "请选择出生日期", trigger: "blur" },
+                ],
+                positionalTitleLevel: [
+                    { required: true, message: "请选择职称级别", trigger: "blur" },
+                ],
                 nurseStationId: [
                     { required: true, message: "请选择所属护理站", trigger: "blur" },
                 ],
@@ -179,48 +206,60 @@ export default {
                 address: [
                     { required: true, message: "居住地址不能为空", trigger: "blur" },
                 ],
-                nurseStationPersonList: {
-                    nursePersonName: [{
-                        required: true,
-                        message: "请选择所属护理站",
-                        trigger: "blur",
-                    }, ],
-                    departmentCode: [
-                        { required: true, message: "所属科室不能为空", trigger: "blur" },
-                    ],
-                    nurseStationId: [
-                        { required: true, message: "请选择所属护理站", trigger: "blur" },
-                    ],
-                    nursePersonName: [
-                        { required: true, message: "护理人姓名不能为空", trigger: "blur" },
-                    ],
-                    nursePersonType: [
-                        { required: true, message: "护理人职称不能为空", trigger: "blur" },
-                    ],
-                    sex: [{ required: true, message: "性别不能为空", trigger: "blur" }],
-                    phone: [{
-                        required: true,
-                        validator: checkMobile,
-                        message: "",
-                        trigger: "blur",
-                    }, ],
-                    address: [
-                        { required: true, message: "居住地址不能为空", trigger: "blur" },
-                    ],
-                },
             },
         };
     },
     created() {
+        this.baseurl = baseurl
         this.infos();
         this.info();
     },
     methods: {
+        //删除Certificate
+        delCertificate(index) {
+            if (this.form.nurseStationPersonCertificateList.length == 1) {
+                this.$message.error("不可全部删除");
+            } else {
+                this.form.nurseStationPersonCertificateList.splice(index, 1);
+            }
+        },
+        //添加Certificate
+        addCertificate() {
+            this.idd++;
+            var obj = {
+                certificateName: null,
+                certificateUrl: null,
+                sort: null,
+                idd: this.idd
+            };
+            if (this.form.nurseStationPersonCertificateList.length == 5) {
+                this.$message.error("最多只能5条");
+            } else {
+                this.form.nurseStationPersonCertificateList.push(obj);
+            }
+        },
+        imgUrl(imgUrl) {},
+        //接收图片所属的item
+        imgclassifyItem(item) {
+            let items = JSON.parse(item);
+            if (items.idd && !items.id) {
+                this.form.nurseStationPersonCertificateList.forEach((e) => {
+                    if (e.idd == items.idd) {
+                        e.certificateUrl = items.certificateUrl;
+                    }
+                });
+            } else if (!items.idd && items.id) {
+                this.form.nurseStationPersonCertificateList.forEach((e) => {
+                    if (e.id == items.id) {
+                        e.certificateUrl = items.certificateUrl;
+                    }
+                });
+            }
+        },
         // // 新增所属科室按钮
         departclick(item, index) {
             if (this.form.nurseStationId != null) {
                 this.getList3();
-                console.log(item);
                 this.departid = item.departmentCode;
                 this.innerVisible2 = true;
                 this.index = index;
@@ -231,7 +270,6 @@ export default {
         },
         // // 修改所属科室按钮
         departclick2() {
-            console.log(this.form.nurseStationId);
             if (this.form.nurseStationId != null) {
                 this.getList3();
                 this.departid2 = this.form.departmentCode;
@@ -257,7 +295,6 @@ export default {
         },
         // 修改护理站
         nurseclick2(row) {
-            console.log(row);
             this.nurseStationName = row.nurseStationName;
             this.stationid2 = row.id;
             this.form.nurseStationId = row.id;
@@ -265,7 +302,6 @@ export default {
             this.innerVisiblexg = false;
             this.form.nursename = row.nurseStationName;
         },
-
         // 护理站名称
         nurseclick(row) {
             this.nursename = row.nurseStationName;
@@ -278,13 +314,10 @@ export default {
                 row.nurseStationName;
             this.form.nurseStationPersonList[this.index].nurseStationId = row.id;
         },
-
         // 所属科室
         StationDepartmentclick(row) {
-            console.log(row);
             this.departname = row.departmentName;
             this.departid = row.departmentCode;
-            console.log(this.departid);
             this.departmentCode = row.departmentCode;
             // this.form.nurseStationId = row.id;
             this.innerVisible2 = false;
@@ -293,11 +326,9 @@ export default {
                 row.departmentName;
             this.form.nurseStationPersonList[this.index].departmentCode =
                 row.departmentCode;
-            console.log(this.form);
         },
         // 修改科室
         StationDepartmentclick2(row) {
-            console.log(row);
             this.departmentName = row.departmentName;
             this.form.departmentCode = row.departmentCode;
             this.departid2 = row.departmentCode;
@@ -314,7 +345,6 @@ export default {
                 this.loading = false;
             });
         },
-
         getList3() {
             this.loading = true;
             StationDepartmentList(this.queryParams3).then((res) => {
@@ -326,7 +356,6 @@ export default {
         // 取消按钮
         cancel() {
             this.open = false;
-            this.open2 = false;
             this.nurseStationName = "请选择所属护理站";
             this.departmentName = "请选择所属科室";
             // this.upload.open=false;
@@ -335,9 +364,10 @@ export default {
         // 表单重置
         reset() {
             this.form = {
+                geniusItem: null,
+                birthDate: null,
                 id: null,
-                pageNum: 1,
-                pageSize: 10,
+                nurseStationId: null,
                 departmentCode: null,
                 userId: null,
                 nursePersonCode: null,
@@ -351,19 +381,12 @@ export default {
                 updateTime: null,
                 nurseStationName: "请选择所属护理站",
                 departmentName: "请选择所属科室",
-                nurseStationPersonList: [{
-                    id: "",
-                    nurseStationId: "",
-                    departmentCode: "",
-                    nursePersonCode: "",
-                    nursePersonName: "",
-                    nursePersonType: "",
-                    nurseStationName: "请选择所属护理站",
-                    phone: "",
-                    address: "",
-                    sex: "",
-                    departmentName: "请选择所属科室",
-                }, ],
+                nurseStationPersonCertificateList: [{
+                    certificateName: null,
+                    certificateUrl: null,
+                    sort: null,
+                    idd: this.idd
+                }]
             };
             this.resetForm("form");
         },
@@ -421,12 +444,14 @@ export default {
             this.handleQuery3();
         },
         resetQuery() {
-
             if (this.nurseStationlist[0]) {
                 this.queryParams.pageNum = 1;
                 this.queryParams.pageSize = 10;
                 this.queryParams.departmentName = null;
+                this.queryParams.phone = null;
                 this.queryParams.nursePersonName = null;
+                this.queryParams.positionalTitleLevel = null;
+                this.queryParams.modifyCheckStatus = null;
             }
             this.handleQuery();
         },
@@ -438,9 +463,9 @@ export default {
         },
         /** 新增按钮操作 */
         handleAdd() {
-            this.queryParams3.nurseStationId = null;
+            this.queryParams3.nurseStationId = null
             this.reset();
-            this.open2 = true;
+            this.open = true;
             this.title = "添加护理站人员信息";
             this.title2 = "请选择所属护理站";
             this.title3 = "请选择科室";
@@ -449,10 +474,18 @@ export default {
         handleUpdate(row) {
             const id = row.id || this.ids;
             getPerson(id).then((response) => {
-                console.log(response);
                 this.departmentName = response.data.departmentName;
                 this.nurseStationName = response.data.nurseStationName;
                 this.form = response.data;
+                var obj = {
+                    certificateName: null,
+                    certificateUrl: null,
+                    sort: null,
+                    idd: this.idd
+                };
+                if (this.form.nurseStationPersonCertificateList.length == 0) {
+                    this.form.nurseStationPersonCertificateList.push(obj);
+                }
                 this.queryParams3.nurseStationId = response.data.nurseStationId;
                 this.open = true;
                 this.title = "修改护理站人员信息";
@@ -465,18 +498,15 @@ export default {
         },
         /** 提交按钮 */
         submitForm() {
-            if (this.form.id == null) {
-                this.form.nursePersonName = this.form.nurseStationPersonList[0].nursePersonName
-                this.form.nursePersonType = this.form.nurseStationPersonList[0].nursePersonType
-                this.form.sex = this.form.nurseStationPersonList[0].sex
-                this.form.address = this.form.nurseStationPersonList[0].address
-                this.form.departmentCode = this.form.nurseStationPersonList[0].departmentCode
-                this.form.departmentName = this.form.nurseStationPersonList[0].departmentName
-                this.form.phone = this.form.nurseStationPersonList[0].phone
-            }
-            console.log(this.form);
             this.$refs["form"].validate((valid) => {
                 if (valid) {
+                    if (this.form.nurseStationPersonCertificateList.length > 0) {
+                        this.form.nurseStationPersonCertificateList.forEach(e => {
+                            if (!e.certificateName && !e.certificateUrl && !e.sort) {
+                                this.form.nurseStationPersonCertificateList = this.form.nurseStationPersonCertificateList.filter(el => el != e)
+                            }
+                        })
+                    }
                     if (this.form.id != null) {
                         updatePerson(this.form).then((response) => {
                             this.$modal.msgSuccess("修改成功");
@@ -486,7 +516,7 @@ export default {
                     } else {
                         addPerson(this.form).then((response) => {
                             this.$modal.msgSuccess("新增成功");
-                            this.open2 = false;
+                            this.open = false;
                             this.getList();
                             this.nurseStationName = "请选择所属护理站";
                             this.departmentName = "请选择所属科室";
@@ -495,6 +525,26 @@ export default {
                 }
             });
         },
+        // 审核
+        handshenhe(row) {
+            getNurseStationPersonCheck(row.id).then(res => {
+                this.form = res.data;
+                this.templeopen = true;
+            })
+        },
+        // 审核提交
+        templesubmit() {
+            this.form.positionalTitleLevel = this.form.positionalTitleLevelCheck
+            this.form.geniusItem = this.form.geniusItemCheck
+            updateNurseStationPersonChecks(this.form).then(res => {
+                this.$modal.msgSuccess("审核成功");
+                this.getList();
+                this.templeopen = false
+            })
+        },
+        templeopenfalse() {
+            this.templeopen = false
+        },
         /** 删除按钮操作 */
         handleDelete(row) {
             const ids = row.id || this.ids;
diff --git a/src/views/system/revenue/index.vue b/src/views/system/revenue/index.vue
new file mode 100644
index 0000000..2ba97e3
--- /dev/null
+++ b/src/views/system/revenue/index.vue
@@ -0,0 +1,514 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
+      <el-form-item label="护理站" prop="nurseStationId">
+        <el-select
+          v-model="queryParams.nurseStationId"
+          placeholder="请选择护理站"
+          @keyup.enter.native="handleQuery"
+          @change="handleQuery"
+        >
+          <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="nursePersonName">
+        <el-button type class="stationbtn" @click="nursePersonNameclick(true)">
+          {{
+          queryParams.nursePersonName
+          }}
+        </el-button>
+        <!-- <el-input
+          v-model="queryParams.nursePersonName"
+          placeholder="请输入护理人员名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />-->
+      </el-form-item>
+      <el-form-item label="选择日期区间" prop="monthStartTime">
+        <el-date-picker
+          v-model="valuetime"
+          type="daterange"
+          align="right"
+          @change="monthStartEndTimechange"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :picker-options="pickerOptions"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="选择月份" prop="monthTime">
+        <el-date-picker
+          v-model="queryParams.monthTime"
+          type="month"
+          placeholder="选择月份"
+          @change="monthtimechange"
+        ></el-date-picker>
+      </el-form-item>
+      <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+      <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+    </el-form>
+    <!-- <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>-->
+    <el-table v-loading="loading" :data="revenueList" @selection-change="handleSelectionChange">
+      <el-table-column label="护理站名称" align="center" prop="nurseStationName" />
+      <el-table-column label="护理人员名称" align="center" prop="nursePersonName" />
+      <el-table-column label="总订单" align="center" prop="orderCount" />
+      <el-table-column label="总收益" align="center" prop="orderTotalPrice" />
+      <el-table-column label="本月订单" align="center" prop="monthOrderCount" />
+      <el-table-column label="本月订单收益" align="center" prop="monthOrderTotalPrice" />
+      <el-table-column label="今日订单" align="center" prop="todayOrderCount" />
+      <el-table-column label="今日订单收益" align="center" prop="todayOrderPrice" />
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:revenue:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:revenue:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>-->
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改护理员订单佣金收益信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="护理站人员表id" prop="nurseStationPersonId">
+          <el-input v-model="form.nurseStationPersonId" placeholder="请输入护理站人员表id" />
+        </el-form-item>
+        <el-form-item label="预约订单表id" prop="appointmentOrderId">
+          <el-input v-model="form.appointmentOrderId" placeholder="请输入预约订单表id" />
+        </el-form-item>
+        <el-form-item label="收益金额" prop="revenueAmount">
+          <el-input v-model="form.revenueAmount" placeholder="请输入收益金额" />
+        </el-form-item>
+        <el-form-item label="预约订单完成时间" prop="finishOrderTime">
+          <el-date-picker
+            clearable
+            v-model="form.finishOrderTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择预约订单完成时间"
+          ></el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- //选择人员 -->
+    <el-dialog
+      title="选择护理站"
+      :visible.sync="nursePersonshow"
+      width="1000px"
+      append-to-body
+      :before-close="nursePersoncancel"
+    >
+      <el-form ref="queryForm" :model="nursePersonqueryParams" :inline="true">
+        <el-form-item label="护理人员名称" prop="nursePersonName" label-width="120">
+          <el-input
+            v-model="nursePersonqueryParams.nursePersonName"
+            placeholder="请输入护理人员名称"
+            clearable
+          />
+        </el-form-item>
+        <!-- <el-form-item label="护理人员编号" prop="nursePersonCode" label-width="120">
+          <el-input
+            v-model="nursePersonqueryParams.nursePersonCode"
+            placeholder="请输入护理人员编号"
+            clearable
+          />
+        </el-form-item>-->
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="nursePersonhandleQuery"
+          >搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="nursePersonreset">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table :data="nursePersonlist" @cell-dblclick="nursePersonclick">
+        <el-table-column label="请选择" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              style="width: 15px; height: 15px"
+              v-if="nursePersonid == scope.row.id"
+              circle
+              @click="nursePersonclick(scope.row)"
+            ></el-button>
+            <el-button
+              v-else
+              style="width: 15px; height: 15px"
+              circle
+              @click="nursePersonclick(scope.row)"
+            ></el-button>
+          </template>
+        </el-table-column>
+        <el-table-column property="nurseStationName" label="所属护理站" align="center"></el-table-column>
+        <el-table-column property="nursePersonCode" label="护理人员编号" align="center"></el-table-column>
+        <el-table-column property="nursePersonName" label="护理人员名称" align="center"></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="nursePersontotal > 0"
+        :total="nursePersontotal"
+        :page.sync="nursePersonqueryParams.pageNum"
+        :limit.sync="nursePersonqueryParams.pageSize"
+        @pagination="nursePersoninfo"
+      />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listRevenue,
+  getRevenue,
+  delRevenue,
+  addRevenue,
+  updateRevenue
+} from "@/api/system/revenue.js";
+import { getListByUser } from "@/api/system/userlist.js";
+import { listPerson } from "@/api/system/person";
+export default {
+  name: "Revenue",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 护理员订单佣金收益信息表格数据
+      revenueList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        nurseStationPersonId: null,
+        appointmentOrderId: null,
+        revenueAmount: null,
+        finishOrderTime: null,
+        monthTime: null,
+        monthStartTime: null, //开始时间
+        monthEndTime: null //结束时间
+      },
+      //护理站请求参数
+      nurseStationqueryParams: {
+        pageNum: 1,
+        pageSize: 10
+      },
+      //人员请求
+      nursePersonqueryParams: {
+        pageNum: 1,
+        pageSize: 10
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      //选择人员
+      nursePersonshow: false,
+      //护理站list
+      nurseStationlist: [],
+      //选择人员
+      nursePersonshow: false,
+      //人员list
+      nursePersonlist: [],
+      nursePersontotal: 0,
+      nursePersonid: null,
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            }
+          }
+        ]
+      },
+      valuetime: ""
+    };
+  },
+  created() {
+    this.nurseStationinfo();
+    this.nursePersoninfo();
+  },
+  methods: {
+    //选择时期区间
+    monthStartEndTimechange(e) {
+      if (!this.queryParams.monthTime) {
+        this.queryParams.monthStartTime = this.formatDate(
+          new Date(e[0]).getTime()
+        );
+        this.queryParams.monthEndTime = this.formatDate(
+          new Date(e[1]).getTime()
+        );
+      } else {
+        this.queryParams.monthStartTime = null;
+        this.queryParams.monthEndTime = null;
+        this.valuetime = "";
+      }
+    },
+    //选择时期
+    monthtimechange(e) {
+      if (!this.queryParams.monthStartTime) {
+        this.queryParams.monthTime = this.formatDate(new Date(e).getTime());
+      } else {
+        this.queryParams.monthTime = "";
+      }
+    },
+    formatDate(time, timetype) {
+      let date = new Date(time); //13位时间戳
+      //let date = new Date(parseInt(time) * 1000); //10位时间戳
+      let y = date.getFullYear();
+      let MM = date.getMonth() + 1;
+      MM = MM < 10 ? "0" + MM : MM;
+      let d = date.getDate();
+      d = d < 10 ? "0" + d : d;
+      return y + "-" + MM + "-" + d;
+    },
+    /** 查询护理员订单佣金收益信息列表 */
+    getList() {
+      this.loading = true;
+      listRevenue(this.queryParams).then(response => {
+        this.revenueList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        nurseStationPersonId: null,
+        appointmentOrderId: null,
+        revenueAmount: null,
+        finishOrderTime: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.queryParams.pageNum = 1;
+      this.queryParams.pageSize = 10;
+      this.queryParams.nursePersonName = null;
+      this.queryParams.nurseStationPersonId = null;
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加护理员订单佣金收益信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getRevenue(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改护理员订单佣金收益信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateRevenue(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addRevenue(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm(
+          '是否确认删除护理员订单佣金收益信息编号为"' + ids + '"的数据项？'
+        )
+        .then(function() {
+          return delRevenue(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "system/revenue/export",
+        {
+          ...this.queryParams
+        },
+        `revenue_${new Date().getTime()}.xlsx`
+      );
+    },
+    //护理站请求
+    nurseStationinfo() {
+      getListByUser(this.nurseStationqueryParams).then(res => {
+        this.nurseStationlist = res.rows;
+        this.nurseStationtotal = res.total;
+        this.queryParams.nurseStationId = res.rows[0].id;
+        this.queryParams.nurseStationName = res.rows[0].nurseStationName;
+        this.getList();
+      });
+    },
+    /** 护理人员重置按钮操作 */
+    nursePersoncancel() {
+      this.nursePersonshow = false;
+      this.nursePersonreset();
+    },
+    //护理人员重置
+    nursePersonreset() {
+      this.nursePersonqueryParams = {
+        pageNum: 1,
+        pageSize: 10
+      };
+      this.nursePersoninfo();
+    },
+    //护理人员请求
+    nursePersoninfo() {
+      listPerson(this.nursePersonqueryParams).then(res => {
+        res.rows.forEach(e => {
+          if (e.modifyCheckStatus == "CHECKED") {
+            e.modifyCheckStatus = true;
+          } else {
+            e.modifyCheckStatus = false;
+          }
+        });
+        this.nursePersonlist = res.rows;
+        this.nursePersontotal = res.total;
+      });
+    },
+    //护理人员搜索
+    nursePersonhandleQuery() {
+      this.nursePersonqueryParams.pageNum = 1;
+      this.nursePersoninfo();
+    },
+    //护理人员click
+    nursePersonclick(row) {
+      this.nursePersonid = row.id;
+      this.queryParams.nursePersonName = row.nursePersonName;
+      this.queryParams.nurseStationPersonId = row.id;
+      this.nursePersonshow = false;
+    },
+    //form点击护理人员
+    nursePersonNameclick() {
+      this.nursePersonid = this.queryParams.nurseStationPersonId;
+      this.nursePersonshow = true;
+    }
+  }
+};
+</script>
+<style scoped>
+.stationbtn {
+  width: 208px;
+  text-align: left;
+  height: 32px;
+  overflow: hidden;
+  font-size: 14px;
+}
+</style>
diff --git a/src/views/system/station/index.vue b/src/views/system/station/index.vue
index 8e5f7f4..e1bca27 100644
--- a/src/views/system/station/index.vue
+++ b/src/views/system/station/index.vue
@@ -804,8 +804,6 @@ export default {
           this.form.stationIntroducePcitureUrl = imgUrl;
       },
       delnurseStationLabelList(index, item) {
-          console.log(index, item);
-          console.log();
           // this.looknurseStationLabel.splice(index,1)
           if (this.looknurseStationLabel.length === 1) {
               this.looknurseStationLabel = [{
@@ -833,7 +831,6 @@ export default {
       //点击街道
       clickstreet(item) {
           this.form.areaCode = item.areaCode;
-          console.log(item, this.form);
       },
       //点击区县城
       clickarea(item) {
@@ -1056,7 +1053,6 @@ export default {
               this.looknurseStationLabel = response.data.nurseStationLabel;
               this.open = true;
               this.loading = false;
-              console.log(this.form);
           });
       },
       /** 提交按钮 */
diff --git a/src/views/system/stationAvatar/index.vue b/src/views/system/stationAvatar/index.vue
index 7098564..896a540 100644
--- a/src/views/system/stationAvatar/index.vue
+++ b/src/views/system/stationAvatar/index.vue
@@ -1,19 +1,13 @@
 <template>
   <div>
-    <div
-      class="user-info-head"
-      :class="video.VideoPath ? 'wihi' : ''"
-      @click="editCropper()"
-    >
+    <div class="user-info-head" :class="video.VideoPath ? 'wihi' : ''" @click="editCropper()">
       <video
         style="width: 208px; height: 208px"
         v-if="video.VideoPath"
         v-bind:src="video.VideoPath"
         class="avatar video-avatar"
         controls="controls"
-      >
-        您的浏览器不支持视频播放
-      </video>
+      >您的浏览器不支持视频播放</video>
       <img
         v-if="options.img"
         v-bind:src="options.img"
@@ -62,19 +56,14 @@
               v-bind:src="videoForm.showVideoPath"
               class="avatar video-avatar"
               controls="controls"
-            >
-              您的浏览器不支持视频播放
-            </video>
-            <img
-              style="width: 100%; height: 100%"
-              v-if="previews.url"
-              :src="previews.url"
-            />
+            >您的浏览器不支持视频播放</video>
+            <img style="width: 100%; height: 100%" v-if="previews.url" :src="previews.url" />
             <div v-else></div>
           </div>
-          <div class="title" v-if="types != 'posterVideoUrl'&&types!='posterPictureUrl'">
-            请上传图片为800x800px的正方形
-          </div>
+          <div
+            class="title"
+            v-if="types != 'posterVideoUrl'&&types!='posterPictureUrl'"
+          >请上传图片为800x800px的正方形</div>
         </el-col>
       </el-row>
       <br />
@@ -119,11 +108,9 @@
             size="small"
             @click="rotateRight()"
           ></el-button>
-        </el-col> -->
+        </el-col>-->
         <el-col :lg="{ span: 2, offset: 20 }" :md="2">
-          <el-button type="primary" size="small" @click="uploadImg()"
-            >提 交</el-button
-          >
+          <el-button type="primary" size="small" @click="uploadImg()">提 交</el-button>
         </el-col>
       </el-row>
     </el-dialog>
@@ -136,7 +123,7 @@ import baseurl from "@/api/baseurl.js";
 import {
   updateNurseStationHeads,
   posts,
-  updatePoserHeads,
+  updatePoserHeads
 } from "@/api/system/stationAvatar.js";
 
 export default {
@@ -158,17 +145,17 @@ export default {
         autoCrop: true, // 是否默认生成截图框
         autoCropWidth: 300, // 默认生成截图框宽度
         autoCropHeight: 300, // 默认生成截图框高度
-        fixedBox: true, // 固定截图框大小 不允许改变
+        fixedBox: true // 固定截图框大小 不允许改变
       },
       previews: {},
       items: {},
       //显示上传按钮
       videoForm: {
-        showVideoPath: null, //回显的变量
+        showVideoPath: null //回显的变量
       },
       video: {
-        VideoPath: null, //回显的变量
-      },
+        VideoPath: null //回显的变量
+      }
     };
   },
   created() {
@@ -181,7 +168,6 @@ export default {
     } else {
       this.video.VideoPath = baseurl + this.tovideo;
     }
-    console.log(this.video);
     if (this.img == null) {
       this.options.img = null;
     } else if (this.img == "") {
@@ -197,12 +183,12 @@ export default {
   },
   watch: {
     tovideo: {
-      handler(newimg, oldimg) {},
+      handler(newimg, oldimg) {}
     },
     item: {
       handler(newimg, oldimg) {
         this.items = this.item;
-      },
+      }
     },
     img: {
       handler(newimg, oldimg) {
@@ -213,13 +199,13 @@ export default {
         } else {
           this.options.img = baseurl + this.img;
         }
-      },
+      }
     },
     type: {
       handler(newimg, oldimg) {
         this.types = this.type;
-      },
-    },
+      }
+    }
   },
   methods: {
     // 编辑头像
@@ -279,13 +265,13 @@ export default {
         formData.append("file", this.previews.data);
         formData.append("type", this.types);
         if (this.types == "posterVideoUrl") {
-          updatePoserHeads(formData).then((response) => {
+          updatePoserHeads(formData).then(response => {
             this.video.VideoPath = baseurl + response.imgUrl;
             this.$emit("imgUrl", response.imgUrl);
             this.openimg = false;
           });
         } else {
-          updateNurseStationHeads(formData).then((response) => {
+          updateNurseStationHeads(formData).then(response => {
             this.options.img = baseurl + response.imgUrl;
             this.$emit("imgUrl", response.imgUrl);
             if (this.types == "attributePitureUrl") {
@@ -304,6 +290,14 @@ export default {
               this.items.posterPictureUrl = response.imgUrl;
               this.$emit("item", JSON.stringify(this.items));
             }
+            if (this.types == "certificateUrl") {
+              this.items.certificateUrl = response.imgUrl;
+              this.$emit("item", JSON.stringify(this.items));
+            }
+            if (this.types == "personCertificateUrl") {
+              this.items.certificateUrl = response.imgUrl;
+              this.$emit("item", JSON.stringify(this.items));
+            }
             this.openimg = false;
           });
         }
@@ -319,8 +313,8 @@ export default {
     closeDialog() {
       this.imgs = "";
       this.visible = false;
-    },
-  },
+    }
+  }
 };
 </script>
 <style scoped lang="scss">
diff --git a/src/views/system/stationClassify/index.vue b/src/views/system/stationClassify/index.vue
index d9ca77d..03bf3b7 100644
--- a/src/views/system/stationClassify/index.vue
+++ b/src/views/system/stationClassify/index.vue
@@ -496,7 +496,6 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
diff --git a/src/views/system/stationItem/index.vue b/src/views/system/stationItem/index.vue
index a281ad1..0af7e7c 100644
--- a/src/views/system/stationItem/index.vue
+++ b/src/views/system/stationItem/index.vue
@@ -290,9 +290,14 @@
           <el-table
             ref="nurseStationItemPrices"
             :data="form.nurseStationItemPrices"
-            style="margin-top: 20px; width: 900px"
+            style="margin-top: 20px; width: 1050px"
           >
-            <el-table-column property="serveDurationUnit" label="服务时长和单位" align="center">
+            <el-table-column
+              property="serveDurationUnit"
+              label="服务时长和单位"
+              align="center"
+              width="120"
+            >
               <template slot-scope="scope">
                 <el-input v-model="scope.row.serveDurationUnit" maxlength="6"></el-input>
               </template>
@@ -313,15 +318,39 @@
                 <el-input v-model="scope.row.description" maxlength="300"></el-input>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center">
+            <el-table-column property="description" label="佣金金额" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  v-model="scope.row.commissionAmount"
+                  placeholder="最多小数点后两位(元)"
+                  @focus="commissionAmountinput(scope.row)"
+                  type="number"
+                  min="0"
+                  oninput="if (value.indexOf('.') > 0) { value = value.slice(0, value.indexOf('.') + 3)} if (value.length > 8) { value = value.slice(0,8) }"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column property="description" label="佣金比例(%)" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  v-model="scope.row.commissionRate"
+                  @focus="commissionRateoninput(scope.row)"
+                  placeholder="最多小数点后两位(%)"
+                  type="number"
+                  min="0"
+                  oninput="if (value.indexOf('.') > 0) { value = value.slice(0, value.indexOf('.') + 3)}  if (value.length > 5) { value = value.slice(0,5) }"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="100">
               <template slot-scope="scope">
                 <el-button size="mini" type="text" @click="addnurseStationItemPrices">新增</el-button>
                 <el-button size="mini" type="text" @click="delnurseStationItemPrices(scope.row)">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
+          <div style="float:right;font-weight:600">注:佣金金额 = 佣金比例 x 价格</div>
         </el-form-item>
-
         <el-form-item label="护理项目耗材">
           <el-button type="primary" size="small" plain @click="listStationConsumableinfo">添加护理项目耗材</el-button>
           <el-table
@@ -774,6 +803,12 @@ export default {
     this.classifylistInfo();
   },
   methods: {
+    commissionAmountinput(e) {
+      e.commissionRate = "";
+    },
+    commissionRateoninput(e) {
+      e.commissionAmount = "";
+    },
     //点击上架
     upwhetherShelf(row) {
       let shelfStatus = null;
@@ -999,7 +1034,9 @@ export default {
           serveDurationUnit: "",
           price: "",
           description: "",
-          idd: this.idd
+          idd: this.idd,
+          commissionAmount: "",
+          commissionRate: ""
         };
         this.form.nurseStationItemPrices.push(obj);
       }
@@ -1050,7 +1087,9 @@ export default {
             serveDurationUnit: null,
             price: null,
             description: null,
-            idd: this.idd
+            idd: this.idd,
+            commissionAmount: "",
+            commissionRate: ""
           }
         ]
       };
@@ -1106,7 +1145,9 @@ export default {
             serveDurationUnit: "",
             price: "",
             description: "",
-            idd: this.idd
+            idd: this.idd,
+            commissionAmount: "",
+            commissionRate: ""
           };
           this.form.nurseStationItemPrices.push(obj);
         }
@@ -1119,10 +1160,26 @@ export default {
       if (!this.form.nurseStationItem.appointmentLimitCount) {
         this.form.nurseStationItem.appointmentLimitCount = null;
       }
-      this.form.nurseStationItemConsumables.forEach(e => {
-        e.nurseStationConsumableId = e.id;
-        e.consumableCount = Number(e.consumableCount);
-      });
+      if (this.form.nurseStationItemConsumables.length > 0) {
+        this.form.nurseStationItemConsumables.forEach(e => {
+          e.nurseStationConsumableId = e.id;
+          e.consumableCount = Number(e.consumableCount);
+        });
+      }
+      if (this.form.nurseStationItemPrices.length > 0) {
+        this.form.nurseStationItemPrices.forEach(e => {
+          if (!e.commissionAmount || e.commissionAmount == "") {
+            e.commissionAmount = null;
+          } else {
+            e.commissionAmount = Number(e.commissionAmount);
+          }
+          if (!e.commissionRate || e.commissionRate == "") {
+            e.commissionRate = null;
+          } else {
+            e.commissionRate = Number(e.commissionRate);
+          }
+        });
+      }
       this.form.nurseStationItem.nurseTypeId = this.form.nurseTypeId;
       this.$refs["form"].validate(valid => {
         if (valid) {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 5672a8f..fb60d29 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -25,7 +25,7 @@
             @node-click="handleNodeClick"
           />
         </div>
-      </el-col> -->
+      </el-col>-->
       <!--用户数据-->
       <el-col :span="24" :xs="24">
         <el-form
@@ -81,16 +81,8 @@
             ></el-date-picker>
           </el-form-item>
           <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleQuery"
-              >搜索</el-button
-            >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-              >重置</el-button
-            >
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
 
@@ -103,8 +95,7 @@
               size="mini"
               @click="handleAdd"
               v-hasPermi="['system:user:add']"
-              >新增</el-button
-            >
+            >新增</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -115,8 +106,7 @@
               :disabled="single"
               @click="handleUpdate"
               v-hasPermi="['system:user:edit']"
-              >修改</el-button
-            >
+            >修改</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -127,8 +117,7 @@
               :disabled="multiple"
               @click="handleDelete"
               v-hasPermi="['system:user:remove']"
-              >删除</el-button
-            >
+            >删除</el-button>
           </el-col>
           <!-- <el-col :span="1.5">
             <el-button
@@ -149,19 +138,11 @@
               @click="handleExport"
               v-hasPermi="['system:user:export']"
             >导出</el-button>
-          </el-col> -->
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-            :columns="columns"
-          ></right-toolbar>
+          </el-col>-->
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
-        <el-table
-          v-loading="loading"
-          :data="userList"
-          @selection-change="handleSelectionChange"
-        >
+        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column
             label="用户编号"
@@ -195,12 +176,7 @@
             v-if="columns[4].visible"
             width="120"
           />
-          <el-table-column
-            label="状态"
-            align="center"
-            key="status"
-            v-if="columns[5].visible"
-          >
+          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.status"
@@ -234,16 +210,14 @@
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['system:user:edit']"
-                >修改</el-button
-              >
+              >修改</el-button>
               <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['system:user:remove']"
-                >删除</el-button
-              >
+              >删除</el-button>
               <el-dropdown
                 size="mini"
                 @command="(command) => handleCommand(command, scope.row)"
@@ -257,14 +231,12 @@
                     command="handleResetPwd"
                     icon="el-icon-key"
                     v-hasPermi="['system:user:resetPwd']"
-                    >重置密码</el-dropdown-item
-                  >
+                  >重置密码</el-dropdown-item>
                   <el-dropdown-item
                     command="handleAuthRole"
                     icon="el-icon-circle-check"
                     v-hasPermi="['system:user:edit']"
-                    >分配角色</el-dropdown-item
-                  >
+                  >分配角色</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
@@ -287,11 +259,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="用户昵称" prop="nickName">
-              <el-input
-                v-model="form.nickName"
-                placeholder="请输入用户昵称"
-                maxlength="30"
-              />
+              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -310,48 +278,28 @@
             <el-form-item label="归属部门" prop="deptId">
               <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
             </el-form-item>
-          </el-col> -->
+          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="手机号码" prop="phonenumber">
-              <el-input
-                v-model="form.phonenumber"
-                placeholder="请输入手机号码"
-                maxlength="11"
-              />
+              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="邮箱" prop="email">
-              <el-input
-                v-model="form.email"
-                placeholder="请输入邮箱"
-                maxlength="50"
-              />
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item
-              v-if="form.userId == undefined"
-              label="用户名称"
-              prop="userName"
-            >
-              <el-input
-                v-model="form.userName"
-                placeholder="请输入用户名称"
-                maxlength="30"
-              />
+            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item
-              v-if="form.userId == undefined"
-              label="用户密码"
-              prop="password"
-            >
+            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
               <el-input
                 v-model="form.password"
                 placeholder="请输入用户密码"
@@ -366,18 +314,13 @@
           <el-col :span="12">
             <!-- multiple -->
             <el-form-item label="护理站" prop="nurseStationIds">
-              <el-select
-                v-model="form.nurseStationIds"
-                placeholder="请选择护理站"
-                v-loadmore="loadMore"
-              >
+              <el-select v-model="form.nurseStationIds" placeholder="请选择护理站" v-loadmore="loadMore">
                 <el-option
                   v-for="item in nurseStationlist"
                   :key="item.id"
                   :label="item.nurseStationName"
                   :value="item.id"
-                >
-                </el-option>
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -388,8 +331,7 @@
                   v-for="dict in dict.type.sys_normal_disable"
                   :key="dict.value"
                   :label="dict.value"
-                  >{{ dict.label }}</el-radio
-                >
+                >{{ dict.label }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -407,14 +349,10 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-          </el-col> -->
+          </el-col>-->
           <el-col :span="12">
             <el-form-item label="角色">
-              <el-select
-                v-model="form.roleIds"
-                multiple
-                placeholder="请选择角色"
-              >
+              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
                 <el-option
                   v-for="item in roleOptions"
                   :key="item.roleId"
@@ -429,11 +367,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input
-                v-model="form.remark"
-                type="textarea"
-                placeholder="请输入内容"
-              ></el-input>
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -445,12 +379,7 @@
     </el-dialog>
 
     <!-- 用户导入对话框 -->
-    <el-dialog
-      :title="upload.title"
-      :visible.sync="upload.open"
-      width="400px"
-      append-to-body
-    >
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
       <el-upload
         ref="upload"
         :limit="1"
@@ -464,11 +393,13 @@
         drag
       >
         <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__text">
+          将文件拖到此处，或
+          <em>点击上传</em>
+        </div>
         <div class="el-upload__tip text-center" slot="tip">
           <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" />
-            是否更新已经存在的用户数据
+            <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
           <el-link
@@ -476,8 +407,7 @@
             :underline="false"
             style="font-size: 12px; vertical-align: baseline"
             @click="importTemplate"
-            >下载模板</el-link
-          >
+          >下载模板</el-link>
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -496,7 +426,7 @@ import {
   addUser,
   updateUser,
   resetUserPwd,
-  changeUserStatus,
+  changeUserStatus
 } from "@/api/system/user";
 import { getToken } from "@/utils/auth";
 import { treeselect } from "@/api/system/dept";
@@ -545,7 +475,7 @@ export default {
       form: {},
       defaultProps: {
         children: "children",
-        label: "label",
+        label: "label"
       },
       // 用户导入参数
       upload: {
@@ -560,7 +490,7 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/system/user/importData",
+        url: process.env.VUE_APP_BASE_API + "/system/user/importData"
       },
       // 查询参数
       queryParams: {
@@ -569,7 +499,7 @@ export default {
         userName: undefined,
         phonenumber: undefined,
         status: undefined,
-        deptId: undefined,
+        deptId: undefined
       },
       // 查询参数
       nurseStationqueryParams: {
@@ -589,7 +519,7 @@ export default {
         dutyPerson: null,
         dutyPhone: null,
         stationPictureUrl: null,
-        sort: null,
+        sort: null
       },
       // 列信息
       columns: [
@@ -599,7 +529,7 @@ export default {
         { key: 3, label: `部门`, visible: true },
         { key: 4, label: `手机号码`, visible: true },
         { key: 5, label: `状态`, visible: true },
-        { key: 6, label: `创建时间`, visible: true },
+        { key: 6, label: `创建时间`, visible: true }
       ],
       // 表单校验
       rules: {
@@ -609,14 +539,14 @@ export default {
             min: 2,
             max: 20,
             message: "用户名称长度必须介于 2 和 20 之间",
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         // nurseStationIds: [
         //   { required: true, message: "护理站不能为空", trigger: "blur" },
         // ],
         nickName: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" },
+          { required: true, message: "用户昵称不能为空", trigger: "blur" }
         ],
         password: [
           { required: true, message: "用户密码不能为空", trigger: "blur" },
@@ -624,59 +554,56 @@ export default {
             min: 5,
             max: 20,
             message: "用户密码长度必须介于 5 和 20 之间",
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         email: [
           {
             type: "email",
             message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"],
-          },
+            trigger: ["blur", "change"]
+          }
         ],
         phonenumber: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号码",
-            trigger: "blur",
-          },
-        ],
-      },
+            trigger: "blur"
+          }
+        ]
+      }
     };
   },
   watch: {
     // 根据名称筛选部门树
     deptName(val) {
       this.$refs.tree.filter(val);
-    },
+    }
   },
   created() {
     this.getList();
     this.getTreeselect();
     this.listinfo();
-    this.getConfigKey("sys.user.initPassword").then((response) => {
+    this.getConfigKey("sys.user.initPassword").then(response => {
       this.initPassword = response.msg;
     });
   },
   methods: {
     listinfo() {
-      list(this.nurseStationqueryParams).then((res) => {
-        console.log(res);
+      list(this.nurseStationqueryParams).then(res => {
         this.nurseStationlist = res.rows;
         this.total2 = res.total;
       });
     },
     loadMore() {
       var a = Math.ceil(this.total2 / 10);
-      console.log(this.nurseStationlist.length);
       if (this.nurseStationlist.length + 1 >= this.total2) {
       } else {
         if (this.nurseStationqueryParams.pageNum >= a) {
         } else {
           this.nurseStationqueryParams.pageNum++;
-          list(this.nurseStationqueryParams).then((res) => {
-            console.log(res);
-            res.rows.forEach((e) => {
+          list(this.nurseStationqueryParams).then(res => {
+            res.rows.forEach(e => {
               this.nurseStationlist.push(e);
             });
           });
@@ -687,7 +614,7 @@ export default {
     getList() {
       this.loading = true;
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(
-        (response) => {
+        response => {
           this.userList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -696,7 +623,7 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-      treeselect().then((response) => {
+      treeselect().then(response => {
         this.deptOptions = response.data;
       });
     },
@@ -715,13 +642,13 @@ export default {
       let text = row.status === "0" ? "启用" : "停用";
       this.$modal
         .confirm('确认要"' + text + '""' + row.userName + '"用户吗？')
-        .then(function () {
+        .then(function() {
           return changeUserStatus(row.userId, row.status);
         })
         .then(() => {
           this.$modal.msgSuccess(text + "成功");
         })
-        .catch(function () {
+        .catch(function() {
           row.status = row.status === "0" ? "1" : "0";
         });
     },
@@ -744,7 +671,7 @@ export default {
         status: "0",
         remark: undefined,
         postIds: [],
-        roleIds: [],
+        roleIds: []
       };
       this.resetForm("form");
     },
@@ -761,7 +688,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.userId);
+      this.ids = selection.map(item => item.userId);
       this.single = selection.length != 1;
       this.multiple = !selection.length;
     },
@@ -782,7 +709,7 @@ export default {
     handleAdd() {
       this.reset();
       this.getTreeselect();
-      getUser().then((response) => {
+      getUser().then(response => {
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
         this.open = true;
@@ -795,13 +722,12 @@ export default {
       this.reset();
       this.getTreeselect();
       const userId = row.userId || this.ids;
-      getUser(userId).then((response) => {
+      getUser(userId).then(response => {
         this.form = response.data;
         if (!this.form.nurseStationIds) {
-          this.form.nurseStationIds = ''
+          this.form.nurseStationIds = "";
         } else {
           this.form.nurseStationIds = Number(this.form.nurseStationIds);
-
         }
         // if (
         //   !this.form.nurseStationIds ||
@@ -814,8 +740,6 @@ export default {
         //     return (e = Number(e));
         //   });
         // }
-
-        console.log(this.form);
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
         this.form.postIds = response.postIds;
@@ -827,58 +751,52 @@ export default {
     },
     /** 重置密码按钮操作 */
     handleResetPwd(row) {
-
       this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         closeOnClickModal: false,
         inputPattern: /^.{5,20}$/,
-        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
+        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
       })
         .then(({ value }) => {
-          resetUserPwd(row.userId, value).then((response) => {
+          resetUserPwd(row.userId, value).then(response => {
             this.$modal.msgSuccess("修改成功，新密码是：" + value);
           });
         })
         .catch(() => {});
     },
     /** 分配角色操作 */
-    handleAuthRole: function (row) {
+    handleAuthRole: function(row) {
       const userId = row.userId;
       this.$router.push("/system/user-auth/role/" + userId);
     },
     /** 提交按钮 */
-        submitForm: function () {
-      this.$refs["form"].validate((valid) => {
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           // this.form.nurseStationIds = this.form.nurseStationIds.join(",");
           // this.form.nurseStationIds = JSON.stringify(this.form.nurseStationIds);
           // var obj = [];
           // obj.push(this.form.nurseStationIds);
-          // console.log(obj)
           // this.form.nurseStationIds = obj;
-
           if (this.form.userId != undefined) {
             if (!this.form.nurseStationIds) {
-              this.form.nurseStationIds = null
-              updateUser(this.form).then((response) => {
+              this.form.nurseStationIds = null;
+              updateUser(this.form).then(response => {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;
                 this.getList();
-                //  console.log('bbb',this.form)
               });
             } else {
               this.form.nurseStationIds = Number(this.form.nurseStationIds);
-              updateUser(this.form).then((response) => {
+              updateUser(this.form).then(response => {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;
                 this.getList();
-                //  console.log('bbb',this.form)
               });
             }
-
           } else {
-            addUser(this.form).then((response) => {
+            addUser(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -892,7 +810,7 @@ export default {
       const userIds = row.userId || this.ids;
       this.$modal
         .confirm("是否确认删除此用户？")
-        .then(function () {
+        .then(function() {
           return delUser(userIds);
         })
         .then(() => {
@@ -906,7 +824,7 @@ export default {
       this.download(
         "system/user/export",
         {
-          ...this.queryParams,
+          ...this.queryParams
         },
         `user_${new Date().getTime()}.xlsx`
       );
@@ -945,7 +863,7 @@ export default {
     // 提交上传文件
     submitFileForm() {
       this.$refs.upload.submit();
-    },
-  },
+    }
+  }
 };
 </script>
diff --git a/src/views/system/userlist/index.vue b/src/views/system/userlist/index.vue
index eff881b..b3212ff 100644
--- a/src/views/system/userlist/index.vue
+++ b/src/views/system/userlist/index.vue
@@ -12,15 +12,13 @@ export default {
   },
   methods: {
     info() {
-      getListByUser().then((res) => {
-        console.log(res);
+      getListByUser().then(res => {
         if (res.rows[0].isAdmin == "1") {
-          console.log(true);
         } else {
           this.$emit("itemlist", res.rows);
         }
       });
-    },
-  },
+    }
+  }
 };
 </script>