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

merge

Browse Source
This commit is contained in:
liuyp 2024-05-15 20:08:51 +08:00
commit c298d106be
22 changed files with 1497 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/emis/emisCommon.js
View File

@ -1,8 +1,10 @@
import {listEmisCountry} from '@/api/emis/emisCountry' import request from '@/utils/request'
// 获取国家名称
export function getEmisCountryByCode(code) {
return new Promise((resolve, reject) => {
// 智能地址解析
export function parseAddress(content) {
return request({
url: '/emis/common/parseAddress',
method: 'get',
params: {content:content}
}) })
} }

6
src/utils/TanexPrinterSdk.js
View File

@ -9,6 +9,8 @@
printerIsRead:打印机已经OK的信号 printerIsRead:打印机已经OK的信号
updatePrintStatus: 打印状态更新
*/ */
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
@ -16,8 +18,8 @@ import { getToken } from '@/utils/auth'
class TanexPrinterSdk { class TanexPrinterSdk {
VERSION="1.0.0" VERSION="1.0.0"
MAX_SENT_RETRY_COUNT = 9; MAX_SENT_RETRY_COUNT = 9;
// WS_URL = "ws://127.0.0.1:17080"; WS_URL = "ws://127.0.0.1:17080";
WS_URL = "ws://192.168.88.100:17080"; // WS_URL = "ws://192.168.88.100:17080";
AUTH_TOKEN=null; AUTH_TOKEN=null;
WS_INIT = 0; WS_INIT = 0;

9
src/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue
View File

@ -153,18 +153,19 @@ export default {
this.queryParams.searchValue = null; this.queryParams.searchValue = null;
this.queryParams.pageNum = 1 this.queryParams.pageNum = 1
this.getList(); this.getList();
}, },
onclear(el){ onclear(el){
this.splaceholder = this.placeholder; this.splaceholder = this.placeholder;
this.slable = null; // this.slable = null;
this.svalue = null; // this.svalue = null;
this.queryParams.searchValue = null; // this.queryParams.searchValue = null;
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
this.$emit("input", this.svalue); this.$emit("input", this.svalue);
this.dispatch('ElFormItem', 'el.form.blur', [this.svalue]);
this.dispatch('ElFormItem', 'el.form.change', [this.svalue])
if(this.visible){ if(this.visible){
this.getList(); this.getList();

6
src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
View File

@ -1,8 +1,4 @@
<template> <template>
<!-- :loading="loading" -->
<!-- v-el-select-loadmore="loadmore" -->
<!-- <i class="el-icon-arrow-down select-down" :class="visible&&'rotate180'"></i> -->
<el-select <el-select
filterable filterable
clearable clearable
@ -110,6 +106,8 @@
this.$emit("onChange",itemData); this.$emit("onChange",itemData);
}, },
onClear(){ onClear(){
this.$emit("input", this.svalue);
this.$emit("onClear");
this.queryParams.searchValue=null; this.queryParams.searchValue=null;
this.queryData(); this.queryData();
}, },

144
src/views/emis/emisCustomerAddress/recipientAddress.vue
View File

@ -1,24 +1,44 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery"> <SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="收件人" prop="name">
<el-form-item label="" prop="customerCode"> <el-input
v-model="queryParams.name"
:placeholder="$t('收件人')"
clearable
@keyup.enter.native="handleQuery"
@input="handleQuery"
/>
</el-form-item>
<el-form-item label="收件电话" prop="phone">
<el-input
v-model="queryParams.phone"
:placeholder="$t('收件电话')"
clearable
@keyup.enter.native="handleQuery"
@input="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('所属国家')" prop="country">
<CountryPicker :placeholder="$t('所属国家')" v-model="queryParams.country" @onChange="handleQuery"></CountryPicker>
</el-form-item>
<!-- <el-form-item label="" prop="customerCode">
<el-input <el-input
v-model="queryParams.customerCode" v-model="queryParams.customerCode"
:placeholder="$t('客户编码')" :placeholder="$t('客户编码')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item> -->
<el-form-item label="" prop="shortName"> <!-- <el-form-item label="" prop="shortName">
<el-input <el-input
v-model="queryParams.shortName" v-model="queryParams.shortName"
:placeholder="$t('客户名称')" :placeholder="$t('客户名称')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item> -->
<el-form-item label="" prop="alias"> <!-- <el-form-item label="" prop="alias">
<el-input <el-input
v-model="queryParams.alias" v-model="queryParams.alias"
:placeholder="$t('地址别名')" :placeholder="$t('地址别名')"
@ -42,22 +62,8 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="" prop="name">
<el-input
v-model="queryParams.name"
:placeholder="$t('姓名')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="phone">
<el-input
v-model="queryParams.phone"
:placeholder="$t('电话')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="province"> <el-form-item label="" prop="province">
<el-input <el-input
v-model="queryParams.province" v-model="queryParams.province"
@ -177,7 +183,7 @@
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item> -->
</SearchForm> </SearchForm>
@ -255,52 +261,41 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom" min-width="80">
<template slot-scope="scope">
<div v-if="scope.row.settleStatus == 0" style="color:red;">
<span class="el-tag el-tag--info">未结算</span>
</div>
<div v-if="scope.row.settleStatus == 10" style="color:red;">
<span class="el-tag">待确认</span>
</div>
<div v-if="scope.row.settleStatus == 11" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已确认</span>
</div>
<div v-if="scope.row.settleStatus == 20" >
<span class="el-tag el-tag--warning el-tag--light">待打款</span>
</div>
<div v-if="scope.row.settleStatus == 21" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已打款</span>
</div>
<div v-if="scope.row.settleStatus == 40" style="color:red;">
<span class="el-tag el-tag--danger">已拒绝</span>
</div>
</template>
</el-table-column>
--> -->
<el-table-column :label="$t('客户编码')" align="center" prop="customerCode" min-width="100" /> <!-- <el-table-column :label="$t('客户编码')" align="center" prop="customerCode" min-width="100" /> -->
<el-table-column :label="$t('客户名称')" align="center" prop="shortName" min-width="100" /> <el-table-column :label="$t('收件人')" align="left" prop="name" width="100" >
<el-table-column :label="$t('地址别名')" align="center" prop="alias" min-width="100" /> <template slot-scope="scope">
<el-table-column :label="$t('地址类型')" align="center" prop="addressType" min-width="100" /> <div class="link-type" @click="handleUpdate(scope.row)">{{scope.row.name}}</div>
<el-table-column :label="$t('国家')" align="center" prop="country" min-width="100" /> </template>
<el-table-column :label="$t('姓名')" align="center" prop="name" min-width="100" /> </el-table-column>
<el-table-column :label="$t('电话')" align="center" prop="phone" min-width="100" /> <el-table-column :label="$t('收件电话')" align="center" prop="phone" min-width="100" />
<el-table-column :label="$t('省')" align="center" prop="province" min-width="100" />
<el-table-column :label="$t('市')" align="center" prop="city" min-width="100" /> <!-- <el-table-column :label="$t('客户名称')" align="center" prop="shortName" min-width="100" /> -->
<el-table-column :label="$t('区')" align="center" prop="county" min-width="100" /> <!-- <el-table-column :label="$t('地址别名')" align="center" prop="alias" min-width="100" /> -->
<el-table-column :label="$t('城镇')" align="center" prop="town" min-width="100" /> <!-- <el-table-column :label="$t('地址类型')" align="center" prop="addressType" min-width="100" /> -->
<el-table-column :label="$t('地址')" align="center" prop="address" min-width="100" /> <el-table-column :label="$t('国家')" align="center" prop="countryName" width="80" />
<el-table-column :label="$t('邮编')" align="center" prop="postCode" min-width="100" /> <el-table-column :label="$t('地区')" align="center" prop="provinceName" width="100" :show-overflow-tooltip="true">
<el-table-column :label="$t('email')" align="center" prop="email" min-width="100" /> <template slot-scope="scope">
<div>{{scope.row.provinceName}} {{scope.row.cityName}} {{scope.row.countyName}} </div>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('市')" align="center" prop="city" min-width="100" /> -->
<!-- <el-table-column :label="$t('区')" align="center" prop="county" min-width="100" /> -->
<!-- <el-table-column :label="$t('城镇')" align="center" prop="town" min-width="100" /> -->
<el-table-column :label="$t('地址')" align="left" prop="address" min-width="200" :show-overflow-tooltip="true" />
<!-- <el-table-column :label="$t('邮编')" align="center" prop="postCode" min-width="100" /> -->
<el-table-column :label="$t('公司')" align="center" prop="company" min-width="100" /> <el-table-column :label="$t('公司')" align="center" prop="company" min-width="100" />
<el-table-column :label="$t('是否默认')" align="center" prop="blDefaultFlag" min-width="100" /> <el-table-column :label="$t('email')" align="center" prop="email" min-width="100" />
<el-table-column :label="$t('排序')" align="center" prop="orderNum" min-width="100" /> <!-- <el-table-column :label="$t('是否默认')" align="center" prop="blDefaultFlag" min-width="100" /> -->
<el-table-column :label="$t('使用站点是否默认')" align="center" prop="blSiteDefaultFlag" min-width="100" /> <!-- <el-table-column :label="$t('排序')" align="center" prop="orderNum" min-width="100" /> -->
<el-table-column :label="$t('使用站点名称')" align="center" prop="useSite" min-width="100" /> <!-- <el-table-column :label="$t('使用站点是否默认')" align="center" prop="blSiteDefaultFlag" min-width="100" /> -->
<el-table-column :label="$t('使用站点代码')" align="center" prop="useSiteCode" min-width="100" /> <el-table-column :label="$t('所属站点')" align="center" prop="useSite" min-width="100" />
<el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" /> <el-table-column :label="$t('创建时间')" align="center" prop="createTime" min-width="170" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> <!-- <el-table-column :label="$t('使用站点代码')" align="center" prop="useSiteCode" min-width="100" /> -->
<!-- <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" /> -->
<!-- <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> -->
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width"> <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -323,16 +318,10 @@
</XdTable> </XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body> <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisCustomerAddressForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisCustomerAddressForm> <recipientAddressForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></recipientAddressForm>
</el-dialog> </el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<emisCustomerAddressView :id="id" ></EmisCustomerAddressView>
</el-dialog>
-->
</div> </div>
</template> </template>
@ -340,11 +329,12 @@
import { listEmisCustomerAddress, getEmisCustomerAddress, delEmisCustomerAddress, addEmisCustomerAddress, updateEmisCustomerAddress } from "@/api/emis/emisCustomerAddress"; import { listEmisCustomerAddress, getEmisCustomerAddress, delEmisCustomerAddress, addEmisCustomerAddress, updateEmisCustomerAddress } from "@/api/emis/emisCustomerAddress";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker'; import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
// import emisCustomerAddressView from '@/views/emis/emisCustomerAddress/emisCustomerAddressView'; // import emisCustomerAddressView from '@/views/emis/emisCustomerAddress/emisCustomerAddressView';
import emisCustomerAddressForm from '@/views/emis/emisCustomerAddress/emisCustomerAddressForm'; import recipientAddressForm from '@/views/emis/emisCustomerAddress/recipientAddressForm';
import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
export default { export default {
name: "emisCustomerAddress", name: "RecipientAddress",
components: { elDateSimplePicker,emisCustomerAddressForm }, components: { elDateSimplePicker,recipientAddressForm,CountryPicker },
dicts: [ dicts: [
], ],
data() { data() {
@ -385,7 +375,7 @@ export default {
customerCode: null, customerCode: null,
shortName: null, shortName: null,
alias: null, alias: null,
addressType: null, addressType: 2,
country: null, country: null,
name: null, name: null,
phone: null, phone: null,

184
src/views/emis/emisCustomerAddress/emisCustomerAddressForm.vue → src/views/emis/emisCustomerAddress/recipientAddressForm.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<div > <div >
<el-row :gutter="0"> <el-row :gutter="0">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" size="mini" :rules="rules" label-width="90px">
<el-col :span="24"> <!-- <el-col :span="24">
<el-form-item label="客户user_id" prop="userId"> <el-form-item label="客户user_id" prop="userId">
<el-input v-model="form.userId" placeholder="请输入客户user_id" /> <el-input v-model="form.userId" placeholder="请输入客户user_id" />
</el-form-item> </el-form-item>
@ -16,91 +16,79 @@
<el-form-item label="地址类型" prop="addressType"> <el-form-item label="地址类型" prop="addressType">
<el-input v-model="form.addressType" placeholder="请输入地址类型" /> <el-input v-model="form.addressType" placeholder="请输入地址类型" />
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="24"> <el-col :span="12">
<el-form-item label="省" prop="province"> <el-form-item label="收件人" prop="name">
<el-input v-model="form.province" placeholder="请输入省" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="市" prop="city">
<el-input v-model="form.city" placeholder="请输入市" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="区" prop="district">
<el-input v-model="form.district" placeholder="请输入区" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="城镇" prop="town">
<el-input v-model="form.town" placeholder="请输入城镇" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="地址" prop="address">
<el-input v-model="form.address" placeholder="请输入地址" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="邮编" prop="postCode">
<el-input v-model="form.postCode" placeholder="请输入邮编" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="姓名" prop="name">
<el-input v-model="form.name" placeholder="请输入姓名" /> <el-input v-model="form.name" placeholder="请输入姓名" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="12">
<el-form-item label="电话" prop="phone"> <el-form-item label="电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入电话" /> <el-input v-model="form.phone" placeholder="请输入电话" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="8">
<el-form-item label="国家" prop="country"> <el-form-item label="所属国家" prop="country">
<el-input v-model="form.country" placeholder="请输入国家" /> <CountryPicker :placeholder="$t('所属国家')" v-model="form.country" ></CountryPicker>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="省市区" prop="province">
<div style="display: inline-flex">
<ProvincePicker v-model="form.province" :countryCode="form.country" ></ProvincePicker>
<CityPicker v-model="form.city" :parentCode="form.province" ></CityPicker>
<DistrictPicker v-model="form.county" :parentCode="form.city" ></DistrictPicker>
<!-- <TownPicker v-model="form.town" :parentCode="form.county" ></TownPicker> -->
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="email" prop="email"> <el-form-item label="地址" prop="address">
<el-input v-model="form.address" type="textarea" placeholder="请输入地址" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮编(选填)" prop="postCode">
<el-input v-model="form.postCode" placeholder="请输入邮编" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱(选填)" prop="email">
<el-input v-model="form.email" placeholder="请输入email" /> <el-input v-model="form.email" placeholder="请输入email" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="公司" prop="company"> <el-form-item label="公司(选填" prop="company">
<el-input v-model="form.company" placeholder="请输入公司" /> <el-input v-model="form.company" placeholder="请输入公司" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="智能填写" prop="parseAddress" style="position: relative">
<el-input v-model="form.parseAddress" type="textarea" rows="5" placeholder="粘贴整段地址，自动识别姓名，公司名称（输入需包含“公司”两个字），手机号码、固话和地址，每项用逗号隔开更准确“例如XXX,XX公司，188****8888,021-88****88，上海上海市xxx区xx路1080号" >
</el-input>
<el-button @click="handleParseAddress" type="primary" size="mini" style="position:absolute;bottom:8px;right:8px" >智能识别</el-button>
</el-form-item>
</el-col>
<!-- <el-col :span="24">
<el-form-item label="是否默认" prop="blDefaultFlag"> <el-form-item label="是否默认" prop="blDefaultFlag">
<el-input v-model="form.blDefaultFlag" placeholder="请输入是否默认" /> <el-input v-model="form.blDefaultFlag" placeholder="请输入是否默认" />
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="24"> <!-- <el-col :span="24">
<el-form-item label="排序" prop="orderNum"> <el-form-item label="排序" prop="orderNum">
<el-input v-model="form.orderNum" placeholder="请输入排序" /> <el-input v-model="form.orderNum" placeholder="请输入排序" />
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="24"> <!-- <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-form-item label="上级字典">
<treeselect
ref="tree"
v-model="form.parentId"
:options="emisCustomerAddressOptions"
:normalizer="normalizer"
:default-expand-level="1"
:show-count="true"
placeholder="选择上级"
/>
</el-form-item>
</el-form> </el-form>
</el-row> </el-row>
<div style="text-align: center;margin-bottom: 10px;"> <div style="text-align: center;margin-bottom: 10px;">
@ -113,13 +101,19 @@
<script> <script>
import { listEmisCustomerAddress, getEmisCustomerAddress, delEmisCustomerAddress, addEmisCustomerAddress, updateEmisCustomerAddress } from "@/api/emis/emisCustomerAddress"; import { listEmisCustomerAddress, getEmisCustomerAddress, delEmisCustomerAddress, addEmisCustomerAddress, updateEmisCustomerAddress } from "@/api/emis/emisCustomerAddress";
import { parseAddress } from "@/api/emis/emisCommon";
import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import ProvincePicker from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
import CityPicker from '@/views/emis/EmisBaseTools/CityPicker.vue';
import DistrictPicker from '@/views/emis/EmisBaseTools/DistrictPicker.vue';
export default { export default {
name: "emisCustomerAddressForm", name: "emisCustomerAddressForm",
props:{ props:{
id:undefined id:undefined
}, },
components: { }, components: { CountryPicker,ProvincePicker,CityPicker,DistrictPicker },
dicts: [ dicts: [
], ],
data() { data() {
@ -131,14 +125,20 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
userId: [ country: [
{ required: true, message: "客户user_id不能为空", trigger: "blur" } { required: true, message: "国家不能为空", trigger: "blur" }
], ],
alias: [ name: [
{ required: true, message: "别名不能为空", trigger: "blur" } { required: true, message: "姓名不能为空", trigger: "blur" }
], ],
addressType: [ phone: [
{ required: true, message: "地址类型不能为空", trigger: "blur" } { required: true, message: "电话不能为空", trigger: "blur" }
],
province: [
{ required: true, message: "省不能为空", trigger: "blur" }
],
address: [
{ required: true, message: "地址不能为空", trigger: "blur" }
], ],
} }
}; };
@ -157,6 +157,23 @@ export default {
}, },
methods: { methods: {
handleParseAddress(){
this.loading = true;
if(this.form.parseAddress){
parseAddress(this.form.parseAddress).then(response => {
// this.form = response.data;
this.loading = false;
let rst=response.data;
this.form.name=rst.name;
this.form.country=rst.country;
this.form.province=rst.province;
this.form.county=rst.county;
this.form.phone=rst.phone;
this.form.address=rst.address;
});
}
},
initData() { initData() {
this.reset(); this.reset();
if(this.id !=undefined) { if(this.id !=undefined) {
@ -166,7 +183,6 @@ export default {
this.loading = false; this.loading = false;
}); });
} }
this.getTreeselect();
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
@ -179,10 +195,10 @@ export default {
id: null, id: null,
userId: null, userId: null,
alias: null, alias: null,
addressType: null, addressType: 2,
province: null, province: null,
city: null, city: null,
district: null, county: null,
town: null, town: null,
address: null, address: null,
postCode: null, postCode: null,
@ -198,7 +214,8 @@ export default {
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null, updateTime: null,
remark: null remark: null,
parseAddress:null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -220,32 +237,7 @@ export default {
} }
}); });
}, },
/** 转换菜单数据结构 */
normalizer(node) {
if (node.children && !node.children.length) {
delete node.children;
}
return {
id: node.id,
label: node.idName,
children: node.children
};
},
/** 查询菜单下拉树结构 */
getTreeselect() {
const queryParams = {}
listEmisCustomerAddress(queryParams).then(response => {
this.emisCustomerAddressOptions = [];
const rootItem = { idId: 0, emisCustomerAddressName: '-', children: [] };
rootItem.children = this.handleTree(response.data, "id");
this.emisCustomerAddressOptions.push(rootItem);
if(this.parentId != undefined) {
this.form.parentId = this.parentId;
}
});
},
} }
}; };
</script> </script>

