From 83eb5c4e4884952a6fa8d4bfa8b94da6a842124a Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Mon, 23 Jun 2025 11:04:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?YT-2798=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A1=AB=E5=86=99=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=9A=84=E6=97=B6=E5=80=99=E5=9B=9E=E8=BD=A6?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B9=8B=E5=90=8E=E4=BF=9D=E5=AD=98=E8=BF=98=E6=98=AF?=
 =?UTF-8?q?=E7=A6=81=E6=AD=A2=E7=82=B9=E5=87=BB=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index ac097cae2..3934c0008 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -1189,6 +1189,13 @@ const onEnter = async (field, value, e) => {
         if (list.length != 0) {
          emit('onEnter', field, value, e)
         }
+        if (props.isShowFooterButtton && !props.footButttondata) {
+          Butttondata = [
+            defaultButtons.formSaveBtn(null), // 保存
+            defaultButtons.formCloseBtn(null) // 关闭
+          ]
+          count.value++
+        }
       }
     )
   } else {

From e9b78b830ebeac25d5796c562cb07cc1d429e5e1 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Mon, 23 Jun 2025 17:02:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=9B=98=E7=82=B9=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96-=E7=9B=98=E7=82=B9=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=E8=A1=A8=E5=A4=B4=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B0=83=E6=95=B4=E9=87=91=E9=A2=9D=E5=90=88?=
 =?UTF-8?q?=E8=AE=A1=EF=BC=88=E6=A0=87=E5=87=86=E6=88=90=E6=9C=AC=E5=8D=95?=
 =?UTF-8?q?=E4=BB=B7*=E7=9B=98=E7=82=B9=E5=B7=AE=E5=BC=82=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=EF=BC=8C=E7=B4=AF=E5=90=88=E8=AE=A1=EF=BC=89=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../countadjustRequestMain.data.ts            | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
index 3a293baad..0cbf56894 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts
@@ -115,6 +115,29 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
       }
     }
   },
+
+    {
+    label: '调整金额合计',
+    field: 'allAdjustmentPrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 2
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 2
+    }
+  },
+
+
   {
     label: '申请时间',
     field: 'requestTime',
@@ -525,6 +548,47 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       min: 1,
       precision: 6
     }
+  },
+    {
+    label: '标准成本价格',
+    field: 'standardCostPrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+
+      {
+    label: '调整后金额',
+    field: 'adjustmentPrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 2
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 2
+    }
   },
   {
     label: '仓库代码',