Merge branch 'ehs' into v2

src/views/hrm/clock_record.vue

@@ -6,7 +6,7 @@
           v-model="query.employee__belong_dept" 
           ref="belongDept"
           :options="deptData" clearable 
-          placeholder="相关方" 
+          placeholder="部门/单位" 
           @change="handleQuery" 
           :show-all-levels="false" 
           :props="{emitPath:false}"
@@ -253,9 +253,9 @@
                   let dateInd = new Date(recordList[j].create_time).getDate();
                     let dateIndex = parseInt(dateInd);
                     if(recordList[j].type==10){
-                      rowData1[dateIndex+1] = '√';
+                      rowData1[dateIndex+1] = '√-' + recordList[j].create_time.substring(11);
                     }else{
-                      rowData2[dateIndex+1] = '√';
+                      rowData2[dateIndex+1] = '√-' + recordList[j].create_time.substring(11);
                     }
                 }
                 tableData.push(rowData1);
@@ -321,7 +321,7 @@
       },
       genTree(data) {
         const result = [
-          {id:'bumen',label:'部门',value:'bumen',children:[]},
+          {id:'bumen',label:'本部',value:'bumen',children:[]},
           {id:'xiangguanfang',label:'相关方',value:'xiangguanfang',children:[]}
         ]
         if (!Array.isArray(data)) {