fix: 暂存

pages/instock/components/printerListScan.vue

@@ -1,119 +0,0 @@
-<template>
-    <uni-popup v-model="printerList!.visible">
-        {{printerList}}
-        <uni-popup-dialog ref="inputClose" mode="input" title="输入内容" value="对话框预置提示内容!" placeholder="请输入内容" @confirm="dialogInputConfirm">
-            <!-- <template #default>
-                <text class="title">
-                    {{ printerList.title }}
-                    <text class="ml-2">{{ printerList?.postData?.order_no }}</text>
-                </text>
-            </template> -->
-            <!-- <view v-if="printerList">
-                <uni-data-checkbox multiple v-model="downloadFile" :disabled="true" :localdata=" [{
-                    text: '下载文件',
-                    value: 1
-                }]">></uni-data-checkbox>
-
-                <view><el-checkbox label="下载文件" v-model="downloadFile" :disabled="true"></el-checkbox></view>
-                <view class="ml-4">
-                            <view>
-                        <el-checkbox label="发送到标签打印机打印" v-model="sendToPeinter" @change="sendToPeinterFun"></el-checkbox>
-                    </view>
-                    <el-radio-group v-model="printer_code">
-                        <el-radio v-for="(item, i) in printerList.printers as any" :key="i" :label="item.value">{{ item.name }}</el-radio>
-                    </el-radio-group>
-                </view>
-            </view> -->
-        </uni-popup-dialog>
-
-        <!-- <template #footer>
-            <div>
-                <el-button @click="printerList.visible = false">{{ t('Cancel') }}</el-button>
-                <el-button :loading="submitLoading" @click="toPrint()" type="primary" v-blur>
-                    {{ '打印' }}
-                </el-button>
-            </div>
-        </template> -->
-    </uni-popup>
-</template>
-<script setup lang="ts">
-import { inject, ref } from 'vue';
-import { printWaybillLabelURL } from '../../../utils/api';
-const printerList = inject('printerList') as any;
-const printer_code = ref('');
-const submitLoading = ref(false);
-const downloadFile = ref(true);
-const sendToPeinter = ref(true);
-const sendToPeinterFun = () => {
-    if (!sendToPeinter.value) {
-        printer_code.value = '';
-    } else {
-        printer_code.value = Object.keys(printerList.value.printers)[0];
-    }
-};
-const dialogInputConfirm = () => {
-    printerList.value && (printer_code.value = Object.keys(printerList.value.printers)[0]);
-};
-const openPrinterSelect = () => {
-    printerList.value && (printer_code.value = Object.keys(printerList.value.printers)[0]);
-};
-const toPrint = async () => {
-    const { batoken, postData, resetForm } = printerList.value;
-    /*
-    const loading = ElLoading.service({
-        lock: true,
-        text: 'Loading',
-        background: 'rgba(0, 0, 0, 0.7)',
-    })
-    */
-    submitLoading.value = true;
-    uni.request({
-        url: printWaybillLabelURL,
-        method: 'POST',
-        header: {
-            batoken: batoken
-        },
-        data: {
-            ...postData,
-            printer_code: printer_code.value
-        },
-        success: (res) => {
-            console.log(res);
-        }
-    });
-    /*
-    await postPrint({
-        ...postData,
-        printer_code: printer_code.value
-    })
-        .then((res: any) => {
-            //loading.close()
-            const list = res.data?.label_path || res.data?.labels || (res.data?.express_label ? [res.data?.express_label] : []);
-            if (list.length === 0) {
-                // ElMessage.error('没有可打印的文件');
-                return;
-            }
-
-            list.map((url: string) => {
-                let path = fullUrl(url);
-                window.open(path, '_blank');
-            });
-            submitLoading.value = false;
-            printerList.value.visible = false;
-            resetForm();
-        })
-        .catch((error: any) => {
-            console.log('error--', error);
-            //loading.close()
-            submitLoading.value = false;
-        });
-        */
-};
-</script>
-<script lang="ts">
-import { defineComponent } from 'vue'
-export default defineComponent({
-    name: 'printer-list-scan',
-})
-</script>
-<style scoped lang="scss"></style>

pages/instock/index.vue

@@ -4,54 +4,54 @@
 			<!-- 基础表单校验 -->
 			<uni-forms ref="valiForm" label-align="right" :rules="rules" :modelValue="valiFormData">
 				<uni-forms-item label="单号" :required="valiFormData.search_order_choice !== 2" name="orderNum">
-					<uni-easyinput v-model="valiFormData.orderNum" placeholder="请输入单号" suffixIcon="scan" :focus="focusType" @iconClick="scan" />
+					<uni-easyinput v-model="valiFormData.orderNum" placeholder="请输入单号" suffixIcon="scan"
+						:focus="focusType" @iconClick="scan" />
 				</uni-forms-item>
 				<uni-forms-item v-if="valiFormData.search_order_choice === 2" label="批次号" name="batch_number">
-					<uni-data-select v-model="valiFormData.batch_number" :localdata="batchOptions" placeholder="请选择批次号"></uni-data-select>
+					<uni-data-select v-model="valiFormData.batch_number" :localdata="batchOptions"
+						placeholder="请选择批次号"></uni-data-select>
 				</uni-forms-item>
 				<uni-forms-item v-if="valiFormData.search_order_choice === 1" label="仓位编码" name="space_code">