557
src/views/emis/emisCustomerAddress/senderAddress.vue Normal file
View File

@ -0,0 +1,557 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="寄件人" prop="name">
<el-input
v-model="queryParams.name"
:placeholder="$t('寄件人')"
clearable
@keyup.enter.native="handleQuery"
@input="handleQuery"
/>
</el-form-item>
<el-form-item label="寄件电话" prop="phone">
<el-input
v-model="queryParams.phone"
:placeholder="$t('寄件电话')"
clearable
@keyup.enter.native="handleQuery"
@input="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('所属国家')" prop="country">
<CountryPicker :placeholder="$t('所属国家')" v-model="queryParams.country" @onChange="handleQuery"></CountryPicker>
</el-form-item>
<!-- <el-form-item label="" prop="customerCode">
<el-input
v-model="queryParams.customerCode"
:placeholder="$t('客户编码')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<!-- <el-form-item label="" prop="shortName">
<el-input
v-model="queryParams.shortName"
:placeholder="$t('客户名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<!-- <el-form-item label="" prop="alias">
<el-input
v-model="queryParams.alias"
:placeholder="$t('地址别名')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="addressType">
<el-input
v-model="queryParams.addressType"
:placeholder="$t('地址类型')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="country">
<el-input
v-model="queryParams.country"
:placeholder="$t('国家')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="province">
<el-input
v-model="queryParams.province"
:placeholder="$t('省')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="city">
<el-input
v-model="queryParams.city"
:placeholder="$t('市')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="county">
<el-input
v-model="queryParams.county"
:placeholder="$t('区')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="town">
<el-input
v-model="queryParams.town"
:placeholder="$t('城镇')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="address">
<el-input
v-model="queryParams.address"
:placeholder="$t('地址')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="postCode">
<el-input
v-model="queryParams.postCode"
:placeholder="$t('邮编')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="email">
<el-input
v-model="queryParams.email"
:placeholder="$t('email')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="company">
<el-input
v-model="queryParams.company"
:placeholder="$t('公司')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="blDefaultFlag">
<el-input
v-model="queryParams.blDefaultFlag"
:placeholder="$t('是否默认')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="orderNum">
<el-input
v-model="queryParams.orderNum"
:placeholder="$t('排序')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="blSiteDefaultFlag">
<el-input
v-model="queryParams.blSiteDefaultFlag"
:placeholder="$t('使用站点是否默认')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="useSite">
<el-input
v-model="queryParams.useSite"
:placeholder="$t('使用站点名称')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="useSiteCode">
<el-input
v-model="queryParams.useSiteCode"
:placeholder="$t('使用站点代码')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="delFlag">
<el-input
v-model="queryParams.delFlag"
:placeholder="$t('删除标志（0代表存在')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="remark">
<el-input
v-model="queryParams.remark"
:placeholder="$t('备注')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
</SearchForm>
<XdTable v-loading="loading"
border stripe
size="small"
:data="emisCustomerAddressList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
:total="total"
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['emis:emisCustomerAddress:add']"
>新增</el-button>
</el-col>
<!--
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['emis:emisCustomerAddress:edit']"
>修改</el-button>
</el-col> -->
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['emis:emisCustomerAddress:remove']"
>删除</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['emis:emisCustomerAddress:export']"
>导出</el-button>
</el-col> -->
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<!--
<el-table-column label="序号" align="center" min-width="60">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column>
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
</template>
</el-table-column>
-->
<!-- <el-table-column :label="$t('客户编码')" align="center" prop="customerCode" min-width="100" /> -->
<el-table-column :label="$t('寄件人')" align="left" prop="name" width="100" >
<template slot-scope="scope">
<div class="link-type" @click="handleUpdate(scope.row)">{{scope.row.name}}</div>
</template>
</el-table-column>
<el-table-column :label="$t('寄件电话')" align="center" prop="phone" min-width="100" />
<!-- <el-table-column :label="$t('客户名称')" align="center" prop="shortName" min-width="100" /> -->
<!-- <el-table-column :label="$t('地址别名')" align="center" prop="alias" min-width="100" /> -->
<!-- <el-table-column :label="$t('地址类型')" align="center" prop="addressType" min-width="100" /> -->
<el-table-column :label="$t('国家')" align="center" prop="countryName" width="80" />
<el-table-column :label="$t('地区')" align="center" prop="provinceName" width="100" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div>{{scope.row.provinceName}} {{scope.row.cityName}} {{scope.row.countyName}} </div>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('市')" align="center" prop="city" min-width="100" /> -->
<!-- <el-table-column :label="$t('区')" align="center" prop="county" min-width="100" /> -->
<!-- <el-table-column :label="$t('城镇')" align="center" prop="town" min-width="100" /> -->
<el-table-column :label="$t('地址')" align="left" prop="address" min-width="200" :show-overflow-tooltip="true" />
<!-- <el-table-column :label="$t('邮编')" align="center" prop="postCode" min-width="100" /> -->
<el-table-column :label="$t('公司')" align="center" prop="company" min-width="100" />
<el-table-column :label="$t('email')" align="center" prop="email" min-width="100" />
<!-- <el-table-column :label="$t('是否默认')" align="center" prop="blDefaultFlag" min-width="100" /> -->
<!-- <el-table-column :label="$t('排序')" align="center" prop="orderNum" min-width="100" /> -->
<!-- <el-table-column :label="$t('使用站点是否默认')" align="center" prop="blSiteDefaultFlag" min-width="100" /> -->
<el-table-column :label="$t('所属站点')" align="center" prop="useSite" min-width="100" />
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" min-width="170" />
<!-- <el-table-column :label="$t('使用站点代码')" align="center" prop="useSiteCode" min-width="100" /> -->
<!-- <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" /> -->
<!-- <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> -->
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['emis:emisCustomerAddress:edit']"
>修改</el-button>
<!--
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['emis:emisCustomerAddress:remove']"
>删除</el-button> -->
</template>
</el-table-column>
</XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
<senderAddressForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></senderAddressForm>
</el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<emisCustomerAddressView :id="id" ></EmisCustomerAddressView>
</el-dialog>
-->
</div>
</template>
<script>
import { listEmisCustomerAddress, getEmisCustomerAddress, delEmisCustomerAddress, addEmisCustomerAddress, updateEmisCustomerAddress } from "@/api/emis/emisCustomerAddress";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
import senderAddressForm from '@/views/emis/emisCustomerAddress/senderAddressForm';
import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
export default {
name: "SenderAddress",
components: { elDateSimplePicker,senderAddressForm ,CountryPicker},
dicts: [
],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 创建时间搜索
dateTimeRange:[],
// 总条数
total: 0,
// 客户寄寄件地址表格数据
emisCustomerAddressList: [],
currentId:null,
openForm: false,
titleForm: "",
// 弹出展示层
id:null,
titleView:"",
openView: false,
// 更新网点时间范围
daterangeCreateTime: [],
// 更新网点时间范围
daterangeUpdateTime: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
customerCode: null,
shortName: null,
alias: null,
addressType: 1,
country: null,
name: null,
phone: null,
province: null,
city: null,
county: null,
town: null,
address: null,
postCode: null,
email: null,
company: null,
blDefaultFlag: null,
orderNum: null,
blSiteDefaultFlag: null,
useSite: null,
useSiteCode: null,
delFlag: null,
remark: null,
},
};
},
created() {
this.getList();
},
methods: {
/** 查询客户寄寄件地址列表 */
getList() {
this.loading = true;
this.queryParams.params = {};
if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
}
if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
}
listEmisCustomerAddress(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
this.emisCustomerAddressList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
// 排序 查询字段是表格中字段名字 动态取值排序顺序
handleSortChange(column) {
this.queryParams.orderByColumn = column.prop;
this.queryParams.isAsc = column.order;
this.getList();
},
/** 新增按钮操作 */
handleAdd(row) {
this.currentId=null;
this.openForm= true;
this.titleForm = "新增";
},
handleShowMoreInput(){
this.moreInputVisible = !this.moreInputVisible;
},
/** 修改按钮操作 */
handleUpdate(row) {
this.currentId= row.id;
this.openForm = true;
this.titleForm = "修改";
},
handleView(row) {
this.id=row.id;
this.titleView="查看";
this.openView=true;
// this.router.push({ path: '/emis/emisCustomerAddress/viewDetail', query: { id: row.id }})
},
handleFormChanged(){
this.openForm = false;
this.getList();
},
cancelForm(){
this.openForm = false;
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除').then(function() {
return delEmisCustomerAddress(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
// this.download('emis/emisCustomerAddress/export', {
// ...this.queryParams
// }, `emisCustomerAddress_${new Date().getTime()}.xlsx`)
const loadingInstance = this.$loading({
text: '正在导出...'
})
var qParam = {...this.queryParams};
qParam.pageNum=1;
qParam.pageSize=5000;
listEmisCustomerAddress(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
this.downloadLoading = false
if (response.code === 200) {
const curList = response.rows
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['id','客户user_id','客户编码','客户名称','地址别名','地址类型','国家','姓名','电话','省','市','区','城镇','地址','邮编','email','公司','是否默认','排序','使用站点是否默认','使用站点名称','使用站点代码','删除标志（0代表存在','创建者','创建时间','更新者','update_time','备注','创建网点','更新网点',];
const filterVal = ['id','userId','customerCode','shortName','alias','addressType','country','name','phone','province','city','county','town','address','postCode','email','company','blDefaultFlag','orderNum','blSiteDefaultFlag','useSite','useSiteCode','delFlag','createBy','createTime','updateBy','updateTime','remark','createSite','updateSite',];
const data = this.formatJson(filterVal, curList, response.rows)
excel.export_json_to_excel({
header: tHeader,
data,
filename: '客户寄寄件地址',
autoWidth: true
})
loadingInstance.close()
})
}
});
},
formatJson(filterVal, jsonData, resData) {
let index = 0
return jsonData.map(v => filterVal.map(j => {
if (j === 'index') {
return ++index
}
if (j === 'status') {
var statusStr='xxx'
if(v[j] == 10){
statusStr='xxx'
}
return statusStr;
}
return v[j]
}))
},
/** 列索引函数 */
getIndex($index) {
return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
},
/** 时间搜索响应函数 */
dateTimeChange(value){
this.dateTimeRange=value;
},
}
};
</script>
<style scoped>
.el-divider{
margin-top: 0px;
background: 0 0;
border-top: 1px solid #E6EBF5;
}
.el-divider__text {
color: #0955ee;
cursor: pointer;
}
</style>

