库存事务类型入库出库下拉框多选修改

fe/PC/src/components/currenForm/index.vue

@@ -216,7 +216,7 @@
             >
             <el-option
               v-for="(op, index) in selectOptions(item.options) ||
-              searchOptions['options']"
+              item.searchOptions"
               :label="op[item.optionsLabel] || op.label"
               :value="op[item.optionsValue] || op.value"
               :key="index"

fe/PC/src/utils/tabsDesTions/index.js

@@ -493,8 +493,8 @@ export const TransactionType = [
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   { label: "是否可用", prop: 'enabled', type: "filter", filters: "whetherOrNot" },
   { label: "描述", prop: 'description' },
-  { label: "入库库区列表", prop: 'inLocationAreas', type: "filterList", filters: "inventoryStage" },
-  { label: "出库库区列表", prop: 'outLocationAreas', type: "filterList", filters: "inventoryStage" },
+  { label: "入库库区列表", prop: 'inLocationAreas' },
+  { label: "出库库区列表", prop: 'outLocationAreas' },
   { label: "备注", prop: 'remark' },
   { label: "事务ID", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },

fe/PC/src/views/basicData/WarehouseManage/TransactionType.vue

@@ -55,6 +55,23 @@
       @importClick="postImportMergeClick(arguments)"
       @postImportDown="importDown"
     ></importFile>
+    <!-- 搜索按钮——窗体组件 -->
+    <searchPage
+      ref="searchTable"
+      :tableLoading="Loading.autoTableLoading"
+      :advancedFilter="advancedFilter()"
+      :filterPageListParams="filterPageListParams"
+      :formTitle="searchTitle"
+      :displayDialog="displayDialog.AddNewDialog"
+      :searchTableData="searchData"
+      :searchTableColumns="searchColumns"
+      :searchTotalCount="searchTotalCount"
+      :supplierItemPage="searchPageListParams"
+      @handleSelectionChange="prepareFormData"
+      @SizeChange="searchAlterResultCount($event, searchPageListParams)"
+      @CurrentChange="searchAlertoldSkipCount($event, searchPageListParams)"
+      @tableButtonClick="searchSubmit(arguments)"
+    ></searchPage>
     <curren-Drawer
       :title="tableColumns"
       :tableColumns="tableColumns"
@@ -70,7 +87,7 @@
   </div>
 </template>
 <script>
-import { postCreate, postUpdate } from "@/api/wms-api"
+import { postCreate, postUpdate, getPageList } from "@/api/wms-api"
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
@@ -78,6 +95,8 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins"
 import { itemStatus, locationType, ItemType, inventoryStage } from '@/filters/status'
+import { filterSelectMixins } from '@/mixins/filter-Select'
+import { getList } from '@/views/gridLayout/components/gridLayout'
 export default {
   name: "TransactionType",
   mixins: [
@@ -86,6 +105,7 @@ export default {
     drawerMixins,
     TableHeaderMixins,
     mixins,
+    filterSelectMixins,
     newAndEdiDialogMixins
   ],
   watch: {
@@ -165,16 +185,14 @@ export default {
         { 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: "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: "inLocationAreas", searchOptions: this.searchOptions(), colSpan: 12 },
+        { type: "selectArray", label: "出库库区清单", prop: "outLocationAreas", searchOptions: this.searchOptions(), 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: "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 }, 
@@ -200,6 +218,28 @@ export default {
     this.paging();
   },
   methods: {
+    searchOptions() {
+      let rs = []
+      let params = {
+        condition: {
+          filters: []
+        },
+        Sorting: "",
+        SkipCount: 0,
+        MaxResultCount: 1000
+      }
+      getPageList(params, 'basedata/area').then(res => {
+        res.items.forEach(item => {
+          let itemObject = {
+            label: item.name,
+            value: item.name
+          }
+          rs.push(itemObject)
+        })
+      }).catch(err => {
+      })
+      return rs
+    },
     //提交表单
     FormSubmit(val) {
       this.ref = val
@@ -250,6 +290,9 @@ export default {
           });
           this.editFormData.inInventoryStatuses = inInventoryStatusesStr.substring(0,inInventoryStatusesStr.length-1)
 
+          this.editFormData.inLocationAreas = this.editFormData.inLocationAreas + ""
+          this.editFormData.outLocationAreas = this.editFormData.outLocationAreas + ""
+
           postUpdate(this.editFormData, this.propsData.id, this.URL).then(res => {
             this.propsData = res
             this.Loading.newAndEdiLoading = false