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

src/views/archives/personInfo.vue

@@ -55,7 +55,7 @@
           <city-list @childCityList="birthCity" />
         </van-popup>
         <!-- 民族 -->
-        <!-- <van-field
+        <van-field
           readonly
           clickable
           :value="obj.infoNation"
@@ -70,8 +70,8 @@
             @confirm="onConfirmNation"
             @cancel="showNation = false"
           />
-        </van-popup>-->
-        <popup-picker :label="label" />
+        </van-popup>
+        <!-- <popup-picker :label="label" /> -->
         <!-- 政治面貌 -->
         <van-field
           readonly
@@ -230,7 +230,64 @@ export default class personInfo extends Vue {
   private showWorkStartDate: boolean = false;
   private currentDate: Date = new Date();
   private columns: any = {
-    nation: ["汉族", "回族", "蒙古族"],
+    nation: [
+      "汉族",
+      "满族",
+      "蒙古族",
+      "回族",
+      "藏族",
+      "维吾尔族",
+      "苗族",
+      "彝族",
+      "壮族",
+      "布依族",
+      "侗族",
+      "瑶族",
+      "白族",
+      "土家族",
+      "哈尼族",
+      "哈萨克族",
+      "傣族",
+      "黎族",
+      "傈僳族",
+      "佤族",
+      "畲族",
+      "高山族",
+      "拉祜族",
+      "水族",
+      "东乡族",
+      "纳西族",
+      "景颇族",
+      "柯尔克孜族",
+      "土族",
+      "达斡尔族",
+      "仫佬族",
+      "羌族",
+      "布朗族",
+      "撒拉族",
+      "毛南族",
+      "仡佬族",
+      "锡伯族",
+      "阿昌族",
+      "普米族",
+      "朝鲜族",
+      "塔吉克族",
+      "怒族",
+      "乌孜别克族",
+      "俄罗斯族",
+      "鄂温克族",
+      "德昂族",
+      "保安族",
+      "裕固族",
+      "京族",
+      "塔塔尔族",
+      "独龙族",
+      "鄂伦春族",
+      "赫哲族",
+      "门巴族",
+      "珞巴族",
+      "基诺族"
+    ],
     political: ["群众", "共青团员", "预备党员", "中共党员", "其他"],
     edu: [
       "小学",
@@ -253,11 +310,10 @@ export default class personInfo extends Vue {
     let params = {
       edId: this.$route.query.ed_id
     };
-    this.$server.EmployeeService.getPersonInfo(params)
-      .then(res => {
-        this.obj = res;
-        console.log(res);
-      })
+    this.$server.EmployeeService.getPersonInfo(params).then(res => {
+      this.obj = res;
+      console.log(res);
+    });
   }
   editInfo(): void {
     this.show = true;
@@ -323,8 +379,6 @@ export default class personInfo extends Vue {
         console.log(error);
       });
   }
-  
-  
 }
 </script>
 

src/views/archives/workInfo.vue

@@ -7,23 +7,23 @@
     <div class="box">
       <div class="item">
         <span>派遣公司</span>
-        <label></label>
+        <label>{{query.sp_full_name}}</label>
       </div>
       <div class="item">
         <span>用工单位</span>
-        <label></label>
+        <label>{{obj.workUnit}}</label>
       </div>
       <div class="item">
         <span>工作地点</span>
-        <label></label>
+        <label>{{query.work_address}}</label>
       </div>
       <div class="item">
         <span>工作职位</span>
-        <label>xx</label>
+        <label>{{obj.position}}</label>
       </div>
       <div class="item">
         <span>入职时间</span>
-        <label>xxx</label>
+        <label>{{obj.workStartDate}}</label>
       </div>
     </div>
   </div>
@@ -40,7 +40,8 @@ import { Component } from "vue-property-decorator";
   }
 })
 export default class workInfo extends Vue {
-  obj: object = {};
+  obj: any = "";
+  query:any=""
   sortKey(array: any, key: any) {
     return array.sort(function(a: any, b: any) {
       var x = a[key];
@@ -54,8 +55,8 @@ export default class workInfo extends Vue {
       idNo: this.$route.query.id_no
     };
     this.$server.EmployeeService.getDispatchInfo(params).then(res => {
-      console.log("res=======" + JSON.stringify(res.workData));
-      this.sortKey(res.workDat, "");
+      this.query=res
+      this.obj = this.sortKey(res.workData, "res.workData.workStartDate")[0];
     });
   }
 }