diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index bdeb41002..4977efef5 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -266,6 +266,12 @@ const props = defineProps({ required: false, default: false }, + // TableForm 的第几列按钮 + indexTableColumn :{ + type: Number, + required: false, + default: 0 + } }) const { t } = useI18n() // 国际化 @@ -576,7 +582,7 @@ const handleAddTable = () => { tableAllSchemas.value.tableFormColumns.forEach(item => { tableFormKeys[item.field] = item.default ? item.default : '' }) - inpuFocus(tableAllSchemas.value.tableFormColumns[0],tableFormKeys,0) + inpuFocus(tableAllSchemas.value.tableFormColumns[props.indexTableColumn],tableFormKeys,0) }else{ emit('handleAddTable') } diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue index ac0a5bd4d..645d5f1eb 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue @@ -28,6 +28,8 @@ 0){ - subList.forEach((item) => { - if(item.itemCode == val[0]['itemCode']){ - flag = true; + const repeatCode = [] //重复数据 + if(tableData.value.length > 0){ + tableData.value.forEach((item) => { + const findIndex = val.findIndex(valItem=>valItem['itemCode']==item.itemCode) + if(findIndex > -1){ + val.splice(findIndex,1) + repeatCode.push(item.itemCode) } }) } - if(flag){ - message.warning("物料代码已经存在"); - return; + if(repeatCode.length>0){ + message.warning(`物料代码${repeatCode.join(',')}已经存在`); } - row[formField] = val[0][searchField] - await ItembasicApi.getItembasicPage({ - code: row['itemCode'] - }).then(res => { - row['uom'] = res.list[0].uom - }) + if(val.length>0){ + val.forEach(item=>{ + const newRow = {...row} + newRow[formField] = item[searchField] + tableData.value.push(newRow) + }) + const itemCodes = val.map(valItem=>valItem['itemCode']) + await ItembasicApi.getItembasicPage({ + code: itemCodes.join(',') + }).then(res => { + row['uom'] = res.list[0].uom + }) + } + } } else { const setV = {} diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts index 023d6051e..8d5b70a15 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts @@ -400,6 +400,7 @@ export const PurchaseDetail = useCrudSchemas(reactive([ width: 150 }, tableForm:{ + multiple:true,//多选 isInpuFocusShow: true, searchListPlaceholder: '请选择供应商物料', searchField: 'itemCode',