Commit 67dd4a15 authored by 姬鋆屾's avatar 姬鋆屾

推添加表格高度固定并添加请假人联动

parent 8d621541
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
:empty-text="emptytxt ? emptytxt : emptyText" :empty-text="emptytxt ? emptytxt : emptyText"
border border
:height="height"
style="width: 100%" style="width: 100%"
> >
<template v-for="column in columns"> <template v-for="column in columns">
...@@ -113,6 +114,10 @@ export default { ...@@ -113,6 +114,10 @@ export default {
required: false, required: false,
default: () => [], default: () => [],
}, },
height: {
type: String,
required: false,
},
}, },
computed: { computed: {
emptyText() { emptyText() {
......
...@@ -201,6 +201,7 @@ ...@@ -201,6 +201,7 @@
:handleSelectionChange="config.methods.handleSelectionChange" :handleSelectionChange="config.methods.handleSelectionChange"
:handleRowClick="config.methods.handleRowClick" :handleRowClick="config.methods.handleRowClick"
:handleCellClick="config.methods.handleCellClick" :handleCellClick="config.methods.handleCellClick"
:height="config.height"
/> />
<DataTableFlow <DataTableFlow
......
...@@ -26,8 +26,9 @@ ...@@ -26,8 +26,9 @@
remote remote
v-model="form.leavePerson" v-model="form.leavePerson"
placeholder="请输入请假人" placeholder="请输入请假人"
@change="changeStaff(form.leavePerson)"
:maxLength="10" :maxLength="10"
:enumData="staffList" :enumData="dict.staffList"
:disabled="pageInfo.type == 'view'" :disabled="pageInfo.type == 'view'"
/> />
<Field <Field
...@@ -37,7 +38,7 @@ ...@@ -37,7 +38,7 @@
type="select" type="select"
placeholder="请选择所属部门" placeholder="请选择所属部门"
:enumData="dict.deptId" :enumData="dict.deptId"
:disabled="pageInfo.type == 'view'" :disabled="true"
/> />
<!-- <Field label="所属部门" prop="deptName" v-model="form.deptName" type="textarea" placeholder="请输入所属部门"/> --> <!-- <Field label="所属部门" prop="deptName" v-model="form.deptName" type="textarea" placeholder="请输入所属部门"/> -->
<Field <Field
...@@ -175,7 +176,7 @@ export default { ...@@ -175,7 +176,7 @@ export default {
loading: true, loading: true,
// 弹出层标题 // 弹出层标题
title: "请假记录信息", title: "请假记录信息",
staffList: {}, staffList: [],
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
direction: "rtl", direction: "rtl",
...@@ -227,6 +228,10 @@ export default { ...@@ -227,6 +228,10 @@ export default {
this.remoteMethod(); this.remoteMethod();
}, },
methods: { methods: {
changeStaff(val) {
let person = this.staffList.filter((v) => v.id == val);
this.form.deptId = person ? person[0].deptId : "";
},
async remoteMethod() { async remoteMethod() {
await this.$post(`/staff/list`, { await this.$post(`/staff/list`, {
page: 1, page: 1,
...@@ -234,12 +239,11 @@ export default { ...@@ -234,12 +239,11 @@ export default {
}).then((res) => { }).then((res) => {
let data = res.data.data; let data = res.data.data;
let obj = {}; let obj = {};
console.log(data);
for (let key in data) { for (let key in data) {
obj[data[key].id] = data[key].name; obj[data[key].id] = data[key].name;
} }
this.staffList = obj; this.dict.staffList = obj;
this.dict.staffList = this.staffList; this.staffList = res.data.data;
}); });
}, },
// beforeSubmit() { // beforeSubmit() {
......
...@@ -395,6 +395,7 @@ export default { ...@@ -395,6 +395,7 @@ export default {
config: { config: {
showType: "tableSelect", showType: "tableSelect",
isshowTabPane: true, isshowTabPane: true,
height: "680px",
search: [ search: [
{ {
name: "salaId", name: "salaId",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment