From f25f4a54b3127169bda40a1299f9dc22fce88287 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Mon, 20 May 2024 12:02:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=88=90=E6=9C=AC=E6=A0=87?=
=?UTF-8?q?=E7=AD=BE=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 7 +-
src/mycomponents/common/comBlankView.vue | 11 +-
src/mycomponents/scan/winCheckFgLabel.vue | 243 ++++++++
src/mycomponents/scan/winComScan.vue | 5 +-
.../scan/winComScanCustomerLabel.vue | 234 ++++++++
src/pages.json | 7 +
src/pages/check/checkFgLabel.vue | 519 ++++++++++++++++++
7 files changed, 1017 insertions(+), 9 deletions(-)
create mode 100644 src/mycomponents/scan/winCheckFgLabel.vue
create mode 100644 src/mycomponents/scan/winComScanCustomerLabel.vue
create mode 100644 src/pages/check/checkFgLabel.vue
diff --git a/.env.development b/.env.development
index ee3253d1..805318a5 100644
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1 @@
-<<<<<<< HEAD
-VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api
VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/api/admin-api
# 租户配置
VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]'
-=======
-VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api
-VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/admin-api
# 租户配置
VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]'
->>>>>>> 1ccdeabc43457dad340e3fdcd18fd01e052931c6
+VITE_BASE_URL=http://dev.ccwin-in.com:25300/api/admin-api
VITE_BASE_URL_IMAGE=http://dev.ccwin-in.com:25300/api/admin-api
# 租户配置
VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]'
\ No newline at end of file
diff --git a/src/mycomponents/common/comBlankView.vue b/src/mycomponents/common/comBlankView.vue
index 96a64f63..fab084fe 100644
--- a/src/mycomponents/common/comBlankView.vue
+++ b/src/mycomponents/common/comBlankView.vue
@@ -3,7 +3,7 @@
@@ -14,6 +14,13 @@
return {
}
+
+ },
+ props: {
+ title: {
+ type: String,
+ default: '去扫描'
+ }
},
created() {
@@ -28,4 +35,4 @@
+
\ No newline at end of file
diff --git a/src/mycomponents/scan/winCheckFgLabel.vue b/src/mycomponents/scan/winCheckFgLabel.vue
new file mode 100644
index 00000000..9476c9e8
--- /dev/null
+++ b/src/mycomponents/scan/winCheckFgLabel.vue
@@ -0,0 +1,243 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/mycomponents/scan/winComScan.vue b/src/mycomponents/scan/winComScan.vue
index 9a408e09..110717ac 100644
--- a/src/mycomponents/scan/winComScan.vue
+++ b/src/mycomponents/scan/winComScan.vue
@@ -23,7 +23,7 @@
-
+
历史记录
@@ -232,8 +232,11 @@
});
},
clear() {
+ if(this.clearResult)
+ {
this.cursorIndex = 0;
this.scanMsg = ''
+ }
},
iconClick(type) {
this.$emit("clearResult", this.scanMsgk);
diff --git a/src/mycomponents/scan/winComScanCustomerLabel.vue b/src/mycomponents/scan/winComScanCustomerLabel.vue
new file mode 100644
index 00000000..a82334de
--- /dev/null
+++ b/src/mycomponents/scan/winComScanCustomerLabel.vue
@@ -0,0 +1,234 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{customerItemCode}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index f3a41a46..245464b2 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -2044,6 +2044,13 @@
"navigationBarTitleText": "打印",
"enablePullDownRefresh": false
}
+ },
+ {
+ "path": "pages/check/checkFgLabel",
+ "style": {
+ "navigationBarTitleText": "标签成品标签",
+ "enablePullDownRefresh": false
+ }
}
],
"globalStyle": {
diff --git a/src/pages/check/checkFgLabel.vue b/src/pages/check/checkFgLabel.vue
new file mode 100644
index 00000000..def2e899
--- /dev/null
+++ b/src/pages/check/checkFgLabel.vue
@@ -0,0 +1,519 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file