aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-05-10 12:38:49 +08:00
parent 6dde42a28c
commit 4beb6e4bf1
2 changed files with 82 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/views/emis/emisSite/emisSiteForm.vue
View File

@ -322,7 +322,8 @@ export default {
],
siteName: [
{ required: true, message: "网点名称不能为空", trigger: "blur" }
{ required: true, message: "网点名称不能为空", trigger: "blur" },
{ validator: this.validateName, trigger: "blur" }
],
parentSiteCode: [
{ required: true, message: "所属网点不能为空", trigger: ["blur","change"] }
@ -414,6 +415,45 @@ export default {
}
}
},
validateName (rule, value, callback) {
if (!value) {
callback(new Error("请输入网点名称"));
} else if (value.length > 20) {
callback(new Error("长度为1-20"));
} else {
if (this.form.id) {
// 修改时检查账号是否重复
listEmisSite({ siteName: value})
.then((res) => {
if (res.rows.length==0) {
callback();
} else {
if(res.rows[0].id != this.form.id ){
callback(new Error("网点名称重复"));
}else{
callback();
}
}
})
.catch((error) => {
callback(new Error("验证失败，请重试"));
});
} else {
// 新增时检查账号是否重复
listEmisSite({ siteName: value})
.then((res) => {
if (res.rows.length==0) {
callback();
} else {
callback(new Error("网点名称重复"));
}
})
.catch((error) => {
callback(new Error("验证失败，请重试"));
});
}
}
},
// 根据当前网点获取父类siteType
onChangeSiteType(){
// 1-总部,2-财务中心 3,分拨中心 4-一级网点 5-二级网点

74
src/views/emis/emisSite/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<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">
<SearchForm id="refQueryForm" :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"
placeholder="网点编号"
@ -10,7 +10,7 @@
@input="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="siteName">
<el-form-item label="网点名称" prop="siteName">
<el-input
v-model="queryParams.siteName"
placeholder="网点名称"
@ -19,22 +19,22 @@
@input="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="parentSiteCode">
<el-form-item label="上级网点" prop="parentSiteCode">
<EmisSiteSimplePicker :placeholder="$t('上级网点')" v-model="queryParams.parentSiteCode" @onChange="handleQuery"></EmisSiteSimplePicker>
</el-form-item>
<el-form-item label="" prop="countryCode">
<el-form-item label="国家" prop="countryCode">
<CountryPicker :placeholder="$t('国家')" v-model="queryParams.countryCode" @onChange="handleQuery"></CountryPicker>
</el-form-item>
<el-form-item label="" prop="province">
<el-form-item label="省份" prop="province">
<ProvincePicker :placeholder="$t('省')" v-model="queryParams.province" :countryCode="queryParams.countryCode" @onChange="handleQuery"></ProvincePicker>
</el-form-item>
<el-form-item label="" prop="city">
<el-form-item label="城市" prop="city">
<CityPicker :placeholder="$t('市')" v-model="queryParams.city" :parentCode="queryParams.province" @onChange="handleQuery"></CityPicker>
</el-form-item>
<el-form-item label="" prop="city">
<el-form-item label="县区" prop="city">
<DistrictPicker :placeholder="$t('区')" v-model="queryParams.county" :parentCode="queryParams.city" @onChange="handleQuery"></DistrictPicker>
</el-form-item>
<el-form-item label="" prop="siteType">
<el-form-item label="网点类型" prop="siteType">
<el-select v-model="queryParams.siteType" placeholder="网点类型" clearable filterable @change="handleQuery">
<el-option
v-for="dict in dict.type.emis_site_type"
@ -44,7 +44,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="siteType">
<el-form-item label="加盟类型" prop="siteType">
<el-select v-model="queryParams.scopeType" placeholder="加盟类型" clearable filterable @change="handleQuery">
<el-option
v-for="dict in dict.type.emis_affiliate_type"
@ -54,7 +54,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="status">
<el-form-item label="启停状态" prop="status">
<el-select v-model="queryParams.status" placeholder="启停状态" clearable filterable @change="handleQuery">
<el-option
v-for="dict in dict.type.sys_biz_enable_status"
@ -64,12 +64,11 @@
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="logoType">
<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"
@ -142,12 +141,12 @@
</el-table-column>
-->
<el-table-column label="网点编号" align="center" prop="siteCode" width="80" >
<el-table-column label="网点编号" align="left" prop="siteCode" width="80" >
<template slot-scope="scope">
<div class="link-type" @click="handleUpdate(scope.row)">{{scope.row.siteCode}}</div>
</template>
</el-table-column>
<el-table-column label="网点名称" align="center" prop="siteName" min-width="100" >
<el-table-column label="网点名称" align="left" prop="siteName" min-width="150" >
<template slot-scope="scope">
<div class="link-type" @click="handleUpdate(scope.row)"><span>{{scope.row.siteName}}</span> <span v-if="scope.row.siteNameEn!=null && scope.row.siteNameEn!=''">/{{scope.row.siteNameEn}}</span> </div>
</template>
@ -168,8 +167,8 @@
<el-table-column label="二字码" align="center" prop="sizeCode2" width="80" />
<el-table-column label="三字码" align="center" prop="sizeCode3" width="80" />
<el-table-column label="截单时间" align="center" prop="cutOffTime" width="100" />
<el-table-column label="派件所属网点" align="center" prop="parentSiteName" min-width="100" />
<el-table-column label="所属财务中心" align="center" prop="superiorFinanceCenterName" min-width="100" />
<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="status" min-width="100" >
@ -177,20 +176,20 @@
<dict-tag :options="dict.type.sys_biz_enable_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="国家" align="center" prop="countryName" width="80" />
<el-table-column label="省份" align="center" prop="provinceName" width="100" />
<el-table-column label="城市" align="center" prop="cityName" width="100" />
<el-table-column label="区/县" align="center" prop="countyName" width="100" />
<el-table-column label="乡/镇" align="center" prop="townName" width="100" />
<el-table-column label="详细地址" align="center" prop="address" min-width="100" />
<el-table-column label="国家" align="center" prop="countryName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="省份" align="center" prop="provinceName" width="100" :show-overflow-tooltip="true" />
<el-table-column label="城市" align="center" prop="cityName" width="100" :show-overflow-tooltip="true"/>
<el-table-column label="区/县" align="center" prop="countyName" width="100" :show-overflow-tooltip="true" />
<!-- <el-table-column label="乡/镇" align="center" prop="townName" width="100" /> -->
<el-table-column label="详细地址" align="center" prop="address" min-width="220" :show-overflow-tooltip="true" />
<el-table-column label="是否到付" align="center" prop="blAllowTopayment" width="80" >
<template slot-scope="scope">
<div v-if="scope.row.blAllowTopayment == 1">是</div>
<div v-else>否</div>
</template>
</el-table-column>
<el-table-column label="派到付款限额" align="center" prop="topaymentLimited" width="100"/>
<el-table-column label="是否允许自提" align="center" prop="blDispatchZt" width="80" >
<el-table-column label="派到付款限额" align="center" prop="topaymentLimited" width="120" />
<el-table-column label="是否允许自提" align="center" prop="blDispatchZt" width="120" >
<template slot-scope="scope">
<div v-if="scope.row.blDispatchZt == 1">是</div>
<div v-else>否</div>
@ -209,11 +208,11 @@
<el-table-column label="特殊区域" align="center" prop="" width="80"/>
<el-table-column label="对外备注" align="center" prop="" width="80"/>
<el-table-column label="数据来源" align="center" prop="dataFrom" width="80"/>
<el-table-column label="创建人" align="center" prop="createBy" width="80"/>
<el-table-column label="创建网点" align="center" prop="createSite" width="80"/>
<el-table-column label="创建人" align="center" prop="createBy" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="创建网点" align="center" prop="createSite" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="170"/>
<el-table-column label="修改人" align="center" prop="updateBy" width="80"/>
<el-table-column label="修改网点" align="center" prop="updateSite" width="80"/>
<el-table-column label="修改人" align="center" prop="updateBy" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="修改网点" align="center" prop="updateSite" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="修改时间" align="center" prop="updateTime" width="170"/>
@ -237,7 +236,6 @@
</template>
</el-table-column>
</xd-table>
</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>
@ -467,15 +465,25 @@ export default {
},
methods: {
getTableHeight() {
this.tableHeight = this.$refs.tableBox.clientHeight - 40;
// console.log(this.$refs.queryForm.offsetHeight);
// let tableH = 200;
// 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);
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() {