aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.xdadan.com/tanex/emis-frontend

Browse Source
This commit is contained in:
liuyp 2024-06-24 13:40:57 +08:00
commit e06af25dc2
107 changed files with 298 additions and 668 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/static/tpl/batch_import_order.xls
View File

Binary file not shown.

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

@ -198,7 +198,7 @@ export default {
</script>
<style scoped lang="scss">
// .el-upload--picture-card 控制加号部分
:deep.hide .el-upload--picture-card {
:deep .hide .el-upload--picture-card {
display: none;
}
// 去掉动画效果

2
src/components/PrintDesigner/base/panel/style.vue
View File

@ -186,7 +186,7 @@ export default {
</script>
<style lang="scss" scoped>
.mini-form {
:deep.el-form-item--mini.el-form-item {
:deep .el-form-item--mini.el-form-item {
margin-bottom: 10px;
}
}

391
src/components/XdTable/index copy.vue
View File

@ -1,391 +0,0 @@
<template>
<div class="xd-table">
<div class="table-operate-btn-content" v-show="showOperateButton">
<!-- toolbar -->
<slot name="operateBtnContent">
<div class="operate-btn-content">
<slot name="toolbar">
<div />
</slot>
<div class="top-right-btn" v-show="showRightButton">
<el-row>
<el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
<el-button size="mini" circle icon="el-icon-search" @click="toggleSearch()" />
</el-tooltip>
<el-tooltip class="item" effect="dark" content="刷新" placement="top">
<el-button size="mini" circle icon="el-icon-refresh" @click="refresh()" />
</el-tooltip>
<el-tooltip class="item" effect="dark" content="间距" placement="top">
<el-dropdown size="mini" @command="(command) => handleAdjustTableSize(command)">
<el-button size="mini" circle style="margin-left: 10px;" class="icon iconfont icon-hangjianju" />
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="small" >中等</el-dropdown-item>
<el-dropdown-item command="mini" >紧凑</el-dropdown-item>
<el-dropdown-item command="medium" >宽松</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="显隐列" placement="top" v-if="canHideColumns">
<el-popover
placement="bottom-end"
popper-class="table-cloumn-setting-popper"
trigger="click"
:show-arrow="false"
>
<div class="setting-row-content">
<div style="text-align:right;display: inline-flex;width:180px;border-bottom: 1px solid #d5d4d438;padding: 0px 0px 10px 0px;">
<!-- <el-button @click="delAllStorage">恢复系统表格设置</el-button>
<el-button @click="delStorage">恢复当前表格设置</el-button> -->
<div style="text-align: left;width: 50%;line-height: 30px;">显示列</div>
<div style="text-align: right;width: 50%;"><el-button type="text" size="mini" plain @click="delAllStorage" >重置</el-button></div>
</div>
<draggable v-model="storageList"
ghostClass="drag-ghost"
chosenClass="drag-chosen"
:animation="500"
handle=".el-icon-s-operation"
@end="updateTable">
<div v-for="clo in storageList" :key="clo.label" class="setting-row">
<!-- <i class="el-icon-s-operation" /> -->
<i class="el-icon-s-operation icon iconfont icon-ui_drag_horizontally" />
<el-checkbox v-model="clo.show" class="label" @change="showOrHidden($event,clo)">{{ clo.label }}</el-checkbox>
<!-- <el-button
class="btn"
size="mini"
:type="clo.fixed === 'left' ? 'primary' : 'default'"
@click="setFixed('left',clo)"
>K</el-button> -->
<!-- <el-button
class="btn"
size="mini"
:type="clo.fixed === 'right' ? 'primary' : 'default'"
@click="setFixed('right',clo)"
>固定在右侧</el-button> -->
</div>
</draggable>
</div>
<el-button style="margin-left: 10px;" slot="reference" size="mini" circle icon="el-icon-menu" />
</el-popover>
</el-tooltip>
<!-- <el-tooltip class="item" effect="dark" content="导出" placement="top" v-if="download!=null">
<el-button size="mini" circle icon="el-icon-download" @click="download()" />
</el-tooltip> -->
</el-row>
</div>
</div>
</slot>
</div>
<div>
<orig-table ref="table"
:config="config" />
<pagination
v-show="total>0"
:total="total"
:page-sizes="[10,20,50,100,300,500,1000,2000,5000]"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
:page-size="queryParams.pageSize"
@pagination="queryTable"
/>
</div>
</div>
</template>
<script>
import Sortable from 'sortablejs'
import draggable from 'vuedraggable'
import origTable from './table.jsx'
// import setHeight from '@/mixins/setHeight'
const components = { origTable, draggable }
export default {
name: 'XadvTable',
components,
// mixins: [setHeight],
props: {
showSearch: {
type: Boolean,
default: true,
},
canHideColumns: {
type: Boolean,
default: true,
},
storageName: {
type: String,
required: false
},
queryParams:{
type: Object,
default: {},
},
total:{
type: Number,
default: 0,
},
showRightButton:{
type: Boolean,
default: true,
},
showOperateButton:{
type: Boolean,
default: true,
},
},
data() {
return {
// 弹出层标题
title: "显示/隐藏",
// 是否显示弹出层
open: false,
showTable: false,
popVisible:false,
storageList: [],
tbSize:"",
name: '',
config: {
children: [],
attrs: {size:"small"},
listeners: {},
key: ''
},
selection: [],
startX: null,
startY: null,
endX: null,
endY: null,
}
},
watch: {
'$attrs': {
handler(newV) {
this.$set(this.config, 'attrs', newV)
},
deep: true,
immediate: true
}
},
mounted() {
this.initStorage()
this.updateTable()
this.initSort();
},
methods: {
// 动态列渲染表格时，需要在列渲染完成后重新渲染一下表格
reload() {
this.$nextTick(() => {
this.initStorage()
this.updateTable()
this.initSort();
})
},
download(){
this.$emit("download");
},
initSort() {
},
// 查询
queryTable(){
this.$emit("queryTable");
},
// 显示搜索
toggleSearch() {
this.$emit("update:showSearch", !this.showSearch);
},
// 刷新
refresh() {
this.$emit("queryTable");
},
// 打开显隐列
showColumn() {
this.open = true;
},
getInstance() {
// const ref = this.$children.find(i => i.$options._componentTag === 'el-table')
// return ref
return this.$refs.table.$refs?.elTable
},
delStorage() {
// this.$confirm('恢复当前表格设置将清除当前表格设置并刷新页面是否继续?', '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() => {
// const storage = window.localStorage.getItem('tableStorage') ? JSON.parse(window.localStorage.getItem('tableStorage')) : {}
// storage[this.storageName] = []
// window.localStorage.setItem('tableStorage', JSON.stringify(storage))
// location.reload()
// })
},
delAllStorage() {
// this.$confirm('恢复系统表格设置将清除当前表格设置并刷新页面是否继续?', '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() => {
// window.localStorage.removeItem('tableStorage')
// location.reload()
// })
window.localStorage.removeItem('tableStorage');
this.reload();
},
showOrHidden(val, clo) {
if (!val && this.storageList.filter(i => i.show).length === 0) {
this.$message.warning('列表最少显示一列')
this.$nextTick(() => {
clo.show = true
})
return
}
this.updateTable()
},
setFixed(value, clo) {
if (clo.fixed === value) {
clo.fixed = false
} else {
clo.fixed = value
}
this.updateTable()
},
// 更多操作触发
handleAdjustTableSize(command) {
//size:mini/small/medium;
// console.log(this.config);
switch (command) {
case "small":
this.config.attrs.size='small';
break;
case "mini":
this.config.attrs.size='mini';
break;
case "medium":
this.config.attrs.size='medium';
break;
default:
break;
}
this.updateTable();
},
// 初始化缓存配置
initStorage() {
this.storageList = []
let list = [];
const storage = window.localStorage.getItem('tableStorage') ? JSON.parse(window.localStorage.getItem('tableStorage')) : {}
// 不管是否初次还是要做一下处理，万一页面有修改，做一下更新，以最新的node节点数组为准
if(this.storageName!=undefined && this.storageName!=''){
list = storage[this.storageName] ? storage[this.storageName] : []
}
// let list = storage[this.storageName] ? storage[this.storageName] : []
this.$vnode.componentOptions.children.forEach(node => {
// 以label为准，因为可能会改文本
if (!(!node.componentOptions || node.componentOptions.propsData.type) && list.findIndex(i => i.label === node.componentOptions.propsData.label) < 0) {
// 非插槽且 不是特殊类型的 找不到就加上
const propsData = JSON.parse(JSON.stringify(node.componentOptions.propsData))
if (propsData.fixed === undefined || propsData.fixed === false) {
propsData.fixed = false
} else {
propsData.fixed = propsData.fixed ? propsData.fixed : 'left'
}
list.push({
fixed: false, // 默认新增的都是不固定
show: true, // 默认新增的都是显示的
...propsData
})
}
})
// 必须在节点数组存在的才有意义
list = list.filter(item => this.$vnode.componentOptions.children.find(n => {
return n.componentOptions && item.label === n.componentOptions.propsData.label
}))
this.storageList = list
},
// 根据缓存的数组进行渲染表格
updateTable() {
// 特殊类型
const childrenNodes = this.$vnode.componentOptions.children.filter(node => node.componentOptions && node.componentOptions.propsData.type)
this.storageList.forEach(item => {
if (item.show) {
const node = this.$vnode.componentOptions.children.find(n => n.componentOptions && n.componentOptions.propsData.label === item.label)
if (node) {
node.componentOptions.propsData.fixed = item.fixed
childrenNodes.push(node)
}
}
})
this.config.children = childrenNodes
this.config.attrs = this.$attrs
this.config.listeners = this.$listeners
// 通过key值触发表格刷新，避免拖拽由于数组长度一致导致diff算法无法识别
this.config.key = Math.random() + ''
// 控制下表格重新刷新
// this.getInstance()?.doLayout()
const storage = window.localStorage.getItem('tableStorage') ? JSON.parse(window.localStorage.getItem('tableStorage')) : {}
storage[this.storageName] = this.storageList
window.localStorage.setItem('tableStorage', JSON.stringify(storage))
}
}
}
</script>
<style lang="scss" scoped>
.table-cloumn-setting-popper{
.setting-row-content{
max-height: 600px;
overflow-y: auto;
.setting-row{
height: 30px;
line-height: 30px;
.el-icon-s-operation{
cursor: move;
font-size: 16px;
margin-right: 8px;
}
.label{
margin-right: 8px;
}
.btn{
padding: 4px!important;
}
}
}
}
.xd-table{
width:100%;
height:100%;
position: relative;
.el-icon-setting{
position: absolute;
right: 7px;
top: 5px;
cursor: pointer;
}
.table-operate-btn-content{
// width: calc(100% - 40px);
width: 100%;
// min-height: 28px; // 给一个最低的高度，防止没有插槽，右侧icon被吞
min-height: 40px; // 给一个最低的高度，防止没有插槽，右侧icon被吞
.operate-btn-content {
display: flex;
justify-content: space-between;
align-items: center;
min-height: 28px;
padding-bottom: 6px;
}
}
}
.drag-ghost { background-color: #e7e7e77d; }
.drag-chosen { background-color: #e7e7e77d; }
.pagination-container{
padding: 0px 20px !important;
}
</style>

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

@ -1,5 +1,5 @@
<template>
<div class="xd-table">
<div class="xd-table" :id="tableId">
<div class="table-operate-btn-content" v-show="showOperateButton">
<!-- toolbar -->
@ -168,8 +168,6 @@
<el-button size="mini" @click="openTbShowTplDlg = false">关 闭</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
@ -256,10 +254,11 @@ export default {
// 增加图层
var tbBody1=document.getElementsByClassName("el-table__body-wrapper")[0];
var xdTableObj = document.getElementById(vnode.context.tableId);
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;";
selDiv.id = "selectDiv";
selDiv.id = "selectDiv-"+vnode.context.tableId;
tbBody1.appendChild(selDiv);
// 表格对象
@ -314,8 +313,9 @@ export default {
if(flag){
//重置选中css
for (var i = 0; i < fileNodes.length; i++) {
if (fileNodes[i].className.indexOf("el-table__cell") != -1) {
fileNodes[i].className = "el-table__cell";
if (fileNodes[i].className.indexOf("el-table__cell") != -1) {
// fileNodes[i].className = "el-table__cell";
fileNodes[i].classList.remove("seled");
selList.push(fileNodes[i]);
}
}
@ -360,8 +360,6 @@ export default {
if (sl > _l && st > _t && selList[i].offsetLeft < _l + _w && selList[i].offsetTop < _t + _h) {
if (selList[i].className.indexOf("seled") == -1) {
selList[i].className = selList[i].className + " seled";
// console.log("===>tst==i>",i);
const cellInfo=getCellPosition(selList[i]);
vnode.context.multipleSelection.push(cellInfo);
@ -375,7 +373,9 @@ export default {
}
} else {
if (selList[i].className.indexOf("seled") != -1 ) {
selList[i].className = "el-table__cell";
// selList[i].className = "el-table__cell";
selList[i].classList.remove("seled");
}
}
}
@ -469,9 +469,10 @@ export default {
document.onmouseup = function () {
//把鼠标移动事初始化
document.onmousemove=null;
var selDiv=document.getElementById("selectDiv");
var xdTableObj = document.getElementById(vnode.context.tableId);
var selDiv=document.getElementById("selectDiv-"+vnode.context.tableId);
if (selDiv) {
document.getElementsByClassName("el-table__body-wrapper")[0].removeChild(selDiv);
xdTableObj.getElementsByClassName("el-table__body-wrapper")[0].removeChild(selDiv);
}
selList = null, _x = null, _y = null, selDiv = null, startX = null, startY = null, evt = null;
vnode.context.mouseflag = false;
@ -484,6 +485,7 @@ export default {
},
data() {
return {
tableId:"XdTable"+Math.random().toString(36).substring(3,10),
// 弹出层标题
title: "显示/隐藏",
// 是否显示弹出层
@ -528,7 +530,6 @@ export default {
currentCellInfo:null,
currentSelectStr:null,
// 表格个性化记忆配置
isNeedDbSaveTpl:false,
fullUrl:null,
@ -571,6 +572,9 @@ export default {
this.tableDom=this.getTableDom();
},
methods: {
getUUID() {
return Math.random().toString(36).substring(3,10);
},
setTbShowTpl(){
this.openTbShowTplDlg=true;
},
@ -978,10 +982,9 @@ export default {
:deep .seled{
// background-color: #f3f3f3;
// background-color: #d0d0d0;
background-color: #dcdcdc!important;
// background-color: #f00202!important;
background-color: #d9ecff7d !important;
color: black;
font-weight: 600;
}

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

@ -106,7 +106,7 @@
<div>扫二维码下载 探路国际速运APP</div>
</div>
<div style="width: 100%;height: 100%;text-align:center;">
<QrCodeImage width="220" height="220" style="width: 220px;margin:auto" id="shareQrCodeImage" :text="appUrl" logoImage="@/assets/logo/short_logo.png"/>
<QrCodeImage width="220" height="220" style="width: 220px;margin:auto" id="shareQrCodeImage" :text="appUrl" />
</div>
</div>
</el-dialog>

2
src/views/emis/EmisBaseTools/AddressSelectPicker.vue
View File

@ -16,7 +16,7 @@
</search-form>
<xd-table v-loading="loading"
border
border
size="mini"
:data="emisCustomerAddressList"
:showSearch.sync="showSearch"

2
src/views/emis/customerService/problemList.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="">
<xd-table v-loading="loading"
border
border
size="mini"
height="300px"
:data="dataList"

2
src/views/emis/customerService/traceRecordList.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="">
<xd-table v-loading="loading"
border
border
size="mini"
:data="scanRecordList"
:queryParams="queryParams"

2
src/views/emis/emisCountry/index.vue
View File

@ -110,7 +110,7 @@
<!-- size="mini" border-->
<xd-table
size="mini"
v-loading="loading" border
v-loading="loading" border
:data="emisCountryList"
:showSearch.sync="showSearch"
:total="total"

4
src/views/emis/emisCountryArea/indexPanel.vue
View File

@ -17,13 +17,13 @@
</search-form>
<xd-table
<xd-table
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight-50)+'px'"
v-loading="loading"
border
border
size="mini"
:data="emisCountryAreaList"
:showSearch.sync="showSearch"

24
src/views/emis/emisCustomerAccount/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="accCode">
<el-input
v-model="queryParams.accCode"
@ -116,9 +116,9 @@
</el-form-item>
</SearchForm>
<XdTable v-loading="loading"
border
<XdTable v-loading="loading"
border
size="small"
:data="emisCustomerAccountList"
:showSearch.sync="showSearch"
@ -128,7 +128,7 @@
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@ -141,7 +141,7 @@
v-hasPermi="['emis:emisCustomerAccount:add']"
>新增</el-button>
</el-col>
<!--
<!--
<el-col :span="1.5">
<el-button
type="success"
@ -176,7 +176,7 @@
</el-col> -->
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<!--
<el-table-column label="序号" align="center" min-width="60">
@ -184,7 +184,7 @@
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column>
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
@ -238,7 +238,7 @@
@click="handleUpdate(scope.row)"
v-hasPermi="['emis:emisCustomerAccount:edit']"
>修改</el-button>
<!--
<!--
<el-button
size="mini"
type="text"
@ -253,7 +253,7 @@
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisCustomerAccountForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisCustomerAccountForm>
</el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
@ -293,7 +293,7 @@ export default {
total: 0,
// 快递用户结算账户表格数据
emisCustomerAccountList: [],
currentId:null,
openForm: false,
titleForm: "",
@ -349,7 +349,7 @@ export default {
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;

2
src/views/emis/emisCustomerAddress/recipientAddress.vue
View File

@ -29,7 +29,7 @@
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border
border
size="small"
:data="emisCustomerAddressList"
:showSearch.sync="showSearch"

2
src/views/emis/emisCustomerAddress/senderAddress.vue
View File

@ -32,7 +32,7 @@
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border
border
size="small"
:data="emisCustomerAddressList"
:showSearch.sync="showSearch"

24
src/views/emis/emisCustomerSettleBill/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="settleBillNo">
<el-input
v-model="queryParams.settleBillNo"
@ -316,9 +316,9 @@
</el-form-item>
</SearchForm>
<XdTable v-loading="loading"
border
<XdTable v-loading="loading"
border
size="small"
:data="emisCustomerSettleBillList"
:showSearch.sync="showSearch"
@ -328,7 +328,7 @@
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@ -341,7 +341,7 @@
v-hasPermi="['emis:emisCustomerSettleBill:add']"
>新增</el-button>
</el-col>
<!--
<!--
<el-col :span="1.5">
<el-button
type="success"
@ -376,7 +376,7 @@
</el-col> -->
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<!--
<el-table-column label="序号" align="center" min-width="60">
@ -384,7 +384,7 @@
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column>
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
@ -463,7 +463,7 @@
@click="handleUpdate(scope.row)"
v-hasPermi="['emis:emisCustomerSettleBill:edit']"
>修改</el-button>
<!--
<!--
<el-button
size="mini"
type="text"
@ -478,7 +478,7 @@
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisCustomerSettleBillForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisCustomerSettleBillForm>
</el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
@ -518,7 +518,7 @@ export default {
total: 0,
// 快递用户结算账单表格数据
emisCustomerSettleBillList: [],
currentId:null,
openForm: false,
titleForm: "",
@ -599,7 +599,7 @@ export default {
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;

2
src/views/emis/emisCustomerUser/moneyUserList.vue
View File

@ -55,7 +55,7 @@
v-loading="loading"
border
border
size="small"
:data="emisCustomerUserList"
:tbData="emisCustomerUserList"

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

@ -90,7 +90,7 @@
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border
border
size="small"
:data="emisCustomerUserList"
:showSearch.sync="showSearch"

2
src/views/emis/emisElectronicPag/index.vue
View File

@ -23,7 +23,7 @@
<xd-table v-loading="loading"
border
border
size="small"
:data="emisElectronicPagList"
:showSearch.sync="showSearch"

2
src/views/emis/emisElectronicPagApply/applyList.vue
View File

@ -54,7 +54,7 @@
<XdTable v-loading="loading"
border
border
size="small"
:data="emisElectronicPagApplyList"
:showSearch.sync="showSearch"

2
src/views/emis/emisElectronicPagApply/manualSendList.vue
View File

@ -51,7 +51,7 @@
<XdTable v-loading="loading"
border
border
size="small"
:data="emisElectronicPagApplyList"
:showSearch.sync="showSearch"

2
src/views/emis/emisElectronicPagApply/recoveryList.vue
View File

@ -51,7 +51,7 @@
<XdTable v-loading="loading"
border
border
size="small"
:data="emisElectronicPagApplyList"
:showSearch.sync="showSearch"

2
src/views/emis/emisElectronicPagApply/recoveryQueryList.vue
View File

@ -51,7 +51,7 @@
<XdTable v-loading="loading"
border
border
size="small"
:data="emisElectronicPagApplyList"
:showSearch.sync="showSearch"

2
src/views/emis/emisElectronicPagApply/sendList.vue
View File

@ -51,7 +51,7 @@
<XdTable v-loading="loading"
border
border
size="small"
:data="emisElectronicPagApplyList"
:showSearch.sync="showSearch"

2
src/views/emis/emisElectronicPagApply/usageStatistics.vue
View File

@ -51,7 +51,7 @@
<XdTable v-loading="loading"
border
border
size="small"
:data="emisElectronicPagApplyList"
:showSearch.sync="showSearch"

2
src/views/emis/emisElectronicSitePag/index.vue
View File

@ -94,7 +94,7 @@
<XdTable v-loading="loading"
border
border
size="small"
:data="emisElectronicSitePagList"
:showSearch.sync="showSearch"

2
src/views/emis/emisExchangeRate/index.vue
View File

@ -37,7 +37,7 @@
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border
border
size="mini"
:data="emisExchangeRateList"
:showSearch.sync="showSearch"

2
src/views/emis/emisFeeType/index.vue
View File

@ -20,7 +20,7 @@
<!-- <el-table v-loading="loading" :data="emisFeeTypeList" @selection-change="handleSelectionChange"> -->
<XdTable
size="mini"
v-loading="loading" border
v-loading="loading" border
:data="emisFeeTypeList"
:showSearch.sync="showSearch"
:total="total"

6
src/views/emis/emisGoods/index.vue
View File

@ -26,17 +26,17 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</SearchForm>
<XdTable
<XdTable
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border
border
size="small"
:data="emisGoodsList"
:showSearch.sync="showSearch"

2
src/views/emis/emisMaterial/index.vue
View File

@ -38,7 +38,7 @@
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border
border
size="small"
:data="emisMaterialList"
:showSearch.sync="showSearch"

2
src/views/emis/emisMonthpayUseApply/index.vue
View File

@ -102,7 +102,7 @@
<XdTable v-loading="loading"
border
border
size="small"
:data="emisMonthpayUseApplyList"
:showSearch.sync="showSearch"

24
src/views/emis/emisPrintTplRel/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="tplCode">
<el-input
v-model="queryParams.tplCode"
@ -36,9 +36,9 @@
</el-form-item>
</SearchForm>
<XdTable v-loading="loading"
border
<XdTable v-loading="loading"
border
size="small"
:data="emisPrintTplRelList"
:showSearch.sync="showSearch"
@ -48,7 +48,7 @@
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@ -61,7 +61,7 @@
v-hasPermi="['emis:emisPrintTplRel:add']"
>新增</el-button>
</el-col>
<!--
<!--
<el-col :span="1.5">
<el-button
type="success"
@ -96,7 +96,7 @@
</el-col> -->
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<!--
<el-table-column label="序号" align="center" min-width="60">
@ -104,7 +104,7 @@
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column>
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
@ -148,7 +148,7 @@
@click="handleUpdate(scope.row)"
v-hasPermi="['emis:emisPrintTplRel:edit']"
>修改</el-button>
<!--
<!--
<el-button
size="mini"
type="text"
@ -163,7 +163,7 @@
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisPrintTplRelForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisPrintTplRelForm>
</el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
@ -203,7 +203,7 @@ export default {
total: 0,
// 快递商户关联表表格数据
emisPrintTplRelList: [],
currentId:null,
openForm: false,
titleForm: "",
@ -249,7 +249,7 @@ export default {
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;

2
src/views/emis/emisProblemType/index.vue
View File

@ -57,7 +57,7 @@
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border
border
size="mini"
:data="emisProblemTypeList"
:showSearch.sync="showSearch"

2
src/views/emis/emisQuoteDispArea/dispAreaPanel.vue
View File

@ -81,7 +81,7 @@
<el-table
size="mini"
ref="areaTable"
border
border
highlight-current-row
v-loading="loading"
:data="emisQuoteDispAreaList"

2
src/views/emis/emisQuoteSendArea/sendAreaPanel.vue
View File

@ -80,7 +80,7 @@
<el-table
size="mini"
ref="areaTable1"
border
border
highlight-current-row
v-loading="loading"
:data="emisQuoteSendAreaList"

4
src/views/emis/emisRegion/PcdPanel.vue
View File

@ -55,7 +55,7 @@
lazy
:load="treeLoad"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
border
border
size="mini"
:showSearch.sync="showSearch"
:queryParams="queryParams"
@ -77,7 +77,7 @@
v-hasPermi="['emis:emisRegion:add']"
>新增省份</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"

2
src/views/emis/emisRegion/TownPanel.vue
View File

@ -101,7 +101,7 @@
<xd-table v-loading="loading"
border
border
size="small"
:data="emisRegionList"
:showSearch.sync="showSearch"

2
src/views/emis/emisSettleType/index.vue
View File

@ -36,7 +36,7 @@
<XdTable v-loading="loading"
border
border
size="mini"
:data="emisSettleTypeList"
:showSearch.sync="showSearch"

2
src/views/emis/emisSiteAccount/index_with_left.vue
View File

@ -213,7 +213,7 @@
<xd-table v-loading="loading"
border
border
size="small"
storageName="emisSiteAccountList_tmp1"
:data="emisSiteAccountList"

2
src/views/emis/emisSiteAccount/prepaymentAccountManagement.vue
View File

@ -42,7 +42,7 @@
storageName="prepaymentAccountManagement"
v-loading="loading"
border
border
size="mini"
:data="emisSiteAccountList"
:showSearch.sync="showSearch"

2
src/views/emis/emisSiteAccount/prepaymentBalanceInquiry.vue
View File

@ -36,7 +36,7 @@
storageName="prepaymentBalanceInquiry"
v-loading="loading"
border
border
size="mini"
:data="emisSiteAccountList"
:showSearch.sync="showSearch"

2
src/views/emis/emisSiteBillControl/index.vue
View File

@ -24,7 +24,7 @@
storageName="emisSiteBillControlList_main"
v-loading="loading"
border
border
size="mini"
:data="emisSiteBillControlList"
:showSearch.sync="showSearch"

2
src/views/emis/emisSitePrepaidRecharge/prepaidRechargeAudit.vue
View File

@ -44,7 +44,7 @@
<XdTable v-loading="loading"
border
border
size="mini"
storageName="prepaidRechargeAudit_main"
:data="emisSitePrepaidRechargeList"

2
src/views/emis/emisSiteSettleRecord/index.vue
View File

@ -53,7 +53,7 @@
<XdTable v-loading="loading"
border
border
size="mini"
storageName="emisSiteSettleRecord_main"

2
src/views/emis/emisSmsSendRecord/index.vue
View File

@ -36,7 +36,7 @@
<XdTable v-loading="loading"
border
border
size="mini"
:data="emisSmsSendRecordList"

2
src/views/emis/emisSpecialCalcWeight/index.vue
View File

@ -36,7 +36,7 @@
storageName="emisSpecialCalcWeight_main"
v-loading="loading"
border
border
size="mini"
:data="emisSpecialCalcWeightList"
:showSearch.sync="showSearch"

2
src/views/emis/emisTmsCar/index.vue
View File

@ -22,7 +22,7 @@
<XdTable v-loading="loading"
border
border
size="small"
:data="emisTmsCarList"
storageName="emisTmsCar_main"

2
src/views/emis/emisTmsDriver/index.vue
View File

@ -198,7 +198,7 @@
<XdTable v-loading="loading"
border
border
size="small"
storageName="emisTmsDriver_main"
:data="emisTmsDriverList"

2
src/views/emis/emisTmsPack/packPrintList.vue
View File

@ -21,7 +21,7 @@
<XdTable v-loading="loading"
border
border
size="mini"
storageName="emisTmsPack_main"
:data="emisTmsPackList"

26
src/views/emis/emisTmsPack/packageManagement.vue
View File

@ -120,7 +120,7 @@
<el-tab-pane label="待合包" name="first">
<XdTable v-loading="loadingWait"
:height="(slotProps.contentHeight-200)+'px'"
border
border
size="small"
:data="emisTmsWaitPackList"
:showSearch.sync="showSearch"
@ -199,7 +199,7 @@
<!-- <el-tab-pane label="已合包" name="second">
<XdTable v-loading="loadingDone"
:height="(slotProps.contentHeight-200)+'px'"
border
border
size="small"
:data="emisTmsDonePackList"
:showSearch.sync="showSearch"
@ -278,7 +278,7 @@
<el-tab-pane label="合包列表" name="third">
<XdTable v-loading="loading"
:height="(slotProps.contentHeight-200)+'px'"
border
border
size="small"
ref="table"
:data="emisTmsPackList"
@ -297,7 +297,7 @@
<XdTable v-loading="loadingDone"
height="200px"
style="margin-left: 5%;width:90%;"
border
border
size="small"
:data="emisTmsDonePackList"
showSearch.sync="false"
@ -503,7 +503,7 @@
<XdTable v-loading="loading"
height="300px"
min-height="300px"
border
border
size="small"
id="emisCoPackDetail"
:data="emisCoPackDetail"
@ -683,7 +683,7 @@
<XdTable v-loading="loading2"
height="300px"
min-height="300px"
border
border
size="small"
id="emisWayBillList"
:data="emisWayBillList"
@ -1018,7 +1018,7 @@ export default {
let mainBillCode=item.substr(0,14);
newBillCodeStr=newBillCodeStr+mainBillCode+",";
}else if(item == ""){
}else{
newBillCodeStr=newBillCodeStr+item+",";
}
@ -1032,7 +1032,7 @@ export default {
this.queryParams.packNo=null;
}
}
this.emisTmsPackList = [];
if (null != this.dateTimeRange && '' != this.dateTimeRange) {
this.queryParams.params["beginSendDate"] = dateToStr(new Date(this.dateTimeRange[0]));
@ -1062,7 +1062,7 @@ export default {
let mainBillCode=item.substr(0,14);
newBillCodeStr=newBillCodeStr+mainBillCode+",";
}else if(item == ""){
}else{
newBillCodeStr=newBillCodeStr+item+",";
}
@ -1112,7 +1112,7 @@ export default {
let mainBillCode=item.substr(0,14);
newBillCodeStr=newBillCodeStr+mainBillCode+",";
}else if(item == ""){
}else{
newBillCodeStr=newBillCodeStr+item+",";
}
@ -1165,7 +1165,7 @@ export default {
let mainBillCode=item.substr(0,14);
newBillCodeStr=newBillCodeStr+mainBillCode+",";
}else if(item == ""){
}else{
newBillCodeStr=newBillCodeStr+item+",";
}
@ -1318,7 +1318,7 @@ export default {
// // })
// }
// })
}
this.openForm= false;
this.titleForm = "";
@ -1460,7 +1460,7 @@ export default {
}
}
this.tempExistCoPackWayBillList = afterList;//this.tempExistCoPackWayBillList.filter(item => {idsArrTemp.indexOf(item.id) == -1})
this.computeTotal();
// 更新主表
this.tempCoPackInfo.destCountry = this.coData.destCountry;

2
src/views/emis/emisTmsPackDtl/index.vue
View File

@ -70,7 +70,7 @@
<XdTable v-loading="loading"
border
border
size="small"
:data="emisTmsPackDtlList"
:showSearch.sync="showSearch"

6
src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
View File

@ -72,7 +72,7 @@
</div>
<xd-table v-loading="loading"
border
border
ref="multipleTable"
size="small"
:queryParams="queryParams"
@ -249,7 +249,7 @@ export default {
this.$message.error("请选择派件员");
return;
}
let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[];
let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[];
let scanWeight = this.form.scanWeight
let dispatchOrSendMan = this.form.dispatchOrSendMan;
let dispatchOrSendManCode = this.form.dispatchOrSendManCode;
@ -500,7 +500,7 @@ export default {
this.ids.splice(this.ids.indexOf(item.billCode+"40"),1)
})
this.$modal.msgSuccess("派件扫描上传"+scanRstItem.message);
}
}
this.dataMap = dataMap;
console.log(this.emisTmsScanRecordList)
this.emisTmsScanRecordList = newList.filter(function(item) {

2
src/views/emis/emisTmsScanRecord/arrivalScan.vue
View File

@ -61,7 +61,7 @@
</div>
<xd-table v-loading="loading"
border
border
ref="multipleTable"
size="small"
:queryParams="queryParams"

4
src/views/emis/emisTmsScanRecord/coPackageScanning.vue
View File

@ -78,7 +78,7 @@
</div>
<xd-table v-loading="loading"
border
border
ref="multipleTable"
size="small"
:queryParams="queryParams"
@ -261,7 +261,7 @@ export default {
this.$message.error("输入单号后回车");
return;
}
let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[];
let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[];
let scanWeight = this.form.scanWeight;
let bagNo = this.form.bagNo;

2
src/views/emis/emisTmsScanRecord/customsClearScan.vue
View File

@ -72,7 +72,7 @@
</div>
<xd-table v-loading="loading"
border
border
ref="multipleTable"
size="small"
:queryParams="queryParams"

2
src/views/emis/emisTmsScanRecord/customsDeclearScan.vue
View File

@ -70,7 +70,7 @@
</div>
<xd-table v-loading="loading"
border
border
ref="multipleTable"
size="small"
:queryParams="queryParams"

6
src/views/emis/emisTmsScanRecord/deliveryScan.vue
View File

@ -27,7 +27,7 @@
</el-input>
</el-form-item>
</el-col>
</el-form>
</el-row>
@ -69,7 +69,7 @@
</div>
<xd-table v-loading="loading"
border
border
ref="multipleTable"
size="small"
:queryParams="queryParams"
@ -245,7 +245,7 @@ export default {
this.$message.error("输入单号后回车");
return;
}
let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[];
let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[];
let scanWeight = this.form.scanWeight
let dispatchOrSendManCode = this.form.dispatchOrSendManCode;

2
src/views/emis/emisTmsScanRecord/index.vue
View File

@ -230,7 +230,7 @@
<xd-table v-loading="loading"
border
border
size="small"
:data="emisTmsScanRecordList"
:showSearch.sync="showSearch"

2
src/views/emis/emisTmsScanRecord/loadingScan.vue
View File

@ -74,7 +74,7 @@
</div>
<xd-table v-loading="loading"
border
border
ref="multipleTable"
size="small"
:queryParams="queryParams"

2
src/views/emis/emisTmsScanRecord/outgoingScan.vue
View File

@ -70,7 +70,7 @@
</div>
<xd-table v-loading="loading"
border
border
ref="multipleTable"
size="small"
:queryParams="queryParams"

10
src/views/emis/emisTmsScanRecord/positionScanning.vue
View File

@ -74,7 +74,7 @@
</div>
<xd-table v-loading="loading"
border
border
ref="multipleTable"
size="small"
:queryParams="queryParams"
@ -201,12 +201,12 @@ export default {
this.form.dispatchOrSendMan=this.$store.getters.empName;
this.form.dispatchOrSendManCode=this.$store.getters.empCode;
this.$nextTick(function() {
let form = this.$refs.form.$el;
let tableH = form.offsetHeight+265;
this.tableHeight = window.innerHeight - tableH;
});
});
},
methods: {
@ -255,7 +255,7 @@ export default {
this.$message.error("输入单号后回车");
return;
}
let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[];
let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[];
let scanWeight = this.form.scanWeight
let dispatchOrSendManCode = this.form.dispatchOrSendManCode;
@ -470,7 +470,7 @@ export default {
this.form.scanType = '70';
this.form.scanDate = new Date();
let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode;
console.log(record)

4
src/views/emis/emisTmsScanRecord/scanRecord.vue
View File

@ -65,7 +65,7 @@
</div>
<xd-table v-loading="loading"
border
border
ref="multipleTable"
size="small"
:queryParams="queryParams"
@ -245,7 +245,7 @@ export default {
this.$message.error("输入单号后回车");
return;
}
let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[];
let bcList=this.formBatch.billCode.trim().split(/[；\;\,\，\n]/)||[];
let scanWeight = this.form.scanWeight
let dispatchOrSendManCode = this.form.dispatchOrSendManCode;

2
src/views/emis/emisTmsScanRecord/scanRecordQuery.vue
View File

@ -94,7 +94,7 @@
<xd-table v-loading="loading"
ref="dataTable"
border
border
size="small"
:data="emisElectronicPagApplyList"
:showSearch.sync="showSearch"

6
src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue
View File

@ -68,7 +68,7 @@
<xd-table v-loading="loading"
ref="multipleTable"
border
border
size="small"
:data="tmsScanList"
:showSearch.sync="showSearch"
@ -131,7 +131,7 @@
<span>{{ parseTime(scope.row.scanDate) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('派件员')" align="center" prop="dispatchManName" min-width="150">
<template slot-scope="scope">
<span class="ellipsis">{{ scope.row.waybillDetail.dispatchManName }}</span>
@ -579,7 +579,7 @@ export default {
.el-divider__text {
color: #0955ee;
cursor: pointer;
}
}
.query-label {
.el-radio{
display: block;

4
src/views/emis/emisTmsScanRecord/signatureAbnormalComparison.vue
View File

@ -52,7 +52,7 @@
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="统计数据" name="first"> -->
<xd-table v-loading="loading"
border
border
size="small"
:data="emisStatList"
:showSearch.sync="showSearch"
@ -103,7 +103,7 @@
<el-tab-pane label="明细数据" name="second"> -->
<el-dialog :title="titleForm" :visible.sync="openForm" width="90%" v-dialogDrag :close-on-click-modal="false" append-to-body>
<xd-table v-loading="loading"
border
border
size="mini"
:data="emisStatRecordList"
:showSearch.sync="showSearch"

2
src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
View File

@ -58,7 +58,7 @@
</el-row >
<xd-table v-loading="loading"
border
border
size="small"
:data="tmsScanList"
:showSearch.sync="showSearch"

2
src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
View File

@ -112,7 +112,7 @@
</div>
<xd-table v-loading="loading"
border
border
ref="multipleTable"
size="small"
:queryParams="queryParams"

2
src/views/emis/emisTmsScanRecord/unloadingScan.vue
View File

@ -67,7 +67,7 @@
</div>
<xd-table v-loading="loading"
border
border
ref="multipleTable"
size="small"
:queryParams="queryParams"

2
src/views/emis/emisTmsScanRecord/unpackScan.vue
View File

@ -57,7 +57,7 @@
</div>
<xd-table v-loading="loading"
border
border
ref="multipleTable"
size="small"
:queryParams="queryParams"

10
src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
View File

@ -123,7 +123,7 @@
<el-tab-pane label="待组批次" name="first">
<XdTable v-loading="loadingWait"
:height="(slotProps.contentHeight-200)+'px'"
border
border
size="small"
:data="emisTmsWaitPackList"
:showSearch.sync="showSearch"
@ -207,7 +207,7 @@
<el-tab-pane label="已组批次" name="second">
<XdTable v-loading="loadingDone"
:height="(slotProps.contentHeight-200)+'px'"
border
border
size="small"
:data="emisTmsDonePackList"
:showSearch.sync="showSearch"
@ -291,7 +291,7 @@
<el-tab-pane label="批次列表" name="third">
<XdTable v-loading="loading"
:height="(slotProps.contentHeight-200)+'px'"
border
border
size="small"
:data="emisTmsPackList"
:showSearch.sync="showSearch"
@ -552,7 +552,7 @@
<XdTable v-loading="loading"
height="300px"
min-height="300px"
border
border
size="small"
id="emisCoPackDetail"
:data="emisCoPackDetail"
@ -728,7 +728,7 @@
<XdTable v-loading="loading2"
height="300px"
min-height="300px"
border
border
size="small"
id="emisWayBillList"
:data="emisWayBillList"

24
src/views/emis/emisTmsSiteBatch/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="batchNo">
<el-input
v-model="queryParams.batchNo"
@ -188,9 +188,9 @@
</el-form-item>
</SearchForm>
<XdTable v-loading="loading"
border
<XdTable v-loading="loading"
border
size="small"
:data="emisTmsSiteBatchList"
:showSearch.sync="showSearch"
@ -200,7 +200,7 @@
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@ -213,7 +213,7 @@
v-hasPermi="['emis:emisTmsSiteBatch:add']"
>新增</el-button>
</el-col>
<!--
<!--
<el-col :span="1.5">
<el-button
type="success"
@ -248,7 +248,7 @@
</el-col> -->
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<!--
<el-table-column label="序号" align="center" min-width="60">
@ -256,7 +256,7 @@
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column>
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
@ -317,7 +317,7 @@
@click="handleUpdate(scope.row)"
v-hasPermi="['emis:emisTmsSiteBatch:edit']"
>修改</el-button>
<!--
<!--
<el-button
size="mini"
type="text"
@ -332,7 +332,7 @@
<el-dialog :title="titleForm" :visible.sync="openForm" width="80%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisTmsSiteBatchForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisTmsSiteBatchForm>
</el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
@ -372,7 +372,7 @@ export default {
total: 0,
// TMS组批次表格数据
emisTmsSiteBatchList: [],
currentId:null,
openForm: false,
titleForm: "",
@ -455,7 +455,7 @@ export default {
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;

14
src/views/emis/emisTmsSiteBatch/packListView.vue
View File

@ -2,7 +2,7 @@
<div slot="pageContent">
<XdTable v-loading="loading"
:height="(slotProps.contentHeight-200)+'px'"
border
border
ref="table"
size="small"
:data="emisTmsPackList"
@ -22,7 +22,7 @@
<XdTable v-loading="loadingDone"
height="200px"
style="margin-left: 5%;width:90%;"
border
border
size="small"
:data="emisTmsDonePackList"
showSearch.sync="false"
@ -267,14 +267,14 @@ export default {
}
}
}
},
// 查询合包明细表
async handleQueryDone(){
this.single = true;
this.multiple = true;
this.loadingDone = true;
let resList = await listEmisTmsPackDtl(this.queryDoneParams);
this.loadingDone = false;
if(!resList || resList.code != 200){
@ -309,7 +309,7 @@ export default {
let mainBillCode=item.substr(0,14);
newBillCodeStr=newBillCodeStr+mainBillCode+",";
}else if(item == ""){
}else{
newBillCodeStr=newBillCodeStr+item+",";
}
@ -323,7 +323,7 @@ export default {
this.queryParams.packNo=null;
}
}
this.emisTmsPackList = [];
if (null != this.dateTimeRange && '' != this.dateTimeRange) {
this.queryParams.params["beginSendDate"] = dateToStr(new Date(this.dateTimeRange[0]));
@ -336,7 +336,7 @@ export default {
this.loading = false;
});
},
}
};
</script>

2
src/views/emis/emisTmsSiteBatch/waitGenBatchWaybillList.vue
View File

@ -317,7 +317,7 @@
:row-class-name="tableRowClassName"
v-loading="loading"
border
border
size="mini"
:data="emisWaybillList"
:showSearch.sync="showSearch"

24
src/views/emis/emisTmsSiteBatchDtl/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="billCode">
<el-input
v-model="queryParams.billCode"
@ -76,9 +76,9 @@
</el-form-item>
</SearchForm>
<XdTable v-loading="loading"
border
<XdTable v-loading="loading"
border
size="small"
:data="emisTmsSiteBatchDtlList"
:showSearch.sync="showSearch"
@ -88,7 +88,7 @@
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@ -101,7 +101,7 @@
v-hasPermi="['emis:emisTmsSiteBatchDtl:add']"
>新增</el-button>
</el-col>
<!--
<!--
<el-col :span="1.5">
<el-button
type="success"
@ -136,7 +136,7 @@
</el-col> -->
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<!--
<el-table-column label="序号" align="center" min-width="60">
@ -144,7 +144,7 @@
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column>
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
@ -193,7 +193,7 @@
@click="handleUpdate(scope.row)"
v-hasPermi="['emis:emisTmsSiteBatchDtl:edit']"
>修改</el-button>
<!--
<!--
<el-button
size="mini"
type="text"
@ -208,7 +208,7 @@
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisTmsSiteBatchDtlForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisTmsSiteBatchDtlForm>
</el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
@ -248,7 +248,7 @@ export default {
total: 0,
// TMS组批次明细表格数据
emisTmsSiteBatchDtlList: [],
currentId:null,
openForm: false,
titleForm: "",
@ -305,7 +305,7 @@ export default {
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;

2
src/views/emis/emisTmsTransPlan/index.vue
View File

@ -39,7 +39,7 @@
<XdTable v-loading="loading"
border
border
size="small"
storageName="emisTmsTransPlan_main"
:data="emisTmsTransPlanList"

20
src/views/emis/emisUser/editForm.vue
View File

@ -287,6 +287,12 @@ export default {
ownerSiteCode: [
{ required: true, message: "所属网点不能为空", trigger: "blur" }
],
ownerSiteCode: [
{ required: true, message: "部门不能为空", trigger: "blur" }
],
ownerSiteCode: [
{ required: true, message: "角色不能为空", trigger: "blur" }
],
password: [
{ required: true, message: "员工密码不能为空", trigger: "blur" },
{ min: 5, max: 20, message: '员工密码长度必须介于 5 和 20 之间', trigger: 'blur' }
@ -316,12 +322,12 @@ export default {
},
created() {
this.initData();
// this.getConfigKey("sys.user.initPassword").then(response => {
// if(this.userId == null) {
// this.initPassword = response.msg;
// this.form.password = this.initPassword;
// }
// });
this.getConfigKey("sys.user.initPassword").then(response => {
if(this.userId == null) {
this.initPassword = response.msg;
// this.form.password = this.initPassword;
}
});
},
methods: {
@ -335,7 +341,7 @@ export default {
this.roleOptions = response.roles;
this.open = true;
this.title = "添加用户";
// this.form.password = this.initPassword;
this.form.password = this.initPassword;
});
}else{
getUser(this.userId).then(response => {

2
src/views/emis/emisWarehouseIn/index.vue
View File

@ -110,7 +110,7 @@
<XdTable v-loading="loading"
border
border
size="small"
:data="emisWarehouseInList"
:showSearch.sync="showSearch"

2
src/views/emis/emisWarehouseInBatch/index.vue
View File

@ -142,7 +142,7 @@
<XdTable v-loading="loading"
border
border
size="small"
:data="emisWarehouseInBatchList"
:showSearch.sync="showSearch"

24
src/views/emis/emisWarehouseInDtl/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="inNo">
<el-input
v-model="queryParams.inNo"
@ -252,9 +252,9 @@
</el-form-item>
</SearchForm>
<XdTable v-loading="loading"
border
<XdTable v-loading="loading"
border
size="small"
:data="emisWarehouseInDtlList"
:showSearch.sync="showSearch"
@ -264,7 +264,7 @@
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@ -277,7 +277,7 @@
v-hasPermi="['emis:emisWarehouseInDtl:add']"
>新增</el-button>
</el-col>
<!--
<!--
<el-col :span="1.5">
<el-button
type="success"
@ -312,7 +312,7 @@
</el-col> -->
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<!--
<el-table-column label="序号" align="center" min-width="60">
@ -320,7 +320,7 @@
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column>
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
@ -391,7 +391,7 @@
@click="handleUpdate(scope.row)"
v-hasPermi="['emis:emisWarehouseInDtl:edit']"
>修改</el-button>
<!--
<!--
<el-button
size="mini"
type="text"
@ -406,7 +406,7 @@
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisWarehouseInDtlForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWarehouseInDtlForm>
</el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
@ -446,7 +446,7 @@ export default {
total: 0,
// 进仓单明细表格数据
emisWarehouseInDtlList: [],
currentId:null,
openForm: false,
titleForm: "",
@ -519,7 +519,7 @@ export default {
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;

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

@ -75,7 +75,7 @@
storageName="A4WaybillIPrinted_main"
v-loading="loading"
border
border
size="small"
:data="emisWaybillList"
:showSearch.sync="showSearch"

19
src/views/emis/emisWaybill/batchWaybillRecord.vue
View File

@ -10,7 +10,7 @@
ref="multipleTable"
:row-class-name="tableRowClassName"
v-loading="loading"
border
border
size="mini"
:data="orderList"
:showSearch.sync="showSearch"
@ -57,7 +57,7 @@
<el-tag v-if="scope.row.uploadStatus==-1" type="danger">下单异常</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('异常信息')" align="left" prop="errorInfo" min-width="120" :show-overflow-tooltip="true" >
<el-table-column :label="$t('异常信息')" align="center" prop="errorInfo" min-width="300" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<span v-if="scope.row.uploadStatus==-1" style="color:red">{{ scope.row.errorInfo }}</span>
<span v-if="scope.row.uploadStatus==1">下单成功</span>
@ -71,7 +71,7 @@
<el-table-column :label="$t('产品类型')" align="center" prop="productType" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" width="100" />
<el-table-column :label="$t('快递员')" align="center" prop="operateEmployeeCode" min-width="100"/>
<el-table-column :label="$t('取件员/操作员')" align="center" prop="operateEmployeeCode" min-width="100"/>
<el-table-column :label="$t('报关方式')" align="center" prop="customsEclaration" min-width="80" />
<el-table-column :label="$t('清关方式')" align="center" prop="customsClear" min-width="80" />
<el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
@ -95,6 +95,9 @@
<el-table-column :label="$t('寄件区')" align="center" prop="sendCounty" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件地址')" align="center" prop="sendAddress" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('月结客户')" align="center" prop="custNo" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件/签收短信')" align="center" prop="blMessage" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('货物名称')" align="center" prop="goodsInfo" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('包装类型')" align="center" prop="packType" min-width="80" />
<el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="80" />
@ -456,12 +459,14 @@ export default {
// 运单号 收件人 收件电话 收件国 收件省 收件市 收件区 收件公司 收件地址
// 寄件人 寄件电话 寄件国 寄件省 寄件市 寄件区 寄件公司 寄件地址
// 线路 产品类型 报关方式 清关方式 快递员 货物名称 包装类型 件数 实际重量 体积
// 取件方式 派送方式 运费 支付方式 月结账号 回款联系人 销售联系人 费用备注
// 取件方式 派送方式 运费 支付方式 月结客户 回款联系人 销售联系人 费用备注
// 取件员/操作员
// 寄件/签收短信
let rowIndex=element['__rowNum__']
let orderData={
billCode: element['运单号'],
sendDate: parseTime(new Date()),
custNo: element['月结账号'],
custNo: element['月结客户'],
receiveName: element['收件人'],
receiveCompany:element['收件公司'],
receiveMobile:element['收件电话'],
@ -495,8 +500,10 @@ export default {
feeRemark:element['费用备注'],
payee: element['回款联系人'],
salesmen: element['销售联系人'],
operateEmployeeCode: element['快递员'],
operateEmployeeCode: element['取件员/操作员'],
remark: element['录单备注'],
blMessage: element['寄件/签收短信'],
uploadStatus: 0,
errorInfo:'',
}

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

@ -310,7 +310,7 @@
:row-class-name="tableRowClassName"
v-loading="loading"
border
border
size="mini"
:data="emisWaybillList"
:showSearch.sync="showSearch"
@ -665,6 +665,7 @@ export default {
billCode:null,
openTraceInfo:false,
currentTraceBillItem:null,
currentTraceBillCode:null,
dateRange:[],
@ -891,8 +892,10 @@ export default {
return '';
},
handleShowTraceInfo(row){
this.currentTraceBillCode=row.billCode;
this.currentTraceBillItem=row;
this.openTraceInfo=true;
},
/** 查询运单列表列表 */

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

@ -305,7 +305,7 @@
:row-class-name="tableRowClassName"
v-loading="loading"
border
border
size="mini"
:data="emisWaybillList"
:showSearch.sync="showSearch"
@ -665,6 +665,7 @@ export default {
billCode:null,
openTraceInfo:false,
currentTraceBillItem:null,
currentTraceBillCode:null,
dateRange:[],

2
src/views/emis/emisWaybill/index.vue
View File

@ -1231,7 +1231,7 @@
<xd-table v-loading="loading"
:header-cell-style="{background:'#f7f7f7',color:'#606266'}"
border
border
size="small"
:data="emisWaybillList"
:showSearch.sync="showSearch"

2
src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
View File

@ -52,7 +52,7 @@
</el-row >
</el-form>
<xd-table v-loading="loading"
border
border
size="small"
storageName="orderEntryAndReceiptPictureManagement_main"

2
src/views/emis/emisWaybill/orderList.vue
View File

@ -134,7 +134,7 @@
<XdTable v-loading="loading"
border
border
size="mini"
storageName="orderList_main"
:data="emisWaybillList"

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

@ -621,8 +621,6 @@ import WaybillDetailReadOnly from '@/views/emis/emisWaybill/waybillDetailReadOnl
import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDetailView.vue';
import XdTableAdv from "@/components/XdTable/index_adv.vue";
import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
@ -654,8 +652,6 @@ export default {
WaybillDetailReadOnly,
XdTableAdv
},
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',

2
src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue
View File

@ -13,7 +13,7 @@
</el-form>
<xd-table v-loading="loading"
border
border
size="small"
ref="multipleTable"
storageName="uploadThePictureOfTheSendWaybillShipment_main"

2
src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue
View File

@ -13,7 +13,7 @@
</el-form>
<xd-table v-loading="loading"
border
border
size="small"
ref="multipleTable"
storageName="uploadThePictureOfTheWaybillSigning_main"

2
src/views/emis/emisWaybill/waybillIsPrinted.vue
View File

@ -40,7 +40,7 @@
storageName="waybillIsPrinted_main"
v-loading="loading"
border
border
size="small"
:data="emisWaybillList"
:showSearch.sync="showSearch"

2
src/views/emis/emisWaybill/waybillList.vue
View File

@ -205,7 +205,7 @@
<XdTable v-loading="loading"
border
border
size="mini"
storageName="waybillList_main"

8
src/views/emis/emisWaybill/waybillModify.vue
View File

@ -1720,9 +1720,11 @@ methods: {
}
let totalFee=0;
this.form.feeItems.forEach(item=>{
totalFee=totalFee+parseInt(item.realFee);
});
if(this.form.feeItems&&this.form.feeItems.length>0){
this.form.feeItems.forEach(item=>{
totalFee=totalFee+parseInt(item.realFee);
});
}
this.form.freight = totalFee;
},
// 计算体积重量

8
src/views/emis/emisWaybill/waybillRecord.vue
View File

@ -1720,9 +1720,11 @@ methods: {
}
let totalFee=0;
this.form.feeItems.forEach(item=>{
totalFee=totalFee+parseInt(item.realFee);
});
if(this.form.feeItems&&this.form.feeItems.length>0){
this.form.feeItems.forEach(item=>{
totalFee=totalFee+parseInt(item.realFee);
});
}
this.form.freight = totalFee;
},
// 计算体积重量

2
src/views/emis/emisWaybillAjustType/index.vue
View File

@ -22,7 +22,7 @@
<XdTable v-loading="loading"
border
border
size="mini"
storageName="emisWaybillAjustType_main"
:data="emisWaybillAjustTypeList"

2
src/views/emis/emisWaybillAttachment/index.vue
View File

@ -62,7 +62,7 @@
<xd-table v-loading="loading"
border
border
size="small"
storageName="emisWaybillAttachment_main"
:data="emisWaybillAttachmentList"

2
src/views/emis/emisWaybillCargo/index.vue
View File

@ -230,7 +230,7 @@
<XdTable v-loading="loading"
border
border
size="small"
:data="emisWaybillCargoList"
:showSearch.sync="showSearch"

2
src/views/emis/emisWaybillFeeitem/index.vue
View File

@ -62,7 +62,7 @@
<xd-table v-loading="loading"
border
border
size="small"
:data="emisWaybillFeeitemList"
:showSearch.sync="showSearch"

24
src/views/emis/emisWaybillProblemFaq/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="billCode">
<el-input
v-model="queryParams.billCode"
@ -52,9 +52,9 @@
</el-form-item>
</SearchForm>
<XdTable v-loading="loading"
border
<XdTable v-loading="loading"
border
size="small"
:data="emisWaybillProblemFaqList"
:showSearch.sync="showSearch"
@ -64,7 +64,7 @@
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@ -77,7 +77,7 @@
v-hasPermi="['emis:emisWaybillProblemFaq:add']"
>新增</el-button>
</el-col>
<!--
<!--
<el-col :span="1.5">
<el-button
type="success"
@ -112,7 +112,7 @@
</el-col> -->
</el-row>
</div>
<el-table-column type="selection" width="55" align="center" />
<!--
<el-table-column label="序号" align="center" min-width="60">
@ -120,7 +120,7 @@
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column>
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
<template slot-scope="scope">
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
@ -166,7 +166,7 @@
@click="handleUpdate(scope.row)"
v-hasPermi="['emis:emisWaybillProblemFaq:edit']"
>修改</el-button>
<!--
<!--
<el-button
size="mini"
type="text"
@ -181,7 +181,7 @@
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisWaybillProblemFaqForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWaybillProblemFaqForm>
</el-dialog>
<!--
<el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
@ -221,7 +221,7 @@ export default {
total: 0,
// 问题件FAG表格数据
emisWaybillProblemFaqList: [],
currentId:null,
openForm: false,
titleForm: "",
@ -269,7 +269,7 @@ export default {
this.loading = false;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;

2
src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
View File

@ -71,7 +71,7 @@
</el-row >
<xd-table v-loading="loading"
border
border
size="small"
storageName="emisElectronicPagApply_main"
:data="emisElectronicPagApplyList"

2
src/views/emis/emisWaybillProblemInfo/index.vue
View File

@ -206,7 +206,7 @@
<xd-table v-loading="loading"
border
border
size="small"
storageName="emisWaybillProblemInfo_main"

2
src/views/emis/emisWaybillProblemInfo/problemEntry.vue
View File

@ -55,7 +55,7 @@
<div>
</div>
<xd-table v-loading="loading"
border
border
size="small"
storageName="problemEntry_main"
:data="emisWaybillList"

Some files were not shown because too many files have changed in this diff Show More