242
src/views/emis/emisCustomerAddress/senderAddressForm.vue Normal file
View File

@ -0,0 +1,242 @@
<template>
<div >
<el-row :gutter="0">
<el-form ref="form" :model="form" size="mini" :rules="rules" label-width="90px">
<!-- <el-col :span="24">
<el-form-item label="客户user_id" prop="userId">
<el-input v-model="form.userId" placeholder="请输入客户user_id" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="别名" prop="alias">
<el-input v-model="form.alias" placeholder="请输入别名" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="地址类型" prop="addressType">
<el-input v-model="form.addressType" placeholder="请输入地址类型" />
</el-form-item>
</el-col> -->
<el-col :span="12">
<el-form-item label="寄件人" prop="name">
<el-input v-model="form.name" placeholder="请输入姓名" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="寄件电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入电话" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所属国家" prop="country">
<CountryPicker :placeholder="$t('所属国家')" v-model="form.country" ></CountryPicker>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="省市区" prop="province">
<div style="display: inline-flex">
<ProvincePicker v-model="form.province" :countryCode="form.country" ></ProvincePicker>
<CityPicker v-model="form.city" :parentCode="form.province" ></CityPicker>
<DistrictPicker v-model="form.county" :parentCode="form.city" ></DistrictPicker>
<!-- <TownPicker v-model="form.town" :parentCode="form.county" ></TownPicker> -->
</div>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="地址" prop="address">
<el-input v-model="form.address" type="textarea" placeholder="请输入地址" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮编(选填)" prop="postCode">
<el-input v-model="form.postCode" placeholder="请输入邮编" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱(选填)" prop="email">
<el-input v-model="form.email" placeholder="请输入email" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="公司(选填" prop="company">
<el-input v-model="form.company" placeholder="请输入公司" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="智能填写" prop="parseAddress" style="position: relative">
<el-input v-model="form.parseAddress" type="textarea" rows="5" placeholder="粘贴整段地址，自动识别姓名，公司名称（输入需包含“公司”两个字），手机号码、固话和地址，每项用逗号隔开更准确“例如XXX,XX公司，188****8888,021-88****88，上海上海市xxx区xx路1080号" >
</el-input>
<el-button @click="handleParseAddress" type="primary" size="mini" style="position:absolute;bottom:8px;right:8px" >智能识别</el-button>
</el-form-item>
</el-col>
<!-- <el-col :span="24">
<el-form-item label="是否默认" prop="blDefaultFlag">
<el-input v-model="form.blDefaultFlag" placeholder="请输入是否默认" />
</el-form-item>
</el-col> -->
<!-- <el-col :span="24">
<el-form-item label="排序" prop="orderNum">
<el-input v-model="form.orderNum" placeholder="请输入排序" />
</el-form-item>
</el-col> -->
<!-- <el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col> -->
</el-form>
</el-row>
<div style="text-align: center;margin-bottom: 10px;">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</div>
</template>
<script>
import { listEmisCustomerAddress, getEmisCustomerAddress, delEmisCustomerAddress, addEmisCustomerAddress, updateEmisCustomerAddress } from "@/api/emis/emisCustomerAddress";
import { parseAddress } from "@/api/emis/emisCommon";
import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import ProvincePicker from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
import CityPicker from '@/views/emis/EmisBaseTools/CityPicker.vue';
import DistrictPicker from '@/views/emis/EmisBaseTools/DistrictPicker.vue';
export default {
name: "emisCustomerAddressForm",
props:{
id:undefined
},
components: { CountryPicker,ProvincePicker,CityPicker,DistrictPicker },
dicts: [
],
data() {
return {
emisCustomerAddressOptions: [],
// 遮罩层
loading: true,
// 表单参数
form: {},
// 表单校验
rules: {
country: [
{ required: true, message: "国家不能为空", trigger: "blur" }
],
name: [
{ required: true, message: "姓名不能为空", trigger: "blur" }
],
phone: [
{ required: true, message: "电话不能为空", trigger: "blur" }
],
province: [
{ required: true, message: "省不能为空", trigger: "blur" }
],
address: [
{ required: true, message: "地址不能为空", trigger: "blur" }
],
}
};
},
watch: {
"id": {
handler (newValue, oldValue) {
this.id = newValue;
this.initData();
},
deep: true
}
},
created() {
this.initData();
},
methods: {
handleParseAddress(){
this.loading = true;
if(this.form.parseAddress){
parseAddress(this.form.parseAddress).then(response => {
// this.form = response.data;
this.loading = false;
let rst=response.data;
this.form.name=rst.name;
this.form.country=rst.country;
this.form.province=rst.province;
this.form.county=rst.county;
this.form.phone=rst.phone;
this.form.address=rst.address;
});
}
},
initData() {
this.reset();
if(this.id !=undefined) {
this.loading = true;
getEmisCustomerAddress(this.id).then(response => {
this.form = response.data;
this.loading = false;
});
}
},
// 取消按钮
cancel() {
this.reset();
this.$emit("on-cancel");
},
// 表单重置
reset() {
this.form = {
id: null,
userId: null,
alias: null,
addressType: 1,
province: null,
city: null,
county: null,
town: null,
address: null,
postCode: null,
name: null,
phone: null,
country: null,
email: null,
company: null,
blDefaultFlag: null,
orderNum: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
remark: null,
parseAddress:null,
};
this.resetForm("form");
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateEmisCustomerAddress(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$emit("on-changed");
});
} else {
addEmisCustomerAddress(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$emit("on-changed");
});
}
}
});
},
}
};
</script>

