Merge remote-tracking branch 'origin/dev'

src/api/system/order.js

@@ -69,3 +69,12 @@ export function confirmCancel(appointmentOrderId) {
         method: 'post'
     })
 }
+
+
+//派单点击护理员获取信息
+export function getPersonInfo(nurseStationPersonId) {
+    return request({
+        url: `/system/appointmentOrder/getPersonInfo?nurseStationPersonId=${nurseStationPersonId}`,
+        method: 'get'
+    })
+}

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
+    })
+}

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'
+    })
+}

src/api/system/stationAvatar.js

@@ -10,8 +10,6 @@ export function updateNurseStationHeads(data) {
 }
 
 //海报视频上传
-
-
 export function updatePoserHeads(data) {
     return request({
         url: '/system/poser/updatePoserHeads',

src/views/index.vue

@@ -486,11 +486,9 @@ export default {
 
     getList() {
       informationStatistics(this.queryParams).then((response) => {
-        console.log(response);
         this.List = response.data;
       });
       summaryToday(this.queryParams).then((response) => {
-        console.log(response);
         this.summaryTodayList = response.data;
       });
     },

src/views/system/OperateGoodsInfo/indexjs.js

@@ -75,8 +75,7 @@ export default {
             goodDetailsLists: [],
             idd: 9999999,
             ids: [],
-            integraloption: [
+            integraloption: [{
-                {
                     value: 0,
                     label: "否",
                 },
@@ -85,7 +84,6 @@ export default {
                     label: "是",
                 },
             ],
-            value: "",
             // 查询参数
             shangjia: {
                 id: null,
@@ -260,10 +258,10 @@ export default {
                 obj.pictureUrlList.push(this.form.goodsPictureUrl);
             }
             if (obj.pictureUrlList.length > 0) {
-                updatePicture(obj).then((res) => { });
+                updatePicture(obj).then((res) => {});
             }
             if (this.imgsurl.pictureUrlList.length > 0) {
-                updatePicture(this.imgsurl).then((res) => { });
+                updatePicture(this.imgsurl).then((res) => {});
             }
             this.imgsurl = { pictureUrlList: [] };
             this.open = false;
@@ -279,8 +277,8 @@ export default {
                     goodsPrice: "",
                     goodsStock: "",
                     attributeDetailsSort: null,
-                },],
+                }, ],
-            },];
+            }, ];
             ++this.isResouceShow
         },
         //页面所属护理站
@@ -350,7 +348,7 @@ export default {
                 integralExchangeFlag: null,
                 integralExchangeSill: null,
                 idd: 9999999,
-            },];
+            }, ];
             this.resetForm("form");
         },
         /** 搜索按钮操作 */
@@ -394,7 +392,7 @@ export default {
                 integralExchangeSill: null,
                 sort: null,
                 idd: 9999999,
-            },];
+            }, ];
             this.open = true;
         },
         /** 修改按钮操作 */
@@ -413,7 +411,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
@@ -425,8 +422,6 @@ export default {
         submitForm() {
             this.form.goodAttributeDetailsLists = [];
             this.form.goodDetailsLists = this.goodDetailsLists;
-            console.log(this.form.goodDetailsLists)
-
             if (!this.form.goodDetailsLists.integralExchangeFlag) {
                 this.form.goodDetailsLists.integralExchangeFlag = null
             }
@@ -456,7 +451,7 @@ export default {
                             }
                             this.imgsurl = { pictureUrlList: [] };
                             if (obj.pictureUrlList.length > 0) {
-                                updatePicture(obj).then((res) => { });
+                                updatePicture(obj).then((res) => {});
                             }
                             this.$modal.msgSuccess("修改成功");
                             ++this.isResouceShow
@@ -491,13 +486,13 @@ export default {
                         var obj = { pictureUrlList: [] };
                         obj.pictureUrlList.push(row.goodsPictureUrl);
                         if (obj.pictureUrlList.length > 0) {
-                            updatePicture(obj).then((res) => { });
+                            updatePicture(obj).then((res) => {});
                         }
                         this.$message.success("删除成功");
                         this.getList();
                     });
                 })
-                .catch(() => { });
+                .catch(() => {});
         },
         imgUrl(imgUrl) {
             this.form.goodsPictureUrl = imgUrl;
@@ -507,7 +502,7 @@ export default {
         },
         attributePitureitem(item) {
             let items = JSON.parse(item);
-            if (items.idd && !items.id) {
+            if (items.idd && !items.attributeDetailsId) {
                 this.goodDetailsLists.forEach((e) => {
                     if (e.idd == items.idd) {
                         e.attributePitureUrl = items.attributePitureUrl;

src/views/system/certificate/index.vue

@@ -456,7 +456,6 @@ export default {
       // 存贮新上传的图片数组
       this.deletNewImgs.push(imgUrlData.certificateUrl);
       this.objitem.push(imgUrlData.certificateUrl);
-        console.log(item,'接受图片item')
       let items = JSON.parse(item);
       if (items.idd && !items.id) {
         this.form.certificateUrlList.forEach(e => {
@@ -469,14 +468,12 @@ export default {
       }
     },
     imgUrl(imgUrl) {
-      console.log(imgUrl)
      
     },
     innerVisiblecancel() {
       this.innerVisible = false;
     },
     nurseclick(row) {
-      console.log(row);
       this.form.personName = row.personName;
       this.form.hospitalPersonId = row.id;
       this.innerVisible = false;
@@ -521,7 +518,6 @@ export default {
             obj.pictureUrlList.push(e.certificateUrl);
           });
         }
-        console.log("2222",this.deletNewImgs)
         updatePicture({ pictureUrlList: this.deletNewImgs }).then(res => {
           this.open = false;
         });
@@ -585,13 +581,10 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      console.log(row)
       this.open = true;
       const hospitalPersonId = row.hospitalPersonId || this.hospitalPersonIds;
       getCertificate(hospitalPersonId).then((response) => {
-        console.log(response,'打印返回的值')
         this.form = response.data;
-      
         this.title = "修改健康咨询-科室人员资质证书信息";
       });
       this.reset();
@@ -619,7 +612,6 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      console.log(row)
       const hospitalPersonIds = row.hospitalPersonId || this.hospitalPersonIds; 
       this.$modal
         .confirm(

src/views/system/classifyItem/index.vue

@@ -504,7 +504,6 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      console.log(row);
       this.$modal
         .confirm("是否确认删除？")
         .then(function() {

src/views/system/communityInfo/index.vue

@@ -642,28 +642,21 @@ export default {
   methods: {
      clickcode2(item) {
       this.form.areaCode = Number(item.areaCode);
-      console.log(this.form);
       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);
         // this.SecondaryLevelInfolist = res.data;
-        // console.log(this.SecondaryLevelInfolist);
         this.citylist = res.data;
       });
     },
@@ -672,35 +665,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);
         // 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);
         // this.SecondaryLevelInfolist = res.data;
-        // console.log(this.SecondaryLevelInfolist);
         this.citylist = res.data;
       });
     },
     // 点击市
     clickcity(item) {
-      console.log(item);
       SecondaryLevelInfo(item.id).then((res) => {
         this.queryParams.area = "";
         this.queryParams.areaCode = "";
-        console.log(res);
         this.arealists = res.data;
       });
     },
@@ -712,19 +697,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);
         this.arealists = res.data;
       });
     },
     // 修改
     clickcity3(item) {
-      console.log(item);
       SecondaryLevelInfo(item.id).then((res) => {
         this.form.area = "";
        this.form.code = "";
-        console.log(res);
         this.arealists = res.data;
       });
     },
@@ -733,9 +714,7 @@ export default {
       this.queryParams.areaCode = "";
       //  this.queryParams.areaCode = "";
       // this.value3 = "";
-      console.log(item);
       SecondaryLevelInfo(item.id).then((res) => {
-        console.log(res);
         this.streetlist = res.data;
       });
     },
@@ -745,9 +724,7 @@ export default {
       // this.value3 = "";
 
       this.form.communityInfoList[index].areaCode = "";
-      console.log(item);
       SecondaryLevelInfo(item.id).then((res) => {
-        console.log(res);
         this.streetlist = res.data;
       });
     },
@@ -756,36 +733,28 @@ export default {
      this.form.code = "";
       //  this.queryParams.areaCode = "";
       // 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);
     },
     //  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) => {
               this.arealist.push(e);
-              console.log(this.arealist);
             });
           });
         }
