From 76693f78858dca45b25cea9e64695c27fbe402c9 Mon Sep 17 00:00:00 2001
From: songguoqiang <yiran_zhao6@163.com>
Date: Tue, 29 Jul 2025 11:58:38 +0800
Subject: [PATCH 1/5] =?UTF-8?q?YT-2929:=E7=89=A9=E6=96=99=E9=9A=94?=
 =?UTF-8?q?=E7=A6=BB=E9=9C=80=E8=A6=81=E6=94=AF=E6=8C=81=E7=BA=BF=E8=BE=B9?=
 =?UTF-8?q?=E8=B4=9F=E5=BA=93=E5=AD=98=E7=9A=84=E9=9A=94=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorymoveRequestMainOKHOLD/index.vue  | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
index eb280d862..c222d6d06 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
@@ -745,13 +745,30 @@ const submitForm = async (formType, submitData) => {
     return
   }
   data.subList = tableData.value // 拼接子表数据参数
-  const cmdExists = data.subList.some(filter =>
-    parseFloat(filter.inventoryQty) < parseFloat(filter.qty)
-  );
-  if(cmdExists){
-    message.warning("数量不能大于库存数量")
-    return
-  }
+  const cmdExists = data.subList.some(filter => 
+  parseFloat(filter.inventoryQty) > 0 && parseFloat(filter.inventoryQty) < parseFloat(filter.qty)
+);
+if(cmdExists){
+  message.warning("库存数量为正式，则数量不能大于库存数量")
+  return
+}
+// 1. 筛选出 inventoryQty <= 0 的记录，并提取它们的 itemCode
+const zeroInventoryItems = data.subList.filter(item => parseFloat(item.inventoryQty) <= 0 && (item.itemType == 'SUB' || item.itemType == 'FG'))
+  .map(item => item.itemCode);
+var isRemark = "";
+  // 2. 如果有库存不足的商品，拼接提示信息
+if (zeroInventoryItems.length > 0) {
+  const str = zeroInventoryItems.join(", "); // 用逗号分隔 itemCode
+  // 删除的二次确认
+    isRemark = str+"是半成品/产成品，请先做生产申请后再进行隔离。"
+    await message.delConfirm(str+"是半成品/产成品，请先做生产申请后再进行隔离。")
+}
+// // 检查库存数量是否小于等于0
+// const zeroInventory = data.subList.some(filter => parseFloat(filter.inventoryQty) <= 0 && (filter.itemType == 'SUB' || filter.itemType == 'FG') );
+// if(zeroInventory){
+//    // 删除的二次确认
+//     await message.delConfirm("[品番]是半成品/产成品，请先做生产申请后再进行隔离。")
+// }
   // let isExist = false
   // tableData.value.forEach(item => {
   //   item['toLocationCode'] = toLocationCode
