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-08-30 15:41:25 +08:00
parent cd25736f40
commit 9e097c6d0f
8 changed files with 172 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -49,6 +49,7 @@
"dayjs": "^1.11.10", "dayjs": "^1.11.10",
"default-passive-events": "^2.0.0", "default-passive-events": "^2.0.0",
"echarts": "4.9.0", "echarts": "4.9.0",
"el-bigdata-table": "^1.0.32",
"el-table-virtual-scroll": "^1.4.4", "el-table-virtual-scroll": "^1.4.4",
"element-china-area-data": "^6.1.0", "element-china-area-data": "^6.1.0",
"element-ui": "2.15.6", "element-ui": "2.15.6",

113
src/components/XdTable/index.vue
View File

@ -204,7 +204,11 @@ import clip from '@/utils/clipboard'
import Sortable from 'sortablejs' import Sortable from 'sortablejs'
import draggable from 'vuedraggable' import draggable from 'vuedraggable'
import origTable from './table.jsx' import origTable from './table.jsx'
const components = { origTable, draggable }
import VirtualScroll from "el-table-virtual-scroll";
import { VirtualColumn } from "el-table-virtual-scroll";
const components = { origTable, draggable,VirtualScroll }
export default { export default {
name: 'XdTable', name: 'XdTable',
@ -262,42 +266,35 @@ export default {
inserted: function (el, binding, vnode) { inserted: function (el, binding, vnode) {
var oDiv = el; var oDiv = el;
var tbBodyDiv=oDiv.getElementsByClassName("el-table__body-wrapper")[0]; var tbBodyDiv=oDiv.getElementsByClassName("el-table__body-wrapper")[0];
//监听用户鼠标事件
// 鼠标按下事件
tbBodyDiv.onmousedown = function (ev) { tbBodyDiv.onmousedown = function (ev) {
var evt = window.event || arguments[0]; var evt = window.event || arguments[0];
var flag = true; var flag = true;
// 鼠标右键菜单，并且记录当前位置 // 鼠标右键菜单，并且记录当前位置
if(evt.button == 2){ if(evt.button == 2){
flag=false; flag=false;
if(vnode.context.multipleSelection&&vnode.context.multipleSelection.length>0){ if(vnode.context.multipleSelection&&vnode.context.multipleSelection.length>0)
vnode.context.currentOdiv=oDiv; {
// vnode.context.currentOdiv=tbBodyDiv;
vnode.context.currentCell=evt.target;
showContextMenu(evt);
const currentCellInfo=getCellPosition(evt.target); // 记住当前单元格位置
vnode.context.currentCellInfo=currentCellInfo; vnode.context.currentOdiv=oDiv;
vnode.context.currentCell=evt.target;
const currentCellInfo=getCellPosition(evt.target);
vnode.context.currentCellInfo=currentCellInfo;
// 显示右键菜单
showContextMenu(evt);
} }
return; return;
} }
// 只有鼠标左键按下时有效
if(evt.button != 0){
return;
}
// addCtrlCKeyDown(oDiv,evt)
vnode.context.multipleSelection=[];
//初始化不显示
vnode.context.contextVisible=false; vnode.context.contextVisible=false;
const refTableObj=vnode.context.getInstance();
// 增加图层 // 增加图层
var xdTableObj = document.getElementById(vnode.context.tableId); var xdTableObj = document.getElementById(vnode.context.tableId);
var tbBody1=xdTableObj.getElementsByClassName("el-table__body-wrapper")[0]; var tbBody1=xdTableObj.getElementsByClassName("el-table__body-wrapper")[0];
var selDiv = document.createElement("div"); var selDiv = document.createElement("div");
selDiv.style.cssText = "position:absolute;width:0px;height:0px;font-size:0px;margin:0px;padding:0px;border:2px solid #409eff;background-color:#d9ecff;z-index:1000;filter:alpha(opacity:60);opacity:0.6;display:none;"; selDiv.style.cssText = "position:absolute;width:0px;height:0px;font-size:0px;margin:0px;padding:0px;border:2px solid #409eff;background-color:#d9ecff;z-index:1000;filter:alpha(opacity:60);opacity:0.6;display:none;";
@ -305,41 +302,22 @@ export default {
tbBody1.appendChild(selDiv); tbBody1.appendChild(selDiv);
// 表格对象 // 表格对象
const tableDom=vnode.context.$refs.table.$refs.elTable.$el; const refTableObj=vnode.context.getInstance();
const tableDom=vnode.context.$refs.table.$refs.elTable.$el;
//用来存储列表 单元格和行 //用来存储列表 单元格和行
var selList = []; var selList = [];
var selRowList = []; var selRowList = [];
//获得指令下的dom对应的表格 //获得指令下的dom对应的表格
var fileNodes = oDiv.getElementsByTagName("td"); var fileNodes = oDiv.getElementsByTagName("td");
var countI = 0; var fileRowNodes = oDiv.getElementsByTagName("tr");
// 获得鼠标 X,Y // 获得鼠标 X,Y
var startX = (evt.x || evt.clientX); var startX = (evt.x || evt.clientX);
var startY = (evt.y || evt.clientY); var startY = (evt.y || evt.clientY);
//重置选中单元格css // 优先选中当前单元格
console.log("===fileNodes.length==>",fileNodes.length); setMouseCellSelect(evt.target);
for (var i = 0; i < fileNodes.length; i++) {
console.log("===fileNodes==>",i);
if (fileNodes[i].className.indexOf("el-table__cell") != -1) {
fileNodes[i].classList.remove("seled");
selList.push(fileNodes[i]);
}
}
var fileRowNodes = oDiv.getElementsByTagName("tr");
// refTableObj.clearSelection()
for (var i = 0; i < fileRowNodes.length; i++) {
if (fileRowNodes[i].className.indexOf("el-table__row") != -1) {
fileRowNodes[i].classList.remove("rowSeled");
selRowList.push(fileRowNodes[i]);
}
}
setMouseCellSelect(evt.target,selRowList);
// setMouseRowSelect(evt.target);
var _x = null; var _x = null;
var _y = null; var _y = null;
@ -352,10 +330,32 @@ export default {
_x = (evt.x || evt.clientX); _x = (evt.x || evt.clientX);
_y = (evt.y || evt.clientY); _y = (evt.y || evt.clientY);
//为了确定是点击事件还是移动事件 //为了确定是点击事件还是移动事件
// if(Math.abs(_x - startX)<5 && Math.abs(_y - startY)<5){
// return; if(Math.abs(_x - startX)<5 && Math.abs(_y - startY)<5){
// } // setMouseCellSelect(evt.target);
// setMouseRowSelect(evt.target);
return;
}
if(flag){ if(flag){
// console.log("===fileNodes.length==>",fileNodes.length);
// 只选取范围内的数据
for (var i = 0; i < fileNodes.length; i++) {
// console.log("===fileNodes==>",i);
if (fileNodes[i].className.indexOf("el-table__cell") != -1) {
fileNodes[i].classList.remove("seled");
selList.push(fileNodes[i]);
}
}
for (var i = 0; i < fileRowNodes.length; i++) {
if (fileRowNodes[i].className.indexOf("el-table__row") != -1) {
fileRowNodes[i].classList.remove("rowSeled");
selRowList.push(fileRowNodes[i]);
}
}
flag = false; flag = false;
} }
@ -381,7 +381,6 @@ export default {
var _l = selDiv.offsetLeft, _t = selDiv.offsetTop; var _l = selDiv.offsetLeft, _t = selDiv.offsetTop;
var _w = selDiv.offsetWidth, _h = selDiv.offsetHeight; var _w = selDiv.offsetWidth, _h = selDiv.offsetHeight;
if(_y>(tbPosRect2.y+tbPosRect2.height)){ if(_y>(tbPosRect2.y+tbPosRect2.height)){
tbBody2.scrollBy(0, 60); tbBody2.scrollBy(0, 60);
} }
@ -667,7 +666,6 @@ export default {
this.initDefaultTplList(); this.initDefaultTplList();
this.initStorage() this.initStorage()
this.updateTable() this.updateTable()
this.initSort();
// this.initKeyDown(); // this.initKeyDown();
this.tableDom=this.getTableDom(); this.tableDom=this.getTableDom();
@ -687,8 +685,6 @@ export default {
}, },
methods: { methods: {
getInstance() { getInstance() {
// const ref = this.$children.find(i => i.$options._componentTag === 'el-table')
// return ref
return this.$refs.table.$refs?.elTable return this.$refs.table.$refs?.elTable
}, },
getUUID() { getUUID() {
@ -1054,7 +1050,6 @@ export default {
this.storeTplToLocal(that.storageList) this.storeTplToLocal(that.storageList)
this.initStorage() this.initStorage()
this.updateTable() this.updateTable()
this.initSort();
// that.updateTable(); // that.updateTable();
// this.refreshKeyId=Math.random().toString(36).substring(3,10); // this.refreshKeyId=Math.random().toString(36).substring(3,10);
@ -1101,15 +1096,11 @@ export default {
this.storeTplToLocal(list) this.storeTplToLocal(list)
this.initStorage() this.initStorage()
this.updateTable() this.updateTable()
this.initSort();
}, },
download(){ download(){
this.$emit("download"); this.$emit("download");
}, },
initSort() {
},
// 查询 // 查询
queryTable(){ queryTable(){
this.$emit("queryTable"); this.$emit("queryTable");
@ -1163,6 +1154,7 @@ export default {
}) })
return return
} }
this.updateTable() this.updateTable()
}, },
setFixed(value, clo) { setFixed(value, clo) {
@ -1277,6 +1269,11 @@ export default {
// 清除本地缓存 // 清除本地缓存
// window.localStorage.removeItem('tableStorage') // window.localStorage.removeItem('tableStorage')
} }
// const storage = window.localStorage.getItem('tableStorage') ? JSON.parse(window.localStorage.getItem('tableStorage')) : {}
// storage[this.saveStorageName] = this.storageList
// window.localStorage.setItem('tableStorage', JSON.stringify(storage))
}, },
storeTplToLocal(tplColList){ storeTplToLocal(tplColList){
const storage = window.localStorage.getItem('tableStorage') ? JSON.parse(window.localStorage.getItem('tableStorage')) : {} const storage = window.localStorage.getItem('tableStorage') ? JSON.parse(window.localStorage.getItem('tableStorage')) : {}

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

@ -91,9 +91,12 @@
:height="(slotProps.contentHeight)+'px'" :height="(slotProps.contentHeight)+'px'"
v-loading="loading" v-loading="loading"
border border
size="small" size="mini"
:data="emisCustomerUserList" :data="emisCustomerUserList"
ref="refTable"
storageName="emisCustomerUserList_month" storageName="emisCustomerUserList_month"
:showSearch.sync="showSearch" :showSearch.sync="showSearch"
@ -599,53 +602,53 @@ export default {
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
// this.download('emis/emisCustomerUser/export', { const loadingInstance = this.$loading({
// ...this.queryParams
// }, `emisCustomerUser_${new Date().getTime()}.xlsx`)
const loadingInstance = this.$loading({
text: '正在导出...' text: '正在导出...'
})
if(this.selectionList&&this.selectionList.length>0){
this.exportData(this.selectionList,loadingInstance);
}
else{
let qExportParam={...this.queryParams};
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: '月结客户列表',
autoWidth: true
}) })
var qParam = {...this.queryParams}; loadingInstance.close()
qParam.pageNum=1; })
qParam.pageSize=5000;
listMonthUser(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
this.downloadLoading = false
if (response.code === 200) {
const curList = response.rows
import('@/vendor/Export2Excel').then(excel => {
// 客户名称 英文简称 月结编号 联系人 手机号码 主归属网点 回款联系人 销售联系人 结算类型 国家 省份 城市 区县 联系地址 E-Mail 是否启用 是否开启OMS账号 首次签约时间 备注
const tHeader = ['客户名称','英文简称','月结编号','联系人','手机号码','主归属网点','回款联系人','销售联系人','结算类型','国家','省份','城市','区县','联系地址','E-Mail','是否启用','是否开启OMS账号','首次签约时间','备注'];
const filterVal = ['customerName','customerNameEn','monthlyPayCode','contact','phone','ownerSite','payee','salesmen','settedType','country','province','city','county','address','email','status','blOpenOms','firstSigningDay','remark'];
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) { 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') {
var statusStr='停用'
if(v[j] == 1){
statusStr='启用'
}
return statusStr;
}
return v[j] return v[j]
})) }))
}, },
/** 列索引函数 */ /** 列索引函数 */
getIndex($index) { getIndex($index) {
return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1 return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1

12
src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue
View File

@ -47,8 +47,8 @@
<el-form-item label="发票类型" prop="invoiceType"> <el-form-item label="发票类型" prop="invoiceType">
<el-select clearable v-model="queryParams.invoiceType" placeholder="请选择" style="width:100%"> <el-select clearable v-model="queryParams.invoiceType" placeholder="请选择" style="width:100%">
<el-option label="增值税电子普通发票" :value="1"></el-option> <el-option label="增值税电子普通发票" :value="1"></el-option>
<el-option label="增值税普通发票" :value="2"></el-option> <el-option label="增值税普通发票(纸质发票)" :value="2"></el-option>
<el-option label="增值税专用发票" :value="3"></el-option> <el-option label="增值税专用发票(纸质发票)" :value="3"></el-option>
<el-option label="其它手工开票" :value="9"></el-option> <el-option label="其它手工开票" :value="9"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -178,8 +178,8 @@
<el-table-column :label="$t('开票类型')" align="center" prop="invoiceType" min-width="100" > <el-table-column :label="$t('开票类型')" align="center" prop="invoiceType" min-width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.invoiceType=='1'" type="info">增值税电子普通发票</el-tag> <el-tag v-if="scope.row.invoiceType=='1'" type="info">增值税电子普通发票</el-tag>
<el-tag v-if="scope.row.invoiceType=='2'" type="info">增值税普通发票</el-tag> <el-tag v-if="scope.row.invoiceType=='2'" type="info">增值税普通发票(纸质发票)</el-tag>
<el-tag v-if="scope.row.invoiceType=='3'" type="info">增值税专用发票</el-tag> <el-tag v-if="scope.row.invoiceType=='3'" type="info">增值税专用发票(纸质发票)</el-tag>
<el-tag v-if="scope.row.invoiceType=='9'" type="info">其它手工开票</el-tag> <el-tag v-if="scope.row.invoiceType=='9'" type="info">其它手工开票</el-tag>
</template> </template>
@ -610,10 +610,10 @@ export default {
return '增值税电子普通发票'; return '增值税电子普通发票';
} }
else if(v['invoiceType'] == 2){ else if(v['invoiceType'] == 2){
return '增值税普通发票'; return '增值税普通发票(纸质发票)';
} }
else if(v['invoiceType'] == 3){ else if(v['invoiceType'] == 3){
return '增值税专用发票'; return '增值税专用发票(纸质发票)';
} }
else if(v['invoiceType'] == 9){ else if(v['invoiceType'] == 9){
return '其它手工发票'; return '其它手工发票';

30
src/views/emis/emisWaybill/centerWaybillList.vue
View File

@ -19,7 +19,7 @@
clearable clearable
:rows="4" :rows="4"
/> />
<!-- @keyup.enter.native="handleQuery" --> <!-- -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -35,7 +35,7 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="月结客户" prop="custNo"> <el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker> <EmisMonthpayAccountPicker v-model="queryParams.custNo" ></EmisMonthpayAccountPicker>
</el-form-item> </el-form-item>
<el-form-item label="付款方式" prop="paymentType" > <el-form-item label="付款方式" prop="paymentType" >
<el-select clearable v-model="queryParams.paymentType" placeholder="请选择"> <el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
@ -51,10 +51,10 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="线路" prop="transLineType"> <el-form-item label="线路" prop="transLineType">
<TransLinePicker v-model="queryParams.transLineType" isInitiated="true" @onChange="handleQuery"></TransLinePicker> <TransLinePicker v-model="queryParams.transLineType" isInitiated="true" ></TransLinePicker>
</el-form-item> </el-form-item>
<el-form-item label="产品类型" prop="productType"> <el-form-item label="产品类型" prop="productType">
<TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" @onChange="handleQuery"></TransProductPicker> <TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductPicker>
</el-form-item> </el-form-item>
@ -89,7 +89,7 @@
v-model="queryParams.sendName" v-model="queryParams.sendName"
:placeholder="$t('寄件人')" :placeholder="$t('寄件人')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="寄件电话" prop="sendMobile"> <el-form-item label="寄件电话" prop="sendMobile">
@ -97,7 +97,7 @@
v-model="queryParams.sendMobile" v-model="queryParams.sendMobile"
:placeholder="$t('寄件人电话')" :placeholder="$t('寄件人电话')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="寄件公司" prop="sendCompany"> <el-form-item label="寄件公司" prop="sendCompany">
@ -105,18 +105,18 @@
v-model="queryParams.sendCompany" v-model="queryParams.sendCompany"
:placeholder="$t('寄件公司')" :placeholder="$t('寄件公司')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="寄件国家" prop="sendCountry"> <el-form-item label="寄件国家" prop="sendCountry">
<CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" @onChange="handleQuery"></CountryPicker1> <CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" ></CountryPicker1>
</el-form-item> </el-form-item>
<el-form-item label="录单备注" prop="remark"> <el-form-item label="录单备注" prop="remark">
<el-input <el-input
v-model="queryParams.remark" v-model="queryParams.remark"
:placeholder="$t('录单备注')" :placeholder="$t('录单备注')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="费用备注" prop="feeRemark"> <el-form-item label="费用备注" prop="feeRemark">
@ -124,7 +124,7 @@
v-model="queryParams.feeRemark" v-model="queryParams.feeRemark"
:placeholder="$t('费用备注')" :placeholder="$t('费用备注')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -138,7 +138,7 @@
v-model="queryParams.receiveName" v-model="queryParams.receiveName"
:placeholder="$t('收件人')" :placeholder="$t('收件人')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="收件电话" prop="receiveMobile"> <el-form-item label="收件电话" prop="receiveMobile">
@ -146,7 +146,7 @@
v-model="queryParams.receiveMobile" v-model="queryParams.receiveMobile"
:placeholder="$t('收件电话')" :placeholder="$t('收件电话')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -156,12 +156,12 @@
v-model="queryParams.receiveCompany" v-model="queryParams.receiveCompany"
:placeholder="$t('收件公司')" :placeholder="$t('收件公司')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="目的国家" prop="receiveCountry"> <el-form-item label="目的国家" prop="receiveCountry">
<CountryPicker2 v-model="queryParams.receiveCountry" :placeholder="$t('目的国家')" @onChange="handleQuery"></CountryPicker2> <CountryPicker2 v-model="queryParams.receiveCountry" :placeholder="$t('目的国家')" ></CountryPicker2>
</el-form-item> </el-form-item>
<el-form-item label="目的省份" prop="receiveProvince"> <el-form-item label="目的省份" prop="receiveProvince">
@ -289,7 +289,7 @@
v-model="queryParams.problemCause" v-model="queryParams.problemCause"
:placeholder="$t('问题件原因')" :placeholder="$t('问题件原因')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> --> </el-form-item> -->

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

@ -40,7 +40,7 @@
<el-col :span="5"> <el-col :span="5">
<el-form-item label="派件网点" prop="dispatchSiteCode"> <el-form-item label="派件网点" prop="dispatchSiteCode">
<!-- $store.getters.ownerSiteCode!='88888' --> <!-- $store.getters.ownerSiteCode!='88888' -->
<EmisSiteSimplePicker2 v-model="queryParams.dispatchSiteCode" :disabled="$store.getters.ownerSiteCode!='88888'" ></EmisSiteSimplePicker2> <EmisSiteSimplePicker2 v-model="queryParams.dispatchSiteCode" :disabled="$store.getters.ownerSiteCode!='88888' && (this.queryParams.salesmen==null||this.queryParams.salesmen==''||this.queryParams.custNo==null||this.queryParams.custNo=='')" ></EmisSiteSimplePicker2>
</el-form-item> </el-form-item>
<el-form-item :label="$t('派件员')" prop="dispatchManCode"> <el-form-item :label="$t('派件员')" prop="dispatchManCode">
<EmisUserSimplePicker2 :placeholder="$t('派件员')" v-model="queryParams.dispatchManCode"></EmisUserSimplePicker2> <EmisUserSimplePicker2 :placeholder="$t('派件员')" v-model="queryParams.dispatchManCode"></EmisUserSimplePicker2>
@ -48,7 +48,7 @@
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="月结客户" prop="custNo"> <el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker> <EmisMonthpayAccountPicker v-model="queryParams.custNo" ></EmisMonthpayAccountPicker>
</el-form-item> </el-form-item>
<el-form-item label="付款方式" prop="paymentType" > <el-form-item label="付款方式" prop="paymentType" >
<el-select clearable v-model="queryParams.paymentType" placeholder="请选择"> <el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
@ -64,10 +64,10 @@
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="线路" prop="transLineType"> <el-form-item label="线路" prop="transLineType">
<TransLinePicker v-model="queryParams.transLineType" isInitiated="true" @onChange="handleQuery"></TransLinePicker> <TransLinePicker v-model="queryParams.transLineType" isInitiated="true" ></TransLinePicker>
</el-form-item> </el-form-item>
<el-form-item label="产品类型" prop="productType"> <el-form-item label="产品类型" prop="productType">
<TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" @onChange="handleQuery"></TransProductPicker> <TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductPicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -82,7 +82,7 @@
v-model="queryParams.sendName" v-model="queryParams.sendName"
:placeholder="$t('寄件人')" :placeholder="$t('寄件人')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="寄件电话" prop="sendMobile"> <el-form-item label="寄件电话" prop="sendMobile">
@ -90,7 +90,7 @@
v-model="queryParams.sendMobile" v-model="queryParams.sendMobile"
:placeholder="$t('寄件人电话')" :placeholder="$t('寄件人电话')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="寄件公司" prop="sendCompany"> <el-form-item label="寄件公司" prop="sendCompany">
@ -98,18 +98,18 @@
v-model="queryParams.sendCompany" v-model="queryParams.sendCompany"
:placeholder="$t('寄件公司')" :placeholder="$t('寄件公司')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="寄件国家" prop="sendCountry"> <el-form-item label="寄件国家" prop="sendCountry">
<CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" @onChange="handleQuery"></CountryPicker1> <CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" ></CountryPicker1>
</el-form-item> </el-form-item>
<el-form-item label="录单备注" prop="remark"> <el-form-item label="录单备注" prop="remark">
<el-input <el-input
v-model="queryParams.remark" v-model="queryParams.remark"
:placeholder="$t('录单备注')" :placeholder="$t('录单备注')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="费用备注" prop="feeRemark"> <el-form-item label="费用备注" prop="feeRemark">
@ -117,7 +117,7 @@
v-model="queryParams.feeRemark" v-model="queryParams.feeRemark"
:placeholder="$t('费用备注')" :placeholder="$t('费用备注')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -131,7 +131,7 @@
v-model="queryParams.receiveName" v-model="queryParams.receiveName"
:placeholder="$t('收件人')" :placeholder="$t('收件人')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="收件电话" prop="receiveMobile"> <el-form-item label="收件电话" prop="receiveMobile">
@ -139,7 +139,7 @@
v-model="queryParams.receiveMobile" v-model="queryParams.receiveMobile"
:placeholder="$t('收件电话')" :placeholder="$t('收件电话')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -149,12 +149,12 @@
v-model="queryParams.receiveCompany" v-model="queryParams.receiveCompany"
:placeholder="$t('收件公司')" :placeholder="$t('收件公司')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="目的国家" prop="receiveCountry"> <el-form-item label="目的国家" prop="receiveCountry">
<CountryPicker2 v-model="queryParams.receiveCountry" :placeholder="$t('目的国家')" @onChange="handleQuery"></CountryPicker2> <CountryPicker2 v-model="queryParams.receiveCountry" :placeholder="$t('目的国家')" ></CountryPicker2>
</el-form-item> </el-form-item>
<el-form-item label="目的省份" prop="receiveProvince"> <el-form-item label="目的省份" prop="receiveProvince">
@ -281,7 +281,7 @@
v-model="queryParams.problemCause" v-model="queryParams.problemCause"
:placeholder="$t('问题件原因')" :placeholder="$t('问题件原因')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> --> </el-form-item> -->

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

@ -21,7 +21,7 @@
clearable clearable
:rows="4" :rows="4"
/> />
<!-- @keyup.enter.native="handleQuery" --> <!-- -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -43,7 +43,7 @@
<el-col :span="5"> <el-col :span="5">
<el-form-item label="寄件网点" prop="productType"> <el-form-item label="寄件网点" prop="productType">
<EmisSiteSimplePicker1 v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode !='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')" ></EmisSiteSimplePicker1> <EmisSiteSimplePicker1 v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode !='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.custNo=='')" ></EmisSiteSimplePicker1>
</el-form-item> </el-form-item>
<el-form-item label="目的网点" prop="dispatchUnderlingSiteCode"> <el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
<EmisSiteSimplePicker2 v-model="queryParams.dispatchUnderlingSiteCode" ></EmisSiteSimplePicker2> <EmisSiteSimplePicker2 v-model="queryParams.dispatchUnderlingSiteCode" ></EmisSiteSimplePicker2>
@ -67,10 +67,10 @@
<el-col :span="5"> <el-col :span="5">
<el-form-item label="线路" prop="transLineType"> <el-form-item label="线路" prop="transLineType">
<TransLinePicker v-model="queryParams.transLineType" isInitiated="true" @onChange="handleQuery"></TransLinePicker> <TransLinePicker v-model="queryParams.transLineType" isInitiated="true" ></TransLinePicker>
</el-form-item> </el-form-item>
<el-form-item label="产品类型" prop="productType"> <el-form-item label="产品类型" prop="productType">
<TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" @onChange="handleQuery"></TransProductPicker> <TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductPicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -82,7 +82,7 @@
v-model="queryParams.sendName" v-model="queryParams.sendName"
:placeholder="$t('寄件人')" :placeholder="$t('寄件人')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="寄件电话" prop="sendMobile"> <el-form-item label="寄件电话" prop="sendMobile">
@ -90,7 +90,7 @@
v-model="queryParams.sendMobile" v-model="queryParams.sendMobile"
:placeholder="$t('寄件人电话')" :placeholder="$t('寄件人电话')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="寄件公司" prop="sendCompany"> <el-form-item label="寄件公司" prop="sendCompany">
@ -98,18 +98,18 @@
v-model="queryParams.sendCompany" v-model="queryParams.sendCompany"
:placeholder="$t('寄件公司')" :placeholder="$t('寄件公司')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="寄件国家" prop="sendCountry"> <el-form-item label="寄件国家" prop="sendCountry">
<CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" @onChange="handleQuery"></CountryPicker1> <CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" ></CountryPicker1>
</el-form-item> </el-form-item>
<el-form-item label="录单备注" prop="remark"> <el-form-item label="录单备注" prop="remark">
<el-input <el-input
v-model="queryParams.remark" v-model="queryParams.remark"
:placeholder="$t('录单备注')" :placeholder="$t('录单备注')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="费用备注" prop="feeRemark"> <el-form-item label="费用备注" prop="feeRemark">
@ -117,7 +117,7 @@
v-model="queryParams.feeRemark" v-model="queryParams.feeRemark"
:placeholder="$t('费用备注')" :placeholder="$t('费用备注')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -129,7 +129,7 @@
v-model="queryParams.receiveName" v-model="queryParams.receiveName"
:placeholder="$t('收件人')" :placeholder="$t('收件人')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="收件电话" prop="receiveMobile"> <el-form-item label="收件电话" prop="receiveMobile">
@ -137,7 +137,7 @@
v-model="queryParams.receiveMobile" v-model="queryParams.receiveMobile"
:placeholder="$t('收件电话')" :placeholder="$t('收件电话')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -147,12 +147,12 @@
v-model="queryParams.receiveCompany" v-model="queryParams.receiveCompany"
:placeholder="$t('收件公司')" :placeholder="$t('收件公司')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="目的国家" prop="receiveCountry"> <el-form-item label="目的国家" prop="receiveCountry">
<CountryPicker2 v-model="queryParams.receiveCountry" :placeholder="$t('目的国家')" @onChange="handleQuery"></CountryPicker2> <CountryPicker2 v-model="queryParams.receiveCountry" :placeholder="$t('目的国家')" ></CountryPicker2>
</el-form-item> </el-form-item>
<el-form-item label="目的省份" prop="receiveProvince"> <el-form-item label="目的省份" prop="receiveProvince">
@ -262,7 +262,7 @@
<XdTable <XdTable2
slot="pageContent" slot="pageContent"
slot-scope="slotProps" slot-scope="slotProps"
@ -271,7 +271,7 @@
highlight-current-row highlight-current-row
ref="refTable" ref="refTable"
:row-key="rowKey" row-key="id"
storageName="sendWaybillList_main_240702" storageName="sendWaybillList_main_240702"
@ -519,10 +519,10 @@
<el-table-column :label="$t('录单网点')" align="center" prop="registerSiteName" min-width="80" :show-overflow-tooltip="true" /> <el-table-column :label="$t('录单网点')" align="center" prop="registerSiteName" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" /> <el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" /> <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
</XdTable> </XdTable2>
<el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="70%" :close-on-click-modal="false" v-dialogDrag append-to-body> <el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="70%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<TraceWaybillDetailView :key="currentTraceBillCode" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView> <TraceWaybillDetailView :key="currentTraceBillCode" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
@ -572,6 +572,8 @@ import WaybillDetailReadOnly from '@/views/emis/emisWaybill/waybillDetailReadOnl
import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue'; import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
import XdTable2 from '@/components/XdTable/index2.vue';
import { queryLastRecord } from "@/api/emis/emisTmsScanRecord"; import { queryLastRecord } from "@/api/emis/emisTmsScanRecord";
import {timeDiffTime,timeFormat} from '@/utils/dateUtils' import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
@ -583,6 +585,7 @@ export default {
// name: "DispatchWaybillList", // name: "DispatchWaybillList",
components: { components: {
XdTable2,
VirtualScroll, VirtualScroll,
VirtualColumn, VirtualColumn,
TraceWaybillDetailView, TraceWaybillDetailView,
@ -889,7 +892,7 @@ export default {
} }
}else{ }else{
if(this.$store.getters.ownerSiteCode!='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='') ){ 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; this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
} }

35
src/views/emis/emisWaybill/sendWaybillListNew.vue
View File

@ -22,7 +22,7 @@
clearable clearable
:rows="4" :rows="4"
/> />
<!-- @keyup.enter.native="handleQuery" --> <!-- -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -43,7 +43,7 @@
<el-col :span="5"> <el-col :span="5">
<el-form-item label="寄件网点" prop="productType"> <el-form-item label="寄件网点" prop="productType">
<EmisSiteSimplePicker1 v-model="queryParams.sendSiteCode" :disabled="($store.getters.ownerSiteCode !='88888') && (queryParams.salesmen==null||queryParams.salesmen=='')" ></EmisSiteSimplePicker1> <EmisSiteSimplePicker1 v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode !='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.custNo=='')" ></EmisSiteSimplePicker1>
</el-form-item> </el-form-item>
@ -53,7 +53,7 @@
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="月结客户" prop="custNo"> <el-form-item label="月结客户" prop="custNo">
<EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker> <EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="onCustNoChange"></EmisMonthpayAccountPicker>
</el-form-item> </el-form-item>
<el-form-item label="付款方式" prop="paymentType" > <el-form-item label="付款方式" prop="paymentType" >
<el-select clearable v-model="queryParams.paymentType" placeholder="请选择"> <el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
@ -69,10 +69,10 @@
<el-col :span="5"> <el-col :span="5">
<el-form-item label="线路" prop="transLineType"> <el-form-item label="线路" prop="transLineType">
<TransLinePicker v-model="queryParams.transLineType" isInitiated="true" @onChange="handleQuery"></TransLinePicker> <TransLinePicker v-model="queryParams.transLineType" isInitiated="true" ></TransLinePicker>
</el-form-item> </el-form-item>
<el-form-item label="产品类型" prop="productType"> <el-form-item label="产品类型" prop="productType">
<TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" @onChange="handleQuery"></TransProductPicker> <TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductPicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -84,7 +84,7 @@
v-model="queryParams.sendName" v-model="queryParams.sendName"
:placeholder="$t('寄件人')" :placeholder="$t('寄件人')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="寄件电话" prop="sendMobile"> <el-form-item label="寄件电话" prop="sendMobile">
@ -92,7 +92,7 @@
v-model="queryParams.sendMobile" v-model="queryParams.sendMobile"
:placeholder="$t('寄件人电话')" :placeholder="$t('寄件人电话')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="寄件公司" prop="sendCompany"> <el-form-item label="寄件公司" prop="sendCompany">
@ -100,18 +100,18 @@
v-model="queryParams.sendCompany" v-model="queryParams.sendCompany"
:placeholder="$t('寄件公司')" :placeholder="$t('寄件公司')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="寄件国家" prop="sendCountry"> <el-form-item label="寄件国家" prop="sendCountry">
<CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" @onChange="handleQuery"></CountryPicker1> <CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" ></CountryPicker1>
</el-form-item> </el-form-item>
<el-form-item label="录单备注" prop="remark"> <el-form-item label="录单备注" prop="remark">
<el-input <el-input
v-model="queryParams.remark" v-model="queryParams.remark"
:placeholder="$t('录单备注')" :placeholder="$t('录单备注')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="费用备注" prop="feeRemark"> <el-form-item label="费用备注" prop="feeRemark">
@ -119,7 +119,7 @@
v-model="queryParams.feeRemark" v-model="queryParams.feeRemark"
:placeholder="$t('费用备注')" :placeholder="$t('费用备注')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -133,7 +133,7 @@
v-model="queryParams.receiveName" v-model="queryParams.receiveName"
:placeholder="$t('收件人')" :placeholder="$t('收件人')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="收件电话" prop="receiveMobile"> <el-form-item label="收件电话" prop="receiveMobile">
@ -141,7 +141,7 @@
v-model="queryParams.receiveMobile" v-model="queryParams.receiveMobile"
:placeholder="$t('收件电话')" :placeholder="$t('收件电话')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
@ -151,12 +151,12 @@
v-model="queryParams.receiveCompany" v-model="queryParams.receiveCompany"
:placeholder="$t('收件公司')" :placeholder="$t('收件公司')"
clearable clearable
@keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="目的国家" prop="receiveCountry"> <el-form-item label="目的国家" prop="receiveCountry">
<CountryPicker2 v-model="queryParams.receiveCountry" :placeholder="$t('目的国家')" @onChange="handleQuery"></CountryPicker2> <CountryPicker2 v-model="queryParams.receiveCountry" :placeholder="$t('目的国家')" ></CountryPicker2>
</el-form-item> </el-form-item>
<el-form-item label="目的省份" prop="receiveProvince"> <el-form-item label="目的省份" prop="receiveProvince">
@ -878,6 +878,9 @@ export default {
this.openView=true; this.openView=true;
}, },
onCustNoChange(){
this.queryParams.sendSiteCode=null;
},
initQueryParams(){ initQueryParams(){
this.queryParams=this.addDateRange(this.queryParams, this.dateRange,"sendDate"); this.queryParams=this.addDateRange(this.queryParams, this.dateRange,"sendDate");
@ -890,7 +893,7 @@ export default {
} }
}else{ }else{
if(this.$store.getters.ownerSiteCode!='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='') ){ if(this.$store.getters.ownerSiteCode!='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.custNo=='') ){
this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode; this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
} }