@@ -793,16 +762,13 @@ export default {
     },
     Provincelist() {
       FirstLevels(this.getProvincequeryParams).then((res) => {
-        console.log(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() {
@@ -944,16 +910,13 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      console.log(row);
       const id = row.id || this.ids;
       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);
           if (res.data !== null) {
             this.form.province = String(res.data.provinceCode);
             // this.form.province = res.data.provinceCode;
@@ -961,7 +924,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;
           }
         });

src/views/system/diseaseInfo/index.vue

@@ -325,7 +325,6 @@ export default {
     //删除deldisease
     deldisease(index) {
       this.form.diseaseInfoList.splice(index, 1);
-      console.log(this.form.diseaseInfoList);
     },
     //添加adddisease
     adddisease() {

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);

src/views/system/goodsOrder/indexjs.js

@@ -158,7 +158,6 @@ export default {
         },
         //页面所属护理站
         ParamsStation(item) {
-            console.log(this.getListByUserquery)
             this.info();
             this.nurseStationshow = true
         },
@@ -256,14 +255,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("录入成功");
@@ -280,10 +277,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();
             });

src/views/system/groupQrCodeInfo/index.vue

@@ -565,11 +565,6 @@ export default {
     },
     //所属护理站页面
     ParamsStation(item) {
-      console.log(
-        item,
-        this.form.nurseStationId,
-        "打印this.queryParams.nurseStationId"
-      );
       this.info();
       this.stationidIndex = this.form.nurseStationId;
       this.nurseStationshow = true;
@@ -584,10 +579,8 @@ export default {
     // 设置修改的图片地址
     setUpdateImgUrl(e) {
       this.form.groupQrCodeUrl = e;
-      console.log(this.form);
     },
     imgUrl(imgUrl) {
-      console.log(this.form);
       // this.$set(this.form,"groupQrCodeInfoDTOList",[])
       this.form.groupQrCodeInfoDTOList.forEach(e => {
         this.$set(e, "groupQrCodeUrl", imgUrl);
@@ -609,7 +602,6 @@ export default {
         if (this.form.groupQrCodeUrl != this.imgone) {
           obj.pictureUrlList.push(this.form.groupQrCodeUrl);
         }
-        console.log(obj);
         updatePicture(obj).then(res => {
           this.editopen = false;
         });
@@ -689,9 +681,7 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getGroupQrCodeInfo(id).then(response => {
-        console.log(response.data);
         this.form = response.data;
-
         // this.form.nurseStationName = item.nurseStationName;
         // this.form.nurseStationId = item.id;
         this.imgone = this.form.groupQrCodeUrl;
@@ -728,7 +718,6 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      console.log(row);
       const ids = row.id || this.ids;
       const groupNames = row.groupName || this.groupNames;
       this.$modal

src/views/system/hospital/index.vue

@@ -282,7 +282,6 @@ export default {
   },
   methods: {
     imgs(item) {
-      console.log(item);
       this.imgsurl.pictureUrlList.push(item);
     },
     /** 查询医院信息管理列表 */
@@ -290,7 +289,6 @@ export default {
       this.loading = true;
       listHospital(this.queryParams).then(response => {
         this.hospitalList = response.rows;
-        console.log(this.hospitalList);
         this.total = response.total;
         this.loading = false;
       });
@@ -345,7 +343,6 @@ export default {
       const id = row.id || this.ids;
       getHospital(id).then(response => {
         this.form = response.data;
-        console.log(this.form);
         this.open = true;
         this.title = "修改医院信息管理";
       });

src/views/system/hospitalDepartment/index.vue

@@ -659,9 +659,7 @@ export default {
     // add
 
     nurseclick(row) {
-      console.log(row);
       // if (this.homenumber) {
-      //   console.log(this.homenumber);
       //   this.form.hospitalName = row.hospitalName;
       //   this.form.hospitalId = row.id;
       // } else {
@@ -697,7 +695,6 @@ export default {
       this.addresetQuery();
       this.form.hospitalId = item.hospitalId;
       this.nnerVisibleindex = index;
-      console.log(this.nnerVisibleindex);
       this.innerVisible = true;
       // this.homenumber = item;
     },
@@ -728,7 +725,6 @@ export default {
     info() {
       list(this.hospitalqueryParams).then((response) => {
         this.infolist = response.rows;
-        console.log(this.infolist);
         this.total2 = response.total;
         this.loading = false;
       });

src/views/system/hospitalPerson/index.vue

@@ -350,7 +350,6 @@
           <el-button icon="el-icon-refresh" size="mini" @click="addresetQuery">重置</el-button>
         </el-form-item>
       </el-form>
-
       <el-table :data="infolist" @cell-dblclick="nurseclick" v-loading="loading">
         <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
@@ -376,7 +375,6 @@
           align="center"
           :show-overflow-tooltip="true"
         ></el-table-column>
-
         <el-table-column property="hospitalAddress" label="医院地址" align="center"></el-table-column>
         <el-table-column property="phone" label="联系电话" align="center" :show-overflow-tooltip="true"></el-table-column>
       </el-table>
@@ -414,7 +412,6 @@
           <el-button icon="el-icon-refresh" size="mini" @click="departresetQuery">重置</el-button>
         </el-form-item>
       </el-form>
-
       <el-table :data="hospitalDepartmentList" @cell-dblclick="departmentclick" v-loading="loading">
         <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">

src/views/system/informationInfo/index.vue

@@ -624,7 +624,6 @@ export default {
     informationInfoinfo() {
       listInformationCategory(this.informationqueryParams).then((response) => {
         this.infolist = response.rows;
-        console.log(this.infolist);
         this.total2 = response.total;
         this.loading = false;
       });
@@ -650,7 +649,6 @@ export default {
       this.loading = true;
       listInformationInfo(this.queryParams).then((response) => {
         this.informationInfoList = response.rows;
-        console.log(this.informationInfoList);
         this.total = response.total;
         this.loading = false;
       });
@@ -675,7 +673,6 @@ export default {
       this.reset();
     },
     nurseclick(row) {
-      console.log(row);
       this.form.informationCategoryId = row.id;
       this.form.informationCategoryName = row.informationCategoryName;
       this.innerVisible = false;

src/views/system/order/index.vue

@@ -9,9 +9,11 @@
       label-width="90px"
     >
       <el-form-item label="所属护理站" prop="nurseStationName">
-        <el-button type="" class="stationbtn" @click="ParamsStation(true)">{{
+        <el-button type class="stationbtn" @click="ParamsStation(true)">
+          {{
           queryParams.nurseStationName
-        }}</el-button>
+          }}
+        </el-button>
       </el-form-item>
       <el-form-item label="订单编号" prop="orderNo">
         <el-input
@@ -22,17 +24,13 @@
         />
       </el-form-item>
       <el-form-item label="订单状态" prop="orderStatus">
-        <el-select
+        <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态">
-          v-model="queryParams.orderStatus"
-          placeholder="请选择订单状态"
-        >
           <el-option
             v-for="item in orderStatuslist"
             :key="item.value"
             :label="item.label"
             :value="item.value"
-          >
+          ></el-option>
-          </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="会员名称" prop="patientName">
@@ -44,80 +42,37 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          type="primary"
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          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-table
       v-loading="loading"
       :data="OrderDetailsList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column
+      <el-table-column label="所属护理站" align="center" prop="nurseStationName" />
-        label="所属护理站"
-        align="center"
-        prop="nurseStationName"
-      />
       <el-table-column label="订单编号" align="center" prop="orderNo" />
-      <el-table-column
+      <el-table-column label="护理项目名称" align="center" prop="nurseItemName" />
-        label="护理项目名称"
-        align="center"
-        prop="nurseItemName"
-      />
       <el-table-column label="订单总金额" align="center" prop="totalPrice" />
       <el-table-column label="下单时间" align="center" prop="createTime" />
-
       <el-table-column label="订单状态" align="center" prop="orderStatus">
         <template slot-scope="scope">
-          <el-button v-if="scope.row.orderStatus == 'WAIT_PAY'"
+          <el-button v-if="scope.row.orderStatus == 'WAIT_PAY'">待付款</el-button>
-            >待付款</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 == 'PAY'"
+          <el-button type="primary" v-if="scope.row.orderStatus == 'WAIT_RECEIVE'">待接单</el-button>
-            >已付款</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
+          <el-button type="success" v-if="scope.row.orderStatus == 'EVALUATED'">服务完成</el-button>
-            type="primary"
+          <el-button type="warning" v-if="scope.row.orderStatus == 'WAIT_REFUND'">退款中</el-button>
-            v-if="scope.row.orderStatus == 'WAIT_DISPATCH'"
+          <el-button type="warning" v-if="scope.row.orderStatus == 'REFUNDED'">退款成功</el-button>
-            >待派单</el-button
+          <el-button type="danger" v-if="scope.row.orderStatus == 'CANCEL'">已取消</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
-          >
-          <el-button
-            type="warning"
-            v-if="scope.row.orderStatus == 'WAIT_REFUND'"
-            >退款中</el-button
-          >
-          <el-button type="warning" v-if="scope.row.orderStatus == 'REFUNDED'"
-            >退款成功</el-button
-          >
-          <el-button type="danger" v-if="scope.row.orderStatus == 'CANCEL'"
-            >已取消</el-button
-          >
         </template>
       </el-table-column>
       <el-table-column label="会员名称" align="center" prop="patientName" />
-      <el-table-column label="护理员" align="center" prop="nursePersonName" />
+      <el-table-column label="护理员名称" align="center" prop="nursePersonName" />
-      <el-table-column
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -125,8 +80,7 @@
             icon="el-icon-zoom-in"
             @click="seeLook(scope.row)"
             v-hasPermi="['system:appointmentOrder:query']"
-            >查看</el-button
+          >查看</el-button>
-          >
           <el-button
             size="mini"
             type="text"
@@ -134,8 +88,7 @@
             @click="dispatch(scope.row)"
             v-hasPermi="['system:appointmentOrder:dispatch']"
             v-if="scope.row.orderStatus == 'WAIT_DISPATCH'"
-            >派单</el-button
+          >派单</el-button>
-          >
           <el-button
             size="mini"
             type="text"
@@ -143,8 +96,7 @@
             v-if="scope.row.orderStatus == 'WAIT_REFUND'"
             @click="cencel(scope.row)"
             v-hasPermi="['system:appointmentOrder:confirmCancel']"
-            >取消预约</el-button
+          >取消预约</el-button>
-          >
           <!-- <el-button
             size="mini"
             type="text"
@@ -152,7 +104,7 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:nurseType:remove']"
             >删除</el-button
-          > -->
+          >-->
         </template>
       </el-table-column>
     </el-table>
@@ -164,66 +116,65 @@
       @pagination="getList"
     />
     <!-- 查看弹框 -->
-    <el-dialog
+    <el-dialog title="查看预约订单信息" :visible.sync="innerVisible4" append-to-body width="1280px">
-      title="查看预约订单信息"
+      <el-form :inline="true" ref="form" :model="query" :rules="rules" label-width="130px">
-      :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
+          <div class="text">{{switchOrderStatus(query.orderStatus)}}</div>
-            :value="switchOrderStatus(query.orderStatus)"
-            style="width: 250px"
-            disabled
-          >
-          </el-input>
         </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="nurseItemName">
+        <el-form-item label="佣金金额" prop="orderCount">
-          <el-input
+          <div class="text">{{query.orderCommissionAmount}}</div>
-            v-model="query.nurseItemName"
-            disabled
-            style="width: 250px"
-          />
-        </el-form-item>
-        <el-form-item label="服务时间" prop="time">
-          <el-input v-model="query.time" disabled style="width: 250px" />
-        </el-form-item>
-        <el-form-item label="护理项目时长" prop="itemServeDurationUnit">
-          <el-input
-            v-model="query.itemServeDurationUnit"
-            disabled
-            style="width: 250px"
-          />
         </el-form-item>
         <el-form-item label="护理站名称" prop="nurseStationName">
-          <el-input
+          <div class="text">{{query.nurseStationName}}</div>
-            v-model="query.nurseStationName"
+        </el-form-item>
-            disabled
+        <el-form-item label="护理项目名称" prop="nurseItemName">
-            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">
+          <div class="text">{{query.time}}</div>
+        </el-form-item>
+        <el-form-item label="护理项目时长" prop="itemServeDurationUnit">
+          <div class="text">{{query.itemServeDurationUnit}}</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
+          <div
-            v-model="query.serviceAddress"
+            class="text"
-            disabled
+            style="height:100px;line-height:26px;overflow: scroll"
-            style="width: 250px"
+          >{{query.serviceAddress}}</div>
-          />
         </el-form-item>
         <el-form-item
           label="服务到岗照片"
@@ -232,7 +183,7 @@
             query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
           "
         >
-          <img class="img" :src="baseurl + query.onDutyPictureUrl" alt="" />
+          <img class="img" :src="baseurl + query.onDutyPictureUrl" alt />
         </el-form-item>
         <el-form-item
           label="服务结束照片"
@@ -241,7 +192,7 @@
             query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
           "
         >
-          <img class="img" :src="baseurl + query.serviceEndPictureUrl" alt="" />
+          <img class="img" :src="baseurl + query.serviceEndPictureUrl" alt />
         </el-form-item>
         <el-form-item
           label="用户确认签名"
@@ -250,46 +201,16 @@
             query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
           "
         >
-          <img
+          <img class="img" :src="baseurl + query.userSignaturePictureUrl" alt />
-            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"
           style="margin: 10px 0 20px 0; padding-bottom: 20px"
         >
-          <el-table-column
+          <el-table-column prop="orderConsumableName" label="耗材包名称" align="center"></el-table-column>
-            prop="orderConsumableName"
+          <el-table-column prop="orderConsumableCount" label="耗材包数量" align="center"></el-table-column>
-            label="耗材包名称"
+          <el-table-column prop="orderConsumablePrice" label="耗材包价格" align="center"></el-table-column>
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="orderConsumableCount"
-            label="耗材包数量"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="orderConsumablePrice"
-            label="耗材包价格"
-            align="center"
-          >
-          </el-table-column>
         </el-table>
         <el-form-item
           label="预约服务位置"
@@ -297,11 +218,7 @@
             query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
           "
         >
-          <el-input
+          <el-input v-model="query.serviceLocationName" disabled style="width: 250px" />
-            v-model="query.serviceLocationName"
-            disabled
-            style="width: 250px"
-          />
         </el-form-item>
       </el-form>
       <div
@@ -312,91 +229,23 @@
         "
       ></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
+    <el-dialog title="取消预约" :visible.sync="innerrefund" append-to-body width="500px">
-      title="取消预约"
-      :visible.sync="innerrefund"
-      append-to-body
-      width="500px"
-    >
       <el-form :inline="true" :rules="rules" label-width="120px">
         <el-form-item label="订单编号" prop="orderNo">
-          <el-input
+          <el-input style="width: 260px" v-model="query.orderNo" clearable :disabled="true" />
-            style="width: 260px"
-            v-model="query.orderNo"
-            clearable
-            :disabled="true"
-          />
         </el-form-item>
         <el-form-item label="服务项目" prop="nurseItemName">
-          <el-input
+          <el-input v-model="query.nurseItemName" style="width: 260px" clearable :disabled="true" />
-            v-model="query.nurseItemName"
-            style="width: 260px"
-            clearable
-            :disabled="true"
-          />
         </el-form-item>
         <el-form-item label="会员姓名" prop="patientName">
-          <el-input
+          <el-input v-model="query.patientName" style="width: 260px" clearable :disabled="true" />
-            v-model="query.patientName"
-            style="width: 260px"
-            clearable
-            :disabled="true"
-          />
         </el-form-item>
         <el-form-item label="退款原因" prop="cancelAppointmentReason">
           <el-input
             style="width: 260px"
             v-model="query.cancelAppointmentReason"
-            placeholder=""
+            placeholder
             clearable
             type="textarea"
             :rows="5"
@@ -409,12 +258,8 @@
         <el-button type="primary" @click="ordercacenl">确 定</el-button>
       </div>
     </el-dialog>
-    <!-- 姓名弹框 -->
+    <!-- 派单护理员弹框 -->
-    <el-dialog
+    <el-dialog :visible.sync="nursePersonNameinfo" width="1300px" append-to-body title="派单">
-      :visible.sync="nursePersonNameinfo"
-      width="1000px"
-      append-to-body
-    >
       <el-form
         ref="queryForm"
         :model="querynursePersonname"
@@ -422,84 +267,87 @@
         label-width="80px"
         :inline="true"
       >
-        <el-form-item label="姓名" prop="nursePersonName" label-width="120">
+        <el-form-item label="护理人员姓名" prop="nursePersonName" label-width="120">
           <el-input
             v-model="querynursePersonname.nursePersonName"
-            placeholder="请输入姓名"
+            placeholder="请输入护理人员姓名"
             clearable
           />
         </el-form-item>
-
         <el-form-item>
-          <el-button
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery2">搜索</el-button>
-            type="primary"
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery2">重置</el-button>
-            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 :data="dispatchlist" @cell-dblclick="submitForm">
-        <el-table-column label="请选择" width="70" align="center">
+        <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
+        <el-table-column property="nurseStationName" label="所属护理站" align="center"></el-table-column>
-          property="nursePersonCode"
+        <!-- <el-table-column property="nursePersonCode" label="护理员编号"  align="center"></el-table-column> -->
-          label="护理员编号"
+        <el-table-column property="nursePersonName" label="护理人员姓名" align="center"></el-table-column>
-          width="150"
+        <el-table-column property="workStatus" label="在线状态" align="center">
-          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
+        <el-table-column property="evaluateStarCount" label="星级评价" align="center" width="180">
-          property="nursePersonName"
+          <template slot-scope="scope">
-          label="护理站人员姓名"
+            <el-rate :value="scope.row.evaluateStarCount" disabled></el-rate>
-          width="150"
+          </template>
-          align="center"
-        >
         </el-table-column>
-        <el-table-column
+        <el-table-column property="nursePersonType" label="护理人员类型" align="center">
-          property="nursePersonType"
-          label="护理站人员类型"
-          width="150"
-          align="center"
-        >
           <template slot-scope="scope">
             {{ scope.row.nursePersonType == "NURSE" ? "护士" : "" }}
             {{ scope.row.nursePersonType == "NURSE_TEACHER" ? "护理师" : "" }}
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column property="positionalTitleLevel" label="职称级别" align="center">
-          property="phone"
+          <template slot-scope="scope">
-          label="手机号"
+            {{ scope.row.positionalTitleLevel == "PRIMARY_LEVEL" ? "初级" : "" }}
-          width="150"
+            {{ scope.row.positionalTitleLevel == "MIDDLE_LEVEL" ? "中级" : "" }}
-          align="center"
+            {{ 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"
@@ -508,6 +356,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>
     <!-- 护理站 -->
     <el-dialog
       title="选择护理站"
@@ -516,42 +378,19 @@
       append-to-body
       :before-close="clicknurseStationshow"
     >
-      <el-form
+      <el-form ref="form" :model="getListByUserquery" label-width="110px" :inline="true">
-        ref="form"
-        :model="getListByUserquery"
-        label-width="110px"
-        :inline="true"
-      >
         <el-form-item label="护理站编码" prop="nurseStationCode">
-          <el-input
+          <el-input v-model="getListByUserquery.nurseStationCode" placeholder="请输入护理站编码" />
-            v-model="getListByUserquery.nurseStationCode"
-            placeholder="请输入护理站编码"
-          />
         </el-form-item>
         <el-form-item label="护理站名称" prop="nurseStationName">
-          <el-input
+          <el-input v-model="getListByUserquery.nurseStationName" placeholder="请输入护理站名称" />
-            v-model="getListByUserquery.nurseStationName"
-            placeholder="请输入护理站名称"
-          />
         </el-form-item>
         <el-form-item>
-          <el-button
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="info">搜索</el-button>
-            type="primary"
+          <el-button icon="el-icon-refresh" size="mini" @click="stationcancel">重置</el-button>
-            icon="el-icon-search"
-            size="mini"
-            @click="info"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh" size="mini" @click="stationcancel"
-            >重置</el-button
-          >
         </el-form-item>
       </el-form>
-      <el-table
+      <el-table v-loading="loading" :data="nurseStationlist" @cell-dblclick="choicestationid">
-        v-loading="loading"
-        :data="nurseStationlist"
-        @cell-dblclick="choicestationid"
-      >
         <el-table-column label="请选择" width="70" align="center">
           <template slot-scope="scope">
             <el-button
@@ -567,31 +406,18 @@
               circle
               v-else
               @click="choicestationid(scope.row)"
-            >
+            ></el-button>
-            </el-button>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column property="nurseStationCode" label="护理站编码" align="center"></el-table-column>
-          property="nurseStationCode"
+        <el-table-column property="nurseStationName" label="护理站名称" align="center"></el-table-column>
-          label="护理站编码"
+        <el-table-column property="phone" label="联系电话" align="center"></el-table-column>
-          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"
           :show-overflow-tooltip="true"
-        >
+        ></el-table-column>
-        </el-table-column>
       </el-table>
 
       <pagination
@@ -625,5 +451,21 @@ export default indexjs;
   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>
 

src/views/system/order/indexjs.js

@@ -6,6 +6,7 @@ import {
     dispatchsubmit,
     xylWeChatRefundNotify,
     appointmentOrderDetails,
+    getPersonInfo
 } from "@/api/system/order";
 import { getListByUser } from "@/api/system/userlist.js";
 import baseurl from '@/api/baseurl.js'
@@ -52,15 +53,16 @@ export default {
                     label: "已取消",
                 }
             ],
-            value: "",
             // 遮罩层
             loading: true,
             innerVisible4: false,
             innerrefund: false,
-            // 派单弹框
+            // 护理员姓名弹框
-            innerdispatch: false,
-            // 姓名弹框
             nursePersonNameinfo: false,
+            nursePersonlist: {},
+            //查看证书
+            certificateshow: false,
+            PersonChecksrcList: [],
             // 选中数组
             ids: [],
             // 非单个禁用
@@ -75,13 +77,6 @@ export default {
             // 护理类型信息表格数据
             OrderDetailsList: [],
             dispatchlist: [],
-            nurseName: "请选择护理员",
-            nursePersonid: "",
-            // querynursecencel:{
-            //   appointmentOrderId:"",
-            // },
-            appointmentOrderId: "",
-            nurseStationPersonId: "",
             total2: 0,
             //护理站
             stationtotal: 0,
@@ -89,9 +84,6 @@ export default {
             nurseStationshow: false,
             // 弹出层标题
             title: "",
-            // 是否显示弹出层
-            open: false,
-            open2: false,
             // 查询参数
             getListByUserquery: {
                 pageNum: 1,
@@ -184,7 +176,6 @@ export default {
                 }
                 this.getList();
                 this.innerrefund = false;
-                console.log(res);
             });
         },
         // 取消按钮
@@ -201,6 +192,8 @@ export default {
                     return "待派单";
                 case "NOT_FINISH":
                     return "未完成";
+                case "WAIT_RECEIVE":
+                    return "待接单"
                 case "COMPLETE":
                     return "待评价";
                 case "EVALUATED":
@@ -221,20 +214,22 @@ export default {
             const id = row.orderNo;
             this.map = null
             appointmentOrderDetails(id).then((res) => {
-                res.data.forEach((e) => {
+                res.data.time = res.data.serviceDate + "-" + res.data.serviceStartTime;
-                    if (e.serviceDate) {
+                this.query = res.data;
-                        e.time = e.serviceDate + "-" + e.serviceStartTime;
+                res.data.disablingCondition == 'DISABLED' ? res.data.disablingCondition = '是' : ''
-                    }
+                res.data.disablingCondition == 'NOT_DISABLED' ? res.data.disablingCondition = '否' : ''
-                });
-                this.query = res.data[0];
                 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;
@@ -262,40 +257,41 @@ export default {
         },
         // 派单
         dispatch(row) {
-            this.querynursePersonname.orderNo = row.orderNo;
+            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;
                 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;
+            getPersonInfo(row.nurseStationPersonId).then(res => {
-            this.nurseName = row.nursePersonName;
+                this.PersonChecksrcList = res.data;
-            this.nursePersonNameinfo = false;
+                this.certificateshow = true
-            console.log(row);
+            })
         },
         // 确认取消预约
         cencel(row) {
@@ -342,11 +338,6 @@ export default {
                 this.loading = false;
             });
         },
-        // 取消按钮
-        cancel() {
-            this.open = false;
-            this.reset();
-        },
         // 表单重置
         reset() {
             this.form = {
@@ -365,8 +356,6 @@ export default {
         handleQuery2() {
             getPerson(this.querynursePersonname).then((res) => {
                 this.dispatchlist = res.rows;
-                console.log(this.querynursePersonname);
-                // this.innerdispatch = true;
             });
         },
         /** 重置按钮操作 */
@@ -390,7 +379,6 @@ export default {
         },
         /** 删除按钮操作 */
         handleDelete(row) {
-            // console.log('row :>> ', row);
             this.$confirm("是否确认删除订单信息的数据项？", "提示", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",

src/views/system/patientArchives/index.vue

@@ -645,9 +645,7 @@ export default {
   methods: {
     // 重置密码
     handleResetPwd(row) {
-      console.log(row);
       const id = row.id;
-      console.log(id);
       // const id=row.userId
       this.$prompt("请输入新的密码", "提示", {
         confirmButtonText: "确定",
@@ -657,7 +655,6 @@ export default {
         inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
       })
         .then((res) => {
-          console.log(res);
           const params = {
             id,
             password: res.value,
@@ -670,7 +667,6 @@ export default {
     },
     // 查询省事件
     province(item) {
-      console.log(item);
       this.queryParams.city = "";
       this.queryParams.area = "";
       this.queryParams.areaCode = "";
@@ -678,9 +674,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;
       });
     },
@@ -690,41 +684,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);
             });
           });
         }
@@ -732,10 +717,8 @@ export default {
     },
     Provincelist() {
       FirstLevel(this.getProvincequeryParams).then((res) => {
-        console.log(res);
         this.arealist = res.data;
         this.total2 = res.total;
-        console.log(this.arealist);
       });
     },
     /** 查询被护理人基本信息列表 */

src/views/system/person/indexjs.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() {
         // 验证手机号的规则
@@ -42,6 +46,7 @@ export default {
             cb(new Error("请输入正确的联系电话"));
         };
         return {
+            baseurl: null,
             //男女选择
             sexs: [{
                     label: "男",
@@ -52,6 +57,23 @@ export default {
                     value: "FEMALE",
                 },
             ],
+            positionalTitleLevellist: [{
+                label: "初级",
+                value: "PRIMARY_LEVEL",
+            }, {
+                label: "中级",
+                value: "MIDDLE_LEVEL",
+            }, {
+                label: "高级",
+                value: "HIGH_LEVEL",
+            }],
+            modifyCheckStatuslist: [{
+                label: "已审核",
+                value: "CHECKED",
+            }, {
+                label: "未审核",
+                value: "NOT_CHECK",
+            }],
             nursePersonTypes: [{
                     label: "护士",
                     value: "NURSE",
@@ -59,10 +81,8 @@ export default {
                 {
                     label: "护理师",
                     value: "NURSE_TEACHER",
-                },
+                }
             ],
-            innerVisible: false,
-            innerVisible2: false,
             innerVisiblexg: false,
             innerVisiblexg2: false,
             // 遮罩层
@@ -109,12 +129,10 @@ export default {
             title: "",
             title2: "",
             title3: "",
-            // 修改弹出层
+            //  添加弹出层修改弹出层
             open: false,
-            // 添加弹出层
+            templeopen: false,
-            open2: false,
             //权限查询
-            // 查询参数
             queryParams: {
                 pageNum: 1,
                 pageSize: 10,
@@ -137,7 +155,6 @@ export default {
                 id: null,
                 nurseStationId: null,
             },
-
             queryParams3: {
                 pageNum: 1,
                 pageSize: 10,
@@ -155,12 +172,20 @@ export default {
                 pageNum: 1,
                 pageSize: 10,
             },
-
             // 表单参数
             form: {},
             index: "",
             // 表单校验
             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" },
                 ],
@@ -183,59 +208,58 @@ 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" },
-                    ],
-                },
             },
             homenumber: null,
+            idd: 1,
         };
     },
     created() {
+        this.baseurl = baseurl
         this.getList();
     },
     methods: {
-        // // 新增所属科室按钮
+        //删除Certificate
-        departclick(item, index) {
+        delCertificate(index) {
-            if (this.form.nurseStationId != null) {
+            if (this.form.nurseStationPersonCertificateList.length == 1) {
-                this.getList3();
+                this.$message.error("不可全部删除");
-                console.log(item);
-                this.departid = item.departmentCode;
-                this.innerVisible2 = true;
-                this.index = index;
-
             } else {
-                // this.innerVisible2 = false;
+                this.form.nurseStationPersonCertificateList.splice(index, 1);
-                this.$message.error('请先选择所属护理站');
             }
-
         },
-        // // 修改所属科室按钮
+        //添加Certificate
+        addCertificate() {
+            this.idd++;
+            var obj = {
+                certificateName: null,
+                certificateUrl: null,
+                idd: this.idd,
+                sort: null,
+            };
+            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;
+                    }
+                });
+            }
+        },
+        // // 所属科室按钮
         departclick2() {
             if (this.form.nurseStationId != null) {
                 this.getList3();
@@ -243,7 +267,6 @@ export default {
                 this.innerVisiblexg2 = true;
 
             } else {
-                // this.innerVisible2 = false;
                 this.$message.error('请先选择所属护理站');
             }
         },
@@ -254,13 +277,6 @@ export default {
             this.innerVisiblexg = true;
             // this.index = index;
         },
-        // 新增护理站按钮
-        clickinnerVisible(item, index) {
-            this.info();
-            this.stationid = item.nurseStationId;
-            this.innerVisible = true;
-            this.index = index;
-        },
         // 修改护理站
         nurseclick2(row) {
             if (this.homenumber) {
@@ -277,37 +293,13 @@ export default {
         },
         // 护理站名称
         nurseclick(row) {
-            console.log(row);
             this.nursename = row.nurseStationName;
             this.stationid = row.id;
             this.form.nurseStationId = row.id;
             this.queryParams3.nurseStationId = row.id;
-            console.log(this.form.nurseStationId);
-            console.log(this.form);
-            this.innerVisible = false;
             this.form.nursename = row.nurseStationName;
-            this.form.nurseStationPersonList[this.index].nurseStationName =
-                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;
-            this.form.departname = row.departmentName;
-            this.form.nurseStationPersonList[this.index].departmentName =
-                row.departmentName;
-            this.form.nurseStationPersonList[this.index].departmentCode =
-                row.departmentCode;
-            console.log(this.form);
-        },
-        // 修改科室
         StationDepartmentclick2(row) {
             this.departmentName = row.departmentName;
             this.form.departmentCode = row.departmentCode;
@@ -315,7 +307,6 @@ export default {
             this.form.departmentName = row.id;
             this.innerVisiblexg2 = false;
         },
-
         //主页面打开护理站列表
         ParamsStation(item) {
             this.info();
@@ -339,6 +330,13 @@ export default {
             // 护理站名称
             this.loading = true;
             listPerson(this.queryParams).then((response) => {
+                response.rows.forEach(e => {
+                    if (e.modifyCheckStatus == 'CHECKED') {
+                        e.modifyCheckStatus = true
+                    } else {
+                        e.modifyCheckStatus = false
+                    }
+                })
                 this.nurseStationPersonList = response.rows;
                 this.total = response.total;
                 this.loading = false;
@@ -355,15 +353,15 @@ export default {
         // 取消按钮
         cancel() {
             this.open = false;
-            this.open2 = false;
             this.nurseStationName = "请选择所属护理站";
             this.departmentName = "请选择所属科室";
-            // this.upload.open=false;
             this.reset();
         },
         // 表单重置
         reset() {
             this.form = {
+                geniusItem: null,
+                birthDate: null,
                 id: null,
                 nurseStationId: null,
                 departmentCode: null,
@@ -379,19 +377,12 @@ export default {
                 updateTime: null,
                 nurseStationName: "请选择所属护理站",
                 departmentName: "请选择所属科室",
-                nurseStationPersonList: [{
+                nurseStationPersonCertificateList: [{
-                    id: "",
+                    certificateName: null,
-                    nurseStationId: "",
+                    certificateUrl: null,
-                    departmentCode: "",
+                    sort: null,
-                    nursePersonCode: "",
+                    idd: this.idd,
-                    nursePersonName: "",
+                }]
-                    nursePersonType: "",
-                    nurseStationName: "请选择所属护理站",
-                    phone: "",
-                    address: "",
-                    sex: "",
-                    departmentName: "请选择所属科室",
-                }, ],
             };
             this.resetForm("form");
         },
@@ -416,12 +407,10 @@ export default {
         },
         /** 重置按钮操作 */
         addcancel() {
-            this.innerVisible = false;
             this.innerVisiblexg = false;
             this.resetQuery4();
         },
         departcancel() {
-            this.innerVisible2 = false;
             this.innerVisiblexg2 = false;
             this.resetQuery3();
         },
@@ -474,20 +463,29 @@ export default {
         handleAdd() {
             this.queryParams3.nurseStationId = null
             this.reset();
-            this.open2 = true;
+            this.open = true;
             this.title = "添加护理站人员信息";
             this.title2 = "请选择所属护理站";
             this.title3 = "请选择科室";
+            this.homenumber = null;
         },
         /** 修改按钮操作 */
         handleUpdate(row) {
             this.homenumber = null;
             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 = "修改护理站人员信息";
@@ -498,20 +496,24 @@ export default {
                 }
             });
         },
+        // 审核
+        handshenhe(row) {
+            getNurseStationPersonCheck(row.id).then(res => {
+                this.form = res.data;
+                this.templeopen = true;
+            })
+        },
         /** 提交按钮 */
         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("修改成功");
@@ -521,7 +523,7 @@ export default {
                     } else {
                         addPerson(this.form).then((response) => {
                             this.$modal.msgSuccess("新增成功");
-                            this.open2 = false;
+                            this.open = false;
                             this.getList();
                             this.nurseStationName = "请选择所属护理站";
                             this.departmentName = "请选择所属科室";
@@ -530,6 +532,19 @@ export default {
                 }
             });
         },
+        // 审核提交
+        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;

src/views/system/revenue/index.vue

@@ -0,0 +1,603 @@
+<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="nursePersonName">
+        <el-button type class="stationbtn" @click="nurseStationNameclick(true)">
+          {{
+          queryParams.nurseStationName
+          }}
+        </el-button>
+      </el-form-item>
+      <el-form-item label="护理人员名称" prop="nursePersonName">
+        <el-button type class="stationbtn" @click="nursePersonNameclick(true)">
+          {{
+          queryParams.nursePersonName
+          }}
+        </el-button>
+      </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="nurseStationshow"
+      width="1000px"
+      append-to-body
+      :before-close="nurseStationcancel"
+    >
+      <el-form ref="queryForm" :model="nurseStationqueryParams" :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="nurseStationhandleQuery"
+          >搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="nurseStationreset">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table :data="nurseStationlist" @cell-dblclick="nurseStationclick">
+        <el-table-column label="请选择" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              style="width: 15px; height: 15px"
+              v-if="nurseStationid == scope.row.id"
+              circle
+              @click="nurseStationclick(scope.row)"
+            ></el-button>
+            <el-button
+              v-else
+              style="width: 15px; height: 15px"
+              circle
+              @click="nurseStationclick(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"></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="nurseStationtotal > 0"
+        :total="nurseStationtotal"
+        :page.sync="nurseStationqueryParams.pageNum"
+        :limit.sync="nurseStationqueryParams.pageSize"
+        @pagination="nurseStationinfo"
+      />
+    </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="nurseStationhandleQuery"
+          >搜索</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="nurseStationid == 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: {},
+      //选择护理站
+      nurseStationshow: false,
+      //选择人员
+      nursePersonshow: false,
+      //护理站list
+      nurseStationlist: [],
+      nurseStationtotal: 0,
+      nurseStationid: null,
+      //选择人员
+      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.getList();
+    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");
+    },
+    //点击护理站
+    nurseStationNameclick() {
+      this.nurseStationid = this.queryParams.nurseStationId;
+      this.nurseStationshow = true;
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.valuetime = "";
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        monthTime: null,
+        monthStartTime: null, //开始时间
+        monthEndTime: 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`
+      );
+    },
+    /** 护理站重置按钮操作 */
+    nurseStationcancel() {
+      this.nurseStationshow = false;
+      this.nurseStationreset();
+    },
+    //护理站重置
+    nurseStationreset() {
+      this.nurseStationqueryParams = {
+        pageNum: 1,
+        pageSize: 10
+      };
+      this.nurseStationinfo();
+    },
+    //护理站请求
+    nurseStationinfo() {
+      this.loading = true;
+      getListByUser(this.nurseStationqueryParams).then(res => {
+        this.nurseStationlist = res.rows;
+        this.nurseStationtotal = res.total;
+        this.loading = false;
+      });
+    },
+    //护理站搜索
+    nurseStationhandleQuery() {
+      this.nurseStationqueryParams.pageNum = 1;
+      this.nurseStationinfo();
+    },
+    //护理站click
+    nurseStationclick(row) {
+      this.nurseStationid = row.id;
+      this.queryParams.nurseStationName = row.nurseStationName;
+      this.queryParams.nurseStationId = row.id;
+      this.nurseStationshow = false;
+    },
+
+    /** 护理人员重置按钮操作 */
+    nursePersoncancel() {
+      this.nursePersonshow = false;
+      this.nursePersonreset();
+    },
+    //护理人员重置
+    nursePersonreset() {
+      this.nursePersonqueryParams = {
+        pageNum: 1,
+        pageSize: 10
+      };
+      this.nursePersoninfo();
+    },
+    //护理人员请求
+    nursePersoninfo() {
+      this.loading = true;
+      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;
+        this.loading = false;
+      });
+    },
+    //护理人员搜索
+    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>

src/views/system/settings/index.vue

@@ -494,7 +494,6 @@ export default {
   },
   methods: {
     imgs(item) {
-      console.log(item);
       this.imgsurl.pictureUrlList.push(item);
     },
     /** 查询泉医到家平台系统业务设置信息列表 */
@@ -587,7 +586,6 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      console.log(row)
       const ids = row.id || this.ids;
       const settingsNames=row.settingsName||this.settingsNames
       this.$modal

src/views/system/station/stationjs.js

@@ -84,15 +84,15 @@ export default {
                 labelDescription: "",
                 sort: "",
                 idd: 1,
-            },],
+            }, ],
             // 护理站信息表格数据
             stationList: [{
                 sysAreaVOList: [{
                     provinceName: null,
                     cityName: null,
                     streetName: null,
-                },],
+                }, ],
-            },],
+            }, ],
             nurseStationlist: [],
             // 弹出层标题
             title: "",
@@ -150,13 +150,13 @@ export default {
                     // validator: checkMobile,
                     trigger: "blur",
                     message: "请输入手机号",
-                },],
+                }, ],
 
                 dutyPhone: [{
                     // validator: checkMobile2,
                     trigger: "blur",
                     message: "请输入联系电话",
-                },],
+                }, ],
                 sort: [{ required: true, message: "排序不能为空", trigger: "blur" }],
                 address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
                 longitude: [
@@ -176,7 +176,7 @@ export default {
                 ],
             },
 
-            checkedDataList: []// 选择的护理机构分类
+            checkedDataList: [] // 选择的护理机构分类
         };
     },
     created() {
@@ -195,20 +195,16 @@ 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 = [{
                     labelDescription: "",
                     sort: "",
                     idd: 1,
-                },];
+                }, ];
             } else {
                 this.looknurseStationLabel.splice(index, 1);
             }
-
-            console.log(this.form.nurseStationLabelList);
         },
         addnurseStationLabelList() {
             if (this.looknurseStationLabel.length == 5) {
@@ -222,12 +218,10 @@ export default {
                 };
                 this.looknurseStationLabel.push(obj);
             }
-            console.log(this.looknurseStationLabel);
         },
         //点击街道
         clickstreet(item) {
             this.form.areaCode = item.areaCode;
-            console.log(item, this.form);
         },
         //点击区县城
         clickarea(item) {
@@ -276,10 +270,10 @@ export default {
                 obj.pictureUrlList.push(this.form.stationPictureUrl);
             }
             if (obj.pictureUrlList.length > 0) {
-                updatePicture(obj).then((res) => { });
+                updatePicture(obj).then((res) => {});
             }
             if (this.imgsurl.pictureUrlList.length > 0) {
-                updatePicture(this.imgsurl).then((res) => { });
+                updatePicture(this.imgsurl).then((res) => {});
             }
             this.imgsurl = { pictureUrlList: [] };
             this.open = false;
@@ -343,8 +337,7 @@ export default {
             // 若已存在id 则为删除
             if (this.checkedDataList.find(el => el == e.id)) {
                 this.checkedDataList = this.checkedDataList.filter(ele => ele != e.id)
-            }
+            } else {
-            else {
                 // 不存在 添加进id
                 this.checkedDataList.push(e.id);
             }
@@ -432,7 +425,7 @@ export default {
                 labelDescription: "",
                 sort: "",
                 idd: 1,
-            },];
+            }, ];
             this.title = "添加护理站信息";
         },
         /** 修改按钮操作 */
@@ -454,7 +447,6 @@ export default {
                 this.looknurseStationLabel = response.data.nurseStationLabel;
                 this.open = true;
                 this.loading = false;
-                console.log(this.form);
             });
         },
         /** 提交按钮 */
@@ -496,7 +488,7 @@ export default {
                             }
                             this.imgsurl = { pictureUrlList: [] };
                             if (obj.pictureUrlList.length > 0) {
-                                updatePicture(obj).then((res) => { });
+                                updatePicture(obj).then((res) => {});
                             }
                             this.$modal.msgSuccess("修改成功");
                             this.open = false;
@@ -521,7 +513,7 @@ export default {
             const ids = row.id || this.ids;
             this.$modal
                 .confirm("是否确认删除此护理站信息？")
-                .then(function () {
+                .then(function() {
                     return delStation(ids);
                 })
                 .then(() => {
@@ -529,12 +521,12 @@ export default {
                     obj.pictureUrlList.push(row.stationIntroducePcitureUrl);
                     obj.pictureUrlList.push(row.stationPictureUrl);
                     if (obj.pictureUrlList.length > 0) {
-                        updatePicture(obj).then((res) => { });
+                        updatePicture(obj).then((res) => {});
                     }
                     this.getList();
                     this.$modal.msgSuccess("删除成功");
                 })
-                .catch(() => { });
+                .catch(() => {});
         },
         /** 导出按钮操作 */
         handleExport() {

src/views/system/stationAvatar/index.vue

@@ -1,19 +1,13 @@
 <template>
   <div>
-    <div
+    <div class="user-info-head" :class="video.VideoPath ? 'wihi' : ''" @click="editCropper()">
-      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,25 +56,19 @@
               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'">
+          <div
-            请上传图片为800x800px的正方形
+            class="title"
-          </div>
+            v-if="types != 'posterVideoUrl'&&types!='posterPictureUrl'"
+          >请上传图片为800x800px的正方形</div>
         </el-col>
       </el-row>
       <br />
       <el-row>
         <el-col :lg="2" :md="2">
-          
           <el-upload
             action="#"
             :http-request="requestUpload"
@@ -120,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 type="primary" size="small" @click="uploadImg()">提 交</el-button>
-            >提 交</el-button
-          >
         </el-col>
       </el-row>
     </el-dialog>
@@ -137,7 +123,7 @@ import baseurl from "@/api/baseurl.js";
 import {
   updateNurseStationHeads,
   posts,
-  updatePoserHeads,
+  updatePoserHeads
 } from "@/api/system/stationAvatar.js";
 
 export default {
@@ -159,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() {
@@ -182,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 == "") {
@@ -198,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) {
@@ -214,13 +199,13 @@ export default {
         } else {
           this.options.img = baseurl + this.img;
         }
-      },
+      }
     },
     type: {
       handler(newimg, oldimg) {
         this.types = this.type;
-      },
+      }
-    },
+    }
   },
   methods: {
     // 编辑头像
@@ -280,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") {
@@ -305,15 +290,13 @@ export default {
               this.items.posterPictureUrl = response.imgUrl;
               this.$emit("item", JSON.stringify(this.items));
             }
-            if(this.types == "certificateUrl"){
+            if (this.types == "certificateUrl") {
               this.items.certificateUrl = response.imgUrl;
               this.$emit("item", JSON.stringify(this.items));
-              console.log(this.item)
             }
-            if(this.types == "personPictureUrl"){
+            if (this.types == "personCertificateUrl") {
-              // this.items.personPictureUrl = response.imgUrl; 
+              this.items.certificateUrl = response.imgUrl;
               this.$emit("item", JSON.stringify(this.items));
-           
             }
             this.openimg = false;
           });
@@ -330,8 +313,8 @@ export default {
     closeDialog() {
       this.imgs = "";
       this.visible = false;
-    },
+    }
-  },
+  }
 };
 </script>
 <style scoped lang="scss">

src/views/system/stationClassify/index.vue

@@ -490,8 +490,6 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-
-      console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
 

src/views/system/stationConsumable/indexjs.js

@@ -96,53 +96,53 @@ export default {
                     required: true,
                     message: "请选择所属护理站",
                     trigger: "blur",
-                },],
+                }, ],
                 consumableDetail: [{
                     required: true,
                     message: "请输入耗材包名称",
                     trigger: "blur",
-                },],
+                }, ],
                 consumableUnit: [{
                     required: true,
                     message: "请输入耗材包单位",
                     trigger: "blur",
-                },],
+                }, ],
                 consumablePrice: [{
                     required: true,
                     message: "请输入耗材包价格",
                     trigger: "blur",
-                },],
+                }, ],
                 sort: [{
                     required: true,
                     message: "请输入排序",
                     trigger: "blur",
-                },],
+                }, ],
                 nurseStationConsumables: {
                     consumableDetail: [{
                         required: true,
                         message: "请输入耗材包名称",
                         trigger: "blur",
-                    },],
+                    }, ],
                     nurseStationId: [{
                         required: true,
                         message: "请选择所属护理站",
                         trigger: "blur",
-                    },],
+                    }, ],
                     consumableUnit: [{
                         required: true,
                         message: "请输入耗材包单位",
                         trigger: "blur",
-                    },],
+                    }, ],
                     consumablePrice: [{
                         required: true,
                         message: "请输入耗材包价格",
                         trigger: "blur",
-                    },],
+                    }, ],
                     sort: [{
                         required: true,
                         message: "请输入排序",
                         trigger: "blur",
-                    },],
+                    }, ],
                 },
             },
             homenumber: null,
@@ -207,7 +207,6 @@ export default {
         },
         //页面所属护理站
         ParamsStation(item) {
-            console.log(this.queryParams)
             this.open3 = true
             this.homenumber = item
             this.stationid = this.queryParams.nurseStationId;
@@ -280,7 +279,7 @@ export default {
                     consumablePrice: "",
                     consumableDetail: null,
                     nurseStationName: "请选择所属护理站",
-                },],
+                }, ],
             };
             this.resetForm("form");
         },
@@ -393,14 +392,14 @@ export default {
             const ids = row.id || this.ids;
             this.$modal
                 .confirm("是否确认删除？")
-                .then(function () {
+                .then(function() {
                     return delStationConsumable(ids);
                 })
                 .then(() => {
                     this.getList();
                     this.$modal.msgSuccess("删除成功");
                 })
-                .catch(() => { });
+                .catch(() => {});
         },
         /** 导出按钮操作 */
         handleExport() {

src/views/system/stationItem/index.vue

@@ -309,9 +309,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"
+              width="120"
             >
-            <el-table-column property="serveDurationUnit" label="服务时长和单位" align="center">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.serveDurationUnit" maxlength="6"></el-input>
               </template>
@@ -320,7 +325,7 @@
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row.price"
-                  placeholder="小数点后两位(元)"
+                  placeholder="最多小数点后两位(元)"
                   type="number"
                   min="0"
                   oninput="if (value.indexOf('.') > 0) { value = value.slice(0, value.indexOf('.') + 3)}  if (value.length > 6) { value = value.slice(0, 6) }"
@@ -332,13 +337,38 @@
                 <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="commissionAmount" 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="commissionRate" 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>

src/views/system/stationItem/stationItemjs.js

@@ -197,6 +197,12 @@ export default {
         this.classifylistInfo();
     },
     methods: {
+        commissionAmountinput(e) {
+            e.commissionRate = null
+        },
+        commissionRateoninput(e) {
+            e.commissionAmount = null
+        },
         //点击上架
         upwhetherShelf(row) {
             let shelfStatus = null
@@ -439,6 +445,8 @@ export default {
                     price: "",
                     description: "",
                     idd: this.idd,
+                    commissionAmount: "",
+                    commissionRate: ""
                 };
                 this.form.nurseStationItemPrices.push(obj);
             }
@@ -490,6 +498,8 @@ export default {
                     price: null,
                     description: null,
                     idd: this.idd,
+                    commissionAmount: "",
+                    commissionRate: ""
                 }, ],
             };
             this.resetForm("form");
@@ -558,6 +568,8 @@ export default {
                         price: "",
                         description: "",
                         idd: this.idd,
+                        commissionAmount: "",
+                        commissionRate: ""
                     };
                     this.form.nurseStationItemPrices.push(obj);
                 }
@@ -567,9 +579,26 @@ export default {
         },
         /** 提交按钮 */
         submitForm() {
-            this.form.nurseStationItemConsumables.forEach((e) => {
+            if (this.form.nurseStationItemPrices.length > 0) {
-                e.nurseStationConsumableId = e.id;
+                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)
+                    }
                 });
+            }
+            if (this.form.nurseStationItemConsumables.length > 0) {
+                this.form.nurseStationItemConsumables.forEach(e => {
+                    e.nurseStationConsumableId = e.id;
+                    e.consumableCount = Number(e.consumableCount);
+                });
+            }
             this.form.nurseStationItem.nurseTypeId = this.form.nurseTypeId;
             if (!this.form.nurseStationItem.appointmentLimitCount) {
                 this.form.nurseStationItem.appointmentLimitCount = null

src/views/system/user/index.vue

@@ -587,7 +587,6 @@ export default {
   methods: {
     listinfo() {
       list(this.nurseStationqueryParams).then(res => {
-        console.log(res);
         this.nurseStationlist = res.rows;
         this.total2 = res.total;
       });
@@ -712,10 +711,6 @@ export default {
         );
         this.form = response.data;
         if (this.form.nurseStationIds) {
-          this.form.nurseStationIds = this.form.nurseStationIds.split(",");
-          this.form.nurseStationIds = this.form.nurseStationIds.map(e => {
-            return (e = Number(e));
-          });
           this.form.nurseStationIdstwo = this.form.nurseStationIdstwo.split(
             ","
           );
@@ -733,7 +728,6 @@ export default {
         // ) {getList
         // } else {
         // }
-        console.log(this.form);
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
         this.form.postIds = response.postIds;
@@ -766,7 +760,6 @@ export default {
     },
     /** 提交按钮 */
     submitForm: function() {
-      console.log(this.form);
       this.$refs["form"].validate(valid => {
         if (valid) {
           // this.form.nurseStationIds = JSON.stringify(this.form.nurseStationIds);
@@ -774,28 +767,26 @@ export default {
           // obj.push(this.form.nurseStationIds);
           // this.form.nurseStationIds = obj;
           if (this.form.userId != undefined) {
-            if (!this.form.nurseStationIds) {
+            if (!this.form.nurseStationIdstwo) {
               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);
               this.form.nurseStationIds = this.form.nurseStationIdstwo.join(
                 ","
               );
+            }
             updateUser(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
-                //  console.log('bbb',this.form)
             });
-            }
           } else {
-            this.form.nurseStationIds = this.form.nurseStationIdstwo.join(",");
+            if (this.form.nurseStationIdstwo) {
+              this.form.nurseStationIds = this.form.nurseStationIdstwo.join(
+                ","
+              );
+            } else {
+              this.form.nurseStationIds = null;
+            }
             addUser(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

src/views/system/userlist/index.vue

@@ -13,9 +13,7 @@ export default {
   methods: {
     info() {
       getListByUser().then((res) => {
-        console.log(res);
         if (res.rows[0].isAdmin == "1") {
-          console.log(true);
         } else {
           this.$emit("itemlist", res.rows);
         }