Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-PDA

pages/checkplan/ErpLocationMoveNoInvoice/ErpLocationMoveNoInvoice.vue

@@ -100,7 +100,7 @@
 			<zb-table style="padding-bottom: 200upx;" ref="zbTable" :show-header="true" :columns="column" :stripe="true"
 				:fit="true" :highlight="true" :border="true" :data="BoxListInfo" @dele="del"></zb-table>
 			
-			<view class="tabbar_bottom">
+			<view class="tabbar_bottom bottom-margin">
 				<u-input v-if="false" v-model="opCode" />
 				<uni-datetime-picker style="align-items: center;" type="date" :clear-icon="false" v-model="commitDate"
 					@maskClick="maskClick" />
@@ -468,7 +468,7 @@
 				}
 				// console.log(this.barCodeArr1)
 				let a = uni.getStorageSync('userid')
-				await this.$MyRequest('/location/AnalyStockBarCode', {
+				await this.$MyRequest('/api/location/AnalyStockBarCode', {
 					MATERIALPACKINGNAME: this.MATERIALPACKINGNAME1,
 					erpFactory: this.ERPFACTORY,
 					erpLocation: this.ERPLOCATION,
@@ -569,7 +569,7 @@
 					opcode: this.opCode,
 					user: this.userId
 				}).then((res) => {
-					this.$MyRequest('/location/CommitMove1', {
+					this.$MyRequest('/api/location/CommitMove1', {
 						body: this.BoxListInfo,
 						user: this.userId,
 						time: this.commitDate,
@@ -621,6 +621,10 @@
 	switch {
 		color: #FFCC33;
 	}
+	
+	.bottom-margin {
+		margin-bottom: 80rpx;
+	}
 
 	/* 基础样式 */
 	.picker {

pages/material/features/ProduceReturnPage/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view style="margin: 10rpx;">
-		<u-navbar back-text="返回" title="退库入库" :background="background"></u-navbar>
+		<u-navbar back-text="返回" title="退料入库" :background="background"></u-navbar>
 		<u-form ref="testForm">
 			<!-- <u-row align="left" style="margin-left: 54rpx;margin-top: 20rpx">
 				<u-col style="display: contents;"><label>组织:</label> </u-col>