gjy vor 3 Jahren
Ursprung
Commit
3e88d6b1b6

+ 12 - 4
pages/erpbusiness/acquisitionInspection/acquisitionInspection.vue

@@ -7,10 +7,10 @@
 					<view>{{warehouseName}}</view>
 					<u-icon name="arrow-down" color=""></u-icon>
 				</view>
-				<view class="right">
+				<!-- <view class="right">
 					<u-icon name="checkmark-circle-fill" color="#22C572"></u-icon>
 					<view class="default">默认</view>
-				</view>
+				</view> -->
 			</view>
 			<u-select v-model="isShowWarehouse" :default-value='[0]' :list="warehouseList" @confirm="confirmWarehouse">
 			</u-select>
@@ -58,6 +58,9 @@
 				</view>
 			</view>
 		</view>
+		<view v-show="isContent">
+			<uni-load-more :status="loadStatus"></uni-load-more>
+		</view>
 	</view>
 </template>
 
@@ -69,6 +72,8 @@
 				warehouseName: '',
 				isShowWarehouse: false,
 				warehouseList: [],
+				isContent:false,
+				loadStatus:'noMore',
 				dataList: []
 			}
 		},
@@ -107,7 +112,7 @@
 		methods: {
 			loadData() {
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelf', {
-					compId: this.compId
+					compId: ''
 				}).then(res => {
 					console.log("warehouseBaseInfo", res)
 					let _resData = res.data.data
@@ -125,7 +130,7 @@
 			//获取列表
 			getList() {
 				this.$api.doRequest('get', '/weighingManagement/selectWeighingManagement', {
-					compId: this.compId,
+					compId: '',
 					currentPage: 1,
 					pageSize: 10,
 					searchKeyWord: this.inputKeyword,
@@ -134,6 +139,9 @@
 				}).then(res => {
 					this.dataList = res.data.data.records
 					console.log(res.data.data.records)
+					if(res.data.data.records.length==0){
+						this.isContent=true
+					}
 					console.log("--------------------------------")
 					console.log("this.dataList",this.dataList)
 				})

+ 12 - 4
pages/erpbusiness/acquisitionInspection/warehouseWeighing.vue

@@ -7,10 +7,10 @@
 					<view>{{warehouseName}}</view>
 					<u-icon name="arrow-down" color=""></u-icon>
 				</view>
-				<view class="right">
+				<!-- <view class="right">
 					<u-icon name="checkmark-circle-fill" color="#22C572"></u-icon>
 					<view class="default">默认</view>
-				</view>
+				</view> -->
 			</view>
 			<u-select v-model="isShowWarehouse" :list="warehouseList" @confirm="confirmWarehouse"></u-select>
 		</view>
@@ -58,6 +58,9 @@
 				</view>
 			</view>
 		</view>
+		<view v-show="isContent">
+			<uni-load-more :status="loadStatus"></uni-load-more>
+		</view>
 		<u-toast ref="uToast" />
 	</view>
 </template>
@@ -71,6 +74,8 @@
 				warehouseName: '',
 				isShowWarehouse: false,
 				warehouseList: [],
+				isContent:false,
+				loadStatus:'noMore',
 				dataList: []
 			}
 		},
@@ -109,7 +114,7 @@
 		methods: {
 			loadData() {
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouseSelf', {
-					compId: this.compId
+					compId: ''
 				}).then(res => {
 					console.log("warehouseBaseInfo", res)
 					let _resData = res.data.data
@@ -127,7 +132,7 @@
 			//获取列表
 			getList() {
 				this.$api.doRequest('get', '/weighingManagement/selectWeighingManagement', {
-					compId: this.compId,
+					compId: '',
 					currentPage: 1,
 					pageSize: 10,
 					searchKeyWord: this.inputKeyword,
@@ -136,6 +141,9 @@
 				}).then(res => {
 					this.dataList = res.data.data.records
 					console.log(res.data.data.records)
+					if(res.data.data.records.length==0){
+						this.isContent=true
+					}
 					// console.log("--------------------------------")
 					// console.log("this.dataList",this.dataList)
 				})