This commit is contained in:
linfso 2024-05-26 09:24:20 +08:00
parent 6c036a7c4a
commit 95b511a00b
4 changed files with 62 additions and 66 deletions

View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<XdPageContainer class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<SearchForm slot="pageHeader" :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"
@ -26,7 +26,12 @@
</SearchForm>
<XdTable v-loading="loading"
<XdTable
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border stripe
size="small"
:data="emisCustomerAddressList"
@ -170,7 +175,7 @@
</el-dialog>
-->
</div>
</XdPageContainer>
</template>
<script>

View File

@ -203,6 +203,11 @@
<EmisUserSimplePicker0 :placeholder="$t('所属业务员')" v-model="form.opEmpCode" ></EmisUserSimplePicker0>
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="主所属网点" prop="ownerSite">
<EmisSiteSimplePicker :placeholder="$t('所属站点')" v-model="form.ownerSite" ></EmisSiteSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="回款联系人" prop="payee" label-width="100px">
<!-- <EmisUserSimplePicker1 :placeholder="$t('回款联系人')" v-model="form.payee" ></EmisUserSimplePicker1> -->
@ -243,8 +248,8 @@
<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 :label="'1'">是</el-radio>
<el-radio :label="'0'">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>

View File

@ -1,11 +1,11 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="mini" :maxShow="10" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" :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
v-model="queryParams.customerName"
:placeholder="$t('客户名称')"
:placeholder="$t('寄件人')"
clearable
@keyup.enter.native="handleQuery"
/>
@ -21,6 +21,14 @@
<el-form-item label="所属国家" prop="country">
<CountryPicker :placeholder="$t('所属国家')" v-model="queryParams.country" ></CountryPicker>
</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="province">
<ProvincePicker v-model="queryParams.province" :countryCode="queryParams.country" ></ProvincePicker>
</el-form-item>
@ -30,19 +38,21 @@
<el-form-item label="销售联系人" prop="salesmen" >
<SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen" ></SalemanPicker>
</el-form-item>
<el-form-item :label="$t('启用状态')" prop="status">
<el-select v-model="queryParams.status" clearable :placeholder="$t('启用状态')" @change="handleQuery">
<el-option key="0" label="停用" :value="0" />
<el-option key="1" label="启用" :value="1" />
</el-select>
</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> -->
</SearchForm>
<XdTable v-loading="loading"
<XdTable
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border stripe
size="small"
:data="emisCustomerUserList"
@ -113,8 +123,8 @@
<div class="link-type" @click="handleUpdate(scope.row)">{{scope.row.customerName}}</div>
</template>
</el-table-column>
<el-table-column :label="$t('所属公司')" align="left" prop="company" width="120" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('手机号码')" align="center" prop="phone" width="100" />
<el-table-column :label="$t('公司名称')" align="left" prop="company" width="120" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('英文简称')" align="center" prop="customerNameEn" min-width="100" /> -->
<!-- <el-table-column :label="$t('手机号')" align="center" prop="mobile" min-width="100" /> -->
@ -131,42 +141,25 @@
<!-- <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="ownerSiteName" min-width="100" />
<el-table-column :label="$t('所属国家')" align="center" prop="country" min-width="100" />
<el-table-column :label="$t('所属省份')" align="center" prop="provinceName" min-width="110" >
<el-table-column :label="$t('国家')" align="left" prop="countryName" min-width="100" />
<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">
<div >
{{ scope.row.provinceName }}
{{ scope.row.cityName }} {{ scope.row.countyName }}
</div>
</template>
</el-table-column>
<!-- <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="county" 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('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="sendProvince" min-width="100" /> -->
<!-- <el-table-column :label="$t('发件区')" align="center" prop="sendCity" min-width="100" /> -->
<!-- <el-table-column :label="$t('发件区')" align="center" prop="sendCounty" min-width="100" /> -->
<!-- <el-table-column :label="$t('发件镇')" align="center" prop="sendTown" 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="realName" min-width="100" /> -->
<el-table-column :label="$t('主归属网点')" align="center" prop="ownerSiteName" min-width="100" />
<el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
<el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" 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" /> -->
<!-- <el-table-column :label="$t('专属业务员')" align="center" prop="opEmpName" min-width="100" /> -->
<!-- <el-table-column :label="$t('微信昵称')" align="center" prop="customerName" width="100" /> -->
<!-- <el-table-column :label="$t('openid')" align="center" prop="openid" min-width="100" >
<template slot-scope="scope">
<div >
{{ scope.row.openid }}
</div>
</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="dataFrom" min-width="100" >
<template slot-scope="scope">
<div v-if="scope.row.dataFrom" >
@ -177,9 +170,7 @@
</div>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('最近下单时间')" align="center" prop="loginDate" min-width="100" /> -->
<el-table-column :label="$t('最近下单时间')" align="center" prop="createTime" min-width="170" />
<el-table-column :label="$t('最近下单时间')" align="center" prop="lastOrderTime" min-width="170" />
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" />
<el-table-column label="备注" align="center" prop="remark" width="80"/>
<el-table-column label="创建人" align="center" prop="createBy" width="80" :show-overflow-tooltip="true"/>
@ -218,7 +209,7 @@
</el-dialog>
</div>
</XdPageContainer>
</template>
<script>

View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="mini" :maxShow="10" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" :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-input
v-model="queryParams.company"
@ -86,7 +86,11 @@
</SearchForm>
<XdTable v-loading="loading"
<XdTable
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border stripe
size="small"
:data="emisCustomerUserList"
@ -96,7 +100,6 @@
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
v-if="tableHeight" :max-height="tableHeight + 'px'"
>
<div slot="toolbar">
@ -296,7 +299,7 @@
</div>
</el-dialog> -->
</div>
</XdPageContainer>
</template>
<script>
@ -377,14 +380,6 @@ export default {
},
created() {
this.getList();
// 调整表格的高度,不允许滚动
this.$nextTick(function() {
let queryFormEl = this.$refs.queryForm.$el;
let tableH = queryFormEl.offsetHeight+190;
this.tableHeight = window.innerHeight - tableH;
});
},
methods: {
/** 查询快递客户用户列表 */