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-27 08:37:51 +08:00
parent 2ba79631ce
commit 16a7c024db
2 changed files with 217 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

250
src/views/emis/emisWaybill/dispatchWaybillList.vue
View File

@ -1,33 +1,104 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="mini" :maxShow="8" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm" size="mini" :maxShow="15" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="billCode">
<div slot="label">
<el-radio-group class="query-label" v-model="queryOrderType">
<el-radio :key="1" label="1">运单号</el-radio>
<el-radio :key="0" label="0">订单号</el-radio>
</el-radio-group>
</div>
<XdTextareaInput
v-model="queryParams.billCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="8">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="24">
<el-form-item label="" prop="billCode">
<div slot="label">
<el-radio-group class="query-label" v-model="queryOrderType">
<el-radio :key="1" label="1">运单号</el-radio>
<!-- <el-radio :key="0" label="0">订单号</el-radio> -->
</el-radio-group>
</div>
<XdTextareaInput
v-model="queryParams.billCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
:rows="10"
/>
<!-- @keyup.enter.native="handleQuery" -->
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="16">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="12">
<el-form-item label="寄件网点" prop="productType">
<EmisSiteSimplePicker1 v-model="queryParams.sendSiteCode" ></EmisSiteSimplePicker1>
</el-form-item>
<el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
<EmisSiteSimplePicker2 v-model="queryParams.dispatchUnderlingSiteCode" ></EmisSiteSimplePicker2>
</el-form-item>
<el-form-item :label="$t('收件业务员')" prop="takePieceEmployeeCode">
<EmisUserSimplePicker1 :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode"></EmisUserSimplePicker1>
</el-form-item>
<el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
</el-form-item>
<el-form-item label="寄件公司" prop="sendCompany">
<el-input
v-model="queryParams.sendCompany"
:placeholder="$t('寄件公司')"
clearable
:rows="2"
@keyup.enter.native="handleQuery"
/>
<!-- @keyup.enter.native="handleQuery" -->
</el-form-item>
<el-form-item label="" prop="dateTimeRange">
<div slot="label">
<el-radio-group class="query-label" v-model="queryOrderDateType">
<el-radio :key="1" label="1">订单时间</el-radio>
<el-radio :key="0" label="0">录单时间</el-radio>
</el-radio-group>
</div>
<elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
</el-form-item>
<el-form-item label="收件人" prop="receiveName">
<!-- <el-form-item :label="$t('取件员')" prop="registerManCode">
<EmisUserSimplePicker1 :placeholder="$t('录单员')" v-model="queryParams.registerManCode"></EmisUserSimplePicker1>
</el-form-item> -->
<el-form-item :label="$t('派件员')" prop="dispatchManCode">
<EmisUserSimplePicker2 :placeholder="$t('派件员')" v-model="queryParams.dispatchManCode"></EmisUserSimplePicker2>
</el-form-item>
<el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
<EmisUserSimplePicker0 :placeholder="$t('操作员')" v-model="queryParams.operateEmployeeCode"></EmisUserSimplePicker0>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="线路" prop="transLineType">
<TransLinePicker v-model="queryParams.transLineType" isInitiated="true" @onChange="handleQuery"></TransLinePicker>
</el-form-item>
<el-form-item label="产品类型" prop="productType">
<TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" @onChange="handleQuery"></TransProductPicker>
</el-form-item>
<el-form-item label="派送方式" prop="dispatchMethod" >
<el-select clearable v-model="queryParams.dispatchMethod" placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_tab_dispatch_mode"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="寄件人" prop="sendName">
<el-input
v-model="queryParams.sendName"
:placeholder="$t('寄件人')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="收件人" prop="receiveName">
<el-input
v-model="queryParams.receiveName"
:placeholder="$t('收件人')"
@ -35,14 +106,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="收件电话" prop="receiveMobile">
<el-input
v-model="queryParams.receiveMobile"
:placeholder="$t('收件电话')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="收件公司" prop="receiveCompany">
<el-input
v-model="queryParams.receiveCompany"
@ -52,16 +116,30 @@
/>
</el-form-item>
</el-col>
<el-form-item label="寄件人" prop="sendName">
<el-input
v-model="queryParams.sendName"
:placeholder="$t('寄件人')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="寄件人电话" prop="sendMobile">
</el-row>
</el-col>
</el-row>
<el-form-item label="查询时间范围" prop="dateTimeRange">
<div slot="label">
<el-radio-group class="query-label" v-model="queryOrderDateType">
<el-radio :key="1" label="1">发货时间</el-radio>
<!-- <el-radio :key="0" label="0">录单时间</el-radio> -->
</el-radio-group>
</div>
<elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
</el-form-item>
<el-form-item label="" prop="queryExpireNotSign">
<el-checkbox style="font-size:400;margin-right:10px;" v-model="queryExpireNotSign" :true-label="'1'" :false-label="'0'">超时未签收</el-checkbox>
</el-form-item>
<el-form-item label="寄件人电话" prop="sendMobile">
<el-input
v-model="queryParams.sendMobile"
:placeholder="$t('寄件人电话')"
@ -69,10 +147,11 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="寄件公司" prop="sendCompany">
<el-form-item label="收件人电话" prop="receiveMobile">
<el-input
v-model="queryParams.sendCompany"
:placeholder="$t('寄件公司')"
v-model="queryParams.receiveMobile"
:placeholder="$t('收件人电话')"
clearable
@keyup.enter.native="handleQuery"
/>
@ -91,7 +170,6 @@
<ProvincePicker2 v-model="queryParams.receiveProvince" :countryCode="queryParams.receiveCountry" style="margin-left:5px" ></ProvincePicker2>
</el-form-item>
<el-form-item label="运单状态" prop="siteType">
<el-select v-model="queryParams.waybillStatus" placeholder="运单状态" clearable filterable>
<el-option
@ -135,48 +213,16 @@
</el-select>
</el-form-item>
<el-form-item label="派送方式" prop="dispatchMethod" >
<el-select clearable v-model="queryParams.dispatchMethod" placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_tab_dispatch_mode"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="线路" prop="transLineType">
<TransLinePicker v-model="queryParams.transLineType" isInitiated="true" @onChange="handleQuery"></TransLinePicker>
</el-form-item>
<el-form-item label="产品类型" prop="productType">
<TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" @onChange="handleQuery"></TransProductPicker>
</el-form-item>
<el-form-item label="寄件网点" prop="productType">
<EmisSiteSimplePicker1 v-model="queryParams.sendSiteCode" ></EmisSiteSimplePicker1>
</el-form-item>
<el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
<EmisSiteSimplePicker2 v-model="queryParams.dispatchUnderlingSiteCode" ></EmisSiteSimplePicker2>
</el-form-item>
<el-form-item :label="$t('回款联系人')" prop="payee">
<PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee" ></PayeePicker>
</el-form-item>
<PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee" ></PayeePicker>
</el-form-item>
<el-form-item :label="$t('销售联系人')" prop="salesmen">
<SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen" ></SalemanPicker>
</el-form-item>
<el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
<EmisUserSimplePicker0 :placeholder="$t('操作员')" v-model="queryParams.operateEmployeeCode"></EmisUserSimplePicker0>
</el-form-item>
<el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode">
<EmisUserSimplePicker1 :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode"></EmisUserSimplePicker1>
</el-form-item>
<el-form-item label="是否问题件" prop="blIsQuestion" >
<el-select clearable v-model="queryParams.blIsQuestion" placeholder="请选择">
@ -198,13 +244,15 @@
/>
</el-form-item>
</SearchForm>
<XdTable v-loading="loading"
<XdTable
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border stripe
size="mini"
:data="emisWaybillList"
@ -214,8 +262,6 @@
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
v-if="tableHeight" :max-height="tableHeight + 'px'"
>
<div slot="toolbar">
@ -450,7 +496,7 @@
</el-dialog>
-->
</div>
</XdPageContainer>
</template>
<script>
@ -475,17 +521,24 @@ import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.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 EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue';
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import {dateToStr} from '@/utils/custom'
export default {
name: "WaybillIsPrinted",
// name: "SendWaybillList",
name: "DispatchWaybillList",
components: {
EmisMonthpayAccountPicker,
elDateAdvPicker,emisWaybillForm,
CountryPicker1,
CountryPicker2,ProvincePicker2,
@ -494,6 +547,8 @@ export default {
SalemanPicker,
EmisUserSimplePicker0,
EmisUserSimplePicker1,
EmisUserSimplePicker2,
EmisSiteSimplePicker1,
EmisSiteSimplePicker2,
ProblemTypePicker
@ -531,6 +586,7 @@ export default {
queryOrderType:null,
queryOrderDateType:null,
queryExpireNotSign:null,
// 弹出展示层
id:null,
@ -713,9 +769,16 @@ export default {
};
},
created() {
const end = new Date()
const start = new Date()
start.setHours(0,0,0,0)
end.setHours(23,59,59,0)
this.dateTimeRange=[start,end];
this.getList();
this.queryOrderType="1";
this.queryOrderDateType="1";
this.queryExpireNotSign="1"
// 调整表格的高度，不允许滚动
this.$nextTick(function() {
@ -724,6 +787,13 @@ export default {
this.tableHeight = window.innerHeight - tableH;
});
},
mounted() {
const end = new Date()
const start = new Date()
start.setHours(0,0,0,0)
end.setHours(23,59,59,0)
this.dateTimeRange=[start,end];
},
methods: {
/** 查询运单列表列表 */
getList() {
@ -916,4 +986,8 @@ export default {
}
}
.queryForm .el-form-item {
margin-bottom: 0px !important;
}
</style>

97
src/views/emis/emisWaybill/sendWaybillList.vue
View File

@ -4,7 +4,6 @@
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="8">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="24">
<el-form-item label="" prop="billCode">
@ -23,10 +22,6 @@
<!-- @keyup.enter.native="handleQuery" -->
</el-form-item>
</el-col>
<el-col :span="24">
</el-col>
</el-row>
</el-col>
@ -40,30 +35,13 @@
<el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
<EmisSiteSimplePicker2 v-model="queryParams.dispatchUnderlingSiteCode" ></EmisSiteSimplePicker2>
</el-form-item>
<el-form-item :label="$t('收件业务员')" prop="takePieceEmployeeCode">
<EmisUserSimplePicker1 :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode"></EmisUserSimplePicker1>
</el-form-item>
<el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
</el-form-item>
<el-form-item :label="$t('回款联系人')" prop="payee">
<PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee" ></PayeePicker>
</el-form-item>
<el-form-item :label="$t('销售联系人')" prop="salesmen">
<SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen" ></SalemanPicker>
</el-form-item>
<el-form-item label="寄件人电话" prop="sendMobile">
<el-input
v-model="queryParams.sendMobile"
:placeholder="$t('寄件人电话')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="寄件公司" prop="sendCompany">
<el-input
v-model="queryParams.sendCompany"
@ -73,6 +51,24 @@
/>
</el-form-item>
<el-form-item :label="$t('取件员')" prop="registerManCode">
<EmisUserSimplePicker1 :placeholder="$t('录单员')" v-model="queryParams.registerManCode"></EmisUserSimplePicker1>
</el-form-item>
<!-- <el-form-item :label="$t('派件员')" prop="dispatchManCode">
<EmisUserSimplePicker2 :placeholder="$t('派件员')" v-model="queryParams.dispatchManCode"></EmisUserSimplePicker2>
</el-form-item> -->
<el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
<EmisUserSimplePicker0 :placeholder="$t('操作员')" v-model="queryParams.operateEmployeeCode"></EmisUserSimplePicker0>
</el-form-item>
</el-col>
<el-col :span="12">
@ -102,8 +98,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="收件人" prop="receiveName">
<el-form-item label="收件人" prop="receiveName">
<el-input
v-model="queryParams.receiveName"
:placeholder="$t('收件人')"
@ -112,6 +107,15 @@
/>
</el-form-item>
<el-form-item label="收件公司" prop="receiveCompany">
<el-input
v-model="queryParams.receiveCompany"
:placeholder="$t('收件公司')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
</el-row>
@ -135,23 +139,25 @@
<el-checkbox style="font-size:400;margin-right:10px;" v-model="queryExpireNotSign" :true-label="'1'" :false-label="'0'">超时未签收</el-checkbox>
</el-form-item>
<el-form-item label="收件电话" prop="receiveMobile">
<el-form-item label="寄件人电话" prop="sendMobile">
<el-input
v-model="queryParams.sendMobile"
:placeholder="$t('寄件人电话')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="收件人电话" prop="receiveMobile">
<el-input
v-model="queryParams.receiveMobile"
:placeholder="$t('收件电话')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="收件公司" prop="receiveCompany">
<el-input
v-model="queryParams.receiveCompany"
:placeholder="$t('收件公司')"
:placeholder="$t('收件人电话')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="发件国" prop="sendCountry">
<CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('发件国')" @onChange="handleQuery"></CountryPicker1>
</el-form-item>
@ -207,13 +213,15 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
<EmisUserSimplePicker0 :placeholder="$t('操作员')" v-model="queryParams.operateEmployeeCode"></EmisUserSimplePicker0>
<el-form-item :label="$t('回款联系人')" prop="payee">
<PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee" ></PayeePicker>
</el-form-item>
<el-form-item :label="$t('销售联系人')" prop="salesmen">
<SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen" ></SalemanPicker>
</el-form-item>
<el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode">
<EmisUserSimplePicker1 :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode"></EmisUserSimplePicker1>
</el-form-item>
<el-form-item label="是否问题件" prop="blIsQuestion" >
@ -513,6 +521,7 @@ import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.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 EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
@ -526,6 +535,8 @@ import {dateToStr} from '@/utils/custom'
export default {
name: "SendWaybillList",
// name: "DispatchWaybillList",
components: {
EmisMonthpayAccountPicker,
elDateAdvPicker,emisWaybillForm,
@ -536,6 +547,8 @@ export default {
SalemanPicker,
EmisUserSimplePicker0,
EmisUserSimplePicker1,
EmisUserSimplePicker2,
EmisSiteSimplePicker1,
EmisSiteSimplePicker2,
ProblemTypePicker