|
|
@@ -78,18 +78,25 @@
|
|
|
</el-table-column>
|
|
|
<!-- 班次信息分组 -->
|
|
|
<el-table-column label="班次信息">
|
|
|
+ <el-table-column
|
|
|
+ key="paiBanMingChen"
|
|
|
+ prop="paiBanMingChen"
|
|
|
+ label="配置名称"
|
|
|
+ min-width="140"
|
|
|
+ />
|
|
|
<el-table-column
|
|
|
key="banCiMing"
|
|
|
prop="banCiMing"
|
|
|
- label="班次名称"
|
|
|
- width="100"
|
|
|
+ label="排班类型"
|
|
|
+ width="140"
|
|
|
/>
|
|
|
+ <!--
|
|
|
<el-table-column
|
|
|
key="banCiBieMing"
|
|
|
prop="banCiBieMing"
|
|
|
label="班次别名"
|
|
|
width="100"
|
|
|
- />
|
|
|
+ />-->
|
|
|
</el-table-column>
|
|
|
<el-table-column key="riQi" prop="riQi" label="日期" width="100" />
|
|
|
<!-- 上班分组 -->
|
|
|
@@ -342,8 +349,9 @@ export default {
|
|
|
fieldType: 'select',
|
|
|
options: deptOption
|
|
|
},
|
|
|
- { prop: 'Q^ban_ci_ming_^SL', label: '班次名称' },
|
|
|
- { prop: 'Q^ban_ci_bie_ming_^SL', label: '班次别名' },
|
|
|
+ { prop: 'Q^pai_ban_ming_chen^SL', label: '配置名称' },
|
|
|
+ { prop: 'Q^ban_ci_ming_^SL', label: '排班类型' },
|
|
|
+ //{ prop: 'Q^ban_ci_bie_ming_^SL', label: '班次别名' },
|
|
|
{
|
|
|
prop: '',
|
|
|
label: '日期范围',
|
|
|
@@ -459,8 +467,13 @@ export default {
|
|
|
{ field_name: 'userName', label: '姓名', name: 'userName' },
|
|
|
{ field_name: 'deptName', label: '部门', name: 'deptName' },
|
|
|
{ field_name: 'gongHao', label: '工号', name: 'gongHao' },
|
|
|
- { field_name: 'banCiMing', label: '班次名称', name: 'banCiMing' },
|
|
|
- { field_name: 'banCiBieMing', label: '班次别名', name: 'banCiBieMing' },
|
|
|
+ {
|
|
|
+ field_name: 'paiBanMingChen',
|
|
|
+ label: '配置名称',
|
|
|
+ name: 'paiBanMingChen'
|
|
|
+ },
|
|
|
+ { field_name: 'banCiMing', label: '排班类型', name: 'banCiMing' },
|
|
|
+ //{ field_name: 'banCiBieMing', label: '班次别名', name: 'banCiBieMing' },
|
|
|
{ field_name: 'riQi', label: '日期', name: 'riQi' },
|
|
|
{ field_name: 'daKaShiJian1', label: '上班打卡时间', name: 'daKaShiJian1' },
|
|
|
{ field_name: 'zhuangTai1', label: '上班打卡状态', name: 'zhuangTai1' },
|