lilei 3 роки тому
батько
коміт
b74b12abbf

+ 2 - 2
App.vue

@@ -1,8 +1,8 @@
 <script>
 <script>
 	export default {
 	export default {
 		globalData: {
 		globalData: {
-			baseUrl: 'http://192.168.16.103:9110/saas/clz/', // 本地
-			// baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
+			// baseUrl: 'http://192.168.16.103:9110/saas/clz/', // 本地
+			baseUrl: 'https://md.test.zyucgj.com/saas/clz/', // 预发布
 			// baseUrl: 'https://car.zyucgj.com/saas/clz/' // 生产
 			// baseUrl: 'https://car.zyucgj.com/saas/clz/' // 生产
 		},
 		},
 		onLaunch: function() {
 		onLaunch: function() {

+ 8 - 1
api/shelf.js

@@ -195,7 +195,14 @@ export const shelfGetTotalWaitQty = (params) => {
     method: 'post'
     method: 'post'
   })
   })
 }
 }
-
+// 临配订单待取数量
+export const shelfTempTotalWaitQty = (params) => {
+  return request({
+    url: `shelfTempBill/getQty`,
+	data: params,
+    method: 'post'
+  })
+}
 // 库存查询
 // 库存查询
 export const getShelfProductStockList = (params) => {
 export const getShelfProductStockList = (params) => {
   return request({
   return request({

+ 1 - 0
pages/digitalShelf/choosePartResult.vue

@@ -191,6 +191,7 @@
 		 			  takeGoods({sn:_this.shelfOrderSn}).then(res => {
 		 			  takeGoods({sn:_this.shelfOrderSn}).then(res => {
 						 if(res.status == 200){
 						 if(res.status == 200){
 							  uni.navigateBack()
 							  uni.navigateBack()
+							  uni.$emit("refreshOrder")
 						 }
 						 }
 						 uni.showToast({
 						 uni.showToast({
 							title: res.message,
 							title: res.message,

+ 1 - 0
pages/digitalShelf/orderDetail.vue

@@ -165,6 +165,7 @@
 		 			  takeGoods({sn:_this.shelfOrderSn}).then(res => {
 		 			  takeGoods({sn:_this.shelfOrderSn}).then(res => {
 						 if(res.status == 200){
 						 if(res.status == 200){
 							  uni.navigateBack()
 							  uni.navigateBack()
+							  uni.$emit("refreshOrder")
 						 }
 						 }
 						 uni.showToast({
 						 uni.showToast({
 							title: res.message,
 							title: res.message,

+ 0 - 1
pages/digitalShelf/orderList.vue

@@ -181,7 +181,6 @@
 			  }
 			  }
 			  this.status = "loading"
 			  this.status = "loading"
 			  getShelfOrderList(params).then(res => {
 			  getShelfOrderList(params).then(res => {
-				  console.log(res,'++++++++++')
 				if (res.code == 200 || res.status == 204 || res.status == 200) {
 				if (res.code == 200 || res.status == 204 || res.status == 200) {
 				  if(_this.pageNo>1){
 				  if(_this.pageNo>1){
 					  _this.list = _this.list.concat(res.data.list || [])
 					  _this.list = _this.list.concat(res.data.list || [])

+ 1 - 1
pages/digitalShelf/settlementManage/settlementAyDetail.vue

@@ -254,7 +254,7 @@
 					flex-grow: 1;
 					flex-grow: 1;
 				}
 				}
 				.orderNo{
 				.orderNo{
-					font-size: 28rpx;
+					font-size: 24rpx;
 				}
 				}
 			}
 			}
 		}
 		}

+ 8 - 4
pages/digitalShelf/tempOrderList/tempOrderList.vue

@@ -61,7 +61,7 @@
 
 
 <script>
 <script>
 	import carNo from '@/components/carNo.vue'
 	import carNo from '@/components/carNo.vue'
-	import { getShelfTempBillList, shelfGetTotalWaitQty } from '@/api/shelf.js'
+	import { getShelfTempBillList, shelfGetTotalWaitQty, shelfTempTotalWaitQty } from '@/api/shelf.js'
 	import moment from 'moment'
 	import moment from 'moment'
 	export default {
 	export default {
 		components: {carNo},
 		components: {carNo},
@@ -123,6 +123,8 @@
 				this.total = 0
 				this.total = 0
 				this.pageNo = 1
 				this.pageNo = 1
 				this.getRow()
 				this.getRow()
+				// 获取总条数
+				this.getWaitTotal()
 			},
 			},
 			// tabs通知swiper切换
 			// tabs通知swiper切换
 			tabsChange(index) {
 			tabsChange(index) {
@@ -192,9 +194,6 @@
 					  _this.list = res.data.list || []
 					  _this.list = res.data.list || []
 				  }
 				  }
 				  _this.total = res.data.count || 0
 				  _this.total = res.data.count || 0
-				  if(this.current == 0){
-					  _this.tabList[0].count = _this.total
-				  }
 				} else {
 				} else {
 				  _this.list = []
 				  _this.list = []
 				  _this.total = 0
 				  _this.total = 0
@@ -209,6 +208,11 @@
 					url: "/pages/digitalShelf/tempOrderList/orderDetail?orderSn="+item.tempSn
 					url: "/pages/digitalShelf/tempOrderList/orderDetail?orderSn="+item.tempSn
 				})
 				})
 			},
 			},
+			// 获取待取货数量
+			async getWaitTotal(){
+				 const ret = await shelfTempTotalWaitQty({billStateList:['WAIT_AUDIT','AUDIT_REJECT','WAIT_OUT_WAREHOUSE']}).then(res => res.data)
+				 this.tabList[1].count = ret || 0
+			}
 		}
 		}
 	}
 	}
 </script>
 </script>