|
@@ -107,15 +107,16 @@
|
|
|
:label="col.day + ''"
|
|
|
:prop="col.id + ''"
|
|
|
:key="col.id + ''"
|
|
|
- width="80px"
|
|
|
+ width="100px"
|
|
|
>
|
|
|
<template slot-scope="{ row }">
|
|
|
<div style="display: flex; flex-direction: column">
|
|
|
- <template v-for="(item, index) in row.personNumberMap[col.id]">
|
|
|
+ <template v-for="(item, index) in row.personNumberMap[col.day]">
|
|
|
<div
|
|
|
- v-html="item"
|
|
|
+ v-html="showItem(item)"
|
|
|
:key="index + ''"
|
|
|
v-on:click="changeWork(row.id, row.name, col.day)"
|
|
|
+ style="white-space: pre-wrap;cursor:pointer;"
|
|
|
></div>
|
|
|
</template>
|
|
|
</div>
|
|
@@ -149,7 +150,8 @@
|
|
|
<el-input
|
|
|
type="text"
|
|
|
v-model="changeUser"
|
|
|
- style="width: 150px"
|
|
|
+ disabled
|
|
|
+ style="width: 200px"
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="部门" prop="changeCompanyId">
|
|
@@ -161,7 +163,12 @@
|
|
|
></el-select-tree>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="班次">
|
|
|
- <el-select v-model="changeShiftId" filterable placeholder="请选择">
|
|
|
+ <el-select
|
|
|
+ v-model="changeShiftId"
|
|
|
+ filterable
|
|
|
+ multiple
|
|
|
+ placeholder="请选择"
|
|
|
+ >
|
|
|
<el-option
|
|
|
v-for="shift in shiftData"
|
|
|
:key="shift.id"
|
|
@@ -273,7 +280,11 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
showItem(item) {
|
|
|
- return item;
|
|
|
+ var str = item;
|
|
|
+ if (item == null || item == "") {
|
|
|
+ str = " ";
|
|
|
+ }
|
|
|
+ return str;
|
|
|
},
|
|
|
indexMethod(index) {
|
|
|
return (this.pageIndex - 1) * this.pageSize + (index + 1);
|