Commit 5d38899c authored by 徐来柯's avatar 徐来柯

update

parent 9b529726
......@@ -181,8 +181,8 @@ export default {
if(res.data.data.length != 0 ){
this.AllTableData = res.data.data.map(item => ({
...item,
DeliveryDt: item.DeliveryDt ? this.$moment(item.DeliveryDt).format('YYYY-MM-DD HH:mm:ss') : '',
EndDt: item.EndDt ? this.$moment(item.EndDt ).format('YYYY-MM-DD HH:mm:ss') : ''
DeliveryDt: item.DeliveryDt ? this.$moment(item.DeliveryDt).format('YYYY-MM-DD HH:mm:ss') : ' ',
EndDt: item.EndDt ? this.$moment(item.EndDt ).format('YYYY-MM-DD HH:mm:ss') : ' '
}))
// 克隆一份tableData数据
this.cloneData= JSON.parse(JSON.stringify(this.AllTableData))
......@@ -245,8 +245,8 @@ export default {
return {
argKeyWord: this.formData.argKeyWord,
argWhere: this.formData.argWhere,
Stime: this.formData.dateValue ? this.$moment(this.formData.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
Stime: this.formData.dateValue ? this.$moment(this.formData.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
},
//关闭提示弹窗
......
......@@ -164,7 +164,7 @@ export default {
if(res.data.data.length != 0 ){
this.AllTableData = res.data.data.map(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') : ' '
}))
this.cloneData= JSON.parse(JSON.stringify(this.AllTableData))
if(this.AllTableData.length > this.$refs.page.pageSize){
......@@ -197,8 +197,8 @@ export default {
var postData = {
argKeyWord: this.formData.argKeyWord,
argWhere: this.formData.argWhere,
Stime: this.formData.dateValue ? this.$moment(this.formData.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
Stime: this.formData.dateValue ? this.$moment(this.formData.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
this.searchData(this.postData)
}).catch(() => {
......@@ -240,8 +240,8 @@ export default {
return {
argKeyWord: this.formData.argKeyWord,
argWhere: this.formData.argWhere,
Stime: this.formData.dateValue ? this.$moment(this.formData.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
Stime: this.formData.dateValue ? this.$moment(this.formData.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
},
//关闭提示弹窗
......@@ -272,8 +272,8 @@ export default {
var postData = {
argKeyWord: this.formData.argKeyWord,
argWhere: this.formData.argWhere,
Stime: $this.$refs.dateValue ? $this.$moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: $this.$refs.dateValue ? $this.$moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
Stime: $this.$refs.dateValue ? $this.$moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: $this.$refs.dateValue ? $this.$moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
$this.searchData(postData)
}).catch(function(err){
......
......@@ -161,7 +161,7 @@ export default {
if(res.data.data.length != 0 ){
$this.AllTableData = res.data.data.map(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') : ' '
}))
// 克隆一份tableData数据
$this.cloneData= JSON.parse(JSON.stringify($this.AllTableData))
......@@ -206,8 +206,8 @@ export default {
var postData = {
argKeyWord: this.formData.argKeyWord,
argWhere: this.formData.argWhere,
Stime: this.formData.dateValue ? this.$moment(this.formData.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
Stime: this.formData.dateValue ? this.$moment(this.formData.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
this.searchData(this.postData)
}).catch(() => {
......@@ -218,8 +218,8 @@ export default {
return {
argKeyWord: this.formData.argKeyWord,
argWhere: this.formData.argWhere,
Stime: this.formData.dateValue ? this.$moment(this.formData.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
Stime: this.formData.dateValue ? this.$moment(this.formData.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
},
delData () {
......
......@@ -271,8 +271,8 @@ export default {
var postData = {
argKeyWord: $this.$refs.head.input,
argWhere: $this.$refs.head.argWhere,
Stime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
Stime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
$this.query(postData)
}).catch(function(err){
......@@ -322,8 +322,8 @@ export default {
var postData = {
argKeyWord: $this.$refs.head.input,
argWhere: $this.$refs.head.argWhere,
Stime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
Stime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
$this.query(postData)
}).catch(function(err){
......@@ -519,8 +519,8 @@ export default {
var postData = {
argKeyWord: $this.$refs.head.input,
argWhere: $this.$refs.head.argWhere,
Stime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
Stime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
$this.query(postData)
this.pageFun(this.PageIndex)
......@@ -605,8 +605,8 @@ export default {
var postData = {
argKeyWord: $this.$refs.head.input,
argWhere: $this.$refs.head.argWhere,
Stime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
Stime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
$this.query(postData)
this.pageFun(this.PageIndex)
......@@ -676,8 +676,8 @@ export default {
var postData = {
argKeyWord: $this.$refs.head.input,
argWhere: $this.$refs.head.argWhere,
Stime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
Stime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
$this.query(postData)
}).catch((err) =>{
......
......@@ -163,7 +163,7 @@ export default {
if(res.data.data.length != 0 ){
this.AllTableData = res.data.data.map(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') : ' '
}))
// 克隆一份tableData数据
this.cloneData= JSON.parse(JSON.stringify(this.AllTableData))
......@@ -208,8 +208,8 @@ export default {
var postData = {
argKeyWord: this.formData.argKeyWord,
argWhere: this.formData.argWhere,
Stime: this.formData.dateValue ? this.$moment(this.formData.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
Stime: this.formData.dateValue ? this.$moment(this.formData.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
this.searchData(this.postData)
}).catch(() => {
......@@ -220,8 +220,8 @@ export default {
return {
argKeyWord: this.formData.argKeyWord,
argWhere: this.formData.argWhere,
Stime: this.formData.dateValue ? this.$moment(this.formData.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
Stime: this.formData.dateValue ? this.$moment(this.formData.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
},
delData () {
......
......@@ -138,7 +138,7 @@ export default {
if(res.data.data.length != 0 ){
this.AllTableData = res.data.data.map(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') : ' '
}))
// 克隆一份tableData数据
this.cloneData= JSON.parse(JSON.stringify(this.AllTableData))
......
......@@ -163,7 +163,7 @@ export default {
if(res.data.data.length != 0 ){
this.AllTableData = res.data.data.map(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') : ' '
}))
// 克隆一份tableData数据
this.cloneData= JSON.parse(JSON.stringify(this.AllTableData))
......@@ -208,8 +208,8 @@ export default {
var postData = {
argKeyWord: this.formData.argKeyWord,
argWhere: this.formData.argWhere,
Stime: this.formData.dateValue ? this.$moment(this.formData.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
Stime: this.formData.dateValue ? this.$moment(this.formData.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
this.searchData(this.postData)
}).catch(() => {
......@@ -220,8 +220,8 @@ export default {
return {
argKeyWord: this.formData.argKeyWord,
argWhere: this.formData.argWhere,
Stime: this.formData.dateValue ? this.$moment(this.formData.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
Stime: this.formData.dateValue ? this.$moment(this.formData.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
},
delData () {
......
......@@ -8,7 +8,7 @@
<template>
<div class="lineBox">
<div class="LineCenten">
<Head type="10" ref="head" @searchQuery="query"></Head>
<Head type="12" ref="head" @searchQuery="query"></Head>
<div class="conterFool_middle" style="width:98%;margin:auto">
<el-table
border
......@@ -26,50 +26,50 @@
<el-table-column
label="序号"
:show-overflow-tooltip="true"
width="185"
width="125"
prop="NO">
</el-table-column>
<el-table-column
label="生产计划编号"
:show-overflow-tooltip="true"
width="185"
width="175"
prop="PID">
</el-table-column>
<el-table-column
label="产品编号"
:show-overflow-tooltip="true"
width="185"
width="175"
prop="ProNumber">
</el-table-column>
<el-table-column
label="产品名称"
:show-overflow-tooltip="true"
prop="ProductName"
width="200">
width="180">
</el-table-column>
<el-table-column
label="产品描述"
:show-overflow-tooltip="true"
prop="Prodescribe"
width="200">
width="180">
</el-table-column>
<el-table-column
label="单位"
:show-overflow-tooltip="true"
prop="Prounit"
width="200">
width="170">
</el-table-column>
<el-table-column
label="计划交货日期"
:show-overflow-tooltip="true"
prop="DeliveryDt"
width="300">
width="200">
</el-table-column>
<el-table-column
label="计划数量"
:show-overflow-tooltip="true"
prop="Quantity"
width="200">
width="140">
</el-table-column>
<el-table-column
label="生产计划状态"
......@@ -249,47 +249,42 @@ export default {
this.typeV = '6'
this.cancelFun()
}
this.deletetext = res.data.msg
var postData = {
argKeyWord: $this.$refs.head.input,
argWhere: $this.$refs.head.argWhere,
Stime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
}
this.deletetext = res.data.msg
var postData = this.resetData()
$this.query(postData)
}).catch(function(err){
console.log('err',err)
})
},
//编辑
A_editFun(value){
var $this = this
let data = value
console.log('编辑',value)
A_editFun(data){
var $this = this
this.$axios({
method:"post",
url:`/api/Plan/Plan_WindowEditSave`,
data:data
}).then((res)=>{
console.log('编辑',res)
if(res.data.code != 0){
this.typeV = '5'
this.deleteShow = true
}else{
this.typeV = '6'
this.cancelFun()
}
this.deletetext = res.data.msg
var postData = {
argKeyWord: $this.$refs.head.input,
argWhere: $this.$refs.head.argWhere,
Stime: $this.$refs.head.dateValue ? $this.$moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: $this.$refs.head.dateValue ? $this.$moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
}
$this.query(postData)
if(res.data.code != 0){
this.typeV = '5'
this.deleteShow = true
}else{
this.typeV = '6'
this.popShow = false
}
this.deletetext = res.data.msg
var postData = this.resetData()
$this.query(postData)
}).catch(function(err){
console.log('err',err)
})
},
resetData () {
return {
argKeyWord: this.$refs.head.input,
argWhere: this.$refs.head.argWhere,
Stime: this.$refs.head.dateValue ? this.$moment(this.$refs.head.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: this.$refs.head.dateValue ? this.$moment(this.$refs.head.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
},
//删除数据
deleteData(data){
......
......@@ -4,6 +4,7 @@
* @Author: Tao
* @LastEditors: Tao
* @LastEditTime: 2020-08-27 11:35:41
type 12: 生产计划
-->
<template>
<div class="head">
......@@ -18,7 +19,7 @@
</el-option>
</el-select>
</div>
<div v-if="type==='10' || type=== '11' || type === '12' || type === '8'" class="select">
<div v-if="type ==='10' || type=== '11' || type === '12' || type === '8'" class="select">
<span>查询条件: </span>
<el-select class="selectName" v-model="argWhere" placeholder="请选择">
<el-option
......@@ -43,7 +44,7 @@
<el-input type="text" @input="inputchargeFun()" v-model="input" :placeholder="placeText"></el-input>
</div>
<div>
<div v-if="type=== '10' || type === '8'" class="bottom" @click="searchQuery" >查询</div>
<div v-if="type === '10' || type === '8' || type === '12'" class="bottom" @click="searchQuery" >查询</div>
<div class="bottom" v-else @click="query()">查询</div>
</div>
<div v-if="type == 9" class="add xy">
......@@ -52,11 +53,11 @@
<div v-if="type == 9" class="add sy" style="margin-left:15px">
<span class="addText">导出</span>
</div>
<div v-if="type != 7 && type != 12" @click="deleteFun()" class="delete">
<div v-if="type != 7" @click="deleteFun()" class="delete">
<span class="deText">删除</span>
<div class="deleteImg"></div>
</div>
<div v-if="type != 7 && type != 12" @click="add()" class="add">
<div v-if="type != 7" @click="add()" class="add">
<span class="addText">添加</span>
<div class="addImg"></div>
</div>
......@@ -184,7 +185,38 @@ export default {
name: '生产排程状态'
}
]
}
} else if (this.type === '12') {
this.productNameArr = [
{
id: '不限',
name: ' '
},
{
id: '生产计划编号',
name: '生产计划编号'
},
{
id: '产品编号',
name: '产品编号'
},
{
id: '产品名称',
name: '产品名称'
},
{
id: '产品描述',
name: '产品描述'
},
{
id: '计划交货日期',
name: '计划交货日期'
},
{
id: '生产计划状态',
name: '生产计划状态'
},
]
}
}else{
this.placeText = '请输入名称'
}
......@@ -209,8 +241,8 @@ export default {
var postData = {
argKeyWord: this.input,
argWhere: this.argWhere,
Stime: this.dateValue ? moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: this.dateValue ? moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
Stime: this.dateValue ? moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: this.dateValue ? moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
this.$emit('searchQuery', postData)
......
......@@ -185,7 +185,7 @@ export default {
if(res.data.data.length != 0 ){
this.AllTableData = res.data.data.DataList.map(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') : ' '
}))
// 克隆一份tableData数据
this.cloneData= JSON.parse(JSON.stringify(this.AllTableData))
......
......@@ -137,7 +137,7 @@ export default {
if(res.data.data.length != 0 ){
this.AllTableData = res.data.data.map(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') : ' '
}))
// 克隆一份tableData数据
this.cloneData= JSON.parse(JSON.stringify(this.AllTableData))
......
......@@ -256,8 +256,8 @@ export default {
var postData = {
argKeyWord: $this.$refs.head.input,
argWhere: $this.$refs.head.argWhere,
Stime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
Stime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: $this.$refs.head.dateValue ? $this.moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
$this.query(postData)
}).catch(function(err){
......@@ -285,8 +285,8 @@ export default {
var postData = {
argKeyWord: $this.$refs.head.input,
argWhere: $this.$refs.head.argWhere,
Stime: $this.$refs.head.dateValue ? $this.$moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: $this.$refs.head.dateValue ? $this.$moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
Stime: $this.$refs.head.dateValue ? $this.$moment(this.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: $this.$refs.head.dateValue ? $this.$moment(this.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
$this.query(postData)
}).catch(function(err){
......
......@@ -169,27 +169,27 @@ export default {
url:`/api/TJStatistics/Statistics_Query?argKeyWord=${postData.argKeyWord}&argWhere=${postData.argWhere}&Stime=${postData.Stime}&Etime=${postData.Etime}`,
}).then((res)=>{
if(res.data.data.length != 0 ){
this.AllTableData = res.data.data.map(item => ({
$this.AllTableData = res.data.data.map(item => ({
...item,
DeliveryDt: item.DeliveryDt ? this.$moment(item.DeliveryDt).format('YYYY-MM-DD HH:mm:ss') : '',
EndDt: item.EndDt ? this.$moment(item.EndDt ).format('YYYY-MM-DD HH:mm:ss') : ''
DeliveryDt: item.DeliveryDt ? $this.$moment(item.DeliveryDt).format('YYYY-MM-DD HH:mm:ss') : ' ',
EndDt: item.EndDt ? $this.$moment(item.EndDt ).format('YYYY-MM-DD HH:mm:ss') : ' '
}))
// 克隆一份tableData数据
this.cloneData= JSON.parse(JSON.stringify(this.AllTableData))
if(this.AllTableData.length > this.$refs.page.pageSize){
this.tableData = this.AllTableData.slice(0, this.$refs.page.pageSize)
$this.cloneData= JSON.parse(JSON.stringify($this.AllTableData))
if($this.AllTableData.length > $this.$refs.page.pageSize){
$this.tableData = $this.AllTableData.slice(0, this.$refs.page.pageSize)
}else{
this.tableData = this.AllTableData
$this.tableData = $this.AllTableData
}
this.totalCount = this.AllTableData.length
$this.totalCount = $this.AllTableData.length
// this.pageIndex = 1
this.totalPage = Math.ceil(this.AllTableData.length / this.$refs.page.pageSize)
this.pageFun(1)
$this.totalPage = Math.ceil($this.AllTableData.length / $this.$refs.page.pageSize)
$this.pageFun(1)
}else{
this.tableData = []
this.totalCount = 0
$this.tableData = []
$this.totalCount = 0
// this.pageIndex = 1
this.totalPage = 1
$this.totalPage = 1
}
}).catch(function(err){
console.log('err',err)
......@@ -215,8 +215,8 @@ export default {
return {
argKeyWord: this.formData.argKeyWord,
argWhere: this.formData.argWhere,
Stime: this.formData.dateValue ? this.$moment(this.formData.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : '',
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ''
Stime: this.formData.dateValue ? this.$moment(this.formData.dateValue[0]).format('YYYY-MM-DD HH:mm:ss') : ' ',
Etime: this.formData.dateValue ? this.$moment(this.formData.dateValue[1]).format('YYYY-MM-DD HH:mm:ss') : ' '
}
},
//关闭提示弹窗
......
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