修复部分bug

api/user.js

@@ -2844,7 +2844,7 @@ export function postIncomingIncomingPackage(data, loadingObj = {}, canCancel = f
 }
 
 /**
- * 入库扫描
+ * 入库扫描列表
  * @param {Object} data
  */
 export function postIncomingBillladingBillladingList(data, loadingObj = {}, canCancel = false) {

config/host.js

@@ -12,7 +12,7 @@ const devhost = 'http://test.api.huo5you.com/'
 // xiaohei
 // const devhost = 'http://192.168.3.18:13000/'
 // tjj
-// const devhost = 'http://192.168.3.14:13000/'
+// const devhost = 'http://192.168.3.14:13000/   '
 // cyz
 // const devhost = 'http://192.168.6.169:9777/'
 // const devhost = 'http://192.168.6.141:8777/'
@@ -22,6 +22,8 @@ const devhost = 'http://test.api.huo5you.com/'
 // const devhost = 'https://h5uapi.huitongys.com/'
 // cg
 // const devhost = 'http://192.168.10.200:13000/'
+
+// const devhost = 'http://192.168.5.10:13000/'
 /**
  * 正式域名
  * */

pagesHome/pages/PickUpLotList/PickUpLotList.vue

@@ -37,11 +37,11 @@
 
 						<view class="header_row">
 							<view>
-								订单在托数：{{details.detauser.orderlNum || '暂无数据'}}
+								订单在托数：{{details.detauser.orderlNum }}
 							</view>
 
 							<view>
-								订单总数：{{details.detauser.orderTotalNum || '暂无数据'}}
+								订单总数：{{details.detauser.orderTotalNum }}
 							</view>
 						</view>
 
@@ -153,7 +153,7 @@
 	// 组件配置
 	const option = reactive({
 		// 标题
-		title: '提货批次',
+		title: '码板打托',
 		// 下拉刷新回调函数
 		async pullDownRefreshInitPage() {
 			// 重置被选中数据
@@ -227,7 +227,7 @@
 		details.pageInfo = JSON.parse(op.pageInfo)
 
 		// #ifdef APP
-		utils.ttsspke('请扫描或输入托盘码')
+		utils.ttsspke('请扫描或输入包条码')
 		// #endif
 	})
 
@@ -262,12 +262,18 @@
 
 			const { code, data } = res
 
+			console.log('data :>> ', data);
+
 			console.log('111 :>> ', 111);
 			if (code !== 200) return
 
 			if (res.data.isHasData == 1) {
 				// details.datelist = res.data.data.list
-				details.detauser = res.data.data
+				details.detauser = data.data
+				details.pageInfo.trayName = data.data.trayName
+				details.pageInfo.pageName = data.data.trayTypeName
+
+				console.log('details.pageInfo :>> ', details.pageInfo);
 
 				for (let item of details.detauser.packageList) {
 					item.scanNum = item.scanNum || 0

pagesHome/pages/SelfPScanList/SelfPScanList.vue

@@ -202,6 +202,8 @@
 	/* 	onHide(() => {
 			uni.$off('scancodedate')
 		}) */
+
+	/** 显示手动输入包条码弹窗 */
 	function showsdqs() {
 		tiplists.value.setdetails({
 			isshow: true,

pagesHome/pages/SelfPickupDetails/SelfPickupDetails.vue

@@ -59,6 +59,7 @@
 									<view>
 										<view @click.stop="goorderdetail(item)">订单号：{{item.orderCode}}</view>
 										<view class="mt10">包条码：{{item.orderPackageCode}}</view>
+										<!-- <view class="mt10">品类：{{item.pinming}}</view> -->
 									</view>
 								</view>
 
@@ -223,7 +224,7 @@
 			uni.$off('scancodedate')
 		}) */
 	function showsdqs() {
-		if (details.planNum <= details.signedNum) return utils.handleToast('提货计划已完成')
+		if (details.planNum <= details.signedNum) return
 
 		tiplists.value.setdetails({
 			isshow: true,
@@ -306,9 +307,8 @@
 	async function sacn() {
 		try {
 			// 标签页为3时, 不支持扫描
-			if (details.orderCode === 3) return
+			if (Number(details.orderType) === 3) return
 
-			if (details.planNum <= details.signedNum) return utils.handleToast('提货计划已完成')
 
 			let content = ''
 			let haveData = false
@@ -333,6 +333,7 @@
 			if (!haveData) return utils.handleToast('码值错误, 不在本计划内')
 			if (content) return utils.handleToast(content)
 
+			if (details.planNum <= details.signedNum) return
 			let data = {
 				id: details.billLadingId,
 				coding: details.scancode,

pagesHome/pages/VehicleArrivalDetails/VehicleArrivalDetails.vue

@@ -494,7 +494,7 @@
 						return
 					}
 
-					utils.handleToast(`卸车${_total}件`)
+					utils.handleToast(`${_total}件`)
 					// #endif
 				}
 			}

pagesHome/pages/codePlateBracket/codePlateBracket.vue

@@ -254,7 +254,7 @@
 			uni.navigateTo({
 				url: '/pagesHome/pages/billsList/billsList?trayCode='
 					+ res.data.data.trayCode + '&trayType='
-					+ res.data.data.trayType
+					+ res.data.data.trayType + '&pageName=' + item.trayTypeName
 			})
 		}
 	}
@@ -284,7 +284,7 @@
 		uni.navigateTo({
 			url: '/pagesHome/pages/billsList/billsList?trayCode='
 				+ item.trayCode + '&trayType='
-				+ item.trayType
+				+ item.trayType + '&pageName=' + item.trayTypeName
 		})
 	}
 	function showCalendar() {

pagesHome/pages/onLoadByScan/onLoadByScan.vue

@@ -234,13 +234,13 @@
 	const scandata = async () => {
 		const _code = details.scancode
 
-		const _submitData = {
+		const _submitData : any = {
 			orderPackageCode: _code,
 			billladingId: details.pageInfo.id,
 			incomingType: "2",
 		}
 
-		if (details.pageInfo.tranNumber) _submitData.tranNumber = details.pageInfo.tranNumber
+		if (details.pageInfo.tranNumber) _submitData.customerTrain = details.pageInfo.tranNumber
 
 		const res = await postIncomingIncomingPackage(_submitData)
 
@@ -295,12 +295,14 @@
 			icon: 'none'
 		})
 		try {
-			const _submitData = {
+			const _submitData : any = {
 				...details.page,
 				startDateStr: details.date[0],
 				endDateStr: details.date[1]
 			}
 
+			if (details.pageInfo.tranNumber) _submitData.customerTrain = details.pageInfo.tranNumber
+
 			const res = await postIncomingBillladingBillladingList(_submitData)
 
 			const { code, data } = res