ZhongRui/ALDbanyunxiangmu.git

			@@ -26,8 +26,8 @@
			@keyup.enter.native="onBarcodeScan">
			</el-input>
			<el-button type="success" @click="confirmPicking">ç¡®è®¤æ£é</el-button>
			<el-button type="warning" @click="openSplitDialog">æå</el-button>
			<el-button type="info" @click="openRevertSplitDialog">æ¤éæå</el-button>
			<!-- <el-button type="warning" @click="openSplitDialog">æå</el-button>
			<el-button type="info" @click="openRevertSplitDialog">æ¤éæå</el-button> -->

			<el-button type="primary" @click="openBatchReturnDialog">ååº</el-button>
			<!-- <el-button type="danger" @click="handleDirectOutbound">ç´æ¥åºåº</el-button> -->
			@@ -291,6 +291,7 @@
			</div>
			</div>
			</div>
			<print-view ref="childs" @parentcall="parentcall"></print-view>
			</template>

			<script>
			@@ -298,12 +299,11 @@
			import { ref, defineComponent } from "vue";
			import { ElMessage } from 'element-plus'
			import { useRoute } from 'vue-router'
			import printView from "@/extension/outbound/extend/printView.vue"

			export default defineComponent({
			name: 'PickingConfirm',
			components: {

			},
			components: {printView},
			props: {
			orderNo: {
			type: String,
			@@ -844,7 +844,12 @@
			this.$message.success('æ£éç¡®è®¤æå');
			this.scanData.barcode = ''; // æ¸ç©ºç©ææ¡ç
			this.loadData();

			console.log(res.data.splitResults)
			if(res.data && res.data.splitResults.length>0){
			// è°ç¨åç»ä»¶æå°æ¹æ³
			this.$refs.childs.open(res.data.splitResults);
			//this.$refs.childs.printSplitLabel(res.data.splitResults);
			}
			// æååç»§ç»èç¦å°ç©ææ¡ç è¾å¥æ¡ï¼åå¤ä¸ä¸ä¸ªæ«ç
			this.$nextTick(() => {
			this.$refs.barcodeInput.focus();
			@@ -1068,12 +1073,15 @@
			if (res.status) {
			this.$message.success('æåæå');
			this.showSplitDialog = false;
			this.splitLoading = false;
			this.resetSplitForm();
			this.loadData();
			} else {
			this.splitLoading = false;
			this.$message.error(res.message \|\| 'æåå¤±è´¥');
			}
			} catch (error) {
			this.splitLoading = false;
			this.$message.error('æåå¤±è´¥');
			}
			},
			@@ -1121,12 +1129,15 @@
			if (res.status) {
			this.$message.success('æ¤éæåæå');
			this.showRevertSplitDialog = false;
			this.revertSplitLoading = false;
			this.revertSplitForm.originalBarcode = '';
			this.loadData();
			} else {
			this.revertSplitLoading = false;
			this.$message.error(res.message \|\| 'æ¤éæåå¤±è´¥');
			}
			} catch (error) {
			this.revertSplitLoading = false;
			this.$message.error('æ¤éæåå¤±è´¥');
			}
			},