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-07-01 11:35:03 +08:00
parent cb9b42c31b
commit 7b2ea113d1
14 changed files with 496 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -9,14 +9,12 @@ VUE_APP_VERSION = '20240516'
#VUE_APP_BASE_API = '/dev-api'
VUE_APP_PDOMAIN = 'tanex56'
VUE_APP_DATA_FROM = 'pc'
# VUE_APP_BASE_API = 'http://api.emis.tanex56.com/api/bizsvr'
VUE_APP_BASE_API = 'http://47.102.220.189:58089/api/bizsvr'
# VUE_APP_BASE_API = 'http://47.96.189.20:58089/api/bizsvr'
VUE_APP_WS_HOST = '47.102.220.189:58089/api/bizsvr'
VUE_APP_PRINTER_HOST = '192.168.88.100:17080'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

2
.env.production
View File

@ -11,4 +11,6 @@ VUE_APP_PDOMAIN = 'tanex56'
VUE_APP_DATA_FROM = 'pc'
VUE_APP_BASE_API = 'https://api.emis.tanex56.com/api/bizsvr'
VUE_APP_WS_HOST = 'api.emis.tanex56.com/api/bizsvr'
VUE_APP_PRINTER_HOST = '127.0.0.1:17080'

2
.env.staging
View File

@ -14,4 +14,6 @@ VUE_APP_PDOMAIN = 'tanex56'
VUE_APP_DATA_FROM = 'pc'
VUE_APP_BASE_API = 'http://api.emis.tanex56.com/api/bizsvr'
VUE_APP_WS_HOST = 'api.emis.tanex56.com/api/bizsvr'
VUE_APP_PRINTER_HOST = '127.0.0.1:17080'

13
src/api/system/notice.js
View File

@ -9,6 +9,17 @@ export function listNotice(query) {
})
}
// 查询用户公告列表
export function getTopNoticeListByUserId(query) {
return request({
url: '/system/notice/getTopNoticeListByUserId',
method: 'get',
params: query
})
}
// 查询公告详细
export function getNotice(noticeId) {
return request({
@ -41,4 +52,4 @@ export function delNotice(noticeId) {
url: '/system/notice/' + noticeId,
method: 'delete'
})
}
}

2
src/components/DictTag/index.vue
View File

@ -17,7 +17,7 @@
:type="item.raw.listClass == 'primary' ? '' : item.raw.listClass"
:class="item.raw.cssClass"
>
{{ item.label }},
{{ item.label }}  
</el-tag>
</template>
</template>

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