271
src/views/emis/emisCustomerUser/batchUpdateForm.vue Normal file
View File

@ -0,0 +1,271 @@
<template>
<div >
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="100px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="12">
<el-form-item label="结算类型" prop="settledType">
<el-select v-model="form.settledType" placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_cus_settled_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="专属业务员" prop="opEmpCode" >
<EmisUserSimplePicker0 :placeholder="$t('专属业务员')" v-model="form.opEmpCode" ></EmisUserSimplePicker0>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="回款联系人" prop="payee" >
<EmisUserSimplePicker1 :placeholder="$t('回款联系人')" v-model="form.payee" ></EmisUserSimplePicker1>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="销售联系人" prop="salesmen" >
<EmisUserSimplePicker2 :placeholder="$t('销售联系人')" v-model="form.salesmen" ></EmisUserSimplePicker2>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="业务网点范围" prop="bizSite" >
<div @click="handleSelectSite">选择网点</div>
<el-input v-model="form.bizSiteName" rows="5" type="textarea" disabled placeholder="" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="开通OMS" prop="blOpenOms" >
<el-radio-group v-model="form.blOpenOms">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否短信" prop="blSms">
<el-radio-group v-model="form.blSms">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否启用" prop="status">
<el-radio-group v-model="form.status">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div style="text-align: center;margin-bottom: 10px;">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
<el-dialog title="选择网点" :visible.sync="openSiteSelectTreeForm" width="40%" :destroy-on-close="true" v-dialogDrag append-to-body>
<EmisSiteSelectTreePicker :selectSiteCode="form.bizSite" :selectSiteName="form.bizSiteName" @on-changed="onSelectSiteTreeCheckChange" ></EmisSiteSelectTreePicker>
</el-dialog>
</div>
</template>
<script>
import { listEmisCustomerUser, getEmisCustomerUser, delEmisCustomerUser, addEmisCustomerUser, updateEmisCustomerUser } from "@/api/emis/emisCustomerUser";
import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import ProvincePicker from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
import CityPicker from '@/views/emis/EmisBaseTools/CityPicker.vue';
import DistrictPicker from '@/views/emis/EmisBaseTools/DistrictPicker.vue';
import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisSiteSelectTreePicker from '@/views/emis/EmisBaseTools/EmisSiteSelectTreePicker.vue';
export default {
name: "emisCustomerUserForm",
props:{
ids:{
type:[Number,Array]
},
},
components: {
CountryPicker,
EmisSiteSimplePicker,ProvincePicker,CityPicker,DistrictPicker,
EmisUserSimplePicker0,EmisUserSimplePicker1,EmisUserSimplePicker2,
EmisSiteSelectTreePicker
},
dicts: ['emis_cus_settled_type'],
data() {
return {
openSiteSelectTreeForm:false,
emisCustomerUserOptions: [],
// 遮罩层
loading: true,
// 表单参数
form: {},
isDataChangeCount:0,
// 表单校验
rules: {
}
};
},
watch: {
"ids": {
handler (newValue, oldValue) {
this.id = newValue;
},
deep: true
},
form: {
handler (n, o) {
this.isDataChangeCount++
},
deep: true
}
},
created() {
this.isDataChangeCount=0;
this.reset();
},
methods: {
handleSelectSite(){
this.openSiteSelectTreeForm=true;
},
onSelectSiteTreeCheckChange(item){
this.openSiteSelectTreeForm=false;
this.form.bizSiteName=item.selectSiteNameStr;
this.form.bizSite=item.selectSiteCodeStr;
// console.log(item)
},
// 取消按钮
cancel() {
this.reset();
this.$emit("on-cancel");
},
// 表单重置
reset() {
this.form = {
id: null,
customerCode: null,
customerName: null,
customerNameEn: null,
simpleName: null,
phone: null,
mobile: null,
customerType: null,
settledType: null,
userType: null,
company: null,
deptId: null,
avatar: null,
sex: null,
invitationInfo: null,
loginIp: null,
loginDate: null,
nickName: null,
unionId: null,
openid: null,
monthlyPayCode: null,
userName: null,
password: null,
ownerSite: null,
bizSite: null,
bizSiteName: null,
country: null,
province: null,
city: null,
county: null,
town: null,
address: null,
email: null,
sendCountry: null,
sendProvince: null,
sendCity: null,
sendCounty: null,
sendTown: null,
postCode: null,
status: null,
realName: null,
idNo: null,
payee: null,
salesmen: null,
dataFrom: null,
blOpenOms: null,
blSms: null,
opEmpCode: null,
orderNum: null,
remark: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
createSite: null,
updateSite: null
};
this.resetForm("form");
},
/** 提交按钮 */
async submitForm() {
// 判断是否有变动
if (this.isDataChangeCount>0 ) {
console.log(this.ids);
if(this.ids.length==0){
this.form.id=item;
await updateEmisCustomerUser(this.form).then(response => {
console.log(response);
});
}else{
this.ids.forEach(async item => {
this.form.id=item;
await updateEmisCustomerUser(this.form).then(response => {
console.log(response);
});
});
}
this.$modal.msgSuccess("修改成功");
this.$emit("on-changed");
}else{
this.$modal.msgSuccess("无变动，无需修改");
}
},
}
};
</script>
<style lang="scss" scoped>
// .el-row{
// display:flex;
// flex-wrap: wrap;
// }
// .el-col{
// min-height: 1px;
// }
</style>

