From 47f6e1df73e43f3deecece789bb25dadfce869b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Thu, 11 May 2023 12:00:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8A=E6=88=90=E5=93=81=E4=B8=8A=E6=9E=B6?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=89=A9=E5=93=81=E4=BB=A3=E7=A0=81=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=8D=8A?=
 =?UTF-8?q?=E6=88=90=E5=93=81=E5=AF=B9=E5=BA=94=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/public/version.json                                     | 2 +-
 .../PartiallyPreparedProducts/PartiallyPreparedProducts.vue   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fe/PC/public/version.json b/fe/PC/public/version.json
index 1508200d4..5022f0ccd 100644
--- a/fe/PC/public/version.json
+++ b/fe/PC/public/version.json
@@ -1,3 +1,3 @@
 {
-    "version": "1.0.17"
+    "version": "1.0.18"
 }
\ No newline at end of file
diff --git a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue
index 3556f2d6b..181807975 100644
--- a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue
+++ b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue
@@ -128,11 +128,11 @@ export default {
       { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic", [
             // {logic:"And",column:"canMake",action:"==",value:"true"},
-            {logic:"And",column:"type",action:"==",value:"半成品"}
+            {logic:"And",column:"type",action:"==",value:"10C04"}
           ])},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,[
             // {logic:"And",column:"canMake",action:"==",value:"true"},
-            {logic:"And",column:"type",action:"==",value:"半成品"}
+            {logic:"And",column:"type",action:"==",value:"10C04"}
           ]) }, 
           colSpan: 12,
         },