From 1d7a281463430d91c1ffe0e546d85bbc123d34ef Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Wed, 13 Sep 2023 15:10:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/job.js                                     |    6 +-
 src/api/login.js                                   |    3 +-
 src/api/userinfo.js                                |   24 +-
 src/components/FirstJob/components/recommend.vue   |    6 +-
 src/components/FirstJob/detail.vue                 |   91 +-
 src/components/FirstJob/joblist.vue                |   17 +-
 src/components/FirstJob/recordBill.vue             | 2522 +++++++++--------
 src/components/Login/login.vue                     |  776 +++---
 src/components/Login/updatepsw.vue                 |  299 +-
 src/components/main/index.vue                      |  932 +++----
 src/components/memberInfo/memberInfo.vue           |  413 ++-
 .../accountsetting/components/boundtel.vue         |   99 +-
 .../userinfo/accountsetting/components/boundwx.vue |   32 +-
 .../accountsetting/components/loginpsw.vue         |  334 ++-
 src/components/userinfo/accountsetting/inedex.vue  |    8 +-
 .../usercenter/components/dataStatistics.vue       |  650 +++++
 .../userinfo/usercenter/components/mybill.vue      | 2927 ++++++++++----------
 .../userinfo/usercenter/components/townsman.vue    | 1069 ++++---
 src/main-dev.js                                    |   10 +
 src/router/index.js                                |    6 +
 src/style/index.less                               |  274 +-
 src/utils/commonUtil.js                            | 2618 +++++++++--------
 src/utils/request.js                               |    6 +-
 src/views/main.vue                                 |   19 +-
 webpack.config.js                                  |    1 +
 25 files changed, 7032 insertions(+), 6110 deletions(-)
 create mode 100644 src/components/userinfo/usercenter/components/dataStatistics.vue

diff --git a/src/api/job.js b/src/api/job.js
index 0c0f9e5..43fe2f6 100644
--- a/src/api/job.js
+++ b/src/api/job.js
@@ -43,12 +43,10 @@ export function getCityApi(id) {
 }
 // 录单报名
 export function recordBillApi(data) {
-	console.log(data);
-
 	return request({
 		url: "/yishoudan/user/apply/order/addByAgency",
 		method: "post",
-		data,
+		data:data,
 		headers: { "Content-Type": "application/x-www-form-urlencoded" },
 	});
 }
@@ -57,7 +55,7 @@ export function getIdCardInfoApi(data) {
 	return request({
 		url: "/yishoudan/commons/idCardOcrRecognize",
 		method: "post",
-		data,
+		data:setqs(data),
 		headers: { "Content-Type": "multipart/form-data" },
 	});
 }
diff --git a/src/api/login.js b/src/api/login.js
index 7728ae3..c8d3628 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -39,6 +39,7 @@ export function logoutApi() {
 export function updatePswApi(data) {
   return request({
     url: "/yishoudan/updatePassword",
-    data: data,
+    method:'post',
+    data: setqs(data),
   });
 }
diff --git a/src/api/userinfo.js b/src/api/userinfo.js
index 62ae994..60ff2d5 100644
--- a/src/api/userinfo.js
+++ b/src/api/userinfo.js
@@ -100,7 +100,7 @@ export function setUserTelApi(data) {
 	return request({
 		url: "/yishoudan/user/changeTel",
 		// method: "post",
-		data: data,
+		data: setqs(data),
 	});
 }
 // 账号修改绑定银行卡
@@ -135,7 +135,7 @@ export function uploadUserAvatarApi(data) {
 		url: "/yishoudan/user/changeUserImgsrc",
 		method: "post",
 		headers: { "Content-Type": "multipart/form-data" },
-		data: data,
+		data: setqs(data),
 		// data,
 	});
 }
@@ -173,7 +173,7 @@ export function updateTownsmanInfoApi(data) {
 	return request({
 		url: "/user/updateInfo",
 		method: "post",
-		data: data,
+		data: setqs(data),
 	});
 }
 // 我的老乡各个状态统计
@@ -181,7 +181,7 @@ export function gettownsManCountApi(data) {
 	return request({
 		url: "/yishoudan/agency/user/listStatistics",
 		method: "post",
-		data: data,
+		data: setqs(data),
 	});
 }
 // 成员管理:获取成员列表
@@ -189,7 +189,7 @@ export function getMemberListApi(data) {
 	return request({
 		url: "/yishoudan/user/getAgencyCorpUsers",
 		method: "post",
-		data: data,
+		data: setqs(data),
 	});
 }
 // 成员管理:删除成员
@@ -197,7 +197,7 @@ export function deleteMemberApi(data) {
 	return request({
 		url: "/yishoudan/user/delAgencyCorpUser",
 		method: "post",
-		data: data,
+		data: setqs(data),
 	});
 }
 
@@ -206,6 +206,16 @@ export function addMemberApi(data) {
 	return request({
 		url: "/yishoudan/user/addAgencyUser",
 		method: "post",
-		data: data,
+		data: setqs(data),
 	});
 }
+// 数据统计列表获取
+export function dataStatisticsListApi(data) {
+	return request({
+		url: "/yishoudan/statistics/agency/team",
+		method: "post",
+		// headers: { "Content-Type": "multipart/form-data" },
+		data: setqs(data),
+		// data,
+	});
+}
\ No newline at end of file
diff --git a/src/components/FirstJob/components/recommend.vue b/src/components/FirstJob/components/recommend.vue
index d2dbefc..badd4da 100644
--- a/src/components/FirstJob/components/recommend.vue
+++ b/src/components/FirstJob/components/recommend.vue
@@ -108,9 +108,9 @@ export default {
         this.relationList = disposeJobListData(data.data.recordList)
 
         console.log(this.relationList)
-        this.relationList.forEach((item) => {
-          item.age = ''
-        })
+        // this.relationList.forEach((item) => {
+        //   item.age = ''
+        // })
         // this.$emit("update:relationList", this.relationList);
       } catch (error) {
         console.log(error)
diff --git a/src/components/FirstJob/detail.vue b/src/components/FirstJob/detail.vue
index ed2fa3b..33a111d 100644
--- a/src/components/FirstJob/detail.vue
+++ b/src/components/FirstJob/detail.vue
@@ -209,7 +209,7 @@
               <div id="swiper">
                 <div class="swiper-wrapper">
                   <div class="swiper-slide" v-for="(item, index) in [...storeImage]" :key="index">
-                    <img :src="item" alt />
+                    <img :src="item" alt @click="showImage(index)" style="cursor:pointer"/>
                   </div>
                 </div>
               </div>
@@ -565,7 +565,7 @@
                 <div class="mb12 mt20">其他信息</div>
                 <div style="white-space: break-spaces">{{ jobDetail.otherInfo || "-" }}</div>
               </div>-->
-              <div class="required" id="required">
+              <div class="required" id="abutment">
                 <div class="mb12 mt20">对接信息</div>
                 <a-descriptions bordered size="small" :column="1" class="leftDesc">
                   <a-descriptions-item class="test1">
@@ -578,12 +578,12 @@
                   </a-descriptions-item>
                   <a-descriptions-item class="test1">
                     <span slot="label" class>宿舍地址</span>
-                    <span>{{jobPoses.room.posContent ? jobPoses.room.posContent  : '-'}}</span>
+                    <span>{{jobPoses.room.posContent ? jobPoses.room.posContent : '-'}}</span>
                   </a-descriptions-item>
-                  <a-descriptions-item class="test1">
+                  <!-- <a-descriptions-item class="test1">
                     <span slot="label" class>总包驻场</span>
                     <span>{{jobDetail.onSiteInfo || '-'}}</span>
-                  </a-descriptions-item>
+                  </a-descriptions-item>-->
                   <a-descriptions-item class="test1">
                     <span slot="label" class>面试说明</span>
                     <span>{{jobDetail.interviewDesp || '-'}}</span>
@@ -605,19 +605,19 @@
               <a-anchor-link href="#required" title="要求" />
               <a-anchor-link href="#contentspecial" title="岗位" />
               <a-anchor-link href="#condition" title="吃住" />
-              <a-anchor-link href="#other" title="对接" />
+              <a-anchor-link href="#abutment" title="对接" />
             </a-anchor>
           </div>
 
           <!-- 财务结算 -->
           <div v-else-if="tabchange == 0">
-            <div class="pay" id="tip">
+            <!-- <div class="pay" id="tip">
               <div class="mb12 mt20 titlestyle">代理须知</div>
               <div class="showInfo" style="width: 640px">{{ jobDetail.agencyStatement || "-" }}</div>
-            </div>
+            </div>-->
             <a-descriptions bordered size="small" :column="1" class="leftDesc mt20" style="width: 900px">
               <a-descriptions-item class="test1">
-                <span slot="label" class>代理利润</span>
+                <span slot="label" class>服务费详情</span>
                 <span>{{ jobDetail.agencyProfit || "-" }}</span>
               </a-descriptions-item>
               <!-- <a-descriptions-item>
@@ -633,11 +633,17 @@
                 <span>{{ jobDetail.paymentCycle }}</span>
               </a-descriptions-item>-->
               <a-descriptions-item>
-                <span slot="label" class>出名单</span>
+                <span slot="label">
+                  <div class="c6">账单日</div>
+                  <div class="c6">{{'(出名单时间)'}}</div>
+                </span>
                 <span>{{ jobDetail.outListTime || "-" }}</span>
               </a-descriptions-item>
               <a-descriptions-item>
-                <span slot="label" class>结算时间</span>
+                <span slot="label" class>
+                  <div class="c6">结算日</div>
+                  <div class="c6">{{'(结算时间)'}}</div>
+                </span>
                 <span>{{ jobDetail.settlementTime || "-" }}</span>
               </a-descriptions-item>
             </a-descriptions>
@@ -709,11 +715,39 @@ import { disposeJobListData, getSalaryClassifyValue } from '../../utils/commonUt
 import recommend from '../../components/FirstJob/components/recommend.vue'
 import { nationlist } from '../../utils/datalist'
 import 'swiper/dist/css/swiper.css'
+import Vue from 'vue'
+import Viewer from 'v-viewer'
+import 'viewerjs/dist/viewer.css'
 import swiper from 'swiper'
 import GDMap from '../map.vue'
 // import recordbill from "@/components/FirstJob/components/recordbill.vue";
 import Clipboard from 'clipboard'
 // import map from '../map.vue'
+Vue.use(Viewer, {
+  defaultOptions: {
+    // 需要配置的属性
+    toolbar: {
+      zoomIn: true,
+      zoomOut: true,
+      oneToOne: false,
+      reset: false,
+      prev: true,
+      play: {
+        show: true,
+        size: 'large',
+      },
+      next: true,
+      rotateLeft: true,
+      rotateRight: true,
+      flipHorizontal: false,
+      flipVertical: false,
+    },
+    title: false,
+    navbar: false,
+    initialViewIndex: 1,
+    isMeetting: false,
+  },
+})
 export default {
   // 组件名称
   name: '',
@@ -744,6 +778,7 @@ export default {
       skeletonshow: true,
       tabchange: 1,
       nationlist,
+      imgList:[], // 预览图片列表
       labelColor: ['pink', 'blue', 'purple', 'orange', 'green', 'cyan', 'red', 'purple'],
       form: {
         // 录单数据
@@ -948,6 +983,33 @@ export default {
     getSalaryClassifyValue(salaryClassify, salaryClassifyValue) {
       return getSalaryClassifyValue(salaryClassify, salaryClassifyValue)
     },
+    /**
+     *  图片预览点击
+     *
+     *
+     */
+    showImage(idx) {
+      var that = this
+      console.log( that.storeImage);
+      that.storeImage.forEach((item, index) => {
+        if (that.isImg(item)) {
+          that.imgList.push(item)
+        }
+      })
+
+      this.$viewerApi({
+        options: { initialViewIndex: idx },
+        images: this.imgList,
+      })
+
+      // }
+    },
+    isImg(str) {
+      console.log(str);
+      let regs = /\.(jpg|jpeg|png)(\?.*)?$/
+      return regs.test(str)
+    },
+
     copyText() {
       console.log(123)
       var clipboard = new Clipboard('.copy', {
@@ -978,7 +1040,7 @@ export default {
 
 <style scoped lang="less">
 .detail-container {
-  overflow: hidden;
+  // overflow: hidden;
   // border-top: 1px solid #eeefef;
 
   // background-color: #f6f6f6;
@@ -1384,7 +1446,7 @@ export default {
         justify-content: space-between;
         font-size: 18px;
         // margin-bottom: 20px;
-        >span {
+        > span {
           font-size: 14px;
           color: #ff4400;
           text-decoration: underline;
@@ -1684,10 +1746,11 @@ export default {
     }
   }
   .leftDesc.ant-descriptions-bordered .ant-descriptions-item-label {
-    width: 104px;
+    width: 124px;
     text-align: center;
     font-weight: normal;
     background-color: #fff;
+    padding: 8px 0;
     font-size: 16px;
     color: #666;
     letter-spacing: 1px;
diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue
index 36705a3..16b403f 100644
--- a/src/components/FirstJob/joblist.vue
+++ b/src/components/FirstJob/joblist.vue
@@ -799,8 +799,23 @@ export default {
       //   }
       // } else
       console.log(typeof this.searchValue.trim())
+      // this.formvalue = {
+      //   // 筛选的上传参数
+      //   district: [], // 城镇数据
+      //   monthlyPayStr: [], // 每月工资
+      //   ageStr: '', // 年龄数据
+      //   jobSpecialLabelIds: [], // 特色标签索引
+      //   aliasName: '',
+      //   sex: [],
+      //   pageNum: 1,
+      //   pageSize: 8,
+      //   total: null, //分页配置
+      // }
+      this.formvalue.aliasName = ''
+      this.formvalue.ageStr = ''
       if (this.searchValue.trim() !== '') {
         this.formvalue.pageNum = 1
+        console.log(this.searchValue)
         if (typeof +this.searchValue.trim() == 'number' && !isNaN(+this.searchValue.trim())) {
           this.formvalue.ageStr = this.searchValue.trim()
         } else {
@@ -1371,7 +1386,7 @@ export default {
     hideFilterContent() {
       setTimeout(() => {
         let fileterContent = document.querySelector('.filter-content')
-        console.log(fileterContent)
+        // console.log(fileterContent)
         // fileterContent.style.transition = 'all .2s'
         if (this.filterStatus == 0) {
           console.log('is in the 0 zone')
diff --git a/src/components/FirstJob/recordBill.vue b/src/components/FirstJob/recordBill.vue
index 25d7206..bfa4f6c 100644
--- a/src/components/FirstJob/recordBill.vue
+++ b/src/components/FirstJob/recordBill.vue
@@ -1,31 +1,31 @@
 <template>
-	<div class="recordBill-container w">
-		<!-- 面包屑 -->
-		<a-breadcrumb class="w">
-			<a-breadcrumb-item href="">
-				<router-link to="/main">
-					<a-icon type="home" />
-				</router-link>
-			</a-breadcrumb-item>
-			<a-breadcrumb-item href="">
-				<a @click="toList">
-					<span>一手职位</span>
-				</a>
-			</a-breadcrumb-item>
-			<a-breadcrumb-item>
-				<router-link :to="'/detail?' + 'id=' + firminfo.id + '&' + 'page=' + firminfo.currentPageNum">
-					<!-- <span @click="$router.back(-1)">企业详情</span> -->
-					<span>企业详情</span>
-				</router-link>
-			</a-breadcrumb-item>
-			<a-breadcrumb-item href="">
-				<span>报名</span>
-			</a-breadcrumb-item>
-		</a-breadcrumb>
-		<div class="content">
-			<a-form-model ref="ruleForm" :model="form" :colon="true" :rules="rules">
-				<a-form-model-item ref="proxy" label="代理" prop="" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }" style="height: 30px; margin-bottom: 18px">
-					<!-- <a-input
+  <div class="recordBill-container w">
+    <!-- 面包屑 -->
+    <a-breadcrumb class="w">
+      <a-breadcrumb-item href>
+        <router-link to="/main">
+          <a-icon type="home" />
+        </router-link>
+      </a-breadcrumb-item>
+      <a-breadcrumb-item href>
+        <a @click="toList">
+          <span>一手职位</span>
+        </a>
+      </a-breadcrumb-item>
+      <a-breadcrumb-item>
+        <router-link :to="'/detail?' + 'id=' + firminfo.id + '&' + 'page=' + firminfo.currentPageNum">
+          <!-- <span @click="$router.back(-1)">企业详情</span> -->
+          <span>企业详情</span>
+        </router-link>
+      </a-breadcrumb-item>
+      <a-breadcrumb-item href>
+        <span>报名</span>
+      </a-breadcrumb-item>
+    </a-breadcrumb>
+    <div class="content">
+      <a-form-model ref="ruleForm" :model="form" :colon="true" :rules="rules">
+        <a-form-model-item ref="proxy" label="代理" prop :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }" style="height: 30px; margin-bottom: 18px">
+          <!-- <a-input
             :value="
               proxyinfo.userName !== '' &&
               proxyinfo.userName !== null &&
@@ -34,85 +34,68 @@
                 : proxyinfo.tel
             "
             :disabled="true"
-          /> -->
-					<div class="pzbox" style="width: 100%">
-						<span v-if="proxyStatus === ''"> {{ proxyinfo.userName !== "" && proxyinfo.userName !== null && proxyinfo.userName !== undefined ? proxyinfo.userName : proxyinfo.tel }}</span>
-						<a-select v-if="proxyStatus === 'proxy'" mode="combobox" auto-focus style="width: calc(100% - 200px)" placeholder="请选择代理" @blur="proxyStatus = ''">
-							<a-select-option v-for="i in proxyList" :key="i.userName" @click="proxyChange(i)">
-								{{ i.userName }}
-							</a-select-option>
-						</a-select>
-						<span
-							@click="proxyStatus = 'proxy'"
-							:style="{
+          />-->
+          <div class="pzbox" style="width: 100%">
+            <span v-if="proxyStatus === ''">{{ proxyinfo.userName !== "" && proxyinfo.userName !== null && proxyinfo.userName !== undefined ? proxyinfo.userName : proxyinfo.tel }}</span>
+            <a-select v-if="proxyStatus === 'proxy'" mode="combobox" auto-focus style="width: calc(100% - 200px)" placeholder="请选择代理" @blur="proxyStatus = ''">
+              <a-select-option v-for="i in proxyList" :key="i.userName" @click="proxyChange(i)">{{ i.userName }}</a-select-option>
+            </a-select>
+            <span @click="proxyStatus = 'proxy'" :style="{
 								color: '#ff4400',
 								marginLeft: '10px',
 								cursor: 'pointer',
-							}"
-							v-if="isMaster && proxyStatus !== 'proxy'"
-							>修改</span
-						>
-					</div>
-				</a-form-model-item>
-				<a-form-model-item ref="username" label="报名企业" prop="username" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }" style="height: 30px; margin-bottom: 18px">
-					<!-- <a-input :value="firminfo.aliasName" :disabled="true" /> -->
-					<div class="pzbox" style="width: 100%">
-						<span v-if="storeStatus === ''">{{ firminfo.aliasName }}</span>
-						<a-select v-if="storeStatus === 'store'" show-search auto-focus mode="combobox" placeholder="请选择企业" style="width: calc(100% - 200px)" :default-active-first-option="false" :show-arrow="false" :filter-option="false" :not-found-content="null" @search="storeSearch" @blur="storeStatus = ''">
-							<a-select-option v-for="i in storeList" :key="i.id + ''" @click="storeChange(i)">
-								{{ i.aliasName }}
-							</a-select-option>
-						</a-select>
-						<span
-							@click="storeStatus = 'store'"
-							:style="{
+							}" v-if="isMaster && proxyStatus !== 'proxy'">修改</span>
+          </div>
+        </a-form-model-item>
+        <a-form-model-item ref="username" label="报名企业" prop="username" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }" style="height: 30px; margin-bottom: 18px">
+          <!-- <a-input :value="firminfo.aliasName" :disabled="true" /> -->
+          <div class="pzbox" style="width: 100%">
+            <span v-if="storeStatus === ''">{{ firminfo.aliasName }}</span>
+            <a-select v-if="storeStatus === 'store'" show-search auto-focus mode="combobox" placeholder="请选择企业" style="width: calc(100% - 200px)" :default-active-first-option="false" :show-arrow="false" :filter-option="false" :not-found-content="null" @search="storeSearch" @blur="storeStatus = ''">
+              <a-select-option v-for="i in storeList" :key="i.id + ''" @click="storeChange(i)">{{ i.aliasName }}</a-select-option>
+            </a-select>
+            <span @click="storeStatus = 'store'" :style="{
 								color: '#ff4400',
 								marginLeft: '10px',
 								cursor: 'pointer',
-							}"
-							v-if="isMaster && storeStatus !== 'store'"
-							>修改</span
-						>
-					</div>
-				</a-form-model-item>
-				<a-form-model-item ref="username" label="岗位" prop="username" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }" style="height: 30px">
-					<!-- <a-input :value="firminfo.jobName" :disabled="true" /> -->
-					<div class="pzbox" style="width: 100%">
-						<span v-if="jobnameStatus === ''">{{ firminfo.jobName }}</span>
-						<a-select v-if="jobnameStatus === 'jobname'" show-search auto-focus placeholder="请选择岗位" option-filter-prop="children" style="width: 200px" @blur="jobnameStatus = ''">
-							<a-select-option v-for="i in storeJobList" :key="i.id" @click="storeJobChange(i)">
-								{{ i.aliasName }}
-							</a-select-option>
-						</a-select>
-						<span
-							@click="selected"
-							:style="{
+							}" v-if="isMaster && storeStatus !== 'store'">修改</span>
+          </div>
+        </a-form-model-item>
+        <a-form-model-item ref="username" label="岗位" prop="username" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }" style="height: 30px">
+          <!-- <a-input :value="firminfo.jobName" :disabled="true" /> -->
+          <div class="pzbox" style="width: 100%">
+            <span v-if="jobnameStatus === ''">{{ firminfo.jobName }}</span>
+            <a-select v-if="jobnameStatus === 'jobname'" show-search auto-focus placeholder="请选择岗位" option-filter-prop="children" style="width: 200px" @blur="jobnameStatus = ''">
+              <a-select-option v-for="i in storeJobList" :key="i.id" @click="storeJobChange(i)">{{ i.aliasName }}</a-select-option>
+            </a-select>
+            <span @click="selected" :style="{
 								color: '#ff4400',
 								marginLeft: '10px',
 								cursor: 'pointer',
-							}"
-							v-if="isMaster && jobnameStatus !== 'jobname'"
-							>修改</span
-						>
-					</div>
-				</a-form-model-item>
-				<a-form-model-item class="time-input" ref="interviewTime" label="面试时间" prop="interviewTime" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
-					<timepicker :isShow.sync="isShow" :datetime.sync="form.interviewTime"></timepicker>
-					<a-input class="pt1" v-model="form.interviewTime" placeholder="请选择面试时间" @input="verify" allowClear @click="getDateinfo"><i class="iconfont icon-rili" slot="suffix" @click="getDateinfo"></i></a-input>
-				</a-form-model-item>
-				<a-form-model-item style="margin-top: 12px" class="time-input" ref="receptionTime" label="接待时间" prop="receptionTime" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
-					<timepicker :isShow.sync="isShow1" :datetime.sync="form.receptionTime"></timepicker>
-					<a-input class="pt1" v-model="form.receptionTime" placeholder="请选择接待时间" @input="verify1" allowClear @click="getDateinfo1"><i class="iconfont icon-rili" slot="suffix" @click="getDateinfo1"></i></a-input>
-				</a-form-model-item>
-				<a-row>
-					<a-col :span="20">
-						<a-form-model-item ref="idCard" label="身份证号" prop="idCard" :wrapperCol="{ span: 16 }" :labelCol="{ span: 5 }">
-							<a-input v-model="form.idCard" @change="getIdInfo($event)" placeholder="请输入老乡身份证号" :max-length="18" />
-						</a-form-model-item>
-					</a-col>
-					<a-col :span="4" class="idCardUpload">
-						<a-upload :customRequest="customRequestFun" list-type="picture-card" :file-list="fileList" @change="handleChange" @preview="handlePreview" style="margin-left: -50px" :beforeUpload="beforeUpload" :data="dataObj">
-							<!-- <div
+							}" v-if="isMaster && jobnameStatus !== 'jobname'">修改</span>
+          </div>
+        </a-form-model-item>
+        <a-form-model-item class="time-input" ref="interviewTime" label="面试时间" prop="interviewTime" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
+          <timepicker :isShow.sync="isShow" :datetime.sync="form.interviewTime"></timepicker>
+          <a-input class="pt1" v-model="form.interviewTime" placeholder="请选择面试时间" @input="verify" allowClear @click="getDateinfo">
+            <i class="iconfont icon-rili" slot="suffix" @click="getDateinfo"></i>
+          </a-input>
+        </a-form-model-item>
+        <a-form-model-item style="margin-top: 12px" class="time-input" ref="receptionTime" label="接待时间" prop="receptionTime" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
+          <timepicker :isShow.sync="isShow1" :datetime.sync="form.receptionTime"></timepicker>
+          <a-input class="pt1" v-model="form.receptionTime" placeholder="请选择接待时间" @input="verify1" allowClear @click="getDateinfo1">
+            <i class="iconfont icon-rili" slot="suffix" @click="getDateinfo1"></i>
+          </a-input>
+        </a-form-model-item>
+        <a-row>
+          <a-col :span="20">
+            <a-form-model-item ref="idCard" label="身份证号" prop="idCard" :wrapperCol="{ span: 16 }" :labelCol="{ span: 5 }">
+              <a-input v-model="form.idCard" @change="getIdInfo($event)" placeholder="请输入老乡身份证号" :max-length="18" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="4" class="idCardUpload">
+            <a-upload :customRequest="customRequestFun" list-type="picture-card" :file-list="fileList" @change="handleChange" @preview="handlePreview" style="margin-left: -50px" :beforeUpload="beforeUpload" :data="dataObj">
+              <!-- <div
                 v-if="fileList.length < 1"
                 style="
                   display: flex;
@@ -122,921 +105,912 @@
               >
                 <a-icon type="upload" />
                 <div class="ant-upload-text">上传证件</div>
-              </div> -->
-							<!-- <img
+              </div>-->
+              <!-- <img
                 v-if="form.idCardImageUrl"
                 :src="form.idCardImageUrl"
                 alt="avatar"
-              /> -->
-							<div v-if="fileList.length == 0" style="display: flex; justify-content: center; align-items: center" class="nloding">
-								<a-icon type="plus" />
-								<div class="ant-upload-text">上传证件</div>
-							</div>
-						</a-upload>
-						<div v-if="loading" style="display: flex; justify-content: center; align-items: center" class="uploading">
-							<a-icon :type="loading ? 'loading' : 'plus'" style="margin-right: 10px" />
-							<div class="ant-upload-text">上传中</div>
-						</div>
-						<i class="iconfont icon-guanbi" v-if="fileList.length !== 0 && !loading" @click="fileList = []"></i>
-					</a-col>
-				</a-row>
-				<a-row class="specialbox">
-					<a-col :span="12">
-						<a-form-model-item ref="userName" label="姓名" prop="userName" :wrapperCol="{ span: 15 }" :labelCol="{ span: 8 }">
-							<a-input v-model="form.userName" placeholder="请输入老乡姓名" class="special-input" />
-						</a-form-model-item>
-					</a-col>
-					<a-col :span="12">
-						<a-form-model-item ref="sex" label="性别" prop="sex" :wrapperCol="{ span: 18 }" :labelCol="{ span: 5 }">
-							<a-radio-group v-model="form.sex" defaultValue="nan" class="radiobox">
-								<a-radio value="1"> 男 </a-radio>
-								<a-radio value="2"> 女 </a-radio>
-							</a-radio-group>
-						</a-form-model-item>
-					</a-col>
-				</a-row>
-				<a-row>
-					<a-col :span="12">
-						<!-- :offset="2" -->
-						<a-form-model-item ref="age" label="年龄" prop="age" :wrapperCol="{ span: 15 }" :labelCol="{ span: 8 }">
-							<a-input v-model="form.age" placeholder="请输入年龄" class="special-input" />
-						</a-form-model-item>
-					</a-col>
-					<a-col :span="12">
-						<a-form-model-item ref="peoplecard" label="民族" prop="peoplecard" :wrapperCol="{ span: 15 }" :labelCol="{ span: 5 }">
-							<a-select v-model="form.nation" placeholder="请选择民族" class="special-input">
-								<a-select-option v-for="item in nationlist" :key="item.id" :value="item.name">{{ item.name }}</a-select-option>
-							</a-select>
-						</a-form-model-item>
-					</a-col>
-				</a-row>
-				<a-form-model-item ref="tel" label="电话" prop="tel" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }" style="margin-bottom: 18px">
-					<a-input v-model="form.tel" placeholder="请输入电话号" :max-length="11" />
-				</a-form-model-item>
-				<a-form-model-item ref="peoplecard" label="家庭住址" prop="peoplecard" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
-					<a-input v-model="form.address" placeholder="请输入家庭住址" />
-				</a-form-model-item>
-				<!-- <a-form-model-item ref="username" label="模式" prop="username">
+              />-->
+              <div v-if="fileList.length == 0" style="display: flex; justify-content: center; align-items: center" class="nloding">
+                <a-icon type="plus" />
+                <div class="ant-upload-text">上传证件</div>
+              </div>
+            </a-upload>
+            <div v-if="loading" style="display: flex; justify-content: center; align-items: center" class="uploading">
+              <a-icon :type="loading ? 'loading' : 'plus'" style="margin-right: 10px" />
+              <div class="ant-upload-text">上传中</div>
+            </div>
+            <i class="iconfont icon-guanbi" v-if="fileList.length !== 0 && !loading" @click="fileList = []"></i>
+          </a-col>
+        </a-row>
+        <a-row class="specialbox">
+          <a-col :span="12">
+            <a-form-model-item ref="userName" label="姓名" prop="userName" :wrapperCol="{ span: 15 }" :labelCol="{ span: 8 }">
+              <a-input v-model="form.userName" placeholder="请输入老乡姓名" class="special-input" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-model-item ref="sex" label="性别" prop="sex" :wrapperCol="{ span: 18 }" :labelCol="{ span: 5 }">
+              <a-radio-group v-model="form.sex" defaultValue="nan" class="radiobox">
+                <a-radio value="1">男</a-radio>
+                <a-radio value="2">女</a-radio>
+              </a-radio-group>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="12">
+            <!-- :offset="2" -->
+            <a-form-model-item ref="age" label="年龄" prop="age" :wrapperCol="{ span: 15 }" :labelCol="{ span: 8 }">
+              <a-input v-model="form.age" placeholder="请输入年龄" class="special-input" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-model-item ref="peoplecard" label="民族" prop="peoplecard" :wrapperCol="{ span: 15 }" :labelCol="{ span: 5 }">
+              <a-select v-model="form.nation" placeholder="请选择民族" class="special-input">
+                <a-select-option v-for="item in nationlist" :key="item.id" :value="item.name">{{ item.name }}</a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+        <a-form-model-item ref="tel" label="电话" prop="tel" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }" style="margin-bottom: 18px">
+          <a-input v-model="form.tel" placeholder="请输入电话号" :max-length="11" />
+        </a-form-model-item>
+        <a-form-model-item ref="peoplecard" label="家庭住址" prop="peoplecard" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
+          <a-input v-model="form.address" placeholder="请输入家庭住址" />
+        </a-form-model-item>
+        <!-- <a-form-model-item ref="username" label="模式" prop="username">
           <a-select v-model="form.pattern" placeholder="请选择民族">
             <a-select-option :value="apply.id">{{ apply.id }}</a-select-option>
           </a-select>
-        </a-form-model-item> -->
-				<a-form-model-item ref="policy" label="政策" prop="policy" class="policyContainer" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
-					<!-- <a-input v-model="form.policy" type='textarea'/> -->
-					<div class="policy" style="min-height: 30px !important">
-						{{ form.policy }}
-					</div>
-					<div class="openContral" v-if="isContainerShow"><span v-if="isFold" @click="toFold(1)">展开</span><span v-else @click="toFold(2)">收起</span></div>
-				</a-form-model-item>
-				<a-form-model-item ref="headerUploadRef" label="附件" prop="peoplecard" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
-					<a-upload
-						:customRequest="customRequestFun2"
-						multiple
-						list-type="picture"
-						:default-file-list="fileList2"
-						class="upload-list-inline"
-						@change="handleChange2"
-						:remove="
+        </a-form-model-item>-->
+        <a-form-model-item ref="policy" label="政策" prop="policy" class="policyContainer" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
+          <!-- <a-input v-model="form.policy" type='textarea'/> -->
+          <div class="policy" style="min-height: 30px !important">{{ form.policy }}</div>
+          <div class="openContral" v-if="isContainerShow">
+            <span v-if="isFold" @click="toFold(1)">展开</span>
+            <span v-else @click="toFold(2)">收起</span>
+          </div>
+        </a-form-model-item>
+
+        <a-form-model-item ref="desp" style="margin-bottom:12px;" label="备注" prop="desp" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
+          <a-textarea v-model="form.desp" placeholder="请输入备注" :auto-size="{ minRows: 2, maxRows: 5 }" />
+        </a-form-model-item>
+
+        <a-form-model-item ref="headerUploadRef" label="附件" prop="peoplecard" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
+          <a-upload :customRequest="customRequestFun2" multiple list-type="picture" :default-file-list="fileList2" class="upload-list-inline" @change="handleChange2" :remove="
 							(file) => {
 								removeFile(file, 'header');
 							}
-						"
-						@preview="handlePreview"
-						:beforeUpload="beforeUpload"
-						:data="dataObj"
-					>
-						<a-button> <a-icon type="upload" /> 上传 </a-button>
-					</a-upload>
-				</a-form-model-item>
-			</a-form-model>
-			<div class="upline">
-				<div>
-					<a-button
-						type="primary"
-						@click="onClose"
-						:style="{
+						" @preview="handlePreview" :beforeUpload="beforeUpload" :data="dataObj">
+            <a-button>
+              <a-icon type="upload" />上传
+            </a-button>
+          </a-upload>
+        </a-form-model-item>
+      </a-form-model>
+      <div class="upline">
+        <div>
+          <a-button type="primary" @click="onClose" :style="{
 							color: '#666',
 							backgroundColor: '#fafafa',
 							borderColor: '#ddd',
 							boxShadow: 'none',
 							textShadow: 'none',
-						}"
-					>
-						取消
-					</a-button>
-					<a-button style="margin-left: 10px; color: #fff; background-color: #ff4400; border-color: #ff4400" @click="handleOk" :loading="confirmLoading"> 提交 </a-button>
-				</div>
-			</div>
-		</div>
-		<a-modal title="预览" :visible="previewVisible" :footer="null" @cancel="previewVisible = false">
-			<img alt="example" :src="form.idCardImageUrl" />
-		</a-modal>
-	</div>
+						}">取消</a-button>
+          <a-button style="margin-left: 10px; color: #fff; background-color: #ff4400; border-color: #ff4400" @click="handleOk" :loading="confirmLoading">提交</a-button>
+        </div>
+      </div>
+    </div>
+    <a-modal title="预览" :visible="previewVisible" :footer="null" @cancel="previewVisible = false">
+      <img alt="example" :src="form.idCardImageUrl" />
+    </a-modal>
+  </div>
 </template>
 <script>
-import { nationlist } from "../../utils/datalist";
+import { nationlist } from '../../utils/datalist'
 // import recordbill from "@/components/FirstJob/components/recordbill.vue";
-import moment from "moment";
-import { isEmptyCheck, getAgeFromBirthday } from "../../utils/commonUtil";
-import timepicker from "./components/timepicker.vue";
-import { recordBillApi, getProxyInfoApi, getStoreAliasApi, getStoreJobApi, getPolicyByJobIdApi } from "@/api/job";
-import request from "@/utils/request";
-import qs from 'qs' 
+import moment from 'moment'
+import { isEmptyCheck, getAgeFromBirthday } from '../../utils/commonUtil'
+import timepicker from './components/timepicker.vue'
+import { recordBillApi, getProxyInfoApi, getStoreAliasApi, getStoreJobApi, getPolicyByJobIdApi } from '@/api/job'
+import request from '@/utils/request'
+import qs from 'qs'
 // import axios from "axios";
-import $ from "jquery";
+import $ from 'jquery'
 // import axiosUpload from "axios";
 export default {
-	inject: ["reload"],
-	// 组件名称
-	name: "recordBill",
-	// 局部注册的组件
-	components: {
-		// recordbill,
-		timepicker,
-	},
-	// 组件参数 接收来自父组件的数据
-	props: {},
-	// 组件状态值
-	data() {
-		return {
-			fileList2: [],
-			fileListT2: [],
-			// facetimedate: "",
-			previewVisible: false,
-			proxyStatus: "", // 代理选择的控制
-			storeStatus: "", // 企业选择的控制
-			jobnameStatus: "", // 岗位选择的控制
-			isContainerShow: false, // 政策展示控制按钮是否显示
-			isFold: true,
-			previewImage: "",
-			isMaster: true,
-			isShow: false,
-			isShow1: false,
-			nationlist,
-			moment,
-			loading: false,
-			confirmLoading: false,
-			fetching: false,
-			proxyList: [],
-			storeList: [],
-			storeJobList: [],
-			userinfo: {},
-			fileList: [],
-			dataObj: {
-				policy: "",
-				signature: "",
-				key: "",
-				ossaccessKeyId: "",
-				dir: "",
-				host: "",
-				// callback:'',
-			},
-			rules: {
-				// 录单校验规则
-				interviewTime: [
-					{
-						required: true,
-						message: "请选择面试时间",
-						trigger: "blur",
-					},
-				],
-				userName: [
-					{
-						required: true,
-						message: "请输入姓名",
-						trigger: "blur",
-					},
-					{
-						pattern:
-							// /^((?![\u3000-\u303F])[\u2E80-\uFE4F]|·)*(?![\u3000-\u303F])[\u2E80-\uFE4F](·)*$/, // 姓名校验规则
-							/^(((?![\u3000-\u303F])[\u2E80-\uFE4F]|·)*(?![\u3000-\u303F])[\u2E80-\uFE4F][^·]{1,12})$/, // 姓名校验规则
-						message: "请输入正确的姓名",
-						trigger: "blur",
-					},
-				],
-				sex: [
-					{
-						required: true,
-						message: "请选择性别",
-						trigger: "change",
-					},
-				],
-				age: [
-					{
-						required: true,
-						message: "请输入年龄",
-						trigger: "blur",
-					},
-					{
-						pattern: /^\d{2}$/,
-						message: "请输入正确的年龄",
-						trigger: "blur",
-					},
-				],
-				idCard: [
-					// {
-					//   required: true,
-					//   message: "请输入年龄",
-					//   trigger: "blur",
-					// },
-					{
-						min: 18,
-						max: 18,
-						message: "请输入正确的身份证号",
-						trigger: "blur",
-					},
-				],
-				tel: [
-					//   {
-					//   required: true,
-					//   message: "请输入年龄",
-					//   trigger: "blur",
-					// },
-					{
-						pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
-						message: "请输入正确的手机号",
-						trigger: "blur",
-					},
-				],
-				// tel: [{ required: true, message: "请输入手机号", trigger: "submit" }],
-			},
-			form: {
-				// 录单数据
-				userName: "",
-				idCard: "",
-				sex: "", // 性别
-				age: "", // 年龄
-				agencyId: "", // 代理id
-				storeJobId: "", // 职位id
-				qiyeId: "", // 企业id
-				nation: undefined, // 民族
-				address: "", // 家庭住址
-				policy: "", // 代理政策
-				interviewTime: "", // 面试时间
-				receptionTime: "", //接待时间
-				idCardImageUrl: "",
-				imgs: "",
-			},
-			proxyinfo: {},
-
-			firminfo: {},
-		};
-	},
-	// 计算属性
-	computed: {},
-	// 侦听器
-	watch: {
-		facetimedate() {
-			console.log(this.facetimedate);
-		},
-	},
-	// 生命周期钩子   注：没用到的钩子请自行删除
-	/**
-	 * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
-	 */
-	created() {
-		if (JSON.stringify(this.$route.params) == "{}") {
-			this.firminfo = JSON.parse(sessionStorage.getItem("CURRENT_FIRM"));
-		} else {
-			this.firminfo = this.$route.params;
-		}
-    console.log(JSON.parse(sessionStorage.getItem("CURRENT_FIRM")));
-    console.log(this.firminfo);
-		// this.userinfo = JSON.parse(userinfo);
-		this.proxyinfo = JSON.parse(localStorage.getItem("LOGIN_DATA"));
-		if (this.proxyinfo.roleOfPmd) {
-			this.isMaster = true;
-		}
-		console.log(this.firminfo);
-		this.getProxyInfo(this.proxyinfo.id);
-		this.getJob(this.firminfo);
-		this.getPolicyByJobId(this.firminfo.id);
-		console.log(this.proxyinfo);
-		console.log(this.firminfo);
-	},
-	/**
-	 * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
-	 * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
-	 */
-	mounted() {
-		// })
-	},
-	// 组件方法
-	methods: {
-		async getJob(value) {
-			try {
-				const { data } = await getStoreJobApi(value.id);
-				console.log(data);
-				if (data.status === 200) {
-					this.storeJobList = data.data;
-					let that = this;
-					const policy = document.querySelector(".policy");
-					// this.$nextTick(()=>{
-					setTimeout(() => {
-						console.log(policy.offsetHeight);
-						console.log(policy.innerHTML);
-						if (policy.offsetHeight >= 230) {
-							policy.style.maxHeight = "230px";
-							policy.style.marginBottom = "24px";
-							that.isContainerShow = true;
-						} else {
-							policy.style.minHeight = "230px";
-							that.isContainerShow = false;
-						}
-					}, 100);
-				}
-			} catch (error) {
-				console.log(error);
-			}
-		},
-		async getPolicyByJobId(value) {
-      console.log(value);
-			try {
-				const { data } = await getPolicyByJobIdApi(value);
-				console.log(data);
-				if (data.status === 200) {
-					this.form.policy = data.data;
-				}
-			} catch (error) {
-				console.log(error);
-			}
-		},
-		onClose() {
-			this.form = {
-				// 录单数据
-				userName: "",
-				idCard: "",
-				sex: "", // 性别
-				age: "", // 年龄
-				nation: undefined, // 民族
-				address: "", // 家庭住址
-				policy: "", // 代理政策
-				interviewTime: "", // 面试时间
-				idCardImageUrl: "",
-			};
-			this.$router.push("/detail?" + "id=" + this.firminfo.id + "&" + "page=" + this.firminfo.currentPageNum);
-		},
-		handleOk() {
-			var that = this;
-			console.log(that.fileListT2);
-
-			this.$refs.ruleForm.validate(async (ispass, no) => {
-				console.log(this.form);
-				console.log(ispass);
-				console.log(no);
-				this.confirmLoading = true;
-
-				if (ispass) {
-					console.log(this.form);
-					this.form["imgs"] = that.fileListT2.toString();
-					console.log({
-						...this.form,
-						storeJobId: this.firminfo.id,
-					});
-         let dataObj = qs.stringify({
-						...this.form,
-						storeJobId: this.firminfo.id,
-					})
-					const { data } = await recordBillApi(dataObj);
-					if (data.status === 200) {
-						console.log(data);
-						// this.$message.success("提交成功");
-						setTimeout(() => {
-							this.confirmLoading = false;
-
-							this.$router.push("/recordsuccess");
-						}, 1000);
-					} else {
-						this.$message.error(data.msg);
-					}
-					// setTimeout(() => {
-					//   this.confirmLoading = false;
-					//   this.form = {
-					//     // 录单数据置空
-					//     name: "",
-					//     tel: "",
-					//     peoplecard: "",
-					//     username: "",
-					//   };
-					//   this.visible = false;
-					// }, 2000);
-				} else {
-					this.confirmLoading = false;
-					this.$message.error(no);
-
-					console.log(123);
-				}
-				console.log(no);
-			});
-		},
-		// interviewTimeDisabledDate(current) {
-		//   // Can not select days before today and today
-		//   return (
-		//     current < moment().startOf("day") || current > moment().add(100, "days")
-		//   );
-		// },
-		// interviewTimeDisabledDateTime() {
-		//   return {
-		//     disabledHours: () => [0, 1, 2, 3, 4, 5, 6, 22, 23],
-		//     disabledMinutes: () =>
-		//       this.range(0, 60)
-		//         .splice(1, 29)
-		//         .concat(this.range(0, 60).splice(31, 59)),
-		//     disabledSeconds: () => this.range(1, 60),
-		//   };
-		// },
-		range(start, end) {
-			const result = [];
-			for (let i = start; i < end; i++) {
-				result.push(i);
-			}
-			return result;
-		},
-
-		getDom() {
-			console.log(1);
-		},
-		formatDateYMD(val) {
-			// model -> view，在更新 `<input>` 元素之前格式化值
-			if (val == null || val == "") {
-				return null;
-			}
-
-			if ((val != null || val == "") && typeof val == "string") {
-				if (val.indexOf("T")) {
-					val = val.replace("T", " "); //原来L端可能返回的时间格式有带T的格式，处理一下
-				}
-				val = val.replace("-", "/").replace("-", "/");
-			}
-			var value = new Date(val);
-			//console.log(val);
-			var fmt = "yyyy-MM-dd";
-			var o = {
-				"M+": value.getMonth() + 1, //月份
-				"d+": value.getDate(), //日
-				// "H+": value.getHours(), //小时
-				//"h+": val.getHours()%12 == 0 ? 12 : val.getHours()%12, //小时
-				// "m+": value.getMinutes(), //分
-				// "s+": value.getSeconds() //秒
-				//"S": val.getMilliseconds() //毫秒
-				//"q+": Math.floor((val.getMonth() + 3) / 3) //季度
-			};
-			if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (value.getFullYear() + "").substr(4 - RegExp.$1.length));
-			for (var k in o) {
-				if (new RegExp("(" + k + ")").test(fmt)) {
-					fmt = fmt.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
-				}
-			}
-			return fmt;
-		},
-		getDateinfo() {
-			this.isShow = true;
-			if (isEmptyCheck(this.form.interviewTime)) {
-				//设置默认值
-				//判断当前时间是不是在16:00之后，如果在16:00之后，默认显示次日09:00，如果在16:00之前，则显示下一个整点时间
-				var mydate = new Date();
-				var tomorrow = new Date();
-				tomorrow.setDate(tomorrow.getDate() + 1);
-				this.form.interviewTime = mydate.toTimeString() >= "16:00" ? this.formatDateYMD(tomorrow.toLocaleDateString()) + " " + "09:00" : this.formatDateYMD(mydate.toLocaleDateString()) + " " + `${mydate.getHours() + 1}:00`;
-			}
-			console.log(this.form.interviewTime);
-		},
-		getDateinfo1() {
-			this.isShow1 = true;
-			if (isEmptyCheck(this.form.receptionTime)) {
-				//设置默认值
-				//判断当前时间是不是在16:00之后，如果在16:00之后，默认显示次日09:00，如果在16:00之前，则显示下一个整点时间
-				var mydate = new Date();
-				var tomorrow = new Date();
-				tomorrow.setDate(tomorrow.getDate() + 1);
-				this.form.receptionTime = mydate.toTimeString() >= "16:00" ? this.formatDateYMD(tomorrow.toLocaleDateString()) + " " + "09:00" : this.formatDateYMD(mydate.toLocaleDateString()) + " " + `${mydate.getHours() + 1}:00`;
-			}
-			console.log(this.form.receptionTime);
-		},
-		verify() {
-			if (this.form.interviewTime !== "") {
-				this.form.interviewTime = "";
-			}
-		},
-		verify1() {
-			if (this.form.receptionTime !== "") {
-				this.form.receptionTime = "";
-			}
-		},
-		handleChange({ fileList }) {
-			console.log(fileList);
-			console.log(fileList[0]);
-			this.fileList = fileList;
-		},
-		handleChange2({ file, fileList }) {
-			console.log(file);
-			console.log(fileList);
-			this.fileList2 = fileList;
-		},
-		// getBase64(file) {
-		//   return new Promise((resolve, reject) => {
-		//     const reader = new FileReader();
-		//     console.log(reader);
-		//     reader.readAsDataURL(file);
-		//     reader.onload = () => resolve(reader.result);
-		//     reader.onerror = (error) => reject(error);
-		//   });
-		// },
-		beforeUpload(e, data) {
-			let that = this;
-			console.log(e);
-			console.log(data);
-			//resolve()
-			return new Promise((resolve, reject) => {
-				//resolve()
-				new Promise((resolve) => {
-					request({
-						url: "/oss/policy",
-						method: "get",
-					})
-						.then(({ data }) => {
-							console.log(data);
-							// console.log(data.msg);
-							resolve(data.data);
-						})
-						.catch((err) => {
-							console.log(err);
-						});
-				})
-					.then((response) => {
-						console.log("响应的数据", response);
-						that.dataObj.policy = response.data.policy;
-						that.dataObj.signature = response.data.signature;
-						that.dataObj.ossaccessKeyId = response.data.accessid;
-						that.dataObj.key = response.data.dir + that.getUUID() + "_${filename}";
-						that.dataObj.dir = response.data.dir;
-						that.dataObj.host = response.data.host;
-						console.log("响应的数据222。。。", that.dataObj);
-						resolve(true);
-					})
-					.catch((err) => {
-						console.log(err);
-						reject(false);
-					});
-			});
-		},
-		getUUID() {
-			return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
-				return (c === "x" ? (Math.random() * 16) | 0 : "r&0x3" | "0x8").toString(16);
-			});
-		},
-		async customRequestFun(file) {
-			console.dir(file.onSuccess);
-			let _self = this;
-			this.loading = true;
-			var formData = new FormData();
-
-			//注意formData里append添加的键的大小写
-			formData.append("key", _self.dataObj.key); //存储在oss的文件路径
-			formData.append("OSSAccessKeyId", _self.dataObj.ossaccessKeyId); //accessKeyId
-			formData.append("policy", _self.dataObj.policy); //policy
-			formData.append("Signature", _self.dataObj.signature); //签名
-			formData.append("success_action_status", "200"); // 上传成功返回的状态码，不设置则是204
-			formData.append("file", file.file); // 一定在最后
-			console.log(formData);
-			let formData1 = new FormData();
-			console.log(file.file);
-			console.log(formData1);
-			formData1.append("uploadFile", file.file); // 一定在最后
-			// try {
-			//   const { data } = await getIdCardInfoApi(formData1);
-			//   console.log(data);
-			// } catch (err) {
-			//   console.log(err);
-			// }
-			request({
-				method: "post",
-				url: "/yishoudan/commons/idCardOcrRecognize",
-				data: formData1,
-				withCredentials: true,
-				// headers: {'Content-Type': 'application/x-www-form-urlencoded'}
-
-				headers: {
-					"Content-Type": "multipart/form-data;boundary = " + new Date().getTime(),
-				},
-			})
-				.then(({ data }) => {
-					this.loading = false;
-
-					console.log(data);
-					if (data.status === 200) {
-						// console.log(this.$message);
-						if (data.data.success) {
-							if (!isEmptyCheck(data.data.num)) {
-								this.form.idCard = data.data.num;
-								this.form.age = data.data.age;
-								if (data.data.sex === "男") {
-									this.form.sex = "1";
-								} else {
-									this.form.sex = "2";
-								}
-								console.log(this.form.sex);
-								this.form.nation = data.data.nationality + "族";
-								this.form.userName = data.data.name;
-								this.form.address = data.data.address;
-							}
-						} else {
-							this.$message.error("身份证识别失败,请重新上传图片");
-						}
-					} else {
-						this.$message.error("上传失败,请重新上传");
-					}
-					console.log(data);
-				})
-				.catch((err) => {
-					console.log(err);
-				});
-			file.onProgress();
-
-			$.ajax({
-				type: "post",
-				url: "http://matripe-cms.oss-cn-beijing.aliyuncs.com",
-				data: formData,
-				contentType: false, // 不设置Content-Type请求头
-				processData: false,
-				success: function (data) {
-					file.onSuccess();
-					_self.uploadFileFlag = true;
-					console.log(data);
-					var img = _self.dataObj.host + "/" + _self.dataObj.key.replace("${filename}", file.file.name);
-					_self.form.idCardImageUrl = img;
-					console.log(_self.form.idCardImageUrl);
-				},
-				fail: function (err) {
-					console.log(err);
-				},
-			});
-		},
-
-		async customRequestFun2(file) {
-			console.dir(file.onSuccess);
-			var that = this;
-
-			let _self = this;
-			var formData = new FormData();
-
-			//注意formData里append添加的键的大小写
-			formData.append("key", _self.dataObj.key); //存储在oss的文件路径
-			formData.append("OSSAccessKeyId", _self.dataObj.ossaccessKeyId); //accessKeyId
-			formData.append("policy", _self.dataObj.policy); //policy
-			formData.append("Signature", _self.dataObj.signature); //签名
-			formData.append("success_action_status", "200"); // 上传成功返回的状态码，不设置则是204
-			formData.append("file", file.file); // 一定在最后
-			console.log(formData);
-			let formData1 = new FormData();
-			console.log(file.file);
-			formData1.append("uploadFile", file.file); // 一定在最后
-			// try {
-			//   const { data } = await getIdCardInfoApi(formData1);
-			//   console.log(data);
-			// } catch (err) {
-			//   console.log(err);
-			// }
-			file.onProgress();
-			$.ajax({
-				type: "post",
-				url: "http://matripe-cms.oss-cn-beijing.aliyuncs.com",
-				data: formData,
-				contentType: false, // 不设置Content-Type请求头
-				processData: false,
-				success: function (data) {
-					file.onSuccess();
-					console.log(data);
-					var img = _self.dataObj.host + "/" + _self.dataObj.key.replace("${filename}", file.file.name);
-					that.fileListT2.push(img);
-				},
-				fail: function (err) {
-					console.log(err);
-				},
-			});
-		},
-
-		removeFile(file) {
-			// let fileList
-			// let _this = this
-			// fileList = this.$refs.headerUploadRef.$children[1].$children[0].items
-
-			// console.log(this.$refs.headerUploadRef.$children[1].$children[0].items);
-			console.log(this.fileList2.indexOf(file));
-			let index = this.fileList2.indexOf(file);
-			this.fileListT2.splice(index, 1);
-
-			console.log(this.fileListT2);
-			// fileList.forEach((item, index) => {
-			//     if (item.uid === file.uid) {
-			//         _this.headerFileList.splice(index, 1)
-			//     }
-			// })
-		},
-
-		async handlePreview(file) {
-			console.log(file);
-			if (!file.url && !file.preview) {
-				file.preview = await this.getBase64(file.originFileObj);
-			}
-			this.previewImage = file.url || file.preview;
-			this.previewVisible = true;
-		},
-		getBase64(file) {
-			return new Promise((resolve, reject) => {
-				const reader = new FileReader();
-				reader.readAsDataURL(file);
-				reader.onload = () => resolve(reader.result);
-				reader.onerror = (error) => reject(error);
-			});
-		},
-		async getProxyInfo(id) {
-			const { data } = await getProxyInfoApi(id);
-			console.log(data);
-			if (data.status === 200) {
-				this.proxyList = data.data;
-				this.proxyList.forEach((item) => {
-					// console.log(item);
-					let data1 = item.agencyName;
-					if (!isEmptyCheck(item.userName)) {
-						item.userName = data1 + "/" + item.userName;
-					}
-					if (!isEmptyCheck(item.tel)) {
-						item.userName = item.userName + item.tel.slice(7, 12);
-					}
-				});
-				console.log(this.proxyList);
-			}
-			console.log(data);
-		},
-		proxyChange(value) {
-			console.log(value);
-			this.form.agencyId = value.id;
-			this.proxyinfo.userName = value.userName;
-			this.proxyStatus = "";
-			console.log(this.form);
-		},
-		async storeSearch(value) {
-			// 企业名称搜索
-			console.log(value);
-			const { data } = await getStoreAliasApi(value);
-			if (data.status === 200) {
-				this.storeList = data.data;
-			}
-			console.log(data);
-		},
-		async storeChange(value) {
-			console.log(value);
-			this.storeList = [];
-			this.firminfo.aliasName = value.aliasName;
-			this.form.qiyeId = value.id;
-			this.storeStatus = "";
-			try {
-				const { data } = await getStoreJobApi(value.id);
-				console.log(data);
-				if (data.status === 200) {
-					this.storeJobList = data.data;
-				}
-			} catch (error) {
-				console.log(error);
-			}
-			console.log(this.form);
-			console.log(value);
-		},
-		selected() {
-			// if (!isEmptyCheck(this.form.qiyeId)) {
-			this.jobnameStatus = "jobname";
-			// } else {
-			// this.$message.warning("请先选择企业");
-			// }
-		},
-		storeJobChange(value) {
-			console.log(value);
-			// this.storeJobList = [];
-			// if(!isEmptyCheck(this.form.qiyeId)){
-			this.getPolicyByJobId(value.id);
-			this.form.storeJobId = value.id;
-			this.jobnameStatus = "";
-			this.firminfo.jobName = value.jobName;
-			console.log(this.form);
-			// } else {
-
-			// }
-		},
-		toList() {
-			this.$router.push({
-				name: "JobList",
-				params: {
-					pagenum: this.firminfo.currentPageNum,
-				},
-			});
-			// this.$router.go(0);
-			// window.location.reload();
-			// this.reload();
-		},
-		getIdInfo(e) {
-			if (e.target.value.length == 18) {
-				let bir = getAgeFromBirthday(e.target.value);
-				if (!isEmptyCheck(bir.gender)) {
-					this.form.sex = bir.gender;
-				}
-				if (!isEmptyCheck(bir.age)) {
-					this.form.age = bir.age;
-				}
-			}
-		},
-		toFold(value) {
-			let policy = document.querySelector(".policy");
-			if (value == 1) {
-				this.isFold = false;
-				policy.style.maxHeight = "unset";
-			} else {
-				this.isFold = true;
-				policy.style.maxHeight = "230px";
-			}
-		},
-	},
-};
+  inject: ['reload'],
+  // 组件名称
+  name: 'recordBill',
+  // 局部注册的组件
+  components: {
+    // recordbill,
+    timepicker,
+  },
+  // 组件参数 接收来自父组件的数据
+  props: {},
+  // 组件状态值
+  data() {
+    return {
+      fileList2: [],
+      fileListT2: [],
+      // facetimedate: "",
+      previewVisible: false,
+      proxyStatus: '', // 代理选择的控制
+      storeStatus: '', // 企业选择的控制
+      jobnameStatus: '', // 岗位选择的控制
+      isContainerShow: false, // 政策展示控制按钮是否显示
+      isFold: true,
+      previewImage: '',
+      isMaster: true,
+      isShow: false,
+      isShow1: false,
+      nationlist,
+      moment,
+      loading: false,
+      confirmLoading: false,
+      fetching: false,
+      proxyList: [],
+      storeList: [],
+      storeJobList: [],
+      userinfo: {},
+      fileList: [],
+      dataObj: {
+        policy: '',
+        signature: '',
+        key: '',
+        ossaccessKeyId: '',
+        dir: '',
+        host: '',
+        // callback:'',
+      },
+      rules: {
+        // 录单校验规则
+        interviewTime: [
+          {
+            required: true,
+            message: '请选择面试时间',
+            trigger: 'blur',
+          },
+        ],
+        userName: [
+          {
+            required: true,
+            message: '请输入姓名',
+            trigger: 'blur',
+          },
+          {
+            pattern:
+              // /^((?![\u3000-\u303F])[\u2E80-\uFE4F]|·)*(?![\u3000-\u303F])[\u2E80-\uFE4F](·)*$/, // 姓名校验规则
+              /^(((?![\u3000-\u303F])[\u2E80-\uFE4F]|·)*(?![\u3000-\u303F])[\u2E80-\uFE4F][^·]{1,12})$/, // 姓名校验规则
+            message: '请输入正确的姓名',
+            trigger: 'blur',
+          },
+        ],
+        sex: [
+          {
+            required: true,
+            message: '请选择性别',
+            trigger: 'change',
+          },
+        ],
+        age: [
+          {
+            required: true,
+            message: '请输入年龄',
+            trigger: 'blur',
+          },
+          {
+            pattern: /^\d{2}$/,
+            message: '请输入正确的年龄',
+            trigger: 'blur',
+          },
+        ],
+        idCard: [
+          {
+            required: true,
+            message: '请输入身份证号',
+            trigger: 'submit',
+          },
+          {
+            min: 18,
+            max: 18,
+            message: '请输入正确的身份证号',
+            trigger: 'submit',
+          },
+        ],
+        tel: [
+          //   {
+          //   required: true,
+          //   message: "请输入年龄",
+          //   trigger: "blur",
+          // },
+          {
+            pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
+            message: '请输入正确的手机号',
+            trigger: 'blur',
+          },
+        ],
+        // tel: [{ required: true, message: "请输入手机号", trigger: "submit" }],
+      },
+      form: {
+        // 录单数据
+        userName: '',
+        idCard: '',
+        sex: '', // 性别
+        age: '', // 年龄
+        agencyId: '', // 代理id
+        storeJobId: '', // 职位id
+        qiyeId: '', // 企业id
+        nation: undefined, // 民族
+        address: '', // 家庭住址
+        policy: '', // 代理政策
+        interviewTime: '', // 面试时间
+        receptionTime: '', //接待时间
+        idCardImageUrl: '',
+        imgs: '',
+      },
+      proxyinfo: {},
+
+      firminfo: {},
+    }
+  },
+  // 计算属性
+  computed: {},
+  // 侦听器
+  watch: {
+    facetimedate() {
+      console.log(this.facetimedate)
+    },
+  },
+  // 生命周期钩子   注：没用到的钩子请自行删除
+  /**
+   * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
+   */
+  created() {
+    if (JSON.stringify(this.$route.params) == '{}') {
+      this.firminfo = JSON.parse(sessionStorage.getItem('CURRENT_FIRM'))
+    } else {
+      this.firminfo = this.$route.params
+    }
+    console.log(JSON.parse(sessionStorage.getItem('CURRENT_FIRM')))
+    console.log(this.firminfo)
+    // this.userinfo = JSON.parse(userinfo);
+    this.proxyinfo = JSON.parse(localStorage.getItem('LOGIN_DATA'))
+    if (this.proxyinfo.roleOfPmd) {
+      this.isMaster = true
+    }
+    console.log(this.firminfo)
+    this.getProxyInfo(this.proxyinfo.id)
+    this.getJob(this.firminfo)
+    this.getPolicyByJobId(this.firminfo.id)
+    console.log(this.proxyinfo)
+    console.log(this.firminfo)
+  },
+  /**
+   * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
+   * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
+   */
+  mounted() {
+    // })
+  },
+  // 组件方法
+  methods: {
+    async getJob(value) {
+      try {
+        const { data } = await getStoreJobApi(value.id)
+        console.log(data)
+        if (data.status === 200) {
+          this.storeJobList = data.data
+          let that = this
+          const policy = document.querySelector('.policy')
+          // this.$nextTick(()=>{
+          setTimeout(() => {
+            console.log(policy.offsetHeight)
+            console.log(policy.innerHTML)
+            if (policy.offsetHeight >= 230) {
+              policy.style.maxHeight = '230px'
+              policy.style.marginBottom = '24px'
+              that.isContainerShow = true
+            } else {
+              policy.style.minHeight = '230px'
+              that.isContainerShow = false
+            }
+          }, 100)
+        }
+      } catch (error) {
+        console.log(error)
+      }
+    },
+    async getPolicyByJobId(value) {
+      console.log(value)
+      try {
+        const { data } = await getPolicyByJobIdApi(value)
+        console.log(data)
+        if (data.status === 200) {
+          this.form.policy = data.data
+        }
+      } catch (error) {
+        console.log(error)
+      }
+    },
+    onClose() {
+      this.form = {
+        // 录单数据
+        userName: '',
+        idCard: '',
+        sex: '', // 性别
+        age: '', // 年龄
+        nation: undefined, // 民族
+        address: '', // 家庭住址
+        policy: '', // 代理政策
+        interviewTime: '', // 面试时间
+        idCardImageUrl: '',
+      }
+      this.$router.push('/detail?' + 'id=' + this.firminfo.id + '&' + 'page=' + this.firminfo.currentPageNum)
+    },
+    handleOk() {
+      var that = this
+      console.log(that.fileListT2)
+
+      this.$refs.ruleForm.validate(async (ispass, no) => {
+        console.log(this.form)
+        console.log(ispass)
+        console.log(no)
+        this.confirmLoading = true
+
+        if (ispass) {
+          console.log(this.form)
+          this.form['imgs'] = that.fileListT2.toString()
+          console.log({
+            ...this.form,
+            storeJobId: this.firminfo.id,
+          })
+          let dataObj = qs.stringify({
+            ...this.form,
+            storeJobId: this.firminfo.id,
+          })
+          const { data } = await recordBillApi(dataObj)
+          if (data.status === 200) {
+            console.log(data)
+            // this.$message.success("提交成功");
+            setTimeout(() => {
+              this.confirmLoading = false
+
+              this.$router.push('/recordsuccess')
+            }, 1000)
+          } else {
+            this.$message.error(data.msg)
+          }
+          // setTimeout(() => {
+          //   this.confirmLoading = false;
+          //   this.form = {
+          //     // 录单数据置空
+          //     name: "",
+          //     tel: "",
+          //     peoplecard: "",
+          //     username: "",
+          //   };
+          //   this.visible = false;
+          // }, 2000);
+        } else {
+          this.confirmLoading = false
+          // this.$message.error(no)
+
+          console.log(123)
+        }
+        console.log(no)
+      })
+    },
+    // interviewTimeDisabledDate(current) {
+    //   // Can not select days before today and today
+    //   return (
+    //     current < moment().startOf("day") || current > moment().add(100, "days")
+    //   );
+    // },
+    // interviewTimeDisabledDateTime() {
+    //   return {
+    //     disabledHours: () => [0, 1, 2, 3, 4, 5, 6, 22, 23],
+    //     disabledMinutes: () =>
+    //       this.range(0, 60)
+    //         .splice(1, 29)
+    //         .concat(this.range(0, 60).splice(31, 59)),
+    //     disabledSeconds: () => this.range(1, 60),
+    //   };
+    // },
+    range(start, end) {
+      const result = []
+      for (let i = start; i < end; i++) {
+        result.push(i)
+      }
+      return result
+    },
+
+    getDom() {
+      console.log(1)
+    },
+    formatDateYMD(val) {
+      // model -> view，在更新 `<input>` 元素之前格式化值
+      if (val == null || val == '') {
+        return null
+      }
+
+      if ((val != null || val == '') && typeof val == 'string') {
+        if (val.indexOf('T')) {
+          val = val.replace('T', ' ') //原来L端可能返回的时间格式有带T的格式，处理一下
+        }
+        val = val.replace('-', '/').replace('-', '/')
+      }
+      var value = new Date(val)
+      //console.log(val);
+      var fmt = 'yyyy-MM-dd'
+      var o = {
+        'M+': value.getMonth() + 1, //月份
+        'd+': value.getDate(), //日
+        // "H+": value.getHours(), //小时
+        //"h+": val.getHours()%12 == 0 ? 12 : val.getHours()%12, //小时
+        // "m+": value.getMinutes(), //分
+        // "s+": value.getSeconds() //秒
+        //"S": val.getMilliseconds() //毫秒
+        //"q+": Math.floor((val.getMonth() + 3) / 3) //季度
+      }
+      if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (value.getFullYear() + '').substr(4 - RegExp.$1.length))
+      for (var k in o) {
+        if (new RegExp('(' + k + ')').test(fmt)) {
+          fmt = fmt.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length))
+        }
+      }
+      return fmt
+    },
+    getDateinfo() {
+      this.isShow = true
+      if (isEmptyCheck(this.form.interviewTime)) {
+        //设置默认值
+        //判断当前时间是不是在16:00之后，如果在16:00之后，默认显示次日09:00，如果在16:00之前，则显示下一个整点时间
+        var mydate = new Date()
+        var tomorrow = new Date()
+        tomorrow.setDate(tomorrow.getDate() + 1)
+        this.form.interviewTime = mydate.toTimeString() >= '16:00' ? this.formatDateYMD(tomorrow.toLocaleDateString()) + ' ' + '09:00' : this.formatDateYMD(mydate.toLocaleDateString()) + ' ' + `${mydate.getHours() + 1}:00`
+      }
+      console.log(this.form.interviewTime)
+    },
+    getDateinfo1() {
+      this.isShow1 = true
+      if (isEmptyCheck(this.form.receptionTime)) {
+        //设置默认值
+        //判断当前时间是不是在16:00之后，如果在16:00之后，默认显示次日09:00，如果在16:00之前，则显示下一个整点时间
+        var mydate = new Date()
+        var tomorrow = new Date()
+        tomorrow.setDate(tomorrow.getDate() + 1)
+        this.form.receptionTime = mydate.toTimeString() >= '16:00' ? this.formatDateYMD(tomorrow.toLocaleDateString()) + ' ' + '09:00' : this.formatDateYMD(mydate.toLocaleDateString()) + ' ' + `${mydate.getHours() + 1}:00`
+      }
+      console.log(this.form.receptionTime)
+    },
+    verify() {
+      if (this.form.interviewTime !== '') {
+        this.form.interviewTime = ''
+      }
+    },
+    verify1() {
+      if (this.form.receptionTime !== '') {
+        this.form.receptionTime = ''
+      }
+    },
+    handleChange({ fileList }) {
+      console.log(fileList)
+      console.log(fileList[0])
+      this.fileList = fileList
+    },
+    handleChange2({ file, fileList }) {
+      console.log(file)
+      console.log(fileList)
+      this.fileList2 = fileList
+    },
+    // getBase64(file) {
+    //   return new Promise((resolve, reject) => {
+    //     const reader = new FileReader();
+    //     console.log(reader);
+    //     reader.readAsDataURL(file);
+    //     reader.onload = () => resolve(reader.result);
+    //     reader.onerror = (error) => reject(error);
+    //   });
+    // },
+    beforeUpload(e, data) {
+      let that = this
+      console.log(e)
+      console.log(data)
+      //resolve()
+      return new Promise((resolve, reject) => {
+        //resolve()
+        new Promise((resolve) => {
+          request({
+            url: '/oss/policy',
+            method: 'get',
+          })
+            .then(({ data }) => {
+              console.log(data)
+              // console.log(data.msg);
+              resolve(data.data)
+            })
+            .catch((err) => {
+              console.log(err)
+            })
+        })
+          .then((response) => {
+            console.log('响应的数据', response)
+            that.dataObj.policy = response.data.policy
+            that.dataObj.signature = response.data.signature
+            that.dataObj.ossaccessKeyId = response.data.accessid
+            that.dataObj.key = response.data.dir + that.getUUID() + '_${filename}'
+            that.dataObj.dir = response.data.dir
+            that.dataObj.host = response.data.host
+            console.log('响应的数据222。。。', that.dataObj)
+            resolve(true)
+          })
+          .catch((err) => {
+            console.log(err)
+            reject(false)
+          })
+      })
+    },
+    getUUID() {
+      return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
+        return (c === 'x' ? (Math.random() * 16) | 0 : 'r&0x3' | '0x8').toString(16)
+      })
+    },
+    async customRequestFun(file) {
+      console.dir(file.onSuccess)
+      let _self = this
+      this.loading = true
+      var formData = new FormData()
+
+      //注意formData里append添加的键的大小写
+      formData.append('key', _self.dataObj.key) //存储在oss的文件路径
+      formData.append('OSSAccessKeyId', _self.dataObj.ossaccessKeyId) //accessKeyId
+      formData.append('policy', _self.dataObj.policy) //policy
+      formData.append('Signature', _self.dataObj.signature) //签名
+      formData.append('success_action_status', '200') // 上传成功返回的状态码，不设置则是204
+      formData.append('file', file.file) // 一定在最后
+      console.log(formData)
+      let formData1 = new FormData()
+      console.log(file.file)
+      console.log(formData1)
+      formData1.append('uploadFile', file.file) // 一定在最后
+      // try {
+      //   const { data } = await getIdCardInfoApi(formData1);
+      //   console.log(data);
+      // } catch (err) {
+      //   console.log(err);
+      // }
+      request({
+        method: 'post',
+        url: '/yishoudan/commons/idCardOcrRecognize',
+        data: formData1,
+        withCredentials: true,
+        // headers: {'Content-Type': 'application/x-www-form-urlencoded'}
+
+        headers: {
+          'Content-Type': 'multipart/form-data;boundary = ' + new Date().getTime(),
+        },
+      })
+        .then(({ data }) => {
+          this.loading = false
+
+          console.log(data)
+          if (data.status === 200) {
+            // console.log(this.$message);
+            if (data.data.success) {
+              if (!isEmptyCheck(data.data.num)) {
+                this.form.idCard = data.data.num
+                this.form.age = data.data.age
+                if (data.data.sex === '男') {
+                  this.form.sex = '1'
+                } else {
+                  this.form.sex = '2'
+                }
+                console.log(this.form.sex)
+                this.form.nation = data.data.nationality + '族'
+                this.form.userName = data.data.name
+                this.form.address = data.data.address
+              }
+            } else {
+              this.$message.error('身份证识别失败,请重新上传图片')
+            }
+          } else {
+            this.$message.error('上传失败,请重新上传')
+          }
+          console.log(data)
+        })
+        .catch((err) => {
+          console.log(err)
+        })
+      file.onProgress()
+
+      $.ajax({
+        type: 'post',
+        url: 'http://matripe-cms.oss-cn-beijing.aliyuncs.com',
+        data: formData,
+        contentType: false, // 不设置Content-Type请求头
+        processData: false,
+        success: function (data) {
+          file.onSuccess()
+          _self.uploadFileFlag = true
+          console.log(data)
+          var img = _self.dataObj.host + '/' + _self.dataObj.key.replace('${filename}', file.file.name)
+          _self.form.idCardImageUrl = img
+          console.log(_self.form.idCardImageUrl)
+        },
+        fail: function (err) {
+          console.log(err)
+        },
+      })
+    },
+
+    async customRequestFun2(file) {
+      console.dir(file.onSuccess)
+      var that = this
+
+      let _self = this
+      var formData = new FormData()
+
+      //注意formData里append添加的键的大小写
+      formData.append('key', _self.dataObj.key) //存储在oss的文件路径
+      formData.append('OSSAccessKeyId', _self.dataObj.ossaccessKeyId) //accessKeyId
+      formData.append('policy', _self.dataObj.policy) //policy
+      formData.append('Signature', _self.dataObj.signature) //签名
+      formData.append('success_action_status', '200') // 上传成功返回的状态码，不设置则是204
+      formData.append('file', file.file) // 一定在最后
+      console.log(formData)
+      let formData1 = new FormData()
+      console.log(file.file)
+      formData1.append('uploadFile', file.file) // 一定在最后
+      // try {
+      //   const { data } = await getIdCardInfoApi(formData1);
+      //   console.log(data);
+      // } catch (err) {
+      //   console.log(err);
+      // }
+      file.onProgress()
+      $.ajax({
+        type: 'post',
+        url: 'http://matripe-cms.oss-cn-beijing.aliyuncs.com',
+        data: formData,
+        contentType: false, // 不设置Content-Type请求头
+        processData: false,
+        success: function (data) {
+          file.onSuccess()
+          console.log(data)
+          var img = _self.dataObj.host + '/' + _self.dataObj.key.replace('${filename}', file.file.name)
+          that.fileListT2.push(img)
+        },
+        fail: function (err) {
+          console.log(err)
+        },
+      })
+    },
+
+    removeFile(file) {
+      // let fileList
+      // let _this = this
+      // fileList = this.$refs.headerUploadRef.$children[1].$children[0].items
+
+      // console.log(this.$refs.headerUploadRef.$children[1].$children[0].items);
+      console.log(this.fileList2.indexOf(file))
+      let index = this.fileList2.indexOf(file)
+      this.fileListT2.splice(index, 1)
+
+      console.log(this.fileListT2)
+      // fileList.forEach((item, index) => {
+      //     if (item.uid === file.uid) {
+      //         _this.headerFileList.splice(index, 1)
+      //     }
+      // })
+    },
+
+    async handlePreview(file) {
+      console.log(file)
+      if (!file.url && !file.preview) {
+        file.preview = await this.getBase64(file.originFileObj)
+      }
+      this.previewImage = file.url || file.preview
+      this.previewVisible = true
+    },
+    getBase64(file) {
+      return new Promise((resolve, reject) => {
+        const reader = new FileReader()
+        reader.readAsDataURL(file)
+        reader.onload = () => resolve(reader.result)
+        reader.onerror = (error) => reject(error)
+      })
+    },
+    async getProxyInfo(id) {
+      const { data } = await getProxyInfoApi(id)
+      console.log(data)
+      if (data.status === 200) {
+        this.proxyList = data.data
+        this.proxyList.forEach((item) => {
+          // console.log(item);
+          let data1 = item.agencyName
+          if (!isEmptyCheck(item.userName)) {
+            item.userName = data1 + '/' + item.userName
+          }
+          if (!isEmptyCheck(item.tel)) {
+            item.userName = item.userName + item.tel.slice(7, 12)
+          }
+        })
+        console.log(this.proxyList)
+      }
+      console.log(data)
+    },
+    proxyChange(value) {
+      console.log(value)
+      this.form.agencyId = value.id
+      this.proxyinfo.userName = value.userName
+      this.proxyStatus = ''
+      console.log(this.form)
+    },
+    async storeSearch(value) {
+      // 企业名称搜索
+      console.log(value)
+      const { data } = await getStoreAliasApi(value)
+      if (data.status === 200) {
+        this.storeList = data.data
+      }
+      console.log(data)
+    },
+    async storeChange(value) {
+      console.log(value)
+      this.storeList = []
+      this.firminfo.aliasName = value.aliasName
+      this.form.qiyeId = value.id
+      this.storeStatus = ''
+      try {
+        const { data } = await getStoreJobApi(value.id)
+        console.log(data)
+        if (data.status === 200) {
+          this.storeJobList = data.data
+        }
+      } catch (error) {
+        console.log(error)
+      }
+      console.log(this.form)
+      console.log(value)
+    },
+    selected() {
+      // if (!isEmptyCheck(this.form.qiyeId)) {
+      this.jobnameStatus = 'jobname'
+      // } else {
+      // this.$message.warning("请先选择企业");
+      // }
+    },
+    storeJobChange(value) {
+      console.log(value)
+      // this.storeJobList = [];
+      // if(!isEmptyCheck(this.form.qiyeId)){
+      this.getPolicyByJobId(value.id)
+      this.form.storeJobId = value.id
+      this.jobnameStatus = ''
+      this.firminfo.jobName = value.jobName
+      console.log(this.form)
+      // } else {
+
+      // }
+    },
+    toList() {
+      this.$router.push({
+        name: 'JobList',
+        params: {
+          pagenum: this.firminfo.currentPageNum,
+        },
+      })
+      // this.$router.go(0);
+      // window.location.reload();
+      // this.reload();
+    },
+    getIdInfo(e) {
+      if (e.target.value.length == 18) {
+        let bir = getAgeFromBirthday(e.target.value)
+        if (!isEmptyCheck(bir.gender)) {
+          this.form.sex = bir.gender
+        }
+        if (!isEmptyCheck(bir.age)) {
+          this.form.age = bir.age
+        }
+      }
+    },
+    toFold(value) {
+      let policy = document.querySelector('.policy')
+      if (value == 1) {
+        this.isFold = false
+        policy.style.maxHeight = 'unset'
+      } else {
+        this.isFold = true
+        policy.style.maxHeight = '230px'
+      }
+    },
+  },
+}
 </script>
 <style scoped lang="less">
 /deep/ .policy {
-	min-height: 0 !important;
+  min-height: 0 !important;
 }
 
 /deep/ .upload-list-inline .ant-upload-list-item {
-	float: left;
-	width: 220px;
-	margin-right: 16px;
+  float: left;
+  width: 220px;
+  margin-right: 16px;
 
-	.ant-upload-animate-enter {
-		animation-name: uploadAnimateInlineIn;
-	}
+  .ant-upload-animate-enter {
+    animation-name: uploadAnimateInlineIn;
+  }
 
-	.ant-upload-animate-leave {
-		animation-name: uploadAnimateInlineOut;
-	}
+  .ant-upload-animate-leave {
+    animation-name: uploadAnimateInlineOut;
+  }
 }
 
 .recordBill-container {
-	// height: 100%;
-
-	box-sizing: border-box;
-
-	.content {
-		margin-top: 12px;
-		padding: 30px 0 20px 300px;
-		position: relative;
-		background-color: #fff;
-		text-align: left;
-
-		.ant-form {
-			width: 640px;
-		}
-	}
-
-	.upline {
-		position: relative !important;
-		box-shadow: none;
-		// transform: translateX(-10px);
-		margin-top: 12px;
-
-		> div {
-			margin-left: 107px;
-			display: flex;
-			justify-content: start;
-
-			button {
-				border-radius: 0;
-				transition: none;
-			}
-
-			button:first-child {
-				&:hover {
-					border-color: #ff4400 !important;
-					color: #ff4400 !important;
-				}
-			}
-
-			button:last-child {
-				&:hover {
-					background-color: #ff7c1f !important;
-					border-color: #ff7c1f !important;
-				}
-			}
-
-			// button::after {
-			//   // display: none;
-			// }
-		}
-	}
+  // height: 100%;
+
+  box-sizing: border-box;
+
+  .content {
+    margin-top: 12px;
+    padding: 30px 0 20px 300px;
+    position: relative;
+    background-color: #fff;
+    text-align: left;
+
+    .ant-form {
+      width: 640px;
+    }
+  }
+
+  .upline {
+    position: relative !important;
+    box-shadow: none;
+    // transform: translateX(-10px);
+    margin-top: 12px;
+
+    > div {
+      margin-left: 107px;
+      display: flex;
+      justify-content: start;
+
+      button {
+        border-radius: 0;
+        transition: none;
+      }
+
+      button:first-child {
+        &:hover {
+          border-color: #ff4400 !important;
+          color: #ff4400 !important;
+        }
+      }
+
+      button:last-child {
+        &:hover {
+          background-color: #ff7c1f !important;
+          border-color: #ff7c1f !important;
+        }
+      }
+
+      // button::after {
+      //   // display: none;
+      // }
+    }
+  }
 }
 
 /deep/ .ant-radio-wrapper {
-	margin-right: 16px;
+  margin-right: 16px;
 
-	span:last-child {
-		padding: 0 2px;
-	}
+  span:last-child {
+    padding: 0 2px;
+  }
 }
 
 // /deep/ .ant-radio {
@@ -1069,297 +1043,297 @@ export default {
 // }
 
 .ant-col {
-	.ant-form-item {
-		margin-top: 0;
-		margin-bottom: 16px !important;
-	}
+  .ant-form-item {
+    margin-top: 0;
+    margin-bottom: 16px !important;
+  }
 }
 
 .idCardUpload {
-	// 上传身份证关闭按钮的样式
-	position: relative;
-
-	.icon-guanbi {
-		position: absolute;
-		top: -3px;
-		right: 52px;
-		height: 16px;
-		width: 16px;
-		text-align: center;
-		line-height: 16px;
-		font-size: 12px;
-		font-weight: 900;
-		border-radius: 50%;
-		background-color: #999;
-		color: #fff;
-		z-index: 99;
-
-		&::before {
-			display: inline-block;
-			transform: scale(0.6);
-		}
-	}
+  // 上传身份证关闭按钮的样式
+  position: relative;
+
+  .icon-guanbi {
+    position: absolute;
+    top: -3px;
+    right: 52px;
+    height: 16px;
+    width: 16px;
+    text-align: center;
+    line-height: 16px;
+    font-size: 12px;
+    font-weight: 900;
+    border-radius: 50%;
+    background-color: #999;
+    color: #fff;
+    z-index: 99;
+
+    &::before {
+      display: inline-block;
+      transform: scale(0.6);
+    }
+  }
 }
 
 .specialbox {
-	margin-top: -8px;
+  margin-top: -8px;
 }
 
 /deep/ .ant-upload-picture-card-wrapper {
-	width: 100px !important;
-	height: 40px !important;
-
-	// border: 1px solid #ddd !important;
-	// box-sizing: border-box;
-	.ant-upload.ant-upload-select-picture-card,
-	.ant-upload-list-item,
-	.ant-upload-list-picture-card-container {
-		width: 100px !important;
-		height: 40px !important;
-		min-width: 100px !important;
-		min-height: 40px !important;
-		font-size: 12px;
-		padding: 0;
-		border-color: #dddddd !important;
-		box-sizing: border-box;
-		border-radius: 0px;
-
-		&:hover {
-			border-color: #ff4400 !important;
-		}
-
-		.ant-upload {
-			padding: 0;
-		}
-
-		.ant-upload-list-item-progress {
-			display: none;
-		}
-
-		// .ant-upload-list-item-uploading {
-		//   display: none;
-		// }
-		.ant-upload-select {
-			background-color: #f5f5f5 !important;
-		}
-
-		.ant-upload-text {
-			font-size: 12px;
-			margin: 0 0 0 6px;
-		}
-
-		.ant-upload-list-item-uploading-text {
-			// display: none;
-			text-align: center !important;
-			line-height: 40px !important;
-			width: 100px !important;
-			height: 40px !important;
-			margin-top: 0;
-			// overflow: hidden;
-		}
-
-		.ant-upload-list-item-actions {
-			> i {
-				display: none;
-			}
-
-			> a {
-				text-align: center;
-			}
-		}
-	}
-
-	// .ant-upload-select {
-	// display: none !important;
-	// }
+  width: 100px !important;
+  height: 40px !important;
+
+  // border: 1px solid #ddd !important;
+  // box-sizing: border-box;
+  .ant-upload.ant-upload-select-picture-card,
+  .ant-upload-list-item,
+  .ant-upload-list-picture-card-container {
+    width: 100px !important;
+    height: 40px !important;
+    min-width: 100px !important;
+    min-height: 40px !important;
+    font-size: 12px;
+    padding: 0;
+    border-color: #dddddd !important;
+    box-sizing: border-box;
+    border-radius: 0px;
+
+    &:hover {
+      border-color: #ff4400 !important;
+    }
+
+    .ant-upload {
+      padding: 0;
+    }
+
+    .ant-upload-list-item-progress {
+      display: none;
+    }
+
+    // .ant-upload-list-item-uploading {
+    //   display: none;
+    // }
+    .ant-upload-select {
+      background-color: #f5f5f5 !important;
+    }
+
+    .ant-upload-text {
+      font-size: 12px;
+      margin: 0 0 0 6px;
+    }
+
+    .ant-upload-list-item-uploading-text {
+      // display: none;
+      text-align: center !important;
+      line-height: 40px !important;
+      width: 100px !important;
+      height: 40px !important;
+      margin-top: 0;
+      // overflow: hidden;
+    }
+
+    .ant-upload-list-item-actions {
+      > i {
+        display: none;
+      }
+
+      > a {
+        text-align: center;
+      }
+    }
+  }
+
+  // .ant-upload-select {
+  // display: none !important;
+  // }
 }
 
 .uploading {
-	position: absolute;
-	width: 98px !important;
-	height: 38px !important;
-	top: 1px;
-	left: -49px;
-	background-color: #f5f5f5;
+  position: absolute;
+  width: 98px !important;
+  height: 38px !important;
+  top: 1px;
+  left: -49px;
+  background-color: #f5f5f5;
 }
 
 /deep/ .ant-form-item {
-	// margin-bottom: 0;
-	margin-top: -8px;
-
-	.ant-col-5 {
-		width: 20%;
-	}
-
-	.ant-form-item-label {
-		// line-height: 22px;
-		> label {
-			font-weight: 400;
-			color: #333;
-		}
-	}
-
-	.ant-input-affix-wrapper {
-		&:hover .ant-input {
-			border-color: #ddd;
-		}
-	}
-
-	.radiobox {
-		height: 40px;
-		display: flex;
-		align-items: center;
-	}
-
-	.ant-form-item-children {
-		.pzbox {
-			// display: flex !important;
-			color: #666;
-
-			span {
-				display: inline-block;
-
-				&:first-child {
-					min-width: 50px;
-				}
-
-				// &:last-child {
-				//   cursor: pointer;
-				//   margin-left: 10px;
-				//   color: #ff4400;
-				// }
-			}
-
-			// &::before {
-			//   content: "";
-			//   display: block;
-			//   position: absolute;
-			//   height: 1px;
-			//   width: 588px;
-			//   left: -428px;
-			//   top: -20px;
-			//   background-color: #d5d5d5;
-			// }
-		}
-	}
-
-	.ant-input {
-		// width: 430px;
-		height: 38px;
-		// color: rgba(77, 87, 94, 0.7);
-		color: #666;
-		// border: none;
-		border: 1px solid #dddddd;
-		box-shadow: none !important;
-
-		// background-color: #f6f6f6;
-		&::placeholder {
-			color: #cdcdcd;
-		}
-	}
-
-	.ant-select-selection__rendered,
-	.ant-select-selection--single,
-	.ant-select {
-		height: 38px;
-		line-height: 38px;
-		// border: none;
-		// border: 1px solid #dddddd;
-		box-shadow: none !important;
-		border-color: #ddd;
-
-		.ant-select-selection__placeholder {
-			line-height: 17px;
-			color: #cdcdcd;
-		}
-
-		.ant-select-selection-selected-value {
-			line-height: 37px;
-			color: #666;
-		}
-
-		&:hover {
-			border-color: #ddd;
-		}
-
-		// &:focus {
-		//   border-color: #d9d9d9;
-		// }
-		// &:active {
-		//   border-color: #d9d9d9;
-		// }
-	}
+  // margin-bottom: 0;
+  margin-top: -8px;
+
+  .ant-col-5 {
+    width: 20%;
+  }
+
+  .ant-form-item-label {
+    // line-height: 22px;
+    > label {
+      font-weight: 400;
+      color: #333;
+    }
+  }
+
+  .ant-input-affix-wrapper {
+    &:hover .ant-input {
+      border-color: #ddd;
+    }
+  }
+
+  .radiobox {
+    height: 40px;
+    display: flex;
+    align-items: center;
+  }
+
+  .ant-form-item-children {
+    .pzbox {
+      // display: flex !important;
+      color: #666;
+
+      span {
+        display: inline-block;
+
+        &:first-child {
+          min-width: 50px;
+        }
+
+        // &:last-child {
+        //   cursor: pointer;
+        //   margin-left: 10px;
+        //   color: #ff4400;
+        // }
+      }
+
+      // &::before {
+      //   content: "";
+      //   display: block;
+      //   position: absolute;
+      //   height: 1px;
+      //   width: 588px;
+      //   left: -428px;
+      //   top: -20px;
+      //   background-color: #d5d5d5;
+      // }
+    }
+  }
+
+  .ant-input {
+    // width: 430px;
+    height: 38px;
+    // color: rgba(77, 87, 94, 0.7);
+    color: #666;
+    // border: none;
+    border: 1px solid #dddddd;
+    box-shadow: none !important;
+
+    // background-color: #f6f6f6;
+    &::placeholder {
+      color: #cdcdcd;
+    }
+  }
+
+  .ant-select-selection__rendered,
+  .ant-select-selection--single,
+  .ant-select {
+    height: 38px;
+    line-height: 38px;
+    // border: none;
+    // border: 1px solid #dddddd;
+    box-shadow: none !important;
+    border-color: #ddd;
+
+    .ant-select-selection__placeholder {
+      line-height: 17px;
+      color: #cdcdcd;
+    }
+
+    .ant-select-selection-selected-value {
+      line-height: 37px;
+      color: #666;
+    }
+
+    &:hover {
+      border-color: #ddd;
+    }
+
+    // &:focus {
+    //   border-color: #d9d9d9;
+    // }
+    // &:active {
+    //   border-color: #d9d9d9;
+    // }
+  }
 }
 
 /deep/ .ant-modal-content {
-	.ant-modal-header {
-		border-bottom: 1px solid transparent;
-		padding-top: 14px;
-		padding-bottom: 14px;
-	}
-
-	.ant-modal-body {
-		padding: 24px;
-		padding-top: 0;
-
-		img {
-			display: block;
-			width: 100%;
-		}
-	}
-
-	.ant-modal-close-x {
-		height: 50px;
-		line-height: 50px;
-		// .anticon-close {
-		//   vertical-align: 10px;
-		//   margin-right: -4px;
-		// }
-	}
+  .ant-modal-header {
+    border-bottom: 1px solid transparent;
+    padding-top: 14px;
+    padding-bottom: 14px;
+  }
+
+  .ant-modal-body {
+    padding: 24px;
+    padding-top: 0;
+
+    img {
+      display: block;
+      width: 100%;
+    }
+  }
+
+  .ant-modal-close-x {
+    height: 50px;
+    line-height: 50px;
+    // .anticon-close {
+    //   vertical-align: 10px;
+    //   margin-right: -4px;
+    // }
+  }
 }
 
 /deep/ .policyContainer {
-	position: relative;
-
-	.ant-form-item-children {
-		position: unset;
-
-		.policy {
-			// position: relative;
-			padding: 0;
-			padding-top: 6px;
-			// padding-bottom: 24px;
-			white-space: pre-wrap;
-			border-radius: 4px;
-			overflow: hidden;
-			line-height: 2;
-		}
-
-		.openContral {
-			position: absolute;
-			height: 20px;
-			line-height: 20px;
-			bottom: 0;
-			right: 10px;
-			cursor: pointer;
-
-			&::after {
-				content: "";
-				position: absolute;
-				width: 480px;
-				height: 1px;
-				background-color: #ededed;
-				bottom: -10px;
-				left: -445px;
-			}
-
-			&:hover {
-				color: #ff4400;
-			}
-		}
-	}
-
-	// background-color: #ff4400;
+  position: relative;
+
+  .ant-form-item-children {
+    position: unset;
+
+    .policy {
+      // position: relative;
+      padding: 0;
+      padding-top: 6px;
+      // padding-bottom: 24px;
+      white-space: pre-wrap;
+      border-radius: 4px;
+      overflow: hidden;
+      line-height: 2;
+    }
+
+    .openContral {
+      position: absolute;
+      height: 20px;
+      line-height: 20px;
+      bottom: 0;
+      right: 10px;
+      cursor: pointer;
+
+      &::after {
+        content: '';
+        position: absolute;
+        width: 480px;
+        height: 1px;
+        background-color: #ededed;
+        bottom: -10px;
+        left: -445px;
+      }
+
+      &:hover {
+        color: #ff4400;
+      }
+    }
+  }
+
+  // background-color: #ff4400;
 }
 
 // /deep/ .date-picker {
@@ -1592,41 +1566,41 @@ export default {
 //  }
 // }
 /deep/ .time-input {
-	margin-bottom: 16px;
-
-	.ant-input {
-		font-size: 20px !important;
-		border-radius: 0px;
-		-webkit-text-stroke-width: 0.5px;
-		font-weight: 400;
-
-		&::placeholder {
-			font-size: 14px;
-			-webkit-text-stroke-width: 0.1px;
-		}
-	}
-
-	.ant-input-suffix {
-		right: 16px;
-	}
-
-	.anticon-close-circle {
-		width: 24px;
-		height: 24px;
-		line-height: 28px;
-		margin-right: 8px;
-	}
+  margin-bottom: 16px;
+
+  .ant-input {
+    font-size: 20px !important;
+    border-radius: 0px;
+    -webkit-text-stroke-width: 0.5px;
+    font-weight: 400;
+
+    &::placeholder {
+      font-size: 14px;
+      -webkit-text-stroke-width: 0.1px;
+    }
+  }
+
+  .ant-input-suffix {
+    right: 16px;
+  }
+
+  .anticon-close-circle {
+    width: 24px;
+    height: 24px;
+    line-height: 28px;
+    margin-right: 8px;
+  }
 }
 
 .ant-input {
-	border-radius: 0px;
+  border-radius: 0px;
 }
 
 /deep/ .pt1 .ant-input {
-	padding-top: 1px;
+  padding-top: 1px;
 }
 
 /deep/ .ant-select-selection {
-	border-radius: 0px !important;
+  border-radius: 0px !important;
 }
 </style>
diff --git a/src/components/Login/login.vue b/src/components/Login/login.vue
index 21a1b37..b0ea4ab 100644
--- a/src/components/Login/login.vue
+++ b/src/components/Login/login.vue
@@ -1,46 +1,35 @@
 <template>
-	<div class="center">
-		<div class="formcontainer">
-			<div class="logo">
-				<!--  <svg class="icon" aria-hidden="true">
+  <div class="center">
+    <div class="formcontainer">
+      <div class="logo">
+        <!--  <svg class="icon" aria-hidden="true">
           <use xlink:href="#icon-yishoudanlogo"></use>
-        </svg> -->
-				<img src="http://matripe.oss-cn-beijing.aliyuncs.com/bcSVG/dtLogo.png" style="width: 80px; text-align: center" alt="" />
-			</div>
-			<ul class="loginchange centerall">
-				<li :class="{ loginactive: loginway === 1 }" @click="loginway = 1">用户名密码登录</li>
-				<li :class="{ loginactive: loginway === 2 }" @click="loginway = 2">手机验证码登录</li>
-			</ul>
-			<div class="formbox">
-				<template v-if="loginway === 1">
-					<a-form id="components-form-demo-normal-login" :form="form" class="login-form" @submit="userhandleSubmit">
-						<a-form-item style="text-align: left">
-							<a-input
-								v-decorator="[
+        </svg>-->
+        <img src="http://matripe.oss-cn-beijing.aliyuncs.com/bcSVG/dtLogo.png" style="width: 80px; text-align: center" alt />
+      </div>
+      <ul class="loginchange centerall">
+        <li :class="{ loginactive: loginway === 1 }" @click="loginway = 1">用户名密码登录</li>
+        <li :class="{ loginactive: loginway === 2 }" @click="loginway = 2">手机验证码登录</li>
+      </ul>
+      <div class="formbox">
+        <template v-if="loginway === 1">
+          <a-form id="components-form-demo-normal-login" :form="form" class="login-form" @submit="userhandleSubmit">
+            <a-form-item style="text-align: left">
+              <a-input v-decorator="[
 									'tel',
 									{
 										rules: [
-											{
-												required: true,
-												message: '请输入用户名',
-											},
-											{
-												pattern: /^1[3456789]\d{9}$/,
-												message: '请输入正确手机号',
-											},
+											{ required: true, message: '请输入用户名' },
+											{ pattern: /^1[3456789]\d{9}$/, message: '请输入正确手机号' },
 										],
 										validateTrigger: 'submit',
 									},
-								]"
-								:maxLength="11"
-								placeholder="请输入用户名"
-							>
-								<i slot="prefix" class="iconfont icon-yonghuming" style="font-size: 24px" />
-							</a-input>
-						</a-form-item>
-						<a-form-item style="text-align: left">
-							<a-input
-								v-decorator="[
+								]" :maxLength="11" placeholder="请输入用户名">
+                <i slot="prefix" class="iconfont icon-yonghuming" style="font-size: 24px" />
+              </a-input>
+            </a-form-item>
+            <a-form-item style="text-align: left">
+              <a-input v-decorator="[
 									'password',
 									{
 										rules: [
@@ -51,34 +40,31 @@
 										],
 										validateTrigger: 'submit',
 									},
-								]"
-								type="password"
-								placeholder="请输入密码"
-							>
-								<i slot="prefix" class="iconfont icon-mima" />
-							</a-input>
-						</a-form-item>
-						<div class="autologin">
-							<span @click="isauto = !isauto" style="opacity: 0">
-								<i class="iconfont icon-xuanzhong" v-if="isauto"></i>
-								<i class="iconfont icon-weixuanzhong" v-else style="color: #999"></i>
-								<label for="register">下次自动登录</label></span
-							>
-							<router-link to="updatepsw" class="login-form-forgot" href="">忘记密码</router-link>
-						</div>
-						<a-form-item>
-							<a-button type="primary" html-type="submit" class="login-form-button"> 登录 </a-button>
-						</a-form-item>
-					</a-form>
-					<!-- <div class="register">
+								]" type="password" placeholder="请输入密码">
+                <i slot="prefix" class="iconfont icon-mima" />
+              </a-input>
+            </a-form-item>
+            <div class="autologin">
+              <span @click="isauto = !isauto" style="opacity: 0">
+                <i class="iconfont icon-xuanzhong" v-if="isauto"></i>
+                <i class="iconfont icon-weixuanzhong" v-else style="color: #999"></i>
+                <label for="register">下次自动登录</label>
+              </span>
+              <!-- <router-link to="updatepsw" class="login-form-forgot" href>忘记密码</router-link> -->
+              <div @click="showModal" class="login-form-forgot" style="cursor:pointer">忘记密码</div>
+            </div>
+            <a-form-item>
+              <a-button type="primary" html-type="submit" class="login-form-button">登录</a-button>
+            </a-form-item>
+          </a-form>
+          <!-- <div class="register">
             <router-link to="/register">还没有账号，立即注册</router-link>
-          </div> -->
-				</template>
-				<template v-if="loginway === 2">
-					<a-form id="components-form-demo-normal-login" :form="form1" class="login-form" @submit="phonehandleSubmit">
-						<a-form-item style="text-align: left">
-							<a-input
-								v-decorator="[
+          </div>-->
+        </template>
+        <template v-if="loginway === 2">
+          <a-form id="components-form-demo-normal-login" :form="form1" class="login-form" @submit="phonehandleSubmit">
+            <a-form-item style="text-align: left">
+              <a-input v-decorator="[
 									'tel',
 									{
 										rules: [
@@ -90,17 +76,12 @@
 										],
 										validateTrigger: 'submit',
 									},
-								]"
-								autocomplete="off"
-								:maxLength="11"
-								placeholder="请输入手机号"
-							>
-								<i slot="prefix" class="icon-shouji iconfont" style="font-size: 24px" />
-							</a-input>
-						</a-form-item>
-						<a-form-item style="text-align: left">
-							<a-input
-								v-decorator="[
+								]" autocomplete="off" :maxLength="11" placeholder="请输入手机号">
+                <i slot="prefix" class="icon-shouji iconfont" style="font-size: 24px" />
+              </a-input>
+            </a-form-item>
+            <a-form-item style="text-align: left">
+              <a-input v-decorator="[
 									'code',
 									{
 										rules: [
@@ -111,335 +92,360 @@
 										],
 										validateTrigger: 'submit',
 									},
-								]"
-								type="text"
-								placeholder="请输入验证码"
-							>
-								<i slot="prefix" class="icon-duanxinyanzheng iconfont" />
-								<span class="getrulecode" slot="suffix"><span @click="getPhoneCode" data-mark="getcode" v-if="timedata.isfinish">获取验证码</span><timmer :timedata="timedata" v-if="!timedata.isfinish" /></span>
-							</a-input>
-						</a-form-item>
-						<div class="autologin">
-							<span @click="isauto = !isauto" style="opacity: 0">
-								<i class="iconfont icon-xuanzhong" v-if="isauto"></i>
-								<i class="iconfont icon-weixuanzhong" v-else style="color: #999"></i>
-								<label for="register">下次自动登录</label>
-							</span>
-							<router-link to="/updatepsw" class="login-form-forgot" href="">忘记密码</router-link>
-						</div>
-						<a-form-item>
-							<a-button type="primary" html-type="submit" class="login-form-button"> 登录 </a-button>
-						</a-form-item>
-					</a-form>
-					<!-- <div class="register">
+								]" type="text" placeholder="请输入验证码">
+                <i slot="prefix" class="icon-duanxinyanzheng iconfont" />
+                <span class="getrulecode" slot="suffix">
+                  <span @click="getPhoneCode" data-mark="getcode" v-if="timedata.isfinish">获取验证码</span>
+                  <timmer :timedata="timedata" v-if="!timedata.isfinish" />
+                </span>
+              </a-input>
+            </a-form-item>
+            <div class="autologin">
+              <span @click="isauto = !isauto" style="opacity: 0">
+                <i class="iconfont icon-xuanzhong" v-if="isauto"></i>
+                <i class="iconfont icon-weixuanzhong" v-else style="color: #999"></i>
+                <label for="register">下次自动登录</label>
+              </span>
+              <!-- <router-link to="/updatepsw" class="login-form-forgot" href>忘记密码</router-link> -->
+            </div>
+            <a-form-item>
+              <a-button type="primary" html-type="submit" class="login-form-button">登录</a-button>
+            </a-form-item>
+          </a-form>
+
+          <!-- <div class="register">
             <router-link to="/register">还没有账号，立即注册</router-link>
-          </div> -->
-				</template>
-			</div>
-		</div>
-	</div>
+          </div>-->
+        </template>
+        <a-modal title="找回密码" :width="760" footer :visible="loginShow" class="modal" @ok="handleOk" @cancel="handleCancel" :maskClosable="false" okText="提交" cancelText="取消" :destroyOnClose="true">
+          <loginpsw></loginpsw>
+        </a-modal>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
-import { loginApi, getPhoneCodeApi } from "../../api/login";
-import timmer from "./components/countback.vue";
-import Cookies from "js-cookie";
+import { loginApi, getPhoneCodeApi } from '../../api/login'
+import timmer from './components/countback.vue'
+import loginpsw from './updatepsw.vue'
+import Cookies from 'js-cookie'
 
 export default {
-	inject: ["reload"],
-	// 组件名称
-	name: "",
-	// 局部注册的组件
-	components: {
-		timmer,
-	},
-	// 组件参数 接收来自父组件的数据
-	props: {},
-	// 组件状态值
-	data() {
-		return {
-			loginway: 1,
-			ischecked: false,
-			isauto: false, // 是否自动登录
-			form: this.$form.createForm(this),
-			form1: this.$form.createForm(this),
-			timedata: {
-				isfinish: true,
-				deadline: 60,
-				timmer: null,
-			},
-		};
-	},
-	// 计算属性
-	computed: {},
-	// 侦听器
-	watch: {},
-	// 生命周期钩子   注：没用到的钩子请自行删除
-	/**
-	 * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
-	 */
-	created() {},
-	/**
-	 * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
-	 * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
-	 */
-	mounted() {},
-	// 组件方法
-	methods: {
-		userhandleSubmit(e) {
-			// 用户名登录提交
-			e.preventDefault();
-			let params;
-			this.form.validateFields(async (err, values) => {
-				console.log(values);
-				if (!err) {
-					params = { ...values, loginType: 0 };
+  inject: ['reload'],
+  // 组件名称
+  name: '',
+  // 局部注册的组件
+  components: {
+    timmer,
+    loginpsw,
+  },
+  // 组件参数 接收来自父组件的数据
+  props: {},
+  // 组件状态值
+  data() {
+    return {
+      loginway: 1,
+      ischecked: false,
+      isauto: false, // 是否自动登录
+      form: this.$form.createForm(this),
+      form1: this.$form.createForm(this),
+      timedata: {
+        isfinish: true,
+        deadline: 60,
+        timmer: null,
+      },
+      loginShow: false,
+    }
+  },
+  // 计算属性
+  computed: {},
+  // 侦听器
+  watch: {},
+  // 生命周期钩子   注：没用到的钩子请自行删除
+  /**
+   * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
+   */
+  created() {},
+  /**
+   * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
+   * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
+   */
+  mounted() {},
+  // 组件方法
+  methods: {
+    userhandleSubmit(e) {
+      // 用户名登录提交
+      e.preventDefault()
+      let params
+      this.form.validateFields(async (err, values) => {
+        console.log(values)
+        if (!err) {
+          params = { ...values, loginType: 0 }
 
-					console.log(params);
-					try {
-						const { data } = await loginApi(params);
+          console.log(params)
+          try {
+            const { data } = await loginApi(params)
 
-						console.log(data);
-						if (data.status !== 200) {
-							this.$message.warning(data.msg);
-							return;
-						}
-						localStorage.setItem("LOGIN_DATA", JSON.stringify(data.data));
-						this.$router.push("/list");
-						// console.log(Cookies.get("LOGIN_DATA"));
-						this.reload();
-						// this.$router.push("/list");
-					} catch (err) {
-						console.log(err);
-					}
-				} else {
-					console.log(err);
-				}
-			});
-		},
-		phonehandleSubmit(e) {
-			e.preventDefault();
-			let params;
-			this.form1.validateFields(async (err, values) => {
-				console.log(err);
-				if (!err) {
-					params = { ...values, loginType: 1 };
-					try {
-						const { data } = await loginApi(params);
-						console.log(data);
-						if (data.status !== 200) {
-							this.$message.warning(data.msg);
-							return;
-						}
-						localStorage.setItem("LOGIN_DATA", JSON.stringify(data.data));
-						this.$router.push("/list");
-						this.reload();
-					} catch (err) {
-						console.log(err);
-					}
-				} else {
-					console.log(err);
-				}
-			});
-		},
-		async getPhoneCode() {
-			const that = this;
+            console.log(data)
+            if (data.status !== 200) {
+              this.$message.warning(data.msg)
+              return
+            }
+            localStorage.setItem('LOGIN_DATA', JSON.stringify(data.data))
+            this.$router.push('/list')
+            // console.log(Cookies.get("LOGIN_DATA"));
+            this.reload()
+            // this.$router.push("/list");
+          } catch (err) {
+            console.log(err)
+          }
+        } else {
+          console.log(err)
+        }
+      })
+    },
+    phonehandleSubmit(e) {
+      e.preventDefault()
+      let params
+      this.form1.validateFields(async (err, values) => {
+        console.log(err)
+        if (!err) {
+          params = { ...values, loginType: 1 }
+          try {
+            const { data } = await loginApi(params)
+            console.log(data)
+            if (data.status !== 200) {
+              this.$message.warning(data.msg)
+              return
+            }
+            localStorage.setItem('LOGIN_DATA', JSON.stringify(data.data))
+            this.$router.push('/list')
+            this.reload()
+          } catch (err) {
+            console.log(err)
+          }
+        } else {
+          console.log(err)
+        }
+      })
+    },
+    async getPhoneCode() {
+      const that = this
 
-			this.form1.validateFields(["tel"], async (err, values) => {
-				console.log(values);
+      this.form1.validateFields(['tel'], async (err, values) => {
+        console.log(values)
 
-				if (!err) {
-					that.timedata.isfinish = false;
+        if (!err) {
+          that.timedata.isfinish = false
 
-					try {
-						const { data } = await getPhoneCodeApi({ tel: values.tel });
-						console.log(data);
-						if (data.status !== 200) {
-							this.$message.warning(data.msg);
-						}
-					} catch (error) {
-						console.log(error);
-					}
-				} else {
-					console.log(err);
-				}
-			});
-		},
-		checked() {
-			console.log(this.ischecked);
-		},
-	},
-};
+          try {
+            const { data } = await getPhoneCodeApi({ tel: values.tel })
+            console.log(data)
+            if (data.status !== 200) {
+              this.$message.warning(data.msg)
+            }
+          } catch (error) {
+            console.log(error)
+          }
+        } else {
+          console.log(err)
+        }
+      })
+    },
+    showModal() {
+      console.log('modal')
+      this.loginShow = true
+    },
+    /**
+     * 关闭忘记密码弹窗
+     *
+     *
+     */
+    handleCancel() {
+      this.loginShow = false
+    },
+    /**
+     * 提交更改密码信息
+     *
+     *
+     */
+    handleOk() {},
+    checked() {
+      console.log(this.ischecked)
+    },
+  },
+}
 </script>
 
 <style scoped lang="less">
 .center {
-	width: 240px;
-	margin: 0 auto;
-	overflow: hidden;
-	/deep/ .login-form {
-		background-color: #fff !important;
-	}
-	.centerall {
-		margin: 0 auto;
-	}
-	.logo {
-		margin: 30px auto 0px;
-		text-align: center;
-		// img {
-		//   width: 100%;
-		//   height: 100%;
-		// }
-		svg {
-			width: 150px;
-			// height: 46px;
-			text-align: center;
-			font-size: 52px;
-			line-height: 52px;
-			// color: initial;
-		}
-	}
-	.loginchange {
-		display: flex;
-		width: 230px;
-		justify-content: space-between;
-		margin-top: 10px;
+  width: 240px;
+  margin: 0 auto;
+  overflow: hidden;
+  /deep/ .login-form {
+    background-color: #fff !important;
+  }
+  .centerall {
+    margin: 0 auto;
+  }
+  .logo {
+    margin: 30px auto 0px;
+    text-align: center;
+    // img {
+    //   width: 100%;
+    //   height: 100%;
+    // }
+    svg {
+      width: 150px;
+      // height: 46px;
+      text-align: center;
+      font-size: 52px;
+      line-height: 52px;
+      // color: initial;
+    }
+  }
+  .loginchange {
+    display: flex;
+    width: 230px;
+    justify-content: space-between;
+    margin-top: 10px;
 
-		.loginactive {
-			color: #4d575e;
-			border-bottom: 1px solid #4d575e;
-		}
-		li {
-			padding: 0 0 4px 0;
-			margin-bottom: 24px;
-			margin-top: 20px;
-			font-size: 14px;
-			text-align: left;
-			color: #cccccc;
-			line-height: 22px;
-			cursor: pointer;
-		}
-	}
-	.formbox {
-		// /deep/ .ant-form-item {
-		// margin-bottom: 0px !important;
-		// padding-bottom: 20px !important;
-		// }
-		/deep/.ant-form-item {
-			// margin-top: -10px;
-			/deep/ .ant-form-explain {
-				// 提示信息的样式
-				margin-top: -2px;
-				line-height: 20px;
-				min-height: 20px !important;
-			}
-			i {
-				font-size: 26px;
-				// margin: 0 8px 0 4px;
-				color: #4d575e;
-			}
+    .loginactive {
+      color: #4d575e;
+      border-bottom: 1px solid #4d575e;
+    }
+    li {
+      padding: 0 0 4px 0;
+      margin-bottom: 24px;
+      margin-top: 20px;
+      font-size: 14px;
+      text-align: left;
+      color: #cccccc;
+      line-height: 22px;
+      cursor: pointer;
+    }
+  }
+  .formbox {
+    // /deep/ .ant-form-item {
+    // margin-bottom: 0px !important;
+    // padding-bottom: 20px !important;
+    // }
+    /deep/.ant-form-item {
+      // margin-top: -10px;
+      /deep/ .ant-form-explain {
+        // 提示信息的样式
+        margin-top: -2px;
+        line-height: 20px;
+        min-height: 20px !important;
+      }
+      i {
+        font-size: 26px;
+        // margin: 0 8px 0 4px;
+        color: #4d575e;
+      }
 
-			.ant-input {
-				height: 36px;
-				text-indent: 15px;
-				// background-color: #f6f6f6;
-				// border: none;
-				padding: 0 0 0 23px !important;
-				border: 1px solid #dddddd;
-				&:hover {
-					border-color: #ff4400;
-				}
-				&:focus {
-					box-shadow: none;
-				}
-				&::placeholder {
-					opacity: 0.4;
-					color: #4d575e;
-					font-size: 14px;
-					text-indent: 15px;
-				}
-			}
-		}
-		.login-form-button {
-			width: 100%;
-			height: 36px;
-			margin-top: 20px;
-			border-radius: 27px;
-			background-color: #ff4400;
-			font-size: 16px;
-			border: none;
-			color: white;
-			box-shadow: none;
-			&::after {
-				display: none;
-			}
-			&:hover {
-				background-color: #ff4400cc;
-			}
-			&:active {
-				background-color: #ff4400;
-			}
-		}
-		.register {
-			display: flex;
-			justify-content: center;
-			font-size: 12px;
-			span {
-				color: #4d575e;
-				i {
-					vertical-align: middle;
-					margin-right: 10px;
-				}
-			}
-			a {
-				color: #353649;
-			}
-		}
-		.autologin {
-			display: flex;
-			justify-content: space-between;
-			font-size: 12px;
-			margin-top: -16px;
-			> span {
-				cursor: pointer;
-				line-height: 18px;
-				margin-top: 2px;
-				i {
-					color: #ff4400;
-					font-size: 14px;
-					vertical-align: middle;
-					margin-right: 5px;
-				}
-				input {
-					margin-top: -3px;
-					vertical-align: bottom;
-				}
-				label {
-					transition: all 0.2s;
-					font-size: 12px;
-					&:hover {
-						color: #ff4400;
-					}
-				}
-			}
-			a {
-				color: #4d575e;
-			}
-		}
-		.getrulecode {
-			// padding: 0 0 0 10px;
-			font-size: 12px;
-			width: 67px;
-			text-align: center;
-			border-left: 1px #cccccc solid;
-			line-height: 12px;
-			color: #4d575e;
+      .ant-input {
+        height: 36px;
+        text-indent: 15px;
+        // background-color: #f6f6f6;
+        // border: none;
+        padding: 0 0 0 23px !important;
+        border: 1px solid #dddddd;
+        &:hover {
+          border-color: #ff4400;
+        }
+        &:focus {
+          box-shadow: none;
+        }
+        &::placeholder {
+          opacity: 0.4;
+          color: #4d575e;
+          font-size: 14px;
+          text-indent: 15px;
+        }
+      }
+    }
+    .login-form-button {
+      width: 100%;
+      height: 36px;
+      margin-top: 20px;
+      border-radius: 27px;
+      background-color: #ff4400;
+      font-size: 16px;
+      border: none;
+      color: white;
+      box-shadow: none;
+      &::after {
+        display: none;
+      }
+      &:hover {
+        background-color: #ff4400cc;
+      }
+      &:active {
+        background-color: #ff4400;
+      }
+    }
+    .register {
+      display: flex;
+      justify-content: center;
+      font-size: 12px;
+      span {
+        color: #4d575e;
+        i {
+          vertical-align: middle;
+          margin-right: 10px;
+        }
+      }
+      a {
+        color: #353649;
+      }
+    }
+    .autologin {
+      display: flex;
+      justify-content: space-between;
+      font-size: 12px;
+      margin-top: -16px;
+      > span {
+        cursor: pointer;
+        line-height: 18px;
+        margin-top: 2px;
+        i {
+          color: #ff4400;
+          font-size: 14px;
+          vertical-align: middle;
+          margin-right: 5px;
+        }
+        input {
+          margin-top: -3px;
+          vertical-align: bottom;
+        }
+        label {
+          transition: all 0.2s;
+          font-size: 12px;
+          &:hover {
+            color: #ff4400;
+          }
+        }
+      }
+      a {
+        color: #4d575e;
+      }
+    }
+    .getrulecode {
+      // padding: 0 0 0 10px;
+      font-size: 12px;
+      width: 67px;
+      text-align: center;
+      border-left: 1px #cccccc solid;
+      line-height: 12px;
+      color: #4d575e;
 
-			span[data-mark="getcode"] {
-				padding: 0 0 0 5px;
-				cursor: pointer;
-			}
-		}
-	}
+      span[data-mark='getcode'] {
+        padding: 0 0 0 5px;
+        cursor: pointer;
+      }
+    }
+  }
 }
 </style>
diff --git a/src/components/Login/updatepsw.vue b/src/components/Login/updatepsw.vue
index 23909d2..6a2431f 100644
--- a/src/components/Login/updatepsw.vue
+++ b/src/components/Login/updatepsw.vue
@@ -1,21 +1,15 @@
 <template>
   <div class="center">
     <div class="formcontainer">
-      <ul class="loginchange centerall">
+      <!-- <ul class="loginchange centerall">
         <router-link to="/login"><li class="goback">&lt;返回</li></router-link>
         <li class="loginactive">找回密码</li>
-      </ul>
+      </ul>-->
       <div class="formbox">
         <template>
-          <a-form
-            id="components-form-demo-normal-login"
-            :form="form1"
-            class="login-form"
-            @submit="phonehandleSubmit"
-          >
-            <a-form-item style="text-align: left">
-              <a-input
-                v-decorator="[
+          <a-form id="components-form-demo-normal-login" hideRequiredMark :form="form1" class="login-form" @submit="phonehandleSubmit" layout="horizontal" :wrapperCol="{ span: 14 }" :labelCol="{ span: 4 }">
+            <a-form-item label="手机号" style="text-align: left;">
+              <a-input v-decorator="[
                   'tel',
                   {
                     rules: [
@@ -27,21 +21,12 @@
                     ],
                     validateTrigger: 'submit',
                   },
-                ]"
-                autocomplete="off"
-                :maxLength="11"
-                placeholder="请输入手机号"
-              >
-                <i
-                  slot="prefix"
-                  class="icon-shouji iconfont"
-                  style="font-size: 24px"
-                />
+                ]" autocomplete="off" :maxLength="11" placeholder="请输入手机号">
+                <!-- <i slot="prefix" class="icon-shouji iconfont" style="font-size: 24px" /> -->
               </a-input>
             </a-form-item>
-            <a-form-item style="text-align: left">
-              <a-input
-                v-decorator="[
+            <a-form-item label="验证码" style="text-align: left">
+              <a-input style="width:unset" v-decorator="[
                   'code',
                   {
                     rules: [
@@ -52,51 +37,38 @@
                     ],
                     validateTrigger: 'submit',
                   },
-                ]"
-                type="text"
-                placeholder="请输入短信验证码"
-              >
-                <i slot="prefix" class="icon-duanxinyanzheng iconfont" />
-                <span class="getrulecode" slot="suffix"
-                  ><span
-                    @click="getPhoneCode"
-                    data-mark="getcode"
-                    v-if="timedata.isfinish"
-                    >获取验证码</span
-                  ><timmer :timedata="timedata" v-if="!timedata.isfinish"
-                /></span>
+                ]" type="text" placeholder="请输入短信验证码">
+                <!-- <i slot="prefix" class="icon-duanxinyanzheng iconfont" /> -->
+                <span class="getrulecode" slot="suffix">
+                  <span @click="getPhoneCode" data-mark="getcode" v-if="timedata.isfinish">获取验证码</span>
+                  <timmer :timedata="timedata" v-if="!timedata.isfinish" />
+                </span>
               </a-input>
             </a-form-item>
-            <a-form-item style="text-align: left">
-              <a-input
-                @input="getpassword"
-                v-decorator="[
+            <a-form-item label="新密码" style="text-align: left">
+              <a-input @input="getpassword" v-decorator="[
                   'password',
                   {
                     rules: [
                       {
                         required: true,
-                        message: '请输入密码',
+                        message: '请输入新密码',
                       },
                     ],
                     validateTrigger: 'submit',
                   },
-                ]"
-                type="password"
-                placeholder="请输入密码"
-              >
-                <i slot="prefix" class="iconfont icon-mima" />
+                ]" type="password" placeholder="请输入密码">
+                <!-- <i slot="prefix" class="iconfont icon-mima" /> -->
               </a-input>
             </a-form-item>
-            <a-form-item style="text-align: left">
-              <a-input
-                v-decorator="[
+            <a-form-item label="确认密码" style="text-align: left">
+              <a-input v-decorator="[
                   'newpassword',
                   {
                     rules: [
                       {
                         required: true,
-                        message: '请再次输入密码',
+                        message: '请再次输入新密码',
                       },
                       {
                         validator: replacepassword,
@@ -105,26 +77,18 @@
                     validateTrigger: 'submit',
                     validateFirst: true,
                   },
-                ]"
-                type="password"
-                placeholder="请再次输入密码"
-              >
-                <i slot="prefix" class="iconfont icon-mima" />
+                ]" type="password" placeholder="请再次输入密码">
+                <!-- <i slot="prefix" class="iconfont icon-mima" /> -->
               </a-input>
             </a-form-item>
-            <a-form-item>
-              <a-button
-                type="primary"
-                html-type="submit"
-                class="login-form-button"
-              >
-                提交
-              </a-button>
+            <a-form-item label class="submit" :wrapperCol="{ span: 16 }" :labelCol="{ span: 4}">
+              <a-button type="primary" class="cancel login-form-button">取消</a-button>
+              <a-button type="primary" html-type="submit" :loading="btnLoading" class="login-form-button">确定</a-button>
             </a-form-item>
           </a-form>
           <!-- <div class="register">
             <router-link to="/register">还没有账号，立即注册</router-link>
-          </div> -->
+          </div>-->
         </template>
       </div>
     </div>
@@ -132,13 +96,13 @@
 </template>
 
 <script>
-import { getPhoneCodeApi, updatePswApi } from "../../api/login";
-import timmer from "./components/countback.vue";
+import { getPhoneCodeApi, updatePswApi } from '../../api/login'
+import timmer from './components/countback.vue'
 
 export default {
-  inject: ["reload"],
+  inject: ['reload'],
   // 组件名称
-  name: "",
+  name: 'updatepsw',
   // 局部注册的组件
   components: {
     timmer,
@@ -150,14 +114,15 @@ export default {
     return {
       loginway: 1,
       ischecked: false,
-      setpassword: "", // 重置密码的密码字段
+      setpassword: '', // 重置密码的密码字段
       form1: this.$form.createForm(this),
       timedata: {
         isfinish: true,
         deadline: 60,
         timmer: null,
       },
-    };
+      btnLoading: false,
+    }
   },
   // 计算属性
   computed: {},
@@ -176,81 +141,99 @@ export default {
   // 组件方法
   methods: {
     phonehandleSubmit(e) {
-      e.preventDefault();
-      let params;
+      e.preventDefault()
+      this.btnLoading = true
+      let params = new FormData()
       this.form1.validateFields(async (err, values) => {
-        console.log(err);
-        console.log(values);
+        console.log(err)
+        console.log(values)
         if (!err) {
-          params = { ...values };
+          params.code = values.code
+          params.newpassword = values.newpassword
+          params.password = values.password
+          params.tel = values.tel
+          console.log(params)
           try {
-            const { data } = await updatePswApi(params);
-            console.log(data);
+            const { data } = await updatePswApi(params)
+            console.log(data)
             if (data.status !== 200) {
-              this.$message.warning(data.msg);
-              return;
+              this.$message.warning(data.msg)
+              return
             }
+
             // localStorage.setItem("LOGIN_DATA", JSON.stringify(data.data));
-            this.$router.push("/login");
-            this.reload();
+            setTimeout(() => {
+              this.$message.success('密码修改成功')
+              this.btnLoading = false
+              this.$router.push('/login')
+              this.reload()
+            }, 2000)
           } catch (err) {
-            console.log(err);
+            this.btnLoading = false
+            console.log(err)
           }
         } else {
-          console.log(err);
+          this.btnLoading = false
+          console.log(err)
         }
-      });
+      })
     },
     async getPhoneCode() {
-      const that = this;
+      const that = this
 
-      this.form1.validateFields(["tel"], async (err, values) => {
-        console.log(values);
+      this.form1.validateFields(['tel'], async (err, values) => {
+        console.log(values)
 
         if (!err) {
-          that.timedata.isfinish = false;
+          that.timedata.isfinish = false
 
           try {
-            const { data } = await getPhoneCodeApi({ tel: values.tel });
-            console.log(data);
+            const { data } = await getPhoneCodeApi({ tel: values.tel })
+            console.log(data)
             if (data.status !== 200) {
-              this.$message.warning(data.msg);
+              this.$message.warning(data.msg)
             }
           } catch (error) {
-            console.log(error);
+            console.log(error)
           }
         } else {
-          console.log(err);
+          console.log(err)
         }
-      });
+      })
     },
     checked() {
-      console.log(this.ischecked);
+      console.log(this.ischecked)
     },
     getpassword(e) {
-      this.setpassword = e.target.value;
-      console.log(e);
+      this.setpassword = e.target.value
+      console.log(e)
     },
     // 检验密码不一致的回调
     replacepassword(rule, value, callback) {
-      console.log(rule);
-      console.log(value);
+      console.log(rule)
+      console.log(value)
       if (this.setpassword !== value) {
-        callback("两次密码不一致");
+        callback('两次密码不一致')
       }
-      callback();
+      callback()
 
       // console.log(callback);
     },
   },
-};
+}
 </script>
 
 <style scoped lang="less">
+.submit {
+  display: flex;
+  justify-content: center;
+}
 .center {
-  width: 240px;
+  width: unset !important;
   overflow: hidden;
-  margin: 0 auto;
+  display: flex;
+  justify-content: center;
+  // margin: 0 auto;
   /deep/ .login-form {
     background-color: #fff !important;
   }
@@ -293,30 +276,41 @@ export default {
   }
   .formbox {
     // /deep/ .ant-form-item {
-    // margin-bottom: 0px !important;
-    // padding-bottom: 20px !important;
-    // }
-    // .ant-form-item {
-    // margin-top: -8px !important;
+    //   margin-bottom: 0px !important;
+    //   padding-bottom: 20px !important;
+    //   display: flex;
     // }
+    .ant-form-item {
+      display: flex;
+      align-items: center;
+    }
     /deep/ .ant-form-explain {
       margin-top: -2px;
       line-height: 20px;
       min-height: 20px !important;
     }
+    /deep/.ant-form-item-control {
+      width: 430px !important;
+      .ant-input-affix-wrapper {
+        display: flex;
+        flex: 1;
+      }
+    }
+
     /deep/.ant-input-affix-wrapper {
       i {
         font-size: 26px;
         // margin: 0 8px 0 4px;
         color: #4d575e;
       }
-
       .ant-input {
-        height: 36px;
-        text-indent: 15px;
+        height: 40px;
         // background-color: #f6f6f6;
+        // width: 430px;
+        text-indent: 15px;
+        font-size: 16px;
         // border: none;
-        padding: 0 0 0 23px !important;
+        padding: 0 !important;
         border: 1px solid #dddddd;
         &:hover {
           border-color: #ff4400;
@@ -327,21 +321,34 @@ export default {
         &::placeholder {
           opacity: 0.4;
           color: #4d575e;
-          font-size: 14px;
+          font-size: 16px;
           text-indent: 15px;
         }
       }
     }
-    .login-form-button {
-      width: 100%;
-      height: 36px;
-      margin-top: 8px;
-      border-radius: 27px;
-      background-color: #ff4400;
+    .ant-input {
+      height: 40px;
+      // background-color: #f6f6f6;
+      // width: 430px;
+      text-indent: 15px;
       font-size: 16px;
-      border: none;
-      color: white;
+      // border: none;
+      padding: 0 !important;
+      border: 1px solid #dddddd;
+      &:hover {
+        border-color: #ff4400;
+      }
+      &:focus {
+        box-shadow: none;
+      }
+      &::placeholder {
+        opacity: 0.4;
+        color: #4d575e;
+        font-size: 16px;
+        text-indent: 15px;
+      }
     }
+
     .register {
       display: flex;
       justify-content: center;
@@ -357,30 +364,7 @@ export default {
         color: #353649;
       }
     }
-    .autologin {
-      display: flex;
-      justify-content: space-between;
-      font-size: 12px;
-      > span {
-        cursor: pointer;
-        line-height: 18px;
-        margin-top: 2px;
 
-        input {
-          margin-top: -3px;
-          vertical-align: bottom;
-        }
-        label {
-          transition: all 0.2s;
-        }
-        &:hover {
-          color: #ff4400;
-        }
-      }
-      a {
-        color: #4d575e;
-      }
-    }
     .getrulecode {
       font-size: 12px;
       width: 67px;
@@ -388,11 +372,32 @@ export default {
       border-left: 1px #cccccc solid;
       line-height: 12px;
       color: #4d575e;
-      span[data-mark="getcode"] {
+      span[data-mark='getcode'] {
         padding: 0 0 0 5px;
         cursor: pointer;
       }
     }
   }
+  .cancel.login-form-button {
+    background-color: #fff;
+    color: #ff4400;
+    border: 1px solid #ff4400;
+    margin-right: 16px;
+  }
+  .login-form-button {
+    width: 96px;
+    height: 32px;
+    margin-top: 16px;
+    border-radius: 0px;
+    background-color: #ff4400;
+    font-size: 14px;
+    border: none;
+    color: white;
+    padding: 0 !important;
+    line-height: 32px;
+  }
+  .login-form-button span {
+    letter-spacing: 1px;
+  }
 }
 </style>
diff --git a/src/components/main/index.vue b/src/components/main/index.vue
index 0a77d1a..4eba938 100644
--- a/src/components/main/index.vue
+++ b/src/components/main/index.vue
@@ -1,112 +1,112 @@
 <template>
-	<!-- 首页页面 -->
-	<div class="main-container">
-		<div class="bgimg">
-			<a-carousel :autoplay="true" effect="fade" :dots="false" ref="scrollimg">
-				<img :src="item" alt="" v-for="(item, index) in imglist" :key="index" />
-			</a-carousel>
-			<div class="middleslogan" :style="{ opacity: isshow ? '1' : '0' }">
-				<!-- </i> -->
-				<i class="iconfont" style="margin-bottom: 20px">
-					<img src="http://matripe.oss-cn-beijing.aliyuncs.com/bcSVG/zzlogo.png" style="width: 140px !important; height: 70px; margin-bottom: 30px" alt="" />
-				</i>
+  <!-- 首页页面 -->
+  <div class="main-container">
+    <div class="bgimg">
+      <a-carousel :autoplay="true" effect="fade" :dots="false" ref="scrollimg">
+        <img :src="item" alt v-for="(item, index) in imglist" :key="index" />
+      </a-carousel>
+      <div class="middleslogan" :style="{ opacity: isshow ? '1' : '0' }">
+        <!-- </i> -->
+        <i class="iconfont" style="margin-bottom: 20px">
+          <img src="http://matripe.oss-cn-beijing.aliyuncs.com/bcSVG/zzlogo.png" style="width: 140px !important; height: 70px; margin-bottom: 30px" alt />
+        </i>
 
-				<i class="iconfont icon-yigezhuanmenfuwudailidepingtai"></i>
-				<!-- <p style="font-size:90px;color:white">一个专门服务代理的平台</p> -->
-				<div v-if="isLogin">
-					<router-link to="/list" style="display: inline-block; width: 100%">查看职位</router-link>
-				</div>
-				<div v-else>
-					<router-link to="/list" style="display: inline-block; width: 100%">登录</router-link>
-				</div>
-			</div>
-			<div id="toAboutBill" style="height: 84px; width: 1200px; position: absolute; bottom: 0;display:none"></div>
-		</div>
-		<div class="navigationBar" ref="navigationBar" id="navigationBar" style="display:none">
-			<!-- <ul>
+        <i class="iconfont icon-yigezhuanmenfuwudailidepingtai"></i>
+        <!-- <p style="font-size:90px;color:white">一个专门服务代理的平台</p> -->
+        <div v-if="isLogin">
+          <router-link to="/list" style="display: inline-block; width: 100%">进入稻田</router-link>
+        </div>
+        <div v-else>
+          <router-link to="/list" style="display: inline-block; width: 100%">登录</router-link>
+        </div>
+      </div>
+      <div id="toAboutBill" style="height: 84px; width: 1200px; position: absolute; bottom: 0;display:none"></div>
+    </div>
+    <div class="navigationBar" ref="navigationBar" id="navigationBar" style="display:none">
+      <!-- <ul>
 				<li @click="toTargetLocation('aboutBill')">关于稻田</li>
 				<li @click="toTargetLocation('cooperativeBrand')">合作品牌</li>
 				<li @click="toTargetLocation('businessLandscape')">业务版图</li>
 				<li @click="toTargetLocation('relationUs')">联系我们</li>
-			</ul> -->
-			<a-anchor @click.prevent="" :affix="true">
-				<a-anchor-link href="#toAboutBill" title="关于稻田" />
-				<a-anchor-link href="#cooperativeBrand" title="合作品牌" />
-				<a-anchor-link href="#businessLandscape" title="业务版图" />
-				<a-anchor-link href="#relationUs" title="联系我们" />
-			</a-anchor>
-		</div>
+      </ul>-->
+      <a-anchor @click.prevent :affix="true">
+        <a-anchor-link href="#toAboutBill" title="关于稻田" />
+        <a-anchor-link href="#cooperativeBrand" title="合作品牌" />
+        <a-anchor-link href="#businessLandscape" title="业务版图" />
+        <a-anchor-link href="#relationUs" title="联系我们" />
+      </a-anchor>
+    </div>
 
-		<div class="aboutBill" id="aboutBill" style="display:none">
-			<div class="w">
-				<div class="title">关于稻田</div>
-				<div class="content">
-					<p>伯才稻田，隶属郑州伯才科技有限公司，是一个专门服务同业合作伙伴的综合平台——一个专门服务代理的平台。平台为合作伙伴提供交付全流程的产品和服务，是伯才供应链产品矩阵中的旗舰产品。平台通过直签、联合派遣和战略合作等方式，严选上线项目，深度介入服务的每一个环节，为合作伙伴的顺利交付保驾护航。</p>
-					<p>郑州伯才科技有限公司的前身为北京矩阵动力科技有限公司，项目于2015年5月在郑州启动，并于2016年5月在北京正式注册公司，开始商业化运作。伯才科技旗下有郑州伯才人力资源服务有限公司、江西人海企业管理有限公司等多家企业服务业务公司。</p>
-					<p>公司2021年启用全新品牌——伯才。“新品牌、新里程”，品牌升级，但初心不变，伯才团队以崭新的面貌继续全心全意服务老乡、成就伙伴。</p>
-				</div>
-			</div>
-		</div>
-		<div class="cooperativeBrand" id="cooperativeBrand" style="display:none">
-			<div class="w">
-				<div class="title">合作品牌</div>
-				<div class="content">
-					<ul class="clearfix">
-						<li v-for="item in cooperativeImg" :key="item">
-							<img :src="`../../../${item}`" alt="" />
-						</li>
-					</ul>
-					<span style="float: right; font-size: 14px; line-height: 20px; margin-top: 16px">* 部分合作品牌展示</span>
-				</div>
-			</div>
-		</div>
-		<div class="businessLandscape" id="businessLandscape" style="display:none">
-			<div class="w">
-				<div class="title">业务版图</div>
-				<div class="content">
-					<div class="left">
-						<p>伯才合作项目</p>
+    <div class="aboutBill" id="aboutBill" style="display:none">
+      <div class="w">
+        <div class="title">关于稻田</div>
+        <div class="content">
+          <p>伯才稻田，隶属郑州伯才科技有限公司，是一个专门服务同业合作伙伴的综合平台——一个专门服务代理的平台。平台为合作伙伴提供交付全流程的产品和服务，是伯才供应链产品矩阵中的旗舰产品。平台通过直签、联合派遣和战略合作等方式，严选上线项目，深度介入服务的每一个环节，为合作伙伴的顺利交付保驾护航。</p>
+          <p>郑州伯才科技有限公司的前身为北京矩阵动力科技有限公司，项目于2015年5月在郑州启动，并于2016年5月在北京正式注册公司，开始商业化运作。伯才科技旗下有郑州伯才人力资源服务有限公司、江西人海企业管理有限公司等多家企业服务业务公司。</p>
+          <p>公司2021年启用全新品牌——伯才。“新品牌、新里程”，品牌升级，但初心不变，伯才团队以崭新的面貌继续全心全意服务老乡、成就伙伴。</p>
+        </div>
+      </div>
+    </div>
+    <div class="cooperativeBrand" id="cooperativeBrand" style="display:none">
+      <div class="w">
+        <div class="title">合作品牌</div>
+        <div class="content">
+          <ul class="clearfix">
+            <li v-for="item in cooperativeImg" :key="item">
+              <img :src="`../../../${item}`" alt />
+            </li>
+          </ul>
+          <span style="float: right; font-size: 14px; line-height: 20px; margin-top: 16px">* 部分合作品牌展示</span>
+        </div>
+      </div>
+    </div>
+    <div class="businessLandscape" id="businessLandscape" style="display:none">
+      <div class="w">
+        <div class="title">业务版图</div>
+        <div class="content">
+          <div class="left">
+            <p>伯才合作项目</p>
 
-						<p>触达城市100+</p>
-						<p>辐射18个省及直辖市</p>
-						<p>覆盖华东、华南、华中、华北、西南、西北6大区域</p>
-					</div>
-					<div class="right">
-						<img src="http://matripe.oss-cn-beijing.aliyuncs.com/yishoudan/map.svg" alt="" />
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="relationUs" id="relationUs" style="display:none">
-			<div class="w">
-				<div class="title">联系我们</div>
-				<div class="content">
-					<div class="left">
-						<p>总部地址：河南省郑州市郑东新区升龙广场2号楼A座</p>
-						<!-- <p>接待地址：河南省郑州市航空港区相州街29-60号</p> -->
-						<p>联系电话：0371-6611 3723</p>
-					</div>
-					<div class="right">
-						<span
-							><img src="http://matripe.oss-cn-beijing.aliyuncs.com/bcSVG/bcdtgzh.jpg" style="width: 100px" alt="" />
-							<p>伯才稻田公众号</p></span
-						>
-						<span
-							><img src="http://matripe.oss-cn-beijing.aliyuncs.com/bcSVG/bcdtxcx.jpg" style="width: 100px" alt="" />
-							<p>伯才稻田小程序</p></span
-						>
-					</div>
-				</div>
-			</div>
-		</div>
-		<!-- <div class="banner">
+            <p>触达城市100+</p>
+            <p>辐射18个省及直辖市</p>
+            <p>覆盖华东、华南、华中、华北、西南、西北6大区域</p>
+          </div>
+          <div class="right">
+            <img src="http://matripe.oss-cn-beijing.aliyuncs.com/yishoudan/map.svg" alt />
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="relationUs" id="relationUs" style="display:none">
+      <div class="w">
+        <div class="title">联系我们</div>
+        <div class="content">
+          <div class="left">
+            <p>总部地址：河南省郑州市郑东新区升龙广场2号楼A座</p>
+            <!-- <p>接待地址：河南省郑州市航空港区相州街29-60号</p> -->
+            <p>联系电话：0371-6611 3723</p>
+          </div>
+          <div class="right">
+            <span>
+              <img src="http://matripe.oss-cn-beijing.aliyuncs.com/bcSVG/bcdtgzh.jpg" style="width: 100px" alt />
+              <p>伯才稻田公众号</p>
+            </span>
+            <span>
+              <img src="http://matripe.oss-cn-beijing.aliyuncs.com/bcSVG/bcdtxcx.jpg" style="width: 100px" alt />
+              <p>伯才稻田小程序</p>
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- <div class="banner">
 			<div class="w">
 				<i class="iconfont icon-yigezhuanmenfuwudailidepingtai"></i>
 			</div>
-		</div> -->
-		<footer>
-			<div class="w">
-				<!-- <ul>
+    </div>-->
+    <footer>
+      <div class="w">
+        <!-- <ul>
 					<li @click="totop"><router-link to="/list">一手职位</router-link></li>
 					<li></li>
 					<li @click="totop">
@@ -116,393 +116,395 @@
 					<li @click="totop">
 						<router-link to="/aboutus">关于我们</router-link>
 					</li>
-				</ul> -->
-				<div>
-					Copyright © 2015 - 2022 Bocai. All Rights Reserved. <i></i>
-					<a target="_blank" href="https://beian.miit.gov.cn/#/Integrated/index">豫ICP备2023001993号</a>
-				</div>
-			</div>
-		</footer>
-	</div>
+        </ul>-->
+        <div>
+          Copyright © 2015 - 2022 Bocai. All Rights Reserved.
+          <i></i>
+          <a target="_blank" href="https://beian.miit.gov.cn/#/Integrated/index">豫ICP备2023001993号</a>
+        </div>
+      </div>
+    </footer>
+  </div>
 </template>
 
 <script>
-import Vue from "vue";
-import Cookies from "js-cookie";
-const path = require("path");
-const files = require.context("../../../static/img", false, /.png$/);
+import Vue from 'vue'
+import Cookies from 'js-cookie'
+const path = require('path')
+const files = require.context('../../../static/img', false, /.png$/)
 
 // const modules = {}
 
-console.dir(Vue);
+console.dir(Vue)
 export default {
-	// 组件名称
-	name: "Main",
-	// 局部注册的组件
-	components: {},
-	// 组件参数 接收来自父组件的数据
-	props: {},
-	// 组件状态值
-	data() {
-		return {
-			isshow: false,
-			imglist: ["http://matripe.oss-cn-beijing.aliyuncs.com/yishoudan/newBanner/banner1.webp", "http://matripe.oss-cn-beijing.aliyuncs.com/yishoudan/newBanner/banner2.webp", "http://matripe.oss-cn-beijing.aliyuncs.com/yishoudan/newBanner/banner3.webp"],
-			cooperativeImg: [],
-			isLogin: false,
-		};
-	},
-	// 计算属性
-	computed: {},
-	// 侦听器
-	watch: {},
-	// 生命周期钩子   注：没用到的钩子请自行删除
-	/**
-	 * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
-	 */
-	created() {
-		if (localStorage.getItem("LOGIN_DATA")) {
-			this.isLogin = true;
-		}
-		setTimeout(() => {
-			this.isshow = true;
-		}, 500);
-	},
-	/**
-	 * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
-	 * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
-	 */
-	mounted() {
-		this.getCooperativeImg();
-		// console.log(navigationBar);
-	},
-	// 组件方法
-	methods: {
-		changeStyle(e) {
-			console.log(e);
-			console.log(1);
-		},
+  // 组件名称
+  name: 'Main',
+  // 局部注册的组件
+  components: {},
+  // 组件参数 接收来自父组件的数据
+  props: {},
+  // 组件状态值
+  data() {
+    return {
+      isshow: false,
+      imglist: ['http://matripe.oss-cn-beijing.aliyuncs.com/yishoudan/newBanner/banner1.webp', 'http://matripe.oss-cn-beijing.aliyuncs.com/yishoudan/newBanner/banner2.webp', 'http://matripe.oss-cn-beijing.aliyuncs.com/yishoudan/newBanner/banner3.webp'],
+      cooperativeImg: [],
+      isLogin: false,
+    }
+  },
+  // 计算属性
+  computed: {},
+  // 侦听器
+  watch: {},
+  // 生命周期钩子   注：没用到的钩子请自行删除
+  /**
+   * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
+   */
+  created() {
+    if (localStorage.getItem('LOGIN_DATA')) {
+      this.isLogin = true
+    }
+    setTimeout(() => {
+      this.isshow = true
+    }, 500)
+  },
+  /**
+   * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
+   * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
+   */
+  mounted() {
+    this.getCooperativeImg()
+    // console.log(navigationBar);
+  },
+  // 组件方法
+  methods: {
+    changeStyle(e) {
+      console.log(e)
+      console.log(1)
+    },
 
-		getCooperativeImg() {
-			files.keys().forEach((key) => {
-				const names = path.basename(key, ".png"); //返回文件名 不含后缀名
-				let content = files(key).default || files(key);
-				if (names.indexOf("imgList") != -1 && names.substr(names.length - 1, 1) == "1") {
-					this.cooperativeImg.push(content);
-				}
-			});
-		},
-		// toTargetLocation(target) {
-		// 	// console.log(123);
-		// 	const now = window.scrollY;
-		// 	// 2. 目标位置（文章信息区域的高度）
-		// 	const dist = document.getElementById(target).getBoundingClientRect().top;
-		// 	console.log(dist);
-		// 	animate({
-		// 		from: now, // 当前的位置
-		// 		to: dist, // 目标位置
-		// 		onUpdate: (latest) => window.scrollTo(0, latest),
-		// 	});
-		// },
-		totop() {
-			// console.log(window);
-			document.body.scrollTop = 0;
-			document.documentElement.scrollTop = 0;
-			// window.body.scrollY = 0;
-		},
-	},
-};
+    getCooperativeImg() {
+      files.keys().forEach((key) => {
+        const names = path.basename(key, '.png') //返回文件名 不含后缀名
+        let content = files(key).default || files(key)
+        if (names.indexOf('imgList') != -1 && names.substr(names.length - 1, 1) == '1') {
+          this.cooperativeImg.push(content)
+        }
+      })
+    },
+    // toTargetLocation(target) {
+    // 	// console.log(123);
+    // 	const now = window.scrollY;
+    // 	// 2. 目标位置（文章信息区域的高度）
+    // 	const dist = document.getElementById(target).getBoundingClientRect().top;
+    // 	console.log(dist);
+    // 	animate({
+    // 		from: now, // 当前的位置
+    // 		to: dist, // 目标位置
+    // 		onUpdate: (latest) => window.scrollTo(0, latest),
+    // 	});
+    // },
+    totop() {
+      // console.log(window);
+      document.body.scrollTop = 0
+      document.documentElement.scrollTop = 0
+      // window.body.scrollY = 0;
+    },
+  },
+}
 </script>
 
 <style scoped lang="less">
 .clearfix:after {
-	/*伪元素是行内元素 正常浏览器清除浮动方法*/
-	content: "";
-	display: block;
-	height: 0;
-	clear: both;
-	visibility: hidden;
+  /*伪元素是行内元素 正常浏览器清除浮动方法*/
+  content: '';
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
 }
 .main-container {
-	overflow: hidden;
-	.bgimg {
-		position: relative;
-		overflow: hidden;
-		width: 100vw;
-		height: calc(100% - 40px);
-		// height: 100%;
-		// background: url("../../assets/banner1.png") no-repeat center;
-		img {
-			width: 100% !important;
-			height: calc(100vh - 40px);
-		}
-		.middleslogan {
-			position: absolute;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			top: 45%;
-			left: 50%;
-			transform: translateX(-50%) translateY(-50%);
-			color: #fff;
-			z-index: 99;
-			transition: all 1.5s;
-			p {
-				text-align: center;
-				font-weight: 100;
-				width: 1200px;
-				letter-spacing: 10px;
-			}
-			i {
-				text-shadow: 3px 3px 10px rgba(0, 0, 0, 0.4);
-			}
-			i:nth-of-type(1) {
-				font-size: 24px;
-				margin-bottom: 30px;
-			}
-			i:nth-of-type(2) {
-				font-size: 64px;
-				line-height: 1;
-			}
-			div {
-				width: 100px;
-				height: 32px;
-				margin-top: 115px;
-				font-size: 14px;
-				line-height: 29px;
-				text-align: center;
-				border-radius: 999px;
-				cursor: pointer;
-				color: #fff;
-				border: 1px solid #fff;
-				text-shadow: 3px 3px 10px rgba(0, 0, 0, 0.4);
-				background-color: rgba(255, 255, 255, 0);
-				transition: all 0.3s;
-				&:hover {
-					background-color: rgba(255, 255, 255, 0.3);
-					border-color: transparent;
-				}
-			}
-		}
-		.bottominfo {
-			position: absolute;
-			bottom: 40px;
-			left: 50%;
-			font-size: 14px;
-			transform: translateX(-50%);
-			color: #fff;
-		}
-	}
-	/deep/ .navigationBar {
-		overflow: hidden;
-		width: 1200px;
-		height: 84px;
-		position: absolute;
-		bottom: 0;
-		left: 50%;
-		border-radius: 8px 8px 0 0;
-		overflow: hidden;
-		transform: translateX(-50%);
-		transition: all 0.2s;
-		z-index: 999;
-		.ant-anchor {
-			display: flex;
-			height: 84px;
-			margin: 0 auto;
-			justify-content: center;
-			align-items: center;
-			background-color: #fff;
-			> div {
-				margin: 0 52px;
-				font-size: 16px;
-			}
-			.ant-anchor-link-active > .ant-anchor-link-title {
-				color: #ff4400;
-			}
-			.ant-anchor-ink {
-				display: none;
-			}
-		}
-	}
-	.aboutBill,
-	.cooperativeBrand,
-	.businessLandscape,
-	.relationUs {
-		padding-top: 25px;
-		padding-bottom: 70px;
-		background-color: #fff;
-		.title {
-			position: relative;
-			text-align: center;
-			font-size: 24px;
-			line-height: 33px;
-			padding-bottom: 12px;
-			&:after {
-				content: "";
-				display: block;
-				width: 30px;
-				height: 2px;
-				position: absolute;
-				background-color: #ff4400;
-				bottom: 0;
-				left: 50%;
-				transform: translateX(-50%);
-			}
-		}
-		.content {
-			margin-top: 50px;
-			font-size: 18px;
-			line-height: 40px;
-			> p {
-				text-indent: 2em;
-				margin-bottom: 20px;
-			}
-		}
-	}
-	.cooperativeBrand {
-		padding-top: 100px;
-		// padding-bottom: 96px;
-		height: 740px;
-		background: url("http://matripe.oss-cn-beijing.aliyuncs.com/yishoudan/cooperativeBrandBg.webp") no-repeat 100%;
-		.content {
-			ul {
-				li {
-					float: left;
-					width: 186px;
-					height: 88px;
-					margin-top: 16px;
-					border-radius: 8px;
-					transition: all 0.2s;
-					&:not(li:nth-child(6n)) {
-						margin-right: 16px;
-					}
+  overflow: hidden;
+  .bgimg {
+    position: relative;
+    overflow: hidden;
+    width: 100vw;
+    height: calc(100%);
+    // height: 100%;
+    // background: url("../../assets/banner1.png") no-repeat center;
+    img {
+      width: 100% !important;
+      height: calc(100vh - 40px);
+    }
+    .middleslogan {
+      position: absolute;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      top: 45%;
+      left: 50%;
+      transform: translateX(-50%) translateY(-50%);
+      color: #fff;
+      z-index: 99;
+      transition: all 1.5s;
+      p {
+        text-align: center;
+        font-weight: 100;
+        width: 1200px;
+        letter-spacing: 10px;
+      }
+      i {
+        text-shadow: 3px 3px 10px rgba(0, 0, 0, 0.4);
+      }
+      i:nth-of-type(1) {
+        font-size: 24px;
+        margin-bottom: 30px;
+      }
+      i:nth-of-type(2) {
+        font-size: 64px;
+        line-height: 1;
+      }
+      div {
+        width: 100px;
+        height: 32px;
+        margin-top: 115px;
+        font-size: 14px;
+        line-height: 29px;
+        text-align: center;
+        border-radius: 999px;
+        cursor: pointer;
+        color: #fff;
+        border: 1px solid #fff;
+        text-shadow: 3px 3px 10px rgba(0, 0, 0, 0.4);
+        background-color: rgba(255, 255, 255, 0);
+        transition: all 0.3s;
+        &:hover {
+          // background-color: rgba(255, 255, 255, 0.3);
+          background-color: #ff4400;
+          border-color: transparent;
+        }
+      }
+    }
+    .bottominfo {
+      position: absolute;
+      bottom: 40px;
+      left: 50%;
+      font-size: 14px;
+      transform: translateX(-50%);
+      color: #fff;
+    }
+  }
+  /deep/ .navigationBar {
+    overflow: hidden;
+    width: 1200px;
+    height: 84px;
+    position: absolute;
+    bottom: 0;
+    left: 50%;
+    border-radius: 8px 8px 0 0;
+    overflow: hidden;
+    transform: translateX(-50%);
+    transition: all 0.2s;
+    z-index: 999;
+    .ant-anchor {
+      display: flex;
+      height: 84px;
+      margin: 0 auto;
+      justify-content: center;
+      align-items: center;
+      background-color: #fff;
+      > div {
+        margin: 0 52px;
+        font-size: 16px;
+      }
+      .ant-anchor-link-active > .ant-anchor-link-title {
+        color: #ff4400;
+      }
+      .ant-anchor-ink {
+        display: none;
+      }
+    }
+  }
+  .aboutBill,
+  .cooperativeBrand,
+  .businessLandscape,
+  .relationUs {
+    padding-top: 25px;
+    padding-bottom: 70px;
+    background-color: #fff;
+    .title {
+      position: relative;
+      text-align: center;
+      font-size: 24px;
+      line-height: 33px;
+      padding-bottom: 12px;
+      &:after {
+        content: '';
+        display: block;
+        width: 30px;
+        height: 2px;
+        position: absolute;
+        background-color: #ff4400;
+        bottom: 0;
+        left: 50%;
+        transform: translateX(-50%);
+      }
+    }
+    .content {
+      margin-top: 50px;
+      font-size: 18px;
+      line-height: 40px;
+      > p {
+        text-indent: 2em;
+        margin-bottom: 20px;
+      }
+    }
+  }
+  .cooperativeBrand {
+    padding-top: 100px;
+    // padding-bottom: 96px;
+    height: 740px;
+    background: url('http://matripe.oss-cn-beijing.aliyuncs.com/yishoudan/cooperativeBrandBg.webp') no-repeat 100%;
+    .content {
+      ul {
+        li {
+          float: left;
+          width: 186px;
+          height: 88px;
+          margin-top: 16px;
+          border-radius: 8px;
+          transition: all 0.2s;
+          &:not(li:nth-child(6n)) {
+            margin-right: 16px;
+          }
 
-					&:hover {
-						background-color: rgba(254, 254, 254, 0.3);
-						box-shadow: 0px 0px 12px 3px #ddd;
-					}
-					img {
-						width: 100%;
-						height: 100%;
-					}
-				}
-			}
-		}
-	}
-	.businessLandscape {
-		.title {
-			margin-top: 80px;
-		}
-		.content {
-			display: flex;
-			justify-content: space-between;
-			.left {
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				p {
-					line-height: 28px;
-					font-size: 16px;
-					color: #666;
-				}
-				p:first-child {
-					margin-bottom: 24px;
-					font-size: 20px;
-					color: #333;
-				}
-			}
-		}
-	}
-	.relationUs {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		padding: unset;
-		height: 445px;
-		background: url("http://matripe.oss-cn-beijing.aliyuncs.com/yishoudan/relationUsBg.webp") no-repeat 100% 100%;
-		// padding-bottom: 126px;
+          &:hover {
+            background-color: rgba(254, 254, 254, 0.3);
+            box-shadow: 0px 0px 12px 3px #ddd;
+          }
+          img {
+            width: 100%;
+            height: 100%;
+          }
+        }
+      }
+    }
+  }
+  .businessLandscape {
+    .title {
+      margin-top: 80px;
+    }
+    .content {
+      display: flex;
+      justify-content: space-between;
+      .left {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        p {
+          line-height: 28px;
+          font-size: 16px;
+          color: #666;
+        }
+        p:first-child {
+          margin-bottom: 24px;
+          font-size: 20px;
+          color: #333;
+        }
+      }
+    }
+  }
+  .relationUs {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    padding: unset;
+    height: 445px;
+    background: url('http://matripe.oss-cn-beijing.aliyuncs.com/yishoudan/relationUsBg.webp') no-repeat 100% 100%;
+    // padding-bottom: 126px;
 
-		.content {
-			display: flex;
-			justify-content: space-between;
-			margin-top: 72px;
-			.left {
-				// display: flex;
-			}
-			.right {
-				display: flex;
-				justify-content: space-around;
-				> span {
-					text-align: center;
-					margin-right: 36px;
-					p {
-						font-size: 14px;
-					}
-				}
-			}
-		}
-	}
-	.banner {
-		height: 72px;
-		// margin-top: 20px;
-		background-color: #ff4400;
-		margin-bottom: -20px;
-		.w {
-			display: flex;
-			height: 100%;
-			justify-content: center;
-			align-items: center;
-			i {
-				font-size: 32px;
-				color: #fff;
-			}
-			img:last-child {
-				width: 173px;
-				height: 42px;
-				margin-right: 110px;
-			}
-		}
-		// background-color: black;
-	}
-	footer {
+    .content {
+      display: flex;
+      justify-content: space-between;
+      margin-top: 72px;
+      .left {
+        // display: flex;
+      }
+      .right {
+        display: flex;
+        justify-content: space-around;
+        > span {
+          text-align: center;
+          margin-right: 36px;
+          p {
+            font-size: 14px;
+          }
+        }
+      }
+    }
+  }
+  .banner {
+    height: 72px;
+    // margin-top: 20px;
+    background-color: #ff4400;
+    margin-bottom: -20px;
+    .w {
+      display: flex;
+      height: 100%;
+      justify-content: center;
+      align-items: center;
+      i {
+        font-size: 32px;
+        color: #fff;
+      }
+      img:last-child {
+        width: 173px;
+        height: 42px;
+        margin-right: 110px;
+      }
+    }
+    // background-color: black;
+  }
+  footer {
     position: absolute;
     bottom: 0;
     left: 50%;
     transform: translateX(-50%);
-		padding: 40px 30px;
-		margin-top: 20px;
-		.w {
-			ul {
-				display: flex;
-				justify-content: center;
-				li {
-					font-size: 16px;
-					text-align: center;
-					color: #4d575e;
-					line-height: 25px;
-				}
-				li:nth-of-type(2n) {
-					width: 1px;
-					height: 20px;
-					margin: 5px 54px;
-					background-color: #4d575e;
-				}
-			}
-			div {
-				text-align: center;
-				// margin-top: 16px;
-				// color: #4d575e;
+    padding: 40px 30px;
+    margin-top: 20px;
+    .w {
+      ul {
+        display: flex;
+        justify-content: center;
+        li {
+          font-size: 16px;
+          text-align: center;
+          color: #4d575e;
+          line-height: 25px;
+        }
+        li:nth-of-type(2n) {
+          width: 1px;
+          height: 20px;
+          margin: 5px 54px;
+          background-color: #4d575e;
+        }
+      }
+      div {
+        text-align: center;
+        // margin-top: 16px;
+        // color: #4d575e;
         color: #fff;
-				font-size: 12px;
-				i {
-					display: inline-block;
-					vertical-align: middle;
-					width: 1px;
-					height: 16px;
-					margin: 0 10px;
-					background-color: #4d575e;
-				}
-			}
-		}
-	}
+        font-size: 12px;
+        i {
+          display: inline-block;
+          vertical-align: middle;
+          width: 1px;
+          height: 16px;
+          margin: 0 10px;
+          background-color: #4d575e;
+        }
+      }
+    }
+  }
 }
 </style>
diff --git a/src/components/memberInfo/memberInfo.vue b/src/components/memberInfo/memberInfo.vue
index 3bc0a13..c4e2ebe 100644
--- a/src/components/memberInfo/memberInfo.vue
+++ b/src/components/memberInfo/memberInfo.vue
@@ -15,16 +15,12 @@
 					在职中<span>{{ statusNum.num3 == 0 ? "" : statusNum.num3 }}</span>
 				</li>
 			</ul>
-		</div> -->
+    </div>-->
     <div class="contentbody">
       <div class="searchbox">
         <div class="searchinput">
-          <a-input
-            placeholder="请输入老乡姓名/身份证号"
-            @keyup.enter="onSearch"
-            @input="resetsearch"
-            v-model="pagination.keys"
-            ><i slot="prefix" class="iconfont icon-sousuo"></i>
+          <a-input placeholder="请输入成员姓名/手机号" @keyup.enter="onSearch" @input="resetsearch" v-model="pagination.keys">
+            <i slot="prefix" class="iconfont icon-sousuo"></i>
             <button slot="suffix" @click="onSearch">搜索</button>
           </a-input>
         </div>
@@ -35,96 +31,47 @@
           <!-- <button @click="changepage(1)">下一页</button> -->
         </div>
       </div>
-      <a-table
-        :columns="columns"
-        :data-source="memberList"
-        :pagination="false"
-        @change="onChange"
-        :loading="{
-          spinning: isspinning,
-          tip: '加载中',
-          wrapperClassName: 'spinstyle',
-        }"
-        :locale="tablenodata"
-        :rowKey="(record) => record.index"
-      >
+      <a-table :columns="columns" :data-source="memberList" :pagination="false" @change="onChange" :loading="{spinning: isspinning,tip: '加载中',wrapperClassName: 'spinstyle',
+        }" :locale="tablenodata" :rowKey="(record) => record.index">
         <a slot="index" slot-scope="record, text, index">{{ index + 1 }}</a>
-        <span slot="userName" slot-scope="text, record"
-          >{{ text }} <span>（{{ record.tel }}）</span>
+        <span slot="nickName" slot-scope="text, record">
+          {{ record.nickName || record.userName }}
+          <span>（{{ record.tel }}）</span>
         </span>
-        <div
-          slot="setting"
-          class="setting"
-          slot-scope="text, record"
-          style="color: #f40"
-        >
+        <div slot="setting" class="setting" slot-scope="text, record" style="color: #f40">
           <a @click="showDetail('detail', record)">详情</a>
-          <a @click="deleteMemeber(record)">删除</a>
+          <a v-if="loginUserInfo.agencyRole != 3" class="delete" @click="deleteMemeber(record)">删除</a>
         </div>
       </a-table>
       <div class="pagecontainer">
-        <a-pagination
-          :current="+pagination.pageNum"
-          :default-current="1"
-          :defaultPageSize="8"
-          :total="pagination.total"
-          @change="onChange"
-        />
+        <a-pagination :current="+pagination.pageNum" :default-current="1" :defaultPageSize="8" :total="pagination.total" @change="onChange" />
         <div class="ant-pagination-options-quick-jumper">
-          <span>共{{ pagination.total }}条，</span>跳至<input
-            ref="pageinput"
-            type="text"
-            @keyup.enter="inputpageChange"
-            @blur="inputpageChange"
-          />页
+          <span>共{{ pagination.total }}条，</span>跳至
+          <input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" />页
         </div>
       </div>
     </div>
-    <a-modal
-      :title="modalTitle"
-      v-model="visible"
-      id="demo"
-      @cancel="modalCancel"
-      width="640px"
-      destroyOnClose
-      class="detailWindow"
-    >
+    <a-modal :title="modalTitle" v-model="visible" id="demo" @cancel="modalCancel" width="640px" destroyOnClose class="detailWindow">
       <template slot="footer" v-if="modalTitle == '新建成员'">
-        <button
-          style="background-color: #fff; border-color: #d9d9d9"
-          @click="modalCancel"
-        >
-          取消
-        </button>
-        <button
-          style="
-            background-color: #f40;
-            color: #fff;
-            border: none;
-            margin-left: 16px;
-            margin-right: 16px;
-          "
-          @click="handleSubmit"
-        >
-          确定
-        </button>
+        <button style="background-color: #fff; border-color: #d9d9d9" @click="modalCancel">取消</button>
+        <button style="background-color: #f40;color: #fff;border: none;margin-left: 16px;margin-right: 16px;" @click="handleSubmit">确定</button>
       </template>
       <template slot="footer" v-else>
         <span></span>
       </template>
       <template v-if="modalTitle == '成员详情'">
-        <a-row>
-          <a-col :span="4">姓名：</a-col>
-          <a-col :span="18">{{ currentMember.userName }}</a-col>
-        </a-row>
         <a-row>
           <a-col :span="4">手机号：</a-col>
           <a-col :span="18">{{ currentMember.tel }}</a-col>
         </a-row>
+        <a-row>
+          <a-col :span="4">备注名：</a-col>
+          <a-col :span="18">{{ currentMember.nickName || currentMember.userName }}</a-col>
+        </a-row>
         <!-- <a-row>
 				<a-col :span="4">登录密码：</a-col>
 				<a-col :span="20">{{ currentMember.userName }}</a-col>
-			</a-row> -->
+        </a-row>-->
         <a-row>
           <a-col :span="4">角色：</a-col>
           <a-col :span="18">{{ currentMember.role }}</a-col>
@@ -136,22 +83,9 @@
         </a-row>
       </template>
       <template v-else>
-        <a-form
-          :form="form"
-          :label-col="{ span: 4 }"
-          :wrapper-col="{ span: 16 }"
-        >
-          <a-form-item label="姓名">
-            <a-input
-              v-decorator="[
-                'userName',
-                { rules: [{ required: true, message: '请输入姓名' }] },
-              ]"
-            />
-          </a-form-item>
+        <a-form :form="form" :label-col="{ span: 4 }" :wrapper-col="{ span: 16 }">
           <a-form-item label="手机号">
-            <a-input
-              v-decorator="[
+            <a-input v-decorator="[
                 'tel',
                 {
                   rules: [
@@ -164,19 +98,19 @@
                   ],
                   validateTrigger: 'submit',
                 },
-              ]"
-              :max-length="11"
-            />
+              ]" :max-length="11" />
+          </a-form-item>
+          <a-form-item label="备注名">
+            <a-input v-decorator="[
+                'nickName',
+                { rules: [{ required: true, message: '请输入备注名' }] },
+              ]" />
           </a-form-item>
           <a-form-item label="角色">
-            <a-radio-group
-              v-decorator="[
+            <a-radio-group v-decorator="[
                 'agencyRole',
                 { rules: [{ required: true, message: '请选择角色' }] },
-              ]"
-              :options="options"
-              @change="groupChange"
-            />
+              ]" :options="options" @change="groupChange" />
           </a-form-item>
           <a-row>
             <a-col :span="4">权限：</a-col>
@@ -189,22 +123,12 @@
 </template>
 
 <script>
-import {
-  getMemberListApi,
-  deleteMemberApi,
-  addMemberApi,
-} from "../../api/userinfo";
-import {
-  formatDateYMD,
-  getUserApplyOrderStatusById,
-  getAgencyRoleTypeById,
-  getAgencyPermissionNameById,
-  getAgencyPermissionsByRole,
-} from "../../utils/commonUtil";
+import { getMemberListApi, deleteMemberApi, addMemberApi } from '../../api/userinfo'
+import { formatDateYMD, getUserApplyOrderStatusById, getAgencyRoleTypeById, getAgencyPermissionNameById, getAgencyPermissionsByRole } from '../../utils/commonUtil'
 
 export default {
   // 组件名称
-  name: "",
+  name: '',
   // 局部注册的组件
   components: {},
   // 组件参数 接收来自父组件的数据
@@ -217,10 +141,7 @@ export default {
         emptyText: () => (
           <div>
             <div>
-              <img
-                src="https://user-images.githubusercontent.com/507615/54591670-ac0a0180-4a65-11e9-846c-e55ffce0fe7b.png"
-                style="width:105px;height:90px;marginTop:20px"
-              />
+              <img src="https://user-images.githubusercontent.com/507615/54591670-ac0a0180-4a65-11e9-846c-e55ffce0fe7b.png" style="width:105px;height:90px;marginTop:20px" />
             </div>
             <div style="marginBottom:20px">暂无数据</div>
           </div>
@@ -244,69 +165,71 @@ export default {
         num2: 0,
         num3: 0,
       },
+      loginUserInfo: null,
       memberList: [],
       visible: false,
       currentMember: {},
-      modalTitle: "新建成员",
+      modalTitle: '新建成员',
       options: [
         // { label: "创建人", value: "1" },
-        { label: "管理员", value: "2" },
-        { label: "成员", value: "3" },
+        { label: '管理员', value: '2' },
+        { label: '成员', value: '3' },
       ],
-      permissionName:
-        "查看职位，报名，查看报名，查看老乡，修改密码，修改手机号",
-      permission: "job:list,apply:add,apply:list,apply:user,user:pwd,user:tel",
-    };
+      permissionName: '查看职位，报名，查看报名，查看老乡，修改密码，修改手机号',
+      permission: 'job:list,apply:add,apply:list,apply:user,user:pwd,user:tel',
+    }
   },
   // 计算属性
   computed: {
     columns() {
-      let { sortedInfo } = this;
-      console.log(sortedInfo);
-      sortedInfo = sortedInfo || {};
+      let { sortedInfo } = this
+      console.log(sortedInfo)
+      sortedInfo = sortedInfo || {}
       const columns = [
         {
-          title: "序号",
-          dataIndex: "index",
-          key: "index",
-          scopedSlots: { customRender: "index" },
+          title: '序号',
+          dataIndex: 'index',
+          key: 'index',
+          scopedSlots: { customRender: 'index' },
           ellipsis: true,
           width: 60,
         },
         {
-          title: "姓名",
-          dataIndex: "userName",
-          key: "userName",
-          scopedSlots: { customRender: "userName" },
+          title: '备注',
+          dataIndex: 'nickName',
+          key: 'nickName',
+          scopedSlots: { customRender: 'nickName' },
           ellipsis: true,
           width: 200,
         },
         {
-          title: "角色",
-          dataIndex: "role",
-          key: "role",
+          title: '角色',
+          dataIndex: 'role',
+          key: 'role',
           width: 100,
+          ellipsis: true,
         },
         {
-          title: "权限",
-          dataIndex: "permission",
-          key: "permission",
+          title: '权限',
+          dataIndex: 'permission',
+          key: 'permission',
           ellipsis: true,
         },
         {
-          title: "操作",
-          dataIndex: "setting",
-          key: "setting",
+          title: '操作',
+          dataIndex: 'setting',
+          key: 'setting',
           // sorter: (a, b) => a.userApplyOrder.localeCompare(b.userApplyOrder),
-          scopedSlots: { customRender: "setting" },
+          scopedSlots: { customRender: 'setting' },
+          ellipsis: true,
 
           // sortOrder: sortedInfo.columnKey == "userApplyOrder" && sortedInfo.order,
           // ellipsis: true,
           width: 100,
         },
-      ];
-      console.log(sortedInfo);
-      return columns;
+      ]
+      console.log(sortedInfo)
+      return columns
     },
   },
   // 侦听器
@@ -317,59 +240,60 @@ export default {
    */
   created() {
     // this.getMemberList();
+    if (localStorage.getItem('LOGIN_DATA')) {
+      this.loginUserInfo = JSON.parse(localStorage.getItem('LOGIN_DATA'))
+    }
   },
   /**
    * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
    * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
    */
   mounted() {
-    this.getMemberList();
-    window.modalCancel = this.modalCancel;
+    this.getMemberList()
+    window.modalCancel = this.modalCancel
   },
   // 组件方法
   methods: {
     onChange(e, e1, e2) {
-      console.log(e);
-      console.log(e1);
-      console.log(e2);
-      if (typeof e == "number") {
-        this.pagination.pageNum = e;
-        this.getMemberList();
+      console.log(e)
+      console.log(e1)
+      console.log(e2)
+      if (typeof e == 'number') {
+        this.pagination.pageNum = e
+        this.getMemberList()
       }
     },
     inputpageChange(e) {
-      const pagenumcount = this.pagination.total / this.pagination.pageSize;
-      console.log(pagenumcount);
+      const pagenumcount = this.pagination.total / this.pagination.pageSize
+      console.log(pagenumcount)
       if (e.target.value) {
         if (e.target.value > pagenumcount) {
-          this.pagination.pageNum = Math.ceil(pagenumcount);
+          this.pagination.pageNum = Math.ceil(pagenumcount)
         } else {
-          this.pagination.pageNum = e.target.value;
+          this.pagination.pageNum = e.target.value
         }
       } else {
-        this.pagination.pageNum = 1;
+        this.pagination.pageNum = 1
       }
       // this.getJobList();
-      this.getMemberList();
-      console.log(e);
+      this.getMemberList()
+      console.log(e)
     },
     async getMemberList() {
       // let jobinfo = {...this.pagination , searchTag:1}
       try {
-        this.isspinning = true;
-        console.log(this.pagination);
-        const { data } = await getMemberListApi(this.pagination);
-        console.log(data);
+        this.isspinning = true
+        console.log(this.pagination)
+        const { data } = await getMemberListApi(this.pagination)
+        console.log(data)
         if (data.status === 200) {
           // console.log();
-          this.memberList = data.data.recordList;
+          this.memberList = data.data.recordList
           this.memberList.forEach((item) => {
-            console.log(item);
-            item.role = getAgencyRoleTypeById(item.agencyRole);
-            item.permission = getAgencyPermissionNameById(
-              item.agencyPermissions
-            );
-          });
+            console.log(item)
+            item.role = getAgencyRoleTypeById(item.agencyRole)
+            item.permission = getAgencyPermissionNameById(item.agencyPermissions)
+          })
           // this.data.forEach((item, index) => {
           //   // console.log(item);
           //   item.userApplyOrder = getUserApplyOrderStatusById(
@@ -380,20 +304,20 @@ export default {
           // });
           // console.log(data);
           // console.log(true);
-          this.pagination.total = data.data.recordCount;
+          this.pagination.total = data.data.recordCount
         }
       } catch (error) {
-        console.log(error);
+        console.log(error)
       }
-      this.isspinning = false;
+      this.isspinning = false
     },
     getPopupContainer(el, dialogContext) {
-      console.log(el);
-      console.log(dialogContext);
+      console.log(el)
+      console.log(dialogContext)
       if (dialogContext) {
-        return dialogContext.getDialogWrap();
+        return dialogContext.getDialogWrap()
       } else {
-        return document.body;
+        return document.body
       }
     },
     resetpag() {
@@ -407,115 +331,120 @@ export default {
       // };
     },
     resetsearch(e) {
-      console.log(e);
+      console.log(e)
       if (e.target.value.length === 0) {
-        this.pagination.keys = "";
+        this.pagination.keys = ''
 
-        this.getMemberList();
+        this.getMemberList()
       }
     },
     onSearch() {
       if (this.pagination.keys != null && this.pagination.keys.length != 0) {
-        this.getMemberList();
+        this.getMemberList()
       }
     },
     showDetail(type, e) {
-      console.log(e);
-      let that = this;
-      if (type == "detail") {
-        this.currentMember = e;
-        this.modalTitle = "成员详情";
-        this.visible = true;
+      console.log(type)
+      console.log(e)
+      let that = this
+      if (type == 'detail') {
+        this.currentMember = e
+        this.modalTitle = '成员详情'
+        this.visible = true
       } else {
-        this.modalTitle = "新建成员";
-        this.visible = true;
+        this.modalTitle = '新建成员'
+        this.visible = true
         this.$nextTick(() => {
-          console.log(123);
+          console.log(123)
           that.form.setFieldsValue({
-            agencyRole: "1",
-          });
-        });
+            agencyRole: '2',
+          })
+        })
       }
     },
     deleteMemeber(e) {
       this.$confirm({
-        title: "确定删除",
-        content: "是否确定删除该成员",
+        title: '确定删除',
+        content: '是否确定删除该成员',
         onOk: async () => {
-          console.log("ok");
-          let data = await deleteMemberApi({ id: e.id });
-          console.log(data);
+          console.log('ok')
+          let { data } = await deleteMemberApi({ id: e.id })
+          console.log(data)
           if (data.status == 200) {
-            this.getMemberList();
+            this.getMemberList()
+          } else {
+            console.log(data.msg)
+            this.$message.warning(data.msg)
           }
         },
         onCancel: () => {
-          console.log("cancel");
+          console.log('cancel')
         },
-      });
+      })
     },
     modalCancel() {
       // console.log(this);
-      this.visible = false;
-      this.permission = getAgencyPermissionsByRole(1);
-      this.permissionName = getAgencyPermissionNameById(this.permission);
+      this.visible = false
+      this.permission = getAgencyPermissionsByRole()
+      this.permissionName = getAgencyPermissionNameById(this.permission)
     },
     handleSubmit() {
-      console.log("issubmit");
+      console.log('issubmit')
       this.form.validateFields(async (err) => {
-        console.log(err);
+        console.log(err)
         if (err == null) {
-          console.log(this.form.getFieldsValue());
+          console.log(this.form.getFieldsValue())
           try {
             let { data } = await addMemberApi({
               ...this.form.getFieldsValue(),
               agencyPermissions: this.permission,
-            });
-            console.log(data);
+            })
+            console.log(data)
             if (data.status == 200) {
-              this.$message.success("新建成功");
-              this.visible = false;
-              this.permission = getAgencyPermissionsByRole(1);
-              this.permissionName = getAgencyPermissionNameById(
-                this.permission
-              );
-              this.getMemberList();
+              this.$message.success('新建成功')
+              this.visible = false
+              this.permission = getAgencyPermissionsByRole(1)
+              this.permissionName = getAgencyPermissionNameById(this.permission)
+              this.getMemberList()
+            } else {
+              this.$message.warning(data.msg)
+              this.visible = false
             }
           } catch (error) {
-            console.log(error);
+            console.log(error)
           }
         }
-      });
+      })
     },
     groupChange(e) {
-      console.log(e);
+      console.log(e)
       this.form.setFieldsValue({
         agencyRole: e.target.value,
-      });
-      this.permission;
-      if (this.form.getFieldValue("agencyRole") == 1) {
-        this.permission = getAgencyPermissionsByRole(1);
+      })
+      this.permission
+      if (this.form.getFieldValue('agencyRole') == 1) {
+        this.permission = getAgencyPermissionsByRole(1)
       } else {
-        this.permission = getAgencyPermissionsByRole(2);
+        this.permission = getAgencyPermissionsByRole(2)
       }
-      console.log(this.permission);
-      this.permissionName = getAgencyPermissionNameById(this.permission);
+      console.log(this.permission)
+      this.permissionName = getAgencyPermissionNameById(this.permission)
     },
     validateServiceName(rule, value, callback) {
-      console.log(rule);
-      console.log(value);
-      console.log(callback);
-      let reg = /^1[3|4|5|7|8][0-9]{9}$/;
+      console.log(rule)
+      console.log(value)
+      console.log(callback)
+      let reg = /^1[3|4|5|7|8][0-9]{9}$/
       // if(value.length == 11){
       if (!reg.test(value)) {
-        callback(new Error());
+        callback(new Error())
       } else {
-        callback();
+        callback()
       }
       // }
     },
   },
-};
+}
 </script>
 
 <style scoped lang="less">
@@ -566,7 +495,7 @@ export default {
         color: #ff6600;
       }
       &::after {
-        content: "";
+        content: '';
         position: absolute;
         display: block;
         width: 1px;
@@ -733,15 +662,17 @@ export default {
 .setting {
   a:first-child {
     padding-right: 9px;
-    border-right: 1px solid #979797;
   }
   a:last-child {
     padding-left: 9px;
   }
+  .delete {
+    border-left: 1px solid #979797;
+  }
 }
-/deep/ .ant-table-row-cell-break-word {
-  padding: 12px 8px !important;
-}
+// /deep/ .ant-table-row-cell-break-word {
+//   padding: 12px 8px !important;
+// }
 .detailWindow {
   /deep/ .ant-modal {
     .ant-modal-close-x {
@@ -762,7 +693,7 @@ export default {
         //   }
       }
       .ant-form-item-control {
-        line-height: 32px;
+        line-height: 40px;
       }
       .ant-row {
         line-height: 30px;
diff --git a/src/components/userinfo/accountsetting/components/boundtel.vue b/src/components/userinfo/accountsetting/components/boundtel.vue
index 787e4ca..ac808c5 100644
--- a/src/components/userinfo/accountsetting/components/boundtel.vue
+++ b/src/components/userinfo/accountsetting/components/boundtel.vue
@@ -6,50 +6,36 @@
     </div>
     <div v-if="isShow">
       <div class="contentbody" v-if="!istelshow">
-        <div class="warninginfo">
-          您的账号可能存在安全风险，为了确保为您本人操作，请先进行安全验证
-        </div>
+        <div class="warninginfo">您的账号可能存在安全风险，为了确保为您本人操作，请先进行安全验证</div>
         <div class="tel">
           <div>手机号</div>
-          <input
-            type="text"
-            v-model.trim="usertelinfo.tel"
-            maxlength="11"
-          /><br />
+          <input type="text" v-model.trim="usertelinfo.tel" maxlength="11" />
+          <br />
           <input type="text" v-model.trim="usertelinfo.code" maxlength="4" />
-          <span class="getrulecode"
-            ><span
-              @click="getPhoneCode"
-              data-mark="getcode"
-              v-if="timedata.isfinish"
-              >获取验证码</span
-            ><timmer :timedata="timedata" v-if="!timedata.isfinish"
-          /></span>
+          <span class="getrulecode">
+            <span @click="getPhoneCode" data-mark="getcode" v-if="timedata.isfinish">获取验证码</span>
+            <timmer :timedata="timedata" v-if="!timedata.isfinish" />
+          </span>
         </div>
         <button @click="submit">确定</button>
       </div>
       <div class="contentbody" v-else>
         <div>{{ userinfo.hidetel }}</div>
-        <button
-          style="width: 106px; margin-top: 16px"
-          @click="istelshow = false"
-        >
-          更换手机号
-        </button>
+        <button style="width: 106px; margin-top: 16px" @click="istelshow = false">更换手机号</button>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import { getPhoneCodeApi } from "@/api/login.js";
-import { setUserTelApi } from "../../../../api/userinfo";
+import { getPhoneCodeApi } from '@/api/login.js'
+import { setUserTelApi } from '../../../../api/userinfo'
 
-import timmer from "../../../Login/components/countback.vue";
+import timmer from '../../../Login/components/countback.vue'
 
 export default {
   // 组件名称
-  name: "",
+  name: '',
   // 局部注册的组件
   components: {
     timmer,
@@ -64,8 +50,8 @@ export default {
   data() {
     return {
       usertelinfo: {
-        tel: "",
-        code: "",
+        tel: '',
+        code: '',
       },
       timedata: {
         isfinish: true,
@@ -74,21 +60,22 @@ export default {
       },
       istelshow: false,
       isShow: false,
-    };
+      trigger: false,
+    }
   },
   // 计算属性
   computed: {},
   // 侦听器
   watch: {
-    "userinfo.tel"(value) {
+    'userinfo.tel'(value) {
       //  setTimeout(()=>{
-      console.log(value);
-      console.log(this.userinfo);
+      console.log(value)
+      console.log(this.userinfo)
       if (this.userinfo.tel) {
-        this.istelshow = true;
+        this.istelshow = true
         // console.log(this.istelshow);
       }
-      this.isShow = true;
+      this.isShow = true
 
       //  },200)
     },
@@ -104,54 +91,56 @@ export default {
    */
   mounted() {
     if (this.userinfo.tel) {
-      this.istelshow = true;
+      this.istelshow = true
       // console.log(this.istelshow);
-      this.isShow = true;
+      this.isShow = true
     }
   },
   // 组件方法
   methods: {
     async submit() {
       try {
-        var reg_tel =
-          /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+        var reg_tel = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
         if (this.usertelinfo.tel.length === 0) {
-          this.$message.warning("请输入手机号");
+          this.$message.warning('请输入手机号')
         } else if (!reg_tel.test(this.usertelinfo.tel)) {
-          this.$message.warning("请输入正确的手机号");
+          this.$message.warning('请输入正确的手机号')
         } else if (this.usertelinfo.code.length === 0) {
-          this.$message.warning("请输入验证码");
+          this.$message.warning('请输入验证码')
         } else {
-          this.timedata.isfinish = false;
-          const { data } = await setUserTelApi(this.usertelinfo);
-          console.log(data);
+          this.timedata.isfinish = false
+          const { data } = await setUserTelApi(this.usertelinfo)
+          console.log(data)
           if (data.status === 200) {
-            this.$message.success("绑定手机成功");
+            this.$message.success('绑定手机成功')
           }
         }
       } catch (error) {
-        console.log(error);
+        console.log(error)
       }
     },
     async getPhoneCode() {
       // 获取手机验证码
-      var reg_tel =
-        /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      var reg_tel = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
       if (this.usertelinfo.tel.length === 0) {
-        this.$message.warning("请输入手机号");
+        this.$message.warning('请输入手机号')
       } else if (!reg_tel.test(this.usertelinfo.tel)) {
-        this.$message.warning("请输入正确的手机号");
+        this.$message.warning('请输入正确的手机号')
       } else {
-        this.timedata.isfinish = false;
-        const { data } = await getPhoneCodeApi({ tel: this.usertelinfo.tel });
-        console.log(data);
+        this.timedata.isfinish = false
+        const { data } = await getPhoneCodeApi({ tel: this.usertelinfo.tel })
+        console.log(data)
       }
     },
   },
-};
+}
 </script>
 
 <style scoped lang="less">
+.testBox{
+  width: 100px;
+  height: 100px;
+}
 .boundtel-container {
   .warninginfo {
     font-size: 14px;
@@ -190,7 +179,7 @@ export default {
       div {
         margin-bottom: 0;
       }
-      span[data-mark="getcode"] {
+      span[data-mark='getcode'] {
         cursor: pointer;
       }
     }
diff --git a/src/components/userinfo/accountsetting/components/boundwx.vue b/src/components/userinfo/accountsetting/components/boundwx.vue
index 198a081..15dc574 100644
--- a/src/components/userinfo/accountsetting/components/boundwx.vue
+++ b/src/components/userinfo/accountsetting/components/boundwx.vue
@@ -6,16 +6,14 @@
     </div>
     <div class="contentbody" v-if="!userinfo.openIdAppDTDL">
       <div>
-        <a-spin tip="加载中..." :spinning="isspinning"> </a-spin>
+        <a-spin tip="加载中..." :spinning="isspinning"></a-spin>
 
-        <img :src="qrcodeurl" alt="" v-if="!isspinning" />
+        <img :src="qrcodeurl" alt v-if="!isspinning" />
       </div>
       <div style="margin-top: 10px">微信扫一扫</div>
     </div>
     <div class="contentbody" v-else>
-      <div class="username" v-if="userinfo.userName">
-        {{ userinfo.userName }}
-      </div>
+      <div class="username" v-if="userinfo.userName">{{ userinfo.userName }}</div>
       <div class="username" v-else>{{ userinfo.hidetel }}</div>
       <button @click="submit">更换微信号</button>
     </div>
@@ -23,10 +21,10 @@
 </template>
 
 <script>
-import { getUserWxApi } from "../../../../api/userinfo";
+import { getUserWxApi } from '../../../../api/userinfo'
 export default {
   // 组件名称
-  name: "",
+  name: 'boundwx',
   // 局部注册的组件
   components: {},
   // 组件参数 接收来自父组件的数据
@@ -38,9 +36,9 @@ export default {
   // 组件状态值
   data() {
     return {
-      qrcodeurl: "",
+      qrcodeurl: '',
       isspinning: false,
-    };
+    }
   },
   // 计算属性
   computed: {},
@@ -51,7 +49,7 @@ export default {
    * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
    */
   created() {
-    this.getUserWx();
+      this.getUserWx()
   },
   /**
    * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
@@ -63,19 +61,19 @@ export default {
     submit() {},
     async getUserWx() {
       try {
-        this.isspinning = true;
-        const { data } = await getUserWxApi();
-        console.log(data);
+        this.isspinning = true
+        const { data } = await getUserWxApi()
+        console.log(data)
         if (data.status === 200) {
-          this.qrcodeurl = data.data;
+          this.qrcodeurl = data.data
         }
       } catch (error) {
-        console.log(error);
+        console.log(error)
       }
-      this.isspinning = false;
+      this.isspinning = false
     },
   },
-};
+}
 </script>
 
 <style scoped lang="less">
diff --git a/src/components/userinfo/accountsetting/components/loginpsw.vue b/src/components/userinfo/accountsetting/components/loginpsw.vue
index e1a63ff..be6e50d 100644
--- a/src/components/userinfo/accountsetting/components/loginpsw.vue
+++ b/src/components/userinfo/accountsetting/components/loginpsw.vue
@@ -4,38 +4,92 @@
       <span>设置新的密码</span>
     </div>
     <div class="contentbody">
-      <div class="username">
-        <div>用户名</div>
-        <input type="text" :value="username" disabled="disabled" />
-      </div>
-      <div class="password">
-        <div>密码</div>
-        <input type="password" v-model.trim="password" class="passwordInp" />
-        <i
-          class="iconfont icon-biyan1"
-          style="font-size: 12px"
-          @click="changeStatus"
-          v-if="inputStatus == 0"
-        ></i>
-        <i
-          class="iconfont icon-zhengyan1"
-          style="font-size: 16px; margin-top: -5px; margin-right: -3px"
-          @click="changeStatus"
-          v-else
-        ></i>
-      </div>
-      <button @click="submit">确定</button>
+      <a-form :form="form" hideRequiredMark class="login-form" @submit="userhandleSubmit">
+        <a-form-item label="原密码" style="text-align: left">
+          <a-input v-decorator="[
+									'password',
+									{
+										rules: [
+											{
+												required: true,
+												message: '请输入密码',
+											},
+										],
+										validateTrigger: 'submit',
+									},
+								]" type="password" placeholder="请输入原密码">
+            <!-- <i slot="prefix" class="iconfont icon-mima" /> -->
+          </a-input>
+          <div class="forgetPsw" @click="loginShow = true" style="cursor:pointer">忘记原密码</div>
+        </a-form-item>
+        <a-form-item label="新密码" style="text-align: left">
+          <!-- @input="getpassword"  -->
+          <a-input v-decorator="[
+                  'newpassword',
+                  {
+                    rules: [
+                      {
+                        required: true,
+                        message: '请输入新密码',
+                      },
+                    ],
+                    validateTrigger: 'submit',
+                  },
+                ]" type="password" placeholder="请输入密码">
+            <!-- <i slot="prefix" class="iconfont icon-mima" /> -->
+          </a-input>
+        </a-form-item>
+        <a-form-item label="确认密码" style="text-align: left">
+          <a-input v-decorator="[
+                  'repassword',
+                  {
+                    rules: [
+                      {
+                        required: true,
+                        message: '请再次输入新密码',
+                      },
+                      {
+                        validator: replacepassword,
+                      },
+                    ],
+                    validateTrigger: 'submit',
+                    validateFirst: true,
+                  },
+                ]" type="password" placeholder="请再次输入密码">
+            <!-- <i slot="prefix" class="iconfont icon-mima" /> -->
+          </a-input>
+        </a-form-item>
+        <a-form-item style="text-align: left">
+          <a-button type="primary sureBtn" html-type="submit">确定</a-button>
+        </a-form-item>
+        <!-- <div class="username">
+          <div>用户名</div>
+          <input type="text" :value="username" :disabled="true" />
+        </div>
+        <div class="password">
+          <div>密码</div>
+          <input type="password" v-model.trim="password" class="passwordInp" />
+          <i class="iconfont icon-biyan1" style="font-size: 12px" @click="changeStatus" v-if="inputStatus == 0"></i>
+          <i class="iconfont icon-zhengyan1" style="font-size: 16px; margin-top: -5px; margin-right: -3px" @click="changeStatus" v-else></i>
+        </div>-->
+      </a-form>
+      <a-modal title="找回密码" :width="760" footer :visible="loginShow" class="modal" @cancel="handleCancel" :maskClosable="false" okText="提交" cancelText="取消" :destroyOnClose="true">
+        <updatepsw></updatepsw>
+      </a-modal>
     </div>
   </div>
 </template>
 
 <script>
-import { setUserPswApi } from "../../../../api/userinfo";
+import { setUserPswApi } from '../../../../api/userinfo'
+import updatepsw from '../../../Login/updatepsw.vue'
 export default {
   // 组件名称
-  name: "",
+  name: 'loginpsw',
   // 局部注册的组件
-  components: {},
+  components: {
+    updatepsw,
+  },
   // 组件参数 接收来自父组件的数据
   props: {
     userinfo: {
@@ -45,10 +99,12 @@ export default {
   // 组件状态值
   data() {
     return {
-      username: "",
+      username: '',
       password: null,
       inputStatus: 0,
-    };
+      form: this.$form.createForm(this),
+      loginShow: false,
+    }
   },
   // 计算属性
   computed: {},
@@ -56,11 +112,11 @@ export default {
   watch: {
     userinfo() {
       this.$nextTick(() => {
-        console.log(this.userinfo);
+        console.log(this.userinfo)
 
         // this.username = this.userinfo.tel;
-        console.log(this.username);
-      });
+        console.log(this.username)
+      })
     },
   },
   // 生命周期钩子   注：没用到的钩子请自行删除
@@ -68,9 +124,7 @@ export default {
    * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
    */
   created() {
-    console.log(this.userinfo.hidename);
-    this.username =
-      this.userinfo.userName || this.userinfo.nickName || this.userinfo.tel;
+    // this.username = this.userinfo.userName || this.userinfo.nickName || this.userinfo.tel
   },
   /**
    * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
@@ -79,87 +133,191 @@ export default {
   mounted() {},
   // 组件方法
   methods: {
+    userhandleSubmit(e) {
+      // 用户名登录提交
+      e.preventDefault()
+      let params
+      this.form.validateFields(async (err, values) => {
+        console.log(values)
+        if (!err) {
+        } else {
+        }
+      })
+    },
     async submit() {
       if (this.password === null || this.password.length === 0) {
-        this.$message.warning("请输入密码");
+        this.$message.warning('请输入密码')
       } else {
         try {
-          const { data } = await setUserPswApi({ password: this.password });
-          console.log(data);
+          const { data } = await setUserPswApi({ password: this.password })
+          console.log(data)
           if (data.status === 200) {
-            this.$message.success("密码修改成功");
+            this.$message.success('密码修改成功')
           }
         } catch (error) {
-          console.log(error);
+          console.log(error)
         }
       }
-      console.log(this.password);
+      console.log(this.password)
     },
     changeStatus(e) {
       // console.log(e);
-      let pas = document.querySelector(".passwordInp");
+      let pas = document.querySelector('.passwordInp')
       // console.dir(pas);
-      if (e.target.className == "iconfont icon-biyan1") {
-        this.inputStatus = 1;
+      if (e.target.className == 'iconfont icon-biyan1') {
+        this.inputStatus = 1
         // e.target.className = "iconfont icon-zhengyan1";
-        pas.attributes[1].nodeValue = "text";
+        pas.attributes[1].nodeValue = 'text'
       } else {
-        this.inputStatus = 0;
+        this.inputStatus = 0
         // e.target.className = "iconfont icon-biyan1";
-        pas.attributes[1].nodeValue = "password";
+        pas.attributes[1].nodeValue = 'password'
       }
     },
+    showModal() {
+      console.log('modal')
+      this.loginShow = true
+    },
+    /**
+     * 关闭忘记密码弹窗
+     *
+     *
+     */
+    handleCancel() {
+      this.loginShow = false
+    },
+    /**
+     * 检验密码不一致的回调
+     *
+     *
+     */
+    replacepassword(rule, value, callback) {
+      console.log(rule)
+      console.log(value)
+      console.log(this.form.getFieldValue('newpassword'))
+      let newpassword = this.form.getFieldValue('newpassword')
+      if (newpassword !== value) {
+        callback('两次密码不一致')
+      }
+      callback()
+
+      // console.log(callback);
+    },
   },
-};
+}
 </script>
 
 <style scoped lang="less">
-.loginpsw-container {
-  .contentbody {
-    .username,
-    .password {
-      margin-top: 16px;
-      div {
-        font-size: 16px;
-        line-height: 16px;
-        margin-bottom: 8px;
-      }
-      input {
-        outline: none;
-        width: 430px;
-        height: 40px;
-        text-indent: 10px;
-        font-size: 16px;
-        background: #f0f0f0;
-        border: 1px solid #ededed;
-        border-radius: 0px;
-      }
+/deep/ .login-form {
+  // width: 430px;
+  .ant-form-item-control {
+    width: 430px !important;
+  }
+  .ant-form-item-label {
+    line-height: 28px;
+    label {
+      font-size: 16px;
     }
-    .password {
-      position: relative;
-      input {
-        background-color: #fff;
-      }
-      .iconfont {
-        position: absolute;
-        font-size: 14px;
-        right: 48%;
-        top: 38px;
-      }
+    .ant-form-item-children {
     }
-    button {
-      width: 64px;
-      height: 32px;
-      margin-top: 21px;
-      background: #ff4400;
-      border-radius: 0px;
-      border: none;
-      font-size: 14px;
-      color: #fff;
-      &:hover {
-        background-color: #ff4400cc;
-      }
+  }
+  .ant-input {
+    height: 40px;
+    width: 430px;
+    text-indent: 15px;
+    font-size: 16px;
+    padding: 0 !important;
+    border-radius: 0;
+    border: 1px solid #dddddd;
+    &:hover {
+      border-color: #ff4400;
+    }
+    &:focus {
+      box-shadow: none;
+    }
+    &::placeholder {
+      opacity: 0.4;
+      color: #4d575e;
+      font-size: 16px;
+      text-indent: 15px;
     }
   }
 }
+.forgetPsw {
+  height: 10px;
+  font-size: 16px;
+  color: #666666;
+  text-align: right;
+  text-decoration: underline;
+}
+.ant-btn-primary {
+  width: 64px;
+  height: 32px;
+  // margin-top: 21px;
+  background: #ff4400;
+  border-radius: 0px;
+  border: none;
+  font-size: 14px;
+  color: #fff;
+  &:hover {
+    background-color: #ff4400cc;
+  }
+  &::selection {
+    background: #ff4400;
+  }
+  &:focus {
+    background: #ff4400;
+  }
+  &:active {
+    background: #ff4400;
+  }
+}
+// .loginpsw-container {
+//   .contentbody {
+//     .username,
+//     .password {
+//       margin-top: 16px;
+//       div {
+//         font-size: 16px;
+//         line-height: 16px;
+//         margin-bottom: 8px;
+//       }
+//       input {
+//         outline: none;
+//         width: 430px;
+//         height: 40px;
+//         text-indent: 10px;
+//         font-size: 16px;
+//         background: #f0f0f0;
+//         border: 1px solid #ededed;
+//         border-radius: 0px;
+//       }
+//     }
+//     .password {
+//       position: relative;
+//       input {
+//         background-color: #fff;
+//       }
+//       .iconfont {
+//         position: absolute;
+//         font-size: 14px;
+//         right: 48%;
+//         top: 38px;
+//       }
+//     }
+//     button {
+//       width: 64px;
+//       height: 32px;
+//       margin-top: 21px;
+//       background: #ff4400;
+//       border-radius: 0px;
+//       border: none;
+//       font-size: 14px;
+//       color: #fff;
+//       &:hover {
+//         background-color: #ff4400cc;
+//       }
+//     }
+//   }
+// }
 </style>
diff --git a/src/components/userinfo/accountsetting/inedex.vue b/src/components/userinfo/accountsetting/inedex.vue
index 63bbd2e..7bdb984 100644
--- a/src/components/userinfo/accountsetting/inedex.vue
+++ b/src/components/userinfo/accountsetting/inedex.vue
@@ -131,7 +131,7 @@
         <ul>
           <li @click="pushto('/accountsetting/bocaiTV')" :class="{ tagactive: activelist === 9 }">
             <span>
-              <i class="iconfont icon-tv"></i>伯才TV 
+              <i class="iconfont icon-tv"></i>伯才TV
             </span>
             <span>
               <i class="iconfont icon-youjiantou"></i>
@@ -140,7 +140,9 @@
         </ul>
       </div>
       <div class="rightcontent">
-        <router-view :userinfo="userinfo" :userbanklist="userbanklist" :userpoint="userpoint" :userbalance="userbalance"></router-view>
+        <keep-alive :include="['boundwx']">
+          <router-view :userinfo="userinfo" :userbanklist="userbanklist" :userpoint="userpoint" :userbalance="userbalance"></router-view>
+        </keep-alive>
       </div>
     </div>
   </div>
@@ -287,7 +289,7 @@ export default {
         this.activelist = 7
       } else if (this.path.indexOf('/mybalance') > -1) {
         this.activelist = 8
-      }else if (this.path.indexOf('/bocaiTV') > -1) {
+      } else if (this.path.indexOf('/bocaiTV') > -1) {
         this.activelist = 9
       }
     },
diff --git a/src/components/userinfo/usercenter/components/dataStatistics.vue b/src/components/userinfo/usercenter/components/dataStatistics.vue
new file mode 100644
index 0000000..8b4c2b7
--- /dev/null
+++ b/src/components/userinfo/usercenter/components/dataStatistics.vue
@@ -0,0 +1,650 @@
+<template>
+  <div class="dataStatisticsContainer w">
+    <div class="navTitle">
+      <div class="dateSelect fsa">
+        <div class="fsa">
+          <a-range-picker style="width:274px" @change="dateChange" class />
+          <div class="ml16">
+            <a-checkable-tag class="f14" v-model="checked0" @change="handleChange(0, checked0)">今日</a-checkable-tag>
+            <a-checkable-tag class="f14" v-model="checked1" @change="handleChange(1, checked1)">昨日</a-checkable-tag>
+            <a-checkable-tag class="f14" v-model="checked2" @change="handleChange(2, checked2)">本周</a-checkable-tag>
+            <a-checkable-tag class="f14" v-model="checked5" @change="handleChange(5, checked5)">本月</a-checkable-tag>
+          </div>
+        </div>
+        <!-- <div class="pagechange">
+          <button @click="changepage(-1)">上一页</button>
+          <button @click="changepage(1)">下一页</button>
+        </div>-->
+      </div>
+    </div>
+    <div class="content">
+      <a-table :columns="columns" :scroll="{ y: 590 }" :data-source="dataList" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :rowKey="(record) => record.index">
+        <span slot="custom_objob">
+          <template>在职</template>
+          <a-tooltip>
+            <template slot="title">
+              <p class="f12" style="color:#fff">仅显示当前在职数</p>
+            </template>
+            <i class="iconfont icon-zhuyi f14 ml4"></i>
+          </a-tooltip>
+        </span>
+        <a @click="townsmanDetailVisible = true" slot="signUps" slot-scope="text">{{text}}</a>
+        <a @click="townsmanDetailVisible = true" slot="obJob" slot-scope="text">{{text}}</a>
+        <a @click="townsmanDetailVisible = true" slot="entry" slot-scope="text">{{text}}</a>
+        <a @click="townsmanDetailVisible = true" slot="passed" slot-scope="text">{{text}}</a>
+        <a @click="townsmanDetailVisible = true" slot="arrived" slot-scope="text">{{text}}</a>
+        <a @click="townsmanDetailVisible = true" slot="nickName" slot-scope="text">{{ text }}</a>
+      </a-table>
+      <div class="total">
+        <div style="width:60px">{{totalObj.index}}</div>
+        <div style="width:100px">数据总计</div>
+        <div>{{totalObj.signUps}}</div>
+        <div>{{totalObj.arrived}}</div>
+        <div>{{totalObj.passed}}</div>
+        <div>{{totalObj.entry}}</div>
+        <div>{{totalObj.obJob}}</div>
+      </div>
+    </div>
+    <a-modal class="townsmanDetailModal" centered v-model="townsmanDetailVisible" width="1200px" @cancel="townsmanDetailModalClose" :footer="null" destroyOnClose>
+      <div slot="title" destoryOnClose>明细</div>
+      <div class="searchinput">
+        <a-input placeholder="请输入老乡姓名/身份证号" @keyup.enter="onSearch" @input="resetsearch" v-model="pagination.keys">
+          <i slot="prefix" class="iconfont icon-sousuo"></i>
+          <button slot="suffix" @click="onSearch">搜索</button>
+        </a-input>
+      </div>
+      <a-table :columns="billColumns" :data-source="billList" :scroll="{ y: 420 }" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :rowKey="(record) => record.index">
+        <span slot="custom_objob">
+          <template>在职</template>
+          <a-tooltip>
+            <template slot="title">
+              <p class="f12" style="color:#fff">仅显示当前在职数</p>
+            </template>
+            <i class="iconfont icon-zhuyi f14 ml4"></i>
+          </a-tooltip>
+        </span>
+      </a-table>
+      <div class="pagecontainer">
+        <a-pagination :current="+pagination.pageNum" :default-current="1" :defaultPageSize="8" :total="pagination.total" @change="onChange" />
+        <div class="ant-pagination-options-quick-jumper">
+          <span>共{{ pagination.total }}条，</span>跳至
+          <input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" />页
+        </div>
+      </div>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { dataStatisticsListApi } from '../../../../api/userinfo'
+import moment from 'moment'
+import { getDateYMD } from '../../../../utils/commonUtil'
+export default {
+  // 组件名称
+  name: 'dataStatistics',
+  // 局部注册的组件
+  components: {},
+  // 组件参数 接收来自父组件的数据
+  props: {},
+  // 组件状态值
+  data() {
+    return {
+      checked0: true,
+      checked1: false,
+      checked2: false,
+      checked5: false,
+      sortedInfo: null,
+      dataList: [],
+      pagination: {
+        pageNum: 1,
+        pageSize: 8,
+        total: null, //分页配置
+        status: 0,
+        keys: null,
+        // searchTag: 1,
+      },
+      billList: [
+        // 报名明细的表格配置
+        {
+          id: 1,
+          name: '房竟慧',
+          age: 21,
+          sex: '女',
+          nation: '汉',
+          tel: 15868868888,
+          IDCard: 40082720011208972,
+          storeJob: '常州华耀光伏普工',
+          recordDate: '2023-09-12 14:00',
+          state: '报名中',
+        },
+        {
+          id: 2,
+          name: '范明',
+          age: 36,
+          sex: '男',
+          nation: '汉',
+          tel: 15868868888,
+          IDCard: 40082720011208972,
+          storeJob: '郑州八大街富士康小时工',
+          recordDate: '2023-09-12 14:00',
+          state: '报名中',
+        },
+        {
+          id: 3,
+          name: '李泽阳',
+          age: 21,
+          sex: '女',
+          nation: '汉',
+          tel: 15868868888,
+          IDCard: 40082720011208972,
+          storeJob: '武汉远大住工普工',
+          recordDate: '2023-09-12 14:00',
+          state: '报名中',
+        },
+        {
+          id: 4,
+          name: '张鸿儒',
+          age: 21,
+          sex: '女',
+          nation: '汉',
+          tel: 15868868888,
+          IDCard: 40082720011208972,
+          storeJob: '宁波密封条普工',
+          recordDate: '2023-09-12 14:00',
+          state: '报名中',
+        },
+        {
+          id: 5,
+          name: '陈伟运',
+          age: 21,
+          sex: '女',
+          nation: '汉',
+          tel: 15868868888,
+          IDCard: 40082720011208972,
+          storeJob: '昆山洽兴包装厂普工',
+          recordDate: '2023-09-12 14:00',
+          state: '报名中',
+        },
+      ],
+      contentListSearchForm: { pageNum: 1, pageSize: 8, keys: '' },
+      townsmanDetailVisible: false,
+      isspinning: false,
+      totalObj: {
+        // 数据总计
+        arrived: null,
+        entry: null,
+        obJob: null,
+        passed: null,
+        signUps: null,
+      },
+      pagination: {
+        hideOnSinglePage: false,
+        showQuickJumper: true,
+        pageSize: 100,
+        total: 0,
+        size: 'small',
+        showTotal: function (total, range) {
+          return `共${total}条`
+        },
+        pageSizeOptions: ['25', '50', '100'],
+        showSizeChanger: true,
+        // showSizeChange:function(current, pageSize){
+        //     this.pageSize = pageSize;
+        // }
+      },
+    }
+  },
+  // 计算属性
+  computed: {
+    columns() {
+      let { sortedInfo } = this
+      console.log(sortedInfo)
+      sortedInfo = sortedInfo || {}
+      const columns = [
+        {
+          title: '序号',
+          dataIndex: 'index',
+          key: 'index',
+          customRender: (text, row, index) => {
+            return index + 1
+          },
+          width: 60,
+        },
+        {
+          title: '姓名',
+          dataIndex: 'nickName',
+          key: 'nickName',
+          ellipsis: true,
+          width: 100,
+        },
+        {
+          title: '报名',
+          dataIndex: 'signUps',
+          key: 'signUps',
+          scopedSlots: { customRender: 'signUps' },
+          ellipsis: true,
+          width: 60,
+        },
+        {
+          title: '到面',
+          dataIndex: 'arrived',
+          key: 'arrived',
+          scopedSlots: { customRender: 'arrived' },
+          ellipsis: true,
+          width: 60,
+          ellipsis: true,
+        },
+        {
+          title: '通过',
+          dataIndex: 'passed',
+          key: 'passed',
+          scopedSlots: { customRender: 'passed' },
+          ellipsis: true,
+          width: 60,
+        },
+        {
+          title: '入职',
+          dataIndex: 'entry',
+          key: 'entry',
+          scopedSlots: { customRender: 'entry' },
+          ellipsis: true,
+          width: 60,
+        },
+        {
+          // title: '在职',
+          dataIndex: 'obJob',
+          key: 'obJob',
+          slots: { title: 'custom_objob' },
+          scopedSlots: { customRender: 'obJob' },
+          // sorter: (a, b) => a.userApplyOrder.localeCompare(b.userApplyOrder),
+
+          // sortOrder: sortedInfo.columnKey == "userApplyOrder" && sortedInfo.order,
+          // ellipsis: true,
+          // width: 180,
+        },
+      ]
+      return columns
+    },
+    billColumns() {
+      let { sortedInfo } = this
+      console.log(sortedInfo)
+      sortedInfo = sortedInfo || {}
+      const columns = [
+        {
+          title: '序号',
+          dataIndex: 'index',
+          key: 'index',
+          customRender: (text, row, index) => {
+            return index + 1
+          },
+          width: 60,
+        },
+        {
+          title: '姓名',
+          dataIndex: 'name',
+          key: 'name',
+          ellipsis: true,
+          width: 100,
+        },
+        {
+          title: '年龄',
+          dataIndex: 'age',
+          key: 'age',
+          ellipsis: true,
+          width: 60,
+        },
+        {
+          title: '民族',
+          dataIndex: 'nation',
+          key: 'nation',
+          ellipsis: true,
+          width: 60,
+          ellipsis: true,
+        },
+        {
+          title: '电话',
+          dataIndex: 'tel',
+          key: 'tel',
+          ellipsis: true,
+          width: 120,
+        },
+        {
+          title: '身份证',
+          dataIndex: 'IDCard',
+          key: 'IDCard',
+          ellipsis: true,
+          // width: 60,
+        },
+        {
+          title: '岗位',
+          dataIndex: 'storeJob',
+          key: 'storeJob',
+          ellipsis: true,
+          // width: 60,
+        },
+        {
+          title: '报名时间',
+          dataIndex: 'recordDate',
+          key: 'recordDate',
+          ellipsis: true,
+          width: 160,
+        },
+        {
+          title: '状态',
+          dataIndex: 'state',
+          key: 'state',
+          ellipsis: true,
+          width: 120,
+        },
+      ]
+      return columns
+    },
+  },
+  // 侦听器
+  watch: {},
+  // 生命周期钩子   注：没用到的钩子请自行删除
+  /**
+   * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
+   */
+  created() {
+    this.contentListSearchForm.start = moment().add(-0, 'd').format('YYYY-MM-DD')
+    this.contentListSearchForm.end = moment().format('YYYY-MM-DD')
+    this.billList = [...this.billList, ...this.billList, ...this.billList]
+    this.getDataStatisticsList()
+  },
+  /**
+   * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
+   * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
+   */
+  mounted() {},
+  // 组件方法
+  methods: {
+    /**
+     * 请求日期切换
+     *
+     *
+     */
+    handleChange(tag, checked) {
+      let that = this
+      this.checked0 = false
+      this.checked1 = false
+      this.checked2 = false
+      this.checked3 = false
+      this.checked4 = false
+      this.checked5 = false
+      var start = getDateYMD()
+      var end = getDateYMD()
+      if (tag == 0) {
+        this.checked0 = checked
+        start = moment().add(-0, 'd').format('YYYY-MM-DD')
+        end = moment().format('YYYY-MM-DD')
+      } else if (tag == 1) {
+        this.checked1 = checked
+
+        start = moment().add(-1, 'd').format('YYYY-MM-DD')
+        end = moment().add(-1, 'd').format('YYYY-MM-DD')
+      } else if (tag == 2) {
+        this.checked2 = checked
+        start = moment().startOf('week').format('YYYY-MM-DD')
+        end = moment().format('YYYY-MM-DD')
+      } else if (tag == 5) {
+        this.checked5 = checked
+
+        start = moment().startOf('month').format('YYYY-MM-DD')
+        end = moment().format('YYYY-MM-DD')
+        // start = moment().subtract('month', 1).format('YYYY-MM') + '-01'
+        // end = moment().subtract(1, 'month').endOf('month').format('YYYY-MM-DD')
+      }
+      that.contentListSearchForm.start = start
+      that.contentListSearchForm.end = end
+      // this.selDate = [moment(that.contentListSearchForm.start, 'YYYY-MM-DD'), moment(that.contentListSearchForm.end, 'YYYY-MM-DD')]
+
+      that.contentListSearchForm.pageNum = 1
+      this.pagination.current = 1
+
+      this.getDataStatisticsList()
+    },
+    async getDataStatisticsList() {
+      this.isspinning = true
+      let { data } = await dataStatisticsListApi(this.contentListSearchForm)
+      console.log(data)
+      if (data.status == 200) {
+        this.totalObj = {
+          arrived: null,
+          entry: null,
+          obJob: null,
+          passed: null,
+          signUps: null,
+        }
+        data.data.list.forEach((item, index) => {
+          this.totalObj.arrived += item.arrived
+          this.totalObj.entry += item.entry
+          this.totalObj.obJob += item.obJob
+          this.totalObj.passed += item.passed
+          this.totalObj.signUps += item.signUps
+          this.totalObj.index = index + 2
+        })
+        this.dataList = data.data.list
+        this.isspinning = false
+      }
+    },
+    inputpageChange(e) {
+      const pagenumcount = this.pagination.total / this.pagination.pageSize
+      console.log(pagenumcount)
+      if (e.target.value) {
+        if (e.target.value > pagenumcount) {
+          this.pagination.pageNum = Math.ceil(pagenumcount)
+        } else {
+          this.pagination.pageNum = e.target.value
+        }
+      } else {
+        this.pagination.pageNum = 1
+      }
+      // this.getJobList();
+      // this.getTownsman()
+      console.log(e)
+    },
+    dateChange(data) {
+      console.log(data)
+      var that = this
+      if (data.length == 2) {
+        that.contentListSearchForm.start = data[0].format('YYYY-MM-DD')
+        that.contentListSearchForm.end = data[1].format('YYYY-MM-DD')
+
+        that.checked0 = false
+        that.checked1 = false
+        that.checked2 = false
+        that.checked3 = false
+        that.checked4 = false
+        that.checked5 = false
+      } else {
+        that.checked0 = true
+        that.checked1 = false
+        that.checked2 = false
+        that.checked3 = false
+        that.checked4 = false
+        that.checked5 = false
+        that.contentListSearchForm.start = moment().add(-7, 'd').format('YYYY-MM-DD')
+        that.contentListSearchForm.end = moment().format('YYYY-MM-DD')
+      }
+
+      that.getDataStatisticsList()
+    },
+    townsmanDetailModalClose() {
+      this.townsmanDetailVisible = false
+    },
+    onSearch() {
+      if (this.pagination.keys != null && this.pagination.keys.length != 0) {
+        // this.getTownsman()
+        // this.gettownsManCount()
+      }
+    },
+    resetsearch(e) {
+      console.log(e)
+      if (e.target.value.length === 0) {
+        this.pagination.keys = ''
+
+        // this.gettownsManCount()
+        // this.getTownsman()
+      }
+    },
+    onChange(e, e1, e2) {
+      console.log(e)
+      console.log(e1)
+      console.log(e2)
+      if (typeof e == 'number') {
+        this.pagination.pageNum = e
+        this.getTownsman()
+      }
+    },
+  },
+}
+</script>
+
+<style scoped lang="less">
+.dataStatisticsContainer {
+  // min-height: 780px;
+}
+.pagechange {
+  button {
+    width: 66px;
+    height: 24px;
+    border: 1px solid rgba(77, 87, 94, 0.3);
+    // border-radius: 4px;
+    font-size: 14px;
+    color: #4d575e;
+    background-color: #fff;
+    &:hover {
+      border-color: #ff4400;
+      color: #ff4400;
+    }
+    &:first-child {
+      margin-right: 12px;
+    }
+  }
+}
+.townsmanDetailModal {
+  /deep/ .ant-modal-header {
+    background-color: #f5f5f5;
+    border-bottom: 0px solid #000;
+  }
+  /deep/ .ant-modal-content {
+    .ant-modal-body {
+      min-height: 600px;
+      max-height: 700px;
+      padding-bottom:90px;
+      overflow: auto;
+    }
+  }
+}
+.ant-tag-checkable:hover {
+  color: #ff4400;
+  cursor: pointer;
+}
+.ant-tag-checkable-checked {
+  background-color: transparent;
+  color: #ff4400;
+}
+/deep/.ant-table-pagination.ant-pagination {
+  float: unset;
+  text-align: center;
+}
+.navTitle {
+  margin: 16px 0;
+}
+.content {
+  position: relative;
+  overflow: auto;
+  max-height: 700px;
+}
+.total {
+  position: sticky;
+  background-color: #fff;
+  bottom: 0;
+  // width: 460px;
+  display: flex;
+  justify-content: start;
+  align-items: center;
+  font-size: 13px;
+  > div {
+    padding: 16px;
+    font-weight: bold;
+    &:not(:nth-child(2)) {
+      width: 60px;
+    }
+  }
+}
+/deep/.searchinput {
+  width: 326px;
+  margin-bottom: 16px;
+  position: relative;
+  .ant-input {
+    // width: 300px;
+    position: relative;
+    height: 32px;
+    text-indent: 10px;
+    background: #fff;
+    // border: 1px solid rgba(77, 87, 94, 0.3);
+    border-radius: 0px;
+    box-shadow: 0px 2px 4px 0px transparent;
+    font-size: 14px !important;
+    padding-right: 0;
+    border-color: #ddd;
+    // z-index: ;
+    &::placeholder {
+      text-indent: 10px;
+      font-size: 14px !important;
+    }
+    &:hover {
+      border-color: #ff4400;
+      box-shadow: none;
+    }
+    &:focus {
+      border-color: #ff4400;
+    }
+  }
+  .ant-input-affix-wrapper {
+    .ant-input-prefix {
+      position: absolute;
+      width: 20px;
+      right: 0;
+      top: 16px;
+      i {
+        color: #c9c9c9;
+      }
+    }
+    .ant-input-suffix {
+      // position: absolute;
+      right: 0px !important;
+    }
+  }
+  button {
+    width: 70px;
+    height: 32px;
+    color: white;
+    background: #ff4400;
+    border-color: #ff4400;
+    border: none;
+    border-radius: 0px;
+    font-size: 14px;
+    box-shadow: none;
+    cursor: pointer;
+    outline: none;
+    &:hover {
+      background-color: #ff4400cc;
+    }
+    // &:focus {
+    //   border: none;
+    // }
+  }
+}
+.pagecontainer {
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+}
+// /deep/.ant-popover .ant-popover-content .ant-popover-inner-content {
+//   width: 200px !important;
+// }
+</style>
\ No newline at end of file
diff --git a/src/components/userinfo/usercenter/components/mybill.vue b/src/components/userinfo/usercenter/components/mybill.vue
index 99d517b..cc7459f 100644
--- a/src/components/userinfo/usercenter/components/mybill.vue
+++ b/src/components/userinfo/usercenter/components/mybill.vue
@@ -1,29 +1,36 @@
 <template>
-	<div class="mybill-container w">
-		<div class="contenttitle">
-			<ul @click="resetpag">
-				<li @click="pagination.status = -1" :class="{ townsmanactive: pagination.status === -1 }">
-					全部<span>{{ billNumber.num == 0 ? "" : billNumber.num }}</span>
-				</li>
-				<li @click="pagination.status = 10" :class="{ townsmanactive: pagination.status === 10 }">
-					待审核<span>{{ billNumber.num10 == 0 ? "" : billNumber.num10 }}</span>
-				</li>
-				<li @click="pagination.status = 20" :class="{ townsmanactive: pagination.status === 20 }">
-					待接待<span>{{ billNumber.num20 == 0 ? "" : billNumber.num20 }}</span>
-				</li>
-				<li @click="pagination.status = 25" :class="{ townsmanactive: pagination.status === 25 }">
-					待面试<span>{{ billNumber.num25 == 0 ? "" : billNumber.num25 }}</span>
-				</li>
-				<li @click="pagination.status = 30" :class="{ townsmanactive: pagination.status === 30 }">
-					待入职<span>{{ billNumber.num30 == 0 ? "" : billNumber.num30 }}</span>
-				</li>
-				<li @click="pagination.status = 40" :class="{ townsmanactive: pagination.status === 40 }">
-					跟在职<span>{{ billNumber.num40 == 0 ? "" : billNumber.num40 }}</span>
-				</li>
-				<li @click="pagination.status = 999" :class="{ townsmanactive: pagination.status === 999 }">
-					已完成<span>{{ billNumber.num999 == 0 ? "" : billNumber.num999 }}</span>
-				</li>
-				<!-- <li
+  <div class="mybill-container w">
+    <div class="contenttitle">
+      <ul @click="resetpag">
+        <li @click="pagination.status = -1" :class="{ townsmanactive: pagination.status === -1 }">
+          全部
+          <span>{{ billNumber.num }}</span>
+        </li>
+        <li @click="pagination.status = 10" :class="{ townsmanactive: pagination.status === 10 }">
+          待审核
+          <span>{{ billNumber.num10 }}</span>
+        </li>
+        <li @click="pagination.status = 20" :class="{ townsmanactive: pagination.status === 20 }">
+          待接待
+          <span>{{ billNumber.num20 }}</span>
+        </li>
+        <li @click="pagination.status = 25" :class="{ townsmanactive: pagination.status === 25 }">
+          待面试
+          <span>{{ billNumber.num25 }}</span>
+        </li>
+        <li @click="pagination.status = 30" :class="{ townsmanactive: pagination.status === 30 }">
+          待入职
+          <span>{{ billNumber.num30 }}</span>
+        </li>
+        <li @click="pagination.status = 40" :class="{ townsmanactive: pagination.status === 40 }">
+          跟在职
+          <span>{{ billNumber.num40 }}</span>
+        </li>
+        <li @click="pagination.status = 999" :class="{ townsmanactive: pagination.status === 999 }">
+          已完成
+          <span>{{ billNumber.num999 }}</span>
+        </li>
+        <!-- <li
           @click="pagination.status = 50"
           :class="{ townsmanactive: pagination.status === 50 }"
         >
@@ -34,1500 +41,1520 @@
           :class="{ townsmanactive: pagination.status === 70 }"
         >
           稍后<span>{{ billNumber.num == 0 ? "" : billNumber.num }}</span>
-        </li> -->
-				<!-- <li
+        </li>-->
+        <!-- <li
           @click="pagination.status = 70"
           :class="{ townsmanactive: pagination.status === 70 }"
         >
           已放弃
-        </li> -->
-			</ul>
-		</div>
-		<div class="contentbody">
-			<div class="searchbox">
-				<div class="searchinput">
-					<a-input placeholder="搜索工单号/职位/姓名/电话/身份证号" allowClear @keyup.enter="onSearch" @input="resetsearch" v-model="pagination.keys"
-						><i slot="prefix" class="iconfont icon-sousuo"></i>
-						<button slot="suffix" @click="onSearch">搜索</button>
-					</a-input>
-					<div>
-						<div>报名时间：</div>
-						<a-range-picker style="" @change="dateChange" class="" />
-					</div>
-				</div>
-				<div class="pagechange">
-					<button @click="changepage(-1)">上一页</button>
-					<button @click="changepage(1)">下一页</button>
-				</div>
-			</div>
+        </li>-->
+      </ul>
+    </div>
+    <div class="contentbody">
+      <div class="searchbox">
+        <div class="searchinput">
+          <a-input placeholder="搜索工单号/职位/姓名/电话/身份证号" allowClear @keyup.enter="onSearch" @input="resetsearch" v-model="pagination.keys">
+            <i slot="prefix" class="iconfont icon-sousuo"></i>
+            <button slot="suffix" @click="onSearch">搜索</button>
+          </a-input>
+          <div>
+            <div>报名时间：</div>
+            <a-range-picker style @change="dateChange" class />
+          </div>
+        </div>
+        <div class="pagechange">
+          <button @click="changepage(-1)">上一页</button>
+          <button @click="changepage(1)">下一页</button>
+        </div>
+      </div>
 
-			<div class="infocontent">
-				<div class="contenttltle">
-					<ul>
-						<li>姓名</li>
-						<li>报名岗位</li>
-						<li>政策</li>
-						<!-- <button @click="statusFilter">filter</button> -->
-						<li>
-							<div>状态：</div>
-							<a-select size="small" placeholder="" allowClear @change="resetStatus" :dropdownMatchSelectWidth="false" dropdownClassName="statusclass" style="">
-								<a-select-option v-for="(i, index) in orderStatus" :key="index" @click="handleChange(i)"> {{ i.name }}</a-select-option>
-							</a-select>
-						</li>
-					</ul>
-				</div>
-				<div style="text-align: center; margin-top: 16px">
-					<a-spin tip="加载中..." :spinning="isspinning"></a-spin>
-				</div>
-				<template v-if="billList.length === 0 && isspinning === false">
-					<a-empty class="nodata" description="暂无数据" />
-				</template>
-				<div class="subsetbox" v-if="!isspinning">
-					<div class="infoSubset" v-for="(item, index) in billList" :key="item.id" :class="item.isDown ? '' : 'isDownstyle'">
-						<ul class="proxyInfo">
-							<li>报名时间: {{ item.createTime }}</li>
-							<li>工单号: {{ item.orderNum }}</li>
-							<li>{{ item.agencyName }}</li>
-							<li>
-								更新时间: {{ item.updateTime }}
-								<span style="display: inline-block">({{ item.diffTime }})</span>
-							</li>
-						</ul>
-						<ul class="billInfo" style="">
-							<li>
-								<div class="serial">{{ index + 1 }}</div>
-								<i
-									class="iconfont icon-shenfenzheng"
-									:style="{
+      <div class="infocontent">
+        <div class="contenttltle">
+          <ul>
+            <li>姓名</li>
+            <li>报名岗位</li>
+            <li>政策</li>
+            <!-- <button @click="statusFilter">filter</button> -->
+            <li>
+              <div>状态：</div>
+              <a-select size="small" placeholder allowClear @change="resetStatus" :dropdownMatchSelectWidth="false" dropdownClassName="statusclass" style>
+                <a-select-option v-for="(i, index) in orderStatus" :key="index" @click="handleChange(i)">{{ i.name }}</a-select-option>
+              </a-select>
+            </li>
+          </ul>
+        </div>
+        <div style="text-align: center; margin-top: 16px">
+          <a-spin tip="加载中..." :spinning="isspinning"></a-spin>
+        </div>
+        <template v-if="billList.length === 0 && isspinning === false">
+          <a-empty class="nodata" description="暂无数据" />
+        </template>
+        <div class="subsetbox" v-if="!isspinning">
+          <div class="infoSubset" v-for="(item, index) in billList" :key="item.id" :class="item.isDown ? '' : 'isDownstyle'">
+            <ul class="proxyInfo">
+              <li>报名时间: {{ item.createTime }}</li>
+              <li>工单号: {{ item.orderNum }}</li>
+              <li>{{ item.agencyName ?item.agencyName + (item.applyUserName ? ('@' + item.applyUserName) : '') : '-' + (item.applyUserName ? ('@' + item.applyUserName) : '')}}</li>
+              <li>
+                更新时间: {{ item.updateTime }}
+                <span style="display: inline-block">({{ item.diffTime }})</span>
+              </li>
+            </ul>
+            <ul class="billInfo" style>
+              <li>
+                <div class="serial">{{ index + 1 }}</div>
+                <i class="iconfont icon-shenfenzheng" :style="{
 										color: item.idCardImageUrl !== '' ? '#ff4400cc' : '#666',
-									}"
-									@click.stop="showdiymodal(item)"
-								></i
-								><span>{{ item.userName }}/{{ item.sex }}/{{ item.age }}</span>
-								<span>{{ item.tel }}</span>
-							</li>
-							<li>
-								<div>{{ item.storeJobName }}</div>
-							</li>
-							<li>
-								<p>{{ item.policy }}</p>
-								<div v-show="item.isunfold" class="policyControl" @click="changeStatus(item, index)" :ref="'Control' + index"><span v-show="item.controlUnfold">展开</span><span v-show="!item.controlUnfold">收起</span></div>
-							</li>
-							<li>
-								<span style="color: #ff4400; cursor: pointer" @click="showDetail(item)">{{ item.statusTag }}</span
-								><span v-show="item.statusShowTime">{{ item.statusTimeInfo }}: {{ item.statusShowTime }}</span>
-								<span v-show="item.status == 40 || item.status == 50">具体以出名单时间为准</span>
-							</li>
-						</ul>
-					</div>
-				</div>
-			</div>
-			<div class="pagecontainer" v-if="billList.length !== 0">
-				<a-pagination :current="+pagination.pageNum" :default-current="1" :defaultPageSize="10" :total="pagination.total" @change="onChange" />
-				<div class="ant-pagination-options-quick-jumper">
-					<span>共{{ pagination.total }}条，</span>
-					跳至<input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" style="" />页
-				</div>
-			</div>
-		</div>
-		<div id="diymodal" class="diymodal" v-if="isdiymodalshow">
-			<div class="title" @mousedown.stop="movebox">
-				<i class="iconfont icon-guanbi" @click.stop="closemodal"></i>
-			</div>
-			<div class="body" @mousewheel.prevent="mousewhell">
-				<div class="imgbox1" v-if="idcardimg !== ''">
-					<div class="imgbox" :style="{ background: `url('${idcardimg}')` }"></div>
-				</div>
-				<div class="warningbox" v-else>
-					<div>
-						<img src="../../../../assets/warning.png" alt="" />
-					</div>
-					<p>未上传身份证照片</p>
-					<!-- <div><button @click="isdiymodalshow = false">确定</button></div> -->
-				</div>
-				<!-- <img :src="idcardimg" alt="" draggable="false" /> -->
-			</div>
-			<div class="footer">
-				<i class="iconfont icon-rotatexuanzhuan" title="旋转" @click="rotate(-90)"></i>
-				<i class="iconfont icon-rotatexuanzhuan2" title="旋转" @click="rotate(90)"></i>
-			</div>
-		</div>
-		<a-modal class="billDetailModal" v-model="billDetailVisible" width="756px" @cancel="billDetailModalClose" :footer="null">
-			<div slot="title">跟进记录</div>
-			<div id="progressinfo" v-if="Object.keys(currentBillDetail).length != 0">
-				<template v-for="(group, key) in currentBillDetail">
-					<div class="titleMain">
-						<div v-if="spliceStr(key) == '1'">
-							<img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/shz.svg" alt="" />
-							报名审核中
-						</div>
-						<div v-if="spliceStr(key) == '2'"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/bmcg.svg" alt="" />报名成功</div>
-						<div v-if="spliceStr(key) == '3'"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/mstg.svg" alt="" />待入职</div>
-						<div v-if="spliceStr(key) == '4'"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/rzcg.svg" alt="" />在职中</div>
-						<div v-if="spliceStr(key) == '5'"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/ylz.svg" alt="" />已离职</div>
-						<div v-if="spliceStr(key) == '6'"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/bmcg.svg" alt="" />已完成</div>
-						<div v-if="spliceStr(key) == '9'"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/yylz.svg" alt="" />约离职</div>
-						<div v-if="spliceStr(key) == '11'"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/wei.svg" alt="" />报名失败</div>
-						<div v-if="spliceStr(key) == '12'"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/yjd.svg" alt="" />已接到</div>
-						<div v-if="spliceStr(key) == '13'"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/wei.svg" alt="" />未接到</div>
-						<div v-if="spliceStr(key) == '14'"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/wei.svg" alt="" />面试未通过</div>
-						<div v-if="spliceStr(key) == '15'"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/wei.svg" alt="" />未入职</div>
-					</div>
-					<div v-for="(item, index) in group" class="ui-step-one">
-						<div class="cb-cricle"></div>
-						<div class="ui-list-info">
-							<!-- :style="padding-bottom: item.desp == '' ? '18px' : '24px';" -->
-							<div class="f12 c6" style="white-space: pre-line" v-if="item.desp != ''">
-								{{ item.desp }}
-								<template v-if="item.policy">
-									<span class="ml12" style="color: #ff4400; cursor: pointer" @click="showInfo2(item.policy)"> 详情</span>
-								</template>
-								<a-modal class="billDetailModal recordInfo" title="报名信息" :visible="zzvisible" @cancel="policyModalCancel" width="716px" :footer="null">
-									<a-row class="f16 mb8">
-										<a-col :span="4">
-											<span class="dib tr">姓名：</span>
-										</a-col>
-										<a-col :span="18">
-											<span class="fwb" v-if="currentBillInfo.userName">{{ currentBillInfo.userName }}</span>
-											<span class="fwb" v-if="currentBillInfo.sex">/{{ currentBillInfo.sex == "1" || currentBillInfo.sex == "男" ? "男" : "女" }}</span>
-											<span class="fwb" v-if="currentBillInfo.age">/{{ currentBillInfo.age }}岁</span>
-											<span class="fwb" v-if="currentBillInfo.nation && currentBillInfo.nation != '族'">/{{ currentBillInfo.nation }}</span>
-										</a-col>
-									</a-row>
-									<a-row class="f16 mb8">
-										<a-col :span="4">
-											<span class="dib tr">电话：</span>
-										</a-col>
-										<a-col :span="18">
-											<span>{{ currentBillInfo.tel == "" || currentBillInfo.tel == null || currentBillInfo.tel == "undefined" ? "-" : currentBillInfo.tel }}</span>
-										</a-col>
-									</a-row>
-									<a-row class="f16 mb8">
-										<a-col :span="4">
-											<span class="dib tr">身份证号：</span>
-										</a-col>
-										<a-col :span="18">
-											<span>{{ currentBillInfo.idCard == "" || currentBillInfo.idCard == null || currentBillInfo.idCard == "undefined" ? "-" : currentBillInfo.idCard }}</span>
-										</a-col>
-									</a-row>
-									<a-row class="f16">
-										<a-col :span="4">
-											<span class="dib tr">家庭住址：</span>
-										</a-col>
-										<a-col :span="18">
-											<span>{{ currentBillInfo.address == "" || currentBillInfo.address == null || currentBillInfo.address == "undefined" ? "-" : currentBillInfo.address }}</span>
-										</a-col>
-									</a-row>
+									}" @click.stop="showdiymodal(item)"></i>
+                <span>{{ item.userName }}/{{ item.sex }}/{{ item.age }}</span>
+                <span>{{ item.tel }}</span>
+              </li>
+              <li>
+                <div>{{ item.storeJobName }}</div>
+              </li>
+              <li>
+                <p>{{ item.policy }}</p>
+                <div v-show="item.isunfold" class="policyControl" @click="changeStatus(item, index)" :ref="'Control' + index">
+                  <span v-show="item.controlUnfold">展开</span>
+                  <span v-show="!item.controlUnfold">收起</span>
+                </div>
+              </li>
+              <li>
+                <span style="color: #ff4400; cursor: pointer" @click="showDetail(item)">{{ item.statusTag }}</span>
+                <span v-show="item.statusShowTime">{{ item.statusTimeInfo }}: {{ item.statusShowTime }}</span>
+                <span v-show="item.status == 40 || item.status == 50">具体以出名单时间为准</span>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+      <div class="pagecontainer" v-if="billList.length !== 0">
+        <a-pagination :current="+pagination.pageNum" :default-current="1" :defaultPageSize="10" :total="pagination.total" @change="onChange" />
+        <div class="ant-pagination-options-quick-jumper">
+          <span>共{{ pagination.total }}条，</span>
+          跳至
+          <input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" style />页
+        </div>
+      </div>
+    </div>
+    <div id="diymodal" class="diymodal" v-if="isdiymodalshow">
+      <div class="title" @mousedown.stop="movebox">
+        <i class="iconfont icon-guanbi" @click.stop="closemodal"></i>
+      </div>
+      <div class="body" @mousewheel.prevent="mousewhell">
+        <div class="imgbox1" v-if="idcardimg !== ''">
+          <div class="imgbox" :style="{ background: `url('${idcardimg}')` }"></div>
+        </div>
+        <div class="warningbox" v-else>
+          <div>
+            <img src="../../../../assets/warning.png" alt />
+          </div>
+          <p>未上传身份证照片</p>
+          <!-- <div><button @click="isdiymodalshow = false">确定</button></div> -->
+        </div>
+        <!-- <img :src="idcardimg" alt="" draggable="false" /> -->
+      </div>
+      <div class="footer">
+        <i class="iconfont icon-rotatexuanzhuan" title="旋转" @click="rotate(-90)"></i>
+        <i class="iconfont icon-rotatexuanzhuan2" title="旋转" @click="rotate(90)"></i>
+      </div>
+    </div>
+    <a-modal class="billDetailModal" v-model="billDetailVisible" width="756px" @cancel="billDetailModalClose" :footer="null">
+      <div slot="title">跟进记录</div>
+      <div id="progressinfo" v-if="Object.keys(currentBillDetail).length != 0">
+        <template v-for="(group, key) in currentBillDetail">
+          <div class="titleMain">
+            <div v-if="spliceStr(key) == '1'">
+              <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/shz.svg" alt />
+              报名审核中
+            </div>
+            <div v-if="spliceStr(key) == '2'">
+              <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/bmcg.svg" alt />报名成功
+            </div>
+            <div v-if="spliceStr(key) == '3'">
+              <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/mstg.svg" alt />待入职
+            </div>
+            <div v-if="spliceStr(key) == '4'">
+              <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/rzcg.svg" alt />在职中
+            </div>
+            <div v-if="spliceStr(key) == '5'">
+              <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/ylz.svg" alt />已离职
+            </div>
+            <div v-if="spliceStr(key) == '6'">
+              <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/bmcg.svg" alt />已完成
+            </div>
+            <div v-if="spliceStr(key) == '9'">
+              <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/yylz.svg" alt />约离职
+            </div>
+            <div v-if="spliceStr(key) == '11'">
+              <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/wei.svg" alt />报名失败
+            </div>
+            <div v-if="spliceStr(key) == '12'">
+              <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/yjd.svg" alt />已接到
+            </div>
+            <div v-if="spliceStr(key) == '13'">
+              <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/wei.svg" alt />未接到
+            </div>
+            <div v-if="spliceStr(key) == '14'">
+              <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/wei.svg" alt />面试未通过
+            </div>
+            <div v-if="spliceStr(key) == '15'">
+              <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/wei.svg" alt />未入职
+            </div>
+          </div>
+          <div v-for="(item, index) in group" class="ui-step-one">
+            <div class="cb-cricle"></div>
+            <div class="ui-list-info">
+              <!-- :style="padding-bottom: item.desp == '' ? '18px' : '24px';" -->
+              <div class="f12 c6" style="white-space: pre-line" v-if="item.desp != ''">
+                {{ item.desp }}
+                <template v-if="item.policy">
+                  <span class="ml12" style="color: #ff4400; cursor: pointer" @click="showInfo2(item.policy)">详情</span>
+                </template>
+                <a-modal class="billDetailModal recordInfo" title="报名信息" :visible="zzvisible" @cancel="policyModalCancel" width="716px" :footer="null">
+                  <a-row class="f16 mb8">
+                    <a-col :span="4">
+                      <span class="dib tr">姓名：</span>
+                    </a-col>
+                    <a-col :span="18">
+                      <span class="fwb" v-if="currentBillInfo.userName">{{ currentBillInfo.userName }}</span>
+                      <span class="fwb" v-if="currentBillInfo.sex">/{{ currentBillInfo.sex == "1" || currentBillInfo.sex == "男" ? "男" : "女" }}</span>
+                      <span class="fwb" v-if="currentBillInfo.age">/{{ currentBillInfo.age }}岁</span>
+                      <span class="fwb" v-if="currentBillInfo.nation && currentBillInfo.nation != '族'">/{{ currentBillInfo.nation }}</span>
+                    </a-col>
+                  </a-row>
+                  <a-row class="f16 mb8">
+                    <a-col :span="4">
+                      <span class="dib tr">电话：</span>
+                    </a-col>
+                    <a-col :span="18">
+                      <span>{{ currentBillInfo.tel == "" || currentBillInfo.tel == null || currentBillInfo.tel == "undefined" ? "-" : currentBillInfo.tel }}</span>
+                    </a-col>
+                  </a-row>
+                  <a-row class="f16 mb8">
+                    <a-col :span="4">
+                      <span class="dib tr">身份证号：</span>
+                    </a-col>
+                    <a-col :span="18">
+                      <span>{{ currentBillInfo.idCard == "" || currentBillInfo.idCard == null || currentBillInfo.idCard == "undefined" ? "-" : currentBillInfo.idCard }}</span>
+                    </a-col>
+                  </a-row>
+                  <a-row class="f16">
+                    <a-col :span="4">
+                      <span class="dib tr">家庭住址：</span>
+                    </a-col>
+                    <a-col :span="18">
+                      <span>{{ currentBillInfo.address == "" || currentBillInfo.address == null || currentBillInfo.address == "undefined" ? "-" : currentBillInfo.address }}</span>
+                    </a-col>
+                  </a-row>
 
-									<div style="border-top: 1px dashed #eeeeee; margin-top: 24px; margin-bottom: 24px"></div>
-									<a-row class="f16 mb8">
-										<a-col :span="4">
-											<span class="dib tr">报名岗位：</span>
-										</a-col>
-										<a-col :span="18">
-											<span class="fwb">{{ currentBillInfo.storeJobName || "-" }}</span>
-										</a-col>
-									</a-row>
-									<a-row class="f16 mb8">
-										<a-col :span="4">
-											<span class="dib tr">政策：</span>
-										</a-col>
-										<a-col :span="18">
-											<span style="white-space: pre-wrap">{{ currentBillInfo.policy || "-" }}</span>
-										</a-col>
-									</a-row>
-									<a-row class="f16 mb8">
-										<a-col :span="4"> </a-col>
-										<a-col :span="18" class="bfbutton">
-											<a-button style="background-color: #ff4400; color: white; border-radius: 0; border: none" @click="handleCancel"> 复制文本 </a-button>
-										</a-col>
-									</a-row>
-								</a-modal>
-							</div>
-							<div class="f12 c9 mt8">
-								{{ item.creator }}
-								<span class="ml8">
-									{{ formatDateYMDHM(item.createTime) }}
-								</span>
-							</div>
-						</div>
-					</div>
-				</template>
-			</div>
-			<div v-else>
-				<a-empty class="nodata" description="暂无数据" style="padding: 40px" />
-			</div>
-		</a-modal>
-	</div>
+                  <div style="border-top: 1px dashed #eeeeee; margin-top: 24px; margin-bottom: 24px"></div>
+                  <a-row class="f16 mb8">
+                    <a-col :span="4">
+                      <span class="dib tr">报名岗位：</span>
+                    </a-col>
+                    <a-col :span="18">
+                      <span class="fwb">{{ currentBillInfo.storeJobName || "-" }}</span>
+                    </a-col>
+                  </a-row>
+                  <a-row class="f16 mb8">
+                    <a-col :span="4">
+                      <span class="dib tr">政策：</span>
+                    </a-col>
+                    <a-col :span="18">
+                      <span style="white-space: pre-wrap">{{ currentBillInfo.policy || "-" }}</span>
+                    </a-col>
+                  </a-row>
+                  <a-row class="f16 mb8">
+                    <a-col :span="4"></a-col>
+                    <a-col :span="18" class="bfbutton">
+                      <a-button style="background-color: #ff4400; color: white; border-radius: 0; border: none" @click="handleCancel">复制文本</a-button>
+                    </a-col>
+                  </a-row>
+                </a-modal>
+              </div>
+              <div class="f12 c9 mt8">
+                {{ item.creator }}
+                <span class="ml8">{{ formatDateYMDHM(item.createTime) }}</span>
+              </div>
+            </div>
+          </div>
+        </template>
+      </div>
+      <div v-else>
+        <a-empty class="nodata" description="暂无数据" style="padding: 40px" />
+      </div>
+    </a-modal>
+  </div>
 </template>
 
 <script>
-import { userBillApi, userBillNumberApi, userBillDetailApi } from "../../../../api/userinfo";
-import { getUserApplyOrderStatusById, isEmptyCheck, formatDateYMDHM, formatDateYMD } from "../../../../utils/commonUtil";
+import { userBillApi, userBillNumberApi, userBillDetailApi } from '../../../../api/userinfo'
+import { getUserApplyOrderStatusByIdToBill, isEmptyCheck, formatDateYMDHM, formatDateYMD } from '../../../../utils/commonUtil'
 
 export default {
-	// 组件名称
-	name: "mybillcontainer",
-	// 局部注册的组件
-	components: {},
-	// 组件参数 接收来自父组件的数据
-	props: {},
-	// 组件状态值
-	data() {
-		return {
-			isspinning: false,
-			idcardimg: "", // 回显的身份证图片url
-			isdiymodalshow: false, // 控制身份证图片显示
-			scaleNum: 1, // 身份证图片显示倍率
-			rotateNum: 0,
-			searchvalue: "", // 搜索框检索信息
-			filterStatus: 1, // 排序状态
-			saveBill: [], // 缓存的报名列表
-			billDetailVisible: false, // 工单详情显示
-			currentBillDetail: {}, // 当前点击的报名详情
-			zzvisible: false, // 跟进记录的政策信息弹出框显示
-			currentBillInfo: {}, // 当前的工单跟进详情
-			pagination: {
-				pageNum: 1,
-				pageSize: 10,
-				total: null, //分页配置
-				status: -1,
-				keys: "",
-			},
-			statusValue: "",
-			orderStatus: [
-				{
-					id: "10",
-					name: "已报名，审核中",
-					value: "10",
-					text: "报名审核中",
-					num: 0,
-				},
-				{
-					id: "20",
-					name: "报名成功，待面试",
-					value: "20",
-					text: "审核通过",
-					num: 0,
-				},
-				{
-					id: "21",
-					name: "审核未通过，报名失败",
-					value: "21",
-					text: "审核未通过",
-					num: 0,
-				},
-				{ id: "25", name: "已接到", value: "25", text: "已接到", num: 0 },
-				{ id: "26", name: "未接到", value: "26", text: "未接到", num: 0 },
-				{
-					id: "30",
-					name: "面试通过，待入职",
-					value: "30",
-					text: "面试通过",
-					num: 0,
-				},
-				{
-					id: "35",
-					name: "面试未通过",
-					value: "35",
-					text: "面试未通过",
-					num: 0,
-				},
-				{
-					id: "40",
-					name: "已入职，在职中",
-					value: "40",
-					text: "已入职",
-					num: 0,
-				},
-				{
-					id: "45",
-					name: "面试通过，未入职",
-					value: "45",
-					text: "通过未入职",
-					num: 0,
-				},
-				{ id: "50", name: "已离职", value: "50", text: "已离职", num: 0 },
-				// { id: "60", name: "已完成", value: "60", text: "已完成", num: 0 }
-			],
-			billList: [],
-			isunfold: false,
-			statusTimeInfo: "", // 状态的时间类型
-			statusShowTime: "", // 状态时间
-			billNumber: {},
-		};
-	},
-	// 计算属性
-	computed: {},
-	// 侦听器
-	watch: {},
-	// 生命周期钩子   注：没用到的钩子请自行删除
-	/**
-	 * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
-	 */
-	created() {
-		this.getBill();
-		this.userBillNumber();
-	},
-	/**
-	 * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
-	 * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
-	 */
-	mounted() {},
-	// 组件方法
-	methods: {
-		onChange(e) {
-			this.pagination.pageNum = e;
-			console.log(e);
-			this.getBill();
-		},
-		dateChange(e) {
-			console.log("ischange");
-			console.log(e);
+  // 组件名称
+  name: 'mybillcontainer',
+  // 局部注册的组件
+  components: {},
+  // 组件参数 接收来自父组件的数据
+  props: {},
+  // 组件状态值
+  data() {
+    return {
+      isspinning: false,
+      idcardimg: '', // 回显的身份证图片url
+      isdiymodalshow: false, // 控制身份证图片显示
+      scaleNum: 1, // 身份证图片显示倍率
+      rotateNum: 0,
+      searchvalue: '', // 搜索框检索信息
+      filterStatus: 1, // 排序状态
+      saveBill: [], // 缓存的报名列表
+      billDetailVisible: false, // 工单详情显示
+      currentBillDetail: {}, // 当前点击的报名详情
+      zzvisible: false, // 跟进记录的政策信息弹出框显示
+      currentBillInfo: {}, // 当前的工单跟进详情
+      pagination: {
+        pageNum: 1,
+        pageSize: 10,
+        total: null, //分页配置
+        status: -1,
+        keys: '',
+      },
+      statusValue: '',
+      orderStatus: [
+        {
+          id: '10',
+          name: '已报名，审核中',
+          value: '10',
+          text: '报名审核中',
+          num: 0,
+        },
+        {
+          id: '20',
+          name: '报名成功，待面试',
+          value: '20',
+          text: '审核通过',
+          num: 0,
+        },
+        {
+          id: '21',
+          name: '审核未通过，报名失败',
+          value: '21',
+          text: '审核未通过',
+          num: 0,
+        },
+        { id: '25', name: '已接到', value: '25', text: '已接到', num: 0 },
+        { id: '26', name: '未接到', value: '26', text: '未接到', num: 0 },
+        {
+          id: '30',
+          name: '面试通过，待入职',
+          value: '30',
+          text: '面试通过',
+          num: 0,
+        },
+        {
+          id: '35',
+          name: '面试未通过',
+          value: '35',
+          text: '面试未通过',
+          num: 0,
+        },
+        {
+          id: '40',
+          name: '已入职，在职中',
+          value: '40',
+          text: '已入职',
+          num: 0,
+        },
+        {
+          id: '45',
+          name: '面试通过，未入职',
+          value: '45',
+          text: '通过未入职',
+          num: 0,
+        },
+        { id: '50', name: '已离职', value: '50', text: '已离职', num: 0 },
+        // { id: "60", name: "已完成", value: "60", text: "已完成", num: 0 }
+      ],
+      billList: [],
+      isunfold: false,
+      statusTimeInfo: '', // 状态的时间类型
+      statusShowTime: '', // 状态时间
+      billNumber: {},
+    }
+  },
+  // 计算属性
+  computed: {},
+  // 侦听器
+  watch: {},
+  // 生命周期钩子   注：没用到的钩子请自行删除
+  /**
+   * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
+   */
+  created() {
+    this.getBill()
+    this.userBillNumber()
+  },
+  /**
+   * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
+   * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
+   */
+  mounted() {},
+  // 组件方法
+  methods: {
+    onChange(e) {
+      this.pagination.pageNum = e
+      console.log(e)
+      this.getBill()
+    },
+    dateChange(e) {
+      console.log('ischange')
+      console.log(e)
 
-			if (e.length != 0) {
-				let date1 = new Date(e[0]._d);
-				let date2 = new Date(e[1]._d);
-				this.pagination.startDate = formatDateYMD(date1);
-				this.pagination.endDate = formatDateYMD(date2);
-			} else {
-				this.pagination.startDate = "";
-				this.pagination.endDate = "";
-			}
-			this.getBill();
-			this.userBillNumber();
-		},
-		inputpageChange(e) {
-			const pagenumcount = this.pagination.total / this.pagination.pageSize;
-			console.log(pagenumcount);
-			if (e.target.value) {
-				if (e.target.value > pagenumcount) {
-					this.pagination.pageNum = Math.ceil(pagenumcount);
-				} else {
-					this.pagination.pageNum = e.target.value;
-				}
-			} else {
-				this.pagination.pageNum = 1;
-			}
-			// this.getJobList();
-			this.getBill();
-			console.log(e);
-		},
-		async userBillNumber() {
-			try {
-				const { data } = await userBillNumberApi(this.pagination);
-				if (data.status == 200) {
-					console.log(data.data);
-					this.billNumber = data.data;
-				}
-			} catch (error) {
-				console.log(error);
-			}
-		},
-		async getBill() {
-			console.log("click");
-			// let that = this;
-			console.log(this.pagination.status);
-			try {
-				this.isspinning = true;
-				const { data } = await userBillApi(this.pagination);
-				console.log(data);
-				if (data.status === 200) {
-					// console.log();
-					this.billList = data.data.recordList;
+      if (e.length != 0) {
+        let date1 = new Date(e[0]._d)
+        let date2 = new Date(e[1]._d)
+        this.pagination.startDate = formatDateYMD(date1)
+        this.pagination.endDate = formatDateYMD(date2)
+      } else {
+        this.pagination.startDate = ''
+        this.pagination.endDate = ''
+      }
+      this.getBill()
+      this.userBillNumber()
+    },
+    inputpageChange(e) {
+      const pagenumcount = this.pagination.total / this.pagination.pageSize
+      console.log(pagenumcount)
+      if (e.target.value) {
+        if (e.target.value > pagenumcount) {
+          this.pagination.pageNum = Math.ceil(pagenumcount)
+        } else {
+          this.pagination.pageNum = e.target.value
+        }
+      } else {
+        this.pagination.pageNum = 1
+      }
+      // this.getJobList();
+      this.getBill()
+      console.log(e)
+    },
+    async userBillNumber() {
+      try {
+        const { data } = await userBillNumberApi(this.pagination)
+        if (data.status == 200) {
+          console.log(data.data)
+          this.billNumber = data.data
+        }
+      } catch (error) {
+        console.log(error)
+      }
+    },
+    async getBill() {
+      console.log('click')
+      // let that = this;
+      console.log(this.pagination.status)
+      try {
+        this.isspinning = true
+        const { data } = await userBillApi(this.pagination)
+        console.log(data)
+        if (data.status === 200) {
+          // console.log();
+          this.billList = data.data.recordList
 
-					console.log(this.billList);
-					setTimeout(() => {
-						this.billList.forEach((item, index) => {
-							let differenceTime = new Date().getTime() - new Date(item.updateTime).getTime();
-							var D = Math.floor(differenceTime / (24 * 60 * 60 * 1000));
-							var level1 = differenceTime % (24 * 3600 * 1000);
-							var H = Math.floor(level1 / (3600 * 1000));
-							var level2 = level1 % (3600 * 1000);
-							var M = Math.floor(level2 / (60 * 1000));
-							var level3 = level2 % (60 * 1000);
-							var S = Math.floor(level3 / 1000);
-							item.diffTime = null;
-							if (D > 0) {
-								item.diffTime = D + "天前";
-							} else if (H > 0) {
-								item.diffTime = H + "小时前";
-							} else if (M > 0) {
-								item.diffTime = M + "分钟前";
-							} else {
-								item.diffTime = S + "秒前";
-							}
-							// console.log(new Date(differenceTime).getDate());
-							// console.log(item.userName, D, H, M);
-							// console.log(item);
-							if (item.sex === 1) {
-								item.sex = "男";
-							} else if (item.sex === 2) {
-								item.sex = "女";
-							} else {
-								item.sex = "未知";
-							}
+          console.log(this.billList)
+          setTimeout(() => {
+            this.billList.forEach((item, index) => {
+              let differenceTime = new Date().getTime() - new Date(item.updateTime).getTime()
+              var D = Math.floor(differenceTime / (24 * 60 * 60 * 1000))
+              var level1 = differenceTime % (24 * 3600 * 1000)
+              var H = Math.floor(level1 / (3600 * 1000))
+              var level2 = level1 % (3600 * 1000)
+              var M = Math.floor(level2 / (60 * 1000))
+              var level3 = level2 % (60 * 1000)
+              var S = Math.floor(level3 / 1000)
+              item.diffTime = null
+              if (D > 0) {
+                item.diffTime = D + '天前'
+              } else if (H > 0) {
+                item.diffTime = H + '小时前'
+              } else if (M > 0) {
+                item.diffTime = M + '分钟前'
+              } else {
+                item.diffTime = S + '秒前'
+              }
+              // console.log(new Date(differenceTime).getDate());
+              // console.log(item.userName, D, H, M);
+              // console.log(item);
+              if (item.sex === 1) {
+                item.sex = '男'
+              } else if (item.sex === 2) {
+                item.sex = '女'
+              } else {
+                item.sex = '未知'
+              }
 
-							// if (index % 2 === 0) {
-							//   item.status = 60;
-							// }
-							if (!isEmptyCheck(item.tel)) {
-								let first = item.tel.slice(0, 3);
-								let second = item.tel.slice(3, 7);
-								let thirdly = item.tel.slice(7, 12);
-								// console.log(first);
-								// console.log(second);
-								// console.log(thirdly);
-								item.tel = first + " " + second + " " + thirdly;
-							}
+              // if (index % 2 === 0) {
+              //   item.status = 60;
+              // }
+              if (!isEmptyCheck(item.tel)) {
+                let first = item.tel.slice(0, 3)
+                let second = item.tel.slice(3, 7)
+                let thirdly = item.tel.slice(7, 12)
+                // console.log(first);
+                // console.log(second);
+                // console.log(thirdly);
+                item.tel = first + ' ' + second + ' ' + thirdly
+              }
 
-							if (item.status === 60 || item.status === 70) {
-								item.isDown = true;
-							} else {
-								item.isDown = false;
-							}
-							item.statusTag = getUserApplyOrderStatusById(item.status);
-							item.interviewTime = formatDateYMDHM(item.interviewTime);
-							item.entryTime = formatDateYMDHM(item.entryTime);
-							item.leaveTime = formatDateYMDHM(item.leaveTime);
-							// item.updateTime = formatDateYMDHMS(item.updateTime);
-							// item.createTime = formatDateYMDHMS(item.createTime);
-							item.updateTime = isEmptyCheck(item.updateTime) ? "2022-03-16 14:19" : formatDateYMDHM(item.updateTime);
-							item.createTime = isEmptyCheck(item.createTime) ? "2022-03-16 14:19" : formatDateYMDHM(item.createTime);
-							item.index = index + 1;
+              if (item.status === 60 || item.status === 70) {
+                item.isDown = true
+              } else {
+                item.isDown = false
+              }
+              item.statusTag = getUserApplyOrderStatusByIdToBill(item.status)
+              item.interviewTime = formatDateYMDHM(item.interviewTime)
+              item.entryTime = formatDateYMDHM(item.entryTime)
+              item.leaveTime = formatDateYMDHM(item.leaveTime)
+              // item.updateTime = formatDateYMDHMS(item.updateTime);
+              // item.createTime = formatDateYMDHMS(item.createTime);
+              item.updateTime = isEmptyCheck(item.updateTime) ? '2022-03-16 14:19' : formatDateYMDHM(item.updateTime)
+              item.createTime = isEmptyCheck(item.createTime) ? '2022-03-16 14:19' : formatDateYMDHM(item.createTime)
+              item.index = index + 1
 
-							// console.log(that.$refs["Control" + index][0]);
+              // console.log(that.$refs["Control" + index][0]);
 
-							// setTimeout(() => {
-							if (item.status == 10 || item.status == 20 || item.status == 21 || item.status == 25 || item.status == 26 || item.status == 30 || item.status == 35 || item.status == 45) {
-								item.statusTimeInfo = "面试时间";
-								item.statusShowTime = item.interviewTime;
-							} else if (item.status == 40) {
-								item.statusTimeInfo = "入职时间";
-								item.statusShowTime = item.entryTime;
-							} else if (item.status == 50) {
-								item.statusTimeInfo = "离职时间";
-								item.statusShowTime = item.leaveTime;
-							}
-							// console.log(item.statusShowTime);
-							// console.log(item.statusTimeInfo);
-							// }, 100);
-							// console.log("controlUnfold", item.controlUnfold);
-							// console.log("isunfold", item.isunfold);
-							// console.log(item);
-						});
-						this.showFlod(this.billList);
+              // setTimeout(() => {
+              if (item.status == 10 || item.status == 20 || item.status == 21 || item.status == 25 || item.status == 26 || item.status == 30 || item.status == 35 || item.status == 45) {
+                item.statusTimeInfo = '面试时间'
+                item.statusShowTime = item.interviewTime
+              } else if (item.status == 40) {
+                item.statusTimeInfo = '入职时间'
+                item.statusShowTime = item.entryTime
+              } else if (item.status == 50) {
+                item.statusTimeInfo = '离职时间'
+                item.statusShowTime = item.leaveTime
+              }
+              // console.log(item.statusShowTime);
+              // console.log(item.statusTimeInfo);
+              // }, 100);
+              // console.log("controlUnfold", item.controlUnfold);
+              // console.log("isunfold", item.isunfold);
+              // console.log(item);
+            })
+            this.showFlod(this.billList)
 
-						this.saveBill = JSON.parse(JSON.stringify(this.billList));
-					}, 0);
+            this.saveBill = JSON.parse(JSON.stringify(this.billList))
+          }, 0)
 
-					this.pagination.total = data.data.recordCount;
-					this.$forceUpdate();
-					this.totop();
-				}
-			} catch (error) {
-				console.log(error);
-			}
-			(this.statusValue = ""), (this.isspinning = false);
-		},
-		resetpag() {
-			// this.pagination.status = this.pagination.status
-			this.getBill();
-			this.userBillNumber();
-		},
-		customRendert(a) {
-			console.log(a);
-			this.$message.success(a.id);
-			// console.log(c);
-		},
-		showdiymodal(info) {
-			// 显示 身份证图片弹出框
-			console.log(info);
-			this.isdiymodalshow = true;
-			if (info.idCardImageUrl !== null && info.idCardImageUrl !== "") {
-				this.idcardimg = info.idCardImageUrl;
-			}
-			// this.$nextTick(() => {
+          this.pagination.total = data.data.recordCount
+          this.$forceUpdate()
+          this.totop()
+        }
+      } catch (error) {
+        console.log(error)
+      }
+      ;(this.statusValue = ''), (this.isspinning = false)
+    },
+    resetpag() {
+      // this.pagination.status = this.pagination.status
+      this.getBill()
+      this.userBillNumber()
+    },
+    customRendert(a) {
+      console.log(a)
+      this.$message.success(a.id)
+      // console.log(c);
+    },
+    showdiymodal(info) {
+      // 显示 身份证图片弹出框
+      console.log(info)
+      this.isdiymodalshow = true
+      if (info.idCardImageUrl !== null && info.idCardImageUrl !== '') {
+        this.idcardimg = info.idCardImageUrl
+      }
+      // this.$nextTick(() => {
 
-			// });
-		},
-		movebox(e) {
-			// 移动身份证弹出框
-			let modalbox = document.querySelector("#diymodal");
-			var x = e.pageX - modalbox.offsetLeft;
-			var y = e.pageY - modalbox.offsetTop;
-			var mousemove = function (e) {
-				modalbox.style.left = e.pageX - x + "px"; // e.pageX是鼠标在点击之后移动的时候实时传过来的坐标信息,而x是在点击的一瞬间就确定的坐标,
-				modalbox.style.top = e.pageY - y + "px";
-			};
-			modalbox.addEventListener("mousemove", mousemove);
-			var mouseup = function () {
-				// modalbox.removeEventListener("mousedown", mousedown);
-				modalbox.removeEventListener("mousemove", mousemove);
-			};
-			modalbox.addEventListener("mouseup", mouseup);
-		},
-		mousewhell(e) {
-			// 滚动鼠标缩放图片
-			let that = this;
-			console.log(e);
-			console.log(that.scaleNum);
-			console.log(this.scaleNum);
-			var delta = 0;
-			let imgbox = document.querySelector(".imgbox");
-			// if (Math.abs(that.rotateNum / 90) % 2 !== 0) {
-			//   imgbox.style.transformOrigin = `${e.offsetY}px ${e.offsetX}px`; // 设置图片的缩放中心,保证跟随鼠标的位置进行图片的缩放
-			// } else {
-			imgbox.style.transformOrigin = `${e.offsetX}px ${e.offsetY}px`; // 设置图片的缩放中心,保证跟随鼠标的位置进行图片的缩放
-			// }
-			var handle = function (delta) {
-				// let
-				let scaleNum = (that.scaleNum += delta / 15);
-				if (delta < 0) {
-					//向下滚动
-					console.log(that.scaleNum);
-					if (scaleNum <= 0.5) {
-						that.scaleNum = 0.5;
-					}
-				} else {
-					//向上滚动
-					console.log(that.scaleNum);
-					if (scaleNum >= 3) {
-						that.scaleNum = 3;
-					}
-				}
-				imgbox.style.transform = `scale(${that.scaleNum})`;
-			};
-			if (!e) e = window.event;
-			if (e.wheelDelta) {
-				//IE、chrome浏览器使用的是wheelDelta，并且值为“正负180”
-				delta = e.wheelDelta / 180;
-				if (window.opera) delta = -delta; //因为IE、chrome等向下滚动是负值，FF是正值，为了处理一致性，在此取反处理
-			} else if (e.detail) {
-				//FF浏览器使用的是detail,其值为“正负3”
-				delta = -e.detail / 3;
-			}
-			if (delta) {
-				handle(delta);
-			}
-		},
-		closemodal() {
-			this.isdiymodalshow = false;
-			this.idcardimg = "";
-			this.scaleNum = 1;
-		},
-		rotate(e) {
-			let imgbox1 = document.querySelector(".imgbox1");
-			let imgbox = document.querySelector(".imgbox");
-			this.scaleNum = 1;
-			console.log(this.scaleNum);
-			this.rotateNum += e;
-			console.log(imgbox1.style);
-			console.log(this.rotateNum);
-			imgbox.style.transformOrigin = `50% 50%`; // 设置图片的缩放中心,保证跟随鼠标的位置进行图片的缩放
-			// imgbox.style.transformOrigin = `${e.offsetX}px ${e.offsetY}px`; // 设置图片的缩放中心,保证跟随鼠标的位置进行图片的缩放
+      // });
+    },
+    movebox(e) {
+      // 移动身份证弹出框
+      let modalbox = document.querySelector('#diymodal')
+      var x = e.pageX - modalbox.offsetLeft
+      var y = e.pageY - modalbox.offsetTop
+      var mousemove = function (e) {
+        modalbox.style.left = e.pageX - x + 'px' // e.pageX是鼠标在点击之后移动的时候实时传过来的坐标信息,而x是在点击的一瞬间就确定的坐标,
+        modalbox.style.top = e.pageY - y + 'px'
+      }
+      modalbox.addEventListener('mousemove', mousemove)
+      var mouseup = function () {
+        // modalbox.removeEventListener("mousedown", mousedown);
+        modalbox.removeEventListener('mousemove', mousemove)
+      }
+      modalbox.addEventListener('mouseup', mouseup)
+    },
+    mousewhell(e) {
+      // 滚动鼠标缩放图片
+      let that = this
+      console.log(e)
+      console.log(that.scaleNum)
+      console.log(this.scaleNum)
+      var delta = 0
+      let imgbox = document.querySelector('.imgbox')
+      // if (Math.abs(that.rotateNum / 90) % 2 !== 0) {
+      //   imgbox.style.transformOrigin = `${e.offsetY}px ${e.offsetX}px`; // 设置图片的缩放中心,保证跟随鼠标的位置进行图片的缩放
+      // } else {
+      imgbox.style.transformOrigin = `${e.offsetX}px ${e.offsetY}px` // 设置图片的缩放中心,保证跟随鼠标的位置进行图片的缩放
+      // }
+      var handle = function (delta) {
+        // let
+        let scaleNum = (that.scaleNum += delta / 15)
+        if (delta < 0) {
+          //向下滚动
+          console.log(that.scaleNum)
+          if (scaleNum <= 0.5) {
+            that.scaleNum = 0.5
+          }
+        } else {
+          //向上滚动
+          console.log(that.scaleNum)
+          if (scaleNum >= 3) {
+            that.scaleNum = 3
+          }
+        }
+        imgbox.style.transform = `scale(${that.scaleNum})`
+      }
+      if (!e) e = window.event
+      if (e.wheelDelta) {
+        //IE、chrome浏览器使用的是wheelDelta，并且值为“正负180”
+        delta = e.wheelDelta / 180
+        if (window.opera) delta = -delta //因为IE、chrome等向下滚动是负值，FF是正值，为了处理一致性，在此取反处理
+      } else if (e.detail) {
+        //FF浏览器使用的是detail,其值为“正负3”
+        delta = -e.detail / 3
+      }
+      if (delta) {
+        handle(delta)
+      }
+    },
+    closemodal() {
+      this.isdiymodalshow = false
+      this.idcardimg = ''
+      this.scaleNum = 1
+    },
+    rotate(e) {
+      let imgbox1 = document.querySelector('.imgbox1')
+      let imgbox = document.querySelector('.imgbox')
+      this.scaleNum = 1
+      console.log(this.scaleNum)
+      this.rotateNum += e
+      console.log(imgbox1.style)
+      console.log(this.rotateNum)
+      imgbox.style.transformOrigin = `50% 50%` // 设置图片的缩放中心,保证跟随鼠标的位置进行图片的缩放
+      // imgbox.style.transformOrigin = `${e.offsetX}px ${e.offsetY}px`; // 设置图片的缩放中心,保证跟随鼠标的位置进行图片的缩放
 
-			imgbox1.style.transform = `rotate(${this.rotateNum}deg)`;
-			this.mousewhell(e);
-		},
+      imgbox1.style.transform = `rotate(${this.rotateNum}deg)`
+      this.mousewhell(e)
+    },
 
-		resetsearch(e) {
-			console.log(e);
-			if (e.target.value.length === 0) {
-				this.pagination.keys = "";
+    resetsearch(e) {
+      console.log(e)
+      if (e.target.value.length === 0) {
+        this.pagination.keys = ''
 
-				this.getBill();
-				this.userBillNumber();
-			}
-		},
-		onSearch() {
-			this.pagination.pageNum = 1;
-			this.pagination.pageSize = 10;
-			this.pagination.status = -1;
-			// console.log();
-			this.getBill();
-			this.userBillNumber();
-		},
-		changepage(num) {
-			console.log(Math.ceil(this.pagination.total / this.pagination.pageSize));
-			if ((this.pagination.pageNum === 1 && num === -1) || (this.pagination.pageNum === Math.ceil(this.pagination.total / this.pagination.pageSize) && num === 1)) {
-				if (num === -1) {
-					this.$message.warning("已经到第一页了");
-				} else {
-					this.$message.warning("已经到最后一页了");
-				}
-				return;
-			} else {
-				this.pagination.pageNum += num;
-			}
-			this.getBill();
-		},
-		totop() {
-			// 返回顶部
-			// console.log(window);
-			document.body.scrollTop = 0;
-			document.documentElement.scrollTop = 0;
-			// window.body.scrollY = 0;
-		},
-		changeStatus(item, index) {
-			// 控制政策的展开
-			// console.log(item);
-			// console.log(index);
-			let parent = this.$refs["Control" + index][0].parentNode;
-			let sibling = this.$refs["Control" + index][0].previousElementSibling;
-			if (item.controlUnfold) {
-				parent.style.maxHeight = "none";
-				sibling.style.height = "100%";
-				console.log(parent);
-			} else {
-				parent.style.maxHeight = "156px";
-				sibling.style.height = "146px";
-				sibling.style.overflow = "hidden";
-				console.log(parent);
-			}
-			item.controlUnfold = !item.controlUnfold;
-			this.$forceUpdate();
-			console.log(item.controlUnfold);
-		},
-		statusFilter() {
-			// 状态筛选
-			let num = this.filterStatus % 3;
-			if (num == 1) {
-				this.billList.sort((a, b) => {
-					return a.status - b.status;
-				});
-			} else if (num == 2) {
-				this.billList.sort((a, b) => {
-					return b.status - a.status;
-				});
-			} else {
-				this.billList = JSON.parse(JSON.stringify(this.saveBill));
-			}
-			this.filterStatus++;
-		},
-		showFlod(list) {
-			// setTimeout(() => {
-			list.forEach((item, index) => {
-				// console.log('=======');
-				let parent = this.$refs["Control" + index][0].parentNode;
-				let sibling = this.$refs["Control" + index][0].previousElementSibling;
-				// console.log('parent ' + parenzt );
-				// console.log('sibling ' + sibling );
-				// console.log('sibling.offsetHeight' + sibling.offsetHeight );
-				// console.log('parent.offsetHeight' + parent.offsetHeight );
-				if (sibling.scrollHeight >= parent.scrollHeight) {
-					// sibling.style.height = "100%";
-					sibling.style.overflow = "hidden";
-					parent.style.paddingBottom = "20px";
-					item.isunfold = true;
-					item.controlUnfold = true;
-				} else {
-					item.isunfold = false;
-				}
-				// console.log(item);
-			});
-			// }, 100);
-			this.$forceUpdate();
-		},
-		handleChange(e) {
-			// console.log(e);
-			// let that = this;
-			// this.billList = JSON.parse(JSON.stringify(this.saveBill));
-			// let list = [];
-			// this.billList.forEach((item) => {
-			// 	if (item.status == e.value) {
-			// 		list.push(item);
-			// 	}
-			// });
-			// this.billList = list;
-			// setTimeout(() => {
-			// 	this.$nextTick(() => {
-			// 		this.showFlod(that.billList);
-			// 	});
-			// }, 0);
-			// console.log(e);
-			this.pagination.statusMin = e.id;
-			this.getBill();
-			this.userBillNumber();
-		},
-		resetStatus(e) {
-			console.log(e);
-			if (e == undefined) {
-				this.pagination.statusMin = "";
-				this.userBillNumber();
-				this.getBill();
-				// this.billList = JSON.parse(JSON.stringify(this.saveBill));
-				// setTimeout(() => {
-				// 	this.showFlod(this.billList);
-				// }, 0);
-			}
-			// console.log(e);
-		},
-		/* 
+        this.getBill()
+        this.userBillNumber()
+      }
+    },
+    onSearch() {
+      this.pagination.pageNum = 1
+      this.pagination.pageSize = 10
+      this.pagination.status = -1
+      // console.log();
+      this.getBill()
+      this.userBillNumber()
+    },
+    changepage(num) {
+      console.log(Math.ceil(this.pagination.total / this.pagination.pageSize))
+      if ((this.pagination.pageNum === 1 && num === -1) || (this.pagination.pageNum === Math.ceil(this.pagination.total / this.pagination.pageSize) && num === 1)) {
+        if (num === -1) {
+          this.$message.warning('已经到第一页了')
+        } else {
+          this.$message.warning('已经到最后一页了')
+        }
+        return
+      } else {
+        this.pagination.pageNum += num
+      }
+      this.getBill()
+    },
+    totop() {
+      // 返回顶部
+      // console.log(window);
+      document.body.scrollTop = 0
+      document.documentElement.scrollTop = 0
+      // window.body.scrollY = 0;
+    },
+    changeStatus(item, index) {
+      // 控制政策的展开
+      // console.log(item);
+      // console.log(index);
+      let parent = this.$refs['Control' + index][0].parentNode
+      let sibling = this.$refs['Control' + index][0].previousElementSibling
+      if (item.controlUnfold) {
+        parent.style.maxHeight = 'none'
+        sibling.style.height = '100%'
+        console.log(parent)
+      } else {
+        parent.style.maxHeight = '156px'
+        sibling.style.height = '146px'
+        sibling.style.overflow = 'hidden'
+        console.log(parent)
+      }
+      item.controlUnfold = !item.controlUnfold
+      this.$forceUpdate()
+      console.log(item.controlUnfold)
+    },
+    statusFilter() {
+      // 状态筛选
+      let num = this.filterStatus % 3
+      if (num == 1) {
+        this.billList.sort((a, b) => {
+          return a.status - b.status
+        })
+      } else if (num == 2) {
+        this.billList.sort((a, b) => {
+          return b.status - a.status
+        })
+      } else {
+        this.billList = JSON.parse(JSON.stringify(this.saveBill))
+      }
+      this.filterStatus++
+    },
+    showFlod(list) {
+      // setTimeout(() => {
+      list.forEach((item, index) => {
+        // console.log('=======');
+        let parent = this.$refs['Control' + index][0].parentNode
+        let sibling = this.$refs['Control' + index][0].previousElementSibling
+        // console.log('parent ' + parenzt );
+        // console.log('sibling ' + sibling );
+        // console.log('sibling.offsetHeight' + sibling.offsetHeight );
+        // console.log('parent.offsetHeight' + parent.offsetHeight );
+        if (sibling.scrollHeight >= parent.scrollHeight) {
+          // sibling.style.height = "100%";
+          sibling.style.overflow = 'hidden'
+          parent.style.paddingBottom = '20px'
+          item.isunfold = true
+          item.controlUnfold = true
+        } else {
+          item.isunfold = false
+        }
+        // console.log(item);
+      })
+      // }, 100);
+      this.$forceUpdate()
+    },
+    handleChange(e) {
+      // console.log(e);
+      // let that = this;
+      // this.billList = JSON.parse(JSON.stringify(this.saveBill));
+      // let list = [];
+      // this.billList.forEach((item) => {
+      // 	if (item.status == e.value) {
+      // 		list.push(item);
+      // 	}
+      // });
+      // this.billList = list;
+      // setTimeout(() => {
+      // 	this.$nextTick(() => {
+      // 		this.showFlod(that.billList);
+      // 	});
+      // }, 0);
+      // console.log(e);
+      this.pagination.statusMin = e.id
+      this.getBill()
+      this.userBillNumber()
+    },
+    resetStatus(e) {
+      console.log(e)
+      if (e == undefined) {
+        this.pagination.statusMin = ''
+        this.userBillNumber()
+        this.getBill()
+        // this.billList = JSON.parse(JSON.stringify(this.saveBill));
+        // setTimeout(() => {
+        // 	this.showFlod(this.billList);
+        // }, 0);
+      }
+      // console.log(e);
+    },
+    /* 
       显示工单跟进记录弹出框
     */
-		showDetail(item) {
-			userBillDetailApi(item.id).then((res) => {
-				let { data } = res;
-				if (data.status == 200) {
-					console.log(res);
-					this.currentBillDetail = data.data.records;
-				} else {
-					this.currentBillDetail = {};
-				}
-				console.log(this.currentBillDetail);
-				console.log(this.currentBillDetail.length);
-				let test = {};
-				console.log(test[0]);
-				console.log(toString(this.currentBillDetail) == "{}");
-			});
-			this.billDetailVisible = true;
-			console.log(item);
-		},
-		/* 
+    showDetail(item) {
+      userBillDetailApi(item.id).then((res) => {
+        let { data } = res
+        if (data.status == 200) {
+          console.log(res)
+          this.currentBillDetail = data.data.records
+        } else {
+          this.currentBillDetail = {}
+        }
+        console.log(this.currentBillDetail)
+        console.log(this.currentBillDetail.length)
+        let test = {}
+        console.log(test[0])
+        console.log(toString(this.currentBillDetail) == '{}')
+      })
+      this.billDetailVisible = true
+      console.log(item)
+    },
+    /* 
       关闭工单跟进记录弹出框
     */
-		billDetailModalClose() {
-			this.billDetailVisible = false;
-		},
-		/* 
+    billDetailModalClose() {
+      this.billDetailVisible = false
+    },
+    /* 
       关闭政策显示框
     */
-		policyModalCancel() {
-			this.zzvisible = false;
-		},
-		/* 
+    policyModalCancel() {
+      this.zzvisible = false
+    },
+    /* 
       截出跟进记录字符串
     */
-		spliceStr(str) {
-			return str.split("_")[1];
-		},
-		/* 
+    spliceStr(str) {
+      return str.split('_')[1]
+    },
+    /* 
       显示跟进记录详情弹出框
     */
-		showInfo2(record) {
-			this.currentBillInfo = JSON.parse(record);
-			// this.currentBillInfo = {
-			//   userName: "李俊中",
-			//   nation: "汉族",
-			//   age: "52",
-			//   sex: 1,
-			//   tel: 1311111111,
-			//   idCard: 412825197101040513,
-			//   address: "河南省上蔡县芦岗乡看花楼村王会庄9988",
-			//   storeJobName: "郑州西区格力绿色再生资源",
-			//   policy:
-			//     "●年龄性别：男 35-55；女 35-46 ●薪资明细：计件工资，多劳多得。不同岗位，计件工资约200-280元/天（出勤七天内，男170元/天，在职不满30天的保底工资按60%或按实际操作量计算工资）。入职会安全培训，上岗实习等，以上时间无工资 ●吃饭住宿：吃饭自理;住宿免费，水电均摊 ●代理利润：出勤15天利润400元；（具体政策以面试当天为准）",
-			// };
-			this.zzvisible = true;
-		},
-		/* 
+    showInfo2(record) {
+      this.currentBillInfo = JSON.parse(record)
+      // this.currentBillInfo = {
+      //   userName: "李俊中",
+      //   nation: "汉族",
+      //   age: "52",
+      //   sex: 1,
+      //   tel: 1311111111,
+      //   idCard: 412825197101040513,
+      //   address: "河南省上蔡县芦岗乡看花楼村王会庄9988",
+      //   storeJobName: "郑州西区格力绿色再生资源",
+      //   policy:
+      //     "●年龄性别：男 35-55；女 35-46 ●薪资明细：计件工资，多劳多得。不同岗位，计件工资约200-280元/天（出勤七天内，男170元/天，在职不满30天的保底工资按60%或按实际操作量计算工资）。入职会安全培训，上岗实习等，以上时间无工资 ●吃饭住宿：吃饭自理;住宿免费，水电均摊 ●代理利润：出勤15天利润400元；（具体政策以面试当天为准）",
+      // };
+      this.zzvisible = true
+    },
+    /* 
     复制跟进记录详情文本
      */
-		handleCancel() {
-			var that = this;
+    handleCancel() {
+      var that = this
 
-			var text = "姓名：" + that.currentBillInfo.userName + "/" + (that.currentBillInfo.sex == 1 || that.currentBillInfo.sex == "男" ? "男" : "女") + "/" + that.currentBillInfo.age + "岁" + (that.currentBillInfo.nation == "族" ? "" : "/" + that.currentBillInfo.nation) + "\n电话：" + (that.currentBillInfo.tel == "" || that.currentBillInfo.tel == undefined || that.currentBillInfo.tel == null ? "-" : that.currentBillInfo.tel) + "\n身份证号：" + (that.currentBillInfo.idCard == "" ? "-" : that.currentBillInfo.idCard) + "\n家庭地址：" + (that.currentBillInfo.address == "" || that.currentBillInfo.address == undefined || that.currentBillInfo.address == null ? "-" : that.currentBillInfo.address) + "\n报名岗位：" + that.currentBillInfo.storeJobName + "\n政策：" + that.currentBillInfo.policy;
+      var text = '姓名：' + that.currentBillInfo.userName + '/' + (that.currentBillInfo.sex == 1 || that.currentBillInfo.sex == '男' ? '男' : '女') + '/' + that.currentBillInfo.age + '岁' + (that.currentBillInfo.nation == '族' ? '' : '/' + that.currentBillInfo.nation) + '\n电话：' + (that.currentBillInfo.tel == '' || that.currentBillInfo.tel == undefined || that.currentBillInfo.tel == null ? '-' : that.currentBillInfo.tel) + '\n身份证号：' + (that.currentBillInfo.idCard == '' ? '-' : that.currentBillInfo.idCard) + '\n家庭地址：' + (that.currentBillInfo.address == '' || that.currentBillInfo.address == undefined || that.currentBillInfo.address == null ? '-' : that.currentBillInfo.address) + '\n报名岗位：' + that.currentBillInfo.storeJobName + '\n政策：' + that.currentBillInfo.policy
 
-			this.zzvisible = false;
-			this.$copyText(text).then(
-				(e) => {
-					console.log("复制成功：", e);
-					that.$message.success("复制成功");
-				},
-				(e) => {
-					console.log("复制失败：", e);
-				}
-			);
-		},
-		/* 
+      this.zzvisible = false
+      this.$copyText(text).then(
+        (e) => {
+          console.log('复制成功：', e)
+          that.$message.success('复制成功')
+        },
+        (e) => {
+          console.log('复制失败：', e)
+        }
+      )
+    },
+    /* 
       关闭跟进详情弹出框
     */
-		// handleOk() {
-		//   this.zzvisible = false;
-		// },
-		formatDateYMDHM(time) {
-			return formatDateYMDHM(time);
-		},
-	},
-};
+    // handleOk() {
+    //   this.zzvisible = false;
+    // },
+    formatDateYMDHM(time) {
+      return formatDateYMDHM(time)
+    },
+  },
+}
 </script>
 
 <style scoped lang="less">
 .mybill-container {
-	position: relative;
-	min-height: 802px;
-	margin-top: 16px;
-	// border-radius: 4px;
-	padding: 1px 10px;
-	background-color: #fff;
-	font-size: 16px;
+  position: relative;
+  // min-height: 802px;
+  margin-top: 16px;
+  // border-radius: 4px;
+  padding: 1px 10px;
+  background-color: #fff;
+  font-size: 16px;
 
-	.diymodal {
-		// display: none;
-		width: 512px;
-		height: 512px;
-		position: fixed;
-		border: #ebebeb solid 1px;
-		left: 50%;
-		top: 50%;
-		background: #ffffff;
-		box-shadow: 0px 5px 20px #ddd;
-		z-index: 9999;
-		transform: translate(-50%, -60%);
-		.title {
-			height: 30px;
-			border-bottom: 1px solid rgb(240, 240, 240);
-			i {
-				float: right;
-				width: 30px;
-				margin: 2px 3px 0 0;
-				line-height: 30px;
-				text-align: center;
-				font-size: 12px;
-				cursor: pointer;
-			}
-		}
-		.body {
-			height: calc(100% - 60px);
-			width: 100%;
-			padding: 10px 0;
-			overflow: hidden;
-			.imgbox1 {
-				height: 100%;
+  .diymodal {
+    // display: none;
+    width: 512px;
+    height: 512px;
+    position: fixed;
+    border: #ebebeb solid 1px;
+    left: 50%;
+    top: 50%;
+    background: #ffffff;
+    box-shadow: 0px 5px 20px #ddd;
+    z-index: 9999;
+    transform: translate(-50%, -60%);
+    .title {
+      height: 30px;
+      border-bottom: 1px solid rgb(240, 240, 240);
+      i {
+        float: right;
+        width: 30px;
+        margin: 2px 3px 0 0;
+        line-height: 30px;
+        text-align: center;
+        font-size: 12px;
+        cursor: pointer;
+      }
+    }
+    .body {
+      height: calc(100% - 60px);
+      width: 100%;
+      padding: 10px 0;
+      overflow: hidden;
+      .imgbox1 {
+        height: 100%;
 
-				.imgbox {
-					position: relative;
-					// width: 100%;
-					height: 100%;
-					background-repeat: no-repeat !important;
-					background-size: contain !important;
-					background-position: center center !important;
-				}
-			}
-			.warningbox {
-				height: 100%;
-				padding: 100px 0 160px;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-around;
-				text-align: center;
-				> div:first-child {
-					margin-top: 20px;
-				}
-				// overflow: hidden;
-				img {
-					width: 80px;
-					height: 80px;
-				}
-				p {
-					font-size: 16px;
-					margin-top: 30px;
-				}
-				> div:last-child {
-					margin-top: 20px;
-					height: 32px;
-					button {
-						float: right;
-						width: 72px;
-						height: 32px;
-						background-color: #ff4400;
-						border: none;
-						color: #fff;
-						// border-radius: 4px;
-						margin-right: 60px;
-					}
-				}
-			}
-			// img {
-			//   height: 100%;
-			// }
-		}
-		.footer {
-			height: 40px;
-			width: 100%;
-			border-top: 1px solid rgb(240, 240, 240);
-			background-color: #fff;
-			text-align: center;
-			i {
-				font-size: 20px;
-				line-height: 40px;
-				color: #a1a1a1;
-				// font-weight: bold;
-				cursor: pointer;
-				&:first-child {
-					margin-right: 25px;
-				}
-			}
-		}
-	}
+        .imgbox {
+          position: relative;
+          // width: 100%;
+          height: 100%;
+          background-repeat: no-repeat !important;
+          background-size: contain !important;
+          background-position: center center !important;
+        }
+      }
+      .warningbox {
+        height: 100%;
+        padding: 100px 0 160px;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-around;
+        text-align: center;
+        > div:first-child {
+          margin-top: 20px;
+        }
+        // overflow: hidden;
+        img {
+          width: 80px;
+          height: 80px;
+        }
+        p {
+          font-size: 16px;
+          margin-top: 30px;
+        }
+        > div:last-child {
+          margin-top: 20px;
+          height: 32px;
+          button {
+            float: right;
+            width: 72px;
+            height: 32px;
+            background-color: #ff4400;
+            border: none;
+            color: #fff;
+            // border-radius: 4px;
+            margin-right: 60px;
+          }
+        }
+      }
+      // img {
+      //   height: 100%;
+      // }
+    }
+    .footer {
+      height: 40px;
+      width: 100%;
+      border-top: 1px solid rgb(240, 240, 240);
+      background-color: #fff;
+      text-align: center;
+      i {
+        font-size: 20px;
+        line-height: 40px;
+        color: #a1a1a1;
+        // font-weight: bold;
+        cursor: pointer;
+        &:first-child {
+          margin-right: 25px;
+        }
+      }
+    }
+  }
 }
 /deep/ .contenttitle {
-	display: flex;
-	padding-bottom: 0px;
-	justify-content: space-between;
-	border-bottom: 1px solid rgba(77, 87, 94, 0.1);
-	margin-top: 16px;
-	margin-bottom: 16px;
+  display: flex;
+  padding-bottom: 0px;
+  justify-content: space-between;
+  border-bottom: 1px solid rgba(77, 87, 94, 0.1);
+  margin-top: 16px;
+  margin-bottom: 16px;
 
-	ul {
-		display: flex;
-		height: 40px;
-		.townsmanactive {
-			// border-color: #;
-			color: #ff6600;
-			z-index: 999;
-			border-bottom: 2px solid #ff6600;
-			span {
-				color: #ff6600;
-			}
-		}
-		li {
-			position: relative;
-			// width: 104px;
-			// height: 40px;
-			padding: 0px 20px;
-			padding-bottom: 16px;
-			font-weight: 600;
-			color: #666;
-			// line-height: 40px;
-			text-align: center;
-			cursor: pointer;
-			span {
-				color: #ff6600;
-				margin-left: 4px;
-				font-size: 16px;
-			}
-			&:hover {
-				color: #ff6600;
-				span {
-					color: #ff6600;
-				}
-			}
-			&::after {
-				content: "";
-				position: absolute;
-				display: block;
-				width: 1px;
-				height: 24px;
-				right: 0;
-				top: 0%;
-				// transform: translateY(-50%);
-				background-color: #eeeeee;
-			}
-			&:last-child::after {
-				display: none;
-			}
-			&:nth-child(7)::after {
-				height: 57px;
-				top: -16px;
-			}
-		}
-		button {
-			width: 100px;
-			height: 28px;
-			position: relative;
-			font-size: 14px;
-			border: 1px solid #cccccc;
-			background-color: #fff;
-			margin-right: -1px;
-			cursor: pointer;
-			&:hover {
-				color: #ff4400;
-			}
-		}
-		button:first-child {
-			// border-radius: 4px 0px 0px 4px;
-		}
-		button:last-child {
-			// border-radius: 0px 4px 4px 0px;
-		}
-	}
+  ul {
+    display: flex;
+    height: 40px;
+    .townsmanactive {
+      // border-color: #;
+      color: #ff6600;
+      z-index: 999;
+      border-bottom: 2px solid #ff6600;
+      span {
+        color: #ff6600;
+      }
+    }
+    li {
+      position: relative;
+      // width: 104px;
+      // height: 40px;
+      padding: 0px 20px;
+      padding-bottom: 16px;
+      font-weight: 600;
+      color: #666;
+      // line-height: 40px;
+      text-align: center;
+      cursor: pointer;
+      span {
+        color: #ff6600;
+        margin-left: 4px;
+        font-size: 16px;
+      }
+      &:hover {
+        color: #ff6600;
+        span {
+          color: #ff6600;
+        }
+      }
+      &::after {
+        content: '';
+        position: absolute;
+        display: block;
+        width: 1px;
+        height: 24px;
+        right: 0;
+        top: 0%;
+        // transform: translateY(-50%);
+        background-color: #eeeeee;
+      }
+      &:last-child::after {
+        display: none;
+      }
+      &:nth-child(7)::after {
+        height: 57px;
+        top: -16px;
+      }
+    }
+    button {
+      width: 100px;
+      height: 28px;
+      position: relative;
+      font-size: 14px;
+      border: 1px solid #cccccc;
+      background-color: #fff;
+      margin-right: -1px;
+      cursor: pointer;
+      &:hover {
+        color: #ff4400;
+      }
+    }
+    button:first-child {
+      // border-radius: 4px 0px 0px 4px;
+    }
+    button:last-child {
+      // border-radius: 0px 4px 4px 0px;
+    }
+  }
 }
 /deep/ .contentbody {
-	// /deep/ .ant-table-placeholder {
-	//   min-height: 300px;
-	//   > div {
-	//     position: relative;
-	//     height: 131px;
-	//     top: 30px;
-	//     // transform: translateY(-50%);
-	//   }
-	// }
-	.searchbox {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		.ant-input {
-			border-radius: 0;
-		}
-		.searchinput {
-			display: flex;
-			position: relative;
-			> div {
-				display: flex;
-				// width: 375px;
-				justify-content: start;
-				align-items: center;
-				font-size: 14px;
-				> div {
-					margin-left: 50px;
-					width: 70px;
-				}
-			}
-			.ant-input {
-				width: 400px;
-				// width: 300px;
-				position: relative;
-				height: 32px;
-				text-indent: 10px;
-				background: #fff;
-				// border: 1px solid rgba(77, 87, 94, 0.3);
-				// border-radius: 136px;
-				box-shadow: 0px 2px 4px 0px transparent;
-				font-size: 14px !important;
-				padding-right: 0;
-				border-color: #e9e9e9;
-				// z-index: ;
-				&::placeholder {
-					text-indent: 10px;
-					font-size: 14px !important;
-				}
-				&:hover {
-					border-color: #ff4400;
-					box-shadow: none;
-				}
-				&:focus {
-					border-color: #ff4400;
-				}
-			}
-			.ant-input-affix-wrapper {
-				.ant-input-prefix {
-					position: absolute;
-					width: 20px;
-					right: 0;
-					top: 16px;
-					i {
-						color: #c9c9c9;
-					}
-				}
-				.ant-input-suffix {
-					// position: absolute;
-					right: 0px !important;
-				}
-			}
-			button {
-				width: 70px;
-				height: 32px;
-				color: white;
-				background: #ff4400;
-				border-color: #ff4400;
-				border: none;
-				// border-radius: 16px;
-				font-size: 14px;
-				box-shadow: none;
-				cursor: pointer;
-				outline: none;
-				&:hover {
-					background-color: #ff4400d9;
-				}
-				// &:focus {
-				//   border: none;
-				// }
-			}
-			.ant-calendar-picker-input {
-				display: flex;
-				padding-left: 0;
-				justify-content: space-between;
-				// margin-left: 20px;
-				width: 260px;
-				border-color: #ccc;
-				// border-radius: 4px;
-				// border: none;
-				&:hover {
-					border-color: #ff4400;
-				}
-				.ant-calendar-range-picker-input {
-					width: 95px;
-					font-size: 14px;
-				}
-				.ant-calendar-range-picker-separator {
-					margin-right: 10px;
-				}
-				.ant-calendar-picker-clear {
-					margin-right: 10px;
-				}
-			}
-		}
-		.pagechange {
-			button {
-				width: 66px;
-				height: 24px;
-				border: 1px solid rgba(77, 87, 94, 0.3);
-				// border-radius: 4px;
-				font-size: 14px;
-				color: #4d575e;
-				background-color: #fff;
-				&:hover {
-					border-color: #ff4400;
-					color: #ff4400;
-				}
-				&:first-child {
-					margin-right: 12px;
-				}
-			}
-		}
-	}
-	.infocontent {
-		.contenttltle {
-			margin-top: 16px;
-			> ul {
-				height: 32px;
-				line-height: 32px;
-				display: flex;
-				justify-content: space-between;
-				background-color: #f5f5f5;
-				border: 1px solid #e8e8e8;
-				font-size: 14px;
-				text-align: center;
-				// li {
-				// }
-				li:first-child {
-					width: 263px;
-					padding-left: 60px;
-				}
-				li:nth-child(2) {
-					width: 246px;
-					// line-height: 100px;
-					// background-color: red;
-				}
-				li:nth-child(3) {
-					// width: 213px;
-					flex: 1;
-					// background-color: green;
-				}
-				li:nth-child(4) {
-					display: flex;
-					justify-content: end;
-					align-items: center;
-					padding-left: 50px;
-					padding-right: 16px;
-					width: 321px;
-					> div:first-child {
-						line-height: 30px;
-					}
-					.ant-select {
-						width: 120px;
-						// margin-left: 20px;
-					}
-					.ant-select-focused .ant-select-selection,
-					.ant-select-selection:focus,
-					.ant-select-selection:active {
-						border-color: #ff4400;
-						box-shadow: none;
-					}
-					.ant-select-selection {
-						border-radius: 0;
-					}
-					.ant-select-selection:hover {
-						border-color: #ff4400;
-					}
-					.ant-select-focused {
-						box-shadow: none;
-					}
-					// background-color: purple;
-				}
-			}
-		}
-		.isDownstyle {
-			.proxyInfo {
-				background-color: #fff3ef !important;
-				border-color: #ff4400cc !important;
-			}
-			.billInfo {
-				li {
-					border-color: #ff4400cc !important;
-					.serial {
-						border-color: #ff4400cc !important;
-					}
-				}
-			}
-		}
-		.infoSubset {
-			// height: 174px;
-			// background-color: pink;
-			margin-top: 16px;
-			font-size: 14px;
+  // /deep/ .ant-table-placeholder {
+  //   min-height: 300px;
+  //   > div {
+  //     position: relative;
+  //     height: 131px;
+  //     top: 30px;
+  //     // transform: translateY(-50%);
+  //   }
+  // }
+  .searchbox {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .ant-input {
+      border-radius: 0;
+    }
+    .searchinput {
+      display: flex;
+      position: relative;
+      > div {
+        display: flex;
+        // width: 375px;
+        justify-content: start;
+        align-items: center;
+        font-size: 14px;
+        > div {
+          margin-left: 50px;
+          width: 70px;
+        }
+      }
+      .ant-input {
+        width: 400px;
+        // width: 300px;
+        position: relative;
+        height: 32px;
+        text-indent: 10px;
+        background: #fff;
+        // border: 1px solid rgba(77, 87, 94, 0.3);
+        // border-radius: 136px;
+        box-shadow: 0px 2px 4px 0px transparent;
+        font-size: 14px !important;
+        padding-right: 0;
+        border-color: #e9e9e9;
+        // z-index: ;
+        &::placeholder {
+          text-indent: 10px;
+          font-size: 14px !important;
+        }
+        &:hover {
+          border-color: #ff4400;
+          box-shadow: none;
+        }
+        &:focus {
+          border-color: #ff4400;
+        }
+      }
+      .ant-input-affix-wrapper {
+        .ant-input-prefix {
+          position: absolute;
+          width: 20px;
+          right: 0;
+          top: 16px;
+          i {
+            color: #c9c9c9;
+          }
+        }
+        .ant-input-suffix {
+          // position: absolute;
+          right: 0px !important;
+        }
+      }
+      button {
+        width: 70px;
+        height: 32px;
+        color: white;
+        background: #ff4400;
+        border-color: #ff4400;
+        border: none;
+        // border-radius: 16px;
+        font-size: 14px;
+        box-shadow: none;
+        cursor: pointer;
+        outline: none;
+        &:hover {
+          background-color: #ff4400d9;
+        }
+        // &:focus {
+        //   border: none;
+        // }
+      }
+      .ant-calendar-picker-input {
+        display: flex;
+        padding-left: 0;
+        justify-content: space-between;
+        // margin-left: 20px;
+        width: 260px;
+        border-color: #ccc;
+        // border-radius: 4px;
+        // border: none;
+        &:hover {
+          border-color: #ff4400;
+        }
+        .ant-calendar-range-picker-input {
+          width: 95px;
+          font-size: 14px;
+        }
+        .ant-calendar-range-picker-separator {
+          margin-right: 10px;
+        }
+        .ant-calendar-picker-clear {
+          margin-right: 10px;
+        }
+      }
+    }
+    .pagechange {
+      button {
+        width: 66px;
+        height: 24px;
+        border: 1px solid rgba(77, 87, 94, 0.3);
+        // border-radius: 4px;
+        font-size: 14px;
+        color: #4d575e;
+        background-color: #fff;
+        &:hover {
+          border-color: #ff4400;
+          color: #ff4400;
+        }
+        &:first-child {
+          margin-right: 12px;
+        }
+      }
+    }
+  }
+  .infocontent {
+    .contenttltle {
+      margin-top: 16px;
+      > ul {
+        height: 32px;
+        line-height: 32px;
+        display: flex;
+        justify-content: space-between;
+        background-color: #f5f5f5;
+        border: 1px solid #e8e8e8;
+        font-size: 14px;
+        text-align: center;
+        // li {
+        // }
+        li:first-child {
+          width: 263px;
+          padding-left: 60px;
+        }
+        li:nth-child(2) {
+          width: 246px;
+          // line-height: 100px;
+          // background-color: red;
+        }
+        li:nth-child(3) {
+          // width: 213px;
+          flex: 1;
+          // background-color: green;
+        }
+        li:nth-child(4) {
+          display: flex;
+          justify-content: end;
+          align-items: center;
+          padding-left: 50px;
+          padding-right: 16px;
+          width: 321px;
+          > div:first-child {
+            line-height: 30px;
+          }
+          .ant-select {
+            width: 120px;
+            // margin-left: 20px;
+          }
+          .ant-select-focused .ant-select-selection,
+          .ant-select-selection:focus,
+          .ant-select-selection:active {
+            border-color: #ff4400;
+            box-shadow: none;
+          }
+          .ant-select-selection {
+            border-radius: 0;
+          }
+          .ant-select-selection:hover {
+            border-color: #ff4400;
+          }
+          .ant-select-focused {
+            box-shadow: none;
+          }
+          // background-color: purple;
+        }
+      }
+    }
+    .isDownstyle {
+      .proxyInfo {
+        background-color: #fff3ef !important;
+        border-color: #ff4400cc !important;
+      }
+      .billInfo {
+        li {
+          border-color: #ff4400cc !important;
+          .serial {
+            border-color: #ff4400cc !important;
+          }
+        }
+      }
+    }
+    .infoSubset {
+      // height: 174px;
+      // background-color: pink;
+      margin-top: 16px;
+      font-size: 14px;
 
-			.proxyInfo {
-				display: flex;
-				height: 40px;
-				padding: 0 16px;
-				// background-color: skyblue;
-				background-color: #f5f5f5;
-				justify-content: space-between;
-				align-items: center;
-				border: 1px solid #ccc;
-				li {
-					flex: 1;
-					&:nth-child(2) {
-						margin-left: 5px;
-					}
-					&:nth-child(3) {
-						// margin-left: 100px;
-						position: relative;
-						transform: translateX(52px);
-					}
-					&:last-child {
-						text-align: right;
-					}
-					// flex: 1;
-				}
-			}
-			.billInfo {
-				display: flex;
-				justify-content: space-between;
-				li {
-					display: flex;
-					flex-direction: column;
-					justify-content: center;
-					align-items: center;
-					text-align: center;
-					border: 1px solid #ccc;
-					border-top: none;
-					&:nth-child(-n + 3) {
-						border-right: none;
-					}
-				}
-				li:first-child {
-					position: relative;
-					width: 273px;
-					padding-left: 60px;
-					.serial {
-						display: flex;
-						align-items: center;
-						position: absolute;
-						height: 100%;
-						width: 60px;
-						left: 0;
-						font-weight: 400;
-						color: #333;
-						font-size: 16px;
-						justify-content: center;
-						background-color: #fff;
-						border-right: 1px solid #ccc;
-					}
-					// flex-direction: column;
+      .proxyInfo {
+        display: flex;
+        height: 40px;
+        padding: 0 16px;
+        // background-color: skyblue;
+        background-color: #f5f5f5;
+        justify-content: space-between;
+        align-items: center;
+        border: 1px solid #ccc;
+        li {
+          flex: 1;
+          &:nth-child(2) {
+            margin-left: 5px;
+          }
+          &:nth-child(3) {
+            // margin-left: 100px;
+            position: relative;
+            transform: translateX(52px);
+          }
+          &:last-child {
+            text-align: right;
+          }
+          // flex: 1;
+        }
+      }
+      .billInfo {
+        display: flex;
+        justify-content: space-between;
+        li {
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          align-items: center;
+          text-align: center;
+          border: 1px solid #ccc;
+          border-top: none;
+          &:nth-child(-n + 3) {
+            border-right: none;
+          }
+        }
+        li:first-child {
+          position: relative;
+          width: 273px;
+          padding-left: 60px;
+          .serial {
+            display: flex;
+            align-items: center;
+            position: absolute;
+            height: 100%;
+            width: 60px;
+            left: 0;
+            font-weight: 400;
+            color: #333;
+            font-size: 16px;
+            justify-content: center;
+            background-color: #fff;
+            border-right: 1px solid #ccc;
+          }
+          // flex-direction: column;
 
-					// justify-content: space-around;
-					// padding: 28px 0 32px;
-					i {
-						text-align: center;
-						width: 24px;
-						font-size: 24px;
-						&:before {
-							cursor: pointer;
-						}
-					}
-					// span {
-					// 	display: block;
-					// 	height: 22px;
-					// }
-					span:nth-of-type(1) {
-						font-weight: bold;
-						margin-bottom: 5px;
-					}
-					// background-color: blue;
-				}
-				li:nth-child(2) {
-					width: 246px;
-					// line-height: 100px;
-					// background-color: red;
-				}
-				li:nth-child(3) {
-					width: 400px;
-					// display: block;
-					position: relative;
-					max-height: 156px;
-					min-height: 156px;
-					text-align: left;
-					padding: 6px 16px 6px 16px;
+          // justify-content: space-around;
+          // padding: 28px 0 32px;
+          i {
+            text-align: center;
+            width: 24px;
+            font-size: 24px;
+            &:before {
+              cursor: pointer;
+            }
+          }
+          // span {
+          // 	display: block;
+          // 	height: 22px;
+          // }
+          span:nth-of-type(1) {
+            font-weight: bold;
+            margin-bottom: 5px;
+          }
+          // background-color: blue;
+        }
+        li:nth-child(2) {
+          width: 246px;
+          // line-height: 100px;
+          // background-color: red;
+        }
+        li:nth-child(3) {
+          width: 400px;
+          // display: block;
+          position: relative;
+          max-height: 156px;
+          min-height: 156px;
+          text-align: left;
+          padding: 6px 16px 6px 16px;
 
-					overflow: hidden;
-					> p {
-						white-space: break-space;
-						text-align: center;
-						word-break: break-all;
-						font-size: 14px;
-						width: 100%;
-					}
-					div {
-						position: absolute;
-						width: 42px;
-						height: 20px;
-						right: 19px;
-						bottom: 3px;
-						text-align: right;
-						background-color: #fff;
-						color: #ff4400;
-						cursor: pointer;
-					}
-					// background-color: green;
-				}
-				li:nth-child(4) {
-					display: flex;
-					flex-direction: column;
-					justify-content: center;
-					// padding-top: 62px;
-					width: 321px;
-					// background-color: purple;
-				}
-			}
-		}
-	}
+          overflow: hidden;
+          > p {
+            white-space: break-space;
+            text-align: center;
+            word-break: break-all;
+            font-size: 14px;
+            width: 100%;
+          }
+          div {
+            position: absolute;
+            width: 42px;
+            height: 20px;
+            right: 19px;
+            bottom: 3px;
+            text-align: right;
+            background-color: #fff;
+            color: #ff4400;
+            cursor: pointer;
+          }
+          // background-color: green;
+        }
+        li:nth-child(4) {
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          // padding-top: 62px;
+          width: 321px;
+          // background-color: purple;
+        }
+      }
+    }
+  }
 }
 .icon-zhengjian {
-	transform: scaleX(-1.2);
+  transform: scaleX(-1.2);
 }
 .billDetailModal {
-	/deep/ .ant-modal-content {
-		.ant-modal-body {
-			max-height: 700px;
-			overflow: auto;
-			padding: 30px;
-			// 跟进信息的状态
-			#progressinfo {
-				margin: 0 !important;
-			}
-			#progressinfo > div {
-				margin-left: 24px;
-				padding-top: 0;
-				padding-bottom: 0;
-				padding-right: 16px;
-				position: relative;
-			}
+  /deep/ .ant-modal-content {
+    .ant-modal-body {
+      max-height: 700px;
+      overflow: auto;
+      padding: 30px;
+      // 跟进信息的状态
+      #progressinfo {
+        margin: 0 !important;
+      }
+      #progressinfo > div {
+        margin-left: 24px;
+        padding-top: 0;
+        padding-bottom: 0;
+        padding-right: 16px;
+        position: relative;
+      }
 
-			.titleMain div {
-				padding-bottom: 20px;
-				padding-left: 13px;
-				border-left: 2px solid #cccccc;
-				left: 16px;
-				line-height: 20px;
-				/*height: 22px;*/
-				font-size: 16px;
-				font-weight: bold;
-				color: #333333;
-			}
+      .titleMain div {
+        padding-bottom: 20px;
+        padding-left: 13px;
+        border-left: 2px solid #cccccc;
+        left: 16px;
+        line-height: 20px;
+        /*height: 22px;*/
+        font-size: 16px;
+        font-weight: bold;
+        color: #333333;
+      }
 
-			.cg-cricle,
-			.cb-cricle {
-				position: absolute;
-				left: -4.5px;
-				top: 1px;
-				background: #cccccc;
-				width: 10px;
-				height: 10px;
-				border-radius: 100%;
-			}
+      .cg-cricle,
+      .cb-cricle {
+        position: absolute;
+        left: -4.5px;
+        top: 1px;
+        background: #cccccc;
+        width: 10px;
+        height: 10px;
+        border-radius: 100%;
+      }
 
-			.ui-list-info {
-				padding-bottom: 24px;
-				border-left: 2px solid #cccccc;
-				padding-left: 13px;
-				position: relative;
-				top: -3px;
-				margin-bottom: -4px;
-			}
-			#progressinfo {
-				margin-top: 24px;
-				font-size: 14px;
-				margin-bottom: 125px;
-				ul {
-					margin-bottom: 0;
+      .ui-list-info {
+        padding-bottom: 24px;
+        border-left: 2px solid #cccccc;
+        padding-left: 13px;
+        position: relative;
+        top: -3px;
+        margin-bottom: -4px;
+      }
+      #progressinfo {
+        margin-top: 24px;
+        font-size: 14px;
+        margin-bottom: 125px;
+        ul {
+          margin-bottom: 0;
 
-					li {
-						display: flex;
-						justify-content: space-between;
-						align-items: center;
-						border-left: 1px solid #e8e8e8;
-						margin-left: 4px;
-						position: relative;
-						padding-bottom: 29px;
+          li {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            border-left: 1px solid #e8e8e8;
+            margin-left: 4px;
+            position: relative;
+            padding-bottom: 29px;
 
-						p {
-							margin-bottom: 0;
-						}
+            p {
+              margin-bottom: 0;
+            }
 
-						> div:first-child {
-							position: absolute;
-							width: 8px;
-							height: 8px;
-							left: -4.5px;
-							top: 0;
-							border: 2px solid #1890ff;
-							background-color: #fff;
-							border-radius: 50%;
-							box-sizing: border-box;
-						}
+            > div:first-child {
+              position: absolute;
+              width: 8px;
+              height: 8px;
+              left: -4.5px;
+              top: 0;
+              border: 2px solid #1890ff;
+              background-color: #fff;
+              border-radius: 50%;
+              box-sizing: border-box;
+            }
 
-						> div:nth-child(2) {
-							margin-left: 37px;
-							margin-top: -7px;
-						}
+            > div:nth-child(2) {
+              margin-left: 37px;
+              margin-top: -7px;
+            }
 
-						> div:last-child {
-							color: #ccc;
-							cursor: pointer;
-						}
-					}
+            > div:last-child {
+              color: #ccc;
+              cursor: pointer;
+            }
+          }
 
-					li:last-child {
-						border-color: transparent;
-					}
-				}
+          li:last-child {
+            border-color: transparent;
+          }
+        }
 
-				.loadmore {
-					text-align: center;
-					color: #1890ff;
-				}
-			}
-			.titleMain > div > img {
-				position: absolute;
-				top: 0px;
-				left: -10px;
-				display: inline-block;
-				width: 20px;
-				height: 20px;
-				background-color: #ccc;
-				line-height: 20px;
-				border-radius: 50%;
-				padding: 2px;
-			}
-			.titleMain:first-of-type > div {
-				color: #ff4400;
-			}
-			.titleMain:first-of-type > div > img {
-				background-color: #ff4400;
-			}
-		}
-		.ant-modal-header {
-			background-color: #f5f5f5;
-			border-bottom: 0px solid #000;
-		}
-	}
+        .loadmore {
+          text-align: center;
+          color: #1890ff;
+        }
+      }
+      .titleMain > div > img {
+        position: absolute;
+        top: 0px;
+        left: -10px;
+        display: inline-block;
+        width: 20px;
+        height: 20px;
+        background-color: #ccc;
+        line-height: 20px;
+        border-radius: 50%;
+        padding: 2px;
+      }
+      .titleMain:first-of-type > div {
+        color: #ff4400;
+      }
+      .titleMain:first-of-type > div > img {
+        background-color: #ff4400;
+      }
+    }
+    .ant-modal-header {
+      background-color: #f5f5f5;
+      border-bottom: 0px solid #000;
+    }
+  }
 }
 .recordInfo {
-	/deep/ .ant-modal-content {
-		.ant-modal-body {
-			padding-left: 120px;
-			.mb8 {
-				margin-bottom: 20px !important;
-			}
-			.ant-row > div:first-child {
-				text-align: right;
-				margin-right: 32px;
-			}
-		}
-	}
+  /deep/ .ant-modal-content {
+    .ant-modal-body {
+      padding-left: 120px;
+      .mb8 {
+        margin-bottom: 20px !important;
+      }
+      .ant-row > div:first-child {
+        text-align: right;
+        margin-right: 32px;
+      }
+    }
+  }
 }
 </style>
diff --git a/src/components/userinfo/usercenter/components/townsman.vue b/src/components/userinfo/usercenter/components/townsman.vue
index 1fbe6dc..f1f2529 100644
--- a/src/components/userinfo/usercenter/components/townsman.vue
+++ b/src/components/userinfo/usercenter/components/townsman.vue
@@ -3,23 +3,31 @@
     <div class="contenttitle">
       <ul @click="resetpag">
         <li @click="pagination.status = 0" :class="{ townsmanactive: pagination.status === 0 }">
-          全部<span>{{ statusNum.num0 == 0 ? "" : statusNum.num0 }}</span>
+          全部
+          <span>{{ statusNum.num0 == 0 ? "" : statusNum.num0 }}</span>
         </li>
-        <li @click="pagination.status = 1" :class="{ townsmanactive: pagination.status === 1 }">
-          空闲中<span>{{ statusNum.num1 == 0 ? "" : statusNum.num1 }}</span>
+        <li @click="pagination.status = 40" :class="{ townsmanactive: pagination.status === 40 }">
+          当前在职
+          <span>{{ statusNum.num1 == 0 ? "" : statusNum.num40 }}</span>
         </li>
         <!-- <li @click="pagination.status = 2" :class="{ townsmanactive: pagination.status === 2 }">
           报名中<span>{{ statusNum.num2 == 0 ? "" : statusNum.num2 }}</span>
-        </li> -->
-        <li @click="pagination.status = 3" :class="{ townsmanactive: pagination.status === 3 }">
-          在职中<span>{{ statusNum.num3 == 0 ? "" : statusNum.num3 }}</span>
+        </li>-->
+        <li @click="pagination.status = 48" :class="{ townsmanactive: pagination.status === 48 }">
+          准备离职
+          <span>{{ statusNum.num3 == 0 ? "" : statusNum.num48}}</span>
+        </li>
+        <li @click="pagination.status = 50" :class="{ townsmanactive: pagination.status === 50 }">
+          准备离职
+          <span>{{ statusNum.num3 == 0 ? "" : statusNum.num50 }}</span>
         </li>
       </ul>
     </div>
     <div class="contentbody">
       <div class="searchbox">
         <div class="searchinput">
-          <a-input placeholder="请输入老乡姓名/身份证号" @keyup.enter="onSearch" @input="resetsearch" v-model="pagination.keys"><i slot="prefix" class="iconfont icon-sousuo"></i>
+          <a-input placeholder="请输入老乡姓名/身份证号" @keyup.enter="onSearch" @input="resetsearch" v-model="pagination.keys">
+            <i slot="prefix" class="iconfont icon-sousuo"></i>
             <button slot="suffix" @click="onSearch">搜索</button>
           </a-input>
         </div>
@@ -28,230 +36,214 @@
           <button @click="changepage(1)">下一页</button>
         </div>
       </div>
-      <a-table :columns="columns" :data-source="data" :pagination="false" @change="onChange" :loading="{
-          spinning: isspinning,
-          tip: '加载中',
-          wrapperClassName: 'spinstyle',
-        }" :locale="tablenodata" :rowKey="(record) => record.index">
+      <a-table :columns="columns" :data-source="data" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :locale="tablenodata" :rowKey="(record) => record.index">
         <a slot="name" slot-scope="text">{{ text }}</a>
         <a slot="userDetail" style="color: #ff4400" slot-scope="text, text1" @click="toDetail(text1)">详情</a>
       </a-table>
       <div class="pagecontainer">
         <a-pagination :current="+pagination.pageNum" :default-current="1" :defaultPageSize="8" :total="pagination.total" @change="onChange" />
         <div class="ant-pagination-options-quick-jumper">
-          <span>共{{ pagination.total }}条，</span>跳至<input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" />页
+          <span>共{{ pagination.total }}条，</span>跳至
+          <input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" />页
         </div>
       </div>
     </div>
     <!-- 老乡详情的弹出框 -->
     <a-modal class="townsmanDetailModal" centered v-model="townsmanDetailVisible" width="756px" @cancel="townsmanDetailModalClose" :footer="null" destroyOnClose>
-      <div slot='title' destoryOnClose>
-        老乡详情
-      </div>
+      <div slot="title" destoryOnClose>老乡详情</div>
       <div class="detailContent">
         <div class="userInfo">
           <div class="userInfo_top">
             <div>
               <div>
-                <span class="f18" style="font-weight:600">
-                  {{currentTownsmanDetail.name}}{{currentTownsmanDetail.sex && currentTownsmanDetail.sex == 1 ? '/男':'/女'}}{{currentTownsmanDetail.age && '/' + currentTownsmanDetail.age + '岁'}}{{currentTownsmanDetail.nation && '/' + currentTownsmanDetail.nation + '族'}}
-                </span>
-                <span style="border:1px solid #ff4400; color: #ff4400;padding:1px 4px;cursor:pointer;margin-left:8px" @click="editTownsmanDetail">编辑</span>
+                <span class="f18" style="font-weight: 600">{{ currentTownsmanDetail.name }}{{ currentTownsmanDetail.sex && currentTownsmanDetail.sex == 1 ? "/男" : "/女" }}{{ currentTownsmanDetail.age && "/" + currentTownsmanDetail.age + "岁" }}{{ currentTownsmanDetail.nation && "/" + currentTownsmanDetail.nation + "族" }}</span>
+                <span style="border: 1px solid #ff4400; color: #ff4400; padding: 1px 4px; cursor: pointer; margin-left: 8px" @click="editTownsmanDetail">编辑</span>
               </div>
-              <p class="f14" style="color:#999">
-                {{currentTownsmanDetail.address || '-'}}
-              </p>
+              <p class="f14" style="color: #999">{{ currentTownsmanDetail.address || "-" }}</p>
             </div>
             <div>
-              <span style="margin-right:20px">
-                <span class="iconfont icon-shenfenzheng1" style="color:#f40;margin-right:4px"></span>{{currentTownsmanDetail.idCard ? currentTownsmanDetail.idCard : '-' }}
+              <span style="margin-right: 20px">
+                <span class="iconfont icon-shenfenzheng1" style="color: #f40; margin-right: 4px"></span>
+                {{ currentTownsmanDetail.idCard ? currentTownsmanDetail.idCard : "-" }}
               </span>
               <span>
-                <span class="iconfont icon-dianhua1" style="color:#f40;margin-right:4px"></span>{{currentTownsmanDetail.tel ? currentTownsmanDetail.tel : '-' }}
+                <span class="iconfont icon-dianhua1" style="color: #f40; margin-right: 4px"></span>
+                {{ currentTownsmanDetail.tel ? currentTownsmanDetail.tel : "-" }}
               </span>
             </div>
           </div>
           <div class="userInfo_bottom" @click="previewImg($event)">
-            <img v-for="img in userImgs" :key="img.id" :src="img.url" :data-src='img.url' alt="">
+            <img v-for="img in userImgs" :key="img.id" :src="img.url" :data-src="img.url" alt />
           </div>
           <viewer v-show="false" :images="images" class="images">
             <img v-for="src in images" :key="src" :src="src" />
           </viewer>
         </div>
         <div v-for="item in orders" :key="item.id" class="jobExperience boxStyle">
-          <div class="experienceTitle titleStyle">
-            工作{{item.index}}
-          </div>
+          <div class="experienceTitle titleStyle">工作{{ item.index }}</div>
           <div class="experienceContent">
             <a-row>
-              <a-col :span="6">
-                报名岗位
-              </a-col>
-              <a-col :span="18" style="text-align:right">
-                {{item.storeJobName || '-'}}
-              </a-col>
+              <a-col :span="6">报名岗位</a-col>
+              <a-col :span="18" style="text-align: right">{{ item.storeJobName || "-" }}</a-col>
             </a-row>
             <a-row>
-              <a-col :span="6">
-                报名企业
-              </a-col>
-              <a-col :span="18" style="text-align:right">
-                {{item.storeName || '-'}}
-              </a-col>
+              <a-col :span="6">报名企业</a-col>
+              <a-col :span="18" style="text-align: right">{{ item.storeName || "-" }}</a-col>
             </a-row>
             <a-row>
-              <a-col :span="6">
-                政策
-              </a-col>
-              <a-col class="policy" :class="'policy' + item.id" :span="18" style="text-align:right">
-                {{item.policy}}
-              </a-col>
-              <span @click="togglePolicyStatus(item)">{{item.policyStatus?'收起':'展开'}}</span>
+              <a-col :span="6">政策</a-col>
+              <a-col class="policy" :class="'policy' + item.id" :span="18" style="text-align: right">{{ item.policy }}</a-col>
+              <span @click="togglePolicyStatus(item)">{{ item.policyStatus ? "收起" : "展开" }}</span>
             </a-row>
             <a-row>
-              <a-col :span="6">
-                状态
-              </a-col>
-              <a-col :span="18" style="text-align:right;color:#333">
-                {{item.statusText}}
-              </a-col>
+              <a-col :span="6">状态</a-col>
+              <a-col :span="18" style="text-align: right; color: #333">{{ item.statusText }}</a-col>
             </a-row>
             <a-row>
-              <a-col :span="6">
-                {{item.timeText}}
-              </a-col>
-              <a-col :span="18" style="text-align:right">
-                {{item.timeStr}}
-              </a-col>
+              <a-col :span="6">{{ item.timeText }}</a-col>
+              <a-col :span="18" style="text-align: right">{{ item.timeStr }}</a-col>
             </a-row>
           </div>
         </div>
-        <div class="progressRecord boxStyle" v-for="item in allOrders" :key='item.createTime'>
-          <div class="progressRecordTitle titleStyle">
-            跟进记录{{item.index}}
-          </div>
-          <div id="progressinfo"> <template v-for="(group,key) in item.records">
+        <div class="progressRecord boxStyle" v-for="item in allOrders" :key="item.createTime">
+          <div class="progressRecordTitle titleStyle">跟进记录{{ item.idxText }}</div>
+          <div id="progressinfo">
+            <template v-for="(group, key) in item.records">
               <div class="titleMain">
                 <div v-if="spliceStr(key) == '1'">
-                  <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/shz.svg" alt="">
+                  <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/shz.svg" alt />
                   报名审核中
                 </div>
-                <div v-if="spliceStr(key) == '2'"> <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/bmcg.svg" alt="">报名成功</div>
-                <div v-if="spliceStr(key) == '3'"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/mstg.svg" alt="">待入职</div>
-                <div v-if="spliceStr(key) == '4'"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/rzcg.svg" alt="">在职中</div>
-                <div v-if="spliceStr(key) == '5'"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/ylz.svg" alt="">已离职</div>
-                <div v-if="spliceStr(key) == '6'"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/bmcg.svg" alt="">已完成</div>
-                <div v-if="spliceStr(key) == '9'"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/yylz.svg" alt="">约离职</div>
-                <div v-if="spliceStr(key) == '11'"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/wei.svg" alt="">报名失败</div>
-                <div v-if="spliceStr(key) == '12'"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/yjd.svg" alt="">已接到</div>
-                <div v-if="spliceStr(key) == '13'"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/wei.svg" alt="">未接到</div>
-                <div v-if="spliceStr(key) == '14'"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/wei.svg" alt="">面试未通过</div>
-                <div v-if="spliceStr(key) == '15'"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/wei.svg" alt="">未入职</div>
+                <div v-if="spliceStr(key) == '2'">
+                  <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/bmcg.svg" alt />报名成功
+                </div>
+                <div v-if="spliceStr(key) == '3'">
+                  <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/mstg.svg" alt />待入职
+                </div>
+                <div v-if="spliceStr(key) == '4'">
+                  <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/rzcg.svg" alt />在职中
+                </div>
+                <div v-if="spliceStr(key) == '5'">
+                  <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/ylz.svg" alt />已离职
+                </div>
+                <div v-if="spliceStr(key) == '6'">
+                  <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/bmcg.svg" alt />已完成
+                </div>
+                <div v-if="spliceStr(key) == '9'">
+                  <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/yylz.svg" alt />约离职
+                </div>
+                <div v-if="spliceStr(key) == '11'">
+                  <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/wei.svg" alt />报名失败
+                </div>
+                <div v-if="spliceStr(key) == '12'">
+                  <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/yjd.svg" alt />已接到
+                </div>
+                <div v-if="spliceStr(key) == '13'">
+                  <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/wei.svg" alt />未接到
+                </div>
+                <div v-if="spliceStr(key) == '14'">
+                  <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/wei.svg" alt />面试未通过
+                </div>
+                <div v-if="spliceStr(key) == '15'">
+                  <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/imgs/wei.svg" alt />未入职
+                </div>
               </div>
-              <div v-for="(item,index) in group" class="ui-step-one">
+              <div v-for="(item, index) in group" class="ui-step-one">
                 <div class="cb-cricle"></div>
                 <div class="ui-list-info">
                   <!-- :style="padding-bottom: item.desp == '' ? '18px' : '24px';" -->
-                  <div class="f12 c6" style="white-space: pre-line;" v-if="item.desp != ''">{{item.desp}}
+                  <div class="f12 c6" style="white-space: pre-line" v-if="item.desp != ''">
+                    {{ item.desp }}
                     <template v-if="item.policy">
-                      <span class="ml12" style="color:#ff4400;cursor: pointer;" @click="showInfo2(item.policy)">
-                        详情</span>
+                      <span class="ml12" style="color: #ff4400; cursor: pointer" @click="showInfo2(item.policy)">详情</span>
                     </template>
-                    <a-modal class="billDetailModal recordInfo" title="报名信息" :visible="zzvisible" @cancel="policyModalCancel" width="716px" :footer='null'>
-                      <a-row class='f16 mb8'>
+                    <a-modal class="billDetailModal recordInfo" title="报名信息" :visible="zzvisible" @cancel="policyModalCancel" width="716px" :footer="null">
+                      <a-row class="f16 mb8">
                         <a-col :span="4">
                           <span class="dib tr">姓名：</span>
                         </a-col>
                         <a-col :span="18">
-                          <span class="fwb" v-if='currentBillInfo.userName'>{{currentBillInfo.userName}}</span>
-                          <span class="fwb" v-if='currentBillInfo.sex'>/{{currentBillInfo.sex == '1' || currentBillInfo.sex == '男' ? '男' : '女'}}</span>
-                          <span class="fwb" v-if='currentBillInfo.age'>/{{currentBillInfo.age}}岁</span>
-                          <span class="fwb" v-if='currentBillInfo.nation && currentBillInfo.nation!="族"'>/{{currentBillInfo.nation}}</span>
+                          <span class="fwb" v-if="currentBillInfo.userName">{{ currentBillInfo.userName }}</span>
+                          <span class="fwb" v-if="currentBillInfo.sex">/{{ currentBillInfo.sex == "1" || currentBillInfo.sex == "男" ? "男" : "女" }}</span>
+                          <span class="fwb" v-if="currentBillInfo.age">/{{ currentBillInfo.age }}岁</span>
+                          <span class="fwb" v-if="currentBillInfo.nation && currentBillInfo.nation != '族'">/{{ currentBillInfo.nation }}</span>
                         </a-col>
                       </a-row>
-                      <a-row class='f16 mb8'>
+                      <a-row class="f16 mb8">
                         <a-col :span="4">
                           <span class="dib tr">电话：</span>
                         </a-col>
                         <a-col :span="18">
-                          <span>{{currentBillInfo.tel == '' || currentBillInfo.tel == null || currentBillInfo.tel == 'undefined' ? '-' : currentBillInfo.tel}}</span>
+                          <span>{{ currentBillInfo.tel == "" || currentBillInfo.tel == null || currentBillInfo.tel == "undefined" ? "-" : currentBillInfo.tel }}</span>
                         </a-col>
                       </a-row>
-                      <a-row class='f16 mb8'>
+                      <a-row class="f16 mb8">
                         <a-col :span="4">
                           <span class="dib tr">身份证号：</span>
                         </a-col>
                         <a-col :span="18">
-                          <span>{{currentBillInfo.idCard == '' || currentBillInfo.idCard == null || currentBillInfo.idCard == 'undefined' ? '-' : currentBillInfo.idCard}}</span>
+                          <span>{{ currentBillInfo.idCard == "" || currentBillInfo.idCard == null || currentBillInfo.idCard == "undefined" ? "-" : currentBillInfo.idCard }}</span>
                         </a-col>
                       </a-row>
-                      <a-row class='f16'>
+                      <a-row class="f16">
                         <a-col :span="4">
                           <span class="dib tr">家庭住址：</span>
                         </a-col>
                         <a-col :span="18">
-                          <span>{{currentBillInfo.address == '' || currentBillInfo.address == null || currentBillInfo.address == 'undefined' ? '-' : currentBillInfo.address}}</span>
+                          <span>{{ currentBillInfo.address == "" || currentBillInfo.address == null || currentBillInfo.address == "undefined" ? "-" : currentBillInfo.address }}</span>
                         </a-col>
                       </a-row>
 
-                      <div style="border-top: 1px dashed #eeeeee;margin-top: 24px;margin-bottom: 24px;"></div>
-                      <a-row class='f16 mb8'>
+                      <div style="border-top: 1px dashed #eeeeee; margin-top: 24px; margin-bottom: 24px"></div>
+                      <a-row class="f16 mb8">
                         <a-col :span="4">
                           <span class="dib tr">报名岗位：</span>
                         </a-col>
                         <a-col :span="18">
-                          <span class="fwb">{{currentBillInfo.storeJobName || '-'}}</span>
+                          <span class="fwb">{{ currentBillInfo.storeJobName || "-" }}</span>
                         </a-col>
                       </a-row>
-                      <a-row class='f16 mb8'>
+                      <a-row class="f16 mb8">
                         <a-col :span="4">
                           <span class="dib tr">政策：</span>
                         </a-col>
                         <a-col :span="18">
-                          <span style="white-space:pre-wrap">{{currentBillInfo.policy || '-'}}</span>
+                          <span style="white-space: pre-wrap">{{ currentBillInfo.policy || "-" }}</span>
                         </a-col>
                       </a-row>
-                      <a-row class='f16 mb8'>
-                        <a-col :span="4">
-                        </a-col>
+                      <a-row class="f16 mb8">
+                        <a-col :span="4"></a-col>
                         <a-col :span="18" class="bfbutton">
-                          <a-button style="background-color:#ff4400;color:white;border-radius:0;border:none" @click="handleCancel">
-                            复制文本
-                          </a-button>
+                          <a-button style="background-color: #ff4400; color: white; border-radius: 0; border: none" @click="handleCancel">复制文本</a-button>
                         </a-col>
                       </a-row>
                     </a-modal>
                   </div>
-                  <div class="f12 c9">{{item.creator}} <span class="ml8">
-                      {{ formatDateYMDHM(item.createTime) }}
-                    </span></div>
+                  <div class="f12 c9">
+                    {{ item.creator }}
+                    <span class="ml8">{{ formatDateYMDHM(item.createTime) }}</span>
+                  </div>
                 </div>
               </div>
-            </template></div>
-
+            </template>
+          </div>
         </div>
 
-        <a-modal class="editDetailModal" transitionName="" centered v-model="editTownsmanVisibel" width="716px" @cancel="cancelEditTownsman" :footer="null" destroyOnClose>
-          <div slot='title'>
-            老乡信息
-          </div>
+        <a-modal class="editDetailModal" transitionName centered v-model="editTownsmanVisibel" width="716px" @cancel="cancelEditTownsman" :footer="null" destroyOnClose>
+          <div slot="title">老乡信息</div>
           <div class="editInfoContent">
-            <a-form :form='Townsmanform' @submit="phonehandleSubmit" :labelCol='{ span: 10 }' :wrapperCol='{ span: 14 }'>
+            <a-form :form="Townsmanform" @submit="phonehandleSubmit" :labelCol="{ span: 10 }" :wrapperCol="{ span: 14 }">
               <a-row>
                 <a-col :span="12">
                   <a-form-item label="姓名">
-                    <a-input v-decorator="['name',{ rules: [{ required: true, message: '请输入姓名' }] },]" placeholder="请输入姓名" />
+                    <a-input v-decorator="['name', { rules: [{ required: true, message: '请输入姓名' }] }]" placeholder="请输入姓名" />
                   </a-form-item>
                 </a-col>
                 <a-col :span="12">
                   <a-form-item label="性别">
-                    <a-radio-group v-decorator="['sex',{ rules: [{ required: true, message: '请选择性别' }] },]" name="radioGroup">
-                      <a-radio :value="1">
-                        男
-                      </a-radio>
-                      <a-radio :value="2">
-                        女
-                      </a-radio>
+                    <a-radio-group v-decorator="['sex', { rules: [{ required: true, message: '请选择性别' }] }]" name="radioGroup">
+                      <a-radio :value="1">男</a-radio>
+                      <a-radio :value="2">女</a-radio>
                     </a-radio-group>
                   </a-form-item>
                 </a-col>
@@ -259,57 +251,60 @@
               <a-row>
                 <a-col :span="12">
                   <a-form-item label="年龄">
-                    <a-input v-decorator="['age',{ rules: [{ required: true, message: '请输入年龄!' }] },]" placeholder="请输入年龄" />
+                    <a-input v-decorator="['age', { rules: [{ required: true, message: '请输入年龄!' }] }]" placeholder="请输入年龄" />
                   </a-form-item>
                 </a-col>
                 <a-col :span="12">
                   <a-form-item label="民族">
                     <a-select v-decorator="['nation']" @change="selectChange">
-                      <a-select-option :title="item.name" v-for="item in nationOptions" :key="item.id" :value="item.name">
-                        {{item.name}}
-                      </a-select-option>
+                      <a-select-option :title="item.name" v-for="item in nationOptions" :key="item.id" :value="item.name">{{ item.name }}</a-select-option>
                     </a-select>
                   </a-form-item>
                 </a-col>
               </a-row>
-              <a-form-item label="电话" :labelCol='{ span:5}' :wrapperCol='{ span: 19 }'>
+              <a-form-item label="电话" :labelCol="{ span: 5 }" :wrapperCol="{ span: 19 }">
                 <a-input v-decorator="['tel']" placeholder="请输入电话" />
               </a-form-item>
-              <a-form-item label="身份证号" :labelCol='{ span:5}' :wrapperCol='{ span: 19 }'>
+              <a-form-item label="身份证号" :labelCol="{ span: 5 }" :wrapperCol="{ span: 19 }">
                 <a-input v-decorator="['idCard']" placeholder="请输入身份证号" />
               </a-form-item>
-              <a-form-item label="家庭住址" :labelCol='{ span:5}' :wrapperCol='{ span: 19 }'>
+              <a-form-item label="家庭住址" :labelCol="{ span: 5 }" :wrapperCol="{ span: 19 }">
                 <a-input v-decorator="['address']" placeholder="请输入家庭住址" />
               </a-form-item>
-              <a-form-item label='附件' :labelCol='{ span:5}' :wrapperCol='{ span: 19 }'>
-                <a-upload name="file" list-type="picture" class="upload-list-inline" :customRequest="customRequestFun2" :beforeUpload="beforeUpload" :showUploadList='false' :remove="(file) => { removeFile(file, 'header'); }" :data="dataObj">
+              <a-form-item label="附件" :labelCol="{ span: 5 }" :wrapperCol="{ span: 19 }">
+                <a-upload name="file" list-type="picture" class="upload-list-inline" :customRequest="customRequestFun2" :beforeUpload="beforeUpload" :showUploadList="false" :remove="
+										(file) => {
+											removeFile(file, 'header');
+										}
+									" :data="dataObj">
                   <!-- :default-file-list='userImgs' -->
-                  <a-button> <a-icon type="upload" /> 上传 </a-button>
+                  <a-button>
+                    <a-icon type="upload" />上传
+                  </a-button>
                 </a-upload>
               </a-form-item>
               <a-row>
-                <a-col :span="5">
-                </a-col>
+                <a-col :span="5"></a-col>
                 <a-col :span="19" class="imgBox">
-                  <div v-for="(item,index) in userImgs" :key="index">
+                  <div v-for="(item, index) in userImgs" :key="index">
                     <div>
-                      <img :src="item.url" @click="previewImg($event)" :data-src='item.url' alt="">
-                      <p style="width:80px;margin-left:8px;font-size:14px;color:#ff4400;overflow:hidden;text-overflow:ellipsis;white-space	:nowrap">{{item.title}}</p>
+                      <img :src="item.url" @click="previewImg($event)" :data-src="item.url" alt />
+                      <p style="width: 80px; margin-left: 8px; font-size: 14px; color: #ff4400; overflow: hidden; text-overflow: ellipsis; white-space: nowrap">{{ item.title }}</p>
                     </div>
-                    <i class="iconfont icon-shanchu" @click="deleteImg('loaded',item)"></i>
+                    <i class="iconfont icon-shanchu" @click="deleteImg('loaded', item)"></i>
                   </div>
-                  <div v-for="(item,index) in fileListT2" :key="index">
+                  <div v-for="(item, index) in fileListT2" :key="index">
                     <div>
-                      <img :src="item" @click="previewImg($event)" :data-src='item' alt="">
-                      <p style="width:80px;margin-left:8px;font-size:14px;color:#ff4400;overflow:hidden;text-overflow:ellipsis;white-space	:nowrap">{{item.name}}</p>
+                      <img :src="item" @click="previewImg($event)" :data-src="item" alt />
+                      <p style="width: 80px; margin-left: 8px; font-size: 14px; color: #ff4400; overflow: hidden; text-overflow: ellipsis; white-space: nowrap">{{ item.name }}</p>
                     </div>
                     <i class="iconfont icon-shanchu" @click="removeFile(item)"></i>
                   </div>
                 </a-col>
               </a-row>
-              <a-form-item label=' ' :colon='false' :labelCol='{ span:5 }' :wrapperCol='{ span: 19 }'>
+              <a-form-item label=" " :colon="false" :labelCol="{ span: 5 }" :wrapperCol="{ span: 19 }">
                 <a-button @click="cancelEditTownsman">取消</a-button>
-                <a-button style="background-color:#ff4400;color:white;margin-left:16px" html-type="submit">提交</a-button>
+                <a-button style="background-color: #ff4400; color: white; margin-left: 16px" html-type="submit">提交</a-button>
               </a-form-item>
             </a-form>
           </div>
@@ -320,26 +315,15 @@
 </template>
 
 <script>
-import Vue from "vue";
-import {
-  userTownsmanApi,
-  gettownsManCountApi,
-  townsmanDetailApi,
-  townsmanDetailImgsApi,
-  updateTownsmanInfoApi,
-  delTowmsmanDetailImgApi,
-} from "../../../../api/userinfo";
-import {
-  formatDateYMD,
-  formatDateYMDHM,
-  getUserApplyOrderStatusById,
-} from "../../../../utils/commonUtil";
-import { nationlist } from "../../../../utils/datalist";
-import Viewer from "v-viewer";
+import Vue from 'vue'
+import { userTownsmanApi, gettownsManCountApi, townsmanDetailApi, townsmanDetailImgsApi, updateTownsmanInfoApi, delTowmsmanDetailImgApi } from '../../../../api/userinfo'
+import { formatDateYMD, formatDateYMDHM, getUserApplyOrderStatusById } from '../../../../utils/commonUtil'
+import { nationlist } from '../../../../utils/datalist'
+import Viewer from 'v-viewer'
 // import imgPreview from "../imgPreviewNewJobDetail.vue";
-import "viewerjs/dist/viewer.css";
-import request from "@/utils/request";
-import $ from "jquery";
+import 'viewerjs/dist/viewer.css'
+import request from '@/utils/request'
+import $ from 'jquery'
 
 Vue.use(Viewer, {
   defaultOptions: {
@@ -352,7 +336,7 @@ Vue.use(Viewer, {
       prev: false,
       play: {
         show: true,
-        size: "large",
+        size: 'large',
       },
       next: false,
       rotateLeft: true,
@@ -363,11 +347,11 @@ Vue.use(Viewer, {
     title: false,
     navbar: false,
   },
-});
+})
 
 export default {
   // 组件名称
-  name: "",
+  name: '',
   // 局部注册的组件
   components: {},
   // 组件参数 接收来自父组件的数据
@@ -380,10 +364,7 @@ export default {
         emptyText: () => (
           <div>
             <div>
-              <img
-                src="https://user-images.githubusercontent.com/507615/54591670-ac0a0180-4a65-11e9-846c-e55ffce0fe7b.png"
-                style="width:105px;height:90px;marginTop:20px"
-              />
+              <img src="https://user-images.githubusercontent.com/507615/54591670-ac0a0180-4a65-11e9-846c-e55ffce0fe7b.png" style="width:105px;height:90px;marginTop:20px" />
             </div>
             <div style="marginBottom:20px">暂无数据</div>
           </div>
@@ -409,29 +390,29 @@ export default {
       townsmanDetailVisible: false, // 控制详情弹出框的显示
       currentTownsmanDetail: {
         // 当前老乡详情信息["name"] = user
-        name: "",
-        userId: "",
-        sex: "",
-        age: "",
-        nationality: "",
-        address: "",
-        idCard: "",
-        tel: "",
-        jobName: "",
-        storeName: "",
-        policy: "",
+        name: '',
+        userId: '',
+        sex: '',
+        age: '',
+        nationality: '',
+        address: '',
+        idCard: '',
+        tel: '',
+        jobName: '',
+        storeName: '',
+        policy: '',
         status: 1,
-        nation: "",
+        nation: '',
         entryTime: 1678075200000,
       },
       dataObj: {
         // 上传图片返回的数据
-        policy: "",
-        signature: "",
-        key: "",
-        ossaccessKeyId: "",
-        dir: "",
-        host: "",
+        policy: '',
+        signature: '',
+        key: '',
+        ossaccessKeyId: '',
+        dir: '',
+        host: '',
         // callback:'',
       },
       fileListT2: [], // 上传图片的列表
@@ -446,88 +427,89 @@ export default {
       zzvisible: false, // 跟进记录的政策信息弹出框显示
       currentBillInfo: {}, // 当前的工单跟进详情
       Townsmanform: this.$form.createForm(this),
-    };
+    }
   },
   // 计算属性
   computed: {
     columns() {
-      let { sortedInfo } = this;
-      console.log(sortedInfo);
-      sortedInfo = sortedInfo || {};
+      let { sortedInfo } = this
+      console.log(sortedInfo)
+      sortedInfo = sortedInfo || {}
       const columns = [
         {
-          title: "序号",
-          dataIndex: "index",
-          key: "index",
-          scopedSlots: { customRender: "index" },
+          title: '序号',
+          dataIndex: 'index',
+          key: 'index',
+          scopedSlots: { customRender: 'index' },
           ellipsis: true,
           width: 60,
         },
         {
-          title: "老乡姓名",
-          dataIndex: "userName",
-          key: "userName",
+          title: '老乡姓名',
+          dataIndex: 'userName',
+          key: 'userName',
           ellipsis: true,
           width: 90,
         },
         {
-          title: "年龄",
-          dataIndex: "age",
-          key: "age",
+          title: '年龄',
+          dataIndex: 'age',
+          key: 'age',
           ellipsis: true,
           width: 60,
         },
         {
-          title: "民族",
-          dataIndex: "nation",
-          key: "nation",
+          title: '民族',
+          dataIndex: 'nation',
+          key: 'nation',
+          ellipsis: true,
+          width: 100,
           ellipsis: true,
-          width: 120,
         },
         {
-          title: "手机号",
-          dataIndex: "tel",
-          key: "tel",
+          title: '手机号',
+          dataIndex: 'tel',
+          key: 'tel',
           ellipsis: true,
-          width: 120,
+          width: 150,
         },
         {
-          title: "身份证号",
-          dataIndex: "IDCard",
-          key: "IDCard",
+          title: '身份证号',
+          dataIndex: 'IDCard',
+          key: 'IDCard',
           ellipsis: true,
           // width: 50,
         },
         {
-          title: "状态",
-          dataIndex: "userApplyOrder",
-          key: "userApplyOrder",
+          title: '状态',
+          dataIndex: 'userApplyOrder',
+          key: 'userApplyOrder',
           sorter: (a, b) => a.userApplyOrder.localeCompare(b.userApplyOrder),
 
           // sortOrder: sortedInfo.columnKey == "userApplyOrder" && sortedInfo.order,
           // ellipsis: true,
-          width: 150,
+          width: 180,
         },
         {
-          title: "操作",
-          dataIndex: "userDetail",
-          key: "userDetail",
-          scopedSlots: { customRender: "userDetail" },
+          title: '操作',
+          dataIndex: 'userDetail',
+          key: 'userDetail',
+          scopedSlots: { customRender: 'userDetail' },
 
           // sortOrder: sortedInfo.columnKey == "userApplyOrder" && sortedInfo.order,
           // ellipsis: true,
           width: 60,
         },
-      ];
-      console.log(sortedInfo);
-      return columns;
+      ]
+      console.log(sortedInfo)
+      return columns
     },
   },
   // 侦听器
   watch: {
     editTownsmanVisibel(val1, val2) {
       if (val1 == false) {
-        this.fileListT2 = [];
+        this.fileListT2 = []
       }
     },
   },
@@ -536,88 +518,83 @@ export default {
    * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
    */
   created() {
-    this.getTownsman();
+    this.getTownsman()
   },
   /**
    * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
    * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
    */
   mounted() {
-    this.gettownsManCount();
+    this.gettownsManCount()
   },
   // 组件方法
   methods: {
     onChange(e, e1, e2) {
-      console.log(e);
-      console.log(e1);
-      console.log(e2);
-      if (typeof e == "number") {
-        this.pagination.pageNum = e;
-        this.getTownsman();
+      console.log(e)
+      console.log(e1)
+      console.log(e2)
+      if (typeof e == 'number') {
+        this.pagination.pageNum = e
+        this.getTownsman()
       }
     },
     inputpageChange(e) {
-      const pagenumcount = this.pagination.total / this.pagination.pageSize;
-      console.log(pagenumcount);
+      const pagenumcount = this.pagination.total / this.pagination.pageSize
+      console.log(pagenumcount)
       if (e.target.value) {
         if (e.target.value > pagenumcount) {
-          this.pagination.pageNum = Math.ceil(pagenumcount);
+          this.pagination.pageNum = Math.ceil(pagenumcount)
         } else {
-          this.pagination.pageNum = e.target.value;
+          this.pagination.pageNum = e.target.value
         }
       } else {
-        this.pagination.pageNum = 1;
+        this.pagination.pageNum = 1
       }
       // this.getJobList();
-      this.getTownsman();
-      console.log(e);
+      this.getTownsman()
+      console.log(e)
     },
     async getTownsman() {
       // let jobinfo = {...this.pagination , searchTag:1}
       try {
-        this.isspinning = true;
-        console.log(this.pagination);
-        const { data } = await userTownsmanApi(this.pagination);
+        this.isspinning = true
+        console.log(this.pagination)
+        const { data } = await userTownsmanApi(this.pagination)
         if (data.status === 200) {
           // console.log();
-          this.data = data.data.recordList;
+          this.data = data.data.recordList
           this.data.forEach((item, index) => {
             // console.log(item);
-            item.userApplyOrder = getUserApplyOrderStatusById(
-              item.userApplyOrderStatus
-            );
-            item.updateTime = formatDateYMD(item.updateTime);
-            item.index = index + 1;
-          });
-          console.log(data);
-
-          console.log(true);
-          this.pagination.total = data.data.recordCount;
+            item.userApplyOrder = getUserApplyOrderStatusById(item.userApplyOrderStatus)
+            item.updateTime = formatDateYMD(item.updateTime)
+            item.index = index + 1
+          })
+          this.pagination.total = data.data.recordCount
         }
       } catch (error) {
-        console.log(error);
+        console.log(error)
       }
-      this.isspinning = false;
+      this.isspinning = false
     },
     async gettownsManCount() {
       try {
-        const { data } = await gettownsManCountApi(this.pagination);
-        console.log(data);
+        const { data } = await gettownsManCountApi(this.pagination)
+        console.log(data)
         if (data.status == 200) {
-          console.log("yes");
-          this.statusNum = data.data;
+          console.log('yes')
+          this.statusNum = data.data
         }
       } catch (error) {
-        console.log(error);
+        console.log(error)
       }
     },
     getPopupContainer(el, dialogContext) {
-      console.log(el);
-      console.log(dialogContext);
+      console.log(el)
+      console.log(dialogContext)
       if (dialogContext) {
-        return dialogContext.getDialogWrap();
+        return dialogContext.getDialogWrap()
       } else {
-        return document.body;
+        return document.body
       }
     },
     resetpag() {
@@ -629,243 +606,248 @@ export default {
       // 	status: this.pagination.status,
       // 	keys: null,
       // };
-      this.gettownsManCount();
-      this.getTownsman();
+      this.gettownsManCount()
+      this.getTownsman()
     },
     resetsearch(e) {
-      console.log(e);
+      console.log(e)
       if (e.target.value.length === 0) {
-        this.pagination.keys = "";
+        this.pagination.keys = ''
 
-        this.gettownsManCount();
-        this.getTownsman();
+        this.gettownsManCount()
+        this.getTownsman()
       }
     },
     onSearch() {
       if (this.pagination.keys != null && this.pagination.keys.length != 0) {
-        this.getTownsman();
-        this.gettownsManCount();
+        this.getTownsman()
+        this.gettownsManCount()
       }
     },
     changepage(num) {
-      console.log(Math.ceil(this.pagination.total / this.pagination.pageSize));
-      if (
-        (this.pagination.pageNum === 1 && num === -1) ||
-        (this.pagination.pageNum ===
-          Math.ceil(this.pagination.total / this.pagination.pageSize) &&
-          num === 1)
-      ) {
+      console.log(Math.ceil(this.pagination.total / this.pagination.pageSize))
+      if ((this.pagination.pageNum === 1 && num === -1) || (this.pagination.pageNum === Math.ceil(this.pagination.total / this.pagination.pageSize) && num === 1)) {
         if (num === -1) {
-          this.$message.warning("已经到第一页了");
+          this.$message.warning('已经到第一页了')
         } else {
-          this.$message.warning("已经到最后一页了");
+          this.$message.warning('已经到最后一页了')
         }
-        return;
+        return
       } else {
-        this.pagination.pageNum += num;
+        this.pagination.pageNum += num
       }
-      this.getTownsman();
+      this.getTownsman()
     },
     /* 
     弹出详情页
     */
     toDetail(e) {
-      this.townsmanDetailVisible = true;
+      this.townsmanDetailVisible = true
       // this.currentTownsmanDetail = e;
-      this.currentTownsmanDetail.userId = e.userId;
-      this.getTownsmanDetail(this.currentTownsmanDetail);
-      console.log(e);
+      this.currentTownsmanDetail.userId = e.userId
+      this.getTownsmanDetail(this.currentTownsmanDetail)
+      console.log(e)
     },
     getTownsmanDetail(e) {
       townsmanDetailApi(e.userId).then((detailRes) => {
-        console.log(detailRes);
-        let userinfo = detailRes.data.data.allOrders[0];
-        console.log(userinfo.nation.indexOf("族"));
-        this.currentTownsmanDetail["name"] = userinfo.userName;
-        this.currentTownsmanDetail["nation"] =
-          userinfo.nation.indexOf("族") > 0
-            ? userinfo.nation.substr(0, userinfo.nation.length - 1)
-            : userinfo.nation;
+        console.log(detailRes)
+        let userinfo = detailRes.data.data.allOrders[0]
+        console.log(userinfo.nation.indexOf('族'))
+        this.currentTownsmanDetail['name'] = userinfo.userName
+        this.currentTownsmanDetail['nation'] = userinfo.nation.indexOf('族') > 0 ? userinfo.nation.substr(0, userinfo.nation.length - 1) : userinfo.nation
         //  == '族' ? userinfo.nation  : userinfo.nation;
-        this.currentTownsmanDetail["currentImg"] = userinfo.idCardImageUrl;
-        this.currentTownsmanDetail["sex"] = userinfo.sex;
-        this.currentTownsmanDetail["age"] = userinfo.age;
-        this.currentTownsmanDetail["idCard"] = userinfo.idCard;
-        this.currentTownsmanDetail["userId"] = userinfo.userId;
-        this.currentTownsmanDetail["tel"] = userinfo.tel;
-        this.currentTownsmanDetail["address"] = userinfo.address;
-        this.currentTownsmanDetail["policy"] = userinfo.policy;
-        this.orders = detailRes.data.data.orders;
-        this.allOrders = detailRes.data.data.allOrders;
+        this.currentTownsmanDetail['currentImg'] = userinfo.idCardImageUrl
+        this.currentTownsmanDetail['sex'] = userinfo.sex
+        this.currentTownsmanDetail['age'] = userinfo.age
+        this.currentTownsmanDetail['idCard'] = userinfo.idCard
+        this.currentTownsmanDetail['userId'] = userinfo.userId
+        this.currentTownsmanDetail['tel'] = userinfo.tel
+        this.currentTownsmanDetail['address'] = userinfo.address
+        this.currentTownsmanDetail['policy'] = userinfo.policy
+        this.orders = detailRes.data.data.orders
+        this.allOrders = detailRes.data.data.allOrders
 
         this.orders.forEach((item, index) => {
-          console.log(item);
-          this.replaceIndex(item, index);
-          item.isOpen = false;
+          console.log(item)
+          this.replaceIndex(item, index)
+          item.isOpen = false
           if (item.status == 60 || item.status == 40) {
-            item.isTimeShow = false;
+            item.isTimeShow = false
           } else {
-            item.isTimeShow = true;
+            item.isTimeShow = true
           }
           if (item.status == 25) {
-            item.isTimeShowDbl = false;
+            item.isTimeShowDbl = false
           } else {
-            item.isTimeShowDbl = true;
+            item.isTimeShowDbl = true
           }
 
           if (item.status == 10) {
-            item.statusText = "待审核";
-            item.timeText = "面试时间";
-            item.timeStr = formatDateYMDHM(item.interviewTime);
+            item.statusText = '待审核'
+            item.timeText = '面试时间'
+            item.timeStr = formatDateYMDHM(item.interviewTime)
 
-            item.timeText2 = "接待时间";
-            item.timeStr2 = formatDateYMDHM(item.receptionTime);
+            item.timeText2 = '接待时间'
+            item.timeStr2 = formatDateYMDHM(item.receptionTime)
           } else if (item.status == 20) {
-            item.statusText = "待接待";
-            item.timeText = "面试时间";
-            item.timeStr = formatDateYMDHM(item.interviewTime);
-            item.timeText2 = "接待时间";
-            item.timeStr2 = formatDateYMDHM(item.receptionTime);
+            item.statusText = '待接待'
+            item.timeText = '面试时间'
+            item.timeStr = formatDateYMDHM(item.interviewTime)
+            item.timeText2 = '接待时间'
+            item.timeStr2 = formatDateYMDHM(item.receptionTime)
           } else if (item.status == 21) {
-            item.statusText = "审核未通过";
-            item.timeText = "面试时间";
-            item.timeStr = formatDateYMDHM(item.interviewTime);
-            item.timeText2 = "接待时间";
-            item.timeStr2 = formatDateYMDHM(item.receptionTime);
+            item.statusText = '审核未通过'
+            item.timeText = '面试时间'
+            item.timeStr = formatDateYMDHM(item.interviewTime)
+            item.timeText2 = '接待时间'
+            item.timeStr2 = formatDateYMDHM(item.receptionTime)
           } else if (item.status == 25) {
-            item.statusText = "待面试";
-            item.timeText = "面试时间";
-            item.timeStr = formatDateYMDHM(item.interviewTime);
+            item.statusText = '待面试'
+            item.timeText = '面试时间'
+            item.timeStr = formatDateYMDHM(item.interviewTime)
           } else if (item.status == 26) {
-            item.statusText = "未接到";
-            item.timeText = "面试时间";
-            item.timeStr = formatDateYMDHM(item.interviewTime);
+            item.statusText = '未接到'
+            item.timeText = '面试时间'
+            item.timeStr = formatDateYMDHM(item.interviewTime)
 
-            item.timeText2 = "接待时间";
-            item.timeStr2 = formatDateYMDHM(item.receptionTime);
+            item.timeText2 = '接待时间'
+            item.timeStr2 = formatDateYMDHM(item.receptionTime)
           } else if (item.status == 30) {
-            item.statusText = "待入职";
-            item.timeText = "面试时间";
-            item.timeStr = formatDateYMDHM(item.interviewTime);
+            item.statusText = '待入职'
+            item.timeText = '面试时间'
+            item.timeStr = formatDateYMDHM(item.interviewTime)
 
-            item.timeText2 = "约入职时间";
-            item.timeStr2 = formatDateYMDHM(item.willEntryTime);
+            item.timeText2 = '约入职时间'
+            item.timeStr2 = formatDateYMDHM(item.willEntryTime)
           } else if (item.status == 35) {
-            item.statusText = "面试未通过";
-            item.timeText = "面试时间";
-            item.timeStr = formatDateYMDHM(item.interviewTime);
+            item.statusText = '面试未通过'
+            item.timeText = '面试时间'
+            item.timeStr = formatDateYMDHM(item.interviewTime)
           } else if (item.status == 40) {
-            item.statusText = "在职中";
-            item.timeText2 = "入职时间";
-            item.timeStr2 = formatDateYMDHM(item.entryTime);
+            item.statusText = '在职中'
+            item.timeText2 = '入职时间'
+            item.timeStr2 = formatDateYMDHM(item.entryTime)
           } else if (item.status == 48) {
-            item.statusText = "约离职";
-            item.timeText = "入职时间";
-            item.timeStr = formatDateYMDHM(item.entryTime);
-            item.timeText2 = "约离职时间";
-            item.timeStr2 = formatDateYMDHM(item.willLeaveTime);
+            item.statusText = '约离职'
+            item.timeText = '入职时间'
+            item.timeStr = formatDateYMDHM(item.entryTime)
+            item.timeText2 = '约离职时间'
+            item.timeStr2 = formatDateYMDHM(item.willLeaveTime)
           } else if (item.status == 45) {
-            item.statusText = "通过未入职";
-            item.timeText = "面试时间";
-            item.timeStr = formatDateYMDHM(item.interviewTime);
-            item.timeText2 = "约入职时间";
-            item.timeStr2 = formatDateYMDHM(item.willEntryTime);
+            item.statusText = '通过未入职'
+            item.timeText = '面试时间'
+            item.timeStr = formatDateYMDHM(item.interviewTime)
+            item.timeText2 = '约入职时间'
+            item.timeStr2 = formatDateYMDHM(item.willEntryTime)
           } else if (item.status == 50) {
-            item.statusText = "已离职";
-            item.timeText = "离职时间";
-            item.timeStr = formatDateYMDHM(item.leaveTime);
+            item.statusText = '已离职'
+            item.timeText = '离职时间'
+            item.timeStr = formatDateYMDHM(item.leaveTime)
           } else if (item.status == 60) {
-            item.statusText = "已完成";
-            item.timeText = "离职时间";
-            item.timeStr = formatDateYMDHM(item.leaveTime);
+            item.statusText = '已完成'
+            item.timeText = '离职时间'
+            item.timeStr = formatDateYMDHM(item.leaveTime)
           }
-        });
-        console.log(this.allOrders);
+        })
+        console.log(this.allOrders)
         this.allOrders.forEach((item1, index) => {
-          this.replaceIndex(item1, index);
-          console.log(item1);
+          this.replaceIndex(item1, index)
+          console.log(item1)
           for (var key in item1.records) {
             // console.log(key, item1.records[key]);
             item1.records[key].forEach((item, index) => {
-              if (item.desp.substr(item.desp.length - 3, 3) == "备注：") {
-                item.desp = item.desp.replace(/备注：/g, "");
+              if (item.desp.substr(item.desp.length - 3, 3) == '备注：') {
+                item.desp = item.desp.replace(/备注：/g, '')
               }
 
               if (item.type == 1) {
-                item["statusText"] = "报名审核中";
+                item['statusText'] = '报名审核中'
               } else if (item.type == 2) {
-                item["statusText"] = "待接待";
+                item['statusText'] = '待接待'
               } else if (item.type == 3) {
-                item["statusText"] = "待入职";
+                item['statusText'] = '待入职'
               } else if (item.type == 4) {
-                item["statusText"] = "在职中";
+                item['statusText'] = '在职中'
               } else if (item.type == 5) {
-                item["statusText"] = "已离职";
+                item['statusText'] = '已离职'
               } else if (item.type == 9) {
-                item["statusText"] = "约离职";
+                item['statusText'] = '约离职'
               } else if (item.type == 6) {
-                item["statusText"] = "已完成";
+                item['statusText'] = '已完成'
               } else if (item.type == 11) {
-                item["statusText"] = "审核未通过";
+                item['statusText'] = '审核未通过'
               } else if (item.type == 12) {
-                item["statusText"] = "已接到";
+                item['statusText'] = '已接到'
               } else if (item.type == 13) {
-                item["statusText"] = "未接到";
+                item['statusText'] = '未接到'
               } else if (item.type == 14) {
-                item["statusText"] = "面试未通过";
+                item['statusText'] = '面试未通过'
               } else if (item.type == 15) {
-                item["statusText"] = "未入职";
+                item['statusText'] = '未入职'
               }
-            });
+            })
           }
-        });
-        console.log(this.allOrders);
-        this.allOrders = this.allOrders.reverse();
-      });
-      this.getTownsmanImg(e);
+        })
+        console.log(this.allOrders)
+        this.allOrders = this.allOrders.reverse()
+      })
+      this.getTownsmanImg(e)
     },
     getTownsmanImg(e) {
       townsmanDetailImgsApi(e.userId).then((detailImgRes) => {
-        console.log(detailImgRes);
-        this.userImgs = detailImgRes.data.data.userImgs;
-      });
+        console.log(detailImgRes)
+        this.userImgs = detailImgRes.data.data.userImgs
+      })
     },
     /* 
       替换index为汉字
     */
     replaceIndex(item1, index) {
-      item1.index = index + 1;
-      item1.index = item1.index + "";
-      item1.index = item1.index.replace("1", "一");
-      item1.index = item1.index.replace("2", "二");
-      item1.index = item1.index.replace("3", "三");
-      item1.index = item1.index.replace("4", "四");
-      item1.index = item1.index.replace("5", "五");
-      item1.index = item1.index.replace("6", "六");
-      item1.index = item1.index.replace("7", "七");
-      item1.index = item1.index.replace("8", "八");
-      item1.index = item1.index.replace("9", "九");
-      item1.index = item1.index.replace("0", "十");
-      return item1;
+      let changeNum = ['十', '一', '二', '三', '四', '五', '六', '七', '八', '九']
+      let idx = (index + 1).toString()
+      let arr = idx.split('')
+      let first
+      let second
+      let third
+      if (arr[0]) {
+        first = changeNum[arr[0]]
+      }
+      if (arr[0] == 1 && idx % 10 == 0) {
+        first = ''
+      }
+      if (arr[0] == 1 && arr[1] && idx % 10 != 0) {
+        first = changeNum[0]
+        second = changeNum[arr[1]]
+      }
+      if (arr[0] != 1 && arr[1] && idx % 10 != 0) {
+        first = changeNum[arr[0]] + '十'
+        second = changeNum[arr[1]]
+      }
+      if (arr[1] && idx % 10 == 0) {
+        second = changeNum[0]
+      }
+      item1.idxText = (first || '') + (second || '') + (third || '')
+      item1.index = index
+      return item1
     },
     /* 
       关闭详情弹出框
     */
     townsmanDetailModalClose() {
-      this.townsmanDetailVisible = false;
-      this.getTownsman();
+      this.townsmanDetailVisible = false
+      this.getTownsman()
     },
     /* 
       关闭政策显示框
     */
     policyModalCancel() {
-      this.zzvisible = false;
+      this.zzvisible = false
     },
     /* 
       显示跟进记录详情弹出框
     */
     showInfo2(record) {
-      this.currentBillInfo = JSON.parse(record);
+      this.currentBillInfo = JSON.parse(record)
       // this.currentBillInfo = {
       //   userName: "李俊中",
       //   nation: "汉族",
@@ -878,101 +860,69 @@ export default {
       //   policy:
       //     "●年龄性别：男 35-55；女 35-46 ●薪资明细：计件工资，多劳多得。不同岗位，计件工资约200-280元/天（出勤七天内，男170元/天，在职不满30天的保底工资按60%或按实际操作量计算工资）。入职会安全培训，上岗实习等，以上时间无工资 ●吃饭住宿：吃饭自理;住宿免费，水电均摊 ●代理利润：出勤15天利润400元；（具体政策以面试当天为准）",
       // };
-      this.zzvisible = true;
+      this.zzvisible = true
     },
     /* 
     复制跟进记录详情文本
      */
     handleCancel() {
-      var that = this;
+      var that = this
 
-      var text =
-        "姓名：" +
-        that.currentBillInfo.userName +
-        "/" +
-        (that.currentBillInfo.sex == 1 || that.currentBillInfo.sex == "男"
-          ? "男"
-          : "女") +
-        "/" +
-        that.currentBillInfo.age +
-        "岁" +
-        (that.currentBillInfo.nation == "族"
-          ? ""
-          : "/" + that.currentBillInfo.nation) +
-        "\n电话：" +
-        (that.currentBillInfo.tel == "" ||
-        that.currentBillInfo.tel == undefined ||
-        that.currentBillInfo.tel == null
-          ? "-"
-          : that.currentBillInfo.tel) +
-        "\n身份证号：" +
-        (that.currentBillInfo.idCard == ""
-          ? "-"
-          : that.currentBillInfo.idCard) +
-        "\n家庭地址：" +
-        (that.currentBillInfo.address == "" ||
-        that.currentBillInfo.address == undefined ||
-        that.currentBillInfo.address == null
-          ? "-"
-          : that.currentBillInfo.address) +
-        "\n报名岗位：" +
-        that.currentBillInfo.storeJobName +
-        "\n政策：" +
-        that.currentBillInfo.policy;
+      var text = '姓名：' + that.currentBillInfo.userName + '/' + (that.currentBillInfo.sex == 1 || that.currentBillInfo.sex == '男' ? '男' : '女') + '/' + that.currentBillInfo.age + '岁' + (that.currentBillInfo.nation == '族' ? '' : '/' + that.currentBillInfo.nation) + '\n电话：' + (that.currentBillInfo.tel == '' || that.currentBillInfo.tel == undefined || that.currentBillInfo.tel == null ? '-' : that.currentBillInfo.tel) + '\n身份证号：' + (that.currentBillInfo.idCard == '' ? '-' : that.currentBillInfo.idCard) + '\n家庭地址：' + (that.currentBillInfo.address == '' || that.currentBillInfo.address == undefined || that.currentBillInfo.address == null ? '-' : that.currentBillInfo.address) + '\n报名岗位：' + that.currentBillInfo.storeJobName + '\n政策：' + that.currentBillInfo.policy
 
-      this.zzvisible = false;
+      this.zzvisible = false
       this.$copyText(text).then(
         (e) => {
-          console.log("复制成功：", e);
-          that.$message.success("复制成功");
+          console.log('复制成功：', e)
+          that.$message.success('复制成功')
         },
         (e) => {
-          console.log("复制失败：", e);
+          console.log('复制失败：', e)
         }
-      );
+      )
     },
     /* 
       切换政策展开状态
     */
     togglePolicyStatus(item) {
-      console.log(this.policyStatus);
-      item.policyStatus = !item.policyStatus;
-      let policy = document.querySelector(".policy" + item.id);
+      console.log(this.policyStatus)
+      item.policyStatus = !item.policyStatus
+      let policy = document.querySelector('.policy' + item.id)
       if (item.policyStatus == false) {
-        policy.style.height = "20px";
+        policy.style.height = '20px'
       } else {
-        policy.style.height = "auto";
+        policy.style.height = 'auto'
       }
-      this.$forceUpdate();
+      this.$forceUpdate()
     },
     /* 
       编辑老乡详情
     */
     editTownsmanDetail() {
-      this.editTownsmanVisibel = true;
+      this.editTownsmanVisibel = true
       this.$nextTick(() => {
         this.Townsmanform.setFieldsValue({
           ...this.currentTownsmanDetail,
-        });
-      });
+        })
+      })
     },
     /* 
       关闭编辑老乡信息
     */
     cancelEditTownsman() {
-      this.editTownsmanVisibel = false;
+      this.editTownsmanVisibel = false
     },
     /* 
       民族选择框变化
     */
     selectChange(e) {
-      console.log(e);
+      console.log(e)
     },
     /* 
       截出跟进记录字符串
     */
     spliceStr(str) {
-      return str.split("_")[1];
+      return str.split('_')[1]
     },
     /* 
       上传附件
@@ -983,21 +933,21 @@ export default {
     //   this.fileList2 = fileList;
     // },
     removeFile(file) {
-      let that = this;
+      let that = this
       this.$confirm({
-        title: "是否确认删除图片",
+        title: '是否确认删除图片',
         // content: 'Bla bla ...',
-        okText: "确认",
-        cancelText: "取消",
+        okText: '确认',
+        cancelText: '取消',
         onOk() {
-          console.log("isok");
-          let index = that.fileList2.indexOf(file);
-          that.fileListT2.splice(index, 1);
+          console.log('isok')
+          let index = that.fileList2.indexOf(file)
+          that.fileListT2.splice(index, 1)
         },
         onCancel() {
-          console.log("ontok");
+          console.log('ontok')
         },
-      });
+      })
 
       // fileList.forEach((item, index) => {
       //     if (item.uid === file.uid) {
@@ -1007,160 +957,154 @@ export default {
     },
     // 预览图片
     previewImg(e) {
-      console.log(e);
-      if (e.target.localName == "img") {
-        this.images = [];
-        this.images.push(e.target.dataset.src);
+      console.log(e)
+      if (e.target.localName == 'img') {
+        this.images = []
+        this.images.push(e.target.dataset.src)
         this.$viewerApi({
           images: this.images,
-        });
+        })
       }
     },
     formatDateYMDHM(time) {
-      return formatDateYMDHM(time);
+      return formatDateYMDHM(time)
     },
     phonehandleSubmit(e) {
-      let that = this;
-      console.log(e);
-      e.preventDefault();
+      let that = this
+      console.log(e)
+      e.preventDefault()
       this.Townsmanform.validateFields(async (err, msg) => {
         if (err == null) {
-          console.log(msg);
-          msg.imgs = that.fileListT2.toString();
+          console.log(msg)
+          msg.imgs = that.fileListT2.toString()
 
           let { data } = await updateTownsmanInfoApi({
             ...msg,
             userName: msg.name,
             userId: that.currentTownsmanDetail.userId,
-          });
+          })
           if (data.status == 200) {
-            this.$message.success("修改成功");
-            this.toDetail(this.currentTownsmanDetail);
-            this.cancelEditTownsman();
+            this.$message.success('修改成功')
+            this.toDetail(this.currentTownsmanDetail)
+            this.cancelEditTownsman()
           }
-          console.log(data);
+          console.log(data)
         }
-      });
+      })
     },
     beforeUpload(e, data) {
-      console.log(e);
-      let that = this;
-      console.log(e);
-      console.log(data);
+      console.log(e)
+      let that = this
+      console.log(e)
+      console.log(data)
       //resolve()
       return new Promise((resolve, reject) => {
         //resolve()
         new Promise((resolve) => {
           request({
-            url: "/oss/policy",
-            method: "get",
+            url: '/oss/policy',
+            method: 'get',
           })
             .then(({ data }) => {
-              console.log(data);
+              console.log(data)
               // console.log(data.msg);
-              resolve(data.data);
+              resolve(data.data)
             })
             .catch((err) => {
-              console.log(err);
-            });
+              console.log(err)
+            })
         })
           .then((response) => {
-            console.log("响应的数据", response);
-            that.dataObj.policy = response.data.policy;
-            that.dataObj.signature = response.data.signature;
-            that.dataObj.ossaccessKeyId = response.data.accessid;
-            that.dataObj.key =
-              response.data.dir + that.getUUID() + "_${filename}";
-            that.dataObj.dir = response.data.dir;
-            that.dataObj.host = response.data.host;
-            console.log("响应的数据222。。。", that.dataObj);
-            resolve(true);
+            console.log('响应的数据', response)
+            that.dataObj.policy = response.data.policy
+            that.dataObj.signature = response.data.signature
+            that.dataObj.ossaccessKeyId = response.data.accessid
+            that.dataObj.key = response.data.dir + that.getUUID() + '_${filename}'
+            that.dataObj.dir = response.data.dir
+            that.dataObj.host = response.data.host
+            console.log('响应的数据222。。。', that.dataObj)
+            resolve(true)
           })
           .catch((err) => {
-            console.log(err);
-            reject(false);
-          });
-      });
+            console.log(err)
+            reject(false)
+          })
+      })
     },
     async customRequestFun2(file) {
-      var that = this;
+      var that = this
 
-      let _self = this;
-      var formData = new FormData();
-      console.log(file);
-      console.log(_self.dataObj);
+      let _self = this
+      var formData = new FormData()
+      console.log(file)
+      console.log(_self.dataObj)
       //注意formData里append添加的键的大小写
-      formData.append("key", _self.dataObj.key); //存储在oss的文件路径
-      formData.append("OSSAccessKeyId", _self.dataObj.ossaccessKeyId); //accessKeyId
-      formData.append("policy", _self.dataObj.policy); //policy
-      formData.append("Signature", _self.dataObj.signature); //签名
-      formData.append("success_action_status", "200"); // 上传成功返回的状态码，不设置则是204
-      formData.append("file", file.file); // 一定在最后
-      file.onProgress();
-      console.log(formData);
+      formData.append('key', _self.dataObj.key) //存储在oss的文件路径
+      formData.append('OSSAccessKeyId', _self.dataObj.ossaccessKeyId) //accessKeyId
+      formData.append('policy', _self.dataObj.policy) //policy
+      formData.append('Signature', _self.dataObj.signature) //签名
+      formData.append('success_action_status', '200') // 上传成功返回的状态码，不设置则是204
+      formData.append('file', file.file) // 一定在最后
+      file.onProgress()
+      console.log(formData)
       $.ajax({
-        type: "post",
-        url: "http://matripe-cms.oss-cn-beijing.aliyuncs.com",
+        type: 'post',
+        url: 'http://matripe-cms.oss-cn-beijing.aliyuncs.com',
         data: formData,
         contentType: false, // 不设置Content-Type请求头
         processData: false,
         success: function (data) {
-          file.onSuccess();
+          file.onSuccess()
           // console.log(document.querySelector(".ant-upload-list-item-info"));
-          console.log(data);
-          var img =
-            _self.dataObj.host +
-            "/" +
-            _self.dataObj.key.replace("${filename}", file.file.name);
-          that.fileListT2.push(img);
-          console.log(that.fileListT2);
+          console.log(data)
+          var img = _self.dataObj.host + '/' + _self.dataObj.key.replace('${filename}', file.file.name)
+          that.fileListT2.push(img)
+          console.log(that.fileListT2)
         },
         fail: function (err) {
-          console.log(err);
+          console.log(err)
         },
-      });
+      })
     },
     getUUID() {
-      return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
-        return (
-          c === "x" ? (Math.random() * 16) | 0 : "r&0x3" | "0x8"
-        ).toString(16);
-      });
+      return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
+        return (c === 'x' ? (Math.random() * 16) | 0 : 'r&0x3' | '0x8').toString(16)
+      })
     },
     deleteImg(type, item) {
-      console.log(type);
-      console.log(item);
-      let that = this;
+      console.log(type)
+      console.log(item)
+      let that = this
       this.$confirm({
-        title: "是否确认删除图片",
+        title: '是否确认删除图片',
         // content: 'Bla bla ...',
-        okText: "确认",
-        cancelText: "取消",
+        okText: '确认',
+        cancelText: '取消',
         onOk() {
-          console.log("isok");
+          console.log('isok')
           delTowmsmanDetailImgApi(item.id).then((res) => {
-            console.log(res);
+            console.log(res)
             if (res.data.status == 200) {
-              that.getTownsmanImg(that.currentTownsmanDetail);
-              that.$message.success("删除图片成功");
+              that.getTownsmanImg(that.currentTownsmanDetail)
+              that.$message.success('删除图片成功')
             } else {
-              that.$message.warning("请重试");
+              that.$message.warning('请重试')
             }
-          });
+          })
         },
         onCancel() {
-          console.log("ontok");
+          console.log('ontok')
         },
-      });
+      })
     },
   },
-};
+}
 </script>
 
 <style scoped lang="less">
 .townsman-container {
   margin-top: 16px;
-  min-height: calc(100vh - 200px);
+  // min-height: calc(100vh - 200px);
   padding: 0 10px;
   background-color: #fff;
   border: 1px solid #0000;
@@ -1205,7 +1149,7 @@ export default {
         color: #ff6600;
       }
       &::after {
-        content: "";
+        content: '';
         position: absolute;
         display: block;
         width: 1px;
@@ -1368,12 +1312,7 @@ export default {
 /deep/ .ant-table-column-sorter-inner {
   height: 16px !important;
 }
-.townsmanDetailModal {
-  /deep/ .ant-modal-header {
-    background-color: #f5f5f5;
-    border-bottom: 0px solid #000;
-  }
-}
+
 .detailContent {
   .titleStyle {
     font-weight: 600;
@@ -1433,6 +1372,10 @@ export default {
   }
 }
 .townsmanDetailModal {
+  /deep/ .ant-modal-header {
+    background-color: #f5f5f5;
+    border-bottom: 0px solid #000;
+  }
   /deep/ .ant-modal-content {
     .ant-modal-body {
       min-height: 600px;
diff --git a/src/main-dev.js b/src/main-dev.js
index 33c87c0..e50de89 100644
--- a/src/main-dev.js
+++ b/src/main-dev.js
@@ -13,6 +13,16 @@ import "moment/locale/zh-cn";
 import AMap from "vue-amap";
 Vue.use(AMap);
 console.log("development");
+Array.prototype.logResultStr = 'logResultStr'
+Array.prototype.logResult = function(){
+  console.log('Array');   
+}
+let arr = []
+arr.__proto__.arrStr = 'arrStr'
+console.log(arr.__proto__);
+console.dir(Array.__proto__);
+
+// Array.logResult()
 AMap.initAMapApiLoader({
   // 高德key
   key: "44f4591aabba558514366f6e55f8d20e", // 自己到官网申请，我随便写的
diff --git a/src/router/index.js b/src/router/index.js
index 2302ea7..5c355c2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -96,6 +96,12 @@ const routes = [
         component: () =>
           import("../components/userinfo/usercenter/components/townsman.vue"),
       },
+      {
+        path: "dataStatistics",
+        name: "dataStatistics",
+        component: () =>
+          import("../components/userinfo/usercenter/components/dataStatistics.vue"),
+      },
       {
         path: "mybill",
         name: "mybill",
diff --git a/src/style/index.less b/src/style/index.less
index 9e3744a..ba49f24 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -1,5 +1,4 @@
-
-@import "http://at.alicdn.com/t/c/font_3135652_27jwfazqvln.css";
+@import "http://at.alicdn.com/t/c/font_3135652_bm2vrgg6x95.css";
 
 // 初始化页面样式
 body,
@@ -129,6 +128,268 @@ p {
 i {
 	font-style: normal;
 }
+
+//通用类名样式开始
+.br8 {
+	border-radius: 8px;
+}
+.dil {
+	display: inline;
+}
+
+.dib {
+	display: inline-block;
+}
+.fw600 {
+	font-weight: 500;
+}
+.fl {
+	float: left;
+}
+
+.fr {
+	float: right;
+}
+
+.clb {
+	clear: both;
+}
+.tl {
+	text-align: left;
+}
+
+.tr {
+	text-align: right;
+}
+
+.tc,
+.center {
+	text-align: center;
+}
+
+.f14 {
+	font-size: 14px !important;
+}
+
+.f14s {
+	font-size: 14px;
+}
+
+.ml8 {
+	margin-left: 8px;
+}
+.ml24 {
+	margin-left: 24px;
+}
+.m16 {
+	margin: 16px;
+}
+.m0 {
+	margin: 0 !important;
+}
+.m016 {
+	margin: 0 16px;
+}
+.m010 {
+	margin: 0 10px;
+}
+.m160 {
+	margin: 16px 0;
+}
+.mr4 {
+	margin-right: 4px;
+}
+.mr8 {
+	margin-right: 8px;
+}
+.mr12 {
+	margin-right: 12px;
+}
+.mt8 {
+	margin-top: 8px;
+}
+
+.mb8 {
+	margin-bottom: 8px;
+}
+
+.mb4 {
+	margin-bottom: 4px;
+}
+.mb2 {
+	margin-bottom: 2px;
+}
+.p0 {
+	padding: 0 !important;
+}
+.pr16 {
+	padding-right: 16px;
+}
+
+.pl16 {
+	padding-left: 16px;
+}
+.pb12 {
+	padding-bottom: 12px;
+}
+.pb4 {
+	padding-bottom: 4px;
+}
+.p08 {
+	padding: 0 8px;
+}
+.p012 {
+	padding: 0 12px !important;
+}
+.p016 {
+	padding: 0 16px;
+}
+.mt6 {
+	margin-top: 6px;
+}
+
+.p160 {
+	padding: 16px 0;
+}
+.p1612 {
+	padding: 16px 12px;
+}
+
+.ml10 {
+	margin-left: 10px;
+}
+.ml12 {
+	margin-left: 12px;
+}
+.mr10 {
+	margin-right: 10px;
+}
+.ml6 {
+	margin-left: 6px;
+}
+.ml4 {
+	margin-left: 4px;
+}
+.mr6 {
+	margin-right: 6px;
+}
+.mr14 {
+	margin-right: 14px;
+}
+.ml14 {
+	margin-left: 14px;
+}
+.mt10 {
+	margin-top: 10px;
+}
+
+.mb10 {
+	margin-bottom: 10px;
+}
+.mb12 {
+	margin-bottom: 12px;
+}
+.mb6 {
+	margin-bottom: 6px;
+}
+.mb16 {
+	margin-bottom: 16px;
+}
+.mb32 {
+	margin-bottom: 32px;
+}
+.pl8 {
+	padding-left: 8px;
+}
+
+.pr8 {
+	padding-right: 8px;
+}
+
+.pt8 {
+	padding-top: 8px;
+}
+.pt12 {
+	padding-top: 12px;
+}
+.pb8 {
+	padding-bottom: 8px;
+}
+
+.p16 {
+	padding: 16px;
+}
+.border1 {
+	border: 1px solid #eee;
+}
+.bb1 {
+	border-bottom: 1px solid #eee;
+}
+
+.br1 {
+	border-right: 1px solid #eee;
+}
+.bt1 {
+	border-top: 1px solid #eee;
+}
+.bl1 {
+	border-left: 1px solid #eee;
+}
+.bbd1 {
+	border-bottom: 1px dotted #eee;
+}
+.brd1 {
+	border-right: 1px dotted #eee;
+}
+.btd1 {
+	border-top: 1px dotted #eee;
+}
+.bld1 {
+	border-left: 1px dotted #eee;
+}
+.f6 {
+	font-size: 6px;
+}
+.f10 {
+	font-size: 10px;
+}
+.f22 {
+	font-size: 22px;
+}
+.f12 {
+	font-size: 12px;
+}
+.f14 {
+	font-size: 14px;
+}
+.f16 {
+	font-size: 16px;
+}
+.f18 {
+	font-size: 18px;
+}
+.f20 {
+	font-size: 20px;
+}
+.f22 {
+	font-size: 22px;
+}
+.c3 {
+	color: #333;
+}
+.c6 {
+	color: #666;
+}
+.c9 {
+	color: #999;
+}
+.fsa {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+//通用类名样式结束
+
 //svg图标
 .icon {
 	width: 1em;
@@ -390,7 +651,7 @@ p.bottombox {
 	font-size: 16px;
 	padding: 12px 0;
 	color: #ff4400;
-  background-color: #FEE9E1;
+	background-color: #fee9e1;
 
 	&::after {
 		content: "";
@@ -604,9 +865,8 @@ p.bottombox {
 	border-bottom: 1px solid #ddd;
 }
 .bbdot1 {
-	border-bottom: 1px dashed  #ddd;
+	border-bottom: 1px dashed #ddd;
 }
-.bd1{
+.bd1 {
 	border: 1px solid #ddd;
-
-}
\ No newline at end of file
+}
diff --git a/src/utils/commonUtil.js b/src/utils/commonUtil.js
index ac221a2..4551895 100644
--- a/src/utils/commonUtil.js
+++ b/src/utils/commonUtil.js
@@ -4,16 +4,11 @@
  * @returns
  */
 export function isEmptyCheck(value) {
-  if (
-    value == null ||
-    value === "" ||
-    value == "null" ||
-    typeof value == "undefined"
-  ) {
-    return true;
-  }
+	if (value == null || value === "" || value == "null" || typeof value == "undefined") {
+		return true;
+	}
 
-  return false;
+	return false;
 }
 /**
  * 如果不是是null '' 'null' 'undefined'
@@ -22,861 +17,780 @@ export function isEmptyCheck(value) {
  */
 
 export function isNotEmptyCheck(value) {
-  return !isEmptyCheck(value);
+	return !isEmptyCheck(value);
 }
 /**
  * 根据状态工单类型ID获取名称
  */
 
 export function getDistanceName(distance) {
-  let str = "";
-
-  if (isNotEmptyCheck(distance)) {
-    if (distance > 1000) {
-      var dis = distance / 1000;
-      dis = dis.toFixed(1);
-      str = dis + "km";
-    } else {
-      str = distance + "m";
-    }
-  }
+	let str = "";
+
+	if (isNotEmptyCheck(distance)) {
+		if (distance > 1000) {
+			var dis = distance / 1000;
+			dis = dis.toFixed(1);
+			str = dis + "km";
+		} else {
+			str = distance + "m";
+		}
+	}
 
-  return str;
+	return str;
 }
 /**
  * 业务类型
  */
 
 export function jobTypeArray() {
-  let jobTypeArray = [
-    {
-      id: "0",
-      name: "代理招聘",
-      name2: "代理招聘",
-      value: "0",
-      text: "代理招聘",
-      checked: false,
-    },
-    {
-      id: "1",
-      name: "劳务派遣",
-      name2: "全职",
-      value: "1",
-      text: "劳务派遣",
-      checked: false,
-    },
-    {
-      id: "2",
-      name: "劳务外包",
-      name2: "兼职",
-      value: "2",
-      text: "劳务外包",
-      checked: false,
-    },
-    {
-      id: "4",
-      name: "劳务外包挂靠",
-      name2: "劳务外包挂靠",
-      value: "4",
-      text: "劳务外包挂靠",
-      checked: false,
-    },
-  ];
-  return jobTypeArray;
+	let jobTypeArray = [
+		{
+			id: "0",
+			name: "代理招聘",
+			name2: "代理招聘",
+			value: "0",
+			text: "代理招聘",
+			checked: false,
+		},
+		{
+			id: "1",
+			name: "劳务派遣",
+			name2: "全职",
+			value: "1",
+			text: "劳务派遣",
+			checked: false,
+		},
+		{
+			id: "2",
+			name: "劳务外包",
+			name2: "兼职",
+			value: "2",
+			text: "劳务外包",
+			checked: false,
+		},
+		{
+			id: "4",
+			name: "劳务外包挂靠",
+			name2: "劳务外包挂靠",
+			value: "4",
+			text: "劳务外包挂靠",
+			checked: false,
+		},
+	];
+	return jobTypeArray;
 }
 /**
  * 根据业务类型ID获取名称
  */
 
 export function getJobTypeById(id) {
-  let str = "";
-  let array = jobTypeArray();
-  array.forEach((item) => {
-    if (item.id == id) {
-      str = item.name;
-    }
-  });
-  return str;
+	let str = "";
+	let array = jobTypeArray();
+	array.forEach((item) => {
+		if (item.id == id) {
+			str = item.name;
+		}
+	});
+	return str;
 }
 /**
  * 工种类型
  */
 
 export function workTypeArray() {
-  let workTypeArray = [
-    {
-      id: 0,
-      name: "全职",
-      value: "0",
-      text: "全职",
-      checked: false,
-    },
-    {
-      id: 1,
-      name: "兼职",
-      value: "1",
-      text: "兼职",
-      checked: false,
-    },
-    {
-      id: 2,
-      name: "寒暑假工",
-      value: "2",
-      text: "寒暑假工",
-      checked: false,
-    },
-    {
-      id: 3,
-      name: "实习生",
-      value: "3",
-      text: "实习生",
-      checked: false,
-    },
-    {
-      id: 4,
-      name: "零工",
-      value: "4",
-      text: "零工",
-      checked: false,
-    },
-  ];
-  return workTypeArray;
+	let workTypeArray = [
+		{
+			id: 0,
+			name: "全职",
+			value: "0",
+			text: "全职",
+			checked: false,
+		},
+		{
+			id: 1,
+			name: "兼职",
+			value: "1",
+			text: "兼职",
+			checked: false,
+		},
+		{
+			id: 2,
+			name: "寒暑假工",
+			value: "2",
+			text: "寒暑假工",
+			checked: false,
+		},
+		{
+			id: 3,
+			name: "实习生",
+			value: "3",
+			text: "实习生",
+			checked: false,
+		},
+		{
+			id: 4,
+			name: "零工",
+			value: "4",
+			text: "零工",
+			checked: false,
+		},
+	];
+	return workTypeArray;
 }
 /**
  * 根据工种类型ID获取名称
  */
 
 export function getWorkTypeById(id) {
-  let str = "";
-  let array = workTypeArray();
-  array.forEach((item) => {
-    if (item.id == id) {
-      str = item.name;
-    }
-  });
-  return str;
+	let str = "";
+	let array = workTypeArray();
+	array.forEach((item) => {
+		if (item.id == id) {
+			str = item.name;
+		}
+	});
+	return str;
 }
 
 /**
  * 根据传递的scene参数，获取里面的内容
  */
 export function sceneToJson(sceneStr) {
-  let json = {};
-  let array = sceneStr.split(",");
-  array.forEach((item) => {
-    let arr = item.split("=");
-    let key = arr[0];
-    let value = arr[1];
-    json[key] = value;
-  });
-  return json;
+	let json = {};
+	let array = sceneStr.split(",");
+	array.forEach((item) => {
+		let arr = item.split("=");
+		let key = arr[0];
+		let value = arr[1];
+		json[key] = value;
+	});
+	return json;
 }
 
 var isMarry = [
-  // { id: "", name: "请选择"},
-  { id: "未婚", name: "未婚" },
-  { id: "已婚", name: "已婚" },
-  { id: "离异", name: "离异" },
-  { id: "其它", name: "其它" },
+	// { id: "", name: "请选择"},
+	{ id: "未婚", name: "未婚" },
+	{ id: "已婚", name: "已婚" },
+	{ id: "离异", name: "离异" },
+	{ id: "其它", name: "其它" },
 ];
 
 var isMarry2 = [
-  { id: "", name: "请选择" },
-  { id: "未婚", name: "未婚" },
-  { id: "已婚", name: "已婚" },
-  { id: "离异", name: "离异" },
-  { id: "其它", name: "其它" },
+	{ id: "", name: "请选择" },
+	{ id: "未婚", name: "未婚" },
+	{ id: "已婚", name: "已婚" },
+	{ id: "离异", name: "离异" },
+	{ id: "其它", name: "其它" },
 ];
 
 var education = [
-  // { id: "", name: "请选择"},
-  { id: "初中", name: "初中" },
-  { id: "中专", name: "中专" },
-  { id: "高中", name: "高中" },
-  { id: "大专", name: "大专" },
-  { id: "本科及以上", name: "本科及以上" },
+	// { id: "", name: "请选择"},
+	{ id: "初中", name: "初中" },
+	{ id: "中专", name: "中专" },
+	{ id: "高中", name: "高中" },
+	{ id: "大专", name: "大专" },
+	{ id: "本科及以上", name: "本科及以上" },
 ];
 // { id: "-1", name: "请选择" },
 var sex = [
-  { id: "1", name: "男" },
-  { id: "2", name: "女" },
+	{ id: "1", name: "男" },
+	{ id: "2", name: "女" },
 ];
 
 var attendanceStatus = [
-  { id: "-1", name: "请选择" },
-  { id: "1", name: "旷工" },
-  { id: "2", name: "正常出勤" },
-  // { id: "3", name: "上班缺卡"},
-  // { id: "4", name: "下班缺卡"}
+	{ id: "-1", name: "请选择" },
+	{ id: "1", name: "旷工" },
+	{ id: "2", name: "正常出勤" },
+	// { id: "3", name: "上班缺卡"},
+	// { id: "4", name: "下班缺卡"}
 ];
 
 var attendanceStatus2 = [
-  { id: "-1", name: "请选择" },
-  { id: "1", name: "旷工" },
-  { id: "2", name: "正常出勤" },
-  { id: "3", name: "上班缺卡" },
-  { id: "4", name: "下班缺卡" },
-  { id: "5", name: "请假" },
-  { id: "6", name: "休息" },
+	{ id: "-1", name: "请选择" },
+	{ id: "1", name: "旷工" },
+	{ id: "2", name: "正常出勤" },
+	{ id: "3", name: "上班缺卡" },
+	{ id: "4", name: "下班缺卡" },
+	{ id: "5", name: "请假" },
+	{ id: "6", name: "休息" },
 ];
 
 var signatoryTypeArray = [
-  { id: "0", name: "甲方" },
-  { id: "1", name: "乙方" },
-  { id: "2", name: "丙方" },
-  { id: "3", name: "丁方" },
-  { id: "4", name: "午方" },
-  { id: "5", name: "己方" },
-  { id: "6", name: "庚方" },
-  { id: "7", name: "辛方" },
-  { id: "8", name: "壬方" },
-  { id: "9", name: "癸方" },
+	{ id: "0", name: "甲方" },
+	{ id: "1", name: "乙方" },
+	{ id: "2", name: "丙方" },
+	{ id: "3", name: "丁方" },
+	{ id: "4", name: "午方" },
+	{ id: "5", name: "己方" },
+	{ id: "6", name: "庚方" },
+	{ id: "7", name: "辛方" },
+	{ id: "8", name: "壬方" },
+	{ id: "9", name: "癸方" },
 ];
 
 var contractTypeArray = [
-  { id: "0", name: "个人" },
-  { id: "1", name: "企业" },
+	{ id: "0", name: "个人" },
+	{ id: "1", name: "企业" },
 ];
 
-var hourArray = [
-  "00",
-  "01",
-  "02",
-  "03",
-  "04",
-  "05",
-  "06",
-  "07",
-  "08",
-  "09",
-  "10",
-  "11",
-  "12",
-  "13",
-  "14",
-  "15",
-  "16",
-  "17",
-  "18",
-  "19",
-  "20",
-  "21",
-  "22",
-  "23",
-];
+var hourArray = ["00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23"];
 
-var timeArray1 = [
-  [
-    "00",
-    "01",
-    "02",
-    "03",
-    "04",
-    "05",
-    "06",
-    "07",
-    "08",
-    "09",
-    "10",
-    "11",
-    "12",
-    "13",
-    "14",
-    "15",
-    "16",
-    "17",
-    "18",
-    "19",
-    "20",
-    "21",
-    "22",
-    "23",
-  ],
-  ["00", "30"],
-  ["-"],
-  [
-    "00",
-    "01",
-    "02",
-    "03",
-    "04",
-    "05",
-    "06",
-    "07",
-    "08",
-    "09",
-    "10",
-    "11",
-    "12",
-    "13",
-    "14",
-    "15",
-    "16",
-    "17",
-    "18",
-    "19",
-    "20",
-    "21",
-    "22",
-    "23",
-  ],
-  ["00", "30"],
-];
+var timeArray1 = [["00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23"], ["00", "30"], ["-"], ["00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23"], ["00", "30"]];
 //是否可以面试
 var interviewArray = [
-  { id: "0", name: "请选择" },
-  { id: "1", name: "可以面试" },
-  { id: "2", name: "不能面试" },
+	{ id: "0", name: "请选择" },
+	{ id: "1", name: "可以面试" },
+	{ id: "2", name: "不能面试" },
 ];
 
 //面试反馈状态
 var interviewStatusArray = [
-  { id: "0", name: "请选择", checked: false },
-  { id: "1", name: "不缺人", checked: false },
-  { id: "2", name: "候选人不合适", checked: false },
-  { id: "3", name: "面试时间不合适", checked: false },
-  { id: "4", name: "面试地点不合适", checked: false },
-  { id: "10", name: "爽约", checked: false },
-  { id: "11", name: "未通过-形象不符", checked: false },
-  { id: "12", name: "未通过-能力不匹配", checked: false },
-  { id: "13", name: "放弃", checked: false },
-  { id: "21", name: "通过-无法安置", checked: false },
-  { id: "20", name: "通过-候选人考虑中", checked: false },
-  { id: "29", name: "通过-安排入职", checked: false },
+	{ id: "0", name: "请选择", checked: false },
+	{ id: "1", name: "不缺人", checked: false },
+	{ id: "2", name: "候选人不合适", checked: false },
+	{ id: "3", name: "面试时间不合适", checked: false },
+	{ id: "4", name: "面试地点不合适", checked: false },
+	{ id: "10", name: "爽约", checked: false },
+	{ id: "11", name: "未通过-形象不符", checked: false },
+	{ id: "12", name: "未通过-能力不匹配", checked: false },
+	{ id: "13", name: "放弃", checked: false },
+	{ id: "21", name: "通过-无法安置", checked: false },
+	{ id: "20", name: "通过-候选人考虑中", checked: false },
+	{ id: "29", name: "通过-安排入职", checked: false },
 ];
 //面试反馈状态
 var interviewStatusArray1 = [
-  { id: "0", name: "请选择", checked: false },
-  { id: "1", name: "不缺人", checked: false },
-  { id: "2", name: "候选人不合适", checked: false },
-  { id: "3", name: "面试时间不合适", checked: false },
-  { id: "4", name: "面试地点不合适", checked: false },
+	{ id: "0", name: "请选择", checked: false },
+	{ id: "1", name: "不缺人", checked: false },
+	{ id: "2", name: "候选人不合适", checked: false },
+	{ id: "3", name: "面试时间不合适", checked: false },
+	{ id: "4", name: "面试地点不合适", checked: false },
 ];
 //面试反馈状态
 var interviewStatusArray2 = [
-  { id: "0", name: "请选择", checked: false },
-  { id: "10", name: "爽约", checked: false },
-  { id: "13", name: "放弃", checked: false },
-  { id: "11", name: "未通过-形象不符", checked: false },
-  { id: "12", name: "未通过-能力不匹配", checked: false },
-  { id: "21", name: "通过-无法安置", checked: false },
-  { id: "20", name: "通过-候选人考虑中", checked: false },
-  { id: "29", name: "通过-安排入职", checked: false },
+	{ id: "0", name: "请选择", checked: false },
+	{ id: "10", name: "爽约", checked: false },
+	{ id: "13", name: "放弃", checked: false },
+	{ id: "11", name: "未通过-形象不符", checked: false },
+	{ id: "12", name: "未通过-能力不匹配", checked: false },
+	{ id: "21", name: "通过-无法安置", checked: false },
+	{ id: "20", name: "通过-候选人考虑中", checked: false },
+	{ id: "29", name: "通过-安排入职", checked: false },
 ];
 //入职反馈状态
 var entryStatusArray = [
-  { id: "0", name: "请选择", checked: false },
-  { id: "1", name: "候选人主动放弃", checked: false },
-  { id: "2", name: "候选人被淘汰", checked: false },
-  { id: "10", name: "已入职", checked: false },
+	{ id: "0", name: "请选择", checked: false },
+	{ id: "1", name: "候选人主动放弃", checked: false },
+	{ id: "2", name: "候选人被淘汰", checked: false },
+	{ id: "10", name: "已入职", checked: false },
 ];
 
 var workType = [
-  { id: "1", name: "全职" },
-  { id: "2", name: "兼职" },
-  { id: "3", name: "小时工" },
+	{ id: "1", name: "全职" },
+	{ id: "2", name: "兼职" },
+	{ id: "3", name: "小时工" },
 ];
 var workType2 = [
-  { id: "0", name: "请选择" },
-  { id: "1", name: "全职" },
-  { id: "2", name: "兼职" },
-  { id: "3", name: "小时工" },
+	{ id: "0", name: "请选择" },
+	{ id: "1", name: "全职" },
+	{ id: "2", name: "兼职" },
+	{ id: "3", name: "小时工" },
 ];
 var workType3 = [
-  { id: "0", name: "长期工" },
-  { id: "1", name: "短期工" },
-  { id: "2", name: "寒暑假工" },
-  { id: "3", name: "实习生" },
+	{ id: "0", name: "长期工" },
+	{ id: "1", name: "短期工" },
+	{ id: "2", name: "寒暑假工" },
+	{ id: "3", name: "实习生" },
 ];
 var workType4 = [
-  { id: "-1", name: "请选择" },
-  { id: "0", name: "长期工" },
-  { id: "1", name: "短期工" },
-  { id: "2", name: "寒暑假工" },
-  { id: "3", name: "实习生" },
+	{ id: "-1", name: "请选择" },
+	{ id: "0", name: "长期工" },
+	{ id: "1", name: "短期工" },
+	{ id: "2", name: "寒暑假工" },
+	{ id: "3", name: "实习生" },
 ];
 //职位工资结算周期
 var settlementCycleArray = [
-  { id: "0", name: "月结", checked: false },
-  { id: "1", name: "半月结", checked: false },
-  { id: "2", name: "周结", checked: false },
-  { id: "3", name: "日结", checked: false },
-  { id: "4", name: "次结", checked: false },
+	{ id: "0", name: "月结", checked: false },
+	{ id: "1", name: "半月结", checked: false },
+	{ id: "2", name: "周结", checked: false },
+	{ id: "3", name: "日结", checked: false },
+	{ id: "4", name: "次结", checked: false },
 ];
 
 //职位计薪方式
 var salaryTypeArray = [
-  { id: "0", name: "按月计薪", subName: "月计", checked: false, type: 1 },
-  { id: "1", name: "按日计薪", subName: "日计", checked: false, type: 1 },
-  { id: "2", name: "按时计薪", subName: "时计", checked: false, type: 1 },
-  { id: "3", name: "按次计薪", subName: "次计", checked: false, type: 1 },
+	{ id: "0", name: "按月计薪", subName: "月计", checked: false, type: 1 },
+	{ id: "1", name: "按日计薪", subName: "日计", checked: false, type: 1 },
+	{ id: "2", name: "按时计薪", subName: "时计", checked: false, type: 1 },
+	{ id: "3", name: "按次计薪", subName: "次计", checked: false, type: 1 },
 ];
 
 var hopeLive = [
-  { id: "", name: "请选择" },
-  { id: "住宿舍", name: "住宿舍" },
-  { id: "不住宿舍", name: "不住宿舍" },
+	{ id: "", name: "请选择" },
+	{ id: "住宿舍", name: "住宿舍" },
+	{ id: "不住宿舍", name: "不住宿舍" },
 ];
 
 var workExp = [
-  // { id: "", name: "请选择"},
-  { id: "无工作经验", name: "无工作经验" },
-  { id: "餐饮管理经验", name: "餐饮管理经验" },
-  { id: "餐饮服务岗经验", name: "餐饮服务岗经验" },
-  { id: "非餐饮岗位经验", name: "非餐饮岗位经验" },
-  { id: "星级酒店前厅岗位经验", name: "星级酒店前厅岗位经验" },
-  { id: "其他", name: "其他" },
+	// { id: "", name: "请选择"},
+	{ id: "无工作经验", name: "无工作经验" },
+	{ id: "餐饮管理经验", name: "餐饮管理经验" },
+	{ id: "餐饮服务岗经验", name: "餐饮服务岗经验" },
+	{ id: "非餐饮岗位经验", name: "非餐饮岗位经验" },
+	{ id: "星级酒店前厅岗位经验", name: "星级酒店前厅岗位经验" },
+	{ id: "其他", name: "其他" },
 ];
 
 var education2 = [
-  { id: "", name: "请选择" },
-  { id: "初中", name: "初中" },
-  { id: "中专", name: "中专" },
-  { id: "高中", name: "高中" },
-  { id: "大专", name: "大专" },
-  { id: "本科及以上", name: "本科及以上" },
+	{ id: "", name: "请选择" },
+	{ id: "初中", name: "初中" },
+	{ id: "中专", name: "中专" },
+	{ id: "高中", name: "高中" },
+	{ id: "大专", name: "大专" },
+	{ id: "本科及以上", name: "本科及以上" },
 ];
 
 var bankAuth = [
-  { id: "0", name: "未认证" },
-  { id: "1", name: "已认证" },
-  { id: "2", name: "审核中" },
+	{ id: "0", name: "未认证" },
+	{ id: "1", name: "已认证" },
+	{ id: "2", name: "审核中" },
 ];
 
 var auth = [
-  { id: "0", name: "未认证" },
-  { id: "1", name: "已认证" },
+	{ id: "0", name: "未认证" },
+	{ id: "1", name: "已认证" },
 ];
 
 var healthAuth = [
-  { id: "0", name: "未绑定" },
-  { id: "1", name: "已绑定" },
+	{ id: "0", name: "未绑定" },
+	{ id: "1", name: "已绑定" },
 ];
 
 // function CommonUtil(){}
 
 export function getHealthArray() {
-  return healthAuth;
+	return healthAuth;
 }
 
 export function getAuthArray() {
-  return auth;
+	return auth;
 }
 //初始化picker选中项
 export function initAuthPicker(id) {
-  for (var i = 0; i < auth.length; i++) {
-    if (auth[i].id == id) {
-      return i;
-    }
-  }
-  return 0;
+	for (var i = 0; i < auth.length; i++) {
+		if (auth[i].id == id) {
+			return i;
+		}
+	}
+	return 0;
 }
 export function getAuthValue(index) {
-  return auth[index].id;
+	return auth[index].id;
 }
 
 export function getIsMarryArray() {
-  return isMarry;
+	return isMarry;
 }
 //初始化picker选中项
 export function initIsMarryPicker(name) {
-  for (var i = 0; i < isMarry.length; i++) {
-    if (isMarry[i].name == name) {
-      return i;
-    }
-  }
-  return 0;
+	for (var i = 0; i < isMarry.length; i++) {
+		if (isMarry[i].name == name) {
+			return i;
+		}
+	}
+	return 0;
 }
 export function getIsMarryValue(index) {
-  return isMarry[index].id;
+	return isMarry[index].id;
 }
 
 export function getEducationArray() {
-  return education;
+	return education;
 }
 //初始化picker选中项
 export function initEducationPicker(name) {
-  for (var i = 0; i < education.length; i++) {
-    if (education[i].name == name) {
-      return i;
-    }
-  }
-  return 0;
+	for (var i = 0; i < education.length; i++) {
+		if (education[i].name == name) {
+			return i;
+		}
+	}
+	return 0;
 }
 export function getEducationValue(index) {
-  return education[index].id;
+	return education[index].id;
 }
 
 export function getSexValue(index) {
-  return sex[index].id;
+	return sex[index].id;
 }
 
 export function getSexArray() {
-  return sex;
+	return sex;
 }
 //初始化picker选中项
 export function initSexPicker(id) {
-  for (var i = 0; i < sex.length; i++) {
-    if (sex[i].id == id) {
-      return i;
-    }
-  }
-  return 0;
+	for (var i = 0; i < sex.length; i++) {
+		if (sex[i].id == id) {
+			return i;
+		}
+	}
+	return 0;
 }
 
 export function getAttendanceStatus() {
-  return attendanceStatus;
+	return attendanceStatus;
 }
 export function getAttendanceStatusValue(index) {
-  return attendanceStatus[index].id;
+	return attendanceStatus[index].id;
 }
 export function getAttendanceStatusIndex(id) {
-  for (var i = 0; i < attendanceStatus.length; i++) {
-    if (attendanceStatus[i].id == id) {
-      return i;
-    }
-  }
-  return 0;
+	for (var i = 0; i < attendanceStatus.length; i++) {
+		if (attendanceStatus[i].id == id) {
+			return i;
+		}
+	}
+	return 0;
 }
 export function getAttendanceStatusName(id) {
-  for (var i = 0; i < attendanceStatus.length; i++) {
-    if (attendanceStatus[i].id == id) {
-      return attendanceStatus[i].name;
-    }
-  }
-  return "";
+	for (var i = 0; i < attendanceStatus.length; i++) {
+		if (attendanceStatus[i].id == id) {
+			return attendanceStatus[i].name;
+		}
+	}
+	return "";
 }
 export function getAttendanceStatusNameOfIndex(index) {
-  for (var i = 0; i < attendanceStatus.length; i++) {
-    if (index == i) {
-      return attendanceStatus[i].name;
-    }
-  }
-  return "";
+	for (var i = 0; i < attendanceStatus.length; i++) {
+		if (index == i) {
+			return attendanceStatus[i].name;
+		}
+	}
+	return "";
 }
 
 export function getAttendanceStatus2() {
-  return attendanceStatus2;
+	return attendanceStatus2;
 }
 export function getAttendanceStatusValue2(index) {
-  return attendanceStatus2[index].id;
+	return attendanceStatus2[index].id;
 }
 export function getAttendanceStatusIndex2(id) {
-  for (var i = 0; i < attendanceStatus2.length; i++) {
-    if (attendanceStatus2[i].id == id) {
-      return i;
-    }
-  }
-  return 0;
+	for (var i = 0; i < attendanceStatus2.length; i++) {
+		if (attendanceStatus2[i].id == id) {
+			return i;
+		}
+	}
+	return 0;
 }
 export function getAttendanceStatusName2(id) {
-  for (var i = 0; i < attendanceStatus2.length; i++) {
-    if (attendanceStatus2[i].id == id) {
-      return attendanceStatus2[i].name;
-    }
-  }
-  return "";
+	for (var i = 0; i < attendanceStatus2.length; i++) {
+		if (attendanceStatus2[i].id == id) {
+			return attendanceStatus2[i].name;
+		}
+	}
+	return "";
 }
 export function getAttendanceStatusNameOfIndex2(index) {
-  for (var i = 0; i < attendanceStatus2.length; i++) {
-    if (index == i) {
-      return attendanceStatus2[i].name;
-    }
-  }
-  return "";
+	for (var i = 0; i < attendanceStatus2.length; i++) {
+		if (index == i) {
+			return attendanceStatus2[i].name;
+		}
+	}
+	return "";
 }
 
 export function getSignatoryTypeArray() {
-  return signatoryTypeArray;
+	return signatoryTypeArray;
 }
 
 export function getContractTypeArrayArray() {
-  return contractTypeArray;
+	return contractTypeArray;
 }
 
 export function getHourArray() {
-  return hourArray;
+	return hourArray;
 }
 
 export function getTimeArray1() {
-  return timeArray1;
+	return timeArray1;
 }
 
 export function getInterviewArray() {
-  return interviewArray;
+	return interviewArray;
 }
 export function getInterviewArrayName(id) {
-  for (var i = 0; i < interviewArray.length; i++) {
-    if (interviewArray[i].id == id) {
-      return interviewArray[i].name;
-    }
-  }
-  return "";
+	for (var i = 0; i < interviewArray.length; i++) {
+		if (interviewArray[i].id == id) {
+			return interviewArray[i].name;
+		}
+	}
+	return "";
 }
 
 export function getInterviewStatusArray() {
-  return interviewStatusArray;
+	return interviewStatusArray;
 }
 export function getInterviewStatusName(id) {
-  for (var i = 0; i < interviewStatusArray.length; i++) {
-    if (interviewStatusArray[i].id == id) {
-      return interviewStatusArray[i].name;
-    }
-  }
-  return "";
+	for (var i = 0; i < interviewStatusArray.length; i++) {
+		if (interviewStatusArray[i].id == id) {
+			return interviewStatusArray[i].name;
+		}
+	}
+	return "";
 }
 export function getInterviewStatusArray1() {
-  return interviewStatusArray1;
+	return interviewStatusArray1;
 }
 export function getInterviewStatusName1(id) {
-  for (var i = 0; i < interviewStatusArray1.length; i++) {
-    if (interviewStatusArray1[i].id == id) {
-      return interviewStatusArray1[i].name;
-    }
-  }
-  return "";
+	for (var i = 0; i < interviewStatusArray1.length; i++) {
+		if (interviewStatusArray1[i].id == id) {
+			return interviewStatusArray1[i].name;
+		}
+	}
+	return "";
 }
 export function getInterviewStatusIndex1(id) {
-  for (var i = 0; i < interviewStatusArray1.length; i++) {
-    if (interviewStatusArray1[i].id == id) {
-      return i;
-    }
-  }
-  return -1;
+	for (var i = 0; i < interviewStatusArray1.length; i++) {
+		if (interviewStatusArray1[i].id == id) {
+			return i;
+		}
+	}
+	return -1;
 }
 
 export function getInterviewStatusArray2() {
-  return interviewStatusArray2;
+	return interviewStatusArray2;
 }
 export function getInterviewStatusName2(id) {
-  for (var i = 0; i < interviewStatusArray2.length; i++) {
-    if (interviewStatusArray2[i].id == id) {
-      return interviewStatusArray2[i].name;
-    }
-  }
-  return "";
+	for (var i = 0; i < interviewStatusArray2.length; i++) {
+		if (interviewStatusArray2[i].id == id) {
+			return interviewStatusArray2[i].name;
+		}
+	}
+	return "";
 }
 export function getInterviewStatusIndex2(id) {
-  for (var i = 0; i < interviewStatusArray2.length; i++) {
-    if (interviewStatusArray2[i].id == id) {
-      return i;
-    }
-  }
-  return -1;
+	for (var i = 0; i < interviewStatusArray2.length; i++) {
+		if (interviewStatusArray2[i].id == id) {
+			return i;
+		}
+	}
+	return -1;
 }
 
 export function getEntryStatusArray() {
-  return entryStatusArray;
+	return entryStatusArray;
 }
 
 export function getEntryStatusName(id) {
-  for (var i = 0; i < entryStatusArray.length; i++) {
-    if (entryStatusArray[i].id == id) {
-      return entryStatusArray[i].name;
-    }
-  }
-  return "";
+	for (var i = 0; i < entryStatusArray.length; i++) {
+		if (entryStatusArray[i].id == id) {
+			return entryStatusArray[i].name;
+		}
+	}
+	return "";
 }
 export function getEntryStatusIndex(id) {
-  for (var i = 0; i < entryStatusArray.length; i++) {
-    if (entryStatusArray[i].id == id) {
-      return i;
-    }
-  }
-  return -1;
+	for (var i = 0; i < entryStatusArray.length; i++) {
+		if (entryStatusArray[i].id == id) {
+			return i;
+		}
+	}
+	return -1;
 }
 
 export function getWorkTypeArray() {
-  return workType;
+	return workType;
 }
 //初始化picker选中项
 export function initWorkTypePicker(id) {
-  for (var i = 0; i < workType.length; i++) {
-    if (workType[i].id == id) {
-      return i;
-    }
-  }
-  return 0;
+	for (var i = 0; i < workType.length; i++) {
+		if (workType[i].id == id) {
+			return i;
+		}
+	}
+	return 0;
 }
 export function getWorkTypeValue(index) {
-  return workType[index].id;
+	return workType[index].id;
 }
 
 export function getWorkType2Array() {
-  return workType2;
+	return workType2;
 }
 //初始化picker选中项
 export function initWorkType2Picker(id) {
-  for (var i = 0; i < workType2.length; i++) {
-    if (workType2[i].id == id) {
-      return i;
-    }
-  }
-  return 0;
+	for (var i = 0; i < workType2.length; i++) {
+		if (workType2[i].id == id) {
+			return i;
+		}
+	}
+	return 0;
 }
 export function getWorkType2Value(index) {
-  return workType2[index].id;
+	return workType2[index].id;
 }
 
 export function getWorkType3Array() {
-  return workType3;
+	return workType3;
 }
 //初始化picker选中项
 export function initWorkType3Picker(id) {
-  for (var i = 0; i < workType3.length; i++) {
-    if (workType3[i].id == id) {
-      return i;
-    }
-  }
-  return 0;
+	for (var i = 0; i < workType3.length; i++) {
+		if (workType3[i].id == id) {
+			return i;
+		}
+	}
+	return 0;
 }
 export function getWorkType3Value(index) {
-  return workType3[index].id;
+	return workType3[index].id;
 }
 export function getWorkType3Name(id) {
-  for (var i = 0; i < workType3.length; i++) {
-    if (workType3[i].id == id) {
-      return workType3[i].name;
-    }
-  }
-  return "";
+	for (var i = 0; i < workType3.length; i++) {
+		if (workType3[i].id == id) {
+			return workType3[i].name;
+		}
+	}
+	return "";
 }
 
 export function getWorkType4Array() {
-  return workType4;
+	return workType4;
 }
 //初始化picker选中项
 export function initWorkType4Picker(id) {
-  for (var i = 0; i < workType4.length; i++) {
-    if (workType4[i].id == id) {
-      return i;
-    }
-  }
-  return 0;
+	for (var i = 0; i < workType4.length; i++) {
+		if (workType4[i].id == id) {
+			return i;
+		}
+	}
+	return 0;
 }
 export function getWorkType4Value(index) {
-  return workType4[index].id;
+	return workType4[index].id;
 }
 export function getWorkType4Name(id) {
-  for (var i = 0; i < workType4.length; i++) {
-    if (workType4[i].id == id) {
-      return workType4[i].name;
-    }
-  }
-  return "";
+	for (var i = 0; i < workType4.length; i++) {
+		if (workType4[i].id == id) {
+			return workType4[i].name;
+		}
+	}
+	return "";
 }
 
 export function getSettlementCycleArray() {
-  return settlementCycleArray;
+	return settlementCycleArray;
 }
 export function getSettlementCycleName(id) {
-  for (var i = 0; i < settlementCycleArray.length; i++) {
-    if (settlementCycleArray[i].id == id) {
-      return settlementCycleArray[i].name;
-    }
-  }
-  return "";
+	for (var i = 0; i < settlementCycleArray.length; i++) {
+		if (settlementCycleArray[i].id == id) {
+			return settlementCycleArray[i].name;
+		}
+	}
+	return "";
 }
 
 export function getSalaryTypeArray() {
-  return salaryTypeArray;
+	return salaryTypeArray;
 }
 export function getSalaryTypeName(id) {
-  for (var i = 0; i < salaryTypeArray.length; i++) {
-    if (salaryTypeArray[i].id == id) {
-      return salaryTypeArray[i].name;
-    }
-  }
-  return "";
+	for (var i = 0; i < salaryTypeArray.length; i++) {
+		if (salaryTypeArray[i].id == id) {
+			return salaryTypeArray[i].name;
+		}
+	}
+	return "";
 }
 export function getSalaryTypeSubName(id) {
-  for (var i = 0; i < salaryTypeArray.length; i++) {
-    if (salaryTypeArray[i].id == id) {
-      return salaryTypeArray[i].subName;
-    }
-  }
-  return "";
+	for (var i = 0; i < salaryTypeArray.length; i++) {
+		if (salaryTypeArray[i].id == id) {
+			return salaryTypeArray[i].subName;
+		}
+	}
+	return "";
 }
 
 export function getHopeLiveArray() {
-  return hopeLive;
+	return hopeLive;
 }
 //初始化picker选中项
 export function initHopeLivePicker(name) {
-  for (var i = 0; i < hopeLive.length; i++) {
-    if (hopeLive[i].id == name) {
-      return i;
-    }
-  }
-  return 0;
+	for (var i = 0; i < hopeLive.length; i++) {
+		if (hopeLive[i].id == name) {
+			return i;
+		}
+	}
+	return 0;
 }
 export function getHopeLiveValue(index) {
-  return hopeLive[index].id;
+	return hopeLive[index].id;
 }
 
 export function getWorkExpArray() {
-  return workExp;
+	return workExp;
 }
 //初始化picker选中项
 export function initWorkExpPicker(name) {
-  for (var i = 0; i < workExp.length; i++) {
-    if (workExp[i].name == name) {
-      return i;
-    }
-  }
-  return 0;
+	for (var i = 0; i < workExp.length; i++) {
+		if (workExp[i].name == name) {
+			return i;
+		}
+	}
+	return 0;
 }
 export function getWorkExpValue(index) {
-  return workExp[index].id;
+	return workExp[index].id;
 }
 
 export function getEducation2Array() {
-  return education2;
+	return education2;
 }
 //初始化picker选中项
 export function initEducation2Picker(name) {
-  for (var i = 0; i < education2.length; i++) {
-    if (education2[i].name == name) {
-      return i;
-    }
-  }
-  return 0;
+	for (var i = 0; i < education2.length; i++) {
+		if (education2[i].name == name) {
+			return i;
+		}
+	}
+	return 0;
 }
 export function getEducation2Value(index) {
-  return education2[index].id;
+	return education2[index].id;
 }
 
 export function getIsMarry2Array() {
-  return isMarry2;
+	return isMarry2;
 }
 //初始化picker选中项
 export function initIsMarry2Picker(name) {
-  for (var i = 0; i < isMarry2.length; i++) {
-    if (isMarry2[i].name == name) {
-      return i;
-    }
-  }
-  return 0;
+	for (var i = 0; i < isMarry2.length; i++) {
+		if (isMarry2[i].name == name) {
+			return i;
+		}
+	}
+	return 0;
 }
 export function getIsMarry2Value(index) {
-  return isMarry2[index].id;
+	return isMarry2[index].id;
 }
 
 export function getBankAuthArray() {
-  return bankAuth;
+	return bankAuth;
 }
 
 //初始化picker选中项
 export function initBankAuthPicker(id) {
-  for (var i = 0; i < bankAuth.length; i++) {
-    if (bankAuth[i].id == id) {
-      return i;
-    }
-  }
-  return 0;
+	for (var i = 0; i < bankAuth.length; i++) {
+		if (bankAuth[i].id == id) {
+			return i;
+		}
+	}
+	return 0;
 }
 export function getBankAuthValue(index) {
-  return bankAuth[index].id;
+	return bankAuth[index].id;
 }
 /**
  *
@@ -885,110 +799,107 @@ export function getBankAuthValue(index) {
  * @returns {string}
  */
 export function getStoreAddress(district, detailPosition) {
-  var res = "";
-  if (isNotEmptyCheck(district)) {
-    var tmpArr = district.split(",");
-    if (tmpArr.length == 3 && tmpArr[0] == tmpArr[1]) {
-      res += tmpArr[1] + tmpArr[2];
-    } else {
-      res += district.replace(/,/g, "");
-    }
-  }
-  if (isNotEmptyCheck(detailPosition)) {
-    res += detailPosition;
-  }
-  return res;
+	var res = "";
+	if (isNotEmptyCheck(district)) {
+		var tmpArr = district.split(",");
+		if (tmpArr.length == 3 && tmpArr[0] == tmpArr[1]) {
+			res += tmpArr[1] + tmpArr[2];
+		} else {
+			res += district.replace(/,/g, "");
+		}
+	}
+	if (isNotEmptyCheck(detailPosition)) {
+		res += detailPosition;
+	}
+	return res;
 }
 
 /**
  * 代理推广明细事件
  */
 export function agencyPromotionDetailEventArray() {
-  let agencyPromotionDetailEventArray = [
-    { id: "10", name: "扫码", value: "10", text: "扫码", checked: false },
-    { id: "20", name: "报名", value: "20", text: "报名", checked: false },
-    { id: "30", name: "面试", value: "30", text: "面试", checked: false },
-    { id: "40", name: "入职", value: "40", text: "入职", checked: false },
-    { id: "50", name: "离职", value: "50", text: "离职", checked: false },
-  ];
-  return agencyPromotionDetailEventArray;
+	let agencyPromotionDetailEventArray = [
+		{ id: "10", name: "扫码", value: "10", text: "扫码", checked: false },
+		{ id: "20", name: "报名", value: "20", text: "报名", checked: false },
+		{ id: "30", name: "面试", value: "30", text: "面试", checked: false },
+		{ id: "40", name: "入职", value: "40", text: "入职", checked: false },
+		{ id: "50", name: "离职", value: "50", text: "离职", checked: false },
+	];
+	return agencyPromotionDetailEventArray;
 }
 /**
  * 根据代理推广明细事件ID获取名称
  */
 export function getAgencyPromotionDetailEventNameId(id) {
-  let str = "";
-  let array = agencyPromotionDetailEventArray();
-  array.forEach((item) => {
-    if (item.id == id) {
-      str = item.name;
-    }
-  });
-  return str;
+	let str = "";
+	let array = agencyPromotionDetailEventArray();
+	array.forEach((item) => {
+		if (item.id == id) {
+			str = item.name;
+		}
+	});
+	return str;
 }
 
 /**
  * 代理推广明细佣金状态
  */
 export function agencyPromotionDetailMoneyStatusArray() {
-  let agencyPromotionDetailMoneyStatusArray = [
-    { id: "0", name: "无佣金", value: "0", text: "无佣金", checked: false },
-    { id: "10", name: "待结算", value: "10", text: "待结算", checked: false },
-    { id: "20", name: "已结算", value: "20", text: "已结算", checked: false },
-    { id: "30", name: "已失效", value: "30", text: "已失效", checked: false },
-  ];
-  return agencyPromotionDetailMoneyStatusArray;
+	let agencyPromotionDetailMoneyStatusArray = [
+		{ id: "0", name: "无佣金", value: "0", text: "无佣金", checked: false },
+		{ id: "10", name: "待结算", value: "10", text: "待结算", checked: false },
+		{ id: "20", name: "已结算", value: "20", text: "已结算", checked: false },
+		{ id: "30", name: "已失效", value: "30", text: "已失效", checked: false },
+	];
+	return agencyPromotionDetailMoneyStatusArray;
 }
 /**
  * 根据代理推广明细佣金状态ID获取名称
  */
 export function getAgencyPromotionDetailMoneyStatusNameId(id) {
-  let str = "";
-  let array = agencyPromotionDetailMoneyStatusArray();
-  array.forEach((item) => {
-    if (item.id == id) {
-      str = item.name;
-    }
-  });
-  return str;
+	let str = "";
+	let array = agencyPromotionDetailMoneyStatusArray();
+	array.forEach((item) => {
+		if (item.id == id) {
+			str = item.name;
+		}
+	});
+	return str;
 }
 
 export function moneyToFixed(money, fixed = 2, multiplicator = 100) {
-  if (money != 0 && money != null && money != "" && money != undefined) {
-    return cutZero(new Number(money / multiplicator).toFixed(fixed));
-  } else {
-    return "0";
-  }
+	if (money != 0 && money != null && money != "" && money != undefined) {
+		return cutZero(new Number(money / multiplicator).toFixed(fixed));
+	} else {
+		return "0";
+	}
 }
 export function cutZero(old) {
-  //拷贝一份 返回去掉零的新串
-  let newstr = old;
-  //循环变量 小数部分长度
-  var leng = old.length - old.indexOf(".") - 1;
-  //判断是否有效数
-  if (old.indexOf(".") > -1) {
-    //循环小数部分
-    for (var i = leng; i > 0; i--) {
-      //如果newstr末尾有0
-      if (
-        newstr.lastIndexOf("0") > -1 &&
-        newstr.substr(newstr.length - 1, 1) == 0
-      ) {
-        var k = newstr.lastIndexOf("0");
-        //如果小数点后只有一个0 去掉小数点
-        if (newstr.charAt(k - 1) == ".") {
-          return newstr.substring(0, k - 1);
-        } else {
-          //否则 去掉一个0
-          newstr = newstr.substring(0, k);
-        }
-      } else {
-        //如果末尾没有0
-        return newstr;
-      }
-    }
-  }
-  return old;
+	//拷贝一份 返回去掉零的新串
+	let newstr = old;
+	//循环变量 小数部分长度
+	var leng = old.length - old.indexOf(".") - 1;
+	//判断是否有效数
+	if (old.indexOf(".") > -1) {
+		//循环小数部分
+		for (var i = leng; i > 0; i--) {
+			//如果newstr末尾有0
+			if (newstr.lastIndexOf("0") > -1 && newstr.substr(newstr.length - 1, 1) == 0) {
+				var k = newstr.lastIndexOf("0");
+				//如果小数点后只有一个0 去掉小数点
+				if (newstr.charAt(k - 1) == ".") {
+					return newstr.substring(0, k - 1);
+				} else {
+					//否则 去掉一个0
+					newstr = newstr.substring(0, k);
+				}
+			} else {
+				//如果末尾没有0
+				return newstr;
+			}
+		}
+	}
+	return old;
 }
 // export function getCurrentPageUrlWithArgs() {
 //   // const pages = getCurrentPages()
@@ -1005,65 +916,33 @@ export function cutZero(old) {
 // }
 
 export function getDateArrayOfScope() {
-  // var multiArray = [['2000年', '2001年'], ['01月', '02月', '03月', '04月', '05月'], ['-'],['2000年', '2001年'], ['01月', '02月', '03月', '04月', '05月']];
-  var multiArray = [
-    [],
-    [
-      "01月",
-      "02月",
-      "03月",
-      "04月",
-      "05月",
-      "06月",
-      "07月",
-      "08月",
-      "09月",
-      "10月",
-      "11月",
-      "12月",
-    ],
-    ["-"],
-    [],
-    [
-      "01月",
-      "02月",
-      "03月",
-      "04月",
-      "05月",
-      "06月",
-      "07月",
-      "08月",
-      "09月",
-      "10月",
-      "11月",
-      "12月",
-    ],
-  ];
-
-  var date = new Date();
-  var end = date.getFullYear();
-
-  var yearArray = [];
-  for (var i = 1990; i <= end; i++) {
-    yearArray.push(i + "年");
-  }
-
-  multiArray[0] = yearArray;
-  multiArray[3] = yearArray;
-
-  return multiArray;
+	// var multiArray = [['2000年', '2001年'], ['01月', '02月', '03月', '04月', '05月'], ['-'],['2000年', '2001年'], ['01月', '02月', '03月', '04月', '05月']];
+	var multiArray = [[], ["01月", "02月", "03月", "04月", "05月", "06月", "07月", "08月", "09月", "10月", "11月", "12月"], ["-"], [], ["01月", "02月", "03月", "04月", "05月", "06月", "07月", "08月", "09月", "10月", "11月", "12月"]];
+
+	var date = new Date();
+	var end = date.getFullYear();
+
+	var yearArray = [];
+	for (var i = 1990; i <= end; i++) {
+		yearArray.push(i + "年");
+	}
+
+	multiArray[0] = yearArray;
+	multiArray[3] = yearArray;
+
+	return multiArray;
 }
 
 export function educationArray() {
-  let educationArray = [
-    { id: "初中", name: "初中" },
-    { id: "高中", name: "高中" },
-    { id: "大专", name: "大专" },
-    { id: "本科", name: "本科" },
-    { id: "硕士", name: "硕士" },
-    { id: "博士", name: "博士" },
-  ];
-  return educationArray;
+	let educationArray = [
+		{ id: "初中", name: "初中" },
+		{ id: "高中", name: "高中" },
+		{ id: "大专", name: "大专" },
+		{ id: "本科", name: "本科" },
+		{ id: "硕士", name: "硕士" },
+		{ id: "博士", name: "博士" },
+	];
+	return educationArray;
 }
 
 /**
@@ -1072,77 +951,61 @@ export function educationArray() {
  * @returns {string}
  */
 export function formatDateYMD(val) {
-  if (val == null || val == "") {
-    return null;
-  }
-
-  if ((val != null || val == "") && typeof val == "string") {
-    if (val.indexOf("T")) {
-      val = val.replace("T", " "); //原来L端可能返回的时间格式有带T的格式，处理一下
-    }
-    val = val.replace("-", "/").replace("-", "/");
-  }
-  var value = new Date(val);
-  //console.log(val);
-  var fmt = "yyyy-MM-dd";
-  var o = {
-    "M+": value.getMonth() + 1, //月份
-    "d+": value.getDate(), //日
-  };
-  if (/(y+)/.test(fmt))
-    fmt = fmt.replace(
-      RegExp.$1,
-      (value.getFullYear() + "").substr(4 - RegExp.$1.length)
-    );
-  for (var k in o) {
-    if (new RegExp("(" + k + ")").test(fmt)) {
-      fmt = fmt.replace(
-        RegExp.$1,
-        RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length)
-      );
-    }
-  }
-  return fmt;
+	if (val == null || val == "") {
+		return null;
+	}
+
+	if ((val != null || val == "") && typeof val == "string") {
+		if (val.indexOf("T")) {
+			val = val.replace("T", " "); //原来L端可能返回的时间格式有带T的格式，处理一下
+		}
+		val = val.replace("-", "/").replace("-", "/");
+	}
+	var value = new Date(val);
+	//console.log(val);
+	var fmt = "yyyy-MM-dd";
+	var o = {
+		"M+": value.getMonth() + 1, //月份
+		"d+": value.getDate(), //日
+	};
+	if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (value.getFullYear() + "").substr(4 - RegExp.$1.length));
+	for (var k in o) {
+		if (new RegExp("(" + k + ")").test(fmt)) {
+			fmt = fmt.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
+		}
+	}
+	return fmt;
 }
 export function formatDateYMDHMS(val) {
-  // model -> view，在更新 `<input>` 元素之前格式化值
-  if (val !== "") {
-    if (val !== null && val !== "" && typeof val == "string") {
-      if (val.indexOf("T")) {
-        val = val.replace("T", " "); //原来L端可能返回的时间格式有带T的格式，处理一下
-      }
-      val = val.replace("-", "/").replace("-", "/");
-    }
-    var value = new Date(val);
-    //console.log(val);
-    var fmt = "yyyy-MM-dd HH:mm";
-    var o = {
-      "M+": value.getMonth() + 1, //月份
-      "d+": value.getDate(), //日
-      "H+": value.getHours(), //小时
-      //"h+": val.getHours()%12 == 0 ? 12 : val.getHours()%12, //小时
-      "m+": value.getMinutes(), //分
-      "s+": value.getSeconds(), //秒
-      //"S": val.getMilliseconds() //毫秒
-      //"q+": Math.floor((val.getMonth() + 3) / 3) //季度
-    };
-    if (/(y+)/.test(fmt))
-      fmt = fmt.replace(
-        RegExp.$1,
-        (value.getFullYear() + "").substr(4 - RegExp.$1.length)
-      );
-    for (var k in o) {
-      if (new RegExp("(" + k + ")").test(fmt)) {
-        fmt = fmt.replace(
-          RegExp.$1,
-          RegExp.$1.length == 1
-            ? o[k]
-            : ("00" + o[k]).substr(("" + o[k]).length)
-        );
-      }
-    }
-    return fmt;
-  }
+	// model -> view，在更新 `<input>` 元素之前格式化值
+	if (val !== "") {
+		if (val !== null && val !== "" && typeof val == "string") {
+			if (val.indexOf("T")) {
+				val = val.replace("T", " "); //原来L端可能返回的时间格式有带T的格式，处理一下
+			}
+			val = val.replace("-", "/").replace("-", "/");
+		}
+		var value = new Date(val);
+		//console.log(val);
+		var fmt = "yyyy-MM-dd HH:mm";
+		var o = {
+			"M+": value.getMonth() + 1, //月份
+			"d+": value.getDate(), //日
+			"H+": value.getHours(), //小时
+			//"h+": val.getHours()%12 == 0 ? 12 : val.getHours()%12, //小时
+			"m+": value.getMinutes(), //分
+			"s+": value.getSeconds(), //秒
+			//"S": val.getMilliseconds() //毫秒
+			//"q+": Math.floor((val.getMonth() + 3) / 3) //季度
+		};
+		if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (value.getFullYear() + "").substr(4 - RegExp.$1.length));
+		for (var k in o) {
+			if (new RegExp("(" + k + ")").test(fmt)) {
+				fmt = fmt.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
+			}
+		}
+		return fmt;
+	}
 }
 /**
  * 时间格式化  2017-01-01 01:01
@@ -1150,680 +1013,675 @@ export function formatDateYMDHMS(val) {
  * @returns {string}
  */
 export function formatDateYMDHM(val) {
-  // model -> view，在更新 `<input>` 元素之前格式化值
-  if (isEmptyCheck(val)) {
-    return "";
-  } else {
-    if ((val != null || val == "") && typeof val == "string") {
-      val = val.replace("-", "/").replace("-", "/");
-    }
-    var value = new Date(val);
-    //console.log(val);
-    var fmt = "yyyy-MM-dd HH:mm";
-    var o = {
-      "M+": value.getMonth() + 1, //月份
-      "d+": value.getDate(), //日
-      "H+": value.getHours(), //小时
-      //"h+": val.getHours()%12 == 0 ? 12 : val.getHours()%12, //小时
-      "m+": value.getMinutes(), //分
-      // "s+": value.getSeconds() //秒
-      //"S": val.getMilliseconds() //毫秒
-      //"q+": Math.floor((val.getMonth() + 3) / 3) //季度
-    };
-    if (/(y+)/.test(fmt))
-      fmt = fmt.replace(
-        RegExp.$1,
-        (value.getFullYear() + "").substr(4 - RegExp.$1.length)
-      );
-    for (var k in o) {
-      if (new RegExp("(" + k + ")").test(fmt)) {
-        fmt = fmt.replace(
-          RegExp.$1,
-          RegExp.$1.length == 1
-            ? o[k]
-            : ("00" + o[k]).substr(("" + o[k]).length)
-        );
-      }
-    }
-    return fmt;
-  }
+	// model -> view，在更新 `<input>` 元素之前格式化值
+	if (isEmptyCheck(val)) {
+		return "";
+	} else {
+		if ((val != null || val == "") && typeof val == "string") {
+			val = val.replace("-", "/").replace("-", "/");
+		}
+		var value = new Date(val);
+		//console.log(val);
+		var fmt = "yyyy-MM-dd HH:mm";
+		var o = {
+			"M+": value.getMonth() + 1, //月份
+			"d+": value.getDate(), //日
+			"H+": value.getHours(), //小时
+			//"h+": val.getHours()%12 == 0 ? 12 : val.getHours()%12, //小时
+			"m+": value.getMinutes(), //分
+			// "s+": value.getSeconds() //秒
+			//"S": val.getMilliseconds() //毫秒
+			//"q+": Math.floor((val.getMonth() + 3) / 3) //季度
+		};
+		if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (value.getFullYear() + "").substr(4 - RegExp.$1.length));
+		for (var k in o) {
+			if (new RegExp("(" + k + ")").test(fmt)) {
+				fmt = fmt.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
+			}
+		}
+		return fmt;
+	}
 }
 function getJobSpecialLabelNamesArray(jobSpecialLabelNames) {
-  if (isNotEmptyCheck(jobSpecialLabelNames)) {
-    return jobSpecialLabelNames.split(", ");
-  }
-  return [];
+	if (isNotEmptyCheck(jobSpecialLabelNames)) {
+		return jobSpecialLabelNames.split(", ");
+	}
+	return [];
 }
 
 /**
  * 处理工单状态
  */
 export function userApplyOrderStatusArray() {
-  // let orderStatus = [
-  //   { id: "10", name: "审核中", value: "10", text: "审核中" },
-  //   { id: "20", name: "待面试", value: "20", text: "待面试" },
-  //   { id: "30", name: "待入职", value: "30", text: "待入职" },
-  //   { id: "40", name: "在职中", value: "40", text: "在职中" },
-  //   { id: "50", name: "待离职", value: "50", text: "待离职" },
-  //   { id: "60", name: "已完成", value: "60", text: "已完成" },
-  // ];
-  let orderStatus = [
-    {
-      id: "10",
-      name: "已报名，审核中",
-      value: "10",
-      text: "报名审核中",
-      num: 0,
-    },
-    {
-      id: "20",
-      name: "报名成功，待面试",
-      value: "20",
-      text: "审核通过",
-      num: 0,
-    },
-    {
-      id: "21",
-      name: "审核未通过，报名失败",
-      value: "21",
-      text: "审核未通过",
-      num: 0,
-    },
-    { id: "25", name: "已接到", value: "25", text: "已接到", num: 0 },
-    { id: "26", name: "未接到", value: "26", text: "未接到", num: 0 },
-    {
-      id: "30",
-      name: "面试通过，待入职",
-      value: "30",
-      text: "面试通过",
-      num: 0,
-    },
-    { id: "35", name: "面试未通过", value: "35", text: "面试未通过", num: 0 },
-    { id: "40", name: "已入职，在职中", value: "40", text: "已入职", num: 0 },
-    {
-      id: "45",
-      name: "面试通过，未入职",
-      value: "45",
-      text: "通过未入职",
-      num: 0,
-    },
-    { id: "50", name: "已离职", value: "50", text: "已离职", num: 0 },
-    // { id: "60", name: "已完成", value: "60", text: "已完成", num: 0 }
-  ];
-  return orderStatus;
+	// let orderStatus = [
+	//   { id: "10", name: "审核中", value: "10", text: "审核中" },
+	//   { id: "20", name: "待面试", value: "20", text: "待面试" },
+	//   { id: "30", name: "待入职", value: "30", text: "待入职" },
+	//   { id: "40", name: "在职中", value: "40", text: "在职中" },
+	//   { id: "50", name: "待离职", value: "50", text: "待离职" },
+	//   { id: "60", name: "已完成", value: "60", text: "已完成" },
+	// ];
+	let orderStatus = [
+		{
+			id: "10",
+			name: "已报名，审核中",
+			value: "10",
+			text: "报名审核中",
+			num: 0,
+		},
+		{
+			id: "20",
+			name: "报名成功，待面试",
+			value: "20",
+			text: "审核通过",
+			num: 0,
+		},
+		{
+			id: "21",
+			name: "审核未通过，报名失败",
+			value: "21",
+			text: "审核未通过",
+			num: 0,
+		},
+		{ id: "25", name: "已接到", value: "25", text: "已接到", num: 0 },
+		{ id: "26", name: "未接到", value: "26", text: "未接到", num: 0 },
+		{
+			id: "30",
+			name: "面试通过，待入职",
+			value: "30",
+			text: "面试通过",
+			num: 0,
+		},
+		{ id: "35", name: "面试未通过", value: "35", text: "面试未通过", num: 0 },
+		{ id: "40", name: "已入职，在职中", value: "40", text: "已入职", num: 0 },
+		{
+			id: "45",
+			name: "面试通过，未入职",
+			value: "45",
+			text: "通过未入职",
+			num: 0,
+		},
+		{ id: "50", name: "已离职", value: "50", text: "已离职", num: 0 },
+		// { id: "60", name: "已完成", value: "60", text: "已完成", num: 0 }
+	];
+	return orderStatus;
 }
 
 /**
- * 根据工单状态ID获取名称
+ * 根据工单状态ID获取名称 我的老乡
  */
 export function getUserApplyOrderStatusById(id) {
-  let str = "";
-  let array = userApplyOrderStatusArray();
-  array.forEach((item) => {
+	let str = "";
+	let array = userApplyOrderStatusArray();
+	array.forEach((item) => {
+		if (id == "50") {
+			str = "离职";
+		} else if (id == "40") {
+			str = "在职";
+		} else {
+			str = "报名";
+		}
+	});		
+	return str;
+}
+/**
+ * 根据工单状态ID获取名称 我的工单
+ */
+export function getUserApplyOrderStatusByIdToBill(id) {
+	let str = "";
+	let array = userApplyOrderStatusArray();
+	array.forEach((item) => {
     if (item.id == id) {
       str = item.name;
     }
-  });
-  return str;
+	});
+	return str;
 }
 // 处理职位列表的方法
 export function disposeJobListData(jobList) {
-  if (jobList !== undefined) {
-    if (Array.isArray(jobList)) {
-      jobList.forEach((item) => {
-        item["workType"] = getWorkTypeById(item.workTypeMulti);
-
-        if (isNotEmptyCheck(item.distance)) {
-          item["distanceKm"] = getDistanceName(item.distance);
-        }
-        if (isNotEmptyCheck(item.jobDesp)) {
-          item["jobDesp"] = item['jobDesp'].replaceAll("*****", "");
-        }
-        //年龄
-        // console.log(jobList);
-        var ageStr = "";
-        if (isNotEmptyCheck(item.minAge) && isNotEmptyCheck(item.maxAge)) {
-          ageStr = item.minAge + "-" + item.maxAge + "岁";
-        } else if (isNotEmptyCheck(item.minAge)) {
-          ageStr = item.minAge + "岁以上";
-        } else if (isNotEmptyCheck(item.maxAge)) {
-          ageStr = item.maxAge + "岁以下";
-        }
-        item["age"] = ageStr;
-        item.updateTime = formatDateYMDHM(item.updateTime);
-        // 更新时间距离现在的差距
-        let differenceTime =
-          new Date().getTime() -
-          new Date(item.updateTime || new Date()).getTime();
-        var D = Math.floor(differenceTime / (24 * 60 * 60 * 1000));
-        var leave1 = differenceTime % (24 * 3600 * 1000);
-        var H = Math.floor(leave1 / (3600 * 1000));
-        var leave2 = leave1 % (3600 * 1000);
-        var M = Math.floor(leave2 / (60 * 1000));
-        var leave3 = leave2 % (60 * 1000);
-        var S = Math.floor(leave3 / 1000);
-        item.diffTime = null;
-        if (D > 0) {
-          item.diffTime = D + "天前";
-        } else if (H > 0) {
-          item.diffTime = H + "小时前";
-        } else if (M > 0) {
-          item.diffTime = M + "分钟前";
-        } else {
-          item.diffTime = S + "秒前";
-        }
-        // 服务费
-        // console.log(item);
-
-        if (item.returnFeeType) {
-          if (item.returnFeeType === 0) {
-            item.servetype = `${item.returnFee || "--"}元/小时`;
-          } else if (item.returnFeeType === 1) {
-            item.servetype = `${item.returnFee || "--"}元/日`;
-          } else if (item.returnFeeType === 2) {
-            item.servetype = `${item.returnFee || "--"}元/月`;
-          } else if (item.returnFeeType === 3) {
-            item.servetype = `${item.returnFee || "--"}元/次`;
-          } else if (item.returnFeeType === 4) {
-            item.servetype = `${item.returnFee || "--"}元/公斤`;
-          } else if (item.returnFeeType === 5) {
-            item.servetype = `工人收入${item.returnFee || "--"}%`;
-          } else if (item.returnFeeType === 6) {
-            item.servetype = `共${item.returnFee || "--"}元`;
-          } else if (item.returnFeeType === 7) {
-            item.servetype = `费用待定`;
-          }
-          // console.log(item);
-          // item["returnFee"] = item.returnFee / 100;
-        } else {
-          item.servetype = `${item.returnFee || "--"}元/小时`;
-        }
-        //时薪
-        // var hourlyPayStr = "";
-        // var hasHourlyPay = false;
-        // if (isNotEmptyCheck(item.hourlyPay)) {
-        //   hourlyPayStr = item.hourlyPay + "元/小时";
-        //   hasHourlyPay = true;
-        // } else if (isNotEmptyCheck(item.dayPay)) {
-        //   hourlyPayStr = item.dayPay + "元/日";
-        //   hasHourlyPay = true;
-        // } else {
-        //   if (
-        //     isNotEmptyCheck(item.minMonthlyPay) &&
-        //     isNotEmptyCheck(item.maxMonthlyPay)
-        //   ) {
-        //     if (item.minMonthlyPay == item.maxMonthlyPay) {
-        //       hourlyPayStr = item.minMonthlyPay;
-        //     } else {
-        //       hourlyPayStr = item.minMonthlyPay + "-" + item.maxMonthlyPay;
-        //     }
-        //   } else if (isNotEmptyCheck(item.minMonthlyPay)) {
-        //     hourlyPayStr = item.minMonthlyPay;
-        //   } else if (isNotEmptyCheck(item.maxMonthlyPay)) {
-        //     hourlyPayStr = item.maxMonthlyPay;
-        //   }
-        // }
-        // item["hourlyPay"] = hourlyPayStr;
-        //月薪
-        // var monthlyPayStr = "";
-        // if (hasHourlyPay) {
-        //   if (
-        //     isNotEmptyCheck(item.minMonthlyPay) &&
-        //     isNotEmptyCheck(item.maxMonthlyPay)
-        //   ) {
-        //     if (item.minMonthlyPay == item.maxMonthlyPay) {
-        //       monthlyPayStr = item.minMonthlyPay;
-        //     } else {
-        //       monthlyPayStr = item.minMonthlyPay + "-" + item.maxMonthlyPay;
-        //     }
-        //   } else if (isNotEmptyCheck(item.minMonthlyPay)) {
-        //     monthlyPayStr = item.minMonthlyPay;
-        //   } else if (isNotEmptyCheck(item.maxMonthlyPay)) {
-        //     monthlyPayStr = item.maxMonthlyPay;
-        //   }
-        // }
-        // item["monthlyPay"] = monthlyPayStr;
-        //地址深圳丨龙岗区丨
-        var districtStr = "";
-        if (isNotEmptyCheck(item.district)) {
-          // console.log(item.district);
-          var districtArr = item.district.split(",");
-          var districtArr1 = [];
-          // console.log(districtArr);
-          districtArr.forEach((item1) => {
-            if (item1.length != 0) {
-              item1 = item1 + "丨";
-              districtArr1.push(item1);
-            }
-          });
-          if (districtArr.length < 3) {
-            districtStr = districtArr1[districtArr1.length - 1];
-          } else {
-            districtStr = districtArr1.join("");
-          }
-          if(item.district.indexOf('undefined') > -1){
-            districtStr = '-丨'
-          }
-          //districtStr = districtArr[1] + '丨' + districtArr[2];
-        }
-        item["district"] = districtStr;
-        //职位特色
-        item["jobSpecialLabelNames"] = getJobSpecialLabelNamesArray(
-          item.jobSpecialLabelNames
-        );
-        // 特色标签
-        // console.log(item.jobSpecialLabelNames);
-        const jobSpecialLabelNames = [];
-        if (
-          isNotEmptyCheck(item.jobSpecialLabelNames) &&
-          Array.isArray(item.jobSpecialLabelNames)
-        ) {
-          item.jobSpecialLabelNames.forEach((item, index) => {
-            if (index <= 2) {
-              jobSpecialLabelNames.push(item);
-              // console.log(jobSpecialLabelNames);
-            } else {
-              return;
-            }
-          });
-          item.jobSpecialLabelNames = jobSpecialLabelNames;
-        }
-        // 年龄限制
-        if (
-          Boolean(item.minAgeWoman) === true &&
-          Boolean(item.minAgeMan) === false
-        ) {
-          item.gender = "女丨";
-        } else if (
-          Boolean(item.minAgeWoman) === false &&
-          Boolean(item.minAgeMan) === true
-        ) {
-          item.gender = "男丨";
-        } else {
-          item.gender = "男女不限丨";
-        }
-      });
-    } else {
-      jobList["workType"] = getWorkTypeById(jobList.workTypeMulti);
-
-      if (isNotEmptyCheck(jobList.distance)) {
-        jobList["distanceKm"] = getDistanceName(jobList.distance);
-      }
-      if (isNotEmptyCheck(jobList.jobDesp)) {
-        jobList["jobDesp"] = jobList['jobDesp'].replaceAll("*****", "");
-      }
-      //年龄
-      var ageStr = "";
-      if (isNotEmptyCheck(jobList.minAge) && isNotEmptyCheck(jobList.maxAge)) {
-        ageStr = jobList.minAge + "-" + jobList.maxAge + "岁";
-      } else if (isNotEmptyCheck(jobList.minAge)) {
-        ageStr = jobList.minAge + "岁以上";
-      } else if (isNotEmptyCheck(jobList.maxAge)) {
-        ageStr = jobList.maxAge + "岁以下";
-      }
-      jobList["age"] = ageStr;
-      //时薪
-      // var hourlyPayStr = "";
-      // var hasHourlyPay = false;
-      // if (isNotEmptyCheck(jobList.hourlyPay)) {
-      //   hourlyPayStr = jobList.hourlyPay + "元/小时";
-      //   hasHourlyPay = true;
-      // } else if (isNotEmptyCheck(jobList.dayPay)) {
-      //   hourlyPayStr = jobList.dayPay + "元/日";
-      //   hasHourlyPay = true;
-      // } else {
-      //   if (
-      //     isNotEmptyCheck(jobList.minMonthlyPay) &&
-      //     isNotEmptyCheck(jobList.maxMonthlyPay)
-      //   ) {
-      //     if (jobList.minMonthlyPay == jobList.maxMonthlyPay) {
-      //       hourlyPayStr = jobList.minMonthlyPay;
-      //     } else {
-      //       hourlyPayStr = jobList.minMonthlyPay + "-" + jobList.maxMonthlyPay;
-      //     }
-      //   } else if (isNotEmptyCheck(jobList.minMonthlyPay)) {
-      //     hourlyPayStr = jobList.minMonthlyPay;
-      //   } else if (isNotEmptyCheck(jobList.maxMonthlyPay)) {
-      //     hourlyPayStr = jobList.maxMonthlyPay;
-      //   }
-      // }
-      // jobList["hourlyPay"] = hourlyPayStr;
-      //月薪
-      // var monthlyPayStr = "";
-      // if (hasHourlyPay) {
-      //   if (
-      //     isNotEmptyCheck(jobList.minMonthlyPay) &&
-      //     isNotEmptyCheck(jobList.maxMonthlyPay)
-      //   ) {
-      //     if (jobList.minMonthlyPay == jobList.maxMonthlyPay) {
-      //       monthlyPayStr = jobList.minMonthlyPay;
-      //     } else {
-      //       monthlyPayStr = jobList.minMonthlyPay + "-" + jobList.maxMonthlyPay;
-      //     }
-      //   } else if (isNotEmptyCheck(jobList.minMonthlyPay)) {
-      //     monthlyPayStr = jobList.minMonthlyPay;
-      //   } else if (isNotEmptyCheck(jobList.maxMonthlyPay)) {
-      //     monthlyPayStr = jobList.maxMonthlyPay;
-      //   }
-      // }
-      // jobList["monthlyPay"] = monthlyPayStr;
-      //服务费
-      // console.log(item);
-
-      if (jobList.returnFeeType) {
-        if (jobList.returnFeeType === 0) {
-          jobList.servetype = `${jobList.returnFee || "--"}元/小时`;
-        } else if (jobList.returnFeeType === 1) {
-          jobList.servetype = `${jobList.returnFee || "--"}元/日`;
-        } else if (jobList.returnFeeType === 2) {
-          jobList.servetype = `${jobList.returnFee || "--"}元/月`;
-        } else if (jobList.returnFeeType === 3) {
-          jobList.servetype = `${jobList.returnFee || "--"}元/次`;
-        } else if (jobList.returnFeeType === 4) {
-          jobList.servetype = `${jobList.returnFee || "--"}元/公斤`;
-        } else if (jobList.returnFeeType === 5) {
-          jobList.servetype = `工人收入${jobList.returnFee || "--"}%`;
-        } else if (jobList.returnFeeType === 6) {
-          jobList.servetype = `共${jobList.returnFee || "--"}元`;
-        } else if (jobList.returnFeeType === 7) {
-          jobList.servetype = `费用待定`;
-        }
-      } else {
-        jobList.servetype = `${jobList.returnFee || "--"}元/小时`;
-      }
-      // if (jobList.returnFeeType || jobList.returnFeeType === 0) {
-      //   if (jobList.returnFeeType === 0) {
-      //     jobList.servetype = "元/小时";
-      //   } else if (jobList.returnFeeType === 1) {
-      //     jobList.servetype = "元/日";
-      //   } else if (jobList.returnFeeType === 2) {
-      //     jobList.servetype = "元/月";
-      //   } else if (jobList.returnFeeType === 3) {
-      //     jobList.servetype = "元/次";
-      //   }
-      //   // console.log(jobList);
-      //   // jobList["returnFee"] = jobList.returnFee / 100;
-      // } else {
-      //   jobList.servetype = "元/小时";
-      // }
-      //地址深圳丨龙岗区丨
-      var districtStr = "";
-      if (isNotEmptyCheck(jobList.district)) {
-        var districtArr = jobList.district.split(",");
-        var districtArr1 = [];
-        // console.log(districtArr);
-        districtArr.forEach((item1) => {
-          if (item1.length != 0) {
-            item1 = item1 + "丨";
-            districtArr1.push(item1);
-          }
-        });
-        if (districtArr.length < 3) {
-          districtStr = districtArr1[districtArr1.length - 1];
-        } else {
-          // districtStr = districtArr[1] + "丨" + districtArr[2];
-          districtStr = districtArr1.join("");
-        }
-        if(jobList.district.indexOf('undefined') > -1){
-          districtStr = '-丨'
-        }
-        //districtStr = districtArr[1] + '丨' + districtArr[2];
-      }
-      jobList["district"] = districtStr;
-      //职位特色
-      jobList["jobSpecialLabelNames"] = getJobSpecialLabelNamesArray(
-        jobList.jobSpecialLabelNames
-      );
-      // console.log(jobList.jobSpecialLabelNames);
-      // 特色标签
-      // console.log(jobList.jobSpecialLabelNames);
-      const jobSpecialLabelNames = [];
-      if (
-        isNotEmptyCheck(jobList.jobSpecialLabelNames) &&
-        Array.isArray(jobList.jobSpecialLabelNames)
-      ) {
-        jobList.jobSpecialLabelNames.forEach((item, index) => {
-          if (index <= 4) {
-            jobSpecialLabelNames.push(item);
-            // console.log(jobSpecialLabelNames);
-          } else {
-            return;
-          }
-        });
-        jobList.jobSpecialLabelNames = jobSpecialLabelNames;
-      }
-      // 年龄限制
-      // console.log(jobList);
-      // console.log(jobList["gender"]);
-      if (
-        Boolean(jobList.minAgeWoman) === true &&
-        Boolean(jobList.minAgeMan) === false
-      ) {
-        jobList.gender = "女丨";
-      } else if (
-        Boolean(jobList.minAgeWoman) === false &&
-        Boolean(jobList.minAgeMan) === true
-      ) {
-        jobList.gender = "男丨";
-      } else {
-        jobList.gender = "男女不限丨";
-      }
-      // if (jobList["gender"] === 1) {
-      //   jobList["gender"] = "丨男";
-      // } else if (jobList["gender"] === 2) {
-      //   jobList["gender"] = "丨女";
-      // } else if (jobList["gender"] === 3) {
-      //   jobList["gender"] = "丨男女不限";
-      // } else {
-      //   jobList["gender"] = "丨男女不限";
-      // }
-    }
-  }
-
-  return jobList;
+	if (jobList !== undefined) {
+		if (Array.isArray(jobList)) {
+			jobList.forEach((item) => {
+				item["workType"] = getWorkTypeById(item.workTypeMulti);
+
+				if (isNotEmptyCheck(item.distance)) {
+					item["distanceKm"] = getDistanceName(item.distance);
+				}
+				if (isNotEmptyCheck(item.jobDesp)) {
+					item["jobDesp"] = item["jobDesp"].replaceAll("*****", "");
+				}
+				//年龄
+				// console.log(jobList);
+				var ageStr = "";
+				if (isNotEmptyCheck(item.minAge) && isNotEmptyCheck(item.maxAge)) {
+					ageStr = item.minAge + "-" + item.maxAge + "岁";
+				} else if (isNotEmptyCheck(item.minAge)) {
+					ageStr = item.minAge + "岁以上";
+				} else if (isNotEmptyCheck(item.maxAge)) {
+					ageStr = item.maxAge + "岁以下";
+				}
+				item["age"] = ageStr;
+				item.updateTime = formatDateYMDHM(item.updateTime);
+				// 更新时间距离现在的差距
+				let differenceTime = new Date().getTime() - new Date(item.updateTime || new Date()).getTime();
+				var D = Math.floor(differenceTime / (24 * 60 * 60 * 1000));
+				var leave1 = differenceTime % (24 * 3600 * 1000);
+				var H = Math.floor(leave1 / (3600 * 1000));
+				var leave2 = leave1 % (3600 * 1000);
+				var M = Math.floor(leave2 / (60 * 1000));
+				var leave3 = leave2 % (60 * 1000);
+				var S = Math.floor(leave3 / 1000);
+				item.diffTime = null;
+				if (D > 0) {
+					item.diffTime = D + "天前";
+				} else if (H > 0) {
+					item.diffTime = H + "小时前";
+				} else if (M > 0) {
+					item.diffTime = M + "分钟前";
+				} else {
+					item.diffTime = S + "秒前";
+				}
+				// 服务费
+				// console.log(item);
+
+				if (item.returnFeeType) {
+					if (item.returnFeeType === 0) {
+						item.servetype = `${item.returnFee || "--"}元/小时`;
+					} else if (item.returnFeeType === 1) {
+						item.servetype = `${item.returnFee || "--"}元/日`;
+					} else if (item.returnFeeType === 2) {
+						item.servetype = `${item.returnFee || "--"}元/月`;
+					} else if (item.returnFeeType === 3) {
+						item.servetype = `${item.returnFee || "--"}元/次`;
+					} else if (item.returnFeeType === 4) {
+						item.servetype = `${item.returnFee || "--"}元/件`;
+					} else if (item.returnFeeType === 5) {
+						item.servetype = `工人收入${item.returnFee || "--"}%`;
+					} else if (item.returnFeeType === 6) {
+						item.servetype = `共${item.returnFee || "--"}元`;
+					} else if (item.returnFeeType === 7) {
+						item.servetype = `费用待定`;
+					}
+					// console.log(item);
+					// item["returnFee"] = item.returnFee / 100;
+				} else {
+					item.servetype = `${item.returnFee || "--"}元/小时`;
+				}
+				//时薪
+				// var hourlyPayStr = "";
+				// var hasHourlyPay = false;
+				// if (isNotEmptyCheck(item.hourlyPay)) {
+				//   hourlyPayStr = item.hourlyPay + "元/小时";
+				//   hasHourlyPay = true;
+				// } else if (isNotEmptyCheck(item.dayPay)) {
+				//   hourlyPayStr = item.dayPay + "元/日";
+				//   hasHourlyPay = true;
+				// } else {
+				//   if (
+				//     isNotEmptyCheck(item.minMonthlyPay) &&
+				//     isNotEmptyCheck(item.maxMonthlyPay)
+				//   ) {
+				//     if (item.minMonthlyPay == item.maxMonthlyPay) {
+				//       hourlyPayStr = item.minMonthlyPay;
+				//     } else {
+				//       hourlyPayStr = item.minMonthlyPay + "-" + item.maxMonthlyPay;
+				//     }
+				//   } else if (isNotEmptyCheck(item.minMonthlyPay)) {
+				//     hourlyPayStr = item.minMonthlyPay;
+				//   } else if (isNotEmptyCheck(item.maxMonthlyPay)) {
+				//     hourlyPayStr = item.maxMonthlyPay;
+				//   }
+				// }
+				// item["hourlyPay"] = hourlyPayStr;
+				//月薪
+				// var monthlyPayStr = "";
+				// if (hasHourlyPay) {
+				//   if (
+				//     isNotEmptyCheck(item.minMonthlyPay) &&
+				//     isNotEmptyCheck(item.maxMonthlyPay)
+				//   ) {
+				//     if (item.minMonthlyPay == item.maxMonthlyPay) {
+				//       monthlyPayStr = item.minMonthlyPay;
+				//     } else {
+				//       monthlyPayStr = item.minMonthlyPay + "-" + item.maxMonthlyPay;
+				//     }
+				//   } else if (isNotEmptyCheck(item.minMonthlyPay)) {
+				//     monthlyPayStr = item.minMonthlyPay;
+				//   } else if (isNotEmptyCheck(item.maxMonthlyPay)) {
+				//     monthlyPayStr = item.maxMonthlyPay;
+				//   }
+				// }
+				// item["monthlyPay"] = monthlyPayStr;
+				//地址深圳丨龙岗区丨
+				var districtStr = "";
+				if (isNotEmptyCheck(item.district)) {
+					// console.log(item.district);
+					var districtArr = item.district.split(",");
+					var districtArr1 = [];
+					// console.log(districtArr);
+					districtArr.forEach((item1) => {
+						if (item1.length != 0) {
+							item1 = item1 + "丨";
+							districtArr1.push(item1);
+						}
+					});
+					if (districtArr.length < 3) {
+						districtStr = districtArr1[districtArr1.length - 1];
+					} else {
+						districtStr = districtArr1.join("");
+					}
+					if (item.district.indexOf("undefined") > -1) {
+						districtStr = "-丨";
+					}
+					//districtStr = districtArr[1] + '丨' + districtArr[2];
+				}
+				item["district"] = districtStr;
+				//职位特色
+				item["jobSpecialLabelNames"] = getJobSpecialLabelNamesArray(item.jobSpecialLabelNames);
+				// 特色标签
+				// console.log(item.jobSpecialLabelNames);
+				const jobSpecialLabelNames = [];
+				if (isNotEmptyCheck(item.jobSpecialLabelNames) && Array.isArray(item.jobSpecialLabelNames)) {
+					item.jobSpecialLabelNames.forEach((item, index) => {
+						if (index <= 2) {
+							jobSpecialLabelNames.push(item);
+							// console.log(jobSpecialLabelNames);
+						} else {
+							return;
+						}
+					});
+					item.jobSpecialLabelNames = jobSpecialLabelNames;
+				}
+				// 年龄限制
+				if (Boolean(item.minAgeWoman) === true && Boolean(item.minAgeMan) === false) {
+					item.gender = "女丨";
+				} else if (Boolean(item.minAgeWoman) === false && Boolean(item.minAgeMan) === true) {
+					item.gender = "男丨";
+				} else {
+					item.gender = "男女不限丨";
+				}
+			});
+		} else {
+			jobList["workType"] = getWorkTypeById(jobList.workTypeMulti);
+
+			if (isNotEmptyCheck(jobList.distance)) {
+				jobList["distanceKm"] = getDistanceName(jobList.distance);
+			}
+			if (isNotEmptyCheck(jobList.jobDesp)) {
+				jobList["jobDesp"] = jobList["jobDesp"].replaceAll("*****", "");
+			}
+			//年龄
+			var ageStr = "";
+			if (isNotEmptyCheck(jobList.minAge) && isNotEmptyCheck(jobList.maxAge)) {
+				ageStr = jobList.minAge + "-" + jobList.maxAge + "岁";
+			} else if (isNotEmptyCheck(jobList.minAge)) {
+				ageStr = jobList.minAge + "岁以上";
+			} else if (isNotEmptyCheck(jobList.maxAge)) {
+				ageStr = jobList.maxAge + "岁以下";
+			}
+			jobList["age"] = ageStr;
+			//时薪
+			// var hourlyPayStr = "";
+			// var hasHourlyPay = false;
+			// if (isNotEmptyCheck(jobList.hourlyPay)) {
+			//   hourlyPayStr = jobList.hourlyPay + "元/小时";
+			//   hasHourlyPay = true;
+			// } else if (isNotEmptyCheck(jobList.dayPay)) {
+			//   hourlyPayStr = jobList.dayPay + "元/日";
+			//   hasHourlyPay = true;
+			// } else {
+			//   if (
+			//     isNotEmptyCheck(jobList.minMonthlyPay) &&
+			//     isNotEmptyCheck(jobList.maxMonthlyPay)
+			//   ) {
+			//     if (jobList.minMonthlyPay == jobList.maxMonthlyPay) {
+			//       hourlyPayStr = jobList.minMonthlyPay;
+			//     } else {
+			//       hourlyPayStr = jobList.minMonthlyPay + "-" + jobList.maxMonthlyPay;
+			//     }
+			//   } else if (isNotEmptyCheck(jobList.minMonthlyPay)) {
+			//     hourlyPayStr = jobList.minMonthlyPay;
+			//   } else if (isNotEmptyCheck(jobList.maxMonthlyPay)) {
+			//     hourlyPayStr = jobList.maxMonthlyPay;
+			//   }
+			// }
+			// jobList["hourlyPay"] = hourlyPayStr;
+			//月薪
+			// var monthlyPayStr = "";
+			// if (hasHourlyPay) {
+			//   if (
+			//     isNotEmptyCheck(jobList.minMonthlyPay) &&
+			//     isNotEmptyCheck(jobList.maxMonthlyPay)
+			//   ) {
+			//     if (jobList.minMonthlyPay == jobList.maxMonthlyPay) {
+			//       monthlyPayStr = jobList.minMonthlyPay;
+			//     } else {
+			//       monthlyPayStr = jobList.minMonthlyPay + "-" + jobList.maxMonthlyPay;
+			//     }
+			//   } else if (isNotEmptyCheck(jobList.minMonthlyPay)) {
+			//     monthlyPayStr = jobList.minMonthlyPay;
+			//   } else if (isNotEmptyCheck(jobList.maxMonthlyPay)) {
+			//     monthlyPayStr = jobList.maxMonthlyPay;
+			//   }
+			// }
+			// jobList["monthlyPay"] = monthlyPayStr;
+			//服务费
+			// console.log(item);
+
+			if (jobList.returnFeeType) {
+				if (jobList.returnFeeType === 0) {
+					jobList.servetype = `${jobList.returnFee || "--"}元/小时`;
+				} else if (jobList.returnFeeType === 1) {
+					jobList.servetype = `${jobList.returnFee || "--"}元/日`;
+				} else if (jobList.returnFeeType === 2) {
+					jobList.servetype = `${jobList.returnFee || "--"}元/月`;
+				} else if (jobList.returnFeeType === 3) {
+					jobList.servetype = `${jobList.returnFee || "--"}元/次`;
+				} else if (jobList.returnFeeType === 4) {
+					jobList.servetype = `${jobList.returnFee || "--"}元/件`;
+				} else if (jobList.returnFeeType === 5) {
+					jobList.servetype = `工人收入${jobList.returnFee || "--"}%`;
+				} else if (jobList.returnFeeType === 6) {
+					jobList.servetype = `共${jobList.returnFee || "--"}元`;
+				} else if (jobList.returnFeeType === 7) {
+					jobList.servetype = `费用待定`;
+				}
+			} else {
+				jobList.servetype = `${jobList.returnFee || "--"}元/小时`;
+			}
+			// if (jobList.returnFeeType || jobList.returnFeeType === 0) {
+			//   if (jobList.returnFeeType === 0) {
+			//     jobList.servetype = "元/小时";
+			//   } else if (jobList.returnFeeType === 1) {
+			//     jobList.servetype = "元/日";
+			//   } else if (jobList.returnFeeType === 2) {
+			//     jobList.servetype = "元/月";
+			//   } else if (jobList.returnFeeType === 3) {
+			//     jobList.servetype = "元/次";
+			//   }
+			//   // console.log(jobList);
+			//   // jobList["returnFee"] = jobList.returnFee / 100;
+			// } else {
+			//   jobList.servetype = "元/小时";
+			// }
+			//地址深圳丨龙岗区丨
+			var districtStr = "";
+			if (isNotEmptyCheck(jobList.district)) {
+				var districtArr = jobList.district.split(",");
+				var districtArr1 = [];
+				// console.log(districtArr);
+				districtArr.forEach((item1) => {
+					if (item1.length != 0) {
+						item1 = item1 + "丨";
+						districtArr1.push(item1);
+					}
+				});
+				if (districtArr.length < 3) {
+					districtStr = districtArr1[districtArr1.length - 1];
+				} else {
+					// districtStr = districtArr[1] + "丨" + districtArr[2];
+					districtStr = districtArr1.join("");
+				}
+				if (jobList.district.indexOf("undefined") > -1) {
+					districtStr = "-丨";
+				}
+				//districtStr = districtArr[1] + '丨' + districtArr[2];
+			}
+			jobList["district"] = districtStr;
+			//职位特色
+			jobList["jobSpecialLabelNames"] = getJobSpecialLabelNamesArray(jobList.jobSpecialLabelNames);
+			// console.log(jobList.jobSpecialLabelNames);
+			// 特色标签
+			// console.log(jobList.jobSpecialLabelNames);
+			const jobSpecialLabelNames = [];
+			if (isNotEmptyCheck(jobList.jobSpecialLabelNames) && Array.isArray(jobList.jobSpecialLabelNames)) {
+				jobList.jobSpecialLabelNames.forEach((item, index) => {
+					if (index <= 4) {
+						jobSpecialLabelNames.push(item);
+						// console.log(jobSpecialLabelNames);
+					} else {
+						return;
+					}
+				});
+				jobList.jobSpecialLabelNames = jobSpecialLabelNames;
+			}
+			// 年龄限制
+			// console.log(jobList);
+			// console.log(jobList["gender"]);
+			if (Boolean(jobList.minAgeWoman) === true && Boolean(jobList.minAgeMan) === false) {
+				jobList.gender = "女丨";
+			} else if (Boolean(jobList.minAgeWoman) === false && Boolean(jobList.minAgeMan) === true) {
+				jobList.gender = "男丨";
+			} else {
+				jobList.gender = "男女不限丨";
+			}
+			// if (jobList["gender"] === 1) {
+			//   jobList["gender"] = "丨男";
+			// } else if (jobList["gender"] === 2) {
+			//   jobList["gender"] = "丨女";
+			// } else if (jobList["gender"] === 3) {
+			//   jobList["gender"] = "丨男女不限";
+			// } else {
+			//   jobList["gender"] = "丨男女不限";
+			// }
+		}
+	}
+
+	return jobList;
 }
 /**
  * 根据薪资类型和薪资值获取薪资展示
  */
 export function getSalaryClassifyValue(salaryClassify, salaryClassifyValue) {
-  var hourlyPay = moneyToFixed(salaryClassifyValue);
-  if (salaryClassify == 0) {
-    return `<span>${hourlyPay}</span>元/小时`;
-  } else if (salaryClassify == 1) {
-    return `<span>${hourlyPay}</span>元/天`;
-  } else if (salaryClassify == 2) {
-    return `补<span>${hourlyPay}</span>元`;
-  } else if (salaryClassify == 3) {
-    return `返<span>${hourlyPay}</span>元`;
-  } else if (salaryClassify == 4) {
-    return "<i>计件</i>";
-  } else if (salaryClassify == 5) {
-    return `保底<span>${hourlyPay}</span>元`;
-  } else if (salaryClassify == 6) {
-    return `<i>面议</i>`;
-  } else if (salaryClassify == 7) {
-    // return '请配置薪资';
-    return `<i>月薪</i>`;
-  } else {
-    return "-";
-  }
+	var hourlyPay = moneyToFixed(salaryClassifyValue);
+	if (salaryClassify == 0) {
+		return `<span>${hourlyPay}</span>元/小时`;
+	} else if (salaryClassify == 1) {
+		return `<span>${hourlyPay}</span>元/天`;
+	} else if (salaryClassify == 2) {
+		return `补<span>${hourlyPay}</span>元`;
+	} else if (salaryClassify == 3) {
+		return `返<span>${hourlyPay}</span>元`;
+	} else if (salaryClassify == 4) {
+		return "<i>计件</i>";
+	} else if (salaryClassify == 5) {
+		return `保底<span>${hourlyPay}</span>元`;
+	} else if (salaryClassify == 6) {
+		return `<i>面议</i>`;
+	} else if (salaryClassify == 7) {
+		// return '请配置薪资';
+		return `<i>月薪</i>`;
+	} else {
+		return "-";
+	}
 }
 // 通过身份证获取信息
 
 export function getAgeFromBirthday(bir) {
-  if (isEmptyCheck(bir)) {
-    return "";
-  }
-  var infoObj = { age: "", gender: "" };
-  var birth = bir.substr(6, 8);
-  var age = bir.substr(16, 1);
-  // console.log(age);
-  // console.log(birth);
-  if (age % 2 == 0) {
-    infoObj.gender = "2";
-  } else {
-    infoObj.gender = "1";
-  }
-  // console.log(bir);
-  var returnAge;
-  // var strBirthdayArr = bir.split("-");
-  // if (strBirthdayArr.length == 1) {
-  //     var d = new Date();
-  //     var nowYear = d.getFullYear();
-  //     return nowYear - strBirthdayArr[0] + 1;
-  // }
-  var birthYear = birth.substr(0, 4);
-  var birthMonth = birth.substr(4, 2);
-  var birthDay = birth.substr(6, 2);
-
-  var d = new Date();
-  var nowYear = d.getFullYear();
-  var nowMonth = d.getMonth() + 1;
-  var nowDay = d.getDate();
-
-  if (nowYear == birthYear) {
-    returnAge = 0; //同年 则为0岁
-  } else {
-    var ageDiff = nowYear - birthYear; //年之差
-    if (ageDiff > 0) {
-      if (nowMonth == birthMonth) {
-        var dayDiff = nowDay - birthDay; //日之差
-        if (dayDiff < 0) {
-          returnAge = ageDiff - 1;
-        } else {
-          returnAge = ageDiff;
-        }
-      } else {
-        var monthDiff = nowMonth - birthMonth; //月之差
-        if (monthDiff < 0) {
-          returnAge = ageDiff - 1;
-        } else {
-          returnAge = ageDiff;
-        }
-      }
-    } else {
-      returnAge = -1; //返回-1 表示出生日期输入错误 晚于今天
-    }
-  }
-  infoObj.age = returnAge;
-  return infoObj; //返回周岁年龄
+	if (isEmptyCheck(bir)) {
+		return "";
+	}
+	var infoObj = { age: "", gender: "" };
+	var birth = bir.substr(6, 8);
+	var age = bir.substr(16, 1);
+	// console.log(age);
+	// console.log(birth);
+	if (age % 2 == 0) {
+		infoObj.gender = "2";
+	} else {
+		infoObj.gender = "1";
+	}
+	// console.log(bir);
+	var returnAge;
+	// var strBirthdayArr = bir.split("-");
+	// if (strBirthdayArr.length == 1) {
+	//     var d = new Date();
+	//     var nowYear = d.getFullYear();
+	//     return nowYear - strBirthdayArr[0] + 1;
+	// }
+	var birthYear = birth.substr(0, 4);
+	var birthMonth = birth.substr(4, 2);
+	var birthDay = birth.substr(6, 2);
+
+	var d = new Date();
+	var nowYear = d.getFullYear();
+	var nowMonth = d.getMonth() + 1;
+	var nowDay = d.getDate();
+
+	if (nowYear == birthYear) {
+		returnAge = 0; //同年 则为0岁
+	} else {
+		var ageDiff = nowYear - birthYear; //年之差
+		if (ageDiff > 0) {
+			if (nowMonth == birthMonth) {
+				var dayDiff = nowDay - birthDay; //日之差
+				if (dayDiff < 0) {
+					returnAge = ageDiff - 1;
+				} else {
+					returnAge = ageDiff;
+				}
+			} else {
+				var monthDiff = nowMonth - birthMonth; //月之差
+				if (monthDiff < 0) {
+					returnAge = ageDiff - 1;
+				} else {
+					returnAge = ageDiff;
+				}
+			}
+		} else {
+			returnAge = -1; //返回-1 表示出生日期输入错误 晚于今天
+		}
+	}
+	infoObj.age = returnAge;
+	return infoObj; //返回周岁年龄
 }
 
 /**
  * 代理成员角色类型
  */
 export function agencyRoleTypeArray() {
-  let workTypeArray = [
-    { id: 1, name: "创建人", value: "1", text: "创建人", checked: false },
-    { id: 2, name: "管理员", value: "2", text: "管理员", checked: false },
-    { id: 3, name: "成员", value: "3", text: "成员", checked: false },
-  ];
-  return workTypeArray;
+	let workTypeArray = [
+		{ id: 1, name: "创建人", value: "1", text: "创建人", checked: false },
+		{ id: 2, name: "管理员", value: "2", text: "管理员", checked: false },
+		{ id: 3, name: "成员", value: "3", text: "成员", checked: false },
+	];
+	return workTypeArray;
 }
 /**
  * 根据代理成员角色ID获取名称
  */
 export function getAgencyRoleTypeById(id) {
-  let str = "";
-  let array = agencyRoleTypeArray();
-  array.forEach((item) => {
-    if (item.id == id) {
-      str = item.name;
-    }
-  });
-  return str;
+	let str = "";
+	let array = agencyRoleTypeArray();
+	array.forEach((item) => {
+		if (item.id == id) {
+			str = item.name;
+		}
+	});
+	return str;
 }
 
 /**
  * 代理成员权限
  */
 export function agencyPermissionArray() {
-  //查看职位、报名、查看报名、查看老乡、修改密码、修改手机号、新增成员、修改成员信息、删除成员
-  let workTypeArray = [
-    {
-      id: 1,
-      name: "查看职位",
-      value: "job:list",
-      text: "查看职位",
-      checked: false,
-    },
-    { id: 2, name: "报名", value: "apply:add", text: "报名", checked: false },
-    {
-      id: 3,
-      name: "查看报名",
-      value: "apply:list",
-      text: "查看报名",
-      checked: false,
-    },
-    {
-      id: 4,
-      name: "查看老乡",
-      value: "apply:user",
-      text: "查看老乡",
-      checked: false,
-    },
-    {
-      id: 5,
-      name: "修改密码",
-      value: "user:pwd",
-      text: "修改密码",
-      checked: false,
-    },
-    {
-      id: 6,
-      name: "修改手机号",
-      value: "user:tel",
-      text: "修改手机号",
-      checked: false,
-    },
-    {
-      id: 7,
-      name: "新增成员",
-      value: "user:add",
-      text: "新增成员",
-      checked: false,
-    },
-    {
-      id: 8,
-      name: "修改成员信息",
-      value: "user:update",
-      text: "修改成员信息",
-      checked: false,
-    },
-    {
-      id: 9,
-      name: "删除成员",
-      value: "user:del",
-      text: "删除成员",
-      checked: false,
-    },
-  ];
-  return workTypeArray;
+	//查看职位、报名、查看报名、查看老乡、修改密码、修改手机号、新增成员、修改成员信息、删除成员
+	let workTypeArray = [
+		{
+			id: 1,
+			name: "查看职位",
+			value: "job:list",
+			text: "查看职位",
+			checked: false,
+		},
+		{ id: 2, name: "报名", value: "apply:add", text: "报名", checked: false },
+		{
+			id: 3,
+			name: "查看报名",
+			value: "apply:list",
+			text: "查看报名",
+			checked: false,
+		},
+		{
+			id: 4,
+			name: "查看老乡",
+			value: "apply:user",
+			text: "查看老乡",
+			checked: false,
+		},
+		{
+			id: 5,
+			name: "修改密码",
+			value: "user:pwd",
+			text: "修改密码",
+			checked: false,
+		},
+		{
+			id: 6,
+			name: "修改手机号",
+			value: "user:tel",
+			text: "修改手机号",
+			checked: false,
+		},
+		{
+			id: 7,
+			name: "新增成员",
+			value: "user:add",
+			text: "新增成员",
+			checked: false,
+		},
+		{
+			id: 8,
+			name: "修改成员信息",
+			value: "user:update",
+			text: "修改成员信息",
+			checked: false,
+		},
+		{
+			id: 9,
+			name: "删除成员",
+			value: "user:del",
+			text: "删除成员",
+			checked: false,
+		},
+	];
+	return workTypeArray;
 }
 
 /**
  * 根据代理权限ID获取名称
  */
 export function getAgencyPermissionNameById(permissionStr) {
-  // let str = "";
-  let array = agencyPermissionArray();
-  let names = [];
-  let permissions = permissionStr.split(",");
-  array.forEach((item) => {
-    if (permissions.indexOf(item.value) >= 0) {
-      names.push(item.name);
-    }
-  });
-  return names.join("，");
+	// let str = "";
+	let array = agencyPermissionArray();
+	let names = [];
+	let permissions = permissionStr.split(",");
+	array.forEach((item) => {
+		if (permissions.indexOf(item.value) >= 0) {
+			names.push(item.name);
+		}
+	});
+	return names.join("，");
 }
 
 /**
  * 根据代理角色获取权限
  */
 export function getAgencyPermissionsByRole(role) {
-  if (role == 1) {
-    return "job:list,apply:add,apply:list,apply:user,user:pwd,user:tel,user:add,user:update,user:del";
-  } else {
-    return "job:list,apply:add,apply:list,apply:user,user:pwd,user:tel";
-  }
+	if (role == 1) {
+		return "job:list,apply:add,apply:list,apply:user,user:pwd,user:tel,user:add,user:update,user:del";
+	} else {
+		return "job:list,apply:add,apply:list,apply:user,user:pwd,user:tel";
+	}
 }
+/**
+ * 获取当前时间
+ */
+export function getDateYMD() {
+	// 开始时间
+	let date = new Date();
+	let prevYear = date.getFullYear();
+	let prevMonth = date.getMonth() + 1;
+	let prevDay = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+	return prevYear + "-" + (prevMonth >= 10 ? prevMonth : "0" + prevMonth) + "-" + prevDay;
+}
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index 0c18946..82d4139 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -26,7 +26,7 @@ const service = axios.create({
 });
 service.interceptors.request.use(
 	(req) => {
-		console.log(req);
+		// console.log(req);
 		// if (req.method == "post" && req.headers["Content-type"]) {
 		// 	if (req.headers["Content-type"].indexOf("multipart/form-data") == -1 && req.headers["Content-type"].indexOf("application/x-www-form-urlencoded") == -1) {
 		// 		let dataObj = qs.stringify(req.data);
@@ -50,10 +50,10 @@ service.interceptors.request.use(
 );
 service.interceptors.response.use(
 	(response) => {
-		console.log(response);
+		// console.log(response);
 		let { msg, status } = response.data;
 		// return response;
-		console.log(status);
+		// console.log(status);
 		if (status == 9999) {
 			localStorage.removeItem("LOGIN_DATA");
 			router.push("/login");
diff --git a/src/views/main.vue b/src/views/main.vue
index 7811bd8..76cde12 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -12,7 +12,7 @@
                 :class="routertitleindex == 0 ? 'titleactive' : ''"
                 rel="opener"
               >
-                稻田首页</router-link
+                首页</router-link
               >
             </li>
             <li>
@@ -38,6 +38,13 @@
                 :class="routertitleindex == 4 ? 'titleactive' : ''"
                 >我的老乡
               </router-link>
+            </li>
+             <li>
+              <router-link
+                to="/dataStatistics"
+                :class="routertitleindex == 6 ? 'titleactive' : ''"
+                >数据统计
+              </router-link>
             </li>
             <!-- <li>
               <router-link to="/serviceoutlets"
@@ -291,8 +298,10 @@ export default {
           return 4;
         } else if (path.indexOf("mybill") > -1) {
           return 5;
-        } else {
+        }  else if (path.indexOf("dataStatistics") > -1) {
           return 6;
+        } else {
+          return 7;
         }
       },
     },
@@ -586,6 +595,12 @@ export default {
 <style scoped lang="less">
 .index-container {
   height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  &>div:nth-child(2){
+    flex: 1;
+  }
   /deep/ .pagetitle {
     background-color: #f0f0f0;
     padding: 0;
diff --git a/webpack.config.js b/webpack.config.js
index 3bc87bf..43960d5 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -6,6 +6,7 @@ module.exports = {
     entry1: "./src/entry/entry1.js",
     entry2: "./src/entry/entry2.js",
   },
+  // devtool: 'source-map',
   plugins: [new CleanWebpackPlugin()],
   output: {
     filename: "[name].bundle.js",