Merge branch 'master' of http://gitlab.corp.qinqinxiaobao.com:9880/frontend_vue/qqxb-self-service

src/assets/css/index.less

@@ -46,7 +46,6 @@ address, caption, cite, code, dfn, th, var, b, em, i,table,td,tr,th,strong{
   font-style: normal;
   font-weight: normal;
   font-family:'微软雅黑','宋体';
-  color:#333;
   box-sizing: border-box;
 }
 ul, ol, li,dl {

src/components/archives/eduExperience.vue

@@ -9,7 +9,7 @@
       <div class="editItem">
         <van-cell title="北京大学" is-link value="2019-2019" />
         <van-cell title="北京大学" is-link value="2019-2019" />
-        <div class="addEdu">添加教育经历</div>
+        <div class="addEdu"><i><img src="@/assets/images/add.png" alt=""></i> 添加教育经历</div>
       </div>
     </div>
     <div class="box" v-show="false">
@@ -109,6 +109,15 @@ export default class eduExperience extends Vue {
         line-height: 15px;
         text-align: center;
         margin: 25px auto 12px;
+        display: flex;
+        justify-content: center;
+        i{
+          margin-right: 10px;
+          img{
+            width: 16px;
+            height: 17px;
+          }
+        }
       }
     }
     .unEiteItem {

src/components/archives/personInfo.vue

@@ -190,7 +190,7 @@ import Vue from "vue";
 import { Icon, Button, Popup, Form, Picker, Field, Area, Toast } from "vant";
 import { Component,Prop } from "vue-property-decorator";
 // import selectInfo from "@/components/archives/selectInfo.vue";
-import AreaList from "@/assets/js/area.js";
+// import AreaList from "@/assets/js/area.js";
 @Component({
   components: {
     [Button.name]: Button,
@@ -198,7 +198,7 @@ import AreaList from "@/assets/js/area.js";
     [Popup.name]: Popup,
     [Picker.name]: Picker,
     [Field.name]: Field,
-    [Area.name]: Area,
+    // [Area.name]: Area,
     [Form.name]: Form
     // selectInfo
   }
@@ -222,7 +222,7 @@ export default class personInfo extends Vue {
   private showMaternity: boolean = false;
   private showFile: boolean = false;
   private showWorkStartDate: boolean = false;
-  private areaList: object = AreaList;
+  private areaList: object = {};
   private columns: any = {
     nation: ["汉族", "回族", "蒙古族"],
     political: ["群众", "共青团员", "预备党员", "中共党员", "其他"],

src/components/archives/selectInfo.vue

-<!--个人信息选择组件-->
-<template>
-  <div>
-    <van-form>
-      <!-- 出生地 -->
-      <van-field
-        readonly
-        clickable
-        :value="birthplaceValue"
-        label="出生地"
-        placeholder="请选择出生地"
-        @click="showBirthplace = true"
-      />
-      <van-popup v-model="showBirthplace" position="bottom">
-        <van-area :area-list="areaList" @confirm="onConfirm" @cancel="showArea = false" />
-      </van-popup>
-      <!-- 民族 -->
-      <van-field
-        readonly
-        clickable
-        :value="nationValue"
-        label="民族"
-        placeholder="请选择"
-        @click="showNation = true"
-      />
-      <van-popup v-model="showNation" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="columns.nation"
-          @confirm="onConfirm"
-          @cancel="showNation = false"
-        />
-      </van-popup>
-      <!-- 政治面貌 -->
-      <van-field
-        readonly
-        clickable
-        :value="politicalValue"
-        label="政治面貌"
-        placeholder="请选择"
-        @click="showPolitical = true"
-      />
-      <van-popup v-model="showPolitical" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="columns.political"
-          @confirm="onConfirm"
-          @cancel="showPolitical = false"
-        />
-      </van-popup>
-      <!-- 最高学历 -->
-      <van-field
-        readonly
-        clickable
-        :value="eduValue"
-        label="最高学历"
-        placeholder="请选择"
-        @click="showEdu = true"
-      />
-      <van-popup v-model="showEdu" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="columns.edu"
-          @confirm="onConfirm"
-          @cancel="showEdu = false"
-        />
-      </van-popup>
-      <!-- 婚姻状况 -->
-      <van-field
-        readonly
-        clickable
-        :value="marryValue"
-        label="婚姻状况"
-        placeholder="请选择"
-        @click="showMarry = true"
-      />
-      <van-popup v-model="showMarry" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="columns.marry"
-          @confirm="onConfirm"
-          @cancel="showMarry = false"
-        />
-      </van-popup>
-      <!-- 生育状况 -->
-      <van-field
-        readonly
-        clickable
-        :value="maternityValue"
-        label="生育情况"
-        placeholder="请选择"
-        @click="showMaternity = true"
-      />
-      <van-popup v-model="showMaternity" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="columns.maternity"
-          @confirm="onConfirm"
-          @cancel="showMaternity = false"
-        />
-      </van-popup>
-      <!-- 档案所在地 -->
-      <!-- <van-field
-        readonly
-        clickable
-        :value="maternityValue"
-        label="档案所在地"
-        placeholder="请选择"
-        @click="showMaternity = true"
-      />
-      <van-popup v-model="showMaternity" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="columns.maternity"
-          @confirm="onConfirm"
-          @cancel="showMaternity = false"
-        />
-      </van-popup> -->
-    </van-form>
-  </div>
-</template>
-<script lang="ts">
-import Vue from "vue";
-import AreaList from "@/assets/js/area.js";
-import { Popup, Form, Picker, Field, Area } from "vant";
-import { Component } from "vue-property-decorator";
-
-@Component({
-  components: {
-    [Popup.name]: Popup,
-    [Form.name]: Form,
-    [Picker.name]: Picker,
-    [Field.name]: Field,
-    [Area.name]: Area
-  }
-})
-export default class personInfo extends Vue {
-  private obj: object = {};
-  private show: boolean = false;
-  private birthplaceValue: string = "";
-  private nationValue:string=""
-  private politicalValue:string=""
-  private eduValue:string=""
-  private marryValue:string=""
-  private maternityValue:string=""
-  private areaList: object = AreaList;
-  private showBirthplace: boolean = false;
-  private showNation: boolean = false;
-  private showPolitical: boolean = false;
-  private showEdu: boolean = false;
-  private showMarry: boolean = false;
-  private showMaternity: boolean = false;
-  private columns: any = {
-    nation: ["汉族", "回族", "蒙古族"],
-    political: ["群众", "共青团员", "预备党员", "中共党员", "其他"],
-    edu: [
-      "小学",
-      "初中",
-      "高中",
-      "大专",
-      "本科",
-      "硕士研究生",
-      "博士研究生",
-      "职高",
-      "中专",
-      "技校",
-      "其他"
-    ],
-    marry: ["已婚", "未婚"],
-    maternity: ["未育", "已育一孩", "已育多孩"]
-  };
-
-  onConfirm(value:any) {
-    this.maternityValue=value
-    // this.birthplaceValue = values.map((item: any) => item.name).join("/");
-    // this.showBirthplace = false;
-    // if(item==="a"){
-    //   // console.log(value,item)
-    //   // this.maternityValue=value
-    //   this.showMaternity=false
-    // }
-  }
-}
-</script>
-<style lang="less" scoped>
-</style>
\ No newline at end of file

src/components/archives/technologyExperience.vue

@@ -57,8 +57,6 @@ export default class technologyExperience extends Vue {
     };
     this.$server.EmployeeService.getTechnologyExperience(params)
       .then(res => {
-        console.log("res=" + JSON.stringify(res) + "技术特长");
-
         this.obj = res;
       })
       .catch(error => {});

src/components/archives/workExperience.vue

@@ -9,7 +9,7 @@
       <div class="editItem">
         <van-cell title="亲亲小保" is-link value="2019-2019" />
         <van-cell title="亲亲小保" is-link value="2019-2019" />
-        <div class="addEdu">添加工作经历</div>
+        <div class="addEdu"><i><img src="@/assets/images/add.png" alt=""></i>添加工作经历</div>
       </div>
     </div>
     <div class="box" v-show="true">
@@ -100,6 +100,15 @@ export default class workExperience extends Vue {
         line-height: 15px;
         text-align: center;
         margin: 25px auto 12px;
+        display: flex;
+        justify-content: center;
+        i{
+          margin-right: 10px;
+          img{
+            width: 16px;
+            height: 17px;
+          }
+        }
       }
     }
     .unEiteItem {

src/services/employee/employeeService.ts

@@ -7,6 +7,8 @@ export interface EmployeeInterface {
     getDispatchInfo(params: any): Promise<any>; //通过身份证号和派遣公司ID拿到派遣员工的信息(劳务派遣首页数据)
     getWorkInfoList(params: any): Promise<any>; //获取工作信息列表
     getWorkInfoDetail(params: any): Promise<any>; //获取工作信息详情
+    updateWorkInfo(params: any): Promise<any>; //修改工作信息
+    addWorkInfo(params: any): Promise<any>; //新增工作信息
     getPersonInfo(params: any): Promise<any>; //获取个人信息
     savePersonInfo(params: any): Promise<any>; //保存个人信息
     getContactInfo(params: any): Promise<any>; //获取联系信息

src/servicesImpl/employee/employeeImpl.ts

@@ -85,6 +85,26 @@ class EmployeeService implements EmployeeInterface {
     }
 
     /**
+     * 修改工作信息
+     * @param params 请求参数
+     */
+
+    public updateWorkInfo(params: any): Promise<any> {
+        let url = urls.employeeUrl + `/api/user/employee/work/info`;
+        return request.put(url, params, this.header)
+    }
+
+    /**
+     * 新增工作信息
+     * @param params 请求参数
+     */
+
+    public addWorkInfo(params: any): Promise<any> {
+        let url = urls.employeeUrl + `/api/user/employee/work/info`;
+        return request.post(url, params, this.header)
+    }
+
+    /**
      * 获取个人信息
      * @param params 请求参数
      */