From 838abafb8051a87fb0e915f094d31586ff84cf55 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 4 Dec 2024 14:44:25 +0800
Subject: [PATCH] =?UTF-8?q?YT-1506=E5=AE=A2=E6=88=B7=E5=AF=B9=E8=B4=A6?=
 =?UTF-8?q?=E5=8D=95-=E6=A8=A1=E5=85=B7=E5=88=86=E6=91=8A=E5=AF=B9?=
 =?UTF-8?q?=E8=B4=A6=E5=8D=95=EF=BC=8C=E5=88=86=E6=91=8A=E4=B8=AD=E5=BA=94?=
 =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9=E9=87=91=E9=A2=9D=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E6=98=AF=E5=88=86=E6=91=8A=E7=8A=B6=E6=80=81=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=8E=B0=E5=88=86=E6=91=8A=E4=B8=AD?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue       |  9 +++++++++
 .../countadjustRecordMain.data.ts                | 16 ++++++++--------
 .../moldAllocation/customerStatement/index.vue   |  5 ++---
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 0c71124df..e589c27dd 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -674,6 +674,15 @@ watch(
     deep: true
   }
 )
+watch(
+  () => props.formAllSchemas,
+  (val) => {
+    formSchema.value = val.formSchema
+  },
+  {
+    deep: true
+  }
+)
 let originFormModel = {}
 const updateOriginFormModel = (data) => {
   originFormModel = JSON.parse(JSON.stringify(data))
diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
index 4d79d87fb..2702e1c3b 100644
--- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
+++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts
@@ -156,14 +156,14 @@ export const CountadjustRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '部门',
-    field: 'departmentCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  // {
+  //   label: '部门',
+  //   field: 'departmentCode',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   // {
   //   label: '接口类型',
   //   field: 'interfaceType',
diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
index 4f4f26c84..b18029692 100644
--- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
+++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
@@ -117,7 +117,7 @@
     <template #adjustmentAmount="{ row }" v-if="tabCurrent.prop == 'ShareReconciliation'">
       <div style="position: relative">
         <span>{{ row.adjustmentAmount }}</span>
-        <Icon v-if="row.status==4"
+        <Icon v-if="chooseRow.status==4"
           icon="ep:edit"
           color="#409eff"
           @click="openDetailForm(row)"
@@ -655,6 +655,7 @@ const changeTabs = async (item) => {
     ]
     apiPage.value = CustomerStatementDetailApi.getCustomerToolApportStatementPage
     DetailAllSchemas.value = CustomerStatementShareReconciliation.allSchemas
+console.log(555,DetailAllSchemas.value)
     otherHeadButttonData.value = [
       {
         label: t(`ts.导出`).replace('ts.', ''),
@@ -794,8 +795,6 @@ const openDetailForm = (row) => {
 }
 // 调整金额提交
 const handleDetailSubmitForm = async (formType, data) => {
-  console.log(detailRef.value.tableObjectRef.tableList)
-  
   await CustomerStatementDetailApi.updateAdjustmentAmount(data.id,data.masterId,data.adjustmentAmount)
   message.success(t('common.updateSuccess'))
   detailRef.value.submitUpdateList()