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

pages/StockOut/features/OtherStockOutNoInvoice/OtherStockOutNoInvoice.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-form-item :border-bottom="false">
 				<p>扫描条码:</p>
@@ -45,7 +45,7 @@
 				<uni-td align="center">{{ item.LOCATIONNAME }}</uni-td>
 			</uni-tr>
 		</uni-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" />
@@ -93,7 +93,7 @@
 				DURABLENAMECode: "", //卷芯
 				focusBarCode: false, //焦点是否被选中
 				focusShipRequest: true, //默认焦点在单号
-				siteName: "",
+				siteName: "SDK",
 				userId: "",
 				commitDate: '',
 				opCode: '',
@@ -157,7 +157,7 @@
 						return false
 					}
 				}
-				this.$MyRequest('/NoInvoice/getQTCList', {
+				this.$MyRequest('/api/NoInvoice/getQTCList', {
 					MATERIALPACKINGNAME: this.MATERIALPACKINGNAME
 				}).then(res => {
 					if (res.data.success) {
@@ -215,7 +215,8 @@
 					opcode: this.opCode,
 					user: this.userId
 				}).then((res) => {
-					this.$MyRequest('/NoInvoice/QTCCommit', {
+					this.opCode = res.resultObj
+					this.$MyRequest('/api/NoInvoice/QTCCommit', {
 						boxList: this.BoxListInfo,
 						user: this.userId,
 						siteName: this.siteName,
@@ -227,6 +228,7 @@
 							this.bqts = 0
 							this.bqkcs = 0
 							this.resetValue();
+							this.opCode = "";
 						} else {
 							this.loading = false;
 						}
@@ -267,6 +269,9 @@
 	}
 </style>
 <style lang="scss">
+	.bottom-margin {
+		margin-bottom: 80rpx;
+	}
 	switch {
 		color: #FFCC33;
 	}

pages/StockOut/index.vue

@@ -36,15 +36,6 @@
 				},
 				//要展示的数组元素
 				elements: [
-					{
-						title: '无单据出库',
-						name: 'OtherStockOutNoInvoice/OtherStockOutNoInvoice',
-						en_name:'OtherStockOutNoInvoice',
-						color: 'cyan',
-						cuIcon: '',
-						label: '无单据出库',
-						id:'200001'
-					},
 					{
 						title: '备货出库',
 						name: 'ShipRequestReservation/index',
@@ -93,6 +84,15 @@
 						cuIcon: '',
 						label: '销售出货',
 						id:'200007'
+					},
+					{
+						title: '报废出库',
+						name: 'OtherStockOutNoInvoice/OtherStockOutNoInvoice',
+						en_name:'OtherStockOutNoInvoice',
+						color: 'cyan',
+						cuIcon: '',
+						label: '报废出库',
+						id:'200001'
 					}
 					// {
 					// 	title: '销售出库确认',