zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ehs' into v2

This commit is contained in:
caoqianming 2023-03-09 15:45:49 +08:00
parent 3b2482e492 c6e63f9c94
commit 73a5a8483f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/hrm/clock_record.vue
View File

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