diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index c893fa868..60595d56e 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -130,6 +130,7 @@ const opensearchTable = (formField, searchField, searchTitle, searchAllSchemas, const _searchTableTitle = searchTitle const _searchTableAllSchemas = searchAllSchemas const _searchTablePage = searchPage + console.log(_searchTablePage) searchTableRef.value.open(_searchTableTitle, _searchTableAllSchemas, _searchTablePage, formField, searchField, type, row) } // 弹层确定返回所选数据 @@ -294,6 +295,9 @@ const handleAddTable = () => { } // 输入框聚焦 const inpuFocus = (headerItem, row, index) => { + console.log(11) + console.log(headerItem) + console.log(11) opensearchTable( headerItem.field, headerItem.tableForm.searchField, diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index 442cd0a40..10b156350 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -57,16 +57,16 @@ + :prop="headerItem.field" style="display: flex;align-items: center;"> + { } // 输入框聚焦 const inpuFocus = (headerItem, row, index)=>{ - if(headerItem?.tableForm?.isInpuFocusShow){ + if(headerItem?.tableForm?.isSearchList){ emit('inpuFocus', headerItem, row, index) } } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue index 537b21a57..45a1027ea 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue @@ -138,7 +138,7 @@ const formData = ref({ // 按库位拆分 { ParamCode: 'ByLocation', Value: true }, // 按器具拆分 - { ParamCode: 'ByContainer', Value: 'false' }, + { ParamCode: 'ByContainer', Value: false }, // 每个任务明细数量 { ParamCode: 'JobDetailCount', Value: 0 }, ] @@ -244,6 +244,13 @@ const submitForm = async () => { if (!formRef) return const valid = await formRef.value.validate() if (!valid) return; + let onlyOne = formData.value.configuration.filter(item=>{ + return item.Value == true + }) + if(onlyOne?.length !=1){ + message.error('只能选择一种拆分方式') + return + } // 提交请求 formLoading.value = true try { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts index 2a153ddf9..7e134e4f1 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts @@ -336,6 +336,9 @@ export const PurchaseDetail = useCrudSchemas(reactive([ table: { width: 150 }, + tableForm:{ + isSearchList: true, // 开启查询弹窗 + } }, { label: 'ERP库位', diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts index 49ad70f70..79c0cdb08 100644 --- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts +++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts @@ -334,7 +334,7 @@ export const PurchaseclaimRequestDetail = useCrudSchemas(reactive( label: '订单号', field: 'poNumber', tableForm:{ - isInpuFocusShow: true, + isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择订单号', searchField: 'poNumber', searchTitle: '供应商发货记录',