This commit is contained in:
linfso 2024-05-10 11:42:02 +08:00
parent f2f079f327
commit c69ab51959
7 changed files with 225 additions and 199 deletions

View File

@ -221,36 +221,36 @@ export default {
this.isDragging = false
},
//右键点击事件
onRightClick(row, column, event) {
console.log(arguments);
var menu = document.querySelector("#rightMenu");
event.preventDefault();
//获取我们自定义的右键菜单
// onRightClick(row, column, event) {
// console.log(arguments);
// var menu = document.querySelector("#rightMenu");
// event.preventDefault();
// //获取我们自定义的右键菜单
// 根据事件对象中鼠标点击的位置,进行定位
menu.style.left = event.clientX + "px";
menu.style.top = event.clientY + "px";
// 改变自定义菜单的隐藏与显示
menu.style.display = "block";
console.log(row, column);
// 获取当前右键点击table下标
// this.tableData.forEach((item, index) => {
// if (item.bugid === row.bugid) {
// //这里判断相等的条件可以自己改为该行数据的唯一键
// this.currentRowIndex = index;
// return false;
// }
// });
// this.setCurrent(row);
},
// // 根据事件对象中鼠标点击的位置,进行定位
// menu.style.left = event.clientX + "px";
// menu.style.top = event.clientY + "px";
// // 改变自定义菜单的隐藏与显示
// menu.style.display = "block";
// console.log(row, column);
// // 获取当前右键点击table下标
// // this.tableData.forEach((item, index) => {
// // if (item.bugid === row.bugid) {
// // //这里判断相等的条件可以自己改为该行数据的唯一键
// // this.currentRowIndex = index;
// // return false;
// // }
// // });
// // this.setCurrent(row);
// },
onCellClick(row, column, cell, event) {
console.log(row);
console.log(column);
console.log(cell);
console.log(event);
cell.classList.add("blue-cell")
},
// onCellClick(row, column, cell, event) {
// console.log(row);
// console.log(column);
// console.log(cell);
// console.log(event);
// cell.classList.add("blue-cell")
// },
// 动态列渲染表格时,需要在列渲染完成后重新渲染一下表格
reload() {

View File

@ -1,6 +1,6 @@
<template>
<el-select
style="width:100%"
filterable
clearable
v-model="svalue"
@ -11,6 +11,7 @@
>
<el-option v-for="item in optionItems" :key="item.code" :label="item.name+'('+item.code+'-'+item.nameEn+')'" :value="item.code" ></el-option>
</el-select>
<!-- style="width:100%" -->
</template>
<script>
import emitter from 'element-ui/src/mixins/emitter';

View File

@ -1,14 +1,15 @@
<template>
<el-select
style="width:100%"
filterable
clearable
v-model="svalue"
:placeholder="placeholder"
@blur="onBlur"
@change="onChange">
<el-option v-for="item in optionItems" :key="item.lineCode" :label="item.lineCode+'-'+item.lineName" :value="item.lineCode" />
<el-option v-for="item in optionItems" :key="item.lineCode" :label="item.lineName" :value="item.lineCode" />
</el-select>
<!-- style="width:100%" -->
</template>
<script>

View File

@ -1,6 +1,5 @@
<template>
<el-select
style="width:100%"
filterable
clearable
v-model="svalue"
@ -8,9 +7,11 @@
@blur="onBlur"
@change="onChange"
>
<el-option v-for="item in optionItems" :key="item.prodCode" :label="item.prodCode+'-'+item.prodName" :value="item.prodCode" />
<el-option v-for="item in optionItems" :key="item.prodCode" :label="item.prodName" :value="item.prodCode" />
</el-select>
<!-- style="width:100%" -->
</template>
<script>
import emitter from 'element-ui/src/mixins/emitter';

View File

@ -1,10 +1,10 @@
<template>
<div class="app-container">
<el-row :gutter="20" type='flex'>
<el-col :span="4" :xs="4">
<el-row :gutter="0" type='flex'>
<!-- <el-col :span="4" :xs="4">
<CountryTreePicker placeholder="所属国家" v-model="queryParams.country" @onNodeClick="handleQuery"></CountryTreePicker>
</el-col>
<el-col :span="20" :xs="20">
</el-col> -->
<el-col :span="24" :xs="24">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="10" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="country">

View File

@ -317,7 +317,7 @@ export default {
// 表单校验
rules: {
siteCode: [
{ required: true, message: "网点编号不能为空", trigger: "blur" },
{ required: true, message: "网点编号不能为空", trigger: ["blur","change"] },
{ validator: this.validateCode, trigger: "blur" }
],
@ -325,13 +325,13 @@ export default {
{ required: true, message: "网点名称不能为空", trigger: "blur" }
],
parentSiteCode: [
{ required: true, message: "所属网点不能为空", trigger: "blur" }
{ required: true, message: "所属网点不能为空", trigger: ["blur","change"] }
],
// cutOffTime: [
// { required: true, message: "截单时间不能为空", trigger: "blur" }
// ],
superiorFinanceCenterCode: [
{ required: true, message: "财务中心不能为空", trigger: "blur" }
{ required: true, message: "财务中心不能为空", trigger: ["blur","change"] }
],
siteType: [
{ required: true, message: "站点类型不能为空", trigger: "blur" }
@ -340,7 +340,7 @@ export default {
{ required: true, message: "加盟类型不能为空", trigger: "blur" }
],
countryCode: [
{ required: true, message: "国家不能为空", trigger: "blur" }
{ required: true, message: "国家不能为空", trigger: ["blur","change"]}
],
province: [
{ required: true, message: "省不能为空", trigger: "blur" }

View File

@ -1,14 +1,6 @@
<template>
<div class="app-container">
<el-row :gutter="20" type='flex'>
<el-col :span="4" :xs="4" style="border-right:1px solid rgb(248 249 251);">
<!-- <EmisSiteTreePicker v-model="queryParams.countryCode"></EmisSiteTreePicker> -->
<CountryTreePicker v-model="queryParams.countryCode" @onNodeClick="handleQuery"></CountryTreePicker>
</el-col>
<el-col :span="20" :xs="20" style="border-left: 1px solid #dfe6ec;">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="20" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="siteCode">
<el-input
v-model="queryParams.siteCode"
@ -75,11 +67,9 @@
<el-form-item label="" prop="logoType">
<EmisBrandPicker :placeholder="$t('所属品牌')" v-model="queryParams.logoType" @onChange="handleQuery"></EmisBrandPicker>
</el-form-item>
</SearchForm>
<div class="table-box" ref="tableBox">
<xd-table v-loading="loading" border stripe size="mini"
:data="emisSiteList"
:showSearch.sync="showSearch"
@ -88,6 +78,8 @@
:queryParams="queryParams"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
v-if="tableHeight"
:max-height="tableHeight + 'px'"
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
@ -113,7 +105,7 @@
v-hasPermi="['emis:emisSite:edit']"
>修改</el-button>
</el-col> -->
<!-- <el-col :span="1.5">
<el-col :span="1.5">
<el-button
type="danger"
plain
@ -123,7 +115,7 @@
@click="handleDelete"
v-hasPermi="['emis:emisSite:remove']"
>删除</el-button>
</el-col> -->
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="warning"
@ -245,10 +237,7 @@
</template>
</el-table-column>
</xd-table>
</el-col>
</el-row>
</div>
<el-dialog :title="titleForm" :visible.sync="openForm" width="70%" :destroy-on-close="true" append-to-body :close-on-click-modal="false">
<emisSiteForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisSiteForm>
</el-dialog>
@ -296,6 +285,7 @@ export default {
showSearch: true,
// 创建时间搜索
dateTimeRange:[],
tableHeight: "",//表格高度
// 总条数
total: 0,
// 网点表格数据
@ -454,10 +444,39 @@ export default {
}
};
},
mounted() {
//挂载window.onresize事件(动态设置table高度)
let _this = this;
window.onresize = () => {
if (_this.resizeFlag) {
clearTimeout(_this.resizeFlag);
}
_this.resizeFlag = setTimeout(() => {
_this.getTableHeight();
_this.resizeFlag = null;
}, 100);
};
},
created() {
this.getList();
this.$nextTick(function() {
this.getTableHeight();
});
},
methods: {
getTableHeight() {
this.tableHeight = this.$refs.tableBox.clientHeight - 40;
// console.log(this.$refs.queryForm.offsetHeight);
// let tableH = 200;
// let tableHeightDetil = window.innerHeight - tableH;
// if (tableHeightDetil <= 300) {
// this.tableHeight = 300;
// } else {
// this.tableHeight = window.innerHeight - tableH;
// }
},
/** 查询网点列表 */
getList() {
this.loading = true;
@ -599,4 +618,8 @@ export default {
color: #0955ee;
cursor: pointer;
}
/*示例中顶部区域固定高度190px*/
.table-box{
height:calc(100vh - 200px);
}
</style>