From 6b36b25fbc864cdd231d10f125b7c258cf3e5a7b Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 5 Jan 2024 14:16:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wincom/winScanContainerNumber.vue         | 110 ------------------
 pages/query/container.vue                     |   6 +-
 2 files changed, 4 insertions(+), 112 deletions(-)
 delete mode 100644 mycomponents/wincom/winScanContainerNumber.vue

diff --git a/mycomponents/wincom/winScanContainerNumber.vue b/mycomponents/wincom/winScanContainerNumber.vue
deleted file mode 100644
index 642e62a4..00000000
--- a/mycomponents/wincom/winScanContainerNumber.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<template>
-	<winScanStandard ref="standard" :title="title" @getScanResult="getScanResult">
-
-	</winScanStandard>
-</template>
-
-<script>
-	import {
-		getContainerByNumber,
-	} from '@/api/request.js';
-	 
-	import winScanStandard from '@/mycomponents/wincom/scanCom/winScanStandard.vue'
-	export default {
-		components: {
-			winScanStandard
-		},
-		emits: ["getScanCode"],
-		props: {
-			title: {
-				type: String,
-				default: '器具代码'
-			},
-			locationTypeList: {
-				type: Array,
-				default: []
-			},
-			isJudgeStatus: {
-				type: Boolean,
-				default: true
-			},
-		},
-		data() {
-			return {
-				code: '',
-				number: '',
-				container: {}
-			}
-		},
-
-		created() {
-
-		},
-		methods: {
-			openScanPopup() {
-				this.$refs.standard.openScanPopup()
-			},
-			closeScanPopup() {
-				this.$refs.standard.closeScanPopup()
-			},
-			scanClick() {
-				this.$refs.standard.clickScanMsg();
-			},
-			cancelClick() {
-				this.$refs.standard.clearScanValue();
-			},
-			getScanResult(result) {
-				if (result.label.Type == "QRCode") {
-					this.code = result.label.itemCode;
-				} else if (result.label.Type == "BarCode") {
-					this.code = result.label.code;
-				}
-
-				uni.showLoading({
-					title: '扫描中...',
-					mask: true
-				});
-
-				getContainerByNumber(this.code).then(res => {
-					uni.hideLoading();
-
-					if (res.data.total > 0) {
-						var number = res.data.list[0].number;
-						var type = res.data.list[0].type;
-						var status = res.data.list[0].status;
-						if (this.isJudgeStatus) {
-							if (status == 'qjztUsed') {
-								this.container = res.data.list[0];
-								this.callBack();
-							} else {
-								this.$refs.standard.showWarningMessage("扫描器具[" + this.code + "]不可用", res => {})
-							}
-
-						}
-
-					} else {
-						this.$refs.standard.showWarningMessage('未查询到器具' + '【' + this.code + '】', res => {
-
-						})
-					}
-				}).catch(error => {
-					uni.hideLoading();
-					this.$refs.standard.showWarningMessage(error, res => {
-
-					})
-				})
-			},
-			callBack() {
-				this.closeScanPopup();
-				this.$emit("getScanCode", this.container, this.number);
-			},
-			getfocus() {
-				this.$refs.standard.getfocus();
-			},
-
-		}
-	}
-</script>
-
-<style>
-</style>
diff --git a/pages/query/container.vue b/pages/query/container.vue
index 0f9847a7..17e847fe 100644
--- a/pages/query/container.vue
+++ b/pages/query/container.vue
@@ -52,7 +52,7 @@
 	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
 	import comLocationDetailCard from '@/pages/query/coms/comLocationDetailCard.vue'
-	import winScanItem from '@/mycomponents/scan/winScanItem.vue'
+	import winScanContainer from "@/mycomponents/scan/winScanContainer.vue"
 	import containerInfo from '@/mycomponents/container/containerInfo.vue'
 
 	export default {
@@ -64,7 +64,9 @@
 			comMessage,
 			comLocationDetailCard,
 			winScanItem,
-			containerInfo
+			containerInfo,
+			winScanContainer
+			
 		},
 		data() {
 			return {