26
src/views/emis/emisCustomerUser/moneyUserForm.vue
View File

@ -146,32 +146,6 @@
</el-col> </el-col>
<!-- <el-col :span="8">
<el-form-item label="国家" prop="country">
<el-input v-model="form.country" placeholder="请输入国家" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="省份" prop="province">
<el-input v-model="form.province" placeholder="请输入省份" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="城市" prop="city">
<el-input v-model="form.city" placeholder="请输入城市" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="区县" prop="county">
<el-input v-model="form.county" placeholder="请输入区县" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="镇" prop="town">
<el-input v-model="form.town" placeholder="请输入镇" />
</el-form-item>
</el-col> -->
<el-col :span="24"> <el-col :span="24">
<el-form-item label="地址" prop="address"> <el-form-item label="地址" prop="address">
<el-input v-model="form.address" type="textarea" placeholder="请输入地址" /> <el-input v-model="form.address" type="textarea" placeholder="请输入地址" />

34
src/views/emis/emisCustomerUser/moneyUserList.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery"> <SearchForm :model="queryParams" ref="queryForm" size="mini" :maxShow="10" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="customerName"> <el-form-item label="客户名称" prop="customerName">
<el-input <el-input
v-model="queryParams.customerName" v-model="queryParams.customerName"
:placeholder="$t('客户名称')" :placeholder="$t('客户名称')"
@ -10,7 +10,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="" prop="phone"> <el-form-item label="电话" prop="phone">
<el-input <el-input
v-model="queryParams.phone" v-model="queryParams.phone"
:placeholder="$t('电话')" :placeholder="$t('电话')"
@ -18,6 +18,19 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="所属国家" prop="country">
<CountryPicker :placeholder="$t('所属国家')" v-model="queryParams.country" ></CountryPicker>
</el-form-item>
<el-form-item label="省份" prop="province">
<ProvincePicker v-model="queryParams.province" :countryCode="queryParams.country" ></ProvincePicker>
</el-form-item>
<el-form-item label="回款联系人" prop="payee" >
<EmisUserSimplePicker1 :placeholder="$t('回款联系人')" v-model="queryParams.payee" ></EmisUserSimplePicker1>
</el-form-item>
<el-form-item label="销售联系人" prop="salesmen" >
<EmisUserSimplePicker2 :placeholder="$t('销售联系人')" v-model="queryParams.salesmen" ></EmisUserSimplePicker2>
</el-form-item>
<!-- <el-form-item label="" prop="company"> <!-- <el-form-item label="" prop="company">
<el-input <el-input
v-model="queryParams.company" v-model="queryParams.company"
@ -204,9 +217,22 @@ import { listEmisCustomerUser, getEmisCustomerUser, delEmisCustomerUser, addEmis
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker'; import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
import moneyUserForm from '@/views/emis/emisCustomerUser/moneyUserForm'; import moneyUserForm from '@/views/emis/emisCustomerUser/moneyUserForm';
import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import ProvincePicker from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
import CityPicker from '@/views/emis/EmisBaseTools/CityPicker.vue';
import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
export default { export default {
name: "moneyUserList", name: "moneyUserList",
components: { elDateSimplePicker,moneyUserForm }, components: { elDateSimplePicker,moneyUserForm ,CountryPicker,
EmisSiteSimplePicker,ProvincePicker,CityPicker,
EmisUserSimplePicker0,EmisUserSimplePicker1,EmisUserSimplePicker2
},
dicts: [ dicts: [
], ],
data() { data() {

9
src/views/emis/emisCustomerUser/monthUserForm.vue
View File

@ -45,12 +45,11 @@
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<!-- <el-col :span="8"> <el-col :span="8">
<el-form-item label="英文简称" prop="customerNameEn"> <el-form-item label="英文简称" prop="customerNameEn">
<el-input v-model="form.customerNameEn" placeholder="请输入英文简称" /> <el-input v-model="form.customerNameEn" placeholder="请输入英文简称" />
</el-form-item> </el-form-item>
</el-col> --> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="邮箱" prop="email"> <el-form-item label="邮箱" prop="email">
@ -102,11 +101,11 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <!-- <el-col :span="8">
<el-form-item label="专属业务员" prop="opEmpCode" > <el-form-item label="专属业务员" prop="opEmpCode" >
<EmisUserSimplePicker0 :placeholder="$t('专属业务员')" v-model="form.opEmpCode" ></EmisUserSimplePicker0> <EmisUserSimplePicker0 :placeholder="$t('专属业务员')" v-model="form.opEmpCode" ></EmisUserSimplePicker0>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="8"> <el-col :span="8">
<el-form-item label="回款联系人" prop="payee" > <el-form-item label="回款联系人" prop="payee" >
<EmisUserSimplePicker1 :placeholder="$t('回款联系人')" v-model="form.payee" ></EmisUserSimplePicker1> <EmisUserSimplePicker1 :placeholder="$t('回款联系人')" v-model="form.payee" ></EmisUserSimplePicker1>

85
src/views/emis/emisCustomerUser/monthUserList.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery"> <SearchForm :model="queryParams" ref="queryForm" size="mini" :maxShow="10" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="company"> <el-form-item label="客户名称" prop="company">
<el-input <el-input
v-model="queryParams.company" v-model="queryParams.company"
:placeholder="$t('客户名称')" :placeholder="$t('客户名称')"
@ -10,7 +10,7 @@
@input="handleQuery" @input="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="" prop="customerName"> <el-form-item label="寄件人" prop="customerName">
<el-input <el-input
v-model="queryParams.customerName" v-model="queryParams.customerName"
:placeholder="$t('寄件人')" :placeholder="$t('寄件人')"
@ -19,7 +19,7 @@
@input="handleQuery" @input="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="" prop="phone"> <el-form-item label="电话" prop="phone">
<el-input <el-input
v-model="queryParams.phone" v-model="queryParams.phone"
:placeholder="$t('电话')" :placeholder="$t('电话')"
@ -28,6 +28,18 @@
@input="handleQuery" @input="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="国家" prop="country">
<CountryPicker :placeholder="$t('国家')" v-model="queryParams.country" ></CountryPicker>
</el-form-item>
<el-form-item label="省份" prop="province">
<ProvincePicker v-model="queryParams.province" :countryCode="queryParams.country" ></ProvincePicker>
</el-form-item>
<el-form-item label="回款联系人" prop="payee" >
<EmisUserSimplePicker1 :placeholder="$t('回款联系人')" v-model="queryParams.payee" ></EmisUserSimplePicker1>
</el-form-item>
<el-form-item label="销售联系人" prop="salesmen" >
<EmisUserSimplePicker2 :placeholder="$t('销售联系人')" v-model="queryParams.salesmen" ></EmisUserSimplePicker2>
</el-form-item>
</SearchForm> </SearchForm>
@ -63,7 +75,7 @@
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="mini"
:disabled="single" :disabled="multiple"
@click="handleBatchUpdate" @click="handleBatchUpdate"
v-hasPermi="['emis:emisCustomerUser:edit']" v-hasPermi="['emis:emisCustomerUser:edit']"
>批量修改</el-button> >批量修改</el-button>
@ -128,11 +140,12 @@
<!-- <el-table-column :label="$t('union_id')" align="center" prop="unionId" min-width="100" /> --> <!-- <el-table-column :label="$t('union_id')" align="center" prop="unionId" min-width="100" /> -->
<!-- <el-table-column :label="$t('登录账号')" align="center" prop="userName" min-width="100" /> --> <!-- <el-table-column :label="$t('登录账号')" align="center" prop="userName" min-width="100" /> -->
<!-- <el-table-column :label="$t('登录密码')" align="center" prop="password" min-width="100" /> --> <!-- <el-table-column :label="$t('登录密码')" align="center" prop="password" min-width="100" /> -->
<el-table-column :label="$t('国家')" align="center" prop="countryName" min-width="100" /> <el-table-column :label="$t('国家')" align="left" prop="countryName" min-width="100" />
<el-table-column :label="$t('省份')" align="center" prop="provinceName" min-width="130" :show-overflow-tooltip="true" > <el-table-column :label="$t('省份')" align="left" prop="provinceName" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('城市')" align="left" prop="citeName" min-width="130" :show-overflow-tooltip="true" >
<template slot-scope="scope"> <template slot-scope="scope">
<div > <div >
{{ scope.row.provinceName }} {{ scope.row.cityName }} {{ scope.row.countyName }} {{ scope.row.cityName }} {{ scope.row.countyName }}
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -140,7 +153,7 @@
<!-- <el-table-column :label="$t('城市')" align="center" prop="city" min-width="100" /> --> <!-- <el-table-column :label="$t('城市')" align="center" prop="city" min-width="100" /> -->
<!-- <el-table-column :label="$t('区县')" align="center" prop="county" min-width="100" /> --> <!-- <el-table-column :label="$t('区县')" align="center" prop="county" min-width="100" /> -->
<!-- <el-table-column :label="$t('镇')" align="center" prop="town" min-width="100" /> --> <!-- <el-table-column :label="$t('镇')" align="center" prop="town" min-width="100" /> -->
<!-- <el-table-column :label="$t('地址')" align="center" prop="address" min-width="100" /> --> <el-table-column :label="$t('地址')" align="center" prop="address" min-width="100" show-overflow-tooltip="true" />
<!-- <el-table-column :label="$t('email')" align="center" prop="email" min-width="100" /> --> <!-- <el-table-column :label="$t('email')" align="center" prop="email" min-width="100" /> -->
<!-- <el-table-column :label="$t('发件国')" align="center" prop="sendCountry" min-width="100" /> --> <!-- <el-table-column :label="$t('发件国')" align="center" prop="sendCountry" min-width="100" /> -->
<!-- <el-table-column :label="$t('发件省')" align="center" prop="sendProvince" min-width="100" /> --> <!-- <el-table-column :label="$t('发件省')" align="center" prop="sendProvince" min-width="100" /> -->
@ -150,16 +163,32 @@
<!-- <el-table-column :label="$t('邮编')" align="center" prop="postCode" min-width="100" /> --> <!-- <el-table-column :label="$t('邮编')" align="center" prop="postCode" min-width="100" /> -->
<!-- <el-table-column :label="$t('启用状态')" align="center" prop="status" min-width="100" /> --> <!-- <el-table-column :label="$t('启用状态')" align="center" prop="status" min-width="100" /> -->
<!-- <el-table-column :label="$t('真实姓名')" align="center" prop="realName" min-width="100" /> --> <!-- <el-table-column :label="$t('真实姓名')" align="center" prop="realName" min-width="100" /> -->
<el-table-column :label="$t('业务网点范围')" align="center" prop="bizSiteName" min-width="100" /> <el-table-column :label="$t('业务网点范围')" align="center" prop="bizSiteName" min-width="150" show-overflow-tooltip="true"/>
<el-table-column :label="$t('回款联系人')" align="center" prop="payeeName" min-width="100" /> <el-table-column :label="$t('回款联系人')" align="center" prop="payeeName" min-width="100" />
<el-table-column :label="$t('销售联系人')" align="center" prop="salesmenName" min-width="100" /> <el-table-column :label="$t('销售联系人')" align="center" prop="salesmenName" min-width="100" />
<!-- <el-table-column :label="$t('是否开通oms')" align="center" prop="blOpenOms" min-width="100" /> --> <el-table-column :label="$t('开通oms')" align="center" prop="blOpenOms" min-width="100" >
<!-- <el-table-column :label="$t('是否短信')" align="center" prop="blSms" min-width="100" /> --> <template slot-scope="scope">
<el-tag v-if="scope.row.blOpenOms==1" type="success">是</el-tag>
<el-tag v-if="scope.row.blOpenOms==0" type="danger">否</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('是否短信')" align="center" prop="blSms" min-width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.blSms==1" type="success">是</el-tag>
<el-tag v-if="scope.row.blSms==0" type="danger">否</el-tag>
</template>
</el-table-column>
<el-table-column label="启用状态" align="center" prop="status" min-width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.status==1" type="success">启用</el-tag>
<el-tag v-if="scope.row.status==0" type="danger">停用</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('专属业务员')" align="center" prop="opEmpName" min-width="100" /> <el-table-column :label="$t('专属业务员')" align="center" prop="opEmpName" min-width="100" />
<!-- <el-table-column :label="$t('微信昵称')" align="center" prop="nickName" min-width="120" /> --> <!-- <el-table-column :label="$t('微信昵称')" align="center" prop="nickName" min-width="120" /> -->
<!-- <el-table-column :label="$t('openid')" align="center" prop="openid" min-width="100" /> --> <!-- <el-table-column :label="$t('openid')" align="center" prop="openid" min-width="100" /> -->
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" /> <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" />
<el-table-column :label="$t('最近下单时间')" align="center" prop="loginDate" min-width="100" /> <el-table-column :label="$t('最近下单时间')" align="center" prop="loginDate" min-width="170" />
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" /> <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" />
<!-- <el-table-column :label="$t('排序')" align="center" prop="orderNum" min-width="100" /> --> <!-- <el-table-column :label="$t('排序')" align="center" prop="orderNum" min-width="100" /> -->
<!-- <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> --> <!-- <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> -->
@ -189,6 +218,9 @@
<monthUserForm :id="currentId" customerType="2" @on-changed="handleFormChanged" @on-cancel="cancelForm"></monthUserForm> <monthUserForm :id="currentId" customerType="2" @on-changed="handleFormChanged" @on-cancel="cancelForm"></monthUserForm>
</el-dialog> </el-dialog>
<el-dialog :title="titleForm" :visible.sync="openBatchUpdateForm" width="50%" :destroy-on-close="true" :close-on-click-modal="false" v-dialogDrag append-to-body>
<batchUpdateForm :ids="ids" @on-changed="handleFormChanged" @on-cancel="cancelForm"></batchUpdateForm>
</el-dialog>
</div> </div>
</template> </template>
@ -198,10 +230,24 @@ import { listEmisCustomerUser, getEmisCustomerUser, delEmisCustomerUser, addEmis
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker'; import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
// import emisCustomerUserView from '@/views/emis/emisCustomerUser/emisCustomerUserView'; // import emisCustomerUserView from '@/views/emis/emisCustomerUser/emisCustomerUserView';
import monthUserForm from '@/views/emis/emisCustomerUser/monthUserForm'; import monthUserForm from '@/views/emis/emisCustomerUser/monthUserForm';
import batchUpdateForm from '@/views/emis/emisCustomerUser/batchUpdateForm';
import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import ProvincePicker from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
import CityPicker from '@/views/emis/EmisBaseTools/CityPicker.vue';
import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
export default { export default {
name: "monthUserList", name: "monthUserList",
components: { elDateSimplePicker,monthUserForm }, components: { elDateSimplePicker,monthUserForm,batchUpdateForm,CountryPicker,
EmisSiteSimplePicker,ProvincePicker,CityPicker,
EmisUserSimplePicker0,EmisUserSimplePicker1,EmisUserSimplePicker2
},
dicts: [ dicts: [
], ],
data() { data() {
@ -225,6 +271,7 @@ export default {
currentId:null, currentId:null,
openForm: false, openForm: false,
openBatchUpdateForm:false,
titleForm: "", titleForm: "",
customerType:1, customerType:1,
@ -301,11 +348,19 @@ export default {
this.moreInputVisible = !this.moreInputVisible; this.moreInputVisible = !this.moreInputVisible;
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleBatchUpdate(row) {
this.currentId= row.id;
this.openBatchUpdateForm = true;
this.titleForm = "批量修改";
},
handleUpdate(row) { handleUpdate(row) {
this.currentId= row.id; this.currentId= row.id;
this.openForm = true; this.openForm = true;
this.titleForm = "修改月结客户"; this.titleForm = "修改月结客户";
}, },
handleView(row) { handleView(row) {
this.id=row.id; this.id=row.id;
this.titleView="查看"; this.titleView="查看";
@ -314,9 +369,11 @@ export default {
}, },
handleFormChanged(){ handleFormChanged(){
this.openForm = false; this.openForm = false;
this.openBatchUpdateForm = false;
this.getList(); this.getList();
}, },
cancelForm(){ cancelForm(){
this.openBatchUpdateForm = false;
this.openForm = false; this.openForm = false;
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */

19
src/views/emis/emisQuoteDispArea/dispAreaPanel.vue
View File

@ -65,6 +65,19 @@
>导出</el-button> >导出</el-button>
</el-col> --> </el-col> -->
</el-row> </el-row>
<el-form style="text-align: right;" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="区域名称" prop="areaName" style="margin-bottom:5px">
<el-input
v-model="queryParams.areaName"
placeholder="区域名称"
clearable
size="mini"
@input="handleQuery"
/>
</el-form-item>
</el-form>
<el-table <el-table
size="mini" size="mini"
ref="areaTable" ref="areaTable"
@ -74,6 +87,7 @@
:data="emisQuoteDispAreaList" :data="emisQuoteDispAreaList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@row-click="handleSelectArea" @row-click="handleSelectArea"
max-height="350px"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('报价区域名称')" align="center" prop="areaName" min-width="100" /> <el-table-column :label="$t('报价区域名称')" align="center" prop="areaName" min-width="100" />
@ -182,7 +196,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 20, pageSize: 1000,
areaName: null, areaName: null,
useSite: null, useSite: null,
useSiteCode: null, useSiteCode: null,
@ -211,7 +225,6 @@ export default {
/** 查询寄件区域列表 */ /** 查询寄件区域列表 */
getList() { getList() {
this.loading = true; this.loading = true;
this.queryParams = {};
listEmisQuoteDispArea(this.queryParams).then(response => { listEmisQuoteDispArea(this.queryParams).then(response => {
this.emisQuoteDispAreaList = response.rows; this.emisQuoteDispAreaList = response.rows;
this.total = response.total; this.total = response.total;
@ -238,7 +251,7 @@ export default {
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum=1,
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */

1
src/views/emis/emisQuoteDispArea/emisQuoteDispAreaForm.vue
View File

@ -224,6 +224,7 @@ export default {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
console.log(this.form)
this.disabled=true; this.disabled=true;
if (this.form.areaId != null) { if (this.form.areaId != null) {
updateEmisQuoteDispArea(this.form).then(response => { updateEmisQuoteDispArea(this.form).then(response => {

29
src/views/emis/emisQuotePrice/emisQuotePriceForm.vue
View File

@ -15,7 +15,7 @@
</el-col> --> </el-col> -->
<el-col :span="24"> <el-col :span="24">
<el-form-item label="使用网点" prop="useSiteCode"> <el-form-item label="使用网点" prop="useSiteCode">
<EmisSiteSimplePicker v-model="form.useSiteCode" :placeholder="$t('使用网点')" isInitiated="true" @onChange="onUseSiteChange"></EmisSiteSimplePicker> <EmisSiteSimplePicker v-model="form.useSiteCode" :placeholder="$t('使用网点')" isInitiated="true" @onChange="onUseSiteChange" @onClear="onUseSiteChange"></EmisSiteSimplePicker>
<!-- <div v-if="ownerSiteCode == 88888"> <!-- <div v-if="ownerSiteCode == 88888">
<EmisSiteSimplePicker v-model="form.useSiteCode" :placeholder="$t('使用网点')" siteType="2" isInitiated="true" :disabled="false" ></EmisSiteSimplePicker> <EmisSiteSimplePicker v-model="form.useSiteCode" :placeholder="$t('使用网点')" siteType="2" isInitiated="true" :disabled="false" ></EmisSiteSimplePicker>
</div> </div>
@ -139,6 +139,7 @@
size="mini" size="mini"
type="primary" type="primary"
@click="handelSelectSendArea()" @click="handelSelectSendArea()"
:disabled="!form.useSiteCode"
>新增区域</el-button> >新增区域</el-button>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -167,6 +168,7 @@
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
:disabled="!form.useSiteCode"
@click="handelSelectDispArea()" @click="handelSelectDispArea()"
>新增区域</el-button> >新增区域</el-button>
</el-col> </el-col>
@ -407,15 +409,25 @@ export default {
}, },
onUseSiteChange(item){ onUseSiteChange(item){
if(item!=null){ if(item!=null){
// this.form.useSiteCode = item.sitCode;
this.form.useSite = item.siteName; this.form.useSite = item.siteName;
} }
this.initSendAreaList();
this.initDispAreaList();
}, },
// 初始化寄件区域 // 初始化寄件区域
initSendAreaList() { initSendAreaList() {
this.loading = true; this.loading = true;
let queryParams = {}; let queryParams = {};
if(this.form.useSiteCode&&this.form.useSiteCode!=''){
queryParams = {
useSiteCode: this.form.useSiteCode,
};
}else{
this.emisQuoteSendAreaList=[]
return;
}
listEmisQuoteSendArea(queryParams).then(response => { listEmisQuoteSendArea(queryParams).then(response => {
this.emisQuoteSendAreaList = response.rows; this.emisQuoteSendAreaList = response.rows;
if(this.form.sendAreaId != null){ if(this.form.sendAreaId != null){
@ -433,7 +445,16 @@ export default {
}, },
initDispAreaList(){ initDispAreaList(){
this.loading = true; this.loading = true;
let queryParams = {}; let queryParams =null;
if(this.form.useSiteCode&&this.form.useSiteCode!=''){
queryParams = {
useSiteCode: this.form.useSiteCode,
};
}else{
this.emisQuoteDispAreaList=[]
return;
}
listEmisQuoteDispArea(queryParams).then(response => { listEmisQuoteDispArea(queryParams).then(response => {
this.emisQuoteDispAreaList = response.rows; this.emisQuoteDispAreaList = response.rows;
if(this.form.dispAreaId != null){ if(this.form.dispAreaId != null){
@ -469,6 +490,7 @@ export default {
// 取消编辑寄件区域 // 取消编辑寄件区域
cancelSendAreaForm(){ cancelSendAreaForm(){
this.openSendAreaForm=false; this.openSendAreaForm=false;
this.initSendAreaList();
}, },
// 公式改变 // 公式改变
@ -495,6 +517,7 @@ export default {
// 取消编辑派件区域 // 取消编辑派件区域
cancelDispAreaForm(){ cancelDispAreaForm(){
this.openDispAreaForm=false; this.openDispAreaForm=false;
this.initDispAreaList();
}, },
// 选择派件区域 // 选择派件区域
onDispAreaChange(){ onDispAreaChange(){

15
src/views/emis/emisQuotePrice/index.vue
View File

@ -18,12 +18,11 @@
<el-form-item label="产品类型" prop="prodCode"> <el-form-item label="产品类型" prop="prodCode">
<TransProductPicker placeholder="产品类型" v-model="queryParams.prodCode" :transLineCode="queryParams.transLineCode" @onChange="handleQuery"></TransProductPicker> <TransProductPicker placeholder="产品类型" v-model="queryParams.prodCode" :transLineCode="queryParams.transLineCode" @onChange="handleQuery"></TransProductPicker>
</el-form-item> </el-form-item>
<!-- <el-form-item label="使用网点" prop="useSiteCode"> <el-form-item label="使用网点" prop="useSiteCode">
<EmisSiteSimplePicker v-if="ownerSiteCode == 88888" v-model="queryParams.useSiteCode" :placeholder="$t('使用网点')" siteType="1" isInitiated="true" :disabled="false" ></EmisSiteSimplePicker> <EmisSiteSimplePicker0 v-if="ownerSiteCode == 88888" v-model="queryParams.useSiteCode" :placeholder="$t('使用网点')" siteType="1" isInitiated="true" :disabled="false" ></EmisSiteSimplePicker0>
<EmisSiteSimplePicker v-else v-model="queryParams.useSiteCode" :placeholder="$t('使用网点')" siteType="2" isInitiated="true" :disabled="true" ></EmisSiteSimplePicker> </el-form-item>
</el-form-item> -->
<el-form-item :label="$t('寄件网点')" prop="sendAreaSiteCode"> <el-form-item :label="$t('寄件网点')" prop="sendAreaSiteCode">
<EmisSiteSimplePicker v-model="queryParams.sendAreaSiteCode" :placeholder="$t('寄件网点')" isInitiated="true" :disabled="false" @onChange="handleQuery"></EmisSiteSimplePicker> <EmisSiteSimplePicker1 v-model="queryParams.sendAreaSiteCode" :placeholder="$t('寄件网点')" isInitiated="true" :disabled="false" @onChange="handleQuery"></EmisSiteSimplePicker1>
</el-form-item> </el-form-item>
<el-form-item :label="$t('派件区域')" prop="dispAreaName"> <el-form-item :label="$t('派件区域')" prop="dispAreaName">
<el-input <el-input
@ -249,13 +248,15 @@ import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
import emisQuotePriceForm from '@/views/emis/emisQuotePrice/emisQuotePriceForm'; import emisQuotePriceForm from '@/views/emis/emisQuotePrice/emisQuotePriceForm';
import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue'; import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; import EmisSiteSimplePicker0 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue'; import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue'; import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
export default { export default {
name: "emisQuotePrice", name: "emisQuotePrice",
components: { elDateSimplePicker,emisQuotePriceForm,CountryPicker,EmisSiteSimplePicker,TransLinePicker,TransProductPicker }, components: { elDateSimplePicker,emisQuotePriceForm,CountryPicker,EmisSiteSimplePicker0,EmisSiteSimplePicker1,TransLinePicker,TransProductPicker },
dicts: [ dicts: [
'sys_normal_disable','emis_create_area_type','emis_fee_type','emis_price_type' 'sys_normal_disable','emis_create_area_type','emis_fee_type','emis_price_type'
], ],

15
src/views/emis/emisQuoteSendArea/sendAreaPanel.vue
View File

@ -65,6 +65,18 @@
>导出</el-button> >导出</el-button>
</el-col> --> </el-col> -->
</el-row> </el-row>
<el-form style="text-align: right;" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="区域名称" prop="areaName" style="margin-bottom:5px">
<el-input
v-model="queryParams.areaName"
placeholder="区域名称"
clearable
size="mini"
@input="handleQuery"
/>
</el-form-item>
</el-form>
<el-table <el-table
size="mini" size="mini"
ref="areaTable1" ref="areaTable1"
@ -74,6 +86,7 @@
:data="emisQuoteSendAreaList" :data="emisQuoteSendAreaList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@row-click="handleSelectArea" @row-click="handleSelectArea"
max-height="350px"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('报价区域名称')" align="center" prop="areaName" min-width="100" /> <el-table-column :label="$t('报价区域名称')" align="center" prop="areaName" min-width="100" />
@ -159,7 +172,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 100, pageSize: 1000,
areaName: null, areaName: null,
useSite: null, useSite: null,
useSiteCode: this.useSiteCode, useSiteCode: this.useSiteCode,

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

@ -428,11 +428,14 @@ export default {
if (res.rows.length==0) { if (res.rows.length==0) {
callback(); callback();
} else { } else {
if(res.rows[0].id != this.form.id ){ res.rows.forEach(item=>{
if(item.id != this.form.id && item.siteName==value ){
callback(new Error("网点名称重复")); callback(new Error("网点名称重复"));
}else{ return;
callback();
} }
});
// 没有重复的
callback();
} }
}) })
.catch((error) => { .catch((error) => {
@ -445,7 +448,14 @@ export default {
if (res.rows.length==0) { if (res.rows.length==0) {
callback(); callback();
} else { } else {
res.rows.forEach(item=>{
if(item.siteName==value ){
callback(new Error("网点名称重复")); callback(new Error("网点名称重复"));
return;
}
});
// 没有重复的
callback();
} }
}) })
.catch((error) => { .catch((error) => {

52
src/views/emis/emisTransLine/emisTransLineForm.vue
View File

@ -137,7 +137,8 @@ export default {
// { validator: this.validateCode, trigger: "blur" } // { validator: this.validateCode, trigger: "blur" }
// ], // ],
lineName: [ lineName: [
{ required: true, message: "线路名称不能为空", trigger: "blur" } { required: true, message: "线路名称不能为空", trigger: "blur" },
{ validator: this.validateName, trigger: "blur" }
], ],
meterRate: [ meterRate: [
{ required: true, message: "泡重比", trigger: "blur" }, { required: true, message: "泡重比", trigger: "blur" },
@ -249,6 +250,55 @@ export default {
} }
} }
}, },
validateName (rule, value, callback) {
if (!value) {
callback(new Error("请输入线路名称"));
} else if (value.length > 50) {
callback(new Error("长度为1-50"));
} else {
if (this.form.id) {
// 修改时检查账号是否重复
listEmisTransLine({ lineName: value})
.then((res) => {
if (res.rows.length==0) {
callback();
} else {
res.rows.forEach(item=>{
if(item.id != this.form.id && item.lineName==value ){
callback(new Error("线路名称重复"));
return;
}
});
// 没有重复的
callback();
}
})
.catch((error) => {
callback(new Error("验证失败，请重试"));
});
} else {
// 新增时检查账号是否重复
listEmisTransLine({ lineName: value})
.then((res) => {
if (res.rows.length==0) {
callback();
} else {
res.rows.forEach(item=>{
if(item.lineName==value ){
callback(new Error("线路名称重复"));
return;
}
});
// 没有重复的
callback();
}
})
.catch((error) => {
callback(new Error("验证失败，请重试"));
});
}
}
},
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {

18
src/views/emis/emisTransProduct/emisTransProductForm.vue
View File

@ -130,7 +130,8 @@ export default {
// { validator: this.validateName, trigger: "blur" } // { validator: this.validateName, trigger: "blur" }
prodName: [ prodName: [
{ required: true, message: "名称不能为空", trigger: "blur" } { required: true, message: "名称不能为空", trigger: "blur" },
{ validator: this.validateName, trigger: "blur" }
], ],
prodNameEn: [ prodNameEn: [
{ required: true, message: "英文名称不能为空", trigger: "blur" } { required: true, message: "英文名称不能为空", trigger: "blur" }
@ -242,11 +243,13 @@ export default {
if (res.rows.length==0) { if (res.rows.length==0) {
callback(); callback();
} else { } else {
if(res.rows[0].id != this.form.id ){ res.rows.forEach(item=>{
if(item.id != this.form.id && item.prodName==value && item.transLineCode==this.form.transLineCode ){
callback(new Error("类型名称重复")); callback(new Error("类型名称重复"));
}else{ return;
callback();
} }
});
callback();
} }
}) })
.catch((error) => { .catch((error) => {
@ -259,7 +262,14 @@ export default {
if (res.rows.length==0) { if (res.rows.length==0) {
callback(); callback();
} else { } else {
res.rows.forEach(item=>{
if(item.prodName==value && item.transLineCode==this.form.transLineCode ){
callback(new Error("类型名称重复")); callback(new Error("类型名称重复"));
return;
}
});
// 没有重复的
callback();
} }
}) })
.catch((error) => { .catch((error) => {

1
src/views/emis/emisTransProduct/index.vue
View File

@ -361,7 +361,6 @@ export default {
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
this.getList(); this.getList();
this.getTranslineList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {