Skip to content

T
tianjin
Commit 2e215bdd authored by 徐来柯's avatar 徐来柯
Browse files
Options

update

parent d1ca6979
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 389 deletions
src/views/education/MaterialDelivery.vue
View file @ 2e215bdd
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="page_bottom" > <!-- <div class="page_bottom" >
<div class="bottom_text"> <div class="bottom_text">
<span>共{{totalCount}}条记录 当前第{{pageIndex}}页 共{{totalPage}}页 每页{{pageSize}}条记录</span> <span>共{{totalCount}}条记录 当前第{{pageIndex}}页 共{{totalPage}}页 每页{{pageSize}}条记录</span>
</div> </div>
...@@ -92,7 +92,8 @@ ...@@ -92,7 +92,8 @@
<span>页</span> <span>页</span>
<div @click="jump" class="bottom_jump">跳转</div> <div @click="jump" class="bottom_jump">跳转</div>
</div> </div>
</div> </div> -->
<Pagination @pageFun="pageFun" />
</div> </div>
<store-dialog :titleText="'物料出库单'" :type="'out'" v-if="popShow" @closeDialog="closeDialog" @conserve="conserve" /> <store-dialog :titleText="'物料出库单'" :type="'out'" v-if="popShow" @closeDialog="closeDialog" @conserve="conserve" />
...@@ -104,9 +105,10 @@ ...@@ -104,9 +105,10 @@
import searchForm from './component/searchForm' import searchForm from './component/searchForm'
import storeDialog from './component/storeDialog' import storeDialog from './component/storeDialog'
import deletePop from './component/deletePop' import deletePop from './component/deletePop'
import Pagination from './component/Pagination'
export default { export default {
components: { searchForm, storeDialog, deletePop }, components: { searchForm, storeDialog, deletePop, Pagination },
data () { data () {
return { return {
tableData: [], tableData: [],
...@@ -116,12 +118,6 @@ export default { ...@@ -116,12 +118,6 @@ export default {
deletetext: '', deletetext: '',
deleteShow: false, deleteShow: false,
typeV: '', typeV: '',
num: 1,
// 首字母已改为小写
totalCount: 1,
pageIndex: 1,
totalPage: 1,
pageSize: 50,
} }
}, },
methods: { methods: {
...@@ -135,57 +131,6 @@ export default { ...@@ -135,57 +131,6 @@ export default {
}else{ }else{
this.tableData = this.AllTableData.slice((num-1)*this.pageSize + 1,this.pageSize*num) this.tableData = this.AllTableData.slice((num-1)*this.pageSize + 1,this.pageSize*num)
} }
},
//跳转
jump(){
if(this.pageIndex != this.num){
if(this.num>this.totalPage || this.num < 1){
this.typeV = '3'
this.deleteShow = true
}else{
this.pageIndex = this.num
this.pageFun(this.pageIndex)
}
}
},
// 首页
first () {
this.pageIndex = 1
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('首页')
},
//末页
end(){
this.pageIndex = this.totalPage
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('尾页')
},
//下一页
next(){
if(this.pageIndex<this.totalPage){
this.pageIndex = this.pageIndex + 1
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('下一页')
}
},
//上一页
last(){
if(this.pageIndex>1){
this.pageIndex = this.pageIndex - 1
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('上一页')
}
},
handleBlur () {
if (this.num > this.totalPage) {
this.num = this.totalPage
} else if(Number(this.num <= 0)) {
this.num = 1
}
}, },
delData () { delData () {
if (this.checkList.length === 0) { if (this.checkList.length === 0) {
......
src/views/education/ProductDelivery.vue
View file @ 2e215bdd
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="page_bottom" > <!-- <div class="page_bottom" >
<div class="bottom_text"> <div class="bottom_text">
<span>共{{totalCount}}条记录 当前第{{pageIndex}}页 共{{totalPage}}页 每页{{pageSize}}条记录</span> <span>共{{totalCount}}条记录 当前第{{pageIndex}}页 共{{totalPage}}页 每页{{pageSize}}条记录</span>
</div> </div>
...@@ -92,7 +92,8 @@ ...@@ -92,7 +92,8 @@
<span>页</span> <span>页</span>
<div @click="jump" class="bottom_jump">跳转</div> <div @click="jump" class="bottom_jump">跳转</div>
</div> </div>
</div> </div> -->
<Pagination @pageFun="pageFun" />
</div> </div>
<store-dialog :titleText="'产品出库单'" :type="'out'" v-if="popShow" @closeDialog="closeDialog" @conserve="conserve" /> <store-dialog :titleText="'产品出库单'" :type="'out'" v-if="popShow" @closeDialog="closeDialog" @conserve="conserve" />
...@@ -104,9 +105,10 @@ ...@@ -104,9 +105,10 @@
import searchForm from './component/searchForm' import searchForm from './component/searchForm'
import storeDialog from './component/storeDialog' import storeDialog from './component/storeDialog'
import deletePop from './component/deletePop' import deletePop from './component/deletePop'
import Pagination from './component/Pagination'
export default { export default {
components: { searchForm, storeDialog, deletePop }, components: { searchForm, storeDialog, deletePop, Pagination },
data () { data () {
return { return {
tableData: [], tableData: [],
...@@ -116,12 +118,6 @@ export default { ...@@ -116,12 +118,6 @@ export default {
deletetext: '', deletetext: '',
deleteShow: false, deleteShow: false,
typeV: '', typeV: '',
num: 1,
// 首字母已改为小写
totalCount: 1,
pageIndex: 1,
totalPage: 1,
pageSize: 50,
} }
}, },
methods: { methods: {
...@@ -135,57 +131,6 @@ export default { ...@@ -135,57 +131,6 @@ export default {
}else{ }else{
this.tableData = this.AllTableData.slice((num-1)*this.pageSize + 1,this.pageSize*num) this.tableData = this.AllTableData.slice((num-1)*this.pageSize + 1,this.pageSize*num)
} }
},
//跳转
jump(){
if(this.pageIndex != this.num){
if(this.num>this.totalPage || this.num < 1){
this.typeV = '3'
this.deleteShow = true
}else{
this.pageIndex = this.num
this.pageFun(this.pageIndex)
}
}
},
// 首页
first () {
this.pageIndex = 1
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('首页')
},
//末页
end(){
this.pageIndex = this.totalPage
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('尾页')
},
//下一页
next(){
if(this.pageIndex<this.totalPage){
this.pageIndex = this.pageIndex + 1
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('下一页')
}
},
//上一页
last(){
if(this.pageIndex>1){
this.pageIndex = this.pageIndex - 1
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('上一页')
}
},
handleBlur () {
if (this.num > this.totalPage) {
this.num = this.totalPage
} else if(Number(this.num <= 0)) {
this.num = 1
}
}, },
delData () { delData () {
if (this.checkList.length === 0) { if (this.checkList.length === 0) {
......
src/views/education/ProductHouseshow.vue
View file @ 2e215bdd
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="page_bottom" > <!-- <div class="page_bottom" >
<div class="bottom_text"> <div class="bottom_text">
<span>共{{totalCount}}条记录 当前第{{pageIndex}}页 共{{totalPage}}页 每页{{pageSize}}条记录</span> <span>共{{totalCount}}条记录 当前第{{pageIndex}}页 共{{totalPage}}页 每页{{pageSize}}条记录</span>
</div> </div>
...@@ -80,7 +80,8 @@ ...@@ -80,7 +80,8 @@
<span>页</span> <span>页</span>
<div @click="jump" class="bottom_jump">跳转</div> <div @click="jump" class="bottom_jump">跳转</div>
</div> </div>
</div> </div> -->
<Pagination @pageFun="pageFun" />
</div> </div>
<delete-pop ref="delete" :deletetext="deletetext" :type="typeV" v-if="deleteShow"></delete-pop> <delete-pop ref="delete" :deletetext="deletetext" :type="typeV" v-if="deleteShow"></delete-pop>
...@@ -90,9 +91,10 @@ ...@@ -90,9 +91,10 @@
<script> <script>
import searchForm from './component/searchForm' import searchForm from './component/searchForm'
import deletePop from './component/deletePop' import deletePop from './component/deletePop'
import Pagination from './component/Pagination'
export default { export default {
components: { searchForm, deletePop }, components: { searchForm, deletePop, Pagination },
data () { data () {
return { return {
tableData: [], tableData: [],
...@@ -101,12 +103,6 @@ export default { ...@@ -101,12 +103,6 @@ export default {
deletetext: '', deletetext: '',
deleteShow: false, deleteShow: false,
typeV: '', typeV: '',
num: 1,
// 首字母已改为小写
totalCount: 1,
pageIndex: 1,
totalPage: 1,
pageSize: 50,
} }
}, },
methods: { methods: {
...@@ -120,57 +116,6 @@ export default { ...@@ -120,57 +116,6 @@ export default {
}else{ }else{
this.tableData = this.AllTableData.slice((num-1)*this.pageSize + 1,this.pageSize*num) this.tableData = this.AllTableData.slice((num-1)*this.pageSize + 1,this.pageSize*num)
} }
},
//跳转
jump(){
if(this.pageIndex != this.num){
if(this.num>this.totalPage || this.num < 1){
this.typeV = '3'
this.deleteShow = true
}else{
this.pageIndex = this.num
this.pageFun(this.pageIndex)
}
}
},
// 首页
first () {
this.pageIndex = 1
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('首页')
},
//末页
end(){
this.pageIndex = this.totalPage
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('尾页')
},
//下一页
next(){
if(this.pageIndex<this.totalPage){
this.pageIndex = this.pageIndex + 1
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('下一页')
}
},
//上一页
last(){
if(this.pageIndex>1){
this.pageIndex = this.pageIndex - 1
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('上一页')
}
},
handleBlur () {
if (this.num > this.totalPage) {
this.num = this.totalPage
} else if(Number(this.num <= 0)) {
this.num = 1
}
} }
} }
} }
......
src/views/education/ProductStorage.vue
View file @ 2e215bdd
...@@ -77,22 +77,7 @@ ...@@ -77,22 +77,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="page_bottom" > <Pagination @pageFun="pageFun" />
<div class="bottom_text">
<span>共{{totalCount}}条记录 当前第{{pageIndex}}页 共{{totalPage}}页 每页{{pageSize}}条记录</span>
</div>
<div class="bottom_btns">
<div class="bottom_firest" @click="first">首页</div>
<div ref="last" :class="num <= 1 ? 'bottom_disabled' : 'bottom_next'" @click="last" >上一页</div>
<div ref="next" :class="num === totalPage || num <= 0 ? 'bottom_disabled' : 'bottom_next'" @click="next" >下一页</div>
<div class="bottom_end" @click="end" > 末页</div>
<span>第</span>
<input v-model="num" class="text" @input="handleBlur" type="text"/>
<span>页</span>
<div @click="jump" class="bottom_jump">跳转</div>
</div>
</div>
</div> </div>
<store-dialog :titleText="'产品入库单'" v-if="popShow" @closeDialog="closeDialog" @conserve="conserve" /> <store-dialog :titleText="'产品入库单'" v-if="popShow" @closeDialog="closeDialog" @conserve="conserve" />
...@@ -104,9 +89,10 @@ ...@@ -104,9 +89,10 @@
import searchForm from './component/searchForm' import searchForm from './component/searchForm'
import storeDialog from './component/storeDialog' import storeDialog from './component/storeDialog'
import deletePop from './component/deletePop' import deletePop from './component/deletePop'
import Pagination from './component/Pagination.vue'
export default { export default {
components: { searchForm, storeDialog, deletePop }, components: { searchForm, storeDialog, deletePop, Pagination },
data () { data () {
return { return {
tableData: [], tableData: [],
...@@ -116,12 +102,6 @@ export default { ...@@ -116,12 +102,6 @@ export default {
deletetext: '', deletetext: '',
deleteShow: false, deleteShow: false,
typeV: '', typeV: '',
num: 1,
// 首字母已改为小写
totalCount: 1,
pageIndex: 1,
totalPage: 1,
pageSize: 50,
} }
}, },
methods: { methods: {
...@@ -135,57 +115,6 @@ export default { ...@@ -135,57 +115,6 @@ export default {
}else{ }else{
this.tableData = this.AllTableData.slice((num-1)*this.pageSize + 1,this.pageSize*num) this.tableData = this.AllTableData.slice((num-1)*this.pageSize + 1,this.pageSize*num)
} }
},
//跳转
jump(){
if(this.pageIndex != this.num){
if(this.num>this.totalPage || this.num < 1){
this.typeV = '3'
this.deleteShow = true
}else{
this.pageIndex = this.num
this.pageFun(this.pageIndex)
}
}
},
// 首页
first () {
this.pageIndex = 1
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('首页')
},
//末页
end(){
this.pageIndex = this.totalPage
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('尾页')
},
//下一页
next(){
if(this.pageIndex<this.totalPage){
this.pageIndex = this.pageIndex + 1
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('下一页')
}
},
//上一页
last(){
if(this.pageIndex>1){
this.pageIndex = this.pageIndex - 1
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('上一页')
}
},
handleBlur () {
if (this.num > this.totalPage) {
this.num = this.totalPage
} else if(Number(this.num <= 0)) {
this.num = 1
}
}, },
delData () { delData () {
if (this.checkList.length === 0) { if (this.checkList.length === 0) {
......
src/views/education/component/relateDialog.vue
View file @ 2e215bdd
...@@ -93,23 +93,7 @@ ...@@ -93,23 +93,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 第三部分 分页 --> <!-- 第三部分 分页 -->
<div class="page_bottom" > <Pagination @pageFun="pageFun" />
<div class="bottom_text">
<span>共{{totalCount}}条记录 当前第{{pageIndex}}页 共{{totalPage}}页 每页{{pageSize}}条记录</span>
</div>
<div class="bottom_btns">
<div class="bottom_firest" @click="first">首页</div>
<div ref="last" :class="num <= 1 ? 'bottom_disabled' : 'bottom_next'" @click="last" >上一页</div>
<div ref="next" :class="num === totalPage || num <= 0 ? 'bottom_disabled' : 'bottom_next'" @click="next" >下一页</div>
<div class="bottom_end" @click="end" > 末页</div>
<span>第</span>
<input v-model="num" @input="handleBlur" class="text" type="text"/>
<span>页</span>
<div @click="jump" class="bottom_jump">跳转</div>
</div>
</div>
</div> </div>
<div class="btn"> <div class="btn">
<div @click="close()" class="cancle">取 消</div> <div @click="close()" class="cancle">取 消</div>
...@@ -121,18 +105,16 @@ ...@@ -121,18 +105,16 @@
</template> </template>
<script> <script>
import Pagination from './Pagination'
export default { export default {
components: { Pagination },
data() { data() {
return { return {
equipValue: '', equipValue: '',
equipList: [], equipList: [],
innerTableData: [], innerTableData: [],
num: 1, num: 1,
// 首字母已改为小写
totalCount: 1,
pageIndex: 1,
totalPage: 1,
pageSize: 50,
} }
}, },
directives: { directives: {
...@@ -166,14 +148,6 @@ export default { ...@@ -166,14 +148,6 @@ export default {
// return v.toString(16); // return v.toString(16);
// }); // });
// }, // },
handleBlur () {
if (this.num > this.totalPage) {
this.num = this.totalPage
} else if(Number(this.num <= 0)) {
this.num = 1
}
},
// 分页方法 // 分页方法
pageFun(num){ pageFun(num){
if(num == 1){ if(num == 1){
...@@ -182,50 +156,6 @@ export default { ...@@ -182,50 +156,6 @@ export default {
this.innerTableData = this.innerTableData.slice((num-1)*this.pageSize + 1,this.pageSize*num) this.innerTableData = this.innerTableData.slice((num-1)*this.pageSize + 1,this.pageSize*num)
} }
}, },
//跳转
jump(){
if(this.pageIndex != this.num){
if(this.num>this.totalPage || this.num < 1){
this.typeV = '3'
this.deleteShow = true
}else{
this.pageIndex = this.num
this.pageFun(this.pageIndex)
}
}
},
// 首页
first () {
this.pageIndex = 1
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('首页')
},
//末页
end(){
this.pageIndex = this.totalPage
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('尾页')
},
//下一页
next(){
if(this.pageIndex<this.totalPage){
this.pageIndex = this.pageIndex + 1
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('下一页')
}
},
//上一页
last(){
if(this.pageIndex>1){
this.pageIndex = this.pageIndex - 1
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('上一页')
}
},
close(){ close(){
this.count = '' this.count = ''
this.value = '' this.value = ''
......
src/views/education/materialinventory.vue
View file @ 2e215bdd
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="page_bottom" > <!-- <div class="page_bottom" >
<div class="bottom_text"> <div class="bottom_text">
<span>共{{totalCount}}条记录 当前第{{pageIndex}}页 共{{totalPage}}页 每页{{pageSize}}条记录</span> <span>共{{totalCount}}条记录 当前第{{pageIndex}}页 共{{totalPage}}页 每页{{pageSize}}条记录</span>
</div> </div>
...@@ -80,7 +80,8 @@ ...@@ -80,7 +80,8 @@
<span>页</span> <span>页</span>
<div @click="jump" class="bottom_jump">跳转</div> <div @click="jump" class="bottom_jump">跳转</div>
</div> </div>
</div> </div> -->
<Pagination @pageFun="pageFun" />
</div> </div>
<delete-pop ref="delete" :deletetext="deletetext" :type="typeV" v-if="deleteShow"></delete-pop> <delete-pop ref="delete" :deletetext="deletetext" :type="typeV" v-if="deleteShow"></delete-pop>
...@@ -90,9 +91,10 @@ ...@@ -90,9 +91,10 @@
<script> <script>
import searchForm from './component/searchForm' import searchForm from './component/searchForm'
import deletePop from './component/deletePop' import deletePop from './component/deletePop'
import Pagination from './component/Pagination'
export default { export default {
components: { searchForm, deletePop }, components: { searchForm, deletePop, Pagination },
data () { data () {
return { return {
tableData: [], tableData: [],
...@@ -101,12 +103,6 @@ export default { ...@@ -101,12 +103,6 @@ export default {
deletetext: '', deletetext: '',
deleteShow: false, deleteShow: false,
typeV: '', typeV: '',
num: 1,
// 首字母已改为小写
totalCount: 1,
pageIndex: 1,
totalPage: 1,
pageSize: 50,
} }
}, },
methods: { methods: {
...@@ -121,57 +117,6 @@ export default { ...@@ -121,57 +117,6 @@ export default {
this.tableData = this.AllTableData.slice((num-1)*this.pageSize + 1,this.pageSize*num) this.tableData = this.AllTableData.slice((num-1)*this.pageSize + 1,this.pageSize*num)
} }
}, },
//跳转
jump(){
if(this.pageIndex != this.num){
if(this.num>this.totalPage || this.num < 1){
this.typeV = '3'
this.deleteShow = true
}else{
this.pageIndex = this.num
this.pageFun(this.pageIndex)
}
}
},
// 首页
first () {
this.pageIndex = 1
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('首页')
},
//末页
end(){
this.pageIndex = this.totalPage
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('尾页')
},
//下一页
next(){
if(this.pageIndex<this.totalPage){
this.pageIndex = this.pageIndex + 1
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('下一页')
}
},
//上一页
last(){
if(this.pageIndex>1){
this.pageIndex = this.pageIndex - 1
this.num = this.pageIndex
this.pageFun(this.pageIndex)
console.log('上一页')
}
},
handleBlur () {
if (this.num > this.totalPage) {
this.num = this.totalPage
} else if(Number(this.num <= 0)) {
this.num = 1
}
}
} }
} }
</script> </script>
\ No newline at end of file
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