提交 080f194f authored 作者: liupengfei's avatar liupengfei

清单统计和单书统计记住查询项

上级 626eb26f
...@@ -12,8 +12,7 @@ module.exports = { ...@@ -12,8 +12,7 @@ module.exports = {
assetsPublicPath: '/', assetsPublicPath: '/',
proxyTable: { proxyTable: {
'/api': { '/api': {
// target: 'http://192.168.2.234:8096',//后端接口地址(测试) target: 'http://192.168.2.234:8096',//后端接口地址(测试)
target: 'http://122.14.50.6:8096',//后端接口地址(伪生产)
changeOrigin: true,//是否允许跨越 changeOrigin: true,//是否允许跨越
pathRewrite: { pathRewrite: {
'^/api': '',//重写, '^/api': '',//重写,
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<el-option label="本系统" :value="0"></el-option> <el-option label="本系统" :value="0"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="发货地区"> <el-form-item label="发货地区">
<!-- <el-select v-model="listQuery.province"> <!-- <el-select v-model="listQuery.province">
<el-option label="全部" :value="null"></el-option> <el-option label="全部" :value="null"></el-option>
<el-option v-for="(value, key) in provinces" :key="key" :label="value" :value="value"></el-option> <el-option v-for="(value, key) in provinces" :key="key" :label="value" :value="value"></el-option>
...@@ -343,14 +343,14 @@ export default { ...@@ -343,14 +343,14 @@ export default {
})() })()
}; };
/*if( ifUndefined(store.getters.book_detailsSerKeys.pageNum) ){ if( ifUndefined(store.getters.book_detailsSerKeys.pageNum) ){
this.listQuery = store.getters.book_detailsSerKeys this.listQuery = store.getters.book_detailsSerKeys
if(ifUndefined(this.listQuery.beginCreateTime) || ifUndefined(this.listQuery.endCreateTime)){ if(ifUndefined(this.listQuery.beginCreateTime) || ifUndefined(this.listQuery.endCreateTime)){
this.commitTime = [] this.commitTime = []
this.commitTime[0] = this.listQuery.beginCreateTime this.commitTime[0] = this.listQuery.beginCreateTime
this.commitTime[1] = this.listQuery.endCreateTime this.commitTime[1] = this.listQuery.endCreateTime
} }
}*/ }
/*var date = new Date(); /*var date = new Date();
var seperator1 = "-"; var seperator1 = "-";
var year = date.getFullYear(); var year = date.getFullYear();
...@@ -377,7 +377,7 @@ export default { ...@@ -377,7 +377,7 @@ export default {
heightList(){ heightList(){
this.$nextTick(()=>{ this.$nextTick(()=>{
let bodyHeight = document.body.clientHeight //body高度 let bodyHeight = document.body.clientHeight //body高度
let searchHeight = (window.getComputedStyle(this.$refs.searchHeight).height).replace(/[^\d\.]/g,''); //检索部分高度 let searchHeight = (window.getComputedStyle(this.$refs.searchHeight).height).replace(/[^\d\.]/g,''); //检索部分高度
this.centerHeight = bodyHeight - searchHeight - 90 - 123 this.centerHeight = bodyHeight - searchHeight - 90 - 123
},100) },100)
}, },
...@@ -565,7 +565,7 @@ export default { ...@@ -565,7 +565,7 @@ export default {
this.listQuery.beginCreateTime = this.commitTime[0] this.listQuery.beginCreateTime = this.commitTime[0]
this.listQuery.endCreateTime = this.commitTime[1] this.listQuery.endCreateTime = this.commitTime[1]
}else{//说明是默认的时间 }else{//说明是默认的时间
this.getTime(); this.getTime();
} }
} else { } else {
this.listQuery.beginCreateTime = null this.listQuery.beginCreateTime = null
...@@ -578,7 +578,7 @@ export default { ...@@ -578,7 +578,7 @@ export default {
var reg=/,$/gi; var reg=/,$/gi;
this.showName=this.showName.replace(reg,""); this.showName=this.showName.replace(reg,"");
}) })
this.listQuery.pageNum = 1 this.listQuery.pageNum = 1
this.getList() this.getList()
}, },
getTime(){ getTime(){
...@@ -627,7 +627,7 @@ export default { ...@@ -627,7 +627,7 @@ export default {
getNav(){ getNav(){
getNavAPI().then(res => { getNavAPI().then(res => {
if(res.data.code === 0 ){ if(res.data.code === 0 ){
this.navTree = res.data.data this.navTree = res.data.data
this.navTreeTotal=res.data.data.length this.navTreeTotal=res.data.data.length
}else{ }else{
errorMsg.apply(this, [ res.data, `获取树形分类失败` ]) errorMsg.apply(this, [ res.data, `获取树形分类失败` ])
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="发货地区"> <el-form-item label="发货地区">
<el-select v-model="addressList" multiple="multiple" placeholder="请选择"> <el-select v-model="addressList" multiple="multiple" placeholder="请选择">
<el-option label="全部" value="全部" key="1"></el-option> <el-option label="全部" value="全部" key="1"></el-option>
<el-option v-for="(value, key) in provinces" :key="key" :label="value" :value="value"></el-option> <el-option v-for="(value, key) in provinces" :key="key" :label="value" :value="value"></el-option>
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<el-form-item label="支付方式"> <el-form-item label="支付方式">
<el-select v-model="listQuery.payType"> <el-select v-model="listQuery.payType">
<el-option label="全部" :value="null"></el-option> <el-option label="全部" :value="null"></el-option>
<el-option label="支付宝" :value="0"></el-option> <el-option label="支付宝" :value="0"></el-option>
<el-option label="微信" :value="1"></el-option> <el-option label="微信" :value="1"></el-option>
<el-option label="网银支付" :value="2"></el-option> <el-option label="网银支付" :value="2"></el-option>
...@@ -241,8 +241,8 @@ export default { ...@@ -241,8 +241,8 @@ export default {
}; };
}, },
mounted() { mounted() {
console.log(store.getters.list_detailsSerKeys,1111111)
/*if( ifUndefined(store.getters.list_detailsSerKeys.pageNum) ){ if( ifUndefined(store.getters.list_detailsSerKeys.pageNum) ){
this.listQuery = store.getters.list_detailsSerKeys this.listQuery = store.getters.list_detailsSerKeys
if(ifUndefined(this.listQuery.beginCreateTime) || ifUndefined(this.listQuery.endCreateTime)){ if(ifUndefined(this.listQuery.beginCreateTime) || ifUndefined(this.listQuery.endCreateTime)){
...@@ -250,7 +250,14 @@ export default { ...@@ -250,7 +250,14 @@ export default {
this.commitTime[0] = this.listQuery.beginCreateTime this.commitTime[0] = this.listQuery.beginCreateTime
this.commitTime[1] = this.listQuery.endCreateTime this.commitTime[1] = this.listQuery.endCreateTime
} }
}*/
if (ifUndefined(this.listQuery.province)) {
this.addressList = this.listQuery.province.split(",").filter(v => v)
}
if (ifUndefined(this.listQuery.code)) {
}
}
/*2018-01-01 00:00:00*/ /*2018-01-01 00:00:00*/
document.getElementsByClassName("el-table__empty-text")[0].innerHTML='请检索数据'; document.getElementsByClassName("el-table__empty-text")[0].innerHTML='请检索数据';
this.getNav() this.getNav()
...@@ -452,7 +459,7 @@ export default { ...@@ -452,7 +459,7 @@ export default {
this.getList() this.getList()
}, },
getTime(){ getTime(){
var d = new Date(); var d = new Date();
var seperator1 = "-"; var seperator1 = "-";
var year = d.getFullYear(); var year = d.getFullYear();
var monthT = d.getMonth() + 1; var monthT = d.getMonth() + 1;
...@@ -499,7 +506,7 @@ export default { ...@@ -499,7 +506,7 @@ export default {
getNavAPI().then(res => { getNavAPI().then(res => {
if(res.data.code === 0 ){ if(res.data.code === 0 ){
this.navTree = res.data.data; this.navTree = res.data.data;
this.navTreeTotal=res.data.data.length this.navTreeTotal=res.data.data.length
}else{ }else{
errorMsg.apply(this, [ res.data, `获取树形分类失败` ]) errorMsg.apply(this, [ res.data, `获取树形分类失败` ])
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论