@ -39,12 +39,14 @@
<el-button @click="delStorage">恢复当前表格设置</el-button> -->
<div style="text-align: left;width: 55%;">
<el-select
v-model="curentTbShowTpl"
v-model="curentTbShowTpl"
size="mini"
clearable
filterable
allow-create
default-first-option
placeholder="选择模版"
@blur="onTplSelectInputBlur($event)"
:style="{width: '100%'}"
@change="changeTbShowTpl"
:disabled="!isNeedDbSaveTpl"
@ -196,6 +198,9 @@ export default {
components,
// mixins: [setHeight],
props: {
id: {
type: String,
},
showSearch: {
type: Boolean,
default: true,
@ -271,6 +276,9 @@ export default {
// 增加图层
var xdTableObj = document.getElementById(vnode.context.tableId);
// console.log("tableId===>",vnode.context.tableId);
// console.log("xdTableObj===>",xdTableObj);
var tbBody1=xdTableObj.getElementsByClassName("el-table__body-wrapper")[0];
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;";
@ -501,7 +509,7 @@ export default {
},
data() {
return {
tableId:"XdTable"+Math.random().toString(36).substring(3,10),
tableId:this.id?this.id:"XdTable"+Math.random().toString(36).substring(3,10),
// 弹出层标题
title: "显示/隐藏",
// 是否显示弹出层
@ -588,9 +596,19 @@ export default {
this.tableDom=this.getTableDom();
},
methods: {
getUUID() {
return Math.random().toString(36).substring(3,10);
},
onTplSelectInputBlur(e) {
if (e.target.value.trim()!== '') {
//e.target.value就是录入的内容
this.curentTbShowTpl = e.target.value;
this.form.tplName = e.target.value;
// 如果是对象，要使用this.$set方法
// this.$set('typeObj', 'name', e.target.value)
}
},
setTbShowTpl(){
this.openTbShowTplDlg=true;
},
@ -621,6 +639,7 @@ export default {
if(val){
if(this.storeTplList&&this.storeTplList.length>0){
const tplItem = this.storeTplList.find(d => d.tplCode === val)
// console.log("===>tplItem==>",tplItem);
this.form=Object.assign({},tplItem);
if(this.form.tplData){
this.storageList=JSON.parse(this.form.tplData);
@ -642,19 +661,24 @@ export default {
}
},
getTbShowlList() {
if(!this.isNeedDbSaveTpl){
return;
}
let queryParams = {
tagId:this.saveStorageName
};
this.storeTplList=[];
listSysCustomizeTpl(queryParams).then(response => {
if(response.rows&&response.rows.length>0){
this.storeTplList=response.rows;
// 获取默认模版
const selTplItem=this.storeTplList.find(item=>item.blDefault == '1' );
if(selTplItem){
// console.log("selTplItem==>",selTplItem);
// this.form.tplCode=selTplItem.tplCode;
this.changeTbShowTpl(selTplItem.tplCode);
}
}
});
},
@ -664,6 +688,13 @@ export default {
return;
}
// 判断模版是否存在，若存在则覆盖
const tmpTplItem=this.storeTplList.find(item=>item.tplName == this.form.tplName );
// console.log("tmpTplItem==>",tmpTplItem);
if(tmpTplItem){
this.form=tmpTplItem;
}
if (this.form.id != null) {
this.curentTbShowTpl=this.form.tplCode;
this.form.tagId=this.saveStorageName;
@ -698,6 +729,25 @@ export default {
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
// 获取导出参数
getExportParam(){
// header:[],filter:[]
var header = [];
var filter = [];
this.storageList.forEach(item => {
if (item.show) {
header.push(item.label);
filter.push(item.prop)
}
})
let params={
header: header,
filter: filter
}
return params;
},
// 鼠标框选----------
//当批量选中结束调用
handleBatchSelect(){
@ -717,23 +767,39 @@ export default {
let currentRow=-1;
this.multipleSelection.forEach(item=>{
if(currentRow!=-1 && currentRow!=item.row){
// 去除末尾的\t
selStr=this.trimTabChar(selStr,'\t','');
selStr=selStr+"\n";
}
let str=item.text;
if(!str || str==''){
str=' ';
str='';
}
selStr = selStr+str+"\t";
currentRow=item.row;
});
selStr=this.trimTabChar(selStr,'\t','');
// console.log("=selStr==>",selStr);
this.currentSelectStr=selStr;
}
// this.$emit('handleSelect',this.multipleSelection)
},
trimTabChar(str,char, type) {
if (char) {
if (type == 'left') {
return str.replace(new RegExp('^\\'+char+'+', 'g'), '');
} else if (type == 'right') {
return str.replace(new RegExp('\\'+char+'+$', 'g'), '');
}
return str.replace(new RegExp('^\\'+char+'+|\\'+char+'+$', 'g'), '');
}
return str.replace(/^\s+|\s+$/g, '');
},
// ---------------
//清除默认事件
clearEventBubble(evt) {

4
src/layout/components/Navbar.vue
View File

@ -24,10 +24,6 @@
<top-tags-view class="topmenu-container" style="left:0px;" />
</div>
<!-- <search id="header-search"/> -->
<div class="right-menu">
<!-- 消息通知 -->
<div class="right-menu-item hover-effect" style="padding: 0 20px;">

125
src/layout/components/TopNotice/index.vue
View File

@ -39,6 +39,9 @@
</template>
<script>
import {Notification} from "element-ui";
import {getTopNoticeListByUserId} from "@/api/system/notice";
export default {
name: 'TopNotice',
data() {
@ -52,6 +55,9 @@ export default {
// time: '2023-07-27 18:30:18'
// },
],
xdNoticSdk:null,
};
},
computed: {
@ -64,7 +70,126 @@ export default {
return this.notice.length;
}
},
mounted() {
this.initXDNoticSdk();
// this.notice();
// const wsuri = this.url;
// this.ws = new WebSocket(wsuri);
// const self = this;
// this.ws.onopen = function (event) {
// //self.text_content = self.text_content + "已经打开连接!" + "\n";
// };
// this.ws.onmessage = function (event) {
// //self.text_content = event.data + "\n";
// var messageBody = JSON.parse(event.data);
// Notification.info({
// title: "通知",
// dangerouslyUseHTMLString: true,
// message: messageBody.noticeContent,
// duration: 0,
// offset: 40,
// onClick: function () {
// //self.warnDetailByWarnid(messageBody.warnId); //自定义回调,message为传的参数
// // 点击跳转的页面
// },
// });
// };
// this.ws.onclose = function (event) {
// //self.text_content = self.text_content + "已经关闭连接!" + "\n";
// };
},
methods: {
initXDNoticSdk(){
this.xdNoticSdk = this.$xdNoticeSdk;
const userId=this.$store.getters.userId;
// console.log("===>userId==>",userId);
this.xdNoticSdk.init(userId);
this.xdNoticSdk.setOnOpen(this.onNoticeOpen);
this.xdNoticSdk.setOnClose(this.onNoticeClose);
this.xdNoticSdk.setOnError(this.onNoticeError);
this.xdNoticSdk.setOnMessage(this.onMessage);
},
onNoticeOpen(evt){
// console.log("onNoticeOpen")
// this.printerStatusMessage="通知组件已连接";
},
onNoticeClose(evt){
// console.log("onNoticeClose")
// this.printerStatusMessage="通知组件已断开！";
},
onNoticeError(evt){
// console.log("onNoticeError")
// this.printerStatusMessage="通知组件已断开！";
},
onMessage(evt){
// console.log("onMessage")
var messageBody = evt.data;
// Notification.info({
// title: "通知",
// dangerouslyUseHTMLString: true,
// message: messageBody,
// duration: 0,
// offset: 40,
// onClick: function () {
// //self.warnDetailByWarnid(messageBody.warnId); //自定义回调,message为传的参数
// // 点击跳转的页面
// },
// });
},
noticeRemote() {
getTopNoticeListByUserId().then(response => {
for (let i = 0; i < response.length; i++) {
let messageBody = response[i];
setTimeout(() => {
this.notificationInfo(messageBody);
}, 100);
}
})
},
notificationInfo(messageBody) {
Notification.info({
title: "通知",
dangerouslyUseHTMLString: true,
message: messageBody.noticeContent,
duration: 0,
offset: 40,
onClick: function () {
//self.warnDetailByWarnid(messageBody.warnId); //自定义回调,message为传的参数
// 点击跳转的页面
},
});
},
// join() {
//
// },
exit() {
if (this.ws) {
this.ws.close();
this.ws = null;
}
},
send() {
if (this.ws) {
this.ws.send(this.message);
} else {
alert("未连接到服务器");
}
},
warnDetailByWarnid(warnid) {
// 跳转预警详情页面
this.$router.push({
path: "/XXX/XXX",
query: {
warnid: warnid,
},
});
},
/* 清空消息 */
clear(type) {
if (type === 'notice') {

12
src/main.js
View File

@ -20,6 +20,8 @@ import plugins from './plugins' // plugins
import { download } from '@/utils/request'
import { triggerTrans } from '@/utils/custom'
import TanexPrinterSdk from '@/utils/TanexPrinterSdk'
import XDNoticeSdk from '@/utils/XDNoticeSdk'
// import _ from 'lodash'
@ -28,7 +30,7 @@ import './permission' // permission control
import { getDicts } from "@/api/system/dict/data";
import { getConfigKey } from "@/api/system/config";
import "default-passive-events";
import { playAudio,playNoticeTone,parseTime, resetForm, addDateRange,addQueryParam,addFormParam,insertJsScript, selectDictLabel, selectDictLabels, handleTree,handleOptions } from "@/utils/custom";
import { playAudio,playNoticeTone,parseTime, resetForm, addDateRange,addQueryParam,addFormParam,insertJsScript, selectDictLabel, selectDictLabels, handleTree,handleOptions,addExportAuditRecord } from "@/utils/custom";
// 分页组件
@ -86,6 +88,8 @@ Vue.prototype.addFormParam = addFormParam
Vue.prototype.insertJsScript = insertJsScript
Vue.prototype.selectDictLabel = selectDictLabel
Vue.prototype.selectDictLabels = selectDictLabels
Vue.prototype.addExportAuditRecord = addExportAuditRecord
Vue.prototype.download = download
Vue.prototype.handleTree = handleTree
Vue.prototype.handleOptions = handleOptions
@ -94,9 +98,13 @@ Vue.prototype.MD5 = md5;
Vue.prototype.playAudio = playAudio;
Vue.prototype.playNoticeTone = playNoticeTone;
// const tanexPrinter = new TanexPrinterSdk();
const tanexPrinter = TanexPrinterSdk.getInstance();
Vue.prototype.$tanexPrinter = tanexPrinter;
const xdNoticeSdk = XDNoticeSdk.getInstance();
Vue.prototype.$xdNoticeSdk = xdNoticeSdk;
Vue.prototype.$t = (key, value) => i18n.t(triggerTrans(key,i18n.locale), value)
// Vue.prototype._ = _

1
src/store/getters.js
View File

@ -6,6 +6,7 @@ const getters = {
cachedViews: state => state.tagsView.cachedViews,
token: state => state.user.token,
avatar: state => state.user.avatar,
userId: state => state.user.userId,
empCode: state => state.user.empCode,
empName: state => state.user.empName,
nickName: state => state.user.nickName,

2
src/store/modules/user.js
View File

@ -4,6 +4,7 @@ import { getToken, setToken, removeToken } from '@/utils/auth'
const user = {
state: {
token: getToken(),
userId:'',
empCode:'',
empName:'',
ownerSiteCode:'',
@ -23,6 +24,7 @@ const user = {
state.name = name
},
SET_EXTRA: (state, userInfo) => {
state.userId = userInfo.userId;
state.empCode = userInfo.empCode;
state.empName = userInfo.empName;
state.ownerSiteCode = userInfo.ownerSiteCode;

10
src/utils/custom.js
View File

@ -659,3 +659,13 @@ export function getUUID() {
export function lpadZero(val,len) {
return (new Array(len + 1).join('0') + val).slice(-len);
}
// 新增数据导出记录表
export function addExportAuditRecord(data) {
return request({
url: '/system/sysExportAuditRecord',
method: 'post',
data: data
})
}

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

@ -302,7 +302,7 @@
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
id="refTable"
ref="refTable"
storageName="sendWaybillList_main"
v-loading="loading"
border
@ -365,7 +365,7 @@
</template>
</el-table-column>
<el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
<el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_payment_status" :value="scope.row.paymentStatus"/>
</template>
@ -375,12 +375,12 @@
<dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
</template>
</el-table-column>
<el-table-column :label="$t('发件人')" align="center" prop="pickupMethod" width="180" :show-overflow-tooltip="true">
<el-table-column :label="$t('发件人')" align="center" prop="fjr" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.sendName }}--{{ scope.row.receiveName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('快件类型')" align="center" prop="pickupMethod" width="180" :show-overflow-tooltip="true">
<el-table-column :label="$t('快件类型')" align="center" prop="kjlx" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.sendSiteName }}--{{ scope.row.dispatchUnderlingSiteName }}</span>
</template>
@ -397,7 +397,6 @@
<span v-else></span>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('订单号')" align="center" prop="orderSn" width="100" :show-overflow-tooltip="true"/> -->
<el-table-column :label="$t('合同号')" align="center" prop="custOrderId" width="100" :show-overflow-tooltip="true"/>
@ -424,8 +423,6 @@
</el-table-column>
<el-table-column :label="$t('录入人')" align="center" prop="registerManName" min-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="customerName" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.paymentType==2 || scope.row.paymentType==4 || scope.row.paymentType==5">{{scope.row.customerName}}</span>
@ -443,18 +440,10 @@
</el-table-column>
<el-table-column :label="$t('问题件类型')" align="center" prop="problemTypeName" width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" width="80" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('延期天数')" align="center" prop="problemDelayDays" width="80" :show-overflow-tooltip="true"/> -->
<el-table-column :label="$t('寄件网点')" align="center" prop="sendSiteName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件财务中心')" align="center" prop="sendSiteFincailName" min-width="80" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" width="100" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
</template>
</el-table-column> -->
<el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件手机')" align="center" prop="sendMobile" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="80" :show-overflow-tooltip="true"/>
@ -542,19 +531,6 @@
<el-table-column :label="$t('派件人')" align="center" prop="dispatchManName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('派件网点')" align="center" prop="dispatchSiteName" min-width="80" :show-overflow-tooltip="true"/>
<!--
<el-table-column :label="$t('是否打印')" align="center" prop="blPrint" min-width="80" >
<template slot-scope="scope">
<el-tag v-if="scope.row.blPrint==1" type="success">已打印</el-tag>
<el-tag v-else type="danger">未打印</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('打印次数')" align="center" prop="printCount" min-width="80" />
<el-table-column :label="$t('打印时间')" align="center" prop="printDate" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('打印人')" align="center" prop="printManName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('打印站点')" align="center" prop="printSiteName" 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" />
@ -570,15 +546,9 @@
</XdTable>
<el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="100%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<TraceWaybillDetailView :key="currentTraceBillCode" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
</el-dialog>
<!--
<el-dialog title="查看运单" :visible.sync="openView" width="100%" :destroy-on-close="true" :close-on-click-modal="false" v-dialogDrag append-to-body>
<WaybillDetailReadOnly :billCode="currentTraceBillCode"></WaybillDetailReadOnly>
</el-dialog> -->
</XdPageContainer>
</template>
@ -621,11 +591,6 @@ import WaybillDetailReadOnly from '@/views/emis/emisWaybill/waybillDetailReadOnl
import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
import FileSaver from 'file-saver'
import XLSX from 'xlsx'
import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
import { formatSearchStr,deepClone } from '@/utils/index'
import clip from '@/utils/clipboard'
@ -679,6 +644,7 @@ export default {
total: 0,
// 运单列表表格数据
emisWaybillList: [],
selectionList:[],
currentId:null,
openForm: false,
@ -902,40 +868,40 @@ export default {
this.openTraceInfo=true;
},
handleView(row){
this.currentTraceBillCode=row.billCode;
console.log("x==>x1==>billCode:",this.currentTraceBillCode)
this.openView=true;
},
initQueryParams(){
// this.queryOrderType="1";
// this.queryOrderDateType="1";
if(this.queryParams.billCode){
if(this.queryOrderType != "1"){
this.queryParams.orderSn=formatSearchStr(this.queryParams.billCode);
this.queryParams.billCode=null;
}else{
// 处理子单号
let qBillCode=formatSearchStr(this.queryParams.billCode);
let billArr = qBillCode.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;
}
}
this.queryParams=this.addDateRange(this.queryParams, this.dateRange,"sendDate");
},
/** 查询运单列表列表 */
getList() {
this.loading = true;
// this.queryOrderType="1";
// this.queryOrderDateType="1";
if(this.queryParams.billCode){
if(this.queryOrderType != "1"){
this.queryParams.orderSn=formatSearchStr(this.queryParams.billCode);
this.queryParams.billCode=null;
}else{
// 处理子单号
let qBillCode=formatSearchStr(this.queryParams.billCode);
let billArr = qBillCode.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;
}
}
this.queryParams=this.addDateRange(this.queryParams, this.dateRange,"sendDate");
listEmisWaybill(this.queryParams).then(response => {
this.emisWaybillList = response.rows;
this.total = response.total;
@ -959,9 +925,10 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
if(selection!=null){
this.billCode=selection[0].billCode;
}
// if(selection!=null){
// this.billCode=selection[0].billCode;
// }
this.selectionList=selection;
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
@ -972,20 +939,6 @@ export default {
this.queryParams.isAsc = column.order;
this.getList();
},
/** 新增按钮操作 */
// handleAdd(row) {
// // <router-link :to="'/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type">
// this.$router.push({ path: '/d24/waybillManagement/WaybillEntry', query: { action:"add"} });
// },
/** 修改按钮操作 */
// handleUpdate(row) {
// // const waybill = this.emisWaybillList.find(item => item.id === id)
// this.$router.push({ path: '/d24/waybillManagement/WaybillModify', query: { action:"modify",billCode: this.billCode }})
// },
// handleView(row) {
// this.$router.push({ path: '/d24/waybillManagement/WaybillDetail', query: { billCode: this.billCode }})
// },
handleFormChanged(){
this.openForm = false;
this.getList();
@ -1003,55 +956,53 @@ export default {
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
handleExport() {
var xlsxParam = { raw: true }
let wb = XLSX.utils.table_to_book(document.querySelector("#refTable"),xlsxParam);
let wbout = XLSX.write(wb, {
bookType: "xlsx",
bookSST: true,
type: "array"
});
try {
FileSaver.saveAs(
new Blob([wbout], { type: "application/octet-stream" }),
'运单列表.xlsx'
);
}
catch (e) {
if (typeof console !== "undefined") console.log(e, wbout);
}
return wbout;
},
/** 导出按钮操作 */
handleExport_old() {
// 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
if (response.code === 200) {
const curList = response.rows
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',];
const data = this.formatJson(filterVal, curList, response.rows)
excel.export_json_to_excel({
header: tHeader,
data,
filename: '运单列表',
autoWidth: true
})
loadingInstance.close()
})
}
});
/** 导出按钮操作 */
handleExport() {
const loadingInstance = this.$loading({
text: '正在导出...'
})
var qParam = {...this.queryParams};
// 增加导出记录
let postExportRecord={
menuName: '寄件运单查询新',
dateRange: qParam.params.beginSendDate+"~"+qParam.params.endSendDate,
}
this.addExportAuditRecord(postExportRecord);
if(this.selectionList&&this.selectionList.length>0){
this.exportData(this.selectionList,loadingInstance);
}
else{
this.initQueryParams();
qParam.pageNum=1;
qParam.pageSize=5000;
listEmisWaybill(qParam).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
})
loadingInstance.close()
})
},
formatJson(filterVal, jsonData, resData) {
let index = 0
@ -1059,16 +1010,68 @@ export default {
if (j === 'index') {
return ++index
}
if (j === 'status') {
var statusStr='xxx'
if(v[j] == 10){
statusStr='xxx'
if (j === 'fjlx') {
return "";
}
if (j === 'fjr') {
return "";
}
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 '自提';
}
return statusStr;
}
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]
}))
},
/** 列索引函数 */
getIndex($index) {
return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1

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

@ -302,6 +302,7 @@
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
ref="refTable"
storageName="sendWaybillList_main"
v-loading="loading"
border
@ -374,12 +375,12 @@
<dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
</template>
</el-table-column>
<el-table-column :label="$t('发件人')" align="center" prop="pickupMethod" width="180" :show-overflow-tooltip="true">
<el-table-column :label="$t('发件人')" align="center" prop="fjr" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.sendName }}--{{ scope.row.receiveName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('快件类型')" align="center" prop="pickupMethod" width="180" :show-overflow-tooltip="true">
<el-table-column :label="$t('快件类型')" align="center" prop="fjlx" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.sendSiteName }}--{{ scope.row.dispatchUnderlingSiteName }}</span>
</template>
@ -681,6 +682,7 @@ export default {
total: 0,
// 运单列表表格数据
emisWaybillList: [],
selectionList:[],
currentId:null,
openForm: false,
@ -905,17 +907,17 @@ export default {
this.openTraceInfo=true;
},
handleView(row){
this.currentTraceBillCode=row.billCode;
console.log("x==>x1==>billCode:",this.currentTraceBillCode)
this.openView=true;
},
/** 查询运单列表列表 */
getList() {
this.loading = true;
initQueryParams(){
// this.queryOrderType="1";
// this.queryOrderDateType="1";
if(this.queryParams.billCode){
if(this.queryOrderType != "1"){
this.queryParams.orderSn=formatSearchStr(this.queryParams.billCode);
@ -938,6 +940,13 @@ export default {
}
}
this.queryParams=this.addDateRange(this.queryParams, this.dateRange,"sendDate");
},
/** 查询运单列表列表 */
getList() {
this.loading = true;
this.initQueryParams();
listEmisWaybill(this.queryParams).then(response => {
this.emisWaybillList = response.rows;
@ -962,9 +971,10 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
if(selection!=null){
this.billCode=selection[0].billCode;
}
// if(selection!=null){
// this.billCode=selection[0].billCode;
// }
this.selectionList=selection;
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
@ -975,20 +985,7 @@ export default {
this.queryParams.isAsc = column.order;
this.getList();
},
/** 新增按钮操作 */
// handleAdd(row) {
// // <router-link :to="'/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type">
// this.$router.push({ path: '/d24/waybillManagement/WaybillEntry', query: { action:"add"} });
// },
/** 修改按钮操作 */
// handleUpdate(row) {
// // const waybill = this.emisWaybillList.find(item => item.id === id)
// this.$router.push({ path: '/d24/waybillManagement/WaybillModify', query: { action:"modify",billCode: this.billCode }})
// },
// handleView(row) {
// this.$router.push({ path: '/d24/waybillManagement/WaybillDetail', query: { billCode: this.billCode }})
// },
handleFormChanged(){
this.openForm = false;
this.getList();
@ -1008,34 +1005,50 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
// this.download('emis/emisWaybill/export', {
// ...this.queryParams
// }, `emisWaybill_${new Date().getTime()}.xlsx`)
const loadingInstance = this.$loading({
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
if (response.code === 200) {
const curList = response.rows
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',];
const data = this.formatJson(filterVal, curList, response.rows)
excel.export_json_to_excel({
header: tHeader,
data,
filename: '运单列表',
autoWidth: true
})
loadingInstance.close()
})
}
});
var qParam = {...this.queryParams};
// 增加导出记录
let postExportRecord={
menuName: '寄件运单查询新',
dateRange: qParam.params.beginSendDate+"~"+qParam.params.endSendDate,
}
this.addExportAuditRecord(postExportRecord);
if(this.selectionList&&this.selectionList.length>0){
this.exportData(this.selectionList,loadingInstance);
}
else{
this.initQueryParams();
qParam.pageNum=1;
qParam.pageSize=5000;
listEmisWaybill(qParam).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
})
loadingInstance.close()
})
},
formatJson(filterVal, jsonData, resData) {
let index = 0
@ -1043,12 +1056,63 @@ export default {
if (j === 'index') {
return ++index
}
if (j === 'status') {
var statusStr='xxx'
if(v[j] == 10){
statusStr='xxx'
if (j === 'fjlx') {
return "";
}
if (j === 'fjr') {
return "";
}
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 '自提';
}
return statusStr;
}
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]
}))