-					<uni-data-select v-model="valiFormData.space_code" :localdata="spaces" placeholder="请选择仓位编码"></uni-data-select>
+					<uni-data-select v-model="valiFormData.space_code" :localdata="spaces"
+						placeholder="请选择仓位编码"></uni-data-select>
 				</uni-forms-item>
 				<uni-forms-item v-if="valiFormData.search_order_choice !== 2" label="重量" required name="weight">
-					<uni-easyinput
-						v-model="valiFormData.weight"
-						placeholder="请输入重量"
-						oninput="value=value.replace(/[^\d.]/g,'').replace(/^\./g, '').replace(/\.{2,}/g, '').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').match(/^\d*(\.?\d{0,2})/g)[0] || null"
-					>
+					<uni-easyinput v-model="valiFormData.weight" placeholder="请输入重量"
+						oninput="value=value.replace(/[^\d.]/g,'').replace(/^\./g, '').replace(/\.{2,}/g, '').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').match(/^\d*(\.?\d{0,2})/g)[0] || null">
 						<template #right>
 							<view class="weight-right">KG</view>
 						</template>
 					</uni-easyinput>
 				</uni-forms-item>
 				<uni-forms-item>
-					<view @click="searchPkgChange" class="checkbox-cum" :style="{ color: valiFormData.search_pkg ? '#007AFF' : 'gray' }">
+					<view @click="searchPkgChange" class="checkbox-cum"
+						:style="{ color: valiFormData.search_pkg ? '#007AFF' : 'gray' }">
 						<checkbox :checked="valiFormData.search_pkg" @click="searchPkgChange" />
 						搜索寄存包裹
 					</view>
 
 					<view class="sub-choice">
 						<checkbox :disabled="!valiFormData.search_pkg" :checked="valiFormData.typing" />
-						<text
-							@click="
+						<text @click="
 								() => {
 									if (valiFormData.search_pkg) {
 										valiFormData.typing = !valiFormData.typing;
 									}
 								}
-							"
-							:style="{ color: valiFormData.search_pkg && valiFormData.typing ? '#007AFF' : 'gray' }"
-						>
+							" :style="{ color: valiFormData.search_pkg && valiFormData.typing ? '#007AFF' : 'gray' }">
 							包裹寄存、代购、运单都找不到时手工添加包裹
 						</text>
 					</view>
 
-					<view @click="searchOrderChoiceChange" class="checkbox-cum" :style="{ color: valiFormData.search_order ? '#007AFF' : 'gray' }">
+					<view @click="searchOrderChoiceChange" class="checkbox-cum"
+						:style="{ color: valiFormData.search_order ? '#007AFF' : 'gray' }">
 						<checkbox :checked="valiFormData.search_order" @click="searchOrderChoiceChange" />
 						搜索运单
 					</view>
 
 					<view>
-						<uni-data-checkbox :disabled="!valiFormData.search_order" v-model="valiFormData.search_order_choice" :localdata="searchOrderChoice" />
+						<uni-data-checkbox :disabled="!valiFormData.search_order"
+							v-model="valiFormData.search_order_choice" :localdata="searchOrderChoice" />
 					</view>
 				</uni-forms-item>
 			</uni-forms>
@@ -87,27 +87,20 @@
 		</uni-popup>
 
 		<uni-popup ref="alertDialog" type="dialog">
-			<uni-popup-dialog
-				type="info"
-				cancelText="否"
-				confirmText="是"
-				title="提示"
-				content="是否按默认申报（默认申报为：衣服，10件，单价1）"
-				@confirm="dialogConfirm"
-				@close="dialogClose"
-			></uni-popup-dialog>
+			<uni-popup-dialog type="info" cancelText="否" confirmText="是" title="提示" content="是否按默认申报（默认申报为：衣服，10件，单价1）"
+				@confirm="dialogConfirm" @close="dialogClose"></uni-popup-dialog>
 		</uni-popup>
 
 		<uni-popup ref="printerDialog" type="dialog">
 			<view style="width: 90%; margin: 0 auto; min-height: 250px; background-color: #fff; border-radius: 5px">
 				<view class="" style="font-size: 20px; border-bottom: 1px solid #e1e1e1; padding: 15px 10px">
-					<view type="info" cancelText="关闭" confirmText="打印" title="打印尾程面单" @confirm="printConfirm">
+					<view>
 						<view style="margin-bottom: 20px">
 							<text>打印尾程面单</text>
 						</view>
 						<view>
 							<view v-if="printerList">
-								<uni-data-checkbox
+								<!-- <uni-data-checkbox
 									multiple
 									v-model="downloadFile"
 									:disabled="true"
@@ -119,30 +112,36 @@
 									]"
 								>
 									>
-								</uni-data-checkbox>
+								</uni-data-checkbox> -->
 								<view>
-									<uni-data-checkbox
-										multiple
-										v-model="sendToPeinter"
-										:localdata="[
+									<uni-data-checkbox multiple v-model="sendToPeinter" :localdata="[
 											{
 												text: '发送到标签打印机打印',
 												value: 1
 											}
-										]"
-										@change="sendToPeinterFun"
-									>
+										]" @change="sendToPeinterFun">
 										>
 									</uni-data-checkbox>
-									<uni-data-checkbox :disabled="sendToPeinter.length === 0" v-model="selectPrinter" :localdata="printers"></uni-data-checkbox>
+									<uni-data-checkbox :disabled="sendToPeinter.length === 0" v-model="selectPrinter"
+										:localdata="printers"></uni-data-checkbox>
 								</view>
 							</view>
 						</view>
 
