This commit is contained in:
linfso 2024-05-10 13:30:02 +08:00
parent 16370fefcb
commit 66d02f5cd6
4 changed files with 31 additions and 51 deletions

View File

@ -154,14 +154,20 @@
</template>
</el-table-column>
<el-table-column label="启用状态" align="center" prop="status" width="80" >
<template slot-scope="scope">
<template slot-scope="scope">
<div>{{scope.row.status}}
<dict-tag :options="dict.type.sys_biz_enable_status" :value="scope.row.status"/>
</div>
</template>
<!-- <dict-tag :options="dict.type.sys_biz_enable_status" :value="scope.row.status"/> -->
<!-- <template slot-scope="scope">
<el-switch
v-model="scope.row.status"
:active-value="1"
:inactive-value="0"
@change="handleStatusChange(scope.row)"
></el-switch>
</template>
</template> -->
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="170" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">

View File

@ -202,10 +202,10 @@
</el-col>
<el-col :span="8">
<el-form-item label="是否停用" prop="blNotInput">
<el-radio-group v-model="form.blNotInput">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
<el-form-item label="是否停用" prop="status">
<el-radio-group v-model="form.status">
<el-radio label="0">是</el-radio>
<el-radio label="1">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@ -230,18 +230,18 @@
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="是否允许开通中班" prop="blClass" label-width="130px">
<el-radio-group v-model="form.blClass">
<el-radio label="0">不开通</el-radio>
<el-radio label="1">开通</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="8">
<el-form-item label="是否允许使用物料" prop="blMaterial" label-width="130px">
<el-radio-group v-model="form.blClass">
<el-radio-group v-model="form.blMaterial">
<el-radio label="0">不允许</el-radio>
<el-radio label="1">允许</el-radio>
</el-radio-group>

View File

@ -170,7 +170,7 @@
<el-table-column label="派件所属网点" align="left" prop="parentSiteName" min-width="120" :show-overflow-tooltip="true" />
<el-table-column label="所属财务中心" align="left" prop="superiorFinanceCenterName" min-width="120" :show-overflow-tooltip="true" />
<el-table-column label="所属区域" align="center" prop="areaName" min-width="100" />
<!-- <el-table-column label="所属区域" align="center" prop="areaName" min-width="100" /> -->
<el-table-column label="启用状态" align="center" prop="status" min-width="100" >
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_biz_enable_status" :value="scope.row.status"/>
@ -283,7 +283,7 @@ export default {
showSearch: true,
// 创建时间搜索
dateTimeRange:[],
tableHeight: "",//表格高度
tableHeight: 200,
// 总条数
total: 0,
// 网点表格数据
@ -457,7 +457,6 @@ export default {
},
created() {
this.getList();
this.$nextTick(function() {
this.getTableHeight();
});
@ -465,25 +464,11 @@ export default {
},
methods: {
getTableHeight() {
// this.tableHeight = this.$refs.tableBox.clientHeight - 40;
// var appContainerHeight=document.getElementById('appContainer').offsetHeight;
var formHeight=document.getElementById('refQueryForm').offsetHeight;
// var element = document.getElementById('refQueryForm');
// var elHeight = element.offsetHeight;
console.log(formHeight);
const divHeight = this.$refs.queryForm.offsetHeight;
console.log(`queryForm元素的高度为:${divHeight}px`);
let tableH = formHeight+190;
this.tableHeight = window.innerHeight - tableH;
// let tableHeightDetil = window.innerHeight - tableH;
// if (tableHeightDetil <= 300) {
// this.tableHeight = 300;
// } else {
// this.tableHeight = window.innerHeight - tableH;
// }
},
/** 查询网点列表 */
getList() {
@ -616,7 +601,7 @@ export default {
};
</script>
<style scoped>
<style lang="scss" scoped>
.el-divider{
margin-top: 0px;
background: 0 0;
@ -626,8 +611,11 @@ export default {
color: #0955ee;
cursor: pointer;
}
/*示例中顶部区域固定高度190px*/
.table-box{
height:calc(100vh - 200px);
:deep .el-table {
.el-table__body {
height: 100%;
}
}
</style>
</stylel>

View File

@ -1,15 +1,12 @@
<template>
<div class="app-container">
<el-row :gutter="20" type='flex'>
<el-row :gutter="0" type='flex'>
<!--部门数据-->
<el-col :span="4" :xs="4" style="border-right:1px solid rgb(248 249 251);">
<!-- <DeptmentTreePicker v-model="queryParams.deptId" @onNodeClick="handleQuery"></DeptmentTreePicker> -->
<!-- <EmisSiteLeftTreePicker v-model="queryParams.ownerSiteCode" @onNodeClick="handleQuery"></EmisSiteLeftTreePicker> -->
<!-- <el-col :span="4" :xs="4" style="border-right:1px solid rgb(248 249 251);">
<CountryTreePicker placeholder="所属国家" v-model="queryParams.params.countryCode" @onNodeClick="handleQuery"></CountryTreePicker>
</el-col>
</el-col> -->
<!--用户数据-->
<el-col :span="20" :xs="20" style="border-left:1px solid rgb(248 249 251);">
<el-col :span="24" :xs="24" >
<SearchForm :model="queryParams" ref="queryForm" size="mini" :maxShow="20" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="所属国家" prop="countryCode">
<CountryPicker :placeholder="$t('所属国家')" v-model="queryParams.params.countryCode" @onChange="handleQuery"></CountryPicker>
@ -60,17 +57,6 @@
></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="创建时间">
<el-date-picker
v-model="dateRange"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item> -->
</SearchForm>
<XdTable v-loading="loading" border stripe size="mini"