From 894629487446f0bb14667be69f7184f541e4e896 Mon Sep 17 00:00:00 2001
From: zhaoyiran <yiran_zhao6@163.com>
Date: Mon, 23 Dec 2024 16:59:16 +0800
Subject: [PATCH] =?UTF-8?q?YT-1758=E4=BF=AE=E6=94=B9=E8=A6=81=E8=B4=A7?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=96=B0=E5=A2=9E=E6=97=B6=E5=8F=97=E5=85=A5?=
 =?UTF-8?q?=E5=8F=B7=E7=9A=84=E6=98=BE=E7=A4=BA=E3=80=82=E5=8F=97=E5=85=A5?=
 =?UTF-8?q?=E5=8F=B7=E6=98=AF=E7=89=A9=E6=96=99=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=AD=E5=B1=9E=E6=80=A7=E4=B8=8D=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=8F=97=E5=85=A5?=
 =?UTF-8?q?=E5=8F=B7=E4=B8=BA=E7=A9=BA=E5=88=99=E7=9B=B4=E6=8E=A5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableForm/src/TableForm.vue           |  2 +-
 .../supplierdeliver/purchasePlanMain/index.vue       | 12 +++++++++++-
 .../purchasePlanMain/purchasePlanMain.data.ts        |  5 +++--
 3 files changed, 15 insertions(+), 4 deletions(-)

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
       }
     },
     {