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

src/components/common/cityList.vue

@@ -2,7 +2,7 @@
   <div>
   <div>
     <van-picker
     <van-picker
       show-toolbar
       show-toolbar
-      title="标题"
+      title=""
       :loading="loading"
       :loading="loading"
       :columns="columns"
       :columns="columns"
       @confirm="onConfirm"
       @confirm="onConfirm"

src/views/archives/workInfo.vue

@@ -55,6 +55,8 @@ export default class workInfo extends Vue {
       idNo: this.$route.query.id_no
       idNo: this.$route.query.id_no
     };
     };
     this.$server.EmployeeService.getDispatchInfo(params).then(res => {
     this.$server.EmployeeService.getDispatchInfo(params).then(res => {
+      console.log('get base info ',res);
+      
       this.query=res
       this.query=res
       this.obj = this.sortKey(res.workData, "res.workData.workStartDate")[0];
       this.obj = this.sortKey(res.workData, "res.workData.workStartDate")[0];
     });
     });