lilei %!s(int64=3) %!d(string=hai) anos
pai
achega
3b3d4426fa
Modificáronse 2 ficheiros con 39 adicións e 17 borrados
  1. 4 4
      pages/replenishmentManage/manualPrint.vue
  2. 35 13
      pages/stock/stockSearch.vue

+ 4 - 4
pages/replenishmentManage/manualPrint.vue

@@ -81,10 +81,6 @@
 				this.allChecked = val
 			},
 			printOnce(opt,tsc,blesdk,data){
-				if(this.isParinting){
-					return
-				}
-				this.isParinting = true
 				const _this = this
 				const dealer = this.$store.state.vuex_userData
 				let top = 10 // 距离顶部10点像素
@@ -147,6 +143,10 @@
 			startPrint(opt,tsc,blesdk){
 				const result =this.$refs.partList.getAllChecked()
 				if(result.length){
+					 if(this.isParinting){
+					 	return
+					 }
+					 this.isParinting = true
 					 this.printOnce(opt,tsc,blesdk,result[this.printIndex])
 				}else{
 					this.toashMsg("请选择产品!")

+ 35 - 13
pages/stock/stockSearch.vue

@@ -41,8 +41,11 @@
 						</view>
 					</view>
 				</view>
-				<view v-if="listData && listData.length == 0">
-					<u-empty :text="noDataText" mode="list" :img-width="200" :margin-top="30"></u-empty>
+				<view v-if="listData&&listData.length==0">
+					<u-empty v-if="status!='loading'" :src="`/static/${$config('themePath')}/def_no_data@3x.png`" icon-size="240" :text="noDataText" mode="list" :margin-top="50"></u-empty>
+				</view>
+				<view style="padding: 20upx;" v-if="totalNum>pageSize || status=='loading'">
+					<u-loadmore :status="status" />
 				</view>
 			</view>
 		</scroll-view>
@@ -57,9 +60,10 @@
 			return {
 				totalData: null,
 				totalNum: 0,
+				status: 'loading',
 				listData: [],
 				pageNo: 1,
-				pageSize: 6,
+				pageSize: 50,
 				params: {},
 				noDataText: '暂无数据',
 				theme: '',
@@ -78,20 +82,36 @@
 				if (pageNo) {
 					this.pageNo = pageNo
 				}
+				this.status = 'loading'
 				let params = Object.assign(this.params, { pageNo: this.pageNo, pageSize: this.pageSize })
 				stockList(params).then(res => {
 					this.getTotal(params)
-					if (res.status == 200) {
-						if(this.pageNo>1){
-							this.listData = this.listData.concat(res.data.list || [])
-						}else{
-							this.listData = res.data.list || []
+					if(res.status == 200){
+						let list = res.data.list
+						if (list && list.length){
+							// 分页 拼接数据
+							if (_this.pageNo != 1) {
+								_this.listData = _this.listData ? _this.listData.concat(list) : list
+							} else {
+								_this.listData = list
+							}
+							this.totalNum = res.data.count
+							if (_this.listData.length == res.data.count) {
+								_this.status = 'nomore'
+							} else {
+								_this.status = 'loadmore'
+							}
+						} else {
+							_this.listData = list || []
+							this.totalNum = 0
+							_this.status = 'nomore'
 						}
-						this.totalNum = res.data.count || 0
-					} else {
-						this.listData = []
-						this.totalNum = 0
-						this.noDataText = res.message
+						_this.noDataText = '暂无配件'
+					}else{
+						_this.status = 'loadmore'
+						_this.listData = []
+						_this.totalNum = 0
+						_this.noDataText = res.message ? res.message : '网络似乎出错了,请稍后再试'
 					}
 				})
 			},
@@ -110,6 +130,8 @@
 				if(this.listData.length < this.totalNum){
 					this.pageNo += 1
 					this.getList()
+				}else{
+					this.status = "nomore"
 				}
 			},
 			// 详情