From e193dacc4fe08bc359af079d7ac505ff55712bae Mon Sep 17 00:00:00 2001
From: zxy <zhouxy1921@11.com>
Date: Wed, 20 May 2026 17:27:32 +0800
Subject: [PATCH] =?UTF-8?q?refactor(components):=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84Element=20Plus=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=B9=B6=E4=BC=98=E5=8C=96=E9=94=80=E5=94=AE=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../saledelivery/SaleDeliveryServiceImpl.java |  1 +
 .../src/types/auto-components.d.ts            | 41 ++++---------------
 .../src/views/biz/material/MaterialSelect.vue |  2 +-
 .../biz/saledelivery/OrderSelectDialog.vue    |  4 +-
 .../src/views/biz/saledelivery/index.vue      | 33 +++++++--------
 5 files changed, 30 insertions(+), 51 deletions(-)

diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/saledelivery/SaleDeliveryServiceImpl.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/saledelivery/SaleDeliveryServiceImpl.java
index 3ce2d29..074907a 100644
--- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/saledelivery/SaleDeliveryServiceImpl.java
+++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/saledelivery/SaleDeliveryServiceImpl.java
@@ -331,6 +331,7 @@ public class SaleDeliveryServiceImpl implements SaleDeliveryService {
         }
 
         saleDelivery.setDeliveryStatus("2");
+        saleDelivery.setTwmStorageId(proStorage.getId());
         saleDeliveryMapper.updateById(saleDelivery);
     }
 }
diff --git a/mes-ui/mes-ui-admin-vue3/src/types/auto-components.d.ts b/mes-ui/mes-ui-admin-vue3/src/types/auto-components.d.ts
index 11a8628..a6f9ebe 100644
--- a/mes-ui/mes-ui-admin-vue3/src/types/auto-components.d.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/types/auto-components.d.ts
@@ -31,28 +31,13 @@ declare module 'vue' {
     DocAlert: typeof import('./../components/DocAlert/index.vue')['default']
     Echart: typeof import('./../components/Echart/src/Echart.vue')['default']
     Editor: typeof import('./../components/Editor/src/Editor.vue')['default']
-    ElAlert: typeof import('element-plus/es')['ElAlert']
-    ElAside: typeof import('element-plus/es')['ElAside']
-    ElAutoResizer: typeof import('element-plus/es')['ElAutoResizer']
     ElAvatar: typeof import('element-plus/es')['ElAvatar']
-    ElBadge: typeof import('element-plus/es')['ElBadge']
     ElButton: typeof import('element-plus/es')['ElButton']
-    ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
     ElCard: typeof import('element-plus/es')['ElCard']
-    ElCarousel: typeof import('element-plus/es')['ElCarousel']
-    ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
-    ElCascader: typeof import('element-plus/es')['ElCascader']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
-    ElCollapse: typeof import('element-plus/es')['ElCollapse']
-    ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
-    ElCollapseTransition: typeof import('element-plus/es')['ElCollapseTransition']
-    ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
-    ElContainer: typeof import('element-plus/es')['ElContainer']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
-    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
-    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
@@ -68,42 +53,25 @@ declare module 'vue' {
     ElementTask: typeof import('./../components/bpmnProcessDesigner/package/penal/task/ElementTask.vue')['default']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
-    ElHeader: typeof import('element-plus/es')['ElHeader']
     ElIcon: typeof import('element-plus/es')['ElIcon']
-    ElImage: typeof import('element-plus/es')['ElImage']
     ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
-    ElLink: typeof import('element-plus/es')['ElLink']
-    ElMain: typeof import('element-plus/es')['ElMain']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
-    ElRate: typeof import('element-plus/es')['ElRate']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
-    ElSlider: typeof import('element-plus/es')['ElSlider']
-    ElSpace: typeof import('element-plus/es')['ElSpace']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    ElTableV2: typeof import('element-plus/es')['ElTableV2']
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
-    ElText: typeof import('element-plus/es')['ElText']
-    ElTimeline: typeof import('element-plus/es')['ElTimeline']
-    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
-    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
-    ElTimeSelect: typeof import('element-plus/es')['ElTimeSelect']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
-    ElTransfer: typeof import('element-plus/es')['ElTransfer']
-    ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     Error: typeof import('./../components/Error/src/Error.vue')['default']
@@ -117,11 +85,20 @@ declare module 'vue' {
     Infotip: typeof import('./../components/Infotip/src/Infotip.vue')['default']
     InputPassword: typeof import('./../components/InputPassword/src/InputPassword.vue')['default']
     InputWithColor: typeof import('./../components/InputWithColor/index.vue')['default']
+    LotNoDialog: typeof import('./../views/biz/productioninsp/LotNoDialog.vue')['default']
     MagicCubeEditor: typeof import('./../components/MagicCubeEditor/index.vue')['default']
+    Matout: typeof import('./../api/biz/matout/index.ts')['default']
+    Matoutdetail: typeof import('./../api/biz/matoutdetail/index.ts')['default']
+    MatOutForm: typeof import('./../views/biz/matout/MatOutForm.vue')['default']
+    Millparamact: typeof import('./../api/biz/millparamact/index.ts')['default']
     Pagination: typeof import('./../components/Pagination/index.vue')['default']
     ProcessDesigner: typeof import('./../components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue')['default']
     ProcessPalette: typeof import('./../components/bpmnProcessDesigner/package/palette/ProcessPalette.vue')['default']
     ProcessViewer: typeof import('./../components/bpmnProcessDesigner/package/designer/ProcessViewer.vue')['default']
+    Proctioninspdetail: typeof import('./../api/biz/proctioninspdetail/index.ts')['default']
+    Proctioninsptotal: typeof import('./../api/biz/proctioninsptotal/index.ts')['default']
+    Productioninsp: typeof import('./../api/biz/productioninsp/index.ts')['default']
+    ProductionInspForm: typeof import('./../views/biz/productioninsp/ProductionInspForm.vue')['default']
     PropertiesPanel: typeof import('./../components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue')['default']
     Qrcode: typeof import('./../components/Qrcode/src/Qrcode.vue')['default']
     ReceiveTask: typeof import('./../components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue')['default']
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/material/MaterialSelect.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/material/MaterialSelect.vue
index 9f10fe6..cc96c50 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/material/MaterialSelect.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/material/MaterialSelect.vue
@@ -129,7 +129,7 @@ const open = (defaultIds?: number[]) => {
   dialogVisible.value = true
   // 设置默认选中的ID列表
   selectedIds.value = defaultIds || []
-  searchMaterial()
+  // searchMaterial()
 }
 
 const searchMaterial = async () => {
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/saledelivery/OrderSelectDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/saledelivery/OrderSelectDialog.vue
index 6fb4d04..346787d 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/saledelivery/OrderSelectDialog.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/saledelivery/OrderSelectDialog.vue
@@ -81,7 +81,7 @@
           <dict-tag v-if="scope.row.unit" :type="DICT_TYPE.UNIT" :value="scope.row.unit" />
           <span v-else>-</span>
         </template>
-      </el-table-column>  
+      </el-table-column>
     </el-table>
 
     <!-- 分页 -->
@@ -169,7 +169,7 @@ const getList = async () => {
           saleOrdId: order.id,
           custId: order.custId, // 添加客户ID
           deliveriedQty: item.deliveriedQty || 0,
-          itemId: item.id 
+          itemId: item.id
         })),
       }
     })
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/saledelivery/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/saledelivery/index.vue
index 881f7df..9030693 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/saledelivery/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/saledelivery/index.vue
@@ -72,12 +72,12 @@
   </ContentWrap>
 
   <!-- 表格区域：主列表  -->
