Commit 662681ef authored by 徐来柯's avatar 徐来柯

update

parent ece37af6
...@@ -182,7 +182,6 @@ export default { ...@@ -182,7 +182,6 @@ export default {
method:"post", method:"post",
url:`/api/StatisticsManage/StatisticsManage_Query?argKeyWord=${postData.argKeyWord}&argWhere=${postData.argWhere}&Stime=${postData.Stime}&Etime=${postData.Etime}`, url:`/api/StatisticsManage/StatisticsManage_Query?argKeyWord=${postData.argKeyWord}&argWhere=${postData.argWhere}&Stime=${postData.Stime}&Etime=${postData.Etime}`,
}).then((res)=>{ }).then((res)=>{
if(res.data.data.length != 0 ){
this.AllTableData = res.data.data.map(item => ({ this.AllTableData = res.data.data.map(item => ({
...item, ...item,
DeliveryDt: item.DeliveryDt ? this.$moment(item.DeliveryDt).format('YYYY-MM-DD HH:mm:ss') : ' ', DeliveryDt: item.DeliveryDt ? this.$moment(item.DeliveryDt).format('YYYY-MM-DD HH:mm:ss') : ' ',
...@@ -197,15 +196,9 @@ export default { ...@@ -197,15 +196,9 @@ export default {
this.tableData = this.AllTableData this.tableData = this.AllTableData
} }
this.totalCount = this.AllTableData.length this.totalCount = this.AllTableData.length
// this.pageIndex = 1 this.$refs.page.first()
this.totalPage = Math.ceil(this.AllTableData.length / this.$refs.page.pageSize) this.totalPage = Math.ceil(this.AllTableData.length / this.$refs.page.pageSize)
this.pageFun(1) this.pageFun(1)
}else{
this.tableData = []
this.totalCount = 0
// this.pageIndex = 1
this.totalPage = 1
}
}).catch(function(err){ }).catch(function(err){
console.log('err',err) console.log('err',err)
}) })
......
...@@ -161,7 +161,6 @@ export default { ...@@ -161,7 +161,6 @@ export default {
method:"post", method:"post",
url:`/api/MaterialDelivery/MaterialDelivery_Query?argKeyWord=${postData.argKeyWord}&argWhere=${postData.argWhere}&Stime=${postData.Stime}&Etime=${postData.Etime}`, url:`/api/MaterialDelivery/MaterialDelivery_Query?argKeyWord=${postData.argKeyWord}&argWhere=${postData.argWhere}&Stime=${postData.Stime}&Etime=${postData.Etime}`,
}).then((res)=>{ }).then((res)=>{
if(res.data.data.length != 0 ){
this.AllTableData = res.data.data.map(item => ({ this.AllTableData = res.data.data.map(item => ({
...item, ...item,
UpdateTime: item.UpdateTime ? this.$moment(item.UpdateTime).format('YYYY-MM-DD HH:mm:ss') : ' ' UpdateTime: item.UpdateTime ? this.$moment(item.UpdateTime).format('YYYY-MM-DD HH:mm:ss') : ' '
...@@ -173,15 +172,9 @@ export default { ...@@ -173,15 +172,9 @@ export default {
this.tableData = this.AllTableData this.tableData = this.AllTableData
} }
this.totalCount = this.AllTableData.length this.totalCount = this.AllTableData.length
// this.pageIndex = 1 this.$refs.page.first()
this.totalPage = Math.ceil(this.AllTableData.length / this.$refs.page.pageSize) this.totalPage = Math.ceil(this.AllTableData.length / this.$refs.page.pageSize)
this.pageFun(1) this.pageFun(1)
}else{
this.tableData = []
this.totalCount = 0
// this.pageIndex = 1
this.totalPage = 1
}
}).catch(function(err){ }).catch(function(err){
console.log('err',err) console.log('err',err)
}) })
......
...@@ -160,7 +160,6 @@ export default { ...@@ -160,7 +160,6 @@ export default {
method:"post", method:"post",
url:`/api/ProductDelivery/ProductDelivery_Query?argKeyWord=${postData.argKeyWord}&argWhere=${postData.argWhere}&Stime=${postData.Stime}&Etime=${postData.Etime}`, url:`/api/ProductDelivery/ProductDelivery_Query?argKeyWord=${postData.argKeyWord}&argWhere=${postData.argWhere}&Stime=${postData.Stime}&Etime=${postData.Etime}`,
}).then((res)=>{ }).then((res)=>{
if(res.data.data.length != 0 ){
this.AllTableData = res.data.data.map(item => ({ this.AllTableData = res.data.data.map(item => ({
...item, ...item,
UpdateTime: item.UpdateTime ? this.$moment(item.UpdateTime).format('YYYY-MM-DD HH:mm:ss') : ' ' UpdateTime: item.UpdateTime ? this.$moment(item.UpdateTime).format('YYYY-MM-DD HH:mm:ss') : ' '
...@@ -173,15 +172,9 @@ export default { ...@@ -173,15 +172,9 @@ export default {
this.tableData = this.AllTableData this.tableData = this.AllTableData
} }
this.totalCount = this.AllTableData.length this.totalCount = this.AllTableData.length
// this.pageIndex = 1 this.$refs.page.first()
this.totalPage = Math.ceil(this.AllTableData.length / this.$refs.page.pageSize) this.totalPage = Math.ceil(this.AllTableData.length / this.$refs.page.pageSize)
this.pageFun(1) this.pageFun(1)
}else{
this.tableData = []
this.totalCount = 0
// this.pageIndex = 1
this.totalPage = 1
}
}).catch(function(err){ }).catch(function(err){
console.log('err',err) console.log('err',err)
}) })
......
...@@ -109,7 +109,6 @@ export default { ...@@ -109,7 +109,6 @@ export default {
method:"post", method:"post",
url:`/api/PHouseshow/PHouseshow_Query?argKeyWord=${postData.argKeyWord}&argWhere=${postData.argWhere}`, url:`/api/PHouseshow/PHouseshow_Query?argKeyWord=${postData.argKeyWord}&argWhere=${postData.argWhere}`,
}).then((res)=>{ }).then((res)=>{
if(res.data.data.length != 0 ){
this.AllTableData = res.data.data.map(item => ({ this.AllTableData = res.data.data.map(item => ({
...item, ...item,
UpdateTime: item.UpdateTime ? this.$moment(item.UpdateTime).format('YYYY-MM-DD HH:mm:ss') : ' ' UpdateTime: item.UpdateTime ? this.$moment(item.UpdateTime).format('YYYY-MM-DD HH:mm:ss') : ' '
...@@ -122,15 +121,9 @@ export default { ...@@ -122,15 +121,9 @@ export default {
this.tableData = this.AllTableData this.tableData = this.AllTableData
} }
this.totalCount = this.AllTableData.length this.totalCount = this.AllTableData.length
// this.pageIndex = 1 this.$refs.page.first()
this.totalPage = Math.ceil(this.AllTableData.length / this.$refs.page.pageSize) this.totalPage = Math.ceil(this.AllTableData.length / this.$refs.page.pageSize)
this.pageFun(1) this.pageFun(1)
}else{
this.tableData = []
this.totalCount = 0
// this.pageIndex = 1
this.totalPage = 1
}
}).catch(function(err){ }).catch(function(err){
console.log('err',err) console.log('err',err)
}) })
......
...@@ -160,7 +160,6 @@ export default { ...@@ -160,7 +160,6 @@ export default {
method:"post", method:"post",
url:`/api/ProductStorage/ProductStorage_Query?argKeyWord=${postData.argKeyWord}&argWhere=${postData.argWhere}&Stime=${postData.Stime}&Etime=${postData.Etime}`, url:`/api/ProductStorage/ProductStorage_Query?argKeyWord=${postData.argKeyWord}&argWhere=${postData.argWhere}&Stime=${postData.Stime}&Etime=${postData.Etime}`,
}).then((res)=>{ }).then((res)=>{
if(res.data.data.length != 0 ){
this.AllTableData = res.data.data.map(item => ({ this.AllTableData = res.data.data.map(item => ({
...item, ...item,
UpdateTime: item.UpdateTime ? this.$moment(item.UpdateTime).format('YYYY-MM-DD HH:mm:ss') : ' ' UpdateTime: item.UpdateTime ? this.$moment(item.UpdateTime).format('YYYY-MM-DD HH:mm:ss') : ' '
...@@ -173,15 +172,9 @@ export default { ...@@ -173,15 +172,9 @@ export default {
this.tableData = this.AllTableData this.tableData = this.AllTableData
} }
this.totalCount = this.AllTableData.length this.totalCount = this.AllTableData.length
// this.pageIndex = 1 this.$refs.page.first()
this.totalPage = Math.ceil(this.AllTableData.length / this.$refs.page.pageSize) this.totalPage = Math.ceil(this.AllTableData.length / this.$refs.page.pageSize)
this.pageFun(1) this.pageFun(1)
}else{
this.tableData = []
this.totalCount = 0
// this.pageIndex = 1
this.totalPage = 1
}
}).catch(function(err){ }).catch(function(err){
console.log('err',err) console.log('err',err)
}) })
......
...@@ -42,11 +42,10 @@ export default { ...@@ -42,11 +42,10 @@ export default {
// 当前页 // 当前页
pageIndex: 1, pageIndex: 1,
// 每页显示条数 // 每页显示条数
pageSize: 10, pageSize: 50,
} }
}, },
created () { created () {
}, },
methods: { methods: {
// 分页方法 // 分页方法
......
...@@ -182,7 +182,6 @@ export default { ...@@ -182,7 +182,6 @@ export default {
method:"post", method:"post",
url:`/api/NewTrendChart/GstVariableList?argKeyWord=${this.argKeyWord}&argDevice=${this.argDevice}&argGroup=${this.argGroup}&argDataType=${this.argDataType}&argPageSize=${this.$refs.page.pageSize}&argPageIndex=${this.$refs.page.pageIndex}`, url:`/api/NewTrendChart/GstVariableList?argKeyWord=${this.argKeyWord}&argDevice=${this.argDevice}&argGroup=${this.argGroup}&argDataType=${this.argDataType}&argPageSize=${this.$refs.page.pageSize}&argPageIndex=${this.$refs.page.pageIndex}`,
}).then((res)=>{ }).then((res)=>{
if(res.data.data.length != 0 ){
this.AllTableData = res.data.data.DataList.map(item => ({ this.AllTableData = res.data.data.DataList.map(item => ({
...item, ...item,
UpdateTime: item.UpdateTime ? this.$moment(item.UpdateTime).format('YYYY-MM-DD HH:mm:ss') : ' ' UpdateTime: item.UpdateTime ? this.$moment(item.UpdateTime).format('YYYY-MM-DD HH:mm:ss') : ' '
...@@ -195,15 +194,9 @@ export default { ...@@ -195,15 +194,9 @@ export default {
this.innerTableData = this.AllTableData this.innerTableData = this.AllTableData
} }
this.totalCount = this.AllTableData.length this.totalCount = this.AllTableData.length
// this.pageIndex = 1 this.$refs.page.first()
this.totalPage = Math.ceil(this.AllTableData.length / this.$refs.page.pageSize) this.totalPage = Math.ceil(this.AllTableData.length / this.$refs.page.pageSize)
this.pageFun(1) this.pageFun(1)
}else{
this.innerTableData = []
this.totalCount = 0
// this.pageIndex = 1
this.totalPage = 1
}
}).catch(function(err){ }).catch(function(err){
console.log('err',err) console.log('err',err)
}) })
......
...@@ -108,7 +108,6 @@ export default { ...@@ -108,7 +108,6 @@ export default {
method:"post", method:"post",
url:`/api/Materialinventory/Materialinventory_Query?argKeyWord=${postData.argKeyWord}&argWhere=${postData.argWhere}`, url:`/api/Materialinventory/Materialinventory_Query?argKeyWord=${postData.argKeyWord}&argWhere=${postData.argWhere}`,
}).then((res)=>{ }).then((res)=>{
if(res.data.data.length != 0 ){
this.AllTableData = res.data.data.map(item => ({ this.AllTableData = res.data.data.map(item => ({
...item, ...item,
UpdateTime: item.UpdateTime ? this.$moment(item.UpdateTime).format('YYYY-MM-DD HH:mm:ss') : ' ' UpdateTime: item.UpdateTime ? this.$moment(item.UpdateTime).format('YYYY-MM-DD HH:mm:ss') : ' '
...@@ -121,15 +120,9 @@ export default { ...@@ -121,15 +120,9 @@ export default {
this.tableData = this.AllTableData this.tableData = this.AllTableData
} }
this.totalCount = this.AllTableData.length this.totalCount = this.AllTableData.length
// this.pageIndex = 1 this.$refs.page.first()
this.totalPage = Math.ceil(this.AllTableData.length / this.$refs.page.pageSize) this.totalPage = Math.ceil(this.AllTableData.length / this.$refs.page.pageSize)
this.pageFun(1) this.pageFun(1)
}else{
this.tableData = []
this.totalCount = 0
// this.pageIndex = 1
this.totalPage = 1
}
}).catch(function(err){ }).catch(function(err){
console.log('err',err) console.log('err',err)
}) })
......
...@@ -147,7 +147,7 @@ export default { ...@@ -147,7 +147,7 @@ export default {
method:"post", method:"post",
url:`/api/TJStatistics/Statistics_Query?argKeyWord=${postData.argKeyWord}&argWhere=${postData.argWhere}&Stime=${postData.Stime}&Etime=${postData.Etime}`, url:`/api/TJStatistics/Statistics_Query?argKeyWord=${postData.argKeyWord}&argWhere=${postData.argWhere}&Stime=${postData.Stime}&Etime=${postData.Etime}`,
}).then((res)=>{ }).then((res)=>{
if(res.data.data.length != 0 ){ // if(res.data.data.length != 0 ){
$this.AllTableData = res.data.data.map(item => ({ $this.AllTableData = res.data.data.map(item => ({
...item, ...item,
DeliveryDt: item.DeliveryDt ? $this.$moment(item.DeliveryDt).format('YYYY-MM-DD HH:mm:ss') : ' ', DeliveryDt: item.DeliveryDt ? $this.$moment(item.DeliveryDt).format('YYYY-MM-DD HH:mm:ss') : ' ',
...@@ -164,11 +164,13 @@ export default { ...@@ -164,11 +164,13 @@ export default {
$this.$refs.page.first() $this.$refs.page.first()
$this.totalPage = Math.ceil($this.AllTableData.length / $this.$refs.page.pageSize) $this.totalPage = Math.ceil($this.AllTableData.length / $this.$refs.page.pageSize)
$this.pageFun(1) $this.pageFun(1)
}else{ // }else{
$this.tableData = [] // $this.tableData = []
$this.totalCount = 0 // $this.$refs.page.pageIndex = 1
$this.totalPage = 1 // $this.$refs.page.first()
} // $this.totalCount = 0
// $this.totalPage = 1
// }
}).catch(function(err){ }).catch(function(err){
console.log('err',err) console.log('err',err)
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment