Merge branch 'dev_web' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_web

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: {