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

md

Browse Source
This commit is contained in:
linfso 2024-05-17 06:28:20 +08:00
parent b2c6d21447
commit 251bc69e0a
13 changed files with 1771 additions and 2784 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -115,12 +115,14 @@
"el-tree-select": "^3.1.14", "el-tree-select": "^3.1.14",
"eslint": "7.15.0", "eslint": "7.15.0",
"eslint-plugin-vue": "7.2.0", "eslint-plugin-vue": "7.2.0",
"hard-source-webpack-plugin": "^0.13.1",
"lint-staged": "10.5.3", "lint-staged": "10.5.3",
"runjs": "4.4.2", "runjs": "4.4.2",
"sass": "1.32.13", "sass": "1.32.13",
"sass-loader": "10.1.1", "sass-loader": "10.1.1",
"script-ext-html-webpack-plugin": "2.1.5", "script-ext-html-webpack-plugin": "2.1.5",
"script-loader": "^0.7.2", "script-loader": "^0.7.2",
"speed-measure-webpack-plugin": "^1.5.0",
"svg-sprite-loader": "5.1.1", "svg-sprite-loader": "5.1.1",
"vue-template-compiler": "2.6.12", "vue-template-compiler": "2.6.12",
"webpack-bundle-analyzer": "^4.9.1" "webpack-bundle-analyzer": "^4.9.1"

82
src/views/emis/EmisBaseTools/CountryPicker.vue
View File

@ -1,17 +1,20 @@
<template> <template>
<el-select <el-select
style="width:100%" style="width:100%"
ref="selectRef"
filterable filterable
clearable clearable
remote
:remote-method="queryData"
v-model="svalue" v-model="svalue"
:placeholder="placeholder" :placeholder="placeholder"
:filter-method="dataFilter"
@blur="onBlur" @blur="onBlur"
@change="onChange" @change="onChange"
@focus="onFocus"
@visible-change="reverseArrow"
> >
<el-option v-for="item in optionItems" :key="item.code" :label="item.name+'('+item.nameEn+')'" :value="item.code" ></el-option> <el-option v-for="item in optionItems" :key="item.code" :label="item.name+'('+item.nameEn+')'" :value="item.code" ></el-option>
</el-select> </el-select>
<!-- style="width:100%" -->
</template> </template>
<script> <script>
import emitter from 'element-ui/src/mixins/emitter'; import emitter from 'element-ui/src/mixins/emitter';
@ -32,58 +35,67 @@
}, },
data() { data() {
return { return {
bakOptionItems:[],
optionItems: [], optionItems: [],
svalue: this.value, svalue: this.value,
optionDefault:null, countryCode:null,
countryMap:new Map(), countryMap:new Map(),
}; };
}, },
watch: { watch: {
value(newVal) { value(newVal) {
this.svalue = newVal; this.svalue = newVal;
if(this.svalue!=null) {
this.countryCode=this.svalue;
}
}, },
}, },
created() { created() {
this.initData(); this.queryData();
},
mounted(){
let rulesDom = this.$refs["selectRef"].$el.querySelector(".el-input .el-input__suffix .el-input__suffix-inner .el-input__icon"); // 找到dom
    rulesDom.classList.add("el-icon-arrow-up"); // 对dom新增class
}, },
methods: { methods: {
onFocus(){
this.countryCode=null;
this.queryData();
},
onBlur(val){ onBlur(val){
this.$emit("input", this.svalue); this.$emit("input", this.svalue);
this.dispatch('ElFormItem', 'el.form.blur', [this.svalue]); this.dispatch('ElFormItem', 'el.form.blur');
}, },
onChange() { onChange() {
this.$emit("input", this.svalue); if(this.svalue!=null){
let itemData ={}; this.$emit("input", this.svalue);
this.optionItems.forEach(item=>{ let itemData ={};
if(item.code === this.svalue){ this.optionItems.forEach(item=>{
itemData = item; if(item.code === this.svalue){
} itemData = item;
});
this.$emit("change",itemData);
this.$emit("onChange",itemData);
this.dispatch('ElFormItem', 'el.form.change', [this.svalue]);
this.optionItems = this.bakOptionItems;
},
initData() {
let queryParams = {};
listSimpleEmisCountry(queryParams).then(response => {
this.bakOptionItems = response.rows;
this.optionItems =this.bakOptionItems;
});
},
dataFilter(val) {
this.optionDefault = val
if (val) {
let searchVal = val.toLowerCase();
this.optionItems = this.bakOptionItems.filter(item => {
if (item.code.indexOf(searchVal) != -1 || item.name.toLowerCase().indexOf(searchVal) != -1 || item.nameEn.toLowerCase().indexOf(searchVal) != -1) {
return true
} }
}) });
this.$emit("change",itemData);
this.$emit("onChange",itemData);
this.dispatch('ElFormItem', 'el.form.change', [this.svalue]);
}
},
queryData(val) {
let queryParams = {
code:this.countryCode,
name:val
};
listSimpleEmisCountry(queryParams).then(response => {
this.optionItems =response.rows;
});
},
reverseArrow(flag) {
let rulesDom = this.$refs["selectRef"].$el.querySelector(
".el-input .el-input__suffix .el-input__suffix-inner .el-input__icon"
); // 找到dom
if (flag) {
rulesDom.classList.add("is-reverse"); // 对dom新增class
} else { } else {
this.optionItems = this.bakOptionItems; rulesDom.classList.remove("is-reverse"); // 对dom新增class
} }
}, },
} }

108
src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue
View File

