From eb64e35f9234f42a08cd35e714b4406dc01b60e7 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Thu, 4 Jun 2026 16:50:29 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=A8=A1=E5=85=B7=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93/=E6=A8=A1=E5=85=B7=E5=85=A5=E5=BA=93-=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E/=E7=BC=96=E8=BE=91-=E6=B8=85=E5=8D=95=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E6=88=90=E6=A8=A1=E5=85=B7=E7=BB=84/=E5=AD=90?=
 =?UTF-8?q?=E6=A8=A1=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moldget/components/StockOutItemForm.vue   | 268 ++++++------------
 src/views/mes/moldget/index.vue               |   2 +-
 .../moldreturn/components/StockInItemForm.vue | 268 ++++++------------
 src/views/mes/moldreturn/index.vue            |   2 +-
 4 files changed, 188 insertions(+), 352 deletions(-)

diff --git a/src/views/mes/moldget/components/StockOutItemForm.vue b/src/views/mes/moldget/components/StockOutItemForm.vue
index b58fb9a3..08289ccd 100644
--- a/src/views/mes/moldget/components/StockOutItemForm.vue
+++ b/src/views/mes/moldget/components/StockOutItemForm.vue
@@ -3,14 +3,14 @@
     <div class="device-ledger-right">
       <ContentWrap>
         <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
-          <el-form-item :label="t('MoldManagement.Mold.code')" prop="code">
+          <el-form-item :label="t('MoldManagement.MoldBrandPage.code')" prop="code">
             <el-input
-v-model="queryParams.code" :placeholder="t('MoldManagement.Mold.code')" clearable @keyup.enter="handleQuery"
+v-model="queryParams.code" :placeholder="t('MoldManagement.MoldBrandPage.code')" clearable @keyup.enter="handleQuery"
               class="!w-240px" />
           </el-form-item>
-          <el-form-item :label="t('MoldManagement.Mold.name')" prop="name">
+          <el-form-item :label="t('MoldManagement.MoldBrandPage.name')" prop="name">
             <el-input
-v-model="queryParams.name" :placeholder="t('MoldManagement.Mold.name')" clearable @keyup.enter="handleQuery"
+v-model="queryParams.name" :placeholder="t('MoldManagement.MoldBrandPage.name')" clearable @keyup.enter="handleQuery"
               class="!w-240px" />
           </el-form-item>
           <el-form-item>
@@ -24,25 +24,59 @@ v-model="queryParams.name" :placeholder="t('MoldManagement.Mold.name')" clearabl
         </el-form>
       </ContentWrap>
       <ContentWrap>
