1011

pages/components/navbar/navbar.js

@@ -1,3 +1,4 @@
+
 const App = getApp();
 Component({
   // 组件的属性列表

src/layout/components/Navbar.vue

@@ -102,7 +102,8 @@ export default {
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';
+          // location.href = '/index';
+          location.href = '/night/';
         })
       }).catch(() => {});
     }

src/views/alarmWorksheet/index.vue

@@ -288,7 +288,7 @@
         var data = {
             id:ids
         }
-        this.$modal.confirm('是否确认删除报警记录编号为"' + ids + '"的数据项？').then(function() {
+        this.$modal.confirm('是否确认删除此订单').then(function() {
 
           return delAlarm(data);
         }).then(() => {

src/views/carousel/index.vue

@@ -287,6 +287,7 @@
         this.reset();
         this.open = true;
         this.title = "添加轮播图";
+        this.lbtDetail = ''
       },
       /** 修改按钮操作 */
       handleUpdate(row) {
@@ -342,7 +343,7 @@
     }
   };
   </script>
-<style scoped>
+<style  scoped>
 /deep/.el-upload{
   border: 1px solid #ccc;
 }

src/views/complain/index.vue

@@ -10,22 +10,25 @@
     >
       <el-form-item label="投诉技师" prop="name">
         <el-input
-          v-model="queryParams.name"
+          v-model="queryParams.jsName"
           placeholder="请输入投诉技师姓名"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="部门名称" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入部门名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="部门">
+        <el-select v-model="queryParams.deptId" clearable placeholder="请选择部门">
+          <el-option
+            v-for="item in deptoptions"
+            :key="item.deptId"
+            :label="item.deptName"
+            :value="item.deptId"
+          >
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="投诉类型" prop="complaintType">
-        <el-select v-model="value" placeholder="请选择" @change="selectType">
+        <el-select v-model="value" clearable placeholder="请选择" @change="selectType">
           <el-option
             v-for="item in options"
             :key="item.desc"
@@ -135,7 +138,7 @@
       <el-table-column label="id" align="center" prop="id" />
       <el-table-column label="投诉类型" align="center" prop="complaintType" />
       <el-table-column label="问题描述" align="center" prop="description" />
-      <el-table-column label="投诉技师" align="center" prop="name" />
+      <el-table-column label="投诉技师" align="center" prop="jsName" />
       <!-- <el-table-column label="图片" align="center" prop="photograph" /> -->
       <!-- <el-table-column
         label="图片"
@@ -197,7 +200,7 @@
       title="投诉详情"
       :visible.sync="drawer"
       direction="rtl"
-       @close="handleClose"
+      @close="handleClose"
       size="50%"
     >
       <div class="jsInfo">
@@ -218,7 +221,7 @@
         </div>
         <div class="js_box">
           <div class="js_name">
-            <b>投诉技师：</b><span>{{ complainInfo.name }}</span>
+            <b>投诉技师：</b><span>{{ complainInfo.jsName }}</span>
           </div>
         </div>
         <div class="js_box">
@@ -230,12 +233,8 @@
           <b>图片：</b>
           <span v-for="(item, index) in infoImg" :key="index">
             <!-- <image-preview :src="item[0]" :width="50" :height="50"/> -->
-            <template >
-              <image-preview
-                :src="item"
-                :width="200"
-                :height="200"
-              />
+            <template>
+              <image-preview :src="item" :width="200" :height="200" />
             </template>
             <!-- <img :src="item" alt="" /> -->
           </span>
@@ -265,8 +264,8 @@
             placeholder="请输入内容"
           />
         </el-form-item>
-        <el-form-item label="投诉技师" prop="name">
-          <el-input v-model="complainInfo.name" placeholder="请输入投诉技师" />
+        <el-form-item label="投诉技师" prop="jsName">
+          <el-input v-model="complainInfo.jsName" placeholder="请输入投诉技师" />
         </el-form-item>
         <el-form-item label="图片" prop="photograph">
           <el-input
@@ -318,6 +317,7 @@ import {
   complaintEnum,
 } from "@/api/system/complaint";
 import { options } from "runjs";
+import { getDept } from "@/api/system/js";
 
 export default {
   name: "Complaint",
@@ -348,7 +348,7 @@ export default {
         pageSize: 10,
         complaintType: null,
         description: null,
-        name: null,
+        jsName: null,
         photograph: null,
         deptName: null,
         deptId: null,
@@ -364,18 +364,26 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+      deptoptions: [],
     };
   },
   created() {
     this.getList();
   },
   mounted() {
+    this.getDeptList();
     this.getMenu();
   },
   methods: {
-    handleClose(){
+    // 获取部门
+    getDeptList() {
+      getDept().then((res) => {
+        this.deptoptions = res.data;
+      });
+    },
+    handleClose() {
       this.drawer = false;
-      this.infoImg = []
+      this.infoImg = [];
     },
     handleDetail(row) {
       this.drawer = true;
@@ -455,6 +463,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.value = null;
+      this.queryParams.deptId = "";
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -543,24 +552,24 @@ export default {
     display: flex;
     justify-content: left;
     .js_name {
-    width: 100%;
-    // height: 40px;
-    line-height: 40px;
-    color: #8c939d;
-    font-size: 14px;
-    // width: 50%;
-    display: flex;
-    align-items: flex-start;
-    b {
-      display: inline-block;
-      width: 86px;
-      // font-weight: normal;
-      // text-align: right;
+      width: 100%;
+      // height: 40px;
+      line-height: 40px;
+      color: #8c939d;
+      font-size: 14px;
+      // width: 50%;
+      display: flex;
+      align-items: flex-start;
+      b {
+        display: inline-block;
+        width: 86px;
+        // font-weight: normal;
+        // text-align: right;
+      }
+      span {
+        color: #333;
+      }
     }
-    span {
-      color: #333;
-    }
-  }
   }
   .js_head {
     text-align: center;

src/views/coupon/index.vue

@@ -11,7 +11,7 @@
       <el-form-item label="名称" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入优惠券名称，可以和活动名称保持一致"
+          placeholder="请输入优惠券名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -21,6 +21,7 @@
           v-model="queryParams.deptId"
           placeholder="请选择"
           style="width: 100px"
+          clearable
         >
           <el-option
             v-for="item in dept"
@@ -36,6 +37,7 @@
           v-model="queryParams.discountType"
           placeholder="请选择"
           style="width: 100px"
+          clearable
         >
           <el-option
             v-for="item in typeState"
@@ -51,6 +53,7 @@
           v-model="queryParams.status"
           placeholder="请选择"
           style="width: 100px"
+          clearable
         >
           <el-option
             v-for="item in serviceState"
@@ -222,17 +225,28 @@
       </el-table-column>
     </el-table>
 
-    <pagination
+    <el-pagination
+      v-show="total > 0"
+      background
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="queryParams.current"
+      :page-size="queryParams.size"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="total"
+    >
+    </el-pagination>
+    <!-- <pagination
       v-show="total > 0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+      :page="queryParams.pageNum"
+      :page-size="queryParams.pageSize"
+      @pagination="getCouponList"
+    /> -->
 
     <!-- 添加或修改优惠券的规则信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="550px" append-to-body>
-      <el-form ref="form" :model="form"  label-width="100px">
+      <el-form ref="form" :model="form" label-width="100px">
         <el-form-item label="部门" v-if="userDeptId == 100">
           <el-select v-model="form.deptName" placeholder="请选择">
             <el-option
@@ -303,7 +317,8 @@
         <el-form-item label="有效天数" prop="termDays">
           <el-input
             v-model="form.termDays"
-            placeholder="请输入优惠券有效期天数，0"
+            placeholder="请输入优惠券有效期天数(最多365天)"
+             oninput="if(value<=0){value=null} if(value>365){value=365} if(value.length > 4){value = Math.ceil(value)}"
           />
         </el-form-item>
         <!-- <el-form-item label="已使用数量" prop="usedNum">
@@ -399,6 +414,7 @@ export default {
         handleWay: 0, //0默认,1新增，2修改,
         discountType: null,
         deptName: null,
+        deptId: null,
       },
       // 表单参数
       form: {},
@@ -454,14 +470,14 @@ export default {
         ],
       },
       serviceState: [
-        { value: 1, label: "启用中" },
+        { value: 1, label: "已启用" },
         { value: 0, label: "停用" },
       ],
       typeState: [
         { value: 2, label: "折扣" },
         { value: 3, label: "满减" },
       ],
-      dept:[]
+      dept: [],
     };
   },
   created() {
@@ -473,6 +489,14 @@ export default {
     this.getDept();
   },
   methods: {
+    handleSizeChange(val) {
+      this.queryParams.size = val;
+      this.getCouponList();
+    },
+    handleCurrentChange(val) {
+      this.queryParams.current = val;
+      this.getCouponList();
+    },
     handleSelectTeam(item) {
       this.form.deptId = item.deptId;
       this.form.deptName = item.deptName;
@@ -483,7 +507,7 @@ export default {
       // data.deptId = deptId;
       // data.nStatus = 0;
       getDept().then((res) => {
-        this.dept = res.data
+        this.dept = res.data;
         this.options = res.data;
 
         // this.jsList = res.data;
@@ -509,25 +533,26 @@ export default {
     },
     //获取优惠券列表
     getCouponList(queryParams) {
-      if (queryParams) {
-        getCoupon(this.queryParams).then((res) => {
-          
-          this.couponList = res.data.records;
-          this.total = res.data.records.length;
-          this.loading = false;
-        });
-      } else {
-        getCoupon().then((res) => {
-          this.couponList = res.data.records;
-          this.total = res.data.records.length;
-          this.loading = false;
-        });
-      }
+      getCoupon(this.queryParams).then((res) => {
+        this.couponList = res.data.records;
+        this.total = res.data.total;
+        this.loading = false;
+      });
+      // if (queryParams) {
+
+      // } else {
+      //   getCoupon().then((res) => {
+      //     this.couponList = res.data.records;
+      //     this.total = res.data.records.length;
+      //     this.loading = false;
+      //   });
+      // }
     },
     // 取消按钮
     cancel() {
       this.open = false;
       this.reset();
+      this.getCouponList();
     },
     // 表单重置
     reset() {
@@ -536,7 +561,7 @@ export default {
         name: null,
         type: null,
         discountType: null,
-        rebValue:null,
+        rebValue: null,
         discountValue: null,
         thresholdAmount: null,
         obtainWay: null,
@@ -559,6 +584,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.deptId = "";
       this.handleQuery();
     },
     // 多选框选中数据
@@ -599,30 +625,30 @@ export default {
         if (this.handleWay == 1) {
           //1新增
           let data = this.form;
-          if(!data.deptName){
+          if (!data.deptName) {
             this.$modal.msgError("优惠券部门不能为空");
-            return
-          }else if(!data.name){
+            return;
+          } else if (!data.name) {
             this.$modal.msgError("优惠券名称不能为空");
-            return
-          }else if(!data.discountType){
+            return;
+          } else if (!data.discountType) {
             this.$modal.msgError("请选择优惠券类型");
-            return
-          }else if(data.discountType == 2 &&!data.rebValue){
+            return;
+          } else if (data.discountType == 2 && !data.rebValue) {
             this.$modal.msgError("优惠券折扣值不能为空");
-            return
-          }else if(data.discountType ==3 && !data.discountValue){
+            return;
+          } else if (data.discountType == 3 && !data.discountValue) {
             this.$modal.msgError("优惠券满减值不能为空");
-            return
-          }else if(!data.thresholdAmount){
+            return;
+          } else if (!data.thresholdAmount) {
             this.$modal.msgError("优惠券门槛金额不能为空");
-            return
-          }else if(!data.termDays){
+            return;
+          } else if (!data.termDays) {
             this.$modal.msgError("优惠券有效天数不能为空");
-            return
-          }else if(data.status == null){
+            return;
+          } else if (data.status == null) {
             this.$modal.msgError("请选择优惠券是否启用");
-            return
+            return;
           }
           // else if(!data.userLimit){
           //   this.$modal.msgError("优惠券限领数量不能为空");
@@ -649,21 +675,6 @@ export default {
             }
           });
         }
-        //   if (valid) {
-        //     if (this.form.id != null) {
-        //       updateCoupon(this.form).then(response => {
-        //         this.$modal.msgSuccess("修改成功");
-        //         this.open = false;
-        //         this.getList();
-        //       });
-        //     } else {
-        //       addCoupon(this.form).then(response => {
-        //         this.$modal.msgSuccess("新增成功");
-        //         this.open = false;
-        //         this.getList();
-        //       });
-        //     }
-        //   }
       });
     },
     /** 删除按钮操作 */
@@ -705,4 +716,12 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+::v-deep {
+  .el-pagination {
+    float: right;
+    padding: 30px 0;
+  }
+}
+</style>
   

src/views/fare/index.vue

@@ -45,6 +45,7 @@
           v-model="queryParams.deptName"
           placeholder="请选择"
           @change="handleSelection"
+          clearable
         >
           <el-option
             v-for="item in options"
@@ -119,11 +120,7 @@
       ></right-toolbar>
     </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="settingList"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="settingList">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="部门名称" align="center" prop="deptName" />
@@ -135,9 +132,8 @@
         prop="additionalFarePer"
       />
       <el-table-column label="是否启用" align="center" prop="enable">
-       
         <template slot-scope="scope">
-            {{ scope.row.enable === 0 ? '已停用' :'已启用 '}}
+          {{ scope.row.enable === 0 ? "已停用" : "已启用 " }}
           <!-- <el-switch
             v-model="scope.row.enable"
             inline-prompt
@@ -200,16 +196,13 @@
           />
         </el-form-item>
         <el-form-item label="城市：">
-          <el-select
-            v-model="form.deptName"
-            placeholder="请选择"
-            @change="handleSelectionChange"
-          >
+          <el-select v-model="form.deptName" placeholder="请选择">
             <el-option
+              @click.native="handleSelectTeam(item)"
               v-for="item in options"
               :key="item.deptId"
               :label="item.deptName"
-              :value="item"
+              :value="item.deptName"
             >
             </el-option>
           </el-select>
@@ -300,24 +293,29 @@ export default {
     this.getDeptList();
   },
   methods: {
+    //选择部门
+    handleSelectTeam(item) {
+      this.form.deptId = item.deptId;
+      this.form.deptName = item.deptName;
+    },
     changeStatus(row) {
-      this.form.additionalFarePer = row.additionalFarePer
-      this.form.baseDistance = row.baseDistance
-      this.form.baseFare = row.baseFare
-      this.form.enable = row.enable
-      this.form.deptId = row.deptId
-      this.form.deptName = row.deptName
-      this.form.id = row.id
+      this.form.additionalFarePer = row.additionalFarePer;
+      this.form.baseDistance = row.baseDistance;
+      this.form.baseFare = row.baseFare;
+      this.form.enable = row.enable;
+      this.form.deptId = row.deptId;
+      this.form.deptName = row.deptName;
+      this.form.id = row.id;
       updateSetting(this.form).then((res) => {
-          if(res.code == 200){
-              this.$modal.msgSuccess("修改成功");
-              this.resetQuery()
-              return true
-          }else{
-              this.$modal.msgError(res.msg);
-              this.resetQuery()
-              return false
-          }
+        if (res.code == 200) {
+          this.$modal.msgSuccess("修改成功");
+          this.resetQuery();
+          return true;
+        } else {
+          this.$modal.msgError(res.msg);
+          this.resetQuery();
+          return false;
+        }
       });
     },
     change(row) {},
@@ -327,11 +325,6 @@ export default {
         this.options = res.data;
       });
     },
-    //选择部门
-    handleSelectionChange(val) {
-      this.form.deptId = val.deptId;
-      this.form.deptName = val.deptName;
-    },
     /** 提交按钮 */
     submitForm() {
       //   this.enable == true ? this.form.enable = 0:this.form.enable = 1
@@ -419,7 +412,7 @@ export default {
     },
     //多选框选中数据
     handleSelection(selection) {
-      this.queryParams.deptId = selection.deptId;
+      // this.queryParams.deptId = selection.deptId;
       //   this.ids = selection.map((item) => item.id);
       //   this.single = selection.length !== 1;
       //   this.multiple = !selection.length;
@@ -434,21 +427,21 @@ export default {
     handleUpdate(row) {
       this.reset();
       this.open = true;
-      this.form.additionalFarePer = row.additionalFarePer
-      this.form.baseDistance = row.baseDistance
-      this.form.baseFare = row.baseFare
-      row.enable == 0 ? this.enable = false : this.enable = true
-      this.form.deptId = row.deptId
-      this.form.deptName = row.deptName
-      this.form.id = row.id
+      this.form.additionalFarePer = row.additionalFarePer;
+      this.form.baseDistance = row.baseDistance;
+      this.form.baseFare = row.baseFare;
+      row.enable == 0 ? (this.enable = false) : (this.enable = true);
+      this.form.deptId = row.deptId;
+      this.form.deptName = row.deptName;
+      this.form.id = row.id;
       this.title = "修改车费设置";
     },
 
     /** 删除按钮操作 */
     handleDelete(row) {
-    //   const ids = row.id || this.ids;
-    let idList = []
-    idList.push(row.id)
+      //   const ids = row.id || this.ids;
+      let idList = [];
+      idList.push(row.id);
       this.$modal
         .confirm('是否确认删除车费设置编号为"' + row.id + '"的数据项？')
         .then(function () {

src/views/index.vue

@@ -22,7 +22,7 @@
       <div class="contrast_data">
         <div class="top">订单量</div>
         <div class="center">
-          {{ upOrderNum.upOrderNum }}
+          {{ upOrderNum.orderNum }}
         </div>
         <!-- <div class="bnottom">{{ order }}%,同上月对比</div> -->
         <div class="bnottom">
@@ -95,7 +95,7 @@
         </div>
       </div>
       <div class="left">
-        <div class="title">技师营业额排名</div>
+        <div class="title">技师完成订单量排名</div>
         <div class="chart_box">
           <el-date-picker
             v-model="value2"

src/views/order/index.vue

@@ -53,6 +53,7 @@
           v-model="queryParams.nStatus"
           placeholder="请选择"
           style="width: 100px"
+          clearable 
         >
           <el-option
             v-for="item in orderStatus"
@@ -635,6 +636,8 @@ export default {
       this.open = true;
       this.title = "详情";
       listOrder(cId).then((response) => {
+        console.log(response.data.records[0]);
+        
         this.form = response.data.records[0];
         let Longitude = this.form.arrivalLongitude;
         let numLatitude = +this.form.arrivalLatitude;

src/views/technician/check/check.vue

@@ -26,7 +26,7 @@
           />
         </el-form-item>
         <el-form-item label="审核状态" prop="nTong">
-          <el-select v-model="queryParams.nTong" placeholder="请选择" style="width: 100px">
+          <el-select v-model="queryParams.nTong" placeholder="请选择" clearable style="width: 100px">
             <el-option
                 v-for="item in auditStatus"
                 :key="item.value"
@@ -46,7 +46,7 @@
           </el-select>
         </el-form-item> -->
         <el-form-item label="性别" prop="nSex">
-          <el-select v-model="queryParams.nSex" placeholder="请选择" style="width: 100px">
+          <el-select v-model="queryParams.nSex" placeholder="请选择" clearable style="width: 100px">
             <el-option
                 v-for="item in sex"
                 :key="item.value"

src/views/technician/details/details.vue

@@ -101,66 +101,72 @@
           </div>
         </div>
       </el-form-item>
-      <el-form-item label="营业执照：">
+      <el-form-item label="健康证照片：">
         <el-upload
           action="#"
           class="avatar-uploader"
-          :http-request="handleBusinessSuccess"
-          :before-upload="beforeBusinessUpload"
+          :http-request="handlehealthSuccess"
+          :before-upload="beforehealthUpload"
           :show-file-list="false"
         >
           <img
-            v-if="jsInfos.businessLicense.length>51"
-            :src="jsInfos.businessLicense"
+            v-if="jsInfos.healthCertificate.length > 51"
+            :src="jsInfos.healthCertificate"
             class="avatar"
           />
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
       </el-form-item>
-      <el-form-item label="无犯罪证明：">
+      <el-form-item label="资格证照片：">
         <el-upload
           action="#"
           class="avatar-uploader"
-          :http-request="handleNocrimeSuccess"
-          :before-upload="beforeNocrimeUpload"
+          :http-request="handlecertificationSuccess"
+          :before-upload="beforecertificationUpload"
           :show-file-list="false"
         >
-          <img v-if="jsInfos.noCrime.length>51" :src="jsInfos.noCrime" class="avatar" />
+          <img
+            v-if="jsInfos.certification.length > 51"
+            :src="jsInfos.certification"
+            class="avatar"
+          />
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
       </el-form-item>
-      <el-form-item label="健康证照片：">
+      <el-form-item label="营业执照：">
         <el-upload
           action="#"
           class="avatar-uploader"
-          :http-request="handlehealthSuccess"
-          :before-upload="beforehealthUpload"
+          :http-request="handleBusinessSuccess"
+          :before-upload="beforeBusinessUpload"
           :show-file-list="false"
         >
           <img
-            v-if="jsInfos.healthCertificate.length>51"
-            :src="jsInfos.healthCertificate"
+            v-if="jsInfos.businessLicense.length > 51"
+            :src="jsInfos.businessLicense"
             class="avatar"
           />
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
       </el-form-item>
-      <el-form-item label="资格证照片：">
+      <el-form-item label="无犯罪证明：">
         <el-upload
           action="#"
           class="avatar-uploader"
-          :http-request="handlecertificationSuccess"
-          :before-upload="beforecertificationUpload"
+          :http-request="handleNocrimeSuccess"
+          :before-upload="beforeNocrimeUpload"
           :show-file-list="false"
         >
           <img
-            v-if="jsInfos.certification.length>51"
-            :src="jsInfos.certification"
+            v-if="jsInfos.noCrime.length > 51"
+            :src="jsInfos.noCrime"
             class="avatar"
           />
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
       </el-form-item>
+
+
       <el-form-item label="评分:">
         <el-input v-model="jsInfos.nStar"></el-input>
       </el-form-item>
@@ -201,9 +207,13 @@
         </el-input>
       </el-form-item>
       <el-form-item label="地址：">
-        <el-input v-model="jsInfos.address" ></el-input>
+        <el-input v-model="jsInfos.name"></el-input>
       </el-form-item>
-      <Map :newAddress="newAddress" :dataObj="addr" @uploadAddress="uploadAddressData" />
+      <Map
+        :newAddress="newAddress"
+        :dataObj="addr"
+        @uploadAddress="uploadAddressData"
+      />
       <!-- <el-form-item label="是否带头像框：" prop="nB1">
         <el-radio-group v-model="jsInfos.nB1">
           <el-radio :label="0">否</el-radio>
@@ -224,15 +234,25 @@
       </el-form-item> -->
 
       <div style="text-align: justify; margin-top: 50px; margin-bottom: 20px">
-        <el-button type="primary" @click="addComplaintShow(jsInfos.id,jsInfos)"
+        <el-button type="primary" @click="addComplaintShow(jsInfos.id, jsInfos)"
           >添加评论</el-button
         >
         <el-button type="primary" @click="work" v-if="jsInfos.nStatus2 == -1"
           >上 岗</el-button
         >
         <el-button type="primary" @click="work" v-else>下 岗</el-button>
-        <el-button type="primary" @click="auditJs(jsInfos.id)" v-if="jsInfos.nTong == 0">审 核</el-button>
-        <el-button type="primary" @click="returnJs(jsInfos.id)"  v-if="jsInfos.nTong == 0">退 回</el-button>
+        <el-button
+          type="primary"
+          @click="auditJs(jsInfos.id)"
+          v-if="jsInfos.nTong == 0"
+          >审 核</el-button
+        >
+        <el-button
+          type="primary"
+          @click="returnJs(jsInfos.id)"
+          v-if="jsInfos.nTong == 0"
+          >退 回</el-button
+        >
         <el-button type="primary" @click="submitForm">修 改</el-button>
         <el-button type="primary" @click="blacklist" v-if="jsInfos.nTong == 3"
           >恢 复</el-button
@@ -266,8 +286,8 @@
           <el-date-picker
             v-model="complainForm.dTime"
             type="datetime"
-            placeholder="选择日期时间"
-            default-time="12:00:00"
+             placeholder="选择日期时间"
+              :picker-options="pickerOptions"
           >
           </el-date-picker>
         </el-form-item>
@@ -296,13 +316,18 @@ import {
   getDept,
 } from "@/api/system/js";
 import { upload } from "@/api/public";
-import Map from '@/components/map/map.vue';
+import Map from "@/components/map/map.vue";
 export default {
   components: {
-    Map
+    Map,
   },
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now()
+        },
+      },
       options: [],
       value: "",
       dialogFormVisible: false,
@@ -321,7 +346,7 @@ export default {
       headimg: "",
       show: false,
       addr: {},
-      newAddress:'太原'
+      newAddress: "太原",
     };
   },
   mounted() {
@@ -331,11 +356,10 @@ export default {
     this.getDept();
   },
   methods: {
-    uploadAddressData(payload){
-      this.jsInfos.latitude =payload.latitude
-      this.jsInfos.longitude =payload.longitude
-      this.jsInfos.address =payload.addressName
-
+    uploadAddressData(payload) {
+      this.jsInfos.latitude = payload.latitude;
+      this.jsInfos.longitude = payload.longitude;
+      this.jsInfos.name = payload.addressName;
     },
     handleSelectionChange(val) {
       this.jsInfos.deptId = val.deptId;
@@ -361,8 +385,8 @@ export default {
       let cOpenId = { id: this.$route.query.id };
       getJs(cOpenId).then((response) => {
         this.jsInfos = response.data;
-        this.addr.lat = response.data.latitude
-        this.addr.lng = response.data.longitude
+        this.addr.lat = response.data.latitude;
+        this.addr.lng = response.data.longitude;
         this.uploadInfos.projects = [];
         this.uploadInfos.cPortrait = response.data.cPortrait;
         this.uploadInfos.businessLicense = response.data.businessLicense;
@@ -386,9 +410,9 @@ export default {
           : (this.jsInfos.businessLicense =
               process.env.VUE_APP_BASE_API + response.data.businessLicense);
         response.data.healthCertificate == ""
-          ? this.jsInfos.healthCertificate = ""
-          : this.jsInfos.healthCertificate =
-              process.env.VUE_APP_BASE_API + response.data.healthCertificate;
+          ? (this.jsInfos.healthCertificate = "")
+          : (this.jsInfos.healthCertificate =
+              process.env.VUE_APP_BASE_API + response.data.healthCertificate);
         response.data.certification == ""
           ? (this.jsInfos.certification = "")
           : (this.jsInfos.certification =
@@ -407,7 +431,6 @@ export default {
             element = process.env.VUE_APP_BASE_API + element;
             imgs.push(element);
           });
-        
         } else {
           imgs = [];
         }
@@ -556,9 +579,9 @@ export default {
         });
       }
     },
-    addComplaintShow(id,jsInfos) {
-      this.complainForm.name = jsInfos.cName
-      this.complainForm.cId = jsInfos.cId
+    addComplaintShow(id, jsInfos) {
+      this.complainForm.name = jsInfos.cName;
+      this.complainForm.cId = jsInfos.cId;
       this.dialogFormVisible = true;
     },
     // 上传身份证图片相关

src/views/technician/technician/index.vue

@@ -47,6 +47,7 @@
           v-model="queryParams.nStatus"
           placeholder="请选择"
           style="width: 100px"
+          clearable 
         >
           <el-option
             v-for="item in serviceState"
@@ -62,6 +63,7 @@
           v-model="queryParams.nSex"
           placeholder="请选择"
           style="width: 100px"
+          clearable 
         >
           <el-option
             v-for="item in sex"

src/views/technician/technicianData/technicianData.vue

@@ -21,7 +21,7 @@
             :picker-options="pickerOptions"
             @change="getList"
             value-format="yyyy-MM-dd"
-            :clearable = "false"
+            :clearable = "true"
           >
           </el-date-picker>
         </el-form-item>