diff --git a/src/components/SearchForm/index.vue b/src/components/SearchForm/index.vue index 6959bb3..9e90bed 100644 --- a/src/components/SearchForm/index.vue +++ b/src/components/SearchForm/index.vue @@ -171,6 +171,23 @@ > + + diff --git a/src/views/foundation/set/warehouse/constant/list/details.ts b/src/views/foundation/set/warehouse/constant/list/details.ts index a1b23f5..18aa55d 100644 --- a/src/views/foundation/set/warehouse/constant/list/details.ts +++ b/src/views/foundation/set/warehouse/constant/list/details.ts @@ -22,7 +22,7 @@ export const DETAILS_FORM_DATA: any[] = [ { prop: "kd_subwarehouse_number", placeholder: "请选择", - type: "selectMultiples", + type: "selectMultiple", label: "金蝶子仓库:", disabled: false, class: "form-item1", @@ -31,7 +31,7 @@ export const DETAILS_FORM_DATA: any[] = [ { prop: "jst_warehouse_number", placeholder: "请选择", - type: "select", + type: "selectMultipleD", label: "对应聚水潭仓库:", disabled: false, class: "form-item1", @@ -40,7 +40,7 @@ export const DETAILS_FORM_DATA: any[] = [ { prop: "lx_warehouse_number", placeholder: "请选择", - type: "select", + type: "selectMultipleD", label: "对应领星仓库:", disabled: false, class: "form-item1", diff --git a/src/views/shipment/outbound/shipmentOrder/constant/list/search.ts b/src/views/shipment/outbound/shipmentOrder/constant/list/search.ts index a7de643..ac45f74 100644 --- a/src/views/shipment/outbound/shipmentOrder/constant/list/search.ts +++ b/src/views/shipment/outbound/shipmentOrder/constant/list/search.ts @@ -20,22 +20,19 @@ export const FORM_DATA: FormItem[] = [ prop: "securityNumbers", placeholder: "请输入来源单号", type: "input", - isArray: true, label: "来源单号: " }, { prop: "lotNumbers", - placeholder: "请选择收货类型", + placeholder: "请选择来源类型", type: "select", - isArray: true, - label: "收货类型: ", + label: "来源类型: ", options: [] }, { prop: "lotNumbers", placeholder: "请选择仓库", type: "select", - isArray: true, label: "仓库: ", options: [] }, @@ -43,34 +40,23 @@ export const FORM_DATA: FormItem[] = [ prop: "Time", type: "daterange", options: [], - startPlaceholder: "收货开始日期", - endPlaceholder: "收货结束日期", + startPlaceholder: "创建开始日期", + endPlaceholder: "创建结束日期", startDate: "createBeginDate", endDate: "createEndDate", - label: "收货时间: " + label: "创建日期: " + }, + { + prop: "securityNumbers", + placeholder: "请输入编码,型号,名称", + type: "input", + label: "物料: " }, { prop: "lotNumbers", - placeholder: "请选择供应商", + placeholder: "请选择发货状态", type: "select", - isArray: true, - label: "供应商: ", - options: [] - }, - { - prop: "materialNumber", - placeholder: "请输入物料编码", - type: "selectRemote1", - isArray: true, - options: [], - label: "物料编码: " - }, - { - prop: "lotNumbers", - placeholder: "请选择收货状态", - type: "select", - isArray: true, - label: "收货状态: ", + label: "发货状态: ", options: [] }, { @@ -78,30 +64,50 @@ export const FORM_DATA: FormItem[] = [ placeholder: "请选择组织", type: "select", isArray: true, - label: "组织: " + label: "组织: ", + options: [] }, - { prop: "securityNumbers", - placeholder: "请输入收货人", + placeholder: "请输入收货客户", type: "input", - isArray: true, - label: "收货人: " + label: "收货客户: " }, - { prop: "securityNumbers", placeholder: "请输入箱号", - type: "input", + type: "inputBtn", isArray: true, label: "箱号: " }, { prop: "securityNumbers", placeholder: "请输入序列号", - type: "input", + type: "inputBtn", isArray: true, label: "序列号: " + }, + { + prop: "securityNumbers", + placeholder: "请输入调入仓库", + type: "input", + + label: "调入仓库: " + }, + { + prop: "securityNumbers", + placeholder: "请输入单号", + type: "inputBtn", + label: "单号: ", + isArray: true + }, + { + prop: "lotNumbers", + placeholder: "请选择组织", + type: "select", + isArray: true, + label: "拣货类型: ", + options: [] } ];