@@ -765,6 +782,7 @@ const submitForm = async (formType, submitData) => {
   //   return message.warning('物料号重复')
   // }
   flag.value = false
+  data.remark = isRemark
   data.subList.forEach(item => {
     console.log(556565,item);
     if(fromInventoryStatus.value){

From 5b54d15421be5abb82173dc9e5732e413c626c0a Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Tue, 29 Jul 2025 13:59:54 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=89=93=E5=88=87=E5=93=81=E7=95=AA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicDataManage/cutItem/cutItem.data.ts   | 73 ++++++++++++-------
 1 file changed, 47 insertions(+), 26 deletions(-)

diff --git a/src/views/wms/basicDataManage/cutItem/cutItem.data.ts b/src/views/wms/basicDataManage/cutItem/cutItem.data.ts
index d5141a5e0..d10d643f5 100644
--- a/src/views/wms/basicDataManage/cutItem/cutItem.data.ts
+++ b/src/views/wms/basicDataManage/cutItem/cutItem.data.ts
@@ -105,33 +105,54 @@ export const CutItem = useCrudSchemas(
       isSearch: false
     },
 
+    // {
+    //   label: '开始日期',
+    //   field: 'beginDate',
+    //   sort: 'custom',
+    //   formatter: dateFormatter,
+    //   table: {
+    //     width: 180
+    //   },
+    //   search: {
+    //     component: 'DatePicker',
+    //     componentProps: {
+    //       valueFormat: 'YYYY-MM-DD HH:mm:ss',
+    //       type: 'daterange',
+    //       defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+    //     }
+    //   },
+    //   form: {
+    //     component: 'DatePicker',
+    //     componentProps: {
+    //       type: 'datetime',
+    //       valueFormat: 'x'
+    //     }
+    //   },
+    //   detail: {
+    //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    //   }
+    // },
+
     {
-      label: '开始日期',
-      field: 'beginDate',
-      sort: 'custom',
-      formatter: dateFormatter,
-      table: {
-        width: 180
-      },
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
-      form: {
-        component: 'DatePicker',
-        componentProps: {
-          type: 'datetime',
-          valueFormat: 'x'
-        }
-      },
-      detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
-      }
-    },
+          label: '开始日期',
+          field: 'beginDate',
+          sort: 'custom',
+          formatter: dateFormatter2,
+          form: {
+            component: 'DatePicker',
+            componentProps: {
+              format: 'YYYY-MM-DD',
+              valueFormat: 'x',
+              
+            }
+          },
+          table: {
+            width: 150
+          },
+          detail: {
+            dateFormat:'YYYY-MM-DD'
+          }
+        },
     {
       label: '创建者',
       field: 'creator',

From c6819dfcf24f1e234a8b2f4d8a201ad636d9be10 Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Tue, 29 Jul 2025 16:08:20 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/inventoryManage/balance/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
index 6f7ae668b..6f4e00d8b 100644
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -299,7 +299,7 @@ const butttondata = (row) => {
   //   float: 'right',
   //   hasPermi: ''
   // },
-  defaultButtons.mainListCreatePointBtn({hide: isShowPointBtn(row)}  ) // 标签打印
+  defaultButtons.mainListCreatePointBtn(null ) // 标签打印
   // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑
   // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除
   ]

From dc27834baa19d40700d76349c269554c6721d606 Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Wed, 30 Jul 2025 08:48:09 +0800
Subject: [PATCH 4/5] =?UTF-8?q?YT-2909=E5=AE=A2=E6=88=B7=E5=AF=B9=E8=B4=A6?=
 =?UTF-8?q?=E5=8D=95=E4=B8=AD=EF=BC=8C=E5=AF=B9=E8=B4=A6=E5=B7=AE=E5=BC=82?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=9A=84=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8EWMS=E4=B8=AD=E6=98=8E=E7=BB=86=E7=8E=B0=E5=AE=9E?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=EF=BC=8C=E6=9C=89=E6=97=B6=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E7=9A=84=E6=95=B0=E6=8D=AE=E4=BC=9A=E4=B8=8E=E5=B7=AE?=
 =?UTF-8?q?=E5=BC=82=E6=95=B0=E6=8D=AE=E6=9D=A1=E6=95=B0=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=EF=BC=8C=E5=A4=A7=E5=A4=9A=E6=95=B0?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E6=98=AF=E5=A5=BD=E4=BD=BF=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/src/Detail.vue          | 316 +++++++++---------
 .../customerStatement/index.vue               |  12 +-
 2 files changed, 165 insertions(+), 163 deletions(-)

diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 19854cc1e..3ee53d63e 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -12,178 +12,180 @@
           {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ t(`ts.${titleNameRef}`).replace('ts.','') }}</span>
         </div>
       </template>
-      <Tabs ref="tabRef" :tabsList="tabsList" :current="current" @change="change"/>
-      <ContentWrap v-if="!isBasic" v-show="tabsList[current].label=='主数据'">
-        <Descriptions
-          :data="detailData"
-          labelClassName="label-class-name"
-          label-align="left"
-          :direction="direction"
-          :column="column"
-          :schema="allSchemas.detailSchema"
-          :columns="2"
-          width="200px"
-        >
-          <template v-for="name in Object.keys($slots)" :key="name" #[name]="{ row }">
-            <slot :name="name" :row="row"></slot>
-          </template>
-        </Descriptions>
-      </ContentWrap>
-      <div class="flex">
-        <!-- 详情 -->
-        <ContentWrap class="w-[100%]" v-show="tabsList[current].label!=annexAlias.label&&tabsList[current].label!='备注'&&tabsList[current].label!='变更记录'&&tabsList[current].label!='主数据'&&!annexTableData.some(item=>item.label==tabsList[current].label)">    
-          <!-- 列表头部 -->
-          <TableHead
-            v-if="!isBasic&&!slotDetailTabList.some(item=>item.label==tabsList[current].label)"
-            :HeadButttondata="HeadButttondata"
-            :masterId="masterParmas.masterId"
-            @button-base-click="buttonBaseClick"
-            :routeName="routeName"
-            @searchFormClick="searchFormClick"
-            :allSchemas="detailAllSchemas"
-            :key="updateKey"
-          />
-          <!-- 默认单表展现 -->
+      <div v-loading="detailLoading">
+        <Tabs ref="tabRef" :tabsList="tabsList" :current="current" @change="change"/>
+        <ContentWrap v-if="!isBasic" v-show="tabsList[current].label=='主数据'">
           <Descriptions
-            v-if="isBasic && !tabsExtend"
             :data="detailData"
+            labelClassName="label-class-name"
+            label-align="left"
+            :direction="direction"
+            :column="column"
             :schema="allSchemas.detailSchema"
             :columns="2"
-            :key="updateKey"
-          />
-          <!-- 检验工序用到插槽 -->
-          <slot v-if="isBasic && !tabsExtend" :data="detailData" name="basicBottom" :key="updateKey"></slot>
-          <!-- 单表切换tabs 展现table -->
-          <Table
-            v-if="isBasic && tabsExtend"
-            :columns="detailAllSchemasRef.tableColumns"
-            :data="tableObjectRef.tableList"
-            :loading="tableObjectRef.loading"
-            :pagination="{ total: tableObjectRef.total }"
-            v-model:pageSize="tableObjectRef.pageSize"
-            v-model:currentPage="tableObjectRef.currentPage"
-            v-model:sort="tableObjectRef.sort"
-            :isShowPackNumber="isShowPackNumber"
-            
-          >
-            <!-- <template #action="{ row }">
-              <ButtonBase
-                :Butttondata="buttondata(row)"
-                @button-base-click="buttonTableClick($event, row)"
-              />
-            </template> -->
-          </Table>
-          <Table
-            v-if="!isBasic && fromeWhere != 'countPlan'&&!slotDetailTabList.some(item=>item.label==tabsList[current].label)"
-            :columns="detailAllSchemasRef.tableColumns"
-            :data="tableObjectRef.tableList"
-            :loading="tableObjectRef.loading"
-            :pagination="{ total: tableObjectRef.total }"
-            v-model:pageSize="tableObjectRef.pageSize"
-            v-model:currentPage="tableObjectRef.currentPage"
-            v-model:sort="tableObjectRef.sort"
-            :isShowPackNumber="isShowPackNumber"
+            width="200px"
           >
             <template v-for="name in Object.keys($slots)" :key="name" #[name]="{ row }">
               <slot :name="name" :row="row"></slot>
             </template>
-            <template #photos="{ row }">
-              <div v-for="(item,index) in row.photos.split(',')" :key="index" style="color:#409eff ; cursor: pointer;" @click="openImage(item)">{{ item }}</div>           
-            </template>
-            <template #differencePrice="{row}">
-              <slot name="differencePrice" :row="row"></slot>
-            </template>
-            <template #action="{ row }">
-              <ButtonBase
-                :Butttondata="buttondata(row)"
-                @button-base-click="buttonTableClick($event, row)"
-              />
-            </template>
-          </Table>
-          <slot v-if="slotDetailTabList.some(item=>item.label==tabsList[current].label)" :name="slotDetail.prop" v-for="slotDetail in slotDetailTabList"></slot>
-          <DetailTable
-            v-if="!isBasic && fromeWhere == 'countPlan' && isShowDrawer"
-            :columns="detailAllSchemasRef.tableColumns"
-            :data="tableObjectRef.tableList"
-            :allList="allList"
-            :countScopeType="countScopeType"
-            :key="updateKey"
-          >
-            <template #action="{ row }">
-              <ButtonBase
-                :Butttondata="buttondata(row)"
-                @button-base-click="buttonTableClick($event, row)"
-              />
-            </template>
-          </DetailTable>
+          </Descriptions>
         </ContentWrap>
-        <!-- other附件组件:如质检明细 -->
-        <div  v-for="(annexItem ,index) in annexTableData" :key="index" v-show="annexItem.label==tabsList[current].label"  class="w-[100%]" :style="{height:annexItem.hasSubDetail?'100%':remarkHeight+'px'}">
-          <ContentWrap  class="w-[100%]">
-            <ElScrollbar ref="scrollbar" :style="{height:annexItem.hasSubDetail?'100%':(remarkHeight-40)+'px'}">
-              <Annex v-show="tabsList[current].label==annexItem.label"
-                  :annexData="annexItem"
-                  :fileType="annexItem.fileType"
-                  :limit="annexItem.limit"
-                  :fileSize="annexItem.fileSize"
-                  :showAddBtn="!annexItem.hiddenUpload"
-                  :showPreview="annexItem.showPreview"
-                  :showDownload = "annexItem.showDownload"
-                  :hiddenDelete = "annexItem.hiddenDelete"
-                  @handleAnnexSuccess="updateAnnexTableHandle"
-                  @deleteAnnexSuccess="updateAnnexTableHandle"
-                  :upData="{...remarksData.data,tableName:annexItem.tableName}"
+        <div class="flex">
+          <!-- 详情 -->
+          <ContentWrap class="w-[100%]" v-show="tabsList[current].label!=annexAlias.label&&tabsList[current].label!='备注'&&tabsList[current].label!='变更记录'&&tabsList[current].label!='主数据'&&!annexTableData.some(item=>item.label==tabsList[current].label)">    
+            <!-- 列表头部 -->
+            <TableHead
+              v-if="!isBasic&&!slotDetailTabList.some(item=>item.label==tabsList[current].label)"
+              :HeadButttondata="HeadButttondata"
+              :masterId="masterParmas.masterId"
+              @button-base-click="buttonBaseClick"
+              :routeName="routeName"
+              @searchFormClick="searchFormClick"
+              :allSchemas="detailAllSchemas"
+              :key="updateKey"
+            />
+            <!-- 默认单表展现 -->
+            <Descriptions
+              v-if="isBasic && !tabsExtend"
+              :data="detailData"
+              :schema="allSchemas.detailSchema"
+              :columns="2"
+              :key="updateKey"
+            />
+            <!-- 检验工序用到插槽 -->
+            <slot v-if="isBasic && !tabsExtend" :data="detailData" name="basicBottom" :key="updateKey"></slot>
+            <!-- 单表切换tabs 展现table -->
+            <Table
+              v-if="isBasic && tabsExtend"
+              :columns="detailAllSchemasRef.tableColumns"
+              :data="tableObjectRef.tableList"
+              :loading="tableObjectRef.loading"
+              :pagination="{ total: tableObjectRef.total }"
+              v-model:pageSize="tableObjectRef.pageSize"
+              v-model:currentPage="tableObjectRef.currentPage"
+              v-model:sort="tableObjectRef.sort"
+              :isShowPackNumber="isShowPackNumber"
+              
+            >
+              <!-- <template #action="{ row }">
+                <ButtonBase
+                  :Butttondata="buttondata(row)"
+                  @button-base-click="buttonTableClick($event, row)"
                 />
-            </ElScrollbar>
-          </ContentWrap> 
-          <ContentWrap class="w-[100%]" v-if="annexItem.subDetailTableData">
-            <Table 
-              v-if="!isBasic && fromeWhere != 'countPlan'"
-              :align="annexItem.align?annexItem.align:'center'"
-              :columns="annexItem.subDetailTableData.tableColumns"
-              :data="annexItem.subDetailTableData.tableList"
-              :loading="annexItem.subDetailTableData.loading"
-              :pagination="{ total: annexItem.subDetailTableData.tableList.length }"
+              </template> -->
+            </Table>
+            <Table
+              v-if="!isBasic && fromeWhere != 'countPlan'&&!slotDetailTabList.some(item=>item.label==tabsList[current].label)"
+              :columns="detailAllSchemasRef.tableColumns"
+              :data="tableObjectRef.tableList"
+              :loading="tableObjectRef.loading"
+              :pagination="{ total: tableObjectRef.total }"
               v-model:pageSize="tableObjectRef.pageSize"
               v-model:currentPage="tableObjectRef.currentPage"
               v-model:sort="tableObjectRef.sort"
               :isShowPackNumber="isShowPackNumber"
-            />
-          </ContentWrap> 
+            >
+              <template v-for="name in Object.keys($slots)" :key="name" #[name]="{ row }">
+                <slot :name="name" :row="row"></slot>
+              </template>
+              <template #photos="{ row }">
+                <div v-for="(item,index) in row.photos.split(',')" :key="index" style="color:#409eff ; cursor: pointer;" @click="openImage(item)">{{ item }}</div>           
+              </template>
+              <template #differencePrice="{row}">
+                <slot name="differencePrice" :row="row"></slot>
+              </template>
+              <template #action="{ row }">
+                <ButtonBase
+                  :Butttondata="buttondata(row)"
+                  @button-base-click="buttonTableClick($event, row)"
+                />
+              </template>
+            </Table>
+            <slot v-if="slotDetailTabList.some(item=>item.label==tabsList[current].label)" :name="slotDetail.prop" v-for="slotDetail in slotDetailTabList"></slot>
+            <DetailTable
+              v-if="!isBasic && fromeWhere == 'countPlan' && isShowDrawer"
+              :columns="detailAllSchemasRef.tableColumns"
+              :data="tableObjectRef.tableList"
+              :allList="allList"
+              :countScopeType="countScopeType"
+              :key="updateKey"
+            >
+              <template #action="{ row }">
+                <ButtonBase
+                  :Butttondata="buttondata(row)"
+                  @button-base-click="buttonTableClick($event, row)"
+                />
+              </template>
+            </DetailTable>
+          </ContentWrap>
+          <!-- other附件组件:如质检明细 -->
+          <div  v-for="(annexItem ,index) in annexTableData" :key="index" v-show="annexItem.label==tabsList[current].label"  class="w-[100%]" :style="{height:annexItem.hasSubDetail?'100%':remarkHeight+'px'}">
+            <ContentWrap  class="w-[100%]">
+              <ElScrollbar ref="scrollbar" :style="{height:annexItem.hasSubDetail?'100%':(remarkHeight-40)+'px'}">
+                <Annex v-show="tabsList[current].label==annexItem.label"
+                    :annexData="annexItem"
+                    :fileType="annexItem.fileType"
+                    :limit="annexItem.limit"
+                    :fileSize="annexItem.fileSize"
+                    :showAddBtn="!annexItem.hiddenUpload"
+                    :showPreview="annexItem.showPreview"
+                    :showDownload = "annexItem.showDownload"
+                    :hiddenDelete = "annexItem.hiddenDelete"
+                    @handleAnnexSuccess="updateAnnexTableHandle"
+                    @deleteAnnexSuccess="updateAnnexTableHandle"
+                    :upData="{...remarksData.data,tableName:annexItem.tableName}"
+                  />
+              </ElScrollbar>
+            </ContentWrap> 
+            <ContentWrap class="w-[100%]" v-if="annexItem.subDetailTableData">
+              <Table 
+                v-if="!isBasic && fromeWhere != 'countPlan'"
+                :align="annexItem.align?annexItem.align:'center'"
+                :columns="annexItem.subDetailTableData.tableColumns"
+                :data="annexItem.subDetailTableData.tableList"
+                :loading="annexItem.subDetailTableData.loading"
+                :pagination="{ total: annexItem.subDetailTableData.tableList.length }"
+                v-model:pageSize="tableObjectRef.pageSize"
+                v-model:currentPage="tableObjectRef.currentPage"
+                v-model:sort="tableObjectRef.sort"
+                :isShowPackNumber="isShowPackNumber"
+              />
+            </ContentWrap> 
 
-        </div>
-        <!-- 附件/备注/变更记录 -->
-        <ContentWrap v-if="!annexAlias.hidden" class="w-[100%]" v-show="tabsList[current].label==annexAlias.label" :style="{height:remarkHeight+'px'}">
-          <!-- 附件组件 -->
-          <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
-            <Annex
-                :annexData="annexData"
-                :showDownload = "annexAlias.showDownload"
-                :hiddenDelete = "annexAlias.hiddenDelete"
-                @handleAnnexSuccess="handleAnnexSuccess"
-                @deleteAnnexSuccess="deleteAnnexSuccess"
-                :upData="remarksData.data" 
+          </div>
+          <!-- 附件/备注/变更记录 -->
+          <ContentWrap v-if="!annexAlias.hidden" class="w-[100%]" v-show="tabsList[current].label==annexAlias.label" :style="{height:remarkHeight+'px'}">
+            <!-- 附件组件 -->
+            <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
+              <Annex
+                  :annexData="annexData"
+                  :showDownload = "annexAlias.showDownload"
+                  :hiddenDelete = "annexAlias.hiddenDelete"
+                  @handleAnnexSuccess="handleAnnexSuccess"
+                  @deleteAnnexSuccess="deleteAnnexSuccess"
+                  :upData="remarksData.data" 
+                  :key="count"
+                />
+            </ElScrollbar> 
+          </ContentWrap>
+          <ContentWrap class="w-[100%]" v-show="tabsList[current].label=='备注'" :style="{height:remarkHeight+'px'}">
+            <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
+              <!-- 备注组件 -->
+              <Remarks
+                :remarksData="remarksData"
+                class="mt-20px"
+                @remarksSubmitScuess="remarksSubmitScuess"
                 :key="count"
               />
-          </ElScrollbar> 
-        </ContentWrap>
-        <ContentWrap class="w-[100%]" v-show="tabsList[current].label=='备注'" :style="{height:remarkHeight+'px'}">
-          <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
-            <!-- 备注组件 -->
-            <Remarks
-              :remarksData="remarksData"
-              class="mt-20px"
-              @remarksSubmitScuess="remarksSubmitScuess"
-              :key="count"
-            />
-          </ElScrollbar> 
-        </ContentWrap>
-        <ContentWrap class="w-[100%]" v-show="tabsList[current].label=='变更记录'" :style="{height:remarkHeight+'px'}">
-          <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
-            <!-- 变更记录组件 -->
-            <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px"  :key="count" :schema="allSchemas.detailSchema"/>
-          </ElScrollbar> 
-        </ContentWrap>
+            </ElScrollbar> 
+          </ContentWrap>
+          <ContentWrap class="w-[100%]" v-show="tabsList[current].label=='变更记录'" :style="{height:remarkHeight+'px'}">
+            <ElScrollbar ref="scrollbar" :style="{height:(remarkHeight-40)+'px'}">
+              <!-- 变更记录组件 -->
+              <ChangeRecord :changeRecordData="changeRecordData" class="mt-20px"  :key="count" :schema="allSchemas.detailSchema"/>
+            </ElScrollbar> 
+          </ContentWrap>
+        </div>
       </div>
     </el-drawer>
     <!-- 表格弹窗 -->
@@ -1045,7 +1047,7 @@ const buttonBaseClick = (val, item) => {
     }
   }  else if (val.includes('export')) {
     // 刷新
-    emit('buttonBaseClick',val, item,tableObject)
+    emit('buttonBaseClick',val, item,tableObjectRef.value)
   } else if (val == 'refresh') {
     // 刷新
     getList()
@@ -1388,7 +1390,7 @@ watch(
       deep: true
     }
   )
-defineExpose({ openDetail, formRef ,updateList,submitUpdateList,changeTabCurrent,openForm,tableObjectRef}) // 提供 open 方法，用于打开弹窗
+defineExpose({ openDetail, formRef ,updateList,submitUpdateList,changeTabCurrent,openForm,tableObjectRef,detailLoading}) // 提供 open 方法，用于打开弹窗
 
 </script>
 <style lang="scss">
diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
index 1334402d2..501c12fcd 100644
--- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
+++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
@@ -822,14 +822,14 @@ const handleExportDetail = async (detailTableObject) => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    detailRef.value.detailLoading = true
     const data = await CustomerStatementDetailApi.exportCustomerStatementDetail(
       detailTableObject.params
     )
     download.excel(data, `客户对账单明细子【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    detailRef.value.detailLoading = false
   }
 }
 
@@ -839,14 +839,14 @@ const handleExportShareReconciliation = async (detailTableObject) => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    detailRef.value.detailLoading = true
     const data = await CustomerStatementDetailApi.exportCustomerStatementShareReconciliatioDetail(
       detailTableObject.params
     )
     download.excel(data, `模具分摊对账单子${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    detailRef.value.detailLoading = false
   }
 }
 // 子表导出对账差异
@@ -855,14 +855,14 @@ const handleExportReconciliation = async (detailTableObject) => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
-    exportLoading.value = true
+    detailRef.value.detailLoading = true
     const data = await CustomerStatementDetailApi.exportCustomerStatementCompareDetail(
       detailTableObject.params
     )
     download.excel(data, `对账差异【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
-    exportLoading.value = false
+    detailRef.value.detailLoading = false
   }
 }
 // 模具分摊对账单修改进屋金额

From 7b37e723feff9d359826371551ed1bbe51f31690 Mon Sep 17 00:00:00 2001
From: songguoqiang <yiran_zhao6@163.com>
Date: Wed, 30 Jul 2025 13:49:12 +0800
Subject: [PATCH 5/5] =?UTF-8?q?YT-2929=EF=BC=9A=E7=89=A9=E6=96=99=E9=9A=94?=
 =?UTF-8?q?=E7=A6=BB=E9=9C=80=E8=A6=81=E6=94=AF=E6=8C=81=E7=BA=BF=E8=BE=B9?=
 =?UTF-8?q?=E8=B4=9F=E5=BA=93=E5=AD=98=E7=9A=84=E9=9A=94=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorymoveJobMain.data.ts              | 12 ++++++++++
 .../inventorymoveRecordMainOKHOLD.data.ts     | 12 ++++++++++
 .../inventorymoveRequestMain.data.ts          | 23 +++++++++++++++++++
 3 files changed, 47 insertions(+)

diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
index f1d4ccf4f..fb194318a 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
@@ -39,6 +39,18 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     sortTableDefault:3,
+  },
+   {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:true,
+    isTableForm:false,
+    isForm: false,
+    sortTableDefault:3,
   },
   // {
   //   label: '发货单号',
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts
index 899dff315..b7100c73e 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts
@@ -145,6 +145,18 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   //   isForm: false,
   // },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:true,
+    isTableForm:false,
+    isForm: false,
+    sortTableDefault:3,
+  },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
index 54ac34c05..eb42fa353 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
@@ -117,6 +117,17 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
   //   },
   //   sortTableDefault:3,
   // },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:true,
+    isTableForm:false,
+    isForm: false,
+  },
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
@@ -1218,6 +1229,18 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
     sortTableDefault:7,
   },
+    // {
+    //   label: '备注',
+    //   field: 'remark',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenSearchHigh: true,// 高级筛选中隐藏
+    //   isSearch: false,
+    //   isForm: false,
+    //   sortTableDefault:7,
+    // },
   {
     label: '从批次',
     field: 'fromBatch',