|
|
@@ -19,6 +19,15 @@
|
|
|
inline
|
|
|
class="demo-form-inline"
|
|
|
>
|
|
|
+ <el-form-item label="公司名称" prop="companyId">
|
|
|
+ <el-select-tree
|
|
|
+ size="mini"
|
|
|
+ :props="companyProps"
|
|
|
+ :options="companyResult"
|
|
|
+ v-model="queryModel.companyId"
|
|
|
+ height="200"
|
|
|
+ ></el-select-tree>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="班次名称" prop="name">
|
|
|
<el-input type="text" size="mini" v-model="queryModel.name"></el-input>
|
|
|
</el-form-item>
|
|
|
@@ -69,6 +78,11 @@
|
|
|
@selection-change="handleSelectionChange"
|
|
|
>
|
|
|
<el-table-column type="selection" width="55"></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="companyName"
|
|
|
+ label="部门名称"
|
|
|
+ width="180"
|
|
|
+ ></el-table-column>
|
|
|
<el-table-column
|
|
|
prop="name"
|
|
|
label="班次名称"
|
|
|
@@ -79,14 +93,9 @@
|
|
|
label="周工作日"
|
|
|
width="180"
|
|
|
></el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="startType"
|
|
|
- label="1-当天,2-第二天"
|
|
|
- width="180"
|
|
|
- ></el-table-column>
|
|
|
<el-table-column
|
|
|
prop="startTime"
|
|
|
- label="上班时间(HH:mm)"
|
|
|
+ label="上班时间"
|
|
|
width="180"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -99,14 +108,9 @@
|
|
|
label="上班延迟分钟"
|
|
|
width="180"
|
|
|
></el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="endType"
|
|
|
- label="1-当天,2-第二天"
|
|
|
- width="180"
|
|
|
- ></el-table-column>
|
|
|
<el-table-column
|
|
|
prop="endTime"
|
|
|
- label="下班时间(HH:mm)"
|
|
|
+ label="下班时间"
|
|
|
width="180"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -162,6 +166,8 @@ import WorkScheduleCompany from "./workSchedule-company";
|
|
|
import workScheduleApi from "@/api/base/workSchedule";
|
|
|
import NProgress from "nprogress"; // progress bar
|
|
|
import "nprogress/nprogress.css"; // progress bar style
|
|
|
+import companyInfoApi from "@/api/base/companyInfo";
|
|
|
+import SelectTree from "@/components/SelectTree";
|
|
|
|
|
|
export default {
|
|
|
data() {
|
|
|
@@ -201,8 +207,24 @@ export default {
|
|
|
showModal1: false,
|
|
|
modalTitle: "",
|
|
|
businessKey: "",
|
|
|
+ companyResult: [],
|
|
|
+ companyProps: {
|
|
|
+ value: "id",
|
|
|
+ label: "name",
|
|
|
+ children: "children"
|
|
|
+ },
|
|
|
};
|
|
|
},
|
|
|
+ created() {
|
|
|
+ var self = this;
|
|
|
+
|
|
|
+ companyInfoApi.list().then(function(response) {
|
|
|
+ var jsonData = response.data;
|
|
|
+ if (jsonData.result) {
|
|
|
+ self.companyResult = jsonData.data;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
methods: {
|
|
|
changePage(pageIndex) {
|
|
|
var self = this;
|
|
|
@@ -344,6 +366,7 @@ export default {
|
|
|
components: {
|
|
|
"workSchedule-detail": WorkScheduleDetail,
|
|
|
"workSchedule-company": WorkScheduleCompany,
|
|
|
+ "el-select-tree": SelectTree
|
|
|
},
|
|
|
};
|
|
|
</script>
|