-						<view style="text-align: center; position: absolute; bottom: 10px; width: 90%; left: 10px; display: flex">
-							<button @click="close" style="width: 45%">关闭</button>
-							<button @click="printConfirm" :hover-stay-time="500" :loading="subLoading" :disabled="subLoading" class="my-bt-bg" style="width: 45%">打印</button>
-						</view>
+
+					</view>
+					<view style="text-align: center; 
+					position: absolute; 
+					bottom: 10px; 
+					width: 90%;  
+					display: flex;    
+					margin: 0 auto;
+					left: 0;
+					right: 0;">
+						<button @click="close" style="width: 35%">关闭</button>
+						<button @click="printConfirm" :hover-stay-time="500" :loading="subLoading"
+							:disabled="sendToPeinter.length === 0 || subLoading" class="my-bt-bg"
+							style="width: 35%">打印</button>
 					</view>
 				</view>
 			</view>
@@ -150,610 +149,588 @@
 	</view>
 </template>
 <script>
-import permision from '@/common/permission.js';
-import printerListScan from './components/printerListScan.vue';
-import { ref, reactive, nextTick, provide } from 'vue';
-import {
-	instockScanURL,
-	outStockScanURL,
-	weighScanURL,
-	checkWaybillGoodsURL,
-	printWaybillLabelURL,
-	getWarehouseSpaceURL,
-	getBindParamsURL,
-	getPrinterListURL
-} from '@/utils/api.js';
-export default {
-	data() {
-		const token = ref(null);
-		const user = ref(null);
-		const loading = ref(false);
-		return {
-			token,
-			user,
-			messageType: '',
-			messageText: '',
-			batchOptions: [],
-			spaces: [],
-			printerList: {},
-			instockHistory: [],
-			printers: [],
-			downloadFile: [],
-			sendToPeinter: [1],
-			selectPrinter: 0,
-			subLoading: false,
-			focusType: true,
-			loading,
-			// 校验表单数据
-			valiFormData: {
-				orderNum: '',
-				batch_number: '',
-				space_code: '',
-				weight: '',
-				search_pkg: true,
-				typing: true,
-				search_order: true,
-				search_order_choice: 1
-			},
-
-			searchOrderChoice: [
-				{
-					text: '更新为已入库,状态为【已入库】',
-					value: 1
-				},
-				{
-					text: '更新为已出库,状态为【已出库】',
-					value: 2
-				},
-				{
-					text: '称重计费',
-					value: 3
-				}
-			]
-		};
-	},
-	computed: {
-		rules: function () {
+	import permision from '@/common/permission.js';
+	import {
+		ref,
+		reactive,
+		nextTick,
+		provide
+	} from 'vue';
+	import {
+		instockScanURL,
+		outStockScanURL,
+		weighScanURL,
+		checkWaybillGoodsURL,
+		printWaybillLabelURL,
+		getWarehouseSpaceURL,
+		getBindParamsURL,
+		getPrinterListURL
+	} from '@/utils/api.js';
+	export default {
+		data() {
+			const token = ref(null);
+			const user = ref(null);
+			const loading = ref(false);
 			return {
-				orderNum: {
-					rules: [
-						{
-							required: this.valiFormData.search_order_choice !== 2,
-							errorMessage: '单号不能为空'
-						}
-					]
-				},
-				weight: {
-					rules: [
-						{
-							required: true,
-							errorMessage: '重量不能为空'
-						},
-						{
-							format: 'number',
-							errorMessage: '重量只能输入数字'
-						}
-					]
-				}
-			};
-		},
-		spaceRes: function () {
-			const res = this.spaces.find((item) => item.value === this.valiFormData.space_code);
-			console.log(res);
-			return res?.text;
-		}
-	},
-	onShow() {
-		this.focusType = true;
-		this.loading = false;
-		this.token = uni.getStorageSync('token');
-		this.user = uni.getStorageSync('user');
-		this.getWarehouseSpace();
-		this.getBindParams();
-		this.getPrinterList();
-	},
-	onHide() {
-		this.focusType = false;
-		this.loading = false;
-	},
-	onReady() {},
-	onNavigationBarButtonTap(event) {
-		if (event.index === 0) {
-			uni.navigateTo({
-				url: '/pages/instock/instockLog'
-			});
-		}
-	},
-	methods: {
-		getWarehouseSpace() {
-			uni.request({
-				url: getWarehouseSpaceURL,
-				method: 'POST',
-				header: {
-					batoken: this.token
+				token,
+				user,
+				messageType: '',
+				messageText: '',
+				batchOptions: [],
+				spaces: [],
+				printerList: {},
+				instockHistory: [],
+				printers: [],
+				downloadFile: [],
+				sendToPeinter: [1],
+				selectPrinter: 0,
+				subLoading: false,
+				focusType: true,
+				loading,
+				// 校验表单数据
+				valiFormData: {
+					orderNum: '',
+					batch_number: '',
+					space_code: '',
+					weight: '',
+					search_pkg: true,
+					typing: true,
+					search_order: true,
+					search_order_choice: 1
 				},
-				data: {
-					code: ''
-				},
-				success: (res) => {
-					if (res.data.code === 1) {
-						this.spaces = res.data.data.spaces.map((item) => {
-							return {
-								text: item.name,
-								value: item.code
-							};
-						});
-					}
-				}
-			});
-		},
-		getBindParams() {
-			uni.request({
-				url: getBindParamsURL,
-				method: 'GET',
-				header: {
-					batoken: this.token
-				},
-				success: (res) => {
-					if (res.data.code === 1) {
-						this.batchOptions = res.data.data.batch_number.map((item) => {
-							return { text: item.name, value: item.id };
-						});
+
+				searchOrderChoice: [{
+						text: '更新为已入库,状态为【已入库】',
+						value: 1
+					},
+					{
+						text: '更新为已出库,状态为【已出库】',
+						value: 2
+					},
+					{
+						text: '称重计费',
+						value: 3
 					}
-				},
-				fail(e) {
-					console.log('fail--', e);
-				}
-			});
+				]
+			};
 		},
-		getPrinterList() {
-			uni.request({
-				url: getPrinterListURL,
-				method: 'GET',
-				header: {
-					batoken: this.token
-				},
-				success: (res) => {
-					if (res.data.code === 1) {
-						this.printerList = res.data.data.printers;
-						this.printers = Object.values(this.printerList).map((item) => {
-							return {
-								text: item.name,
-								value: item.value
-							};
-						});
+		computed: {
+			rules: function() {
+				return {
+					orderNum: {
+						rules: [{
+							required: this.valiFormData.search_order_choice !== 2,
+							errorMessage: '单号不能为空'
+						}]
+					},
+					weight: {
+						rules: [{
+								required: true,
+								errorMessage: '重量不能为空'
+							},
+							{
+								format: 'number',
+								errorMessage: '重量只能输入数字'
+							}
+						]
 					}
-				},
-				fail(e) {
-					console.log('fail--', e);
-				}
-			});
+				};
+			},
+			spaceRes: function() {
+				const res = this.spaces.find((item) => item.value === this.valiFormData.space_code);
+				console.log(res);
+				return res?.text;
+			}
 		},
-		batchText(batch_number) {
-			return this.batchOptions.find((item) => item.value === batch_number)?.text;
+		onShow() {
+			this.focusType = true;
+			this.loading = false;
+			this.token = uni.getStorageSync('token');
+			this.user = uni.getStorageSync('user');
+			this.getWarehouseSpace();
+			this.getBindParams();
+			this.getPrinterList();
 		},
-		searchPkgChange() {
-			this.valiFormData.search_pkg = !this.valiFormData.search_pkg;
-			this.valiFormData.typing = this.valiFormData.search_pkg;
+		onHide() {
+			this.focusType = false;
+			this.loading = false;
 		},
-		searchOrderChoiceChange() {
-			this.valiFormData.search_order = !this.valiFormData.search_order;
-			this.valiFormData.search_order_choice = this.valiFormData.search_order ? 3 : '';
+		onReady() {},
+		onNavigationBarButtonTap(event) {
+			if (event.index === 0) {
+				uni.navigateTo({
+					url: '/pages/instock/instockLog'
+				});
+			}
 		},
-		reset() {
-			this.loading = false;
-			this.focusType = false;
+		methods: {
+			getWarehouseSpace() {
+				uni.request({
+					url: getWarehouseSpaceURL,
+					method: 'POST',
+					header: {
+						batoken: this.token
+					},
+					data: {
+						code: ''
+					},
+					success: (res) => {
+						if (res.data.code === 1) {
+							this.spaces = res.data.data.spaces.map((item) => {
+								return {
+									text: item.name,
+									value: item.code
+								};
+							});
+						}
+					}
+				});
+			},
+			getBindParams() {
+				uni.request({
+					url: getBindParamsURL,
+					method: 'GET',
+					header: {
+						batoken: this.token
+					},
+					success: (res) => {
+						if (res.data.code === 1) {
+							this.batchOptions = res.data.data.batch_number.map((item) => {
+								return {
+									text: item.name,
+									value: item.id
+								};
+							});
+						}
+					},
+					fail(e) {
+						console.log('fail--', e);
+					}
+				});
+			},
+			getPrinterList() {
+				uni.request({
+					url: getPrinterListURL,
+					method: 'GET',
+					header: {
+						batoken: this.token
+					},
+					success: (res) => {
+						if (res.data.code === 1) {
+							this.printerList = res.data.data.printers;
+							this.printers = Object.values(this.printerList).map((item) => {
+								return {
+									text: item.name,
+									value: item.value
+								};
+							});
+						}
+					},
+					fail(e) {
+						console.log('fail--', e);
+					}
+				});
+			},
+			batchText(batch_number) {
+				return this.batchOptions.find((item) => item.value === batch_number)?.text;
+			},
+			searchPkgChange() {
+				this.valiFormData.search_pkg = !this.valiFormData.search_pkg;
+				this.valiFormData.typing = this.valiFormData.search_pkg;
+			},
+			searchOrderChoiceChange() {
+				this.valiFormData.search_order = !this.valiFormData.search_order;
+				this.valiFormData.search_order_choice = this.valiFormData.search_order ? 3 : '';
+			},
+			reset() {
+				this.loading = false;
+				this.focusType = false;
 
-			this.valiFormData = {
-				...this.valiFormData,
-				orderNum: '',
-				// space_code: '',
-				batch_number: '',
-				weight: '',
-				search_pkg: true,
-				typing: true,
-				search_order: true
-			};
-			nextTick(() => {
-				this.focusType = true;
-			});
-		},
+				this.valiFormData = {
+					...this.valiFormData,
+					orderNum: '',
+					// space_code: '',
+					batch_number: '',
+					weight: '',
+					search_pkg: true,
+					typing: true,
+					search_order: true
+				};
+				nextTick(() => {
+					this.focusType = true;
+				});
+			},
 
-		async scan() {
+			async scan() {
+				// #ifdef APP-PLUS
+				let status = await this.checkPermission();
+				if (status !== 1) {
+					return;
+				}
+				// #endif
+				uni.scanCode({
+					success: (res) => {
+						this.result = res.result;
+						this.valiFormData.orderNum = res.result;
+						// this.onsubmit();
+					},
+					fail: (err) => {
+						// 需要注意的是小程序扫码不需要申请相机权限
+					}
+				});
+			},
 			// #ifdef APP-PLUS
-			let status = await this.checkPermission();
-			if (status !== 1) {
-				return;
-			}
+			async checkPermission(code) {
+				let status = permision.isIOS ? await permision.requestIOS('camera') : await permision.requestAndroid(
+					'android.permission.CAMERA');
+
+				if (status === null || status === 1) {
+					status = 1;
+				} else {
+					uni.showModal({
+						content: 'Camera permission required',
+						confirmText: 'Setting',
+						success: function(res) {
+							if (res.confirm) {
+								permision.gotoAppSetting();
+							}
+						}
+					});
+				}
+				return status;
+			},
 			// #endif
-			uni.scanCode({
-				success: (res) => {
-					this.result = res.result;
-					this.valiFormData.orderNum = res.result;
-					// this.onsubmit();
-				},
-				fail: (err) => {
-					// 需要注意的是小程序扫码不需要申请相机权限
+			async warehouseScan() {
+				this.st && clearTimeout(this.st);
+				if (this.valiFormData.search_order_choice === 1) {
+					await this.checkWaybillGoods();
+				} else if (this.valiFormData.search_order_choice === 2) {
+					await this.scanOutstock();
+				} else if (this.valiFormData.search_order_choice === 3) {
+					await this.weighScan();
 				}
-			});
-		},
-		// #ifdef APP-PLUS
-		async checkPermission(code) {
-			let status = permision.isIOS ? await permision.requestIOS('camera') : await permision.requestAndroid('android.permission.CAMERA');
-
-			if (status === null || status === 1) {
-				status = 1;
-			} else {
-				uni.showModal({
-					content: 'Camera permission required',
-					confirmText: 'Setting',
-					success: function (res) {
-						if (res.confirm) {
-							permision.gotoAppSetting();
+			},
+			async checkWaybillGoods() {
+				this.loading = true;
+				uni.request({
+					url: checkWaybillGoodsURL,
+					method: 'POST',
+					header: {
+						batoken: this.token
+					},
+					data: {
+						order_no: this.valiFormData.orderNum
+					},
+					success: (res) => {
+						this.loading = false;
+						if (res.data.code === 1 && res.data.data.is_goods_empty) {
+							this.$refs.alertDialog.open();
+						} else {
+							this.instockScan(0);
 						}
 					}
 				});
-			}
-			return status;
-		},
-		// #endif
-		async warehouseScan() {
-			this.st && clearTimeout(this.st);
+			},
+			instockScan(is_save_goods) {
+				uni.request({
+					url: instockScanURL,
+					method: 'POST',
+					header: {
+						batoken: this.token
+					},
+					data: {
+						order_no: this.valiFormData.orderNum,
+						weight: this.valiFormData.weight,
+						space_code: this.valiFormData.space_code,
+						is_save_goods: is_save_goods
+					},
+					success: (res) => {
+						this.loading = false;
+						if (res.data.code == 1) {
+							this.messageType = 'success';
+							this.messageText = res.data.msg;
+							this.$refs.message.open();
 
-			if (this.valiFormData.search_order_choice === 1) {
-				await this.checkWaybillGoods();
-			} else if (this.valiFormData.search_order_choice === 2) {
-				await this.scanOutstock();
-			} else if (this.valiFormData.search_order_choice === 3) {
-				await this.weighScan();
-			}
-		},
-		async checkWaybillGoods() {
-			this.loading = true;
-			uni.request({
-				url: checkWaybillGoodsURL,
-				method: 'POST',
-				header: {
-					batoken: this.token
-				},
-				data: {
-					order_no: this.valiFormData.orderNum
-				},
-				success: (res) => {
-					this.loading = false;
-					if (res.data.code === 1 && res.data.data.is_goods_empty) {
-						this.$refs.alertDialog.open();
-					} else {
-						this.instockScan(0);
+							if (res.data.data.labels && res.data.data.labels.length > 0) {
+								console.log('有打印面单');
+								this.selectPrinter = this.sendToPeinter.length > 0 ? this.printers[0].value : 0;
+								this.$refs.printerDialog.open();
+							}
+							const historyItem = {
+								orderNum: this.valiFormData.orderNum,
+								createTime: new Date(),
+								space: this.spaceRes,
+								type: '入库',
+								status: true
+							};
+							this.instockHistory.unshift(historyItem);
+							uni.setStorageSync('instockHistory', this.instockHistory);
+							this.getHistory();
+						} else {
+							this.messageType = 'error';
+							this.messageText = res.data.msg;
+							this.$refs.message.open();
+							const historyItem = {
+								orderNum: this.valiFormData.orderNum,
+								createTime: new Date(),
+								space: this.spaceRes,
+								type: '入库',
+								status: false
+							};
+							this.instockHistory.unshift(historyItem);
+							uni.setStorageSync('instockHistory', this.instockHistory);
+							this.getHistory();
+						}
+						this.st = setTimeout(() => {
+							this.reset();
+							this.st && clearTimeout(this.st);
+						}, 1000);
 					}
+				});
+			},
+			scanOutstock() {
+				console.log(this.valiFormData.orderNum, this.valiFormData.batch_number);
+				if (this.valiFormData.orderNum.length === 0 && this.valiFormData.batch_number.length === 0) {
+					this.messageType = 'error';
+					this.messageText = '单号或批次号至少填一个';
+					this.$refs.message.open();
+					return;
 				}
-			});
-		},
-		instockScan(is_save_goods) {
-			uni.request({
-				url: instockScanURL,
-				method: 'POST',
-				header: {
-					batoken: this.token
-				},
-				data: {
-					order_no: this.valiFormData.orderNum,
-					weight: this.valiFormData.weight,
-					space_code: this.valiFormData.space_code,
-					is_save_goods: is_save_goods
-				},
-				success: (res) => {
-					this.loading = false;
-					if (res.data.code == 1) {
-						this.messageType = 'success';
-						this.messageText = res.data.msg;
-						this.$refs.message.open();
+				this.loading = true;
+				uni.request({
+					url: outStockScanURL,
+					method: 'POST',
+					header: {
+						batoken: this.token
+					},
+					data: {
+						order_no: this.valiFormData.orderNum,
+						batch_number: this.valiFormData.batch_number
+					},
+					success: (res) => {
+						this.loading = false;
+						if (res.data.code == 1) {
+							this.messageType = 'success';
+							this.messageText = res.data.msg;
+							this.$refs.message.open();
 
-						if (res.data.data.labels && res.data.data.labels.length > 0) {
-							console.log('有打印面单');
-							// this.printerList.visible = true;
-							// this.printerList.batoken = this.token;
-							// this.printerList.title = '打印尾程面单';
-							// this.printerList.postData = {
-							// 	order_no: this.valiFormData.orderNum
-							// };
-							// this.printerList.resetForm = () => resetForm(ruleFormRef.value);
-							// res.data.data.labels.map((url: string) => {
-							// 	let path = fullUrl(url);
-							// 	window.open(path, '_blank');
-							// });
+							if (res.data.data.labels && res.data.data.labels.length > 0) {
+								console.log('有打印面单');
+								this.selectPrinter = this.sendToPeinter.length > 0 ? this.printers[0].value : 0;
+								this.$refs.printerDialog.open();
+							}
+							const historyItem = {
+								orderNum: this.valiFormData.orderNum,
+								batch_text: this.batchText(this.valiFormData.batch_number),
+								createTime: new Date(),
+								type: '出库',
+								status: true
+							};
+							this.instockHistory.unshift(historyItem);
+							this.instockHistory.length > 10 && (this.instockHistory.length = 10);
+							uni.setStorageSync('instockHistory', this.instockHistory);
+							this.getHistory();
+						} else {
+							this.messageType = 'error';
+							this.messageText = res.data.msg;
+							this.$refs.message.open();
+							const historyItem = {
+								orderNum: this.valiFormData.orderNum,
+								batch_text: this.batchText(this.valiFormData.batch_number),
+								createTime: new Date(),
+								type: '出库',
+								status: false
+							};
+							this.instockHistory.unshift(historyItem);
+							this.instockHistory.length > 10 && (this.instockHistory.length = 10);
+							uni.setStorageSync('instockHistory', this.instockHistory);
+							this.getHistory();
 						}
-						const historyItem = {
-							orderNum: this.valiFormData.orderNum,
-							createTime: new Date(),
-							space: this.spaceRes,
-							type: '入库',
-							status: true
-						};
-						this.instockHistory.unshift(historyItem);
-						uni.setStorageSync('instockHistory', this.instockHistory);
-						this.getHistory();
-					} else {
-						this.messageType = 'error';
-						this.messageText = res.data.msg;
-						this.$refs.message.open();
-						const historyItem = {
-							orderNum: this.valiFormData.orderNum,
-							createTime: new Date(),
-							space: this.spaceRes,
-							type: '入库',
-							status: false
-						};
-						this.instockHistory.unshift(historyItem);
-						uni.setStorageSync('instockHistory', this.instockHistory);
-						this.getHistory();
+						this.st = setTimeout(() => {
+							this.reset();
+							this.st && clearTimeout(this.st);
+						}, 1000);
 					}
-					this.st = setTimeout(() => {
-						this.reset();
-						this.st && clearTimeout(this.st);
-					}, 1000);
-				}
-			});
-		},
-		scanOutstock() {
-			console.log(this.valiFormData.orderNum, this.valiFormData.batch_number);
-			if (this.valiFormData.orderNum.length === 0 && this.valiFormData.batch_number.length === 0) {
-				this.messageType = 'error';
-				this.messageText = '单号或批次号至少填一个';
-				this.$refs.message.open();
-				return;
-			}
-			this.loading = true;
-			uni.request({
-				url: outStockScanURL,
-				method: 'POST',
-				header: {
-					batoken: this.token
-				},
-				data: {
-					order_no: this.valiFormData.orderNum,
-					batch_number: this.valiFormData.batch_number
-				},
-				success: (res) => {
-					this.loading = false;
-					if (res.data.code == 1) {
-						this.messageType = 'success';
-						this.messageText = res.data.msg;
-						this.$refs.message.open();
-
-						if (res.data.data.labels && res.data.data.labels.length > 0) {
-							console.log('有打印面单');
-							// this.printerList.visible = true;
-							// this.printerList.batoken = this.token;
-							// this.printerList.title = '打印尾程面单';
-							// this.printerList.postData = {
-							// 	order_no: this.valiFormData.orderNum
-							// };
-							// res.data.data.labels.map((url: string) => {
-							// 	let path = fullUrl(url);
-							// 	window.open(path, '_blank');
-							// });
+				});
+			},
+			weighScan() {
+				this.loading = true;
+				uni.request({
+					url: weighScanURL,
+					method: 'POST',
+					header: {
+						batoken: this.token
+					},
+					data: {
+						order_no: this.valiFormData.orderNum,
+						weight: this.valiFormData.weight
+					},
+					success: (res) => {
+						this.loading = false;
+						if (res.data.code == 1) {
+							this.messageType = 'success';
+							this.messageText = res.data.msg;
+							this.$refs.message.open();
+							const historyItem = {
+								orderNum: this.valiFormData.orderNum,
+								createTime: new Date(),
+								type: '称重',
+								status: true
+							};
+							this.instockHistory.unshift(historyItem);
+							this.instockHistory.length > 10 && (this.instockHistory.length = 10);
+							uni.setStorageSync('instockHistory', this.instockHistory);
+							this.getHistory();
+						} else {
+							this.messageType = 'error';
+							this.messageText = res.data.msg;
+							this.$refs.message.open();
+							const historyItem = {
+								orderNum: this.valiFormData.orderNum,
+								createTime: new Date(),
+								type: '称重',
+								status: false
+							};
+							this.instockHistory.unshift(historyItem);
+							this.instockHistory.length > 10 && (this.instockHistory.length = 10);
+							uni.setStorageSync('instockHistory', this.instockHistory);
+							this.getHistory();
 						}
-						const historyItem = {
-							orderNum: this.valiFormData.orderNum,
-							batch_text: this.batchText(this.valiFormData.batch_number),
-							createTime: new Date(),
-							type: '出库',
-							status: true
-						};
-						this.instockHistory.unshift(historyItem);
-						this.instockHistory.length > 10 && (this.instockHistory.length = 10);
-						uni.setStorageSync('instockHistory', this.instockHistory);
-						this.getHistory();
-					} else {
-						this.messageType = 'error';
-						this.messageText = res.data.msg;
-						this.$refs.message.open();
-						const historyItem = {
-							orderNum: this.valiFormData.orderNum,
-							batch_text: this.batchText(this.valiFormData.batch_number),
-							createTime: new Date(),
-							type: '出库',
-							status: false
-						};
-						this.instockHistory.unshift(historyItem);
-						this.instockHistory.length > 10 && (this.instockHistory.length = 10);
-						uni.setStorageSync('instockHistory', this.instockHistory);
-						this.getHistory();
+						this.st = setTimeout(() => {
+							this.reset();
+							this.st && clearTimeout(this.st);
+						}, 1000);
 					}
-					this.st = setTimeout(() => {
-						this.reset();
-						this.st && clearTimeout(this.st);
-					}, 1000);
+				});
+			},
+			isNotGoods() {
+				this.instockScan(0);
+			},
+			close() {
+				this.$refs.printerDialog.close();
+			},
+			dialogConfirm() {
+				this.instockScan(1);
+			},
+			dialogClose() {
+				this.instockScan(0);
+			},
+			sendToPeinterFun(res) {
+				if (!res.detail.value.length > 0) {
+					this.selectPrinter = 0;
+				} else {
+					this.selectPrinter = this.printers[0].value;
 				}
-			});
-		},
-		weighScan() {
-			this.loading = true;
-			uni.request({
-				url: weighScanURL,
-				method: 'POST',
-				header: {
-					batoken: this.token
-				},
-				data: {
-					order_no: this.valiFormData.orderNum,
-					weight: this.valiFormData.weight
-				},
-				success: (res) => {
-					this.loading = false;
-					if (res.data.code == 1) {
+			},
+			printConfirm() {
+				this.subLoading = true;
+				uni.request({
+					url: printWaybillLabelURL,
+					method: 'POST',
+					header: {
+						batoken: this.token
+					},
+					data: {
+						order_no: this.valiFormData.orderNum,
+						printer_code: this.selectPrinter
+					},
+					success: (res) => {
+						this.subLoading = false;
+						console.log('打印成功', res);
 						this.messageType = 'success';
-						this.messageText = res.data.msg;
+						this.messageText = "打印成功";
 						this.$refs.message.open();
-						const historyItem = {
-							orderNum: this.valiFormData.orderNum,
-							createTime: new Date(),
-							type: '称重',
-							status: true
-						};
-						this.instockHistory.unshift(historyItem);
-						this.instockHistory.length > 10 && (this.instockHistory.length = 10);
-						uni.setStorageSync('instockHistory', this.instockHistory);
-						this.getHistory();
-					} else {
-						this.messageType = 'error';
-						this.messageText = res.data.msg;
-						this.$refs.message.open();
-						const historyItem = {
-							orderNum: this.valiFormData.orderNum,
-							createTime: new Date(),
-							type: '称重',
-							status: false
-						};
-						this.instockHistory.unshift(historyItem);
-						this.instockHistory.length > 10 && (this.instockHistory.length = 10);
-						uni.setStorageSync('instockHistory', this.instockHistory);
-						this.getHistory();
 					}
-					this.st = setTimeout(() => {
-						this.reset();
-						this.st && clearTimeout(this.st);
-					}, 1000);
-				}
-			});
-		},
-		isNotGoods() {
-			this.instockScan(0);
-		},
-		close() {
-			this.$refs.printerDialog.close();
-		},
-		dialogConfirm() {
-			console.log('点击确认');
-			this.instockScan(1);
-		},
-		dialogClose() {
-			this.instockScan(0);
-		},
-		sendToPeinterFun(res) {
-			if (!res.detail.value.length > 0) {
-				this.selectPrinter = 0;
-			} else {
-				this.selectPrinter = this.printers[0].value;
+				});
+			},
+			onsubmit() {
+				this.$refs.valiForm
+					.validate()
+					.then((res) => {
+						this.warehouseScan();
+					})
+					.catch((err) => {
+						console.log('err', err);
+					});
+			},
+			getHistory() {
+				// this.instockHistory = uni.getStorageSync('history')
 			}
-		},
-		printConfirm() {
-			this.subLoading = true;
-			uni.request({
-				url: printWaybillLabelURL,
-				method: 'POST',
-				header: {
-					batoken: this.token
-				},
-				data: {
-					order_no: this.valiFormData.orderNum,
-					printer_code: this.selectPrinter
-				},
-				success: (res) => {
-					this.subLoading = false;
-					console.log('打印成功', res);
-				}
-			});
-		},
-		onsubmit() {
-			this.selectPrinter = this.printers[0].value;
-			this.$refs.printerDialog.open();
-
-			// this.printerList.visible = true;
-			// this.printerList.batoken = this.token;
-			// this.printerList.title = '打印尾程面单';
-			// this.printerList.postData = {
-			// 	order_no: this.valiFormData.orderNum
-			// };
-
-			// this.$refs.valiForm
-			// 	.validate()
-			// 	.then((res) => {
-			// 		this.warehouseScan();
-			// 	})
-			// 	.catch((err) => {
-			// 		console.log('err', err);
-			// 	});
-		},
-		getHistory() {
-			// this.instockHistory = uni.getStorageSync('history')
 		}
-	}
-};
+	};
 </script>
 <style lang="scss">
-.example {
-	padding: 15px;
-	background-color: #fff;
-}
-
-.checkbox-cum {
-	margin-bottom: 20rpx;
-	font-size: 14rpx;
-}
-
-.sub-choice {
-	margin-bottom: 20rpx;
-	margin-left: 20rpx;
-	font-size: 14rpx;
-}
-
-.button-group {
-	margin-top: 15px;
-	display: flex;
-	flex-direction: row;
-	justify-content: space-around;
+	.example {
+		padding: 15px;
+		background-color: #fff;
+	}
 
-	button {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		height: 35px;
-		width: 50%;
-		margin-left: 10px;
-		font-size: 16rpx;
+	.checkbox-cum {
+		margin-bottom: 20rpx;
+		font-size: 14rpx;
 	}
 
-	.uni-icons {
-		margin-right: 10px;
+	.sub-choice {
+		margin-bottom: 20rpx;
+		margin-left: 20rpx;
+		font-size: 14rpx;
 	}
-}
 
-.weight-right {
-	padding-right: 10rpx;
-	font-size: 14rpx;
-}
+	.button-group {
+		margin-top: 15px;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-around;
 
-.history {
-	display: flex;
-	width: 100%;
-	flex-direction: column;
-	justify-items: start;
+		button {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			height: 35px;
+			width: 50%;
+			margin-left: 10px;
+			font-size: 16rpx;
+		}
 
-	.title {
-		padding: 20rpx;
-		font-size: 24rpx;
-		font-weight: 600;
+		.uni-icons {
+			margin-right: 10px;
+		}
 	}
 
-	.code {
-		font-weight: 600;
+	.weight-right {
+		padding-right: 10rpx;
+		font-size: 14rpx;
 	}
 
-	.item {
-		padding: 20rpx;
-		font-size: 20rpx;
-		color: #666;
+	.history {
+		display: flex;
+		width: 100%;
+		flex-direction: column;
+		justify-items: start;
 
-		.status {
-			padding-left: 20rpx;
+		.title {
+			padding: 20rpx;
+			font-size: 24rpx;
+			font-weight: 600;
 		}
 
-		.fail {
+		.code {
 			font-weight: 600;
-			color: #f00;
+		}
+
+		.item {
+			padding: 20rpx;
+			font-size: 20rpx;
+			color: #666;
+
+			.status {
+				padding-left: 20rpx;
+			}
+
+			.fail {
+				font-weight: 600;
+				color: #f00;
+			}
 		}
 	}
-}
-</style>
+</style>

unpackage/dist/cache/.vite/deps/_metadata.json

@@ -1,8 +1,8 @@
 {
-  "hash": "adf7464e",
-  "configHash": "fd42d985",
+  "hash": "f40f3ae4",
+  "configHash": "d35ae346",
   "lockfileHash": "e3b0c442",
-  "browserHash": "d1f8efbb",
+  "browserHash": "63a7975d",
   "optimized": {},
   "chunks": {}
 }