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-09-05 20:18:03 +08:00
parent 1dd4dfe5f0
commit 82640f388b
5 changed files with 232 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/views/emis/emisCommissionQuote/index.vue
View File

@ -1,24 +1,24 @@
<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="21" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="quoteCode"> <!-- <el-form-item label="" prop="quoteCode">
<el-input <el-input
v-model="queryParams.quoteCode" v-model="queryParams.quoteCode"
: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="quoteName"> <el-form-item label="方案名称" prop="quoteName">
<el-input <el-input
v-model="queryParams.quoteName" v-model="queryParams.quoteName"
: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="calcType"> <el-form-item label="计算类型" prop="calcType">
<el-input <el-input
v-model="queryParams.calcType" v-model="queryParams.calcType"
:placeholder="$t('计算类型')" :placeholder="$t('计算类型')"
@ -26,23 +26,25 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="" prop="postType"> <el-form-item label="岗位类型" prop="postType">
<el-input <el-input
v-model="queryParams.postType" v-model="queryParams.postType"
:placeholder="$t('岗位类型:emis_commission_post')" :placeholder="$t('岗位类型')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="" prop="transType"> <el-form-item label="运输方式" prop="transType">
<el-input <el-select v-model="queryParams.transType" placeholder="运输方式" clearable filterable >
v-model="queryParams.transType" <el-option
:placeholder="$t('快递类型:emis_biz_shipping_method')" v-for="item in dict.type.emis_biz_shipping_method"
clearable v-bind:key="item.value"
@keyup.enter.native="handleQuery" v-bind:label="item.label"
/> v-bind:value="item.value"
</el-form-item> />
<el-form-item label="" prop="blOpen"> </el-select>
</el-form-item>
<el-form-item label="启用状态" prop="blOpen">
<el-input <el-input
v-model="queryParams.blOpen" v-model="queryParams.blOpen"
:placeholder="$t('启用状态')" :placeholder="$t('启用状态')"
@ -50,7 +52,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="" prop="empCode"> <el-form-item label="员工编号" prop="empCode">
<el-input <el-input
v-model="queryParams.empCode" v-model="queryParams.empCode"
:placeholder="$t('员工编号')" :placeholder="$t('员工编号')"
@ -58,7 +60,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="" prop="empName"> <el-form-item label="员工名称" prop="empName">
<el-input <el-input
v-model="queryParams.empName" v-model="queryParams.empName"
:placeholder="$t('员工名称')" :placeholder="$t('员工名称')"
@ -66,7 +68,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="" prop="startDate"> <el-form-item label="开始日期" prop="startDate">
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.startDate" v-model="queryParams.startDate"
type="date" type="date"
@ -74,7 +76,7 @@
:placeholder="$t('开始日期')"> :placeholder="$t('开始日期')">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="" prop="endDate"> <el-form-item label="结束日期" prop="endDate">
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.endDate" v-model="queryParams.endDate"
type="date" type="date"
@ -82,36 +84,13 @@
:placeholder="$t('结束日期')"> :placeholder="$t('结束日期')">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="" prop="priorityLevel">
<el-input
v-model="queryParams.priorityLevel"
:placeholder="$t('优先级')"
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>
<el-form-item label="" prop="delFlag">
<el-input
v-model="queryParams.delFlag"
:placeholder="$t('删除标志（0代表存在')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</SearchForm> </SearchForm>
<XdTable v-loading="loading" <XdTable v-loading="loading"
border stripe border stripe
size="small" size="mini"
:data="emisCommissionQuoteList" :data="emisCommissionQuoteList"
:showSearch.sync="showSearch" :showSearch.sync="showSearch"
:queryParams="queryParams" :queryParams="queryParams"
@ -206,12 +185,13 @@
</template> </template>
</el-table-column> </el-table-column>
--> -->
<!-- :emis_commission_post :emis_biz_shipping_method -->
<el-table-column :label="$t('提成方案编码')" align="center" prop="quoteCode" min-width="100" /> <!-- <el-table-column :label="$t('提成方案编码')" align="center" prop="quoteCode" min-width="100" /> -->
<el-table-column :label="$t('提成方案名称')" align="center" prop="quoteName" min-width="100" /> <el-table-column :label="$t('方案名称')" align="center" prop="quoteName" min-width="100" />
<el-table-column :label="$t('计算类型')" align="center" prop="calcType" min-width="100" /> <el-table-column :label="$t('计算类型')" align="center" prop="calcType" min-width="100" />
<el-table-column :label="$t('岗位类型:emis_commission_post')" align="center" prop="postType" min-width="100" /> <el-table-column :label="$t('岗位类型')" align="center" prop="postType" min-width="100" />
<el-table-column :label="$t('快递类型:emis_biz_shipping_method')" align="center" prop="transType" min-width="100" /> <el-table-column :label="$t('快递类型')" align="center" prop="transType" min-width="100" />
<el-table-column :label="$t('启用状态')" align="center" prop="blOpen" min-width="100" /> <el-table-column :label="$t('启用状态')" align="center" prop="blOpen" min-width="100" />
<el-table-column :label="$t('员工编号')" align="center" prop="empCode" min-width="100" /> <el-table-column :label="$t('员工编号')" align="center" prop="empCode" min-width="100" />
<el-table-column :label="$t('员工名称')" align="center" prop="empName" min-width="100" /> <el-table-column :label="$t('员工名称')" align="center" prop="empName" min-width="100" />
@ -219,7 +199,6 @@
<el-table-column :label="$t('结束日期')" align="center" prop="endDate" min-width="100" /> <el-table-column :label="$t('结束日期')" align="center" prop="endDate" min-width="100" />
<el-table-column :label="$t('优先级')" align="center" prop="priorityLevel" min-width="100" /> <el-table-column :label="$t('优先级')" align="center" prop="priorityLevel" 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" />
<el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" 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
@ -246,12 +225,6 @@
</el-dialog> </el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<emisCommissionQuoteView :quoteId="quoteId" ></EmisCommissionQuoteView>
</el-dialog>
-->
</div> </div>
</template> </template>
@ -264,8 +237,7 @@ import emisCommissionQuoteForm from '@/views/emis/emisCommissionQuote/emisCommis
export default { export default {
name: "emisCommissionQuote", name: "emisCommissionQuote",
components: { elDateSimplePicker,emisCommissionQuoteForm }, components: { elDateSimplePicker,emisCommissionQuoteForm },
dicts: [ dicts: ['emis_biz_shipping_method'],
],
data() { data() {
return { return {
// 遮罩层 // 遮罩层

6
src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
View File

@ -83,13 +83,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="actionType==2 || actionType==3 || actionType==4" label="月结客户" prop="custNo"> <el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo"></EmisMonthpayAccountPicker> <EmisMonthpayAccountPicker v-model="queryParams.custNo"></EmisMonthpayAccountPicker>
</el-form-item> </el-form-item>
<el-form-item label="付款方式" prop="params.paymentType" > <el-form-item label="付款方式" prop="params.paymentType" >
<el-select v-if="actionType==1" clearable v-model="queryParams.params.paymentType" placeholder="请选择"> <el-select clearable v-model="queryParams.params.paymentType" placeholder="请选择">
<el-option <el-option
v-for="dict in dict.type.emis_payment_type.filter(item=>['1','3','6'].includes(item.value))" v-for="dict in dict.type.emis_payment_type.filter(item=>['2','4','5'].includes(item.value))"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"

243
src/views/emis/emisWaybill/A4WaybillIPrinted.vue
View File

@ -16,7 +16,7 @@
/> />
<!-- @keyup.enter.native="handleQuery" --> <!-- @keyup.enter.native="handleQuery" -->
</el-form-item> </el-form-item>
<el-form-item label="录单时间" prop="dateTimeRange"> <el-form-item label="寄件日期" prop="dateTimeRange">
<elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker> <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
</el-form-item> </el-form-item>
@ -73,7 +73,9 @@
slot-scope="slotProps" slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'" :height="(slotProps.contentHeight)+'px'"
storageName="A4WaybillIPrinted_main" ref="refTable"
storageName="A4WaybillIPrinted_main"
v-loading="loading" v-loading="loading"
border border
size="small" size="small"
@ -164,7 +166,7 @@
<el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('发货日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/> <el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" width="100" > <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/> <dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
@ -263,6 +265,7 @@ import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePick
import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue'; import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue';
import TanexPrinterPanel from '@/views/emis/EmisBaseTools/TanexPrinterPanel.vue'; import TanexPrinterPanel from '@/views/emis/EmisBaseTools/TanexPrinterPanel.vue';
import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
export default { export default {
@ -308,6 +311,8 @@ export default {
// 运单列表表格数据 // 运单列表表格数据
emisWaybillList: [], emisWaybillList: [],
selectionList:[],
currentId:null, currentId:null,
openForm: false, openForm: false,
titleForm: "", titleForm: "",
@ -318,26 +323,7 @@ export default {
id:null, id:null,
titleView:"", titleView:"",
openView: false, openView: false,
// 更新网点时间范围
daterangeOrderDate: [],
// 更新网点时间范围
daterangeEstimateDate: [],
// 更新网点时间范围
daterangePickStartDate: [],
// 更新网点时间范围
daterangePickFinishDate: [],
// 更新网点时间范围
daterangeDispFdDate: [],
// 更新网点时间范围
daterangeRegisterDate: [],
// 更新网点时间范围
daterangeSendDate: [],
// 更新网点时间范围
daterangeProduceBillDate: [],
// 更新网点时间范围
daterangeCreateTime: [],
// 更新网点时间范围
daterangeUpdateTime: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
@ -496,8 +482,13 @@ export default {
}; };
}, },
created() { created() {
const end = new Date()
const start = new Date()
start.setHours(0,0,0,0)
end.setHours(23,59,59,0)
this.dateTimeRange=[timeFormat(start), timeFormat(end)]
this.getList(); this.getList();
this.queryOrderType="1";
}, },
@ -532,43 +523,31 @@ export default {
}); });
this.$refs.tanexPrinter.downPDF(orderList,true,"A4-EP"); this.$refs.tanexPrinter.downPDF(orderList,true,"A4-EP");
}, },
initQueryParams(){
this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"sendDate");
let qParam=null;
if(this.queryParams.billCode){
qParam={
pageNum:this.queryParams.pageNum,
pageSize:this.queryParams.pageSize,
billCode:this.queryParams.billCode,
}
}else{
if(this.$store.getters.ownerSiteCode!='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.salesmen=='') ){
this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
}
qParam=this.queryParams
}
return qParam;
},
/** 查询运单列表列表 */ /** 查询运单列表列表 */
getList() { getList() {
this.loading = true; this.loading = true;
let qParam=this.initQueryParams();
this.queryParams.params = {}; listEmisWaybill(qParam).then(response => {
if(this.queryParams.billCode){
if(this.queryOrderType != "1"){
this.queryParams.orderSn=this.queryParams.billCode+"";
this.queryParams.billCode=null;
}else{
// 处理子单号
let billArr = this.queryParams.billCode.split(",");
let newBillCodeStr="";
billArr.forEach(item=>{
if(item.startsWith("T")){
let mainBillCode=item.substr(0,14);
newBillCodeStr=newBillCodeStr+mainBillCode+",";
}else{
newBillCodeStr=newBillCodeStr+item+",";
}
});
this.queryParams.billCode=newBillCodeStr;
}
}
if(this.dateTimeRange&&this.dateTimeRange.length==2){
let startDate = new Date(this.dateTimeRange[0]);
let endDate= new Date(this.dateTimeRange[1]);
startDate=dateToStr(startDate);
endDate=dateToStr(endDate)
this.queryParams.params["beginSendDate"] = startDate;
this.queryParams.params["endSendDate"] = endDate;
}
listEmisWaybill(this.queryParams).then(response => {
this.emisWaybillList = response.rows; this.emisWaybillList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -593,6 +572,9 @@ export default {
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.currentSelection=selection; this.currentSelection=selection;
this.selectionList=selection;
this.ids = selection.map(item => item.id) this.ids = selection.map(item => item.id)
this.single = selection.length!==1 this.single = selection.length!==1
this.multiple = !selection.length this.multiple = !selection.length
@ -641,49 +623,126 @@ export default {
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); }).catch(() => {});
}, },
/** 导出按钮操作 */
handleExport() {
// this.download('emis/emisWaybill/export', {
// ...this.queryParams
// }, `emisWaybill_${new Date().getTime()}.xlsx`)
const loadingInstance = this.$loading({
text: '正在导出...'
})
var qParam = {...this.queryParams};
qParam.pageNum=1;
qParam.pageSize=5000;
listEmisWaybill(this.addDateRange(qParam, this.dateTimeRange)).then(response => { /** 导出按钮操作 */
this.downloadLoading = false handleExport() {
if (response.code === 200) { const loadingInstance = this.$loading({
const curList = response.rows text: '正在导出...'
import('@/vendor/Export2Excel').then(excel => { })
const tHeader = ['id','订单号','客户单号，合同号','运单号','子单号,逗号隔开','订单状态','运单状态','订单类型','下单时间','客户ID','客户编号2502021','客户名称','收件客户编号2502021','收件客户客户名称','第三方客户客户编号','第三方客户客户名称','wx','收货人名','收货公司','收货人手机号','收货人电话','收货人国家','省','市','区','县','收货地址','邮编','寄件人省市区名称，逗号分隔','寄件人名','寄件公司','寄件人手机号','寄件人电话','寄件人国家','寄件省','寄件市','寄件区','寄件县','寄件地址','寄件邮编','发件人省市区名称，逗号分隔','支付方式','计费方式','支付月结编号','快递线路','快递产品类型','时效','计泡比例','清关方式','报关方式','预计到达时间','包装类型','派件方式:1-送货上门','取件方式:1-上门取件','预计上门取件开始时间','预计上门取件结束时间','取货失败原因','入仓代码','入仓名称','入仓地址','入仓联系人','入仓联系人电话','入仓单号','实际进仓单关联','客户发货开始时间','客户发货截止时间','货物大类','货物描述','货物图片，逗号隔开','预入仓代垫运费','预入仓代垫运费','预入仓实际运费','预入仓快递公司','预入仓快递单号','预入仓自定义标识','预入仓供应商','总重量','总体积','件数','实际重量','体积重量','费用币种','结算重量','计费重量','运费','是否超长','是否出账','账单备注','是否超重','超重重量','费用备注','三段码','实际货值','是否投保','投保货值','投保货值币种','保费币种','保费','保险备注','保险站点代码','投保日期','是否打印','打印人编号','打印站点','打印时间','打印次数','是否同行转单','转单代码','转单单号','转单时间','转单原因','当前网点编号','下一网点编号','上一网点点号','寄件站点代码','寄件日期','寄件人编号','取件员代码','发件网点代码','发货时间','派件人代码','派件时间','派件网点代码','生成账单时间','生成账单站点代码','生成账单人代码','目的地编号','目的省','目的城市','目的国家','目的地网点代码','目的地财务中心代码','业务人代码','销售回款人','销售联系人','操作员代码','是否问题件','问题件类型','问题件原因','问题件延期天数','是否备注消息','是否发送收件人短信','是否生成子单','签收人','签收人代码','签收站点代码','签收时间','揽收图片备注','签收底单图片','时区偏差','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','备注','创建网点','更新网点',];
const filterVal = ['id','orderSn','custOrderId','billCode','billCodeSub','orderStatus','waybillStatus','orderType','orderDate','userId','customerCode','customerName','receiveCustomerCode','receiveCustomerName','thirdCustomerCode','thirdCustomerName','openId','receiveName','receiveCompany','receiveMobile','receiveTel','receiveCountry','receiveProvince','receiveCity','receiveCounty','receiveTown','receiveAddress','receivePostcode','receivePcd','sendName','sendCompany','sendMobile','sendTel','sendCountry','sendProvince','sendCity','sendCounty','sendTown','sendAddress','sendPostcode','sendPcd','paymentType','calcFeeType','custNo','transLineType','productType','timeType','meterType','customsClear','customsEclaration','estimateDate','packType','dispatchMethod','pickupMethod','pickStartDate','pickFinishDate','pickFailReason','intoWarehouseCode','intoWarehouseName','intoWarehouseAddress','intoWarehouseContact','intoWarehousePhone','intoWarehouseBillCode','warehouseInNo','customerDeliveryBeginTime','customerDeliveryEndTime','goodsType','goodsInfo','goodsPics','blPrepareInFreight','prepareInEstFee','prepareInRealFee','prepareInExpress','prepareInBillCode','prepareInRemark','prepareInSupplier','totalWeight','totalVolume','parcelQty','billWeight','volumeWeight','currency','settlementWeight','feeWeight','freight','blOverLong','blBill','blBillText','blOverWeight','overWeightNumber','feeRemark','thirdCode','realValue','blInsure','insureValue','insureValueCurrency','insureFeeCurrency','insureFee','insureRemark','insureSiteCode','insureDate','blPrint','printManCode','printSite','printDate','printCount','blDispFd','transferCode','transferBillcode','dispFdDate','dispFdReason','currentSiteCode','nextSiteCode','lastSiteCode','registerSiteCode','registerDate','registerManCode','takePieceEmployeeCode','sendSiteCode','sendDate','dispatchManCode','dispatchDate','dispatchSiteCode','produceBillDate','produceBillSiteCode','produceBillManCode','destinationCode','destinationProvince','destinationCity','destinationCounty','dispatchUnderlingSiteCode','destinationCenterCode','marketManCode','payee','salesmen','operateEmployeeCode','blIsQuestion','problemType','problemCause','problemDelayDays','blMessage','blAcceptMessage','blGenSubbill','signMan','signManCode','signSiteCode','signDate','billPicSendRmk','billPicDispatchRmk','timezoneOffset','delFlag','createBy','createTime','updateBy','updateTime','remark','createSite','updateSite',]; var qParam = {...this.queryParams};
const data = this.formatJson(filterVal, curList, response.rows) // 增加导出记录
excel.export_json_to_excel({ let postExportRecord={
header: tHeader, menuName: 'A4纸运单打印导出',
data, dateRange: qParam.params.beginSendDate+"~"+qParam.params.endSendDate,
filename: '运单列表', }
autoWidth: true
}) this.addExportAuditRecord(postExportRecord);
loadingInstance.close()
}) if(this.selectionList&&this.selectionList.length>0){
} this.exportData(this.selectionList,loadingInstance);
}); }
else{
let qParam=this.initQueryParams();
let qExportParam={...qParam};
qExportParam.pageNum=1;
qExportParam.pageSize=20000;
listEmisWaybill(qExportParam).then(response => {
if (response.code === 200) {
this.exportData(response.rows,loadingInstance);
}
});
}
},
exportData(selData,loadingInstance){
const curList =selData
import('@/vendor/Export2Excel').then(excel => {
const exportParam=this.$refs.refTable.getExportParam();
const tHeader = exportParam.header;
const filterVal = exportParam.filter;
const data = this.formatJson(filterVal, curList, selData)
excel.export_json_to_excel({
header: tHeader,
data,
filename: 'A4纸运单列表',
autoWidth: true
})
loadingInstance.close()
})
}, },
formatJson(filterVal, jsonData, resData) { formatJson(filterVal, jsonData, resData) {
let index = 0 let index = 0
return jsonData.map(v => filterVal.map(j => { return jsonData.map(v => filterVal.map(j => {
if (j === 'index') { if (j === 'index') {
return ++index return ++index
} }
if (j === 'status') { if (j === 'kjlx') {
var statusStr='xxx' return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName'];
if(v[j] == 10){ }
statusStr='xxx' if (j === 'fjr') {
return v['sendName']+'--'+v['receiveName'];
}
if (j === 'custName') {
let paymentType=v['paymentType'];
if(paymentType==2 || paymentType==4 || paymentType==5 ){
return v['custName'];
}else{
return "";
} }
return statusStr; }
if (j === 'sendMobile') {
return "";
}
if (j === 'paymentStatus') {
return this.selectDictLabel(this.dict.type.emis_payment_status,v[j]);
}
if (j === 'pickupMethod') {
return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v[j]);
}
if (j === 'customsEclaration') {
return this.selectDictLabel(this.dict.type.emis_declare_mode,v[j]);
}
if (j === 'customsClear') {
return this.selectDictLabel(this.dict.type.emis_customs_clear,v[j]);
}
if (j === 'packType') {
return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v[j]);
}
if (j === 'dispatchMethod') {
if(v[j] == 1){
return '派送';
}else{
return '自提';
}
}
if (j === 'blMessage') {
if(v[j] == 1){
return '发送';
}else{
return '不发送';
}
}
if (j === 'blAcceptMessage') {
if(v[j] == 1){
return '发送';
}else{
return '不发送';
}
}
if (j === 'blSign') {
if(v[j] == 1){
return '已签收';
}else{
return '未签收';
}
}
if (j === 'paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
} }
return v[j] return v[j]
})) }))

40
src/views/emis/emisWaybill/UserOrderList.vue
View File

@ -2,20 +2,19 @@
<XdPageContainer class="app-container"> <XdPageContainer class="app-container">
<div slot="pageHeader" class="tab-container"> <div slot="pageHeader" class="tab-container">
<el-tabs v-model="activeTab" class="center-tabs" @tab-click="handleTabsClick" @tab-remove="removeTab"> <!-- <el-tabs v-model="activeTab" class="center-tabs" @tab-click="handleTabsClick" @tab-remove="removeTab">
<!-- <el-tab-pane label="全部" name="allOrder" ></el-tab-pane> --> <el-tab-pane label="全部" name="allOrder" ></el-tab-pane>
<el-tab-pane label="未接单" name="waitConfirm" ></el-tab-pane> <el-tab-pane label="未接单" name="waitConfirm" ></el-tab-pane>
<el-tab-pane label="已接单" name="hasConfirm" ></el-tab-pane> <el-tab-pane label="已接单" name="hasConfirm" ></el-tab-pane>
<el-tab-pane label="已取消" name="hasCancel" ></el-tab-pane> <el-tab-pane label="已取消" name="hasCancel" ></el-tab-pane>
<el-tab-pane v-for="(item, index) in billTabs" :key="index" :name="item.billCode" :label="'运单:'+item.billCode" closable > <el-tab-pane v-for="(item, index) in billTabs" :key="index" :name="item.billCode" :label="'运单:'+item.billCode" closable >
<!-- <waybillDetailReadOnly :billCode="item.billCode"></waybillDetailReadOnly> --> <waybillDetailReadOnly :billCode="item.billCode"></waybillDetailReadOnly>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs> -->
<SearchForm :model="queryParams" ref="queryForm" size="mini" :maxShow="8" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery"> <SearchForm :model="queryParams" ref="queryForm" size="mini" :maxShow="8" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="运单号" prop="billCode"> <el-form-item label="运单号" prop="billCode">
<XdTextareaInput <XdTextareaInput
v-model="queryParams.billCode" v-model="queryParams.billCode"
:placeholder="$t('多个流水号逗号或换行隔开')" :placeholder="$t('多个流水号逗号或换行隔开')"
@ -31,15 +30,26 @@
<EmisSiteSimplePicker1 v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode!='88888'" ></EmisSiteSimplePicker1> <EmisSiteSimplePicker1 v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode!='88888'" ></EmisSiteSimplePicker1>
</el-form-item> </el-form-item>
<el-form-item label="取件方式" prop="pickupMethod"> <el-form-item label="取件方式" prop="pickupMethod">
<el-select v-model="queryParams.pickupMethod" clearable placeholder="请选择"> <el-select v-model="queryParams.pickupMethod" clearable placeholder="请选择">
<el-option <el-option
v-for="dict in dict.type.emis_qujian_fangshi" v-for="dict in dict.type.emis_qujian_fangshi"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="订单状态" prop="orderStatus">
<el-select v-model="queryParams.orderStatus" clearable placeholder="请选择">
<el-option
v-for="dict in dict.type.emis_order_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode"> <el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode">
<EmisUserSimplePicker1 :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode" postCode="RSD"></EmisUserSimplePicker1> <EmisUserSimplePicker1 :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode" postCode="RSD"></EmisUserSimplePicker1>

22
src/views/emis/emisWaybillAjustApply/adjustPanel.vue
View File

@ -1803,15 +1803,17 @@ export default {
async handleCalcFeeItem(row){ async handleCalcFeeItem(row){
if(row!=null && this.form.settlementWeight!=null){ if(row!=null && this.form.settlementWeight!=null){
if(row.calcExp&&row.calcExp!='undefined'){ if(row.calcExp&&row.calcExp!='undefined'){
let expr=row.calcExp; if(row.initialWeightFee>0||row.addWeightPrice>0){
// 如果公式包含变量，使用变量进行计算 let expr=row.calcExp;
if(expr.indexOf('s')!=-1 || expr.indexOf('d')!=-1){ // 如果公式包含变量，使用变量进行计算
expr=expr.replace("s",row.initialWeightFee); if(expr.indexOf('s')!=-1 || expr.indexOf('d')!=-1){
expr=expr.replace("d",row.addWeightPrice); expr=expr.replace("s",row.initialWeightFee);
expr=expr.replace("w",this.form.settlementWeight); expr=expr.replace("d",row.addWeightPrice);
row.realFee=parseFloat(eval(expr)).toFixed(2); expr=expr.replace("w",this.form.settlementWeight);
}else{ row.realFee=parseFloat(eval(expr)).toFixed(2);
// }else{
//
}
} }
}else{ }else{
@ -1853,7 +1855,7 @@ export default {
} }
} }
this.form.freight = totalFee.toFixed(2); this.form.freight = totalFee.toFixed(2);
}, },
calcBillFee(){ calcBillFee(){
if(this.form.settlementWeight if(this.form.settlementWeight