-  <ContentWrap class="!p-15px" style="height: calc(50vh - 150px);">
-    <div style="display: flex; flex-direction: column; ">
+  <ContentWrap class="!p-10px">
+    <div style="display: flex; flex-direction: column; height: calc(50vh - 180px);">
       <!-- 主列表 -->
-      <div style="flex: 1; min-height: 0;">
+      <div style="flex: 1; min-height: 0; display: flex; flex-direction: column; overflow: hidden;">
         <div style="font-weight: bold; margin-bottom: 8px;">出库单列表</div>
-        <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border @row-click="handleRowClick" style="height: calc(50vh - 220px);">
+        <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border @row-click="handleRowClick" style="flex: 1;" max-height="100%">
           <el-table-column type="selection" width="55px" align="right" fixed="left" />
           <el-table-column label="序号" align="center" type="index" width="60px" fixed="left" />
           <el-table-column label="出库单号" align="center" prop="saleDeliveryNo" width="130px" fixed="left" />
@@ -98,7 +98,7 @@
           <el-table-column label="出库人" align="center" prop="deliveryEmpName" width="100px" />
           <el-table-column label="交货方式" align="center" prop="deliveryType" width="100px">
             <template #default="scope">
-              <span>{{ scope.row.deliveryType === '1' ? '发货' : (scope.row.deliveryType === '2' ? '自提' : '-') }}</span>      
+              <span>{{ scope.row.deliveryType === '1' ? '发货' : (scope.row.deliveryType === '2' ? '自提' : '-') }}</span>
             </template>
           </el-table-column>
           <el-table-column label="联系人" align="center" prop="contact" width="100px" />
@@ -142,17 +142,18 @@
             </template>
           </el-table-column>
         </el-table>
-        <Pagination
-          :total="total"
-          v-model:page="queryParams.pageNo"
-          v-model:limit="queryParams.pageSize"
-          @pagination="getList"
-          style="margin-top: 8px;"
-        />
+        <div style="display: flex; justify-content: flex-end; margin-top: 1px; flex-shrink: 0;">
+          <Pagination
+            :total="total"
+            v-model:page="queryParams.pageNo"
+            v-model:limit="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </div>
       </div>
-</div>
-</ContentWrap>
-  <ContentWrap class="!p-15px"  style="height: calc(50vh - 100px);">
+    </div>
+  </ContentWrap>
+  <ContentWrap class="!p-15px"  style="height: calc(43vh - 100px);">
       <!-- 明细表格 -->
       <div style="flex: 1; min-height: 0;"  >
         <div style="font-weight: bold; margin-bottom: 8px;">出库单明细</div>
@@ -177,7 +178,7 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <SaleDeliveryForm ref="formRef" @success="getList" @close="handleQuery"/>
-  
+
   <!-- 详情弹窗 -->
   <SaleDeliveryDetail ref="detailRef"  @success="getList" @close="handleQuery"/>
 </template>