Merge branch 'dev-cjw' into shenzhen-dev

src/views/projectFront/laborManage/personDetails.vue

@@ -1301,7 +1301,7 @@
                   }}</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="address" :label="dateOfIssue">
+              <el-table-column prop="address" :label="$t('message.laborMange.dateOfIssue')">
                 <template slot-scope="scope">
                   <el-date-picker
                     v-if="scope.row.certificateState"

src/views/projectFront/materialProcure/unProcureForm.vue

@@ -518,7 +518,7 @@ export default {
 <style lang="less" scoped>
 .header-info{
   width: 35%;
-  height: 50px;
+  height: 25px;
   display: flex;
   justify-content: space-between;
   align-items: center;

src/views/projectFront/wareHouseManage/devManage.vue

@@ -86,7 +86,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="进场时间" prop="entryTime">
+          <el-form-item label="时间" prop="entryTime">
             <el-date-picker
               :disabled="isDetail"
               value-format="yyyy-MM-dd HH:mm:ss"
@@ -152,7 +152,7 @@ export default {
   },
   data() {
     return {
-      id: '',
+      devSn: '',
       pageNo2: 1,
       pageSize2: 10,
       total2: 0,
@@ -351,18 +351,18 @@ export default {
       this.dialogTableVisible = true
       this.pageNo2 = 1
       this.pageSize2 = 10
-      this.id = obj.id
+      this.devSn = obj.devSn
       this.getPageList()
     },
 
-    //获取人员动态--今日数据列表
+    //获取历史数据列表
     getPageList() {
       console.log(this.startTime)
       let data = {
         projectSn: this.$store.state.projectSn,
         pageNo: this.pageNo2,
         pageSize: this.pageSize2,
-        id: this.id
+        devSn: this.devSn
       }
       rtToolPageHistory(data).then((res) => {
         if (res.code == 200) {