@ -99,40 +99,52 @@ import { getStaffList } from "@/api/emis/emisStaff";
queryParams:{ queryParams:{
pageNum:1, pageNum:1,
pageSize:5, pageSize:5,
empCode:null,
searchValue:null, searchValue:null,
siteCode:this.sideCode, ownerSiteCode:null,
postCode:this.postCode postCode:null
} }
}; };
}, },
watch: { watch: {
value(newVal,oldVal) { value(newVal,oldVal) {
this.svalue = newVal; this.svalue = newVal;
this.initData(); console.log("empCode1==>"+newVal);
console.log("this.svalue1==>"+this.svalue);
console.log("this.svalue1==>"+this.firstFlag);
if(this.svalue!=null&&this.firstFlag){
this.queryParams.empCode=this.svalue;
this.queryData();
}
}, },
siteCode(newVal){ siteCode(newVal){
this.initData(); console.log("siteCode==>"+newVal);
this.queryParams.ownerSiteCode=newVal;
this.queryData();
},
postCode(newVal){
console.log("postCode==>"+newVal);
this.queryParams.postCode=newVal;
this.queryData();
} }
}, },
beforeDestroy(){
// this.firstFlag = true;
},
mounted() { mounted() {
// 给个随机id 判断是否clickoutside // 给个随机id 判断是否clickoutside
this.createdId = String(new Date().getTime()) this.createdId = String(new Date().getTime())
}, },
created() { created() {
this.queryData();
}, },
methods: { methods: {
changeValue(val) { changeValue(val) {
if(this.queryParams.searchValue === val ) return; if(this.queryParams.searchValue === val ) return;
this.slable = val; this.slable = val;
this.isEdit = true; this.isEdit = true;
this.queryParams.searchValue = val this.queryParams.searchValue = val
this.queryParams.pageNum = 1 this.queryParams.pageNum = 1
this.getList() this.queryData()
}, },
onRowClick(row, column, event) { onRowClick(row, column, event) {
this.svalue=row.empCode; this.svalue=row.empCode;
@ -146,12 +158,15 @@ import { getStaffList } from "@/api/emis/emisStaff";
}, },
changePage(cur) { changePage(cur) {
this.queryParams.pageNum = cur this.queryParams.pageNum = cur
this.getList() this.queryData()
this.visible = true this.visible = true
this.$refs.popoverRef.doShow(); this.$refs.popoverRef.doShow();
}, },
onfocus(el) { onfocus(el) {
this.firstFlag = false;
this.queryParams.empCode=null;
if(this.slable) { if(this.slable) {
this.splaceholder= this.slable this.splaceholder= this.slable
} }
@ -159,9 +174,12 @@ import { getStaffList } from "@/api/emis/emisStaff";
this.slable = null; this.slable = null;
this.queryParams.searchValue = null; this.queryParams.searchValue = null;
this.queryParams.pageNum = 1 this.queryParams.pageNum = 1
this.getList(); this.queryData();
}, },
onclear(el){ onclear(el){
this.firstFlag = false;
this.queryParams.empCode=null;
this.splaceholder = this.placeholder; this.splaceholder = this.placeholder;
this.slable = null; this.slable = null;
this.svalue = null; this.svalue = null;
@ -173,7 +191,7 @@ import { getStaffList } from "@/api/emis/emisStaff";
this.dispatch('ElFormItem', 'el.form.blur', [this.svalue]); this.dispatch('ElFormItem', 'el.form.blur', [this.svalue]);
if(this.visible){ if(this.visible){
this.getList(); this.queryData();
} }
}, },
onblur(el) { onblur(el) {
@ -183,55 +201,47 @@ import { getStaffList } from "@/api/emis/emisStaff";
this.$emit("input", this.svalue); this.$emit("input", this.svalue);
this.dispatch('ElFormItem', 'el.form.blur', [this.svalue]); this.dispatch('ElFormItem', 'el.form.blur', [this.svalue]);
}, },
initData(){ queryData() {
// && this.firstFlag console.log("this.firstFlag2==>"+this.firstFlag)
if(this.svalue){ console.log("this.empCode2==>"+this.queryParams.empCode)
let queryParams = {
empCode:this.svalue if(this.firstFlag&&!this.queryParams.empCode){
} return;
getStaffList(queryParams).then(response => { }
// this.dataList=response.rows;
if(response.rows.length > 0) {
const curItem = response.rows[0];
this.showItem(curItem);
}else{
const curItem ={
empCode:this.svalue,
empName:''
};
this.showItem(curItem);
}
this.firstFlag = false;
});
}
},
getList() {
this.loading = true; this.loading = true;
// 首次执行
// this.queryParams.empCode = this.firstFlag?this.value:null; console.log(this.queryParams)
getStaffList(this.queryParams).then(response => { getStaffList(this.queryParams).then(response => {
this.loading = false; this.loading = false;
this.total = response.total; this.total = response.total;
this.dataList = response.rows; this.dataList = response.rows;
// if(this.firstFlag){ this.firstFlag = false;
// const selItem = this.dataList.find(item => item.empCode==this.svalue)
// if(selItem){ if(response.rows.length > 0) {
// this.showItem(selItem); const curItem = response.rows.find(item => item.empCode === this.svalue);
// } this.showItem(curItem);
// // 首次执行结束 }else{
// this.firstFlag = false; const curItem ={
// } empCode:this.svalue,
empName:''
};
this.showItem(curItem);
}
}); });
}, },
showItem(item){ showItem(item){
console.log(item); console.log(item);
// this.slable=item.empCode+'-'+item.empName; // this.slable=item.empCode+'-'+item.empName;
this.slable=item.empName; if(item!=null){
this.$emit("input", this.svalue); this.slable=item.empName;
this.$emit("onChange",item); this.$emit("input", this.svalue);
this.dispatch('ElFormItem', 'el.form.change', [this.svalue]); this.$emit("onChange",item);
this.dispatch('ElFormItem', 'el.form.change', [this.svalue]);
}
}, },
getIndex($index) { getIndex($index) {
return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1 return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1

36
src/views/emis/EmisBaseTools/TransProductCasPicker.vue
View File

@ -8,6 +8,7 @@
style="width: 100%" style="width: 100%"
clearable clearable
filterable filterable
@focus="onFocus"
></el-cascader> ></el-cascader>
</template> </template>
<script> <script>
@ -36,6 +37,8 @@ export default {
return { return {
resetCascader:0, resetCascader:0,
svalue: this.value, svalue: this.value,
lineCode:null,
prodCode:null,
props: { props: {
// checkStrictly: true, // checkStrictly: true,
lazy: true, lazy: true,
@ -51,13 +54,10 @@ export default {
let parentCode = node.value; let parentCode = node.value;
this.queryData(level,parentCode) this.queryData(level,parentCode)
.then((res) => { .then((res) => {
// console.log(res);
console.log(res);
if (res.code != 200) { if (res.code != 200) {
return; return;
} }
res.rows.map((item) => { res.rows.map((item) => {
if(level==0){ if(level==0){
@ -92,11 +92,12 @@ export default {
watch: { watch: {
value(newVal) { value(newVal) {
this.svalue = newVal; this.svalue = newVal;
if(this.svalue!=null) {
this.lineCode=this.svalue[0];
this.prodCode=this.svalue[1];
}
}, },
svalue(newVal, oldVal) { svalue(newVal, oldVal) {
if (newVal !== oldVal) {
}
}, },
countryCode(newVal) { countryCode(newVal) {
this.queryData(0,0); this.queryData(0,0);
@ -107,21 +108,18 @@ export default {
this.queryData(0,0); this.queryData(0,0);
}, },
methods: { methods: {
onFocus(){
this.lineCode=null;
this.prodCode=null;
this.queryData(0,0);
},
async queryData(level,parentCode) { async queryData(level,parentCode) {
// console.log(level)
// 第一级国家
// if(level == 0){
// let queryParams={};
// let res=await listSimpleEmisCountry(queryParams);
// console.log("xxxx1")
// console.log(res)
// return res;
// }
// 第二级是线路 // 第1级是线路
if(level == 0){ if(level == 0){
let queryParams={ let queryParams={
country:this.countryCode country:this.countryCode,
lineCode:this.lineCode,
}; };
let res=await listSimpleEmisTransLine(queryParams); let res=await listSimpleEmisTransLine(queryParams);
return res; return res;
@ -131,13 +129,13 @@ export default {
if(level == 1){ if(level == 1){
let queryParams={ let queryParams={
transLineCode:parentCode, transLineCode:parentCode,
prodCode:this.prodCode,
status:1 status:1
}; };
let res=await listSimpleEmisTransProduct(queryParams); let res=await listSimpleEmisTransProduct(queryParams);
return res; return res;
} }
}, },
handleChange(value) { handleChange(value) {
console.log(value); console.log(value);

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

@ -54,6 +54,7 @@
@queryTable="getList" @queryTable="getList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@sort-change="handleSortChange" @sort-change="handleSortChange"
v-if="tableHeight" :max-height="tableHeight + 'px'"
> >
<div slot="toolbar"> <div slot="toolbar">
@ -250,6 +251,7 @@ export default {
], ],
data() { data() {
return { return {
tableHeight: 200,
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
@ -294,6 +296,14 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
// 调整表格的高度，不允许滚动
this.$nextTick(function() {
let queryFormEl = this.$refs.queryForm.$el;
let tableH = queryFormEl.offsetHeight+190;
this.tableHeight = window.innerHeight - tableH;
});
}, },
methods: { methods: {
/** 查询快递客户用户列表 */ /** 查询快递客户用户列表 */

21
src/views/emis/emisQuotePrice/emisQuotePriceForm.vue
View File

@ -15,7 +15,9 @@
</el-col> --> </el-col> -->
<el-col :span="24"> <el-col :span="24">
<el-form-item label="使用网点" prop="useSiteCode"> <el-form-item label="使用网点" prop="useSiteCode">
<EmisSiteSimplePicker v-model="form.useSiteCode" :placeholder="$t('使用网点')" isInitiated="true" @onChange="onUseSiteChange" @onClear="onUseSiteChange"></EmisSiteSimplePicker> <EmisSiteSimplePicker v-if="ownerSiteCode == '88888'" v-model="form.useSiteCode" :placeholder="$t('使用网点')" isInitiated="true" @onChange="onUseSiteChange" @onClear="onUseSiteChange"></EmisSiteSimplePicker>
<el-input v-else v-model="ownerSiteName" placeholder="寄件网点" disabled />
<!-- <div v-if="ownerSiteCode == 88888"> <!-- <div v-if="ownerSiteCode == 88888">
<EmisSiteSimplePicker v-model="form.useSiteCode" :placeholder="$t('使用网点')" siteType="2" isInitiated="true" :disabled="false" ></EmisSiteSimplePicker> <EmisSiteSimplePicker v-model="form.useSiteCode" :placeholder="$t('使用网点')" siteType="2" isInitiated="true" :disabled="false" ></EmisSiteSimplePicker>
</div> </div>
@ -102,7 +104,7 @@
<el-option <el-option
v-for="dict of dict.type.emis_fee_type.filter(el=> el.value != 1001)" v-for="dict of dict.type.emis_fee_type.filter(el=> el.value != 1001)"
:key="dict.value" :key="dict.value"
:label="dict.value+'-'+dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
/> />
</el-select> </el-select>
@ -110,7 +112,7 @@
<el-option <el-option
v-for="dict of dict.type.emis_fee_type.filter(el=> el.value == 1001)" v-for="dict of dict.type.emis_fee_type.filter(el=> el.value == 1001)"
:key="dict.value" :key="dict.value"
:label="dict.value+'-'+dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
/> />
</el-select> </el-select>
@ -358,27 +360,19 @@ export default {
}, },
created() { created() {
// this.form.useSiteName="总部";
// this.form.useSitCode='88888';
// if(checkRole(['admin'])){
// this.form.useSiteName="总部";
// this.form.useSitCode='88888';
// // this.ownerSiteCode='88888';
// }
// console.log(this.ownerSiteCode); console.log(this.ownerSiteCode);
this.initData(); this.initData();
}, },
methods: { methods: {
initData() { initData() {
// this.form.useSiteCode=this.ownerSiteCode;
if(this.quoteId !=null) { if(this.quoteId !=null) {
this.loading = true; this.loading = true;
getEmisQuotePrice(this.quoteId).then(response => { getEmisQuotePrice(this.quoteId).then(response => {
this.form.useSiteCode=this.ownerSiteCode;
this.form = response.data; this.form = response.data;
if(this.isCopy){ if(this.isCopy){
this.form.quoteName=this.form.quoteName+"_Copy" this.form.quoteName=this.form.quoteName+"_Copy"
console.log(this.form); console.log(this.form);
@ -398,6 +392,7 @@ export default {
}else{ }else{
this.form.feeType='9999'; this.form.feeType='9999';
} }
this.form.useSiteCode=this.ownerSiteCode;
this.initSendAreaList(); this.initSendAreaList();
this.initDispAreaList(); this.initDispAreaList();

1
src/views/emis/emisSite/index.vue
View File

@ -174,7 +174,6 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.status==1" type="success">启用</el-tag> <el-tag v-if="scope.row.status==1" type="success">启用</el-tag>
<el-tag v-if="scope.row.status==0" type="danger">停用</el-tag> <el-tag v-if="scope.row.status==0" type="danger">停用</el-tag>
<!-- <dict-tag :options="dict.type.sys_biz_enable_status" :value="scope.row.status"/> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="国家" align="center" prop="countryName" width="80" :show-overflow-tooltip="true"/> <el-table-column label="国家" align="center" prop="countryName" width="80" :show-overflow-tooltip="true"/>

31
src/views/emis/emisUser/index.vue
View File

@ -504,17 +504,28 @@ export default {
handleResetPwd(row) { handleResetPwd(row) {
const userId= row.userId || this.ids[0]; const userId= row.userId || this.ids[0];
this.$prompt('请输入新密码', "提示", { this.$confirm('密码将重置为初始密码:'+this.initPassword+' 吗?', '提示', {
confirmButtonText: "确定", confirmButtonText: '确定',
cancelButtonText: "取消", cancelButtonText: '取消',
closeOnClickModal: false, type: 'warning'
inputPattern: /^.{5,20}$/, }).then(() => {
inputErrorMessage: "用户密码长度必须介于 5 和 20 之间" resetUserPwd(userId, this.initPassword).then(response => {
}).then(({ value }) => { this.$modal.msgSuccess("重置成功");
resetUserPwd(userId, value).then(response => {
this.$modal.msgSuccess("修改成功，新密码是：" + value);
}); });
}).catch(() => {}); }).catch(() => {
})
// this.$prompt('请输入新密码', "提示", {
// confirmButtonText: "确定",
// cancelButtonText: "取消",
// closeOnClickModal: false,
// inputPattern: /^.{5,20}$/,
// inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
// }).then(({ value }) => {
// resetUserPwd(userId, value).then(response => {
// this.$modal.msgSuccess("修改成功，新密码是：" + value);
// });
// }).catch(() => {});
}, },
/** 分配角色操作 */ /** 分配角色操作 */
handleAuthRole: function(row) { handleAuthRole: function(row) {

239
src/views/emis/emisWaybill/emisWaybillRecord.vue
View File

@ -1,10 +1,10 @@
<template> <template>
<div class="app-container"> <div class="app-container" >
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" size="mini" :model="form" :rules="rules" label-width="100px">
<el-collapse v-model="activeNames"> <el-collapse v-model="activeNames">
<el-collapse-item title="" name="1"> <el-collapse-item title="" name="1">
<template slot="title"> <template slot="title">
<div class="form-group-title"><span class="title">{{ $t('基础信息') }}</span></div> <div class="form-group-title"><span class="title">{{ $t('发货信息') }}</span></div>
</template> </template>
<div> <div>
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;"> <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
@ -28,11 +28,7 @@
<CountryPicker0 v-model="form.reciever.country"></CountryPicker0> <CountryPicker0 v-model="form.reciever.country"></CountryPicker0>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="6">
<el-form-item label="线路" prop="transLine">
<TransLinePicker v-model="form.transLine" :countryCode="form.reciever.country" @onChange="onTransLineChange"></TransLinePicker>
</el-form-item>
</el-col> -->
<el-col :span="8"> <el-col :span="8">
<el-form-item label="产品类型" prop="productType"> <el-form-item label="产品类型" prop="productType">
<TransProductCasPicker v-model="form.productTypeSelArr" :countryCode="form.reciever.country" @onChange="onProductChange" ></TransProductCasPicker> <TransProductCasPicker v-model="form.productTypeSelArr" :countryCode="form.reciever.country" @onChange="onProductChange" ></TransProductCasPicker>
@ -103,7 +99,7 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="寄件网点" prop="sendSiteName"> <el-form-item label="寄件网点" prop="sendSiteName">
<el-input v-model="form.sendSiteName" placeholder="寄件网点" disabled /> <el-input v-model="form.sendSiteName" placeholder="" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -154,7 +150,7 @@
padding: 5px 15px; padding: 5px 15px;
background: black; background: black;
font-size: 13px; font-size: 13px;
color: white;">寄件</span> color: white;">寄件信息</span>
</div> </div>
<div style="width:50%;text-align:right;padding-right: 15px;"> <div style="width:50%;text-align:right;padding-right: 15px;">
<!-- icon="el-icon-edit" --> <!-- icon="el-icon-edit" -->
@ -210,13 +206,13 @@
<el-col :span="12"> <el-col :span="12">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding:15px"> <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding:15px">
<el-col :span="24" style="display:inline-flex;border-bottom: 1px dotted #e6ebf5"> <el-col :span="24" style="display:inline-flex;margin-bottom: 10px;border-bottom: 1px dotted #e6ebf5">
<div class="form-group-title" style="width:50%"> <div class="form-group-title" style="width:50%">
<span style="border-radius: 15px; <span style="border-radius: 15px;
padding: 5px 15px; padding: 5px 15px;
background: #b12e29; background: #b12e29;
font-size: 13px; font-size: 13px;
color: white;">收件</span> color: white;">收件信息</span>
</div> </div>
<div style="width:50%;text-align:right;padding-right: 15px;"> <div style="width:50%;text-align:right;padding-right: 15px;">
<el-button <el-button
@ -229,20 +225,6 @@
</div> </div>
</el-col> </el-col>
<!-- <el-col :span="12">
<el-form-item label="收件客户" prop="customerCode">
<customer-picker1 v-model="form.receiveCustomerCode"></customer-picker1>
</el-form-item>
</el-col> -->
<!-- <el-col :span="12">
<el-form-item label="选择收件人" prop="customerCode">
</el-form-item>
</el-col> -->
<!-- <el-col :span="12">
<el-form-item label="客户名称" prop="customerName">
<el-input v-model="form.customerName" placeholder="请输入客户名称" />
</el-form-item>
</el-col> -->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="收件人" prop="reciever.name"> <el-form-item label="收件人" prop="reciever.name">
<CustomerAddressSimplePicker1 addressType="2" :countryCode="form.reciever.country" v-model="form.reciever.name" @onChange="onChangeSelectReceiver"></CustomerAddressSimplePicker1> <CustomerAddressSimplePicker1 addressType="2" :countryCode="form.reciever.country" v-model="form.reciever.name" @onChange="onChangeSelectReceiver"></CustomerAddressSimplePicker1>
@ -251,7 +233,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="收件电话" prop="reciever.phone"> <el-form-item label="收件电话" prop="reciever.phone">
<el-input v-model="form.reciever.phone" placeholder="请输入收件人手机号" /> <el-input v-model="form.reciever.phone" placeholder="" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -266,12 +248,12 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="收件地址" prop="reciever.address"> <el-form-item label="收件地址" prop="reciever.address">
<el-input v-model="form.reciever.address" type="textarea" rows="3" placeholder="详细地址" /> <el-input v-model="form.reciever.address" type="textarea" rows="3" placeholder="" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="收件公司" prop="reciever.company"> <el-form-item label="收件公司" prop="reciever.company">
<el-input v-model="form.reciever.company" placeholder="请输入收件公司" /> <el-input v-model="form.reciever.company" placeholder="" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -281,7 +263,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="派件网点" prop="dispatchSite"> <el-form-item label="派件网点" prop="dispatchSite">
<el-input v-model="form.dispatchSite" placeholder="请输入派件网点" disabled /> <el-input v-model="form.dispatchSite" placeholder="" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -310,7 +292,7 @@
<el-col :span="24"><div style="font-weight:600">货物信息</div></el-col> <el-col :span="24"><div style="font-weight:600">货物信息</div></el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="" prop="goodsType" label-width="0px"> <el-form-item label="" prop="goodsType" label-width="0px">
<GoodsPicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsPicker> <GoodsSimplePicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsSimplePicker>
<el-table <el-table
class="cargoList" class="cargoList"
:cell-style="{ :cell-style="{
@ -325,17 +307,16 @@
border border
stripe stripe
:data="form.cargoList" :data="form.cargoList"
size="mini" size="small"
style="width: 100%" style="width: 100%"
max-height="300px" max-height="300px"
> >
<el-table-column label="操作" align="center" width="50">
<template slot-scope="scope"> <el-table-column prop="goodsName" label="描述" align="center" min-width="100">
<span class="icon iconfont" <template slot-scope="scope">
style="cursor: pointer;font-size: 21px;color: #6e6e6e;" <el-input v-model="scope.row.goodsName" @input="(val)=>handleCalcQty(val,scope.row)" size="mini" placeholder=""></el-input>
@click="()=>deleteGoodsItem(scope.row)">&#xe7ae;</span> </template>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="length" label="长(cm)" align="center" width="60"> <el-table-column prop="length" label="长(cm)" align="center" width="60">
@ -364,13 +345,18 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goodsName" label="描述" align="center" min-width="100">
<template slot-scope="scope"> <el-table-column label="操作" align="center" width="50">
<el-input v-model="scope.row.goodsName" size="mini" placeholder=""></el-input> <template slot-scope="scope">
</template> <span class="icon iconfont"
style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
@click="()=>deleteGoodsItem(scope.row)">&#xe7ae;</span>
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-input v-model="form.goodsInfo" type="textarea" placeholder="" disabled />
<el-input v-model="form.goodsInfo" type="textarea" placeholder="" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -383,17 +369,6 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="总体积" prop="totalVolume" label-width="70px" > <el-form-item label="总体积" prop="totalVolume" label-width="70px" >
<!-- <div style="display:inline-flex">
<el-input v-model="form.length" style="width:100px" placeholder="长" >
<span slot="suffix">(cm)</span>
</el-input>
<el-input v-model="form.width" style="margin-left:5px;width:100px" placeholder="宽" >
<span slot="suffix">(cm)</span>
</el-input>
<el-input v-model="form.height" style="margin-left:5px;width:100px" placeholder="高" >
<span slot="suffix">(cm)</span>
</el-input>
</div> -->
<div style=""> <div style="">
<el-input v-model="form.totalVolume" style="text-align: right;width: 120px" placeholder="体积" > <el-input v-model="form.totalVolume" style="text-align: right;width: 120px" placeholder="体积" >
<span slot="suffix">(m³)</span> <span slot="suffix">(m³)</span>
@ -445,8 +420,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="生成子单" prop="blGenSubbill" label-width="70px"> <el-form-item label="生成子单" prop="blGenSubbill" label-width="70px" v-if="this.form.billCode && this.form.parcelQty>0">
<el-radio-group v-model="form.blGenSubbill" @change="onGenSubbill"> <el-radio-group v-model="form.blGenSubbill" @change="handleGenSubbill">
<el-radio :key="1" :label="1">是</el-radio> <el-radio :key="1" :label="1">是</el-radio>
<el-radio :key="0" :label="0">否</el-radio> <el-radio :key="0" :label="0">否</el-radio>
</el-radio-group> </el-radio-group>
@ -455,7 +430,7 @@
</el-col> </el-col>
<el-col :span="24" v-if="form.blGenSubbill==1"> <el-col :span="24" v-if="form.blGenSubbill==1">
<el-form-item label="子单号" prop="billCodeSub" label-width="70px"> <el-form-item label="子单号" prop="billCodeSub" label-width="70px">
<el-input v-model="form.billCodeSub" type="textarea" placeholder="" disabled /> <el-input v-model="form.billCodeSub" rows="5" type="textarea" placeholder="" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -515,14 +490,7 @@
style="width: 100%" style="width: 100%"
> >
<el-table-column label="操作" align="center" width="50">
<template slot-scope="scope">
<span class="icon iconfont"
style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
v-if="scope.row.blAutoGen==0"
@click="()=>deleteFeeItem(scope.row)">&#xe7ae;</span>
</template>
</el-table-column>
<el-table-column prop="feeName" label="收费项" align="center" width="70"> <el-table-column prop="feeName" label="收费项" align="center" width="70">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="font-weight:600;color:red">{{ scope.row.feeName }}</span> <span style="font-weight:600;color:red">{{ scope.row.feeName }}</span>
@ -554,6 +522,15 @@
<el-input v-model="scope.row.remark" size="mini" placeholder=""></el-input> <el-input v-model="scope.row.remark" size="mini" placeholder=""></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="50">
<template slot-scope="scope">
<span class="icon iconfont"
style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
v-if="scope.row.blAutoGen==0"
@click="()=>deleteFeeItem(scope.row)">&#xe7ae;</span>
</template>
</el-table-column>
</el-table> </el-table>
<div> <div>
<el-popover <el-popover
@ -573,7 +550,7 @@
icon="el-icon-plus" icon="el-icon-plus"
@click="handleAddFee" @click="handleAddFee"
>增加自定义费用</el-button> >增加自定义费用</el-button>
</el-popover> </el-popover>
</div> </div>
</el-form-item> </el-form-item>
@ -641,13 +618,6 @@
<AddressSelectPicker0 :addressType="addressType" @onSelected="onAddressChangeSelect"></AddressSelectPicker0> <AddressSelectPicker0 :addressType="addressType" @onSelected="onAddressChangeSelect"></AddressSelectPicker0>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -685,7 +655,7 @@ import DistrictPicker2 from '@/views/emis/EmisBaseTools/DistrictPicker.vue';
// import CustomerPicker1 from '@/views/emis/EmisBaseTools/CustomerPicker.vue'; // import CustomerPicker1 from '@/views/emis/EmisBaseTools/CustomerPicker.vue';
// import CustomerPicker2 from '@/views/emis/EmisBaseTools/CustomerPicker.vue'; // import CustomerPicker2 from '@/views/emis/EmisBaseTools/CustomerPicker.vue';
import GoodsPicker from '@/views/emis/EmisBaseTools/GoodsPicker.vue'; import GoodsSimplePicker from '@/views/emis/EmisBaseTools/GoodsSimplePicker.vue';
import CustomerAddressSimplePicker0 from '@/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue'; import CustomerAddressSimplePicker0 from '@/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue';
import CustomerAddressSimplePicker1 from '@/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue'; import CustomerAddressSimplePicker1 from '@/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue';
import AddressSelectPicker0 from '@/views/emis/EmisBaseTools/AddressSelectPicker.vue'; import AddressSelectPicker0 from '@/views/emis/EmisBaseTools/AddressSelectPicker.vue';
@ -714,7 +684,7 @@ components: {
AddressSelectPicker1, AddressSelectPicker1,
CustomerAddressSimplePicker0, CustomerAddressSimplePicker0,
CustomerAddressSimplePicker1, CustomerAddressSimplePicker1,
GoodsPicker, GoodsSimplePicker,
EmisUserSimplePicker0, EmisUserSimplePicker0,
EmisUserSimplePicker1, EmisUserSimplePicker1,
EmisUserSimplePicker2, EmisUserSimplePicker2,
@ -749,7 +719,7 @@ data() {
addressType:null, addressType:null,
// 遮罩层 // 遮罩层
loading: true, loading: true,
isInit:true, isNeedSave:false,
triggerCount:0, triggerCount:0,
printTypeCheckList:['1','2','5'], printTypeCheckList:['1','2','5'],
// 表单参数 // 表单参数
@ -884,9 +854,11 @@ data() {
watch: { watch: {
"form.reciever.province":{ "form.reciever.province":{
handler (newValue, oldValue) { handler (newValue, oldValue) {
this.calcDestSite(); // this.isNeedSave=true;
this.calcDestSite();
}, },
deep: true immediate: false,
deep: true,
}, },
"form.totalVolume":{ "form.totalVolume":{
handler (newValue, oldValue) { handler (newValue, oldValue) {
@ -898,30 +870,44 @@ data() {
handler (newValue, oldValue) { handler (newValue, oldValue) {
this.reCalcSettlementWeight(); this.reCalcSettlementWeight();
}, },
immediate: false,
deep: true deep: true
}, },
"form.billWeight":{ "form.billWeight":{
handler (newValue, oldValue) { handler (newValue, oldValue) {
this.reCalcSettlementWeight(); this.reCalcSettlementWeight();
}, },
immediate: false,
deep: true deep: true
}, },
"form.calcFeeType":{ "form.calcFeeType":{
handler (newValue, oldValue) { handler (newValue, oldValue) {
this.calcBillFee(); this.calcBillFee();
}, },
immediate: false,
deep: true deep: true
}, },
"form.settlementWeight":{ "form.settlementWeight":{
handler (newValue, oldValue) { handler (newValue, oldValue) {
this.calcBillFee(); this.calcBillFee();
}, },
immediate: false,
deep: true
},
"form.parcelQty":{
handler (newValue, oldValue) {
this.handleGenSubbill();
},
immediate: false,
deep: true deep: true
}, },
},
activated(){
}, },
mouted(){ mouted(){
},
updated(){
}, },
created() { created() {
this.billCode=this.$route.query.billCode; this.billCode=this.$route.query.billCode;
@ -965,7 +951,6 @@ methods: {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
let newList = this.form.cargoList.filter(item => item.goodsName !== row.goodsName); let newList = this.form.cargoList.filter(item => item.goodsName !== row.goodsName);
this.form.cargoList=newList; this.form.cargoList=newList;
this.handleCalcQty(); this.handleCalcQty();
this.handleCalcVolume(); this.handleCalcVolume();
@ -976,13 +961,16 @@ methods: {
lpadZero(val,len) { lpadZero(val,len) {
return (new Array(len + 1).join('0') + val).slice(-len); return (new Array(len + 1).join('0') + val).slice(-len);
}, },
onGenSubbill(value){ handleGenSubbill(value){
if(value==1 && this.form.parcelQty>0 && this.form.billCode){ if(this.form.blGenSubbill==1 && this.form.parcelQty > 0 && this.form.billCode){
let billSubCodeStr=""; // let billSubCodeStr="";
for(let i=1;i<this.form.parcelQty;i++){ // for(let i=1;i<this.form.parcelQty;i++){
let subBillCode = this.form.billCode+""+this.lpadZero(i,3); // let subBillCode = this.form.billCode+""+this.lpadZero(i,3);
billSubCodeStr=billSubCodeStr+subBillCode+";" // billSubCodeStr=billSubCodeStr+subBillCode+";"
} // console.log(billSubCodeStr);
// }
let billSubCodeStr = this.form.billCode+"["+this.lpadZero(1,3)+"-"+this.lpadZero(this.form.parcelQty,3)+"]";
console.log(billSubCodeStr);
this.form.billCodeSub=billSubCodeStr; this.form.billCodeSub=billSubCodeStr;
}else{ }else{
this.form.billCodeSub=null; this.form.billCodeSub=null;
@ -997,8 +985,7 @@ methods: {
this.form.sendDate = parseTime(new Date()); this.form.sendDate = parseTime(new Date());
this.form.sendSiteCode=this.$store.getters.ownerSiteCode; this.form.sendSiteCode=this.$store.getters.ownerSiteCode;
this.form.sendSiteName=this.$store.getters.ownerSiteName; this.form.sendSiteName=this.$store.getters.ownerSiteName;
console.log(this.form.sendSiteName)
// console.log(this.form.sendSiteCode);
if(this.billCode !=null) { if(this.billCode !=null) {
this.loading = true; this.loading = true;
@ -1007,7 +994,8 @@ methods: {
this.form.productTypeSelArr=[this.form.transLine,this.form.productType]; this.form.productTypeSelArr=[this.form.transLine,this.form.productType];
this.loading = false; this.loading = false;
this.isInit=false; this.isNeedSave=true;
}); });
}else{ }else{
// console.log(this.dict.type.emis_declare_mode[0]); // console.log(this.dict.type.emis_declare_mode[0]);
@ -1027,7 +1015,7 @@ methods: {
this.form.calcFeeType='1'; this.form.calcFeeType='1';
this.form.blMessage='1' this.form.blMessage='1'
this.isInit=false; this.isNeedSave=true;
} }
@ -1131,14 +1119,11 @@ methods: {
blAcceptMessage: null, blAcceptMessage: null,
meterType:null, meterType:null,
blGenSubbill:null, blGenSubbill:null,
billCodeSub:null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
onTransLineChange(item){
// this.form.meterType = item.meterRate;
},
onProductChange(item){ onProductChange(item){
console.log(item);
this.form.transLine=item[0]; this.form.transLine=item[0];
this.form.productType=item[1]; this.form.productType=item[1];
}, },
@ -1146,7 +1131,6 @@ methods: {
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
console.log(this.form);
realSubmitOrder(this.form).then(response => { realSubmitOrder(this.form).then(response => {
this.$modal.msgSuccess("下单成功"); this.$modal.msgSuccess("下单成功");
this.$emit("on-changed"); this.$emit("on-changed");
@ -1196,16 +1180,15 @@ methods: {
// 计算目的站点 // 计算目的站点
calcDestSite(){ calcDestSite(){
// 初始化不计算 // 初始化不计算
if(this.isInit){ if(!this.isNeedSave){
return; return;
} }
let queryParams = { let queryParams = {
lineCode:this.form.transLine,
province:this.form.reciever.province province:this.form.reciever.province
}; };
if(this.form.transLine && this.form.reciever.province){ if(this.form.reciever.province){
getDestSite(queryParams).then(response => { getDestSite(queryParams).then(response => {
console.log(response); console.log(response);
this.form.destinationCode = response.data.destCode+''; this.form.destinationCode = response.data.destCode+'';
@ -1220,7 +1203,7 @@ methods: {
}, },
handleCalcVolume(val,row){ handleCalcVolume(val,row){
// 初始化不计算 // 初始化不计算
if(this.isInit){ if(!this.isNeedSave){
return; return;
} }
@ -1233,15 +1216,23 @@ methods: {
this.form.cargoList.forEach(item=>{ this.form.cargoList.forEach(item=>{
totalVolume=totalVolume+item.volume; totalVolume=totalVolume+item.volume;
}); });
this.form.totalVolume = totalVolume; this.form.totalVolume = parseFloat(totalVolume.toFixed(5));
}, },
handleCalcQty(val,row){ handleCalcQty(val,row){
let totalCargoQty=0; let totalCargoQty=0;
let goodsInfo='';
this.form.cargoList.forEach(item=>{ this.form.cargoList.forEach(item=>{
totalCargoQty=totalCargoQty+parseInt(item.cargoQty); totalCargoQty=totalCargoQty+parseInt(item.cargoQty);
goodsInfo=goodsInfo+item.goodsName+"x"+item.cargoQty+",";
}); });
this.form.goodsInfo = goodsInfo;
this.form.parcelQty = totalCargoQty; this.form.parcelQty = totalCargoQty;
this.handleGenSubbill();
}, },
handleCalcFeeItem(val,row){ handleCalcFeeItem(val,row){
let totalFee=0; let totalFee=0;
@ -1253,7 +1244,7 @@ methods: {
// 计算体积重量 // 计算体积重量
reCalcVolumeWeight(){ reCalcVolumeWeight(){
// 初始化不计算 // 初始化不计算
if(this.isInit){ if(!this.isNeedSave){
return; return;
} }
@ -1274,7 +1265,7 @@ methods: {
// 计算计算重量 // 计算计算重量
reCalcSettlementWeight(){ reCalcSettlementWeight(){
// 初始化不计算 // 初始化不计算
if(this.isInit){ if(!this.isNeedSave){
return; return;
} }
@ -1299,7 +1290,7 @@ methods: {
}, },
calcBillFee(){ calcBillFee(){
// 初始化不计算 // 初始化不计算
if(this.isInit){ if(!this.isNeedSave){
return; return;
} }
@ -1347,9 +1338,8 @@ methods: {
this.form.dispatchUnderlingSite= item.siteName; this.form.dispatchUnderlingSite= item.siteName;
this.form.dispatchSite= item.siteName; this.form.dispatchSite= item.siteName;
}, },
onGoodsChange(goodsList,goodsInfo){ onGoodsChange(goodsName){
if(goodsName&& goodsName!='') {
if(goodsList!=null && goodsList.length>0) {
// 旧map // 旧map
let nameOldMap = new Map(); let nameOldMap = new Map();
if(this.form.cargoList!=null&& this.form.cargoList.length>0){ if(this.form.cargoList!=null&& this.form.cargoList.length>0){
@ -1358,38 +1348,19 @@ methods: {
}); });
} }
// 新map if(!(goodsName in nameOldMap)){
let nameNewMap = new Map();
goodsList.forEach(item=>{
nameNewMap[item.goodsName]=item;
});
// 添加没有的
goodsList.forEach(item=>{
if(!(item.goodsName in nameOldMap)){
let cargo={ let cargo={
"goodsCode": item.goodsCode, "goodsCode": goodsName,
"goodsName": item.goodsName, "goodsName": goodsName,
"cargoQty": 1, "cargoQty": 1,
"length": 0, "length": 0,
"width": 0, "width": 0,
"height": 0, "height": 0,
"volume": 0, "volume": 0,
} }
this.form.cargoList.push(cargo); this.form.cargoList.push(cargo);
}
});
let goodsInfo='';
if(this.form.cargoList!=null&& this.form.cargoList.length>0){
this.form.cargoList.forEach(item=>{
goodsInfo=goodsInfo+item.goodsName+",";
});
} }
this.form.goodsInfo = goodsInfo;
this.handleCalcQty(); this.handleCalcQty();
this.handleCalcVolume(); this.handleCalcVolume();
} }

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

File diff suppressed because it is too large Load Diff

1467
src/views/emis/emisWaybill/orderRecord.vue
View File

File diff suppressed because it is too large Load Diff

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

@ -1,6 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<SearchForm :model="queryParams" ref="queryForm" size="mini" :maxShow="50" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery"> <SearchForm :model="queryParams" ref="queryForm" size="mini" :maxShow="8" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="" prop="billCode"> <el-form-item label="" prop="billCode">
<div slot="label"> <div slot="label">
<el-radio-group class="query-label" v-model="queryParams.params.queryOrderType"> <el-radio-group class="query-label" v-model="queryParams.params.queryOrderType">
@ -17,8 +18,15 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="" prop="dateTimeRange">
<div slot="label">
<el-radio-group class="query-label" v-model="queryParams.params.queryOrderDateType">
<el-radio label="1">下单时间</el-radio>
<el-radio label="0">录单时间</el-radio>
</el-radio-group>
</div>
<elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
</el-form-item>
<el-form-item label="收件人" prop="receiveName"> <el-form-item label="收件人" prop="receiveName">
<el-input <el-input
@ -122,15 +130,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="" prop="dateTimeRange">
<div slot="label">
<el-radio-group class="query-label" v-model="queryParams.params.queryOrderDateType">
<el-radio label="1">下单时间</el-radio>
<el-radio label="0">录单时间</el-radio>
</el-radio-group>
</div>
<elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
</el-form-item>
@ -139,7 +139,7 @@
<XdTable v-loading="loading" <XdTable v-loading="loading"
border stripe border stripe
size="small" size="mini"
:data="emisWaybillList" :data="emisWaybillList"
:showSearch.sync="showSearch" :showSearch.sync="showSearch"
:queryParams="queryParams" :queryParams="queryParams"
@ -147,6 +147,8 @@
@queryTable="getList" @queryTable="getList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@sort-change="handleSortChange" @sort-change="handleSortChange"
v-if="tableHeight" :max-height="tableHeight + 'px'"
> >
<div slot="toolbar"> <div slot="toolbar">
@ -183,7 +185,7 @@
@click="handleView" @click="handleView"
>查看</el-button> >查看</el-button>
</el-col> --> </el-col> -->
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
plain plain
@ -191,6 +193,15 @@
:disabled="single" :disabled="single"
@click="handleView" @click="handleView"
>预览面单</el-button> >预览面单</el-button>
</el-col> -->
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
:disabled="single"
@click="handleView"
>下载进仓单</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -199,7 +210,7 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleView" @click="handleView"
>下载pdf</el-button> >下载打印pdf</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -212,17 +223,6 @@
>打印</el-button> >打印</el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['emis:emisWaybill:remove']"
>删除</el-button>
</el-col> -->
<!-- <el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
@ -250,192 +250,155 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom" min-width="80">
<template slot-scope="scope">
<div v-if="scope.row.settleStatus == 0" style="color:red;">
<span class="el-tag el-tag--info">未结算</span>
</div>
<div v-if="scope.row.settleStatus == 10" style="color:red;">
<span class="el-tag">待确认</span>
</div>
<div v-if="scope.row.settleStatus == 11" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已确认</span>
</div>
<div v-if="scope.row.settleStatus == 20" >
<span class="el-tag el-tag--warning el-tag--light">待打款</span>
</div>
<div v-if="scope.row.settleStatus == 21" style="color:green;">
<span class="el-tag el-tag--success el-tag--light">已打款</span>
</div>
<div v-if="scope.row.settleStatus == 40" style="color:red;">
<span class="el-tag el-tag--danger">已拒绝</span>
</div>
</template>
</el-table-column>
--> -->
<!-- <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" /> --> <!-- <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" /> -->
<el-table-column :label="$t('运单号')" align="center" prop="billCode" width="120" :show-overflow-tooltip="true">
<template slot-scope="scope">
<router-link :to="'/d24/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type">
<span>{{ scope.row.billCode }}</span>
</router-link>
</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="orderSn" width="100" :show-overflow-tooltip="true"/> -->
<el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" width="100" :show-overflow-tooltip="true"/> <!-- <el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" width="100" :show-overflow-tooltip="true"/> -->
<!-- <el-table-column :label="$t('子单号,逗号隔开')" align="center" prop="billCodeSub" min-width="100" /> --> <!-- <el-table-column :label="$t('子单号,逗号隔开')" align="center" prop="billCodeSub" min-width="100" /> -->
<!-- <el-table-column :label="$t('订单状态')" align="center" prop="orderStatus" min-width="100" /> --> <!-- <el-table-column :label="$t('订单状态')" align="center" prop="orderStatus" min-width="100" /> -->
<el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" width="100" > <!-- <el-table-column :label="$t('物流信息')" align="center" prop="lastTraceInfo" width="100" /> -->
<el-table-column label="发货信息" align="center" >
<el-table-column :label="$t('运单编号')" align="center" prop="billCode" width="120" :show-overflow-tooltip="true">
<template slot-scope="scope">
<router-link :to="'/d24/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type">
<span>{{ scope.row.billCode }}</span>
</router-link>
</template>
</el-table-column>
<el-table-column :label="$t('发货日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('收件业务员')" align="center" prop="salesmen" min-width="100" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/> <dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column :label="$t('物流信息')" align="center" prop="lastTraceInfo" width="100" /> <el-table-column :label="$t('起始国')" align="center" prop="sendCountryName" width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的国')" align="center" prop="receiveCountryName" width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('时效')" align="center" prop="timeType" min-width="80" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('计泡比例')" align="center" prop="meterType" min-width="100" /> -->
<!-- <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170" /> -->
</el-table-column>
<el-table-column :label="$t('国家')" align="center" prop="receiveCountryName" width="100" />
<el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="100" />
<el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="100" />
<el-table-column :label="$t('时效')" align="center" prop="timeType" min-width="100" />
<el-table-column :label="$t('计泡比例')" align="center" prop="meterType" min-width="100" />
<!-- <el-table-column :label="$t('订单类型')" align="center" prop="orderType" min-width="100" /> -->
<!-- <el-table-column :label="$t('下单时间')" align="center" prop="orderDate" min-width="100" /> -->
<!-- <el-table-column :label="$t('客户编号2502021')" align="center" prop="customerCode" min-width="100" /> -->
<!-- <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" /> -->
<!-- <el-table-column :label="$t('收件客户编号2502021')" align="center" prop="receiveCustomerCode" min-width="100" /> -->
<!-- <el-table-column :label="$t('收件客户客户名称')" align="center" prop="receiveCustomerName" min-width="100" /> -->
<!-- <el-table-column :label="$t('第三方客户客户编号')" align="center" prop="thirdCustomerCode" min-width="100" /> -->
<!-- <el-table-column :label="$t('第三方客户客户名称')" align="center" prop="thirdCustomerName" min-width="100" /> -->
<!-- <el-table-column :label="$t('收货人名')" align="center" prop="receiveName" min-width="100" /> -->
<!-- <el-table-column :label="$t('收货公司')" align="center" prop="receiveCompany" min-width="100" /> -->
<!-- <el-table-column :label="$t('收货人手机号')" align="center" prop="receiveMobile" min-width="100" /> -->
<!-- <el-table-column :label="$t('收货人电话')" align="center" prop="receiveTel" min-width="100" /> -->
<!-- <el-table-column :label="$t('省')" align="center" prop="receiveProvince" min-width="100" /> --> <el-table-column label="寄件信息" align="center" >
<!-- <el-table-column :label="$t('市')" align="center" prop="receiveCity" min-width="100" /> --> <el-table-column :label="$t('寄件客户')" align="center" prop="sendCompany" min-width="80" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('区')" align="center" prop="receiveCounty" min-width="100" /> --> <el-table-column :label="$t('寄件网点')" align="center" prop="sendSiteName" min-width="80" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('县')" align="center" prop="receiveTown" min-width="100" /> --> <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="80" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('收货地址')" align="center" prop="receiveAddress" min-width="100" /> <el-table-column :label="$t('寄件手机')" align="center" prop="sendMobile" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('邮编')" align="center" prop="receivePostcode" min-width="100" /> <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件人省市区名称，逗号分隔')" align="center" prop="receivePcd" min-width="100" /> <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('寄件人名')" align="center" prop="sendName" min-width="100" /> <el-table-column :label="$t('寄件省')" align="center" prop="sendProvinceName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100" /> <el-table-column :label="$t('寄件市')" align="center" prop="sendCityName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件人手机号')" align="center" prop="sendMobile" min-width="100" /> <el-table-column :label="$t('寄件区')" align="center" prop="sendCountyName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件人电话')" align="center" prop="sendTel" min-width="100" /> <el-table-column :label="$t('寄件地址')" align="center" prop="sendAddress" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件人国家')" align="center" prop="sendCountry" min-width="100" /> <el-table-column :label="$t('寄件/签收短信')" align="center" prop="blMessage" min-width="80" :show-overflow-tooltip="true">
<el-table-column :label="$t('寄件省')" align="center" prop="sendProvince" min-width="100" /> <template slot-scope="scope">
<el-table-column :label="$t('寄件市')" align="center" prop="sendCity" min-width="100" /> <el-tag v-if="scope.row.blMessage==1" type="success">发送</el-tag>
<el-table-column :label="$t('寄件区')" align="center" prop="sendCounty" min-width="100" /> <el-tag v-else type="danger">不发送</el-tag>
<el-table-column :label="$t('寄件县')" align="center" prop="sendTown" min-width="100" /> </template>
<el-table-column :label="$t('寄件地址')" align="center" prop="sendAddress" min-width="100" /> </el-table-column>
<el-table-column :label="$t('寄件邮编')" align="center" prop="sendPostcode" min-width="100" /> </el-table-column>
<el-table-column :label="$t('发件人省市区名称，逗号分隔')" align="center" prop="sendPcd" min-width="100" /> <el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="100" />
<el-table-column :label="$t('计费方式')" align="center" prop="calcFeeType" min-width="100" />
<el-table-column :label="$t('支付月结编号')" align="center" prop="custNo" min-width="100" /> -->
<!-- <el-table-column :label="$t('清关方式')" align="center" prop="customsClear" min-width="100" />
<el-table-column :label="$t('报关方式')" align="center" prop="customsEclaration" min-width="100" />
<el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="100" />
<el-table-column :label="$t('包装类型')" align="center" prop="packType" min-width="100" />
<el-table-column :label="$t('派件方式:1-送货上门')" align="center" prop="dispatchMethod" min-width="100" />
<el-table-column :label="$t('取件方式:1-上门取件')" align="center" prop="pickupMethod" min-width="100" />
<el-table-column :label="$t('预计上门取件开始时间')" align="center" prop="pickStartDate" min-width="100" />
<el-table-column :label="$t('预计上门取件结束时间')" align="center" prop="pickFinishDate" min-width="100" />
<el-table-column :label="$t('取货失败原因')" align="center" prop="pickFailReason" min-width="100" />
<el-table-column :label="$t('入仓代码')" align="center" prop="intoWarehouseCode" min-width="100" />
<el-table-column :label="$t('入仓名称')" align="center" prop="intoWarehouseName" min-width="100" />
<el-table-column :label="$t('入仓地址')" align="center" prop="intoWarehouseAddress" min-width="100" />
<el-table-column :label="$t('入仓联系人')" align="center" prop="intoWarehouseContact" min-width="100" />
<el-table-column :label="$t('入仓联系人电话')" align="center" prop="intoWarehousePhone" min-width="100" />
<el-table-column :label="$t('入仓单号')" align="center" prop="intoWarehouseBillCode" min-width="100" /> -->
<!-- <el-table-column :label="$t('客户发货开始时间')" align="center" prop="customerDeliveryBeginTime" min-width="100" /> <el-table-column label="收件信息" align="center">
<el-table-column :label="$t('客户发货截止时间')" align="center" prop="customerDeliveryEndTime" min-width="100" /> <el-table-column :label="$t('目的地')" align="center" prop="destinationName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('货物大类')" align="center" prop="goodsType" min-width="100" /> <el-table-column :label="$t('目的网点')" align="center" prop="dispatchUnderlingSiteName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('货物描述')" align="center" prop="goodsInfo" min-width="100" />
<el-table-column :label="$t('货物图片，逗号隔开')" align="center" prop="goodsPics" min-width="100" /> <!-- <el-table-column :label="$t('收件客户')" align="center" prop="receiveCustomerName" min-width="100" /> -->
<el-table-column :label="$t('预入仓代垫运费')" align="center" prop="blPrepareInFreight" min-width="100" /> <el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('预入仓代垫运费')" align="center" prop="prepareInEstFee" min-width="100" /> <el-table-column :label="$t('收件电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('预入仓实际运费')" align="center" prop="prepareInRealFee" min-width="100" /> <el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('预入仓快递公司')" align="center" prop="prepareInExpress" min-width="100" /> <el-table-column :label="$t('收件国家')" align="center" prop="receiveCountryName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('预入仓快递单号')" align="center" prop="prepareInBillCode" min-width="100" /> <el-table-column :label="$t('收件省')" align="center" prop="receiveProvinceName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('预入仓自定义标识')" align="center" prop="prepareInRemark" min-width="100" /> <el-table-column :label="$t('收件市')" align="center" prop="receiveCityName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('预入仓供应商')" align="center" prop="prepareInSupplier" min-width="100" /> <el-table-column :label="$t('收件区')" align="center" prop="receiveCountyName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" /> <el-table-column :label="$t('收件地址')" align="center" prop="receiveAddress" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" /> <el-table-column :label="$t('派件短信')" align="center" prop="blAcceptMessage" min-width="80" :show-overflow-tooltip="true">
<el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" /> <template slot-scope="scope">
<el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" /> <el-tag v-if="scope.row.blAcceptMessage==1" type="success">发送</el-tag>
<el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" /> <el-tag v-else type="danger">不发送</el-tag>
<el-table-column :label="$t('费用币种')" align="center" prop="currency" min-width="100" /> </template>
<el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" /> </el-table-column>
<el-table-column :label="$t('计费重量')" align="center" prop="feeWeight" min-width="100" />
<el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" /> </el-table-column>
<el-table-column :label="$t('是否超长')" align="center" prop="blOverLong" min-width="100" />
<el-table-column :label="$t('是否出账')" align="center" prop="blBill" min-width="100" /> <el-table-column label="货物信息" align="center">
<el-table-column :label="$t('是否超重')" align="center" prop="blOverWeight" min-width="100" />
<el-table-column :label="$t('超重重量')" align="center" prop="overWeightNumber" min-width="100" /> <el-table-column :label="$t('货物名称')" align="center" prop="goodsInfo" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('费用备注')" align="center" prop="feeRemaker" min-width="100" /> <el-table-column :label="$t('包装类型')" align="center" prop="packType" min-width="80" >
<el-table-column :label="$t('三段码')" align="center" prop="thirdCode" min-width="100" /> <template slot-scope="scope">
<el-table-column :label="$t('实际货值')" align="center" prop="realValue" min-width="100" /> <dict-tag :options="dict.type.emis_tab_packing_type" :value="scope.row.packType"/>
<el-table-column :label="$t('是否投保')" align="center" prop="blInsure" min-width="100" /> </template>
<el-table-column :label="$t('投保货值')" align="center" prop="insureValue" min-width="100" /> </el-table-column>
<el-table-column :label="$t('投保货值币种')" align="center" prop="insureValueCurrency" min-width="100" /> <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="80" />
<el-table-column :label="$t('保费币种')" align="center" prop="insureFeeCurrency" min-width="100" /> <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="80" />
<el-table-column :label="$t('保费')" align="center" prop="insureFee" min-width="100" /> <el-table-column :label="$t('体积')" align="center" prop="totalVolume" min-width="80" />
<el-table-column :label="$t('保险备注')" align="center" prop="insureRemark" min-width="100" /> <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="80" />
<el-table-column :label="$t('保险站点代码')" align="center" prop="insureSiteCode" min-width="100" /> <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="80" />
<el-table-column :label="$t('投保日期')" align="center" prop="insureDate" min-width="100" />
<el-table-column :label="$t('是否打印')" align="center" prop="blPrint" min-width="100" /> <el-table-column :label="$t('派件方式')" align="center" prop="dispatchMethod" min-width="80" >
<el-table-column :label="$t('打印人编号')" align="center" prop="printManCode" min-width="100" /> <template slot-scope="scope">
<el-table-column :label="$t('打印站点')" align="center" prop="printSite" min-width="100" /> <el-tag v-if="scope.row.dispatchMethod==1" type="info">派送</el-tag>
<el-table-column :label="$t('打印时间')" align="center" prop="printDate" min-width="100" /> <el-tag v-else type="info">自提</el-tag>
<el-table-column :label="$t('打印次数')" align="center" prop="printCount" min-width="100" /> </template>
<el-table-column :label="$t('是否同行转单')" align="center" prop="blDispFd" min-width="100" /> </el-table-column>
<el-table-column :label="$t('转单代码')" align="center" prop="transferCode" min-width="100" />
<el-table-column :label="$t('转单单号')" align="center" prop="transferBillcode" min-width="100" /> </el-table-column>
<el-table-column :label="$t('转单时间')" align="center" prop="dispFdDate" min-width="100" />
<el-table-column :label="$t('转单原因')" align="center" prop="dispFdReason" min-width="100" /> <el-table-column label="收费信息" align="center">
<el-table-column :label="$t('当前网点编号')" align="center" prop="currentSiteCode" min-width="100" />
<el-table-column :label="$t('上一网点点号')" align="center" prop="lastSiteCode" min-width="100" /> <el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" >
<el-table-column :label="$t('寄件站点代码')" align="center" prop="registerSiteCode" min-width="100" /> <template slot-scope="scope">
<el-table-column :label="$t('寄件日期')" align="center" prop="registerDate" min-width="100" /> <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
<el-table-column :label="$t('寄件人编号')" align="center" prop="registerManCode" min-width="100" /> </template>
<el-table-column :label="$t('取件员代码')" align="center" prop="takePieceEmployeeCode" min-width="100" /> </el-table-column>
<el-table-column :label="$t('发件网点代码')" align="center" prop="sendSiteCode" min-width="100" /> <el-table-column :label="$t('到付款')" align="center" prop="freight" min-width="80" />
<el-table-column :label="$t('发货时间')" align="center" prop="sendDate" min-width="100" /> <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="80" />
<el-table-column :label="$t('派件人代码')" align="center" prop="dispatchManCode" min-width="100" /> <el-table-column :label="$t('保价金额')" align="center" prop="insureValue" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('派件时间')" align="center" prop="dispatchDate" min-width="100" /> <el-table-column :label="$t('保费')" align="center" prop="insureFee" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('派件网点代码')" align="center" prop="dispatchSiteCode" min-width="100" /> <el-table-column :label="$t('费用备注')" align="center" prop="feeRemaker" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('生成账单时间')" align="center" prop="produceBillDate" min-width="100" />
<el-table-column :label="$t('生成账单站点代码')" align="center" prop="produceBillSiteCode" min-width="100" /> </el-table-column>
<el-table-column :label="$t('生成账单人代码')" align="center" prop="produceBillManCode" min-width="100" />
<el-table-column :label="$t('目的地编号')" align="center" prop="destinationCode" min-width="100" /> <el-table-column label="签收信息" align="center">
<el-table-column :label="$t('目的省')" align="center" prop="destinationProvince" min-width="100" />
<el-table-column :label="$t('目的城市')" align="center" prop="destinationCity" min-width="100" /> <el-table-column :label="$t('签收状态')" align="center" prop="waybillStatus" width="80" >
<el-table-column :label="$t('目的国家')" align="center" prop="destinationCounty" min-width="100" /> <template slot-scope="scope">
<el-table-column :label="$t('目的地网点代码')" align="center" prop="dispatchUnderlingSiteCode" min-width="100" /> <el-tag v-if="scope.row.waybillStatus=='50'" type="success">已签收</el-tag>
<el-table-column :label="$t('目的地财务中心代码')" align="center" prop="destinationCenterCode" min-width="100" /> <el-tag v-else type="danger">未签收</el-tag>
<el-table-column :label="$t('业务人代码')" align="center" prop="marketManCode" min-width="100" /> </template>
<el-table-column :label="$t('销售回款人')" align="center" prop="payee" min-width="100" /> </el-table-column>
<el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" /> <el-table-column :label="$t('签收时间')" align="center" prop="signDate" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('操作员代码')" align="center" prop="operateEmployeeCode" min-width="100" />
<el-table-column :label="$t('是否问题件')" align="center" prop="blIsQuestion" min-width="100" /> <el-table-column :label="$t('签收人')" align="center" prop="signMan" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('问题件类型')" align="center" prop="problemType" min-width="100" /> <el-table-column :label="$t('派件人')" align="center" prop="dispatchManName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" min-width="100" /> <el-table-column :label="$t('派件网点')" align="center" prop="dispatchSiteName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('问题件延期天数')" align="center" prop="problemDelayDays" min-width="100" />
<el-table-column :label="$t('是否备注消息')" align="center" prop="blMessage" min-width="100" /> </el-table-column>
<el-table-column :label="$t('是否发送收件人短信')" align="center" prop="blAcceptMessage" min-width="100" />
<el-table-column :label="$t('是否生成子单')" align="center" prop="blGenSubbill" min-width="100" /> <el-table-column label="打印信息" align="center">
<el-table-column :label="$t('签收人')" align="center" prop="signMan" min-width="100" /> <el-table-column :label="$t('是否打印')" align="center" prop="blPrint" min-width="80" >
<el-table-column :label="$t('签收人代码')" align="center" prop="signManCode" min-width="100" /> <template slot-scope="scope">
<el-table-column :label="$t('签收站点代码')" align="center" prop="signSiteCode" min-width="100" /> <el-tag v-if="scope.row.blPrint==1" type="success">已打印</el-tag>
<el-table-column :label="$t('签收时间')" align="center" prop="signDate" min-width="100" /> <el-tag v-else type="danger">未打印</el-tag>
<el-table-column :label="$t('揽收图片备注')" align="center" prop="billPicSendRmk" min-width="100" /> </template>
<el-table-column :label="$t('签收底单图片')" align="center" prop="billPicDispatchRmk" min-width="100" /> </el-table-column>
<el-table-column :label="$t('时区偏差')" align="center" prop="timezoneOffset" min-width="100" /> <el-table-column :label="$t('打印次数')" align="center" prop="printCount" min-width="80" />
<el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> --> <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>
<el-table-column :label="$t('订单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
</XdTable> </XdTable>
<!-- <!--
@ -464,6 +427,8 @@ export default {
], ],
data() { data() {
return { return {
tableHeight: 200,
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
@ -668,6 +633,13 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
// 调整表格的高度，不允许滚动
this.$nextTick(function() {
let queryFormEl = this.$refs.queryForm.$el;
let tableH = queryFormEl.offsetHeight+190;
this.tableHeight = window.innerHeight - tableH;
});
}, },
methods: { methods: {
/** 查询运单列表列表 */ /** 查询运单列表列表 */

13
vue.config.js
View File

@ -6,6 +6,9 @@ function resolve(dir) {
} }
const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');
const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
// const MiniCssExtractPlugin = require('mini-css-extract-plugin'); // const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const CompressionPlugin = require('compression-webpack-plugin'); const CompressionPlugin = require('compression-webpack-plugin');
// const LodashModuleReplacementPlugin = require("lodash-webpack-plugin"); // const LodashModuleReplacementPlugin = require("lodash-webpack-plugin");
@ -13,6 +16,9 @@ const CompressionPlugin = require('compression-webpack-plugin');
const name = process.env.VUE_APP_TITLE || '管理系统' // 网页标题 const name = process.env.VUE_APP_TITLE || '管理系统' // 网页标题
// 判断开发环境
const isProduction = process.env.NODE_ENV === 'production';
const port = process.env.port || process.env.npm_config_port || 80 // 端口 const port = process.env.port || process.env.npm_config_port || 80 // 端口
const webpack = require("webpack"); const webpack = require("webpack");
const Timestamp = new Date().getTime(); const Timestamp = new Date().getTime();
@ -87,13 +93,14 @@ module.exports = {
filename: '[path].gz[query]', // 压缩后的文件名 filename: '[path].gz[query]', // 压缩后的文件名
algorithm: 'gzip', // 使用gzip压缩 algorithm: 'gzip', // 使用gzip压缩
minRatio: 0.8 // 压缩率小于1才会压缩 minRatio: 0.8 // 压缩率小于1才会压缩
}) }),
// new HardSourceWebpackPlugin(),
// new SpeedMeasurePlugin()
], ],
}, },
chainWebpack(config) { chainWebpack(config) {
config.plugins.delete('preload') // TODO: need test config.plugins.delete('preload') // TODO: need test
config.plugins.delete('prefetch') // TODO: need test config.plugins.delete('prefetch') // TODO: need test
// config.optimization.minimize(true); // config.optimization.minimize(true);
// config.optimization.splitChunks({ // config.optimization.splitChunks({
// chunks: 'all' // chunks: 'all'
@ -125,8 +132,6 @@ module.exports = {
}) })
.end() .end()
config config
.when(process.env.NODE_ENV !== 'development', .when(process.env.NODE_ENV !== 'development',
config => { config => {