Merge branch 'master' of http://git.xdadan.loc/tanex/emis-frontend
This commit is contained in:
commit
e905c50b62
@ -92,7 +92,9 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column :label="$t('派件员')" align="center" prop="dispatchOrSendMan" min-width="100">
|
<el-table-column :label="$t('派件员')" align="center" prop="dispatchOrSendMan" min-width="100">
|
||||||
{{ scope.row.waybillDetail.dispatchManName }}
|
<template slot-scope="scope">
|
||||||
|
<span></span>{{ scope.row.waybillDetail.dispatchManName }}</span>
|
||||||
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="170" >
|
<el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="170" >
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
@ -270,12 +272,25 @@ export default {
|
|||||||
};
|
};
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
// const end = new Date()
|
||||||
|
// const start = new Date()
|
||||||
|
// start.setHours(0,0,0,0)
|
||||||
|
// end.setHours(23,59,59,0)
|
||||||
|
// this.dateTimeRange=[start,end];
|
||||||
|
|
||||||
this.$nextTick(function() {
|
this.$nextTick(function() {
|
||||||
let queryFormEl = this.$refs.queryForm.$el;
|
let queryFormEl = this.$refs.queryForm.$el;
|
||||||
let tableH = queryFormEl.offsetHeight+190;
|
let tableH = queryFormEl.offsetHeight+190;
|
||||||
this.tableHeight = window.innerHeight - tableH;
|
this.tableHeight = window.innerHeight - tableH;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
mounted() {
|
||||||
|
const end = new Date()
|
||||||
|
const start = new Date()
|
||||||
|
start.setHours(0,0,0,0)
|
||||||
|
end.setHours(23,59,59,0)
|
||||||
|
this.dateTimeRange=[start,end];
|
||||||
|
},
|
||||||
methods: {
|
methods: {
|
||||||
/** 查询扫描记录列表 */
|
/** 查询扫描记录列表 */
|
||||||
getList() {
|
getList() {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user