-<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @selection-change="handleSelectionChange" ref="tableRef" :row-key="row => row.id">
-      <el-table-column width="30" type="selection" />
-      <el-table-column :label="t('MoldManagement.Mold.code')" align="center" prop="code"  sortable />
-      <el-table-column :label="t('MoldManagement.Mold.name')" align="left" prop="name"  sortable />
-      <el-table-column :label="t('MoldManagement.Mold.useTime')" align="center" prop="useTime"  sortable />
-      <el-table-column :label="t('MoldManagement.Mold.status')" align="center" prop="status" sortable>
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.ERP_MOLD_STATUS" :value="scope.row.status" />
-        </template>
-      </el-table-column>
-      <el-table-column :label="t('MoldManagement.Mold.machineName')" align="center" prop="machineName"  sortable />
-      <el-table-column :label="t('MoldManagement.Mold.remark')" align="center" prop="remark" />
-      <el-table-column :label="t('MoldManagement.Mold.isEnable')" align="center" prop="isEnable">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
-        </template>
-      </el-table-column>
-      <el-table-column :label="t('MoldManagement.Mold.createTime')" align="center" prop="createTime" :formatter="dateFormatter" width="180px"  sortable />
-    </el-table>
+        <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"
+          @selection-change="handleSelectionChange" ref="tableRef" :row-key="row => row.id"
+          @expand-change="handleExpandChange">
+          <el-table-column width="30" type="selection" />
+          <el-table-column type="expand">
+            <template #default="scope">
+              <div style="padding: 0 48px">
+                <el-table v-loading="expandLoadingMap[scope.row.id]" :data="expandDataMap[scope.row.id] || []"
+                  :stripe="true" :show-overflow-tooltip="true" size="small">
+                  <el-table-column :label="t('MoldManagement.MoldListPage.subMoldName')" prop="name" min-width="160" />
+                  <el-table-column :label="t('MoldManagement.MoldListPage.type')" min-width="120">
+                    <template #default="subScope">
+                      <dict-tag :type="DICT_TYPE.SUBMOLD_TYPE" :value="subScope.row.type" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="t('MoldManagement.MoldListPage.installLocation')" min-width="140">
+                    <template #default="subScope">
+                      {{ subScope.row.installLocation || subScope.row.installPosition || subScope.row.currentPosition || subScope.row.machineName || '-' }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="t('MoldManagement.MoldListPage.material')" min-width="120">
+                    <template #default="subScope">
+                      {{ subScope.row.material || '-' }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="t('MoldManagement.MoldListPage.quantity')" width="90" align="center">
+                    <template #default="subScope">
+                      {{ subScope.row.quantity || subScope.row.count || 1 }}
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column :label="t('MoldManagement.MoldBrandPage.code')" prop="code" min-width="150" sortable />
+          <el-table-column :label="t('MoldManagement.MoldBrandPage.name')" prop="name" min-width="160" sortable />
+          <el-table-column :label="t('MoldManagement.MoldBrandPage.productName')" prop="productName" min-width="140" />
+          <el-table-column :label="t('MoldManagement.MoldBrandPage.version')" prop="version" width="100" />
+          <el-table-column :label="t('MoldManagement.MoldBrandPage.status')" prop="status" width="100" align="center">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.ERP_MOLD_STATUS" :value="scope.row.status" />
+            </template>
+          </el-table-column>
+          <el-table-column :label="t('MoldManagement.MoldBrandPage.currentDevice')" min-width="140">
+            <template #default="scope">
+              {{ scope.row.deviceName }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="t('MoldManagement.MoldBrandPage.moldSize')" prop="moldSize" width="90"
+            align="center" />
+          <el-table-column :label="t('MoldManagement.MoldBrandPage.childMoldCount')" prop="childMoldCount" width="90"
+            align="center" />
+        </el-table>
         <Pagination
 :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
           @pagination="getList" />
@@ -64,8 +98,7 @@ v-model="queryParams.name" :placeholder="t('MoldManagement.Mold.name')" clearabl
 
 <script setup lang="ts">
 import { DICT_TYPE } from '@/utils/dict'
-import { dateFormatter } from '@/utils/formatTime'
-import { MoldBrandApi, MoldVO } from '@/api/erp/mold'
+import { MoldBrandApi, MoldBrandVO } from '@/api/erp/mold'
 import { useDictStoreWithOut } from '@/store/modules/dict'
 
 const props = defineProps<{
@@ -77,37 +110,37 @@ const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
 const loading = ref(false) // 列表的加载中
-const list = ref<MoldVO[]>([]) // 列表的数据
+const list = ref<MoldBrandVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   code: undefined,
   name: undefined,
-  brand: undefined,
 })
 const queryFormRef = ref() // 搜索的表单
 
-
-
 const dictStore = useDictStoreWithOut()
 const dictReady = ref(false)
 
+// 展开行相关
+const expandLoadingMap = ref<Record<number, boolean>>({})
+const expandDataMap = ref<Record<number, any[]>>({})
+
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
   ignoreSelectionChange.value = true
   try {
-    const data = await MoldBrandApi.getMoldPage({
+    const data = await MoldBrandApi.getMoldBrandPage({
       pageNo: queryParams.pageNo,
       pageSize: queryParams.pageSize,
       code: queryParams.code,
       name: queryParams.name,
-      brandId: queryParams.brand,
-      statuss: [1]
     })
-    list.value = data.list
-    total.value = data.total
+    const pageResult = data?.pageResult ?? data ?? {}
+    list.value = pageResult.list ?? []
+    total.value = pageResult.total ?? 0
   } finally {
     loading.value = false
     await nextTick()
@@ -115,6 +148,30 @@ const getList = async () => {
   }
 }
 
+/** 展开行 - 加载子模具列表 */
+const handleExpandChange = async (row: MoldBrandVO, expandedRows: MoldBrandVO[]) => {
+  if (!expandedRows.some((r) => r.id === row.id)) {
+    // 收起时清除数据
+    delete expandDataMap.value[row.id]
+    return
+  }
+  if (expandDataMap.value[row.id]) {
+    // 已加载过，不重复请求
+    return
+  }
+  expandLoadingMap.value[row.id] = true
+  try {
+    const data = await MoldBrandApi.getMoldPage({
+      pageNo: 1,
+      pageSize: 100,
+      brandId: row.id,
+    })
+    expandDataMap.value[row.id] = data.list || []
+  } finally {
+    expandLoadingMap.value[row.id] = false
+  }
+}
+
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.pageNo = 1
@@ -188,7 +245,7 @@ const handleSelectionChange = (rows: any[]) => {
 
 const validate = async (): Promise<boolean> => {
   if (!tableRef.value) return false
-  
+
   try {
     await tableRef.value.validate()
     return true
@@ -196,7 +253,7 @@ const validate = async (): Promise<boolean> => {
     return false
   }
 }
-defineExpose({ validate,selectedRows: selectedRows })
+defineExpose({ validate, selectedRows: selectedRows })
 
 /** 初始化 **/
 onMounted(async () => {
@@ -204,7 +261,6 @@ onMounted(async () => {
   dictReady.value = true
   getList()
 })
-
 </script>
 
 <style scoped>
@@ -213,146 +269,8 @@ onMounted(async () => {
   gap: 12px;
 }
 
-.device-ledger-left {
-  width: 280px;
-  flex: 0 0 auto;
-}
-
 .device-ledger-right {
   flex: 1;
   min-width: 0;
 }
-
-.device-ledger-detail-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-bottom: 12px;
-}
-
-.device-ledger-detail-title {
-  font-size: 14px;
-  font-weight: 600;
-}
-
-.device-ledger-history-steps {
-  padding: 8px 8px 0;
-}
-
-.device-ledger-history-title {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  font-size: 13px;
-}
-
-.device-ledger-history-time {
-  font-weight: 600;
-}
-
-.device-ledger-history-operator {
-  color: var(--el-text-color-secondary);
-}
-
-.device-ledger-tab-toolbar {
-  margin-bottom: 8px;
-  text-align: right;
-}
-
-.device-ledger-history-items {
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-  margin-top: 8px;
-}
-
-.device-ledger-history-item {
-  display: flex;
-  padding: 10px;
-  background: var(--el-fill-color-blank);
-  border: 1px solid var(--el-border-color-lighter);
-  border-radius: 8px;
-  flex-direction: column;
-  gap: 8px;
-}
-
-.device-ledger-history-item-head {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-}
-
-.device-ledger-history-item-body {
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-  width: 100%;
-}
-
-.device-ledger-history-item-row {
-  display: flex;
-  gap: 10px;
-}
-
-.device-ledger-history-item-label {
-  width: 70px;
-  flex: 0 0 70px;
-  color: var(--el-text-color-secondary);
-}
-
-.device-ledger-history-item-value {
-  flex: 1;
-  color: var(--el-text-color-regular);
-  word-break: break-word;
-}
-
-.device-ledger-history-item-images {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px;
-  margin-top: 4px;
-}
-
-.device-ledger-history-item-image {
-  width: 76px;
-  height: 76px;
-  overflow: hidden;
-  border-radius: 6px;
-}
-
-.device-ledger-history-image-error {
-  display: flex;
-  width: 100%;
-  height: 100%;
-  font-size: 12px;
-  color: var(--el-text-color-secondary);
-  background: var(--el-fill-color);
-  align-items: center;
-  justify-content: center;
-}
-
-.device-ledger-repair-collapse {
-  padding: 8px 8px 0;
-}
-
-.device-ledger-repair-title {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-}
-
-.device-ledger-repair-name {
-  font-weight: 600;
-  color: var(--el-text-color-primary);
-}
-
-.device-ledger-repair-meta {
-  font-size: 12px;
-  color: var(--el-text-color-secondary);
-}
-
-.device-ledger-history-item-text {
-  color: var(--el-text-color-regular);
-}
 </style>
diff --git a/src/views/mes/moldget/index.vue b/src/views/mes/moldget/index.vue
index ad033595..ef523c16 100644
--- a/src/views/mes/moldget/index.vue
+++ b/src/views/mes/moldget/index.vue
@@ -409,7 +409,7 @@ onMounted(async () => {
   await getList()
   // 加载产品、仓库列表、客户
   // productList.value = await ProductApi.getProductSimpleList()
-  moldList.value = await MoldBrandApi.getMoldAllList()
+  moldList.value = await MoldBrandApi.getBrandList()
   warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
   customerList.value = await CustomerApi.getCustomerSimpleList()
   userList.value = await UserApi.getSimpleUserList()
diff --git a/src/views/mes/moldreturn/components/StockInItemForm.vue b/src/views/mes/moldreturn/components/StockInItemForm.vue
index 5d8ee791..be7d2152 100644
--- a/src/views/mes/moldreturn/components/StockInItemForm.vue
+++ b/src/views/mes/moldreturn/components/StockInItemForm.vue
@@ -3,14 +3,14 @@
     <div class="device-ledger-right">
       <ContentWrap>
         <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
-          <el-form-item :label="t('MoldManagement.Mold.code')" prop="code">
+          <el-form-item :label="t('MoldManagement.MoldBrandPage.code')" prop="code">
             <el-input
-v-model="queryParams.code" :placeholder="t('MoldManagement.Mold.code')" clearable @keyup.enter="handleQuery"
+v-model="queryParams.code" :placeholder="t('MoldManagement.MoldBrandPage.code')" clearable @keyup.enter="handleQuery"
               class="!w-240px" />
           </el-form-item>
-          <el-form-item :label="t('MoldManagement.Mold.name')" prop="name">
+          <el-form-item :label="t('MoldManagement.MoldBrandPage.name')" prop="name">
             <el-input
-v-model="queryParams.name" :placeholder="t('MoldManagement.Mold.name')" clearable @keyup.enter="handleQuery"
+v-model="queryParams.name" :placeholder="t('MoldManagement.MoldBrandPage.name')" clearable @keyup.enter="handleQuery"
               class="!w-240px" />
           </el-form-item>
           <el-form-item>
@@ -24,25 +24,59 @@ v-model="queryParams.name" :placeholder="t('MoldManagement.Mold.name')" clearabl
         </el-form>
       </ContentWrap>
       <ContentWrap>
-<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @selection-change="handleSelectionChange" ref="tableRef" :row-key="row => row.id">
-      <el-table-column width="30" type="selection" />
-      <el-table-column :label="t('MoldManagement.Mold.code')" align="center" prop="code"  sortable />
-      <el-table-column :label="t('MoldManagement.Mold.name')" align="left" prop="name"  sortable />
-      <el-table-column :label="t('MoldManagement.Mold.useTime')" align="center" prop="useTime"  sortable />
-      <el-table-column :label="t('MoldManagement.Mold.status')" align="center" prop="status" sortable>
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.ERP_MOLD_STATUS" :value="scope.row.status" />
-        </template>
-      </el-table-column>
-      <el-table-column :label="t('MoldManagement.Mold.machineName')" align="center" prop="machineName"  sortable />
-      <el-table-column :label="t('MoldManagement.Mold.remark')" align="center" prop="remark" />
-      <el-table-column :label="t('MoldManagement.Mold.isEnable')" align="center" prop="isEnable">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
-        </template>
-      </el-table-column>
-      <el-table-column :label="t('MoldManagement.Mold.createTime')" align="center" prop="createTime" :formatter="dateFormatter" width="180px"  sortable />
-    </el-table>
+        <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"
+          @selection-change="handleSelectionChange" ref="tableRef" :row-key="row => row.id"
+          @expand-change="handleExpandChange">
+          <el-table-column width="30" type="selection" />
+          <el-table-column type="expand">
+            <template #default="scope">
+              <div style="padding: 0 48px">
+                <el-table v-loading="expandLoadingMap[scope.row.id]" :data="expandDataMap[scope.row.id] || []"
+                  :stripe="true" :show-overflow-tooltip="true" size="small">
+                  <el-table-column :label="t('MoldManagement.MoldListPage.subMoldName')" prop="name" min-width="160" />
+                  <el-table-column :label="t('MoldManagement.MoldListPage.type')" min-width="120">
+                    <template #default="subScope">
+                      <dict-tag :type="DICT_TYPE.SUBMOLD_TYPE" :value="subScope.row.type" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="t('MoldManagement.MoldListPage.installLocation')" min-width="140">
+                    <template #default="subScope">
+                      {{ subScope.row.installLocation || subScope.row.installPosition || subScope.row.currentPosition || subScope.row.machineName || '-' }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="t('MoldManagement.MoldListPage.material')" min-width="120">
+                    <template #default="subScope">
+                      {{ subScope.row.material || '-' }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column :label="t('MoldManagement.MoldListPage.quantity')" width="90" align="center">
+                    <template #default="subScope">
+                      {{ subScope.row.quantity || subScope.row.count || 1 }}
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column :label="t('MoldManagement.MoldBrandPage.code')" prop="code" min-width="150" sortable />
+          <el-table-column :label="t('MoldManagement.MoldBrandPage.name')" prop="name" min-width="160" sortable />
+          <el-table-column :label="t('MoldManagement.MoldBrandPage.productName')" prop="productName" min-width="140" />
+          <el-table-column :label="t('MoldManagement.MoldBrandPage.version')" prop="version" width="100" />
+          <el-table-column :label="t('MoldManagement.MoldBrandPage.status')" prop="status" width="100" align="center">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.ERP_MOLD_STATUS" :value="scope.row.status" />
+            </template>
+          </el-table-column>
+          <el-table-column :label="t('MoldManagement.MoldBrandPage.currentDevice')" min-width="140">
+            <template #default="scope">
+              {{ scope.row.deviceName }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="t('MoldManagement.MoldBrandPage.moldSize')" prop="moldSize" width="90"
+            align="center" />
+          <el-table-column :label="t('MoldManagement.MoldBrandPage.childMoldCount')" prop="childMoldCount" width="90"
+            align="center" />
+        </el-table>
         <Pagination
 :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
           @pagination="getList" />
@@ -64,8 +98,7 @@ v-model="queryParams.name" :placeholder="t('MoldManagement.Mold.name')" clearabl
 
 <script setup lang="ts">
 import { DICT_TYPE } from '@/utils/dict'
-import { dateFormatter } from '@/utils/formatTime'
-import { MoldBrandApi, MoldVO } from '@/api/erp/mold'
+import { MoldBrandApi, MoldBrandVO } from '@/api/erp/mold'
 import { useDictStoreWithOut } from '@/store/modules/dict'
 
 
@@ -78,37 +111,37 @@ const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
 const loading = ref(false) // 列表的加载中
-const list = ref<MoldVO[]>([]) // 列表的数据
+const list = ref<MoldBrandVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   code: undefined,
   name: undefined,
-  brand: undefined,
 })
 const queryFormRef = ref() // 搜索的表单
 
-
-
 const dictStore = useDictStoreWithOut()
 const dictReady = ref(false)
 
+// 展开行相关
+const expandLoadingMap = ref<Record<number, boolean>>({})
+const expandDataMap = ref<Record<number, any[]>>({})
+
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
   ignoreSelectionChange.value = true
   try {
-    const data = await MoldBrandApi.getMoldPage({
+    const data = await MoldBrandApi.getMoldBrandPage({
       pageNo: queryParams.pageNo,
       pageSize: queryParams.pageSize,
       code: queryParams.code,
       name: queryParams.name,
-      brandId: queryParams.brand,
-      statuss: [3,0]
     })
-    list.value = data.list
-    total.value = data.total
+    const pageResult = data?.pageResult ?? data ?? {}
+    list.value = pageResult.list ?? []
+    total.value = pageResult.total ?? 0
   } finally {
     loading.value = false
     await nextTick()
@@ -116,6 +149,30 @@ const getList = async () => {
   }
 }
 
+/** 展开行 - 加载子模具列表 */
+const handleExpandChange = async (row: MoldBrandVO, expandedRows: MoldBrandVO[]) => {
+  if (!expandedRows.some((r) => r.id === row.id)) {
+    // 收起时清除数据
+    delete expandDataMap.value[row.id]
+    return
+  }
+  if (expandDataMap.value[row.id]) {
+    // 已加载过，不重复请求
+    return
+  }
+  expandLoadingMap.value[row.id] = true
+  try {
+    const data = await MoldBrandApi.getMoldPage({
+      pageNo: 1,
+      pageSize: 100,
+      brandId: row.id,
+    })
+    expandDataMap.value[row.id] = data.list || []
+  } finally {
+    expandLoadingMap.value[row.id] = false
+  }
+}
+
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.pageNo = 1
@@ -189,7 +246,7 @@ const handleSelectionChange = (rows: any[]) => {
 
 const validate = async (): Promise<boolean> => {
   if (!tableRef.value) return false
-  
+
   try {
     await tableRef.value.validate()
     return true
@@ -197,7 +254,7 @@ const validate = async (): Promise<boolean> => {
     return false
   }
 }
-defineExpose({ validate,selectedRows: selectedRows })
+defineExpose({ validate, selectedRows: selectedRows })
 
 /** 初始化 **/
 onMounted(async () => {
@@ -205,7 +262,6 @@ onMounted(async () => {
   dictReady.value = true
   getList()
 })
-
 </script>
 
 <style scoped>
@@ -214,146 +270,8 @@ onMounted(async () => {
   gap: 12px;
 }
 
-.device-ledger-left {
-  width: 280px;
-  flex: 0 0 auto;
-}
-
 .device-ledger-right {
   flex: 1;
   min-width: 0;
 }
-
-.device-ledger-detail-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-bottom: 12px;
-}
-
-.device-ledger-detail-title {
-  font-size: 14px;
-  font-weight: 600;
-}
-
-.device-ledger-history-steps {
-  padding: 8px 8px 0;
-}
-
-.device-ledger-history-title {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  font-size: 13px;
-}
-
-.device-ledger-history-time {
-  font-weight: 600;
-}
-
-.device-ledger-history-operator {
-  color: var(--el-text-color-secondary);
-}
-
-.device-ledger-tab-toolbar {
-  margin-bottom: 8px;
-  text-align: right;
-}
-
-.device-ledger-history-items {
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-  margin-top: 8px;
-}
-
-.device-ledger-history-item {
-  display: flex;
-  padding: 10px;
-  background: var(--el-fill-color-blank);
-  border: 1px solid var(--el-border-color-lighter);
-  border-radius: 8px;
-  flex-direction: column;
-  gap: 8px;
-}
-
-.device-ledger-history-item-head {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-}
-
-.device-ledger-history-item-body {
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-  width: 100%;
-}
-
-.device-ledger-history-item-row {
-  display: flex;
-  gap: 10px;
-}
-
-.device-ledger-history-item-label {
-  width: 70px;
-  flex: 0 0 70px;
-  color: var(--el-text-color-secondary);
-}
-
-.device-ledger-history-item-value {
-  flex: 1;
-  color: var(--el-text-color-regular);
-  word-break: break-word;
-}
-
-.device-ledger-history-item-images {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px;
-  margin-top: 4px;
-}
-
-.device-ledger-history-item-image {
-  width: 76px;
-  height: 76px;
-  overflow: hidden;
-  border-radius: 6px;
-}
-
-.device-ledger-history-image-error {
-  display: flex;
-  width: 100%;
-  height: 100%;
-  font-size: 12px;
-  color: var(--el-text-color-secondary);
-  background: var(--el-fill-color);
-  align-items: center;
-  justify-content: center;
-}
-
-.device-ledger-repair-collapse {
-  padding: 8px 8px 0;
-}
-
-.device-ledger-repair-title {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-}
-
-.device-ledger-repair-name {
-  font-weight: 600;
-  color: var(--el-text-color-primary);
-}
-
-.device-ledger-repair-meta {
-  font-size: 12px;
-  color: var(--el-text-color-secondary);
-}
-
-.device-ledger-history-item-text {
-  color: var(--el-text-color-regular);
-}
 </style>
diff --git a/src/views/mes/moldreturn/index.vue b/src/views/mes/moldreturn/index.vue
index 114ad4b2..4ce2d006 100644
--- a/src/views/mes/moldreturn/index.vue
+++ b/src/views/mes/moldreturn/index.vue
@@ -405,7 +405,7 @@ onMounted(async () => {
   await getList()
   // 加载产品、仓库列表、客户
   // productList.value = await ProductApi.getProductSimpleList()
-  moldList.value = await MoldBrandApi.getMoldAllList()
+  moldList.value = await MoldBrandApi.getBrandList()
   warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
   customerList.value = await CustomerApi.getCustomerSimpleList()
   userList.value = await UserApi.getSimpleUserList()