diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index f24522097..35c8ffc4d 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -97,7 +97,7 @@ :type="headerItem?.tableForm?.inputType" :placeholder=" t( - `ts.${headerItem?.tableForm?.placeholder || '请输入' + headerItem.label}` + `ts.${headerItem?.tableForm?.isPlaceholder === false ? '' :( headerItem?.tableForm?.placeholder || '请输入' + headerItem.label)}` ).replace('ts.', '') " :disabled="itemIsDisabled(headerItem, row)" diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 5a5676cdc..19bef105e 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -203,7 +203,7 @@ const { loadStart, loadDone } = usePageLoading() val.forEach(item=>{ if(tableData.value.find(item1=>item1['id'] == item['id'])) return const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row})) - + newRow[formField] = item[searchField] newRow['itemCode'] = item['code'] newRow['poNumber'] = item['number'] @@ -232,6 +232,16 @@ const { loadStart, loadDone } = usePageLoading() setV['itemCode'] = val[0]['code'] setV['poNumber'] = val[0]['number'] setV['poLine'] = val[0]['lineNumber'] + setV['receivedNumber'] = val[0]['receivedNumber'] + console.log(PurchasePlanDetail.allSchemas.tableFormColumns); + + PurchasePlanDetail.allSchemas.tableFormColumns.forEach(item =>{ + if(item.value == ''){ + if(item.field == 'receivedNumber'){ + item.tableForm.placeholder = '' + } + } + }) if(formField == 'supplierCode'){ setV['supplierCode'] = val[0]['code'] diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 34b72cab6..030754ab9 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -843,8 +843,9 @@ export const PurchasePlanDetail = useCrudSchemas( } }, tableForm: { - type: 'Select', - disabled: true + // type: 'Select', + disabled: true, + isPlaceholder:true } }, {