diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 53d983090..d7241c457 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -678,8 +678,8 @@ const onBlur = (field, e) => { * @param field 当前操作字段 * @param e */ -const onEnter = (field, e) => { - emit('onEnter', field, e) +const onEnter = (field,value, e) => { + emit('onEnter', field,value, e) } // 修改盘点类型 diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue index 6dfbcc921..7aa98c2a1 100644 --- a/src/components/Form/src/Form.vue +++ b/src/components/Form/src/Form.vue @@ -248,7 +248,7 @@ export default defineComponent({ { if(event.keyCode === 13){ //回车 - emit('onEnter',item.field,event) + emit('onEnter',item.field,formModel.value[item.field],event) } }} v-slots={{ suffix: () => ( @@ -282,7 +282,7 @@ export default defineComponent({ { if(event.keyCode === 13){ //回车 - emit('onEnter',item.field,event) + emit('onEnter',item.field,formModel.value[item.field],event) } }} disabled={item?.componentProps?.enterSearch?false:true} v-slots={{ suffix: () => ( diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index 4916ccec7..b6a64f14a 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -57,6 +57,7 @@ @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" @formFormDateChange="formFormDateChange" + @onEnter="onEnter" /> const newRow = val[0] newRow['poNumber'] = val[0]['number'] // 请求明细数据 - getSearchTableData(val[0]['number'],val[0]['supplierCode']) + getSearchTableData(val[0]['number']) // tableData.value = [newRow] // formRef.handleAddTable() } @@ -372,7 +373,7 @@ const labelPrint = async (row) => { } -const getSearchTableData = async (number,supplierCode)=>{ +const getSearchTableData = async (number,isEnter=false)=>{ const {tableObject ,tableMethods} = useTable({ defaultParams:{number}, getListApi: PurchaseDetailApi.getPurchaseDetailPage // 分页接口 @@ -391,14 +392,16 @@ const getSearchTableData = async (number,supplierCode)=>{ newRow['itemCode'] = row['itemCode'] newRow['uom'] = row['uom'] newRow['poNumber'] =row['number'] - let queryData = { - supplierCode, - itemCode:row['itemCode'] - } - SupplieritemApi.getDefaultLocationCode(queryData as SupplieritemApi.SupplieritemVO).then(res =>{ - newRow['defaultToLocationCode'] = res - tableData.value.push(newRow) - }) + newRow['defaultToLocationCode'] =row['defaultLocation'] + tableData.value.push(newRow) + if(isEnter){ + //回车--供应商代码 + const setV = {} + setV['poNumber'] = number + setV['supplierCode'] = row.supplierCode + formRef.value.formRef.setValues(setV) + + } }) } /** 添加/修改操作 */ @@ -566,7 +569,10 @@ const handleAddTable = () => { const handleDeleteTable = (item, index) => { tableData.value.splice(index, 1) } - +const onEnter = async (field,value)=>{ + console.log(field,value) + getSearchTableData(value,true) +} // 主子数据 提交 const submitForm = async (formType, data) => { data.subList = tableData.value // 拼接子表数据参数 diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 19946a9ce..00571e37b 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -59,6 +59,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择采购订单', // 输入框占位文本 searchField: 'number', // 查询弹窗赋值字段