From 2ddfbbee7daba207e0a51125ef4ef68dc98a61ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Wed, 29 Mar 2023 16:36:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E7=B1=BB=E5=9E=8B=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E3=80=90=E5=85=A5=E5=BA=93=E5=BA=93=E5=8C=BA=E3=80=91?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicData/WarehouseManage/TransactionType.vue  | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/fe/PC/src/views/basicData/WarehouseManage/TransactionType.vue b/fe/PC/src/views/basicData/WarehouseManage/TransactionType.vue
index 23f9146d6..6bca7b038 100644
--- a/fe/PC/src/views/basicData/WarehouseManage/TransactionType.vue
+++ b/fe/PC/src/views/basicData/WarehouseManage/TransactionType.vue
@@ -160,12 +160,21 @@ export default {
       CreateForm: [],
       editForm: [
         { type: "input", label: "描述", prop: 'description', colSpan: 12 },
+        { type: "select", label: "是否可用", prop: 'enabled', options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "事务类型", prop: "transType", options: "TransTypeBase", colSpan: 12 },
         { type: "select", label: "事务子类型", prop: "transSubType", options: "transSubType", colSpan: 12 },
         { type: "selectArray", label: "入库库位类型清单", prop: 'inLocationTypes', options: "locationType", colSpan: 12 },
         { type: "selectArray", label: "出库库位类型清单", prop: 'outLocationTypes', options: "locationType", colSpan: 12 },
-        { type: "input", label: "入库库区清单", prop: 'inLocationAreas', colSpan: 12 },
-        { type: "input", label: "出库库区清单", prop: 'outLocationAreas', colSpan: 12 },
+        
+        { type: "filterSelect", label: "入库库区清单", prop: "inLocationAreas", optionsLabel: "name", optionsValue: "code", 
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/area")},
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/area', 'Area', '入库库区选择', this.editFormData) }, colSpan: 12 },
+        
+        { type: "filterSelect", label: "出库库区清单", prop: "outLocationAreas", optionsLabel: "name", optionsValue: "code", 
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/area")},
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/area', 'Area', '出库库区选择', this.editFormData) }, colSpan: 12 },
+        // { type: "input", label: "入库库区清单", prop: 'inLocationAreas', colSpan: 12 },
+        // { type: "input", label: "出库库区清单", prop: 'outLocationAreas', colSpan: 12 },
         { type: "selectArray", label: "物品状态清单", prop: 'itemStatuses', options: "ItemStatus", colSpan: 12 },
         { type: "selectArray", label: "物品类型清单", prop: 'itemTypes', options: "ItemType", colSpan: 12 },
         { type: "selectArray", label: "来源库存状态清单", prop: 'outInventoryStatuses', options: "inventoryStage", colSpan: 12 }, 
@@ -175,7 +184,6 @@ export default {
         { type: "select", label: "自动执行", prop: 'autoHandleRequest', options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "自动完成任务", prop: 'autoCompleteJob', options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "直接创建记录", prop: 'directCreateNote', options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否可用", prop: 'enabled', options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editRules: {