From 5b50353a0fc5ad9e44b1f43bcb8a906559a12388 Mon Sep 17 00:00:00 2001
From: shenzhouyu <zhouyu.shen@xujiesoft.com>
Date: Fri, 26 Sep 2025 09:13:20 +0800
Subject: [PATCH] =?UTF-8?q?MR=E5=87=BA=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mr/mr.js                              |   6 +-
 src/api/outsourcing/outsourcing.js            |   2 +-
 src/api/production/production-issue.js        |   2 +
 src/router/index.js                           |   4 +-
 src/views/modules/mr-issue/index.vue          |   2 +-
 src/views/modules/mr-issue/mrPicking.vue      | 336 +++++---
 .../modules/mr-issue/mrPickingDetail.vue      | 759 +++++++++++++-----
 .../outsourcingDirectIssue.vue                |   6 +-
 .../outsourcing-issue/outsourcingPicking.vue  |  30 +-
 .../modules/production-issue/directIssue.vue  |   1 -
 .../production-issue/productionPicking.vue    | 158 +++-
 11 files changed, 957 insertions(+), 349 deletions(-)

diff --git a/src/api/mr/mr.js b/src/api/mr/mr.js
index 91471f5..82f9e37 100644
--- a/src/api/mr/mr.js
+++ b/src/api/mr/mr.js
@@ -1,13 +1,13 @@
 import { createAPI } from "@/utils/httpRequest.js";
 
 // 获取MR列表
-export const getMrList = data => createAPI(`mr/getMrList`, 'post', data)
+export const getMrList = data => createAPI(`/pda/mr/getMrList`, 'post', data)
 
 // 获取MR材料行列表
-export const getMrMaterialLines = data => createAPI(`mr/getMrMaterialLines`, 'post', data)
+export const getMrMaterialLines = data => createAPI(`/pda/mr/getMrMaterialLines`, 'post', data)
 
 // 扫描材料标签
-export const scanMaterialLabel = data => createAPI(`mr/scanMaterialLabel`, 'post', data)
+export const scanMaterialLabel = data => createAPI(`/pda/mr/scanMaterialLabel`, 'post', data)
 
 // 确认MR发料
 export const confirmMrIssue = data => createAPI(`mr/confirmMrIssue`, 'post', data)
diff --git a/src/api/outsourcing/outsourcing.js b/src/api/outsourcing/outsourcing.js
index 7619873..de48dfe 100644
--- a/src/api/outsourcing/outsourcing.js
+++ b/src/api/outsourcing/outsourcing.js
@@ -1,4 +1,4 @@
 import { createAPI } from "@/utils/httpRequest.js";
 
 // 获取委外订单信息
-export const getOutsourceOrderInfo = data => createAPI(`/pda/outsourcing/issue/getOutsourceOrderInfo`,'post',data)
\ No newline at end of file
+export const getOutsourcingOrderInfo = data => createAPI(`/pda/outsourcing/issue/getOutsourcingOrderInfo`,'post',data)
\ No newline at end of file
diff --git a/src/api/production/production-issue.js b/src/api/production/production-issue.js
index d6da869..3bef56b 100644
--- a/src/api/production/production-issue.js
+++ b/src/api/production/production-issue.js
@@ -31,6 +31,7 @@ export const scanMaterialLabel = data => createAPI(`/pda/production/issue/scanMa
 export const getIssureNotifyByNo = data => createAPI(`/pda/production/issue/getIssureNotifyByNo`,'post',data)
 // 获取工单列表
 export const getIssureNotifyListByNo = data => createAPI(`/pda/production/issue/getIssureNotifyListByNo`,'post',data)
+export const getIssueNotifyHeaderInfo = data => createAPI(`/pda/production/issue/getIssueNotifyHeaderInfo`,'post',data)
 
 // 直接领料相关接口
 // 获取工单信息
@@ -40,3 +41,4 @@ export const scanMaterialLabelDirect = data => createAPI(`/pda/production/issue/
 // 确认直接发料
 export const confirmDirectIssue = data => createAPI(`/pda/production/issue/confirmDirectIssue`,'post',data)
 
+
diff --git a/src/router/index.js b/src/router/index.js
index a138e00..6f0cd32 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -56,7 +56,7 @@ const globalRoutes = [
   {path: "/productionReturnPicking", name: "productionReturnPicking", component: resolve => require(["@/views/modules/production-return/productionReturnPicking.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
   {path: "/productionReturnIssueList", name: "productionReturnIssueList", component: resolve => require(["@/views/modules/production-return/productionReturnIssueList.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
   {path: "/productionReturnPickingDetail/:orderNo/:orderType/:partNo/:transactionId/:quantity/:batchNo", name: "productionReturnPickingDetail", component: resolve => require(["@/views/modules/production-return/productionReturnPickingDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
-  {path: "/productionReturnPDA", name: "productionReturnPDA", component: resolve => require(["@/views/modules/production-return/productionReturnPDA.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
+  {path: "/productionReturnPDA", name: "productionReturnPDA", component: resolve => require(["@/views/modules/production-return/productionReturnPDA.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: false } },
   {path: "/productionReturnPDAList/:workOrderNo/:partNo/:unissureQty/:itemNo", name: "productionReturnPDAList", component: resolve => require(["@/views/modules/production-return/productionReturnPDAList.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
   {path: "/productionReturnPDAIssueList/:workOrderNo/:material", name: "productionReturnPDAIssueList", component: resolve => require(["@/views/modules/production-return/productionReturnPDAIssueList.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
   {path: '/production-return/pick/:orderNo',
@@ -91,7 +91,7 @@ const globalRoutes = [
   // Material Requisition
   {path: "/mrissue",name: "mrissue", component: resolve => require(["@/views/modules/mr-issue/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
   {path: "/mrPicking",name: "mrPicking", component: resolve => require(["@/views/modules/mr-issue/mrPicking.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
-  {path: "/mrPickingDetail/:orderNo/:lineNo/:partNo",name: "mrPickingDetail", component: resolve => require(["@/views/modules/mr-issue/mrPickingDetail.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
+  {path: "/mrPickingDetail/:orderNo/:lineNo/:partNo/:material",name: "mrPickingDetail", component: resolve => require(["@/views/modules/mr-issue/mrPickingDetail.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
 
   // 盘点
   {path: "/stocktaking",name: "stocktaking", component: resolve => require(["@/views/modules/inventory/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
diff --git a/src/views/modules/mr-issue/index.vue b/src/views/modules/mr-issue/index.vue
index f2d4c27..4f32a43 100644
--- a/src/views/modules/mr-issue/index.vue
+++ b/src/views/modules/mr-issue/index.vue
@@ -42,7 +42,7 @@ export default {
           icon: "records",
           label: "MR退料",
           iconClass: "qualified",
-          to: "productionPicking",
+          to: "mrPickingReturn",
           disabled: false,
         },
       ],
diff --git a/src/views/modules/mr-issue/mrPicking.vue b/src/views/modules/mr-issue/mrPicking.vue
index 65e36c3..5ca82a1 100644
--- a/src/views/modules/mr-issue/mrPicking.vue
+++ b/src/views/modules/mr-issue/mrPicking.vue
@@ -13,34 +13,25 @@
 
     <!-- 搜索框 -->
     <div class="search-container">
-      <el-input clearable
-                v-model="searchCode"
-                placeholder="请输入MR号"
-                prefix-icon="el-icon-search"
-                @keyup.enter.native="handleSearch"
-                ref="searchInput"
-      />
+      <el-input clearable v-model="searchCode" placeholder="请输入MR号" prefix-icon="el-icon-search"
+        @keyup.enter.native="handleSearch" ref="searchInput" />
     </div>
 
-    <!-- MR列表 -->
-    <div class="content-area">
-      <div
-        v-for="(item, index) in mrList"
-        :key="index"
-        class="mr-card"
-        @click="goToMaterialSelection(item)"
-      >
+    <!-- MR工单列表 -->
+    <div class="work-order-list" v-if="mrList.length > 0">
+      <div v-for="(item, index) in displayMrList" :key="index"
+        :class="['work-order-card', { selected: selectedMr && isSameMr(selectedMr, item) }]" @click="selectMr(item)">
         <div class="card-title">
-          <span class="title-label">MR号：{{ item.orderNo }} &nbsp;&nbsp; 行号：{{ item.lineNo }}</span>
+          <span class="title-label">MR号：{{ item.orderNo }} &nbsp;&nbsp; 客户号：{{ item.intCustomerNo }}</span>
           <span class="title-value">{{ item.partNo }}</span>
         </div>
 
         <!-- 物料描述单独一行 -->
         <div class="part-desc-row">
-          <span class="desc-text">{{ item.partDesc }}</span>
+          <span class="desc-text">目的地:{{ item.intDestDesc }}</span>
         </div>
 
-        <div class="card-details">
+        <!-- <div class="card-details">
           <div class="detail-item">
             <div class="detail-label">需求数量</div>
             <div class="detail-value">{{ item.qtyDue }}</div>
@@ -53,130 +44,233 @@
             <div class="detail-label">单位</div>
             <div class="detail-value">{{ item.unitMeas }}</div>
           </div>
-        </div>
+        </div> -->
       </div>
+    </div>
 
-      <!-- 空状态 -->
-      <div v-if="mrList.length === 0 && !loading" class="empty-state">
-        <i class="el-icon-box"></i>
-        <p>暂无MR数据</p>
-      </div>
+    <!-- 材料列表 -->
+    <div class="content-area" v-if="selectedMr && materialList.length > 0">
+      <div v-for="(material, index) in materialList" :key="index" class="material-card"
+        @click="selectMaterial(material)">
+        <div class="card-title">
+          <span class="title-label">物料编码：{{ material.partNo }} &nbsp;&nbsp; 行号：{{ material.lineNo }}</span>
+        </div>
+
+        <!-- 物料描述单独一行 -->
+        <div class="part-desc-row">
+          <span class="desc-text">{{ material.partDesc }}</span>
+        </div>
 
-      <!-- 加载状态 -->
-      <div v-if="loading" class="loading-state">
-        <i class="el-icon-loading"></i>
-        <p>加载中...</p>
+        <div class="card-details">
+          <div class="detail-item">
+            <div class="detail-label">需求数量</div>
+            <div class="detail-value">{{ material.qtyIssued }}</div>
+          </div>
+          <div class="detail-item">
+            <div class="detail-label">到期数量</div>
+            <div class="detail-value">{{ material.qtyDue || 0 }}</div>
+          </div>
+          <div class="detail-item">
+            <div class="detail-label">单位</div>
+            <div class="detail-value">{{ material.unitMeas }}</div>
+          </div>
+        </div>
       </div>
     </div>
 
+    <!-- 空状态 -->
+    <div v-if="selectedMr && materialList.length === 0" class="empty-state">
+      <i class="el-icon-box"></i>
+      <p>该MR暂无材料清单</p>
+    </div>
+
+    <div v-if="mrList.length === 0 && !loading" class="empty-state">
+      <i class="el-icon-box"></i>
+      <p>暂无MR数据</p>
+    </div>
+
+    <!-- 加载状态 -->
+    <div v-if="loading" class="loading-state">
+      <i class="el-icon-loading"></i>
+      <p>加载中...</p>
+    </div>
+
   </div>
 </template>
 
 <script>
-import { getMrList } from '@/api/mr/mr'
-import moment from 'moment';
+import { getMrList, getMrMaterialLines } from '@/api/mr/mr'
+import moment from 'moment'
 
 export default {
   data() {
     return {
       searchCode: '',
       mrList: [],
-      loading: false
-    };
+      selectedMr: null,
+      materialList: [],
+      loading: false,
+      showOnlySelected: false,
+    }
+  },
+  computed: {
+    displayMrList() {
+      if (this.showOnlySelected && this.selectedMr) {
+        return [this.selectedMr]
+      }
+      return this.mrList
+    },
   },
   methods: {
     formatDate(date) {
-      return date ? moment(date).format('YYYY-MM-DD') : '';
+      return date ? moment(date).format('YYYY-MM-DD') : ''
     },
 
     // 处理搜索
     handleSearch() {
       if (this.searchCode.trim()) {
-        this.searchMrList(this.searchCode.trim());
-      } else {
-        this.loadMrList();
+        this.searchMrList(this.searchCode.trim())
       }
     },
 
     // 加载MR列表
     loadMrList() {
-      this.loading = true;
+      this.loading = true
       const params = {
         site: this.$store.state.user.site,
       }
 
-      getMrList(params).then(({ data }) => {
-        this.loading = false;
-        if (data && data.code === 0) {
-          this.mrList = data.list || [];
-        } else {
-          this.$message.error(data.msg || '获取数据失败');
-        }
-      }).catch(error => {
-        this.loading = false;
-        console.error('获取MR列表失败:', error);
-        this.$message.error('获取数据失败');
-      });
+      getMrList(params)
+        .then(({ data }) => {
+          this.loading = false
+          if (data && data.code === 0) {
+            this.mrList = data.list || []
+          } else {
+            this.$message.error(data.msg || '获取数据失败')
+          }
+        })
+        .catch((error) => {
+          this.loading = false
+          console.error('获取MR列表失败:', error)
+          this.$message.error('获取数据失败')
+        })
     },
 
     // 搜索特定MR
     searchMrList(searchCode) {
-      this.loading = true;
+      this.loading = true
       const params = {
         orderNo: searchCode,
         site: this.$store.state.user.site,
-      };
+      }
+
+      getMrList(params)
+        .then(({ data }) => {
+          this.loading = false
+          if (data && data.code === 0) {
+            if (data.list.length === 0) {
+              this.$message.warning('未找到匹配的MR')
+            }
+            this.mrList = data.list || []
+            // 重置选择状态
+            this.selectedMr = null
+            this.materialList = []
+            this.showOnlySelected = false
+          } else {
+            this.$message.error(data.msg || '查询失败')
+          }
+        })
+        .catch((error) => {
+          this.loading = false
+          this.$message.error('查询失败')
+        })
+    },
+
+    // 判断是否为同一MR
+    isSameMr(a, b) {
+      if (!a || !b) return false
+      return a.orderNo === b.orderNo && a.lineNo === b.lineNo
+    },
+
+    // 选择MR（支持再次点击切换显示所有）
+    selectMr(mr) {
+      if (
+        this.showOnlySelected &&
+        this.selectedMr &&
+        this.isSameMr(this.selectedMr, mr)
+      ) {
+        // 再次点击同一条，恢复显示所有主数据
+        this.selectedMr = null
+        this.materialList = []
+        this.showOnlySelected = false
+        return
+      }
+
+      // 选择并仅显示当前MR
+      this.selectedMr = mr
+      this.showOnlySelected = true
+      this.loadMaterialList()
+    },
 
-      getMrList(params).then(({ data }) => {
-        this.loading = false;
-        if (data && data.code === 0) {
-          if (data.list.length === 0) {
-            this.$message.warning('未找到匹配的MR');
+    // 加载材料清单
+    loadMaterialList() {
+      if (!this.selectedMr) {
+        this.materialList = []
+        return
+      }
+      let params = {
+        orderNo: this.selectedMr.orderNo,
+        site: this.$store.state.user.site,
+      }
+      getMrMaterialLines(params)
+        .then(({ data }) => {
+          this.loading = false
+          if (data && data.code === 0) {
+            if (data.list.length === 0) {
+              this.$message.warning('未找到匹配的MR')
+            }
+            this.materialList = data.list || []
+          } else {
+            this.$message.error(data.msg || '查询失败')
           }
-          this.mrList = data.list || [];
-        } else {
-          this.$message.error(data.msg || '查询失败');
-        }
-      }).catch(error => {
-        this.loading = false;
-        this.$message.error('查询失败');
-      });
+        })
+        .catch((error) => {
+          this.loading = false
+          this.$message.error('查询失败')
+        })
     },
 
-    // 跳转到材料选择
-    goToMaterialSelection(mr) {
-      // 直接跳转到发料详情页面，传递完整的MR信息
+    // 选择材料，跳转到发料详情页
+    selectMaterial(material) {
       this.$router.push({
         name: 'mrPickingDetail',
         params: {
-          orderNo: mr.orderNo,
-          lineNo: mr.lineNo,
-          partNo: mr.partNo,
-          partDesc: mr.partDesc,
-          qtyDue: mr.qtyDue,
-          qtyIssued: mr.qtyIssued,
-          unitMeas: mr.unitMeas,
-          statusCode: mr.statusCode,
-          releaseNo: mr.releaseNo,
-          dueDate: mr.dueDate
-        }
-      });
+          orderNo: this.selectedMr.orderNo,
+          lineNo: material.lineNo,
+          partNo: material.partNo,
+          material: {
+            partDesc: material.partDesc,
+            qtyDue: material.qtyDue,
+            qtyIssued: material.qtyIssued,
+            unitMeas: material.unitMeas,
+            statusCode: material.statusCode,
+            releaseNo: material.releaseNo,
+            dueDate: material.dueDate,
+          },
+        },
+      })
     },
-
   },
 
   mounted() {
     // 聚焦搜索框
     this.$nextTick(() => {
       if (this.$refs.searchInput) {
-        this.$refs.searchInput.focus();
+        this.$refs.searchInput.focus()
       }
-    });
-
-    // 加载数据
-    this.loadMrList();
-  }
-};
+    })
+  },
+}
 </script>
 
 <style scoped>
@@ -194,7 +288,7 @@ export default {
   justify-content: space-between;
   align-items: center;
   padding: 8px 16px;
-  background: #17B3A3;
+  background: #17b3a3;
   color: white;
   height: 40px;
   min-height: 40px;
@@ -225,6 +319,38 @@ export default {
   background: white;
 }
 
+/* 工单列表 */
+.work-order-list {
+  overflow-y: auto;
+  padding: 12px 16px;
+}
+
+/* 工单卡片 */
+.work-order-card {
+  background: white;
+  border-radius: 8px;
+  margin-bottom: 12px;
+  padding: 16px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  cursor: pointer;
+  transition: all 0.2s ease;
+  border: 2px solid transparent;
+}
+
+.work-order-card:hover {
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+  transform: translateY(-1px);
+}
+
+.work-order-card.selected {
+  border-color: #17b3a3;
+  background: #f0fffe;
+}
+
+.work-order-card:active {
+  transform: translateY(0);
+}
+
 /* 内容区域 */
 .content-area {
   flex: 1;
@@ -232,8 +358,8 @@ export default {
   padding: 12px 16px;
 }
 
-/* MR卡片 */
-.mr-card {
+/* 材料卡片 */
+.material-card {
   background: white;
   border-radius: 8px;
   margin-bottom: 12px;
@@ -241,14 +367,20 @@ export default {
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
   cursor: pointer;
   transition: all 0.2s ease;
+  border: 2px solid transparent;
 }
 
-.mr-card:hover {
+.material-card:hover {
   box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
   transform: translateY(-1px);
 }
 
-.mr-card:active {
+.material-card.selected {
+  border-color: #17b3a3;
+  background: #f0fffe;
+}
+
+.material-card:active {
   transform: translateY(0);
 }
 
@@ -341,7 +473,7 @@ export default {
   align-items: center;
   justify-content: center;
   padding: 60px 20px;
-  color: #17B3A3;
+  color: #17b3a3;
 }
 
 .loading-state i {
@@ -351,8 +483,12 @@ export default {
 }
 
 @keyframes spin {
-  from { transform: rotate(0deg); }
-  to { transform: rotate(360deg); }
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
 }
 
 .loading-state p {
@@ -370,11 +506,19 @@ export default {
     padding: 8px 12px;
   }
 
+  .work-order-list {
+    padding: 8px 12px;
+  }
+
+  .work-order-card {
+    padding: 12px;
+  }
+
   .content-area {
     padding: 8px 12px;
   }
 
-  .mr-card {
+  .material-card {
     padding: 12px;
   }
 
diff --git a/src/views/modules/mr-issue/mrPickingDetail.vue b/src/views/modules/mr-issue/mrPickingDetail.vue
index 05cc885..c7fa731 100644
--- a/src/views/modules/mr-issue/mrPickingDetail.vue
+++ b/src/views/modules/mr-issue/mrPickingDetail.vue
@@ -13,19 +13,10 @@
 
     <!-- 搜索框 -->
     <div class="search-container">
-      <el-input clearable class="compact-input"
-        v-model="scanCode"
-        placeholder="请扫描材料纸质标签"
-        prefix-icon="el-icon-search"
-        @keyup.enter.native="handleScan"
-        ref="scanInput"
-      />
+      <el-input clearable class="compact-input" v-model="scanCode" placeholder="请扫描材料纸质标签" prefix-icon="el-icon-search"
+        @keyup.enter.native="handleScan" ref="scanInput" />
       <div class="mode-switch">
-        <el-switch
-          class="custom-switch"
-          v-model="isRemoveMode"
-          active-color="#ff4949"
-          inactive-color="#13ce66">
+        <el-switch class="custom-switch" v-model="isRemoveMode" active-color="#ff4949" inactive-color="#13ce66">
         </el-switch>
         <span v-if="isRemoveMode" class="switch-text">{{ '移除' }}</span>
         <span v-else class="switch-text2">{{ '添加' }}</span>
@@ -33,29 +24,32 @@
     </div>
 
     <!-- MR信息卡片 -->
-    <div class="material-info-card" v-if="mrInfo.orderNo">
-      <div class="card-header">
-        <div class="mr-info">
-          <span class="mr-label">MR号：</span>
-          <span class="mr-value">{{ mrInfo.orderNo }}</span>
-          <span class="line-label">行号：</span>
-          <span class="line-value">{{ mrInfo.lineNo }}</span>
+    <div class="work-order-list" v-if="mrInfo.orderNo">
+      <div class="material-card">
+        <div class="card-title">
+          <span class="title-label">MR号：{{ mrInfo.orderNo }} &nbsp;&nbsp; 行号：{{ mrInfo.lineNo }}</span>
         </div>
-      </div>
 
-      <div class="card-content">
-        <div class="part-info">
-          <div class="part-no">{{ mrInfo.partNo }}</div>
-          <div class="part-desc">{{ mrInfo.partDesc }}</div>
+        <!-- 物料描述单独一行 -->
+         <div class="part-desc-row">
+          <span class="desc-text">{{ mrInfo.partNo }}</span>
+        </div>
+        <div class="part-desc-row">
+          <span class="desc-text">{{ mrInfo.partDesc }}</span>
         </div>
-        <div class="qty-info">
-          <div class="qty-item">
-            <span class="qty-label">需求：</span>
-            <span class="qty-value">{{ mrInfo.qtyDue }}</span>
+
+        <div class="card-details">
+          <div class="detail-item">
+            <div class="detail-label">需求数量</div>
+            <div class="detail-value">{{ mrInfo.qtyIssued }}</div>
+          </div>
+          <div class="detail-item">
+            <div class="detail-label">到期数量</div>
+            <div class="detail-value">{{ mrInfo.qtyDue || 0 }}</div>
           </div>
-          <div class="qty-item">
-            <span class="qty-label">已发：</span>
-            <span class="qty-value">{{ mrInfo.qtyIssued }}</span>
+          <div class="detail-item">
+            <div class="detail-label">单位</div>
+            <div class="detail-value">{{ mrInfo.unitMeas }}</div>
           </div>
         </div>
       </div>
@@ -74,21 +68,18 @@
       <div class="list-header">
         <div class="col-no">NO.</div>
         <div class="col-label">标签条码</div>
-        <div class="col-part">物料编码</div>
         <div class="col-batch">批次号</div>
         <div class="col-qty">标签数量</div>
       </div>
 
-      <div
-        v-for="(label, index) in labelList"
-        :key="label.id"
-        class="list-item"
-      >
+      <div v-for="(label, index) in labelList" :key="label.id" class="list-item">
         <div class="col-no">{{ labelList.length - index }}</div>
         <div class="col-label">{{ label.labelCode }}</div>
-        <div class="col-part">{{ label.partNo }}</div>
         <div class="col-batch">{{ label.batchNo }}</div>
-        <div class="col-qty">{{ label.quantity }}</div>
+        <div class="col-qty" @click="openEditDialog(label, index)">
+          <span class="quantity-display">{{ label.quantity }}</span>
+          <i class="el-icon-edit edit-icon"></i>
+        </div>
       </div>
 
       <!-- 空状态 -->
@@ -98,7 +89,7 @@
     </div>
 
     <!-- 发料汇总 -->
-<!--    <div class="issue-summary" v-if="labelList.length > 0">
+    <!--    <div class="issue-summary" v-if="labelList.length > 0">
       <div class="summary-item">
         <span class="summary-label">标签总数：</span>
         <span class="summary-value">{{ labelList.length }}</span>
@@ -118,12 +109,67 @@
         取消
       </button>
     </div>
+
+    <!-- 编辑标签弹框 -->
+    <div v-if="showEditDialog" class="edit-overlay">
+      <div class="edit-modal">
+        <div class="modal-header">
+          <span class="modal-title">编辑标签信息</span>
+          <i class="el-icon-close close-btn" @click="closeEditDialog"></i>
+        </div>
+
+        <div class="modal-body">
+          <div class="form-group">
+            <label class="form-label">物料标签</label>
+            <el-input
+              v-model="editForm.labelCode"
+              disabled
+              class="form-input"
+            />
+          </div>
+
+          <div class="form-group">
+            <label class="form-label">批次号</label>
+            <el-input
+              v-model="editForm.batchNo"
+              disabled
+              class="form-input"
+            />
+          </div>
+
+          <div class="form-group">
+            <label class="form-label">库位 <span class="required">*</span></label>
+            <el-input
+              v-model="editForm.locationId"
+              placeholder="请输入库位"
+              class="form-input"
+            />
+          </div>
+
+          <div class="form-group">
+            <label class="form-label">发料数量 <span class="required">*</span></label>
+            <el-input
+              v-model="editForm.quantity"
+              type="number"
+              :min="0"
+              placeholder="请输入发料数量"
+              class="form-input"
+            />
+          </div>
+        </div>
+
+        <div class="modal-footer">
+          <button class="btn-cancel" @click="closeEditDialog">取消</button>
+          <button class="btn-confirm" @click="confirmEdit">确定</button>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
-import { scanMaterialLabel, confirmMrIssue } from '@/api/mr/mr';
-import moment from 'moment';
+import { scanMaterialLabel, confirmMrIssue } from '@/api/mr/mr'
+import moment from 'moment'
 
 export default {
   data() {
@@ -134,34 +180,44 @@ export default {
       orderNo: '',
       lineNo: '',
       partNo: '',
-      isRemoveMode: false // 默认为添加模式
-    };
+      isRemoveMode: false, // 默认为添加模式
+      material: {},
+      // 编辑弹框相关
+      showEditDialog: false,
+      editForm: {
+        labelCode: '',
+        batchNo: '',
+        locationId: '',
+        quantity: 0
+      },
+      editIndex: -1, // 当前编辑的标签索引
+    }
   },
   computed: {
     // 计算发料总量
     totalIssueQty() {
       return this.labelList.reduce((total, label) => {
-        return total + (parseFloat(label.quantity) || 0);
-      }, 0);
-    }
+        return total + (parseFloat(label.quantity) || 0)
+      }, 0)
+    },
   },
   methods: {
     formatDate(date) {
-      return date ? moment(date).format('YYYY-MM-DD') : '';
+      return date ? moment(date).format('YYYY-MM-DD') : ''
     },
 
     // 处理扫描
     handleScan() {
       if (!this.scanCode.trim()) {
-        return;
+        return
       }
 
       if (this.isRemoveMode) {
-        this.removeLabelByCode(this.scanCode.trim());
+        this.removeLabelByCode(this.scanCode.trim())
       } else {
-        this.validateAndAddLabel(this.scanCode.trim());
+        this.validateAndAddLabel(this.scanCode.trim())
       }
-      this.scanCode = '';
+      this.scanCode = ''
     },
 
     // 验证标签并添加到列表
@@ -172,66 +228,76 @@ export default {
         lineNo: this.lineNo,
         partNo: this.partNo,
         site: this.$store.state.user.site,
-      };
-
-      scanMaterialLabel(params).then(({ data }) => {
-        if (data && data.code === 0) {
-          // 检查是否已经扫描过
-          const exists = this.labelList.find(item => item.labelCode === labelCode);
-          if (exists) {
-            this.$message.warning('该标签已扫描，请勿重复扫描');
-            return;
-          }
+      }
 
-          // 检查物料编码是否匹配
-          if (data.labelInfo.partNo !== this.partNo) {
-            this.$message.error(`扫描的物料编码[${data.labelInfo.partNo}]与选择的物料[${this.partNo}]不匹配`);
-            return;
+      scanMaterialLabel(params)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            // 检查是否已经扫描过
+            const exists = this.labelList.find(
+              (item) => item.labelCode === labelCode
+            )
+            if (exists) {
+              this.$message.warning('该标签已扫描，请勿重复扫描')
+              return
+            }
+
+            // 检查物料编码是否匹配
+            if (data.labelInfo.partNo !== this.partNo) {
+              this.$message.error(
+                `扫描的物料编码[${data.labelInfo.partNo}]与选择的物料[${this.partNo}]不匹配`
+              )
+              return
+            }
+
+            // 添加到列表
+            this.labelList.push({
+              id: Date.now(),
+              labelCode: labelCode,
+              partNo: data.labelInfo.partNo,
+              quantity: data.labelInfo.availableQty,
+              batchNo: data.labelInfo.batchNo,
+              locationId: data.labelInfo.locationId,
+              warehouseId: data.labelInfo.warehouseId,
+            })
+
+            this.$message.success('扫描成功')
+          } else {
+            this.$message.error(data.msg || '该标签无效，请检查')
           }
-
-          // 添加到列表
-          this.labelList.push({
-            id: Date.now(),
-            labelCode: labelCode,
-            partNo: data.labelInfo.partNo,
-            quantity: data.labelInfo.quantity,
-            batchNo: data.labelInfo.batchNo,
-            locationId: data.labelInfo.locationId,
-            warehouseId: data.labelInfo.warehouseId
-          });
-
-          this.$message.success('扫描成功');
-        } else {
-          this.$message.error(data.msg || '该标签无效，请检查');
-        }
-      }).catch(error => {
-        this.$message.error('扫描失败');
-      });
+        })
+        .catch((error) => {
+          this.$message.error('扫描失败')
+        })
     },
 
     // 通过条码移除标签
     removeLabelByCode(labelCode) {
-      const index = this.labelList.findIndex(item => item.labelCode === labelCode);
+      const index = this.labelList.findIndex(
+        (item) => item.labelCode === labelCode
+      )
       if (index !== -1) {
-        this.labelList.splice(index, 1);
-        this.$message.success('移除成功');
+        this.labelList.splice(index, 1)
+        this.$message.success('移除成功')
       } else {
-        this.$message.warning('未找到该标签');
+        this.$message.warning('未找到该标签')
       }
     },
 
     // 确认发料
     confirmIssue() {
       if (this.labelList.length === 0) {
-        this.$message.warning('请先扫描材料标签');
-        return;
+        this.$message.warning('请先扫描材料标签')
+        return
       }
 
       // 检查发料数量是否超过需求数量
-      const remainQty = this.mrInfo.qtyDue - this.mrInfo.qtyIssued;
+      const remainQty = this.mrInfo.qtyDue - this.mrInfo.qtyIssued
       if (this.totalIssueQty > remainQty) {
-        this.$message.error(`发料数量[${this.totalIssueQty}]不能超过剩余需求数量[${remainQty}]`);
-        return;
+        this.$message.error(
+          `发料数量[${this.totalIssueQty}]不能超过剩余需求数量[${remainQty}]`
+        )
+        return
       }
 
       const params = {
@@ -240,35 +306,43 @@ export default {
         lineNo: this.lineNo,
         partNo: this.partNo,
         issueQty: this.totalIssueQty,
-        labels: this.labelList.map(label => ({
+        selectedMaterials: this.labelList.map((label) => ({
           labelCode: label.labelCode,
           quantity: label.quantity,
           batchNo: label.batchNo,
           partNo: label.partNo,
           locationId: label.locationId,
-          warehouseId: label.warehouseId
-        }))
-      };
-
-      this.$confirm(`确认发料 ${this.totalIssueQty} ${this.mrInfo.unitMeas || 'pcs'}？`, '确认发料', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        confirmMrIssue(params).then(({ data }) => {
-          if (data && data.code === 0) {
-            this.$message.success('发料成功');
-            this.$router.back();
-          } else {
-            this.$message.error(data.msg || '发料失败');
-          }
-        }).catch(error => {
-          console.error('发料确认失败:', error);
-          this.$message.error('发料失败');
-        });
-      }).catch(() => {
-        // 用户取消
-      });
+          warehouseId: label.warehouseId,
+        })),
+      }
+
+      this.$confirm(
+        `确认发料 ${this.totalIssueQty} ${this.mrInfo.unitMeas || 'pcs'}？`,
+        '确认发料',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }
+      )
+        .then(() => {
+          confirmMrIssue(params)
+            .then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message.success('发料成功')
+                this.$router.back()
+              } else {
+                this.$message.error(data.msg || '发料失败')
+              }
+            })
+            .catch((error) => {
+              console.error('发料确认失败:', error)
+              this.$message.error('发料失败')
+            })
+        })
+        .catch(() => {
+          // 用户取消
+        })
     },
 
     // 取消发料
@@ -277,58 +351,110 @@ export default {
         this.$confirm('取消后将清空已扫描的标签，确定取消吗？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '继续操作',
-          type: 'warning'
-        }).then(() => {
-          this.$router.back();
-        }).catch(() => {
-          // 用户选择继续操作
-        });
+          type: 'warning',
+        })
+          .then(() => {
+            this.$router.back()
+          })
+          .catch(() => {
+            // 用户选择继续操作
+          })
       } else {
-        this.$router.back();
+        this.$router.back()
       }
     },
 
     // 初始化MR信息
     initMrInfo() {
-      const params = this.$route.params;
+      const params = this.$route.params
       this.mrInfo = {
         orderNo: this.orderNo,
         lineNo: this.lineNo,
         partNo: this.partNo,
-        partDesc: params.partDesc || '物料描述',
-        qtyDue: params.qtyDue || 0,
-        qtyIssued: params.qtyIssued || 0,
-        unitMeas: params.unitMeas || 'pcs',
-        statusCode: params.statusCode || '',
-        releaseNo: params.releaseNo || '',
-        dueDate: params.dueDate || ''
-      };
-    }
+        partDesc: this.material.partDesc,
+        qtyDue: this.material.qtyDue,
+        qtyIssued: this.material.qtyIssued,
+        unitMeas: this.material.unitMeas,
+        statusCode: this.material.statusCode,
+        releaseNo: this.material.releaseNo,
+        dueDate: this.material.dueDate,
+      }
+    },
+
+    // 打开编辑弹框
+    openEditDialog(label, index) {
+      this.editForm = {
+        labelCode: label.labelCode,
+        batchNo: label.batchNo,
+        locationId: label.locationId || '',
+        quantity: label.quantity || label.availableQty
+      }
+      this.editIndex = index
+      this.showEditDialog = true
+    },
+
+    // 关闭编辑弹框
+    closeEditDialog() {
+      this.showEditDialog = false
+      this.editForm = {
+        labelCode: '',
+        batchNo: '',
+        locationId: '',
+        quantity: 0
+      }
+      this.editIndex = -1
+    },
+
+    // 确认编辑
+    confirmEdit() {
+      // 验证必填字段
+      if (!this.editForm.locationId.trim()) {
+        this.$message.warning('请输入库位')
+        return
+      }
+
+      if (!this.editForm.quantity || this.editForm.quantity <= 0) {
+        this.$message.warning('请输入有效的发料数量')
+        return
+      }
+
+      // 更新标签信息
+      if (this.editIndex >= 0 && this.editIndex < this.labelList.length) {
+        this.labelList[this.editIndex].locationId = this.editForm.locationId
+        this.labelList[this.editIndex].quantity = Number(this.editForm.quantity)
+        this.$message.success('修改成功')
+      }
+
+      this.closeEditDialog()
+    },
   },
 
   mounted() {
     // 获取路由参数
-    this.orderNo = this.$route.params.orderNo;
-    this.lineNo = this.$route.params.lineNo;
-    this.partNo = this.$route.params.partNo;
+    this.orderNo = this.$route.params.orderNo
+    this.lineNo = this.$route.params.lineNo
+    this.partNo = this.$route.params.partNo
+    this.material = this.$route.params.material
+
+    console.log('路由参数', this.$route.params)
 
     if (!this.orderNo || !this.lineNo || !this.partNo) {
-      this.$message.error('参数错误');
-      this.$router.back();
-      return;
+      this.$message.error('参数错误')
+      this.$router.back()
+      return
     }
 
     // 初始化MR信息
-    this.initMrInfo();
+    this.initMrInfo()
 
     // 聚焦扫描框
     this.$nextTick(() => {
       if (this.$refs.scanInput) {
-        this.$refs.scanInput.focus();
+        this.$refs.scanInput.focus()
       }
-    });
-  }
-};
+    })
+  },
+}
 </script>
 
 <style scoped>
@@ -346,7 +472,7 @@ export default {
   justify-content: space-between;
   align-items: center;
   padding: 8px 16px;
-  background: #17B3A3;
+  background: #17b3a3;
   color: white;
   height: 40px;
   min-height: 40px;
@@ -459,85 +585,116 @@ export default {
   height: 28px;
 }
 
-/* MR信息卡片 */
-.material-info-card {
-  background: white;
-  margin: 4px 16px;
-  padding: 10px 16px;
-  border-radius: 8px;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-  border: 1px solid #f0f0f0;
+/* 内容区域 */
+.content-area {
+  flex: 1;
+  overflow-y: auto;
+  padding: 12px 16px;
 }
 
-.card-header {
-  margin-bottom: 8px;
+/* 材料卡片 */
+.material-card {
+  background: white;
+  border-radius: 8px;
+  margin-bottom: 12px;
+  padding: 16px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  cursor: pointer;
+  transition: all 0.2s ease;
+  border: 2px solid transparent;
 }
 
-.mr-info {
-  display: flex;
-  align-items: center;
-  gap: 12px;
+.material-card:hover {
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+  transform: translateY(-1px);
 }
 
-.mr-label, .line-label {
-  font-size: 12px;
-  color: #666;
-  font-weight: normal;
+.material-card.selected {
+  border-color: #17b3a3;
+  background: #f0fffe;
 }
 
-.mr-value, .line-value {
-  font-size: 14px;
-  font-weight: bold;
-  color: #17B3A3;
+.material-card:active {
+  transform: translateY(0);
 }
 
-.card-content {
-  display: flex;
-  justify-content: space-between;
-  align-items: flex-start;
-  gap: 12px;
+/* 卡片标题 */
+.card-title {
+  margin-bottom: 12px;
 }
 
-.part-info {
-  flex: 1;
-  min-width: 0;
+.title-label {
+  font-size: 12px;
+  color: #666;
+  display: block;
+  margin-bottom: 4px;
 }
 
-.part-no {
-  font-size: 13px;
+.title-value {
+  font-size: 16px;
   font-weight: bold;
   color: #333;
-  margin-bottom: 2px;
+  margin-left: 16px;
 }
 
-.part-desc {
-  font-size: 11px;
+/* 物料描述行 */
+.part-desc-row {
+  margin-bottom: 12px;
+  padding: 0 4px;
+}
+
+.desc-text {
+  font-size: 12px;
   color: #666;
   line-height: 1.3;
   word-break: break-all;
 }
 
-.qty-info {
+.work-order-card {
+  background: white;
+  border-radius: 8px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  transition: all 0.2s ease;
+  border: 2px solid transparent;
+}
+
+.work-order-card:hover {
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+  transform: translateY(-1px);
+}
+
+.work-order-card:active {
+  transform: translateY(0);
+}
+
+/* 卡片详情 */
+.card-details {
   display: flex;
-  gap: 16px;
-  flex-shrink: 0;
+  justify-content: space-between;
+  align-items: flex-start;
+  gap: 4px;
 }
 
-.qty-item {
+.detail-item {
+  flex: 1;
   text-align: center;
+  min-width: 50px;
+  max-width: 70px;
 }
 
-.qty-label {
+.detail-label {
   font-size: 11px;
   color: #666;
-  display: block;
-  margin-bottom: 2px;
+  margin-bottom: 4px;
+  line-height: 1.2;
+  margin-left: -12px;
 }
 
-.qty-value {
+.detail-value {
   font-size: 13px;
-  font-weight: bold;
   color: #333;
+  line-height: 1.2;
+  margin-left: -12px;
 }
 
 /* 区域标题 */
@@ -550,7 +707,7 @@ export default {
   margin: 0 16px;
   margin-top: 4px;
   border-radius: 8px 8px 0 0;
-  border-bottom: 2px solid #17B3A3;
+  border-bottom: 2px solid #17b3a3;
 }
 
 .title-left {
@@ -559,13 +716,13 @@ export default {
 }
 
 .title-left i {
-  color: #17B3A3;
+  color: #17b3a3;
   font-size: 16px;
   margin-right: 8px;
 }
 
 .title-left span {
-  color: #17B3A3;
+  color: #17b3a3;
   font-size: 14px;
   font-weight: 500;
 }
@@ -621,8 +778,35 @@ export default {
 }
 
 .col-qty {
-  width: 60px;
+  width: 80px;
   text-align: center;
+  cursor: pointer;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 4px;
+}
+
+.quantity-display {
+  font-size: 12px;
+  color: #333;
+}
+
+.edit-icon {
+  font-size: 12px;
+  color: #17b3a3;
+  opacity: 0.7;
+  transition: opacity 0.2s ease;
+}
+
+.col-qty:hover .edit-icon {
+  opacity: 1;
+}
+
+.col-qty:hover {
+  background-color: #f0fffe;
+  border-radius: 4px;
 }
 
 .empty-labels {
@@ -636,6 +820,15 @@ export default {
   font-size: 14px;
 }
 
+/* 工单列表 */
+.work-order-list {
+  overflow-y: auto;
+  padding: 12px 16px;
+}
+.work-order-list {
+  padding: 8px 12px;
+}
+
 /* 发料汇总 */
 .issue-summary {
   background: white;
@@ -661,7 +854,7 @@ export default {
 .summary-value {
   font-size: 16px;
   font-weight: bold;
-  color: #17B3A3;
+  color: #17b3a3;
 }
 
 /* 底部操作按钮 */
@@ -684,7 +877,7 @@ export default {
 }
 
 .action-btn.primary {
-  background: #17B3A3;
+  background: #17b3a3;
   color: white;
 }
 
@@ -693,13 +886,13 @@ export default {
 }
 
 .action-btn.secondary {
-  border: 1px solid #17B3A3;
+  border: 1px solid #17b3a3;
   background: white;
-  color: #17B3A3;
+  color: #17b3a3;
 }
 
 .action-btn.secondary:hover {
-  background: #17B3A3;
+  background: #17b3a3;
   color: white;
 }
 
@@ -717,19 +910,23 @@ export default {
     padding: 8px 12px;
   }
 
-  .material-info-card {
-    margin: 4px 12px;
+  .content-area {
     padding: 8px 12px;
   }
 
-  .card-content {
-    flex-direction: column;
-    gap: 8px;
+  .material-card {
+    padding: 12px;
   }
 
-  .qty-info {
-    justify-content: flex-start;
-    gap: 12px;
+  .card-details {
+    flex-wrap: wrap;
+    gap: 6px;
+  }
+
+  .detail-item {
+    flex: 0 0 48%;
+    margin-bottom: 6px;
+    min-width: 50px;
   }
 
   .section-title {
@@ -756,12 +953,154 @@ export default {
     min-width: 50px;
   }
 
-  .list-header, .list-item {
+  .list-header,
+  .list-item {
     font-size: 11px;
   }
 
-  .col-label, .col-part, .col-batch {
+  .col-label,
+  .col-part,
+  .col-batch {
     flex: 1.2;
   }
 }
+
+/* 编辑弹框样式 */
+.edit-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 9999;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 20px;
+}
+
+.edit-modal {
+  background: white;
+  border-radius: 12px;
+  width: 100%;
+  max-width: 400px;
+  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.3);
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+}
+
+.edit-modal .modal-header {
+  background: #17b3a3;
+  color: white;
+  padding: 12px 16px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.edit-modal .modal-title {
+  font-size: 16px;
+  font-weight: 500;
+  margin: 0;
+}
+
+.edit-modal .close-btn {
+  font-size: 16px;
+  cursor: pointer;
+  color: white;
+  transition: color 0.2s ease;
+  padding: 4px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.edit-modal .close-btn:hover {
+  color: #e0e0e0;
+}
+
+.edit-modal .modal-body {
+  padding: 20px;
+}
+
+.edit-modal .form-group {
+  margin-bottom: 16px;
+}
+
+.edit-modal .form-label {
+  display: block;
+  font-size: 14px;
+  color: #333;
+  margin-bottom: 6px;
+  font-weight: 500;
+}
+
+.edit-modal .required {
+  color: #ff4949;
+}
+
+.edit-modal .form-input {
+  width: 100%;
+}
+
+.edit-modal .form-input ::v-deep .el-input__inner {
+  height: 40px;
+  border: 2px solid #dcdfe6;
+  border-radius: 6px;
+  font-size: 14px;
+  padding: 0 12px;
+}
+
+.edit-modal .form-input ::v-deep .el-input__inner:focus {
+  border-color: #17b3a3;
+  outline: none;
+}
+
+.edit-modal .form-input ::v-deep .el-input__inner:disabled {
+  background: #f5f7fa;
+  color: #c0c4cc;
+  border-color: #e4e7ed;
+}
+
+.edit-modal .modal-footer {
+  padding: 16px 20px;
+  display: flex;
+  gap: 12px;
+  justify-content: flex-end;
+  border-top: 1px solid #f0f0f0;
+}
+
+.edit-modal .btn-cancel {
+  padding: 10px 20px;
+  border-radius: 6px;
+  font-size: 14px;
+  cursor: pointer;
+  transition: all 0.2s;
+  border: 1px solid #dcdfe6;
+  background: white;
+  color: #606266;
+}
+
+.edit-modal .btn-cancel:hover {
+  background: #f5f7fa;
+  border-color: #c0c4cc;
+}
+
+.edit-modal .btn-confirm {
+  padding: 10px 20px;
+  border-radius: 6px;
+  font-size: 14px;
+  cursor: pointer;
+  transition: all 0.2s;
+  border: 1px solid #17b3a3;
+  background: #17b3a3;
+  color: white;
+}
+
+.edit-modal .btn-confirm:hover {
+  background: #13998c;
+  border-color: #13998c;
+}
 </style>
diff --git a/src/views/modules/outsourcing-issue/outsourcingDirectIssue.vue b/src/views/modules/outsourcing-issue/outsourcingDirectIssue.vue
index 9fbbdd6..c387be9 100644
--- a/src/views/modules/outsourcing-issue/outsourcingDirectIssue.vue
+++ b/src/views/modules/outsourcing-issue/outsourcingDirectIssue.vue
@@ -107,7 +107,7 @@
 </template>
 
 <script>
-import { getOutsourceOrderInfo } from '@/api/outsourcing/outsourcing.js'
+import { getOutsourcingOrderInfo } from '@/api/outsourcing/outsourcing.js'
 import moment from 'moment'
 
 export default {
@@ -135,7 +135,7 @@ export default {
         site: this.$store.state.user.site,
         poNumber: this.outsourcingNo.trim(),
       }
-      getOutsourceOrderInfo(params)
+      getOutsourcingOrderInfo(params)
         .then(({ data }) => {
           this.loading = false
           if (data && data.code === 0) {
@@ -182,7 +182,7 @@ export default {
         site: this.$store.state.user.site,
         poNumber: this.selectedOrder.poNumber,
       }
-      getOutsourceOrderInfo(params)
+      getOutsourcingOrderInfo(params)
         .then(({ data }) => {
           if (data && data.code === 0) {
             this.materialList = (data.rows || []).map((item, index) => ({
diff --git a/src/views/modules/outsourcing-issue/outsourcingPicking.vue b/src/views/modules/outsourcing-issue/outsourcingPicking.vue
index beab1c4..15c4977 100644
--- a/src/views/modules/outsourcing-issue/outsourcingPicking.vue
+++ b/src/views/modules/outsourcing-issue/outsourcingPicking.vue
@@ -71,7 +71,7 @@
 </template>
 
 <script>
-import { getPoList } from '@/api/po/po.js'
+import { getOutsourcingOrderInfo } from '@/api/outsourcing/outsourcing'
 import moment from 'moment';
 
 export default {
@@ -100,13 +100,10 @@ export default {
       this.loading = true;
       const params = {
         site: this.$store.state.user.site,
-        status: '待发料',
-        type: 'outsourcing'
       }
       console.log('params', params);
 
-      // 使用现有的 PO API 来获取委外订单数据
-      getPoList(params).then(({ data }) => {
+      getOutsourcingOrderInfo(params).then(({ data }) => {
         this.loading = false;
         if (data && data.code === 0) {
           // 转换数据格式以适配委外发料
@@ -137,29 +134,6 @@ export default {
         status: '待发料',
         type: 'outsourcing'
       };
-
-      getPoList(params).then(({ data }) => {
-        this.loading = false;
-        if (data && data.code === 0) {
-          if (data.rows.length === 0) {
-            this.$message.warning('未找到匹配的委外订单');
-          }
-          // 转换数据格式
-          this.outsourcingList = (data.rows || []).map(item => ({
-            outsourcingNo: item.poNumber || item.notifyNo,
-            requestNo: item.workOrderNo || item.relatedNo,
-            pickedLabels: item.pickedLabels || 0,
-            totalLabels: item.totalLabels || 0,
-            requestQty: item.requestQty || item.qty,
-            remainQty: item.remainQty || item.invQtyToReceive
-          }));
-        } else {
-          this.$message.error(data.msg || '查询失败');
-        }
-      }).catch(error => {
-        this.loading = false;
-        this.$message.error('查询失败');
-      });
     },
 
     // 跳转到发料页面
diff --git a/src/views/modules/production-issue/directIssue.vue b/src/views/modules/production-issue/directIssue.vue
index 7f37939..f529471 100644
--- a/src/views/modules/production-issue/directIssue.vue
+++ b/src/views/modules/production-issue/directIssue.vue
@@ -271,7 +271,6 @@ export default {
       });
     },
   },
-
   mounted() {
     // 聚焦工单号输入框
     this.$nextTick(() => {
diff --git a/src/views/modules/production-issue/productionPicking.vue b/src/views/modules/production-issue/productionPicking.vue
index 797b25c..aa9a8d5 100644
--- a/src/views/modules/production-issue/productionPicking.vue
+++ b/src/views/modules/production-issue/productionPicking.vue
@@ -15,12 +15,89 @@
     <div class="search-container">
       <el-input  clearable
                  v-model="searchCode"
-                 placeholder="请扫描出库单或关联单号"
+                 placeholder="请扫描领料申请单号"
                  prefix-icon="el-icon-search"
                  @keyup.enter.native="handleSearch"
                  ref="searchInput"
       />
     </div>
+     <!-- 工单信息卡片列表 -->
+    <div class="work-order-list" v-if="outboundList.length > 0">
+      <div
+        v-for="(workOrder, index) in outboundList"
+        :key="index"
+        class="work-order-card"
+        @click="selectWorkOrder(workOrder)"
+      >
+        <div class="card-title">
+          <span class="title-label">工单号：{{ workOrder.orderNo }}</span>
+          
+        </div>
+        <div class="part-desc-row">
+          <span class="title-value">{{ workOrder.partNo }}</span>
+        </div>
+
+        <!-- 物料描述单独一行 -->
+        <div class="part-desc-row">
+          <span class="desc-text">{{ workOrder.partDesc }}</span>
+        </div>
+
+        <div class="card-details">
+          <div class="detail-item">
+            <div class="detail-label">计划数量</div>
+            <div class="detail-value">{{ workOrder.lotSize }}</div>
+          </div>
+          <div class="detail-item">
+            <div class="detail-label">状态</div>
+            <div class="detail-value">{{ workOrder.status }}</div>
+          </div>
+          <div class="detail-item">
+            <div class="detail-label">单位</div>
+            <div class="detail-value">{{ workOrder.uom || "个" }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div
+      class="content-area"
+      v-if="selectedWorkOrder && materialList.length > 0"
+    >
+      <div
+        v-for="(material, index) in materialList"
+        :key="index"
+        class="material-card"
+        @click="openIssueList(material)"
+      >
+        <div class="card-title">
+          <span class="title-label"
+            >物料编码：{{ material.componentPartNo }} &nbsp;&nbsp; 行号：{{
+              material.lineNo || index + 1
+            }}</span
+          >
+        </div>
+
+        <!-- 物料描述单独一行 -->
+        <div class="part-desc-row">
+          <span class="desc-text">{{ material.componentPartDesc }}</span>
+        </div>
+
+        <div class="card-details">
+          <div class="detail-item">
+            <div class="detail-label">需求数量</div>
+            <div class="detail-value">{{ material.qtyRequired }}</div>
+          </div>
+          <div class="detail-item">
+            <div class="detail-label">已发数量</div>
+            <div class="detail-value">{{ material.qtyIssued || 0 }}</div>
+          </div>
+          <div class="detail-item">
+            <div class="detail-label">单位</div>
+            <div class="detail-value">{{ material.uom || "个" }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
 
     <!-- 出库单列表 -->
     <div class="content-area">
@@ -73,7 +150,7 @@
 <script>
 import {
   getIssureNotifyByNo,
-  getIssureNotifyListByNo,
+  getIssueNotifyHeaderInfo
 } from '@/api/production/production-issue'
 import { getCurrentWarehouse } from '@/utils'
 import moment from 'moment';
@@ -114,7 +191,7 @@ export default {
       }
       console.log('params', params);
       
-      getIssureNotifyListByNo(params).then(({ data }) => {
+      getIssueNotifyHeaderInfo(params).then(({ data }) => {
         this.loading = false;
         if (data && data.code === 0) {
           this.outboundList = data.list || [];
@@ -143,7 +220,7 @@ export default {
         status: 'ISSUE'
       };
 
-      getIssureNotifyListByNo(params).then(({ data }) => {
+      getIssueNotifyHeaderInfo(params).then(({ data }) => {
         this.loading = false;
         if (data && data.code === 0) {
           if (data.list.length === 0) {
@@ -159,6 +236,42 @@ export default {
       });
     },
 
+    // 选择工单
+    selectWorkOrder(workOrder) {
+      this.selectedWorkOrder = workOrder;
+      this.loadMaterialList();
+    },
+
+    // 加载材料清单（工单BOM）
+    loadMaterialList() {
+      if (!this.selectedWorkOrder) {
+        this.materialList = [];
+        return;
+      }
+
+      const params = {
+        workOrderNo: this.selectedWorkOrder.orderNo,
+        site: this.$store.state.user.site,
+      };
+
+      /* getWorkOrderMaterials(params)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.materialList = (data.materials || []).map((item, index) => ({
+              ...item,
+              id: index + 1,
+            }));
+          } else {
+            this.$message.error(data.msg || '获取材料清单失败');
+            this.materialList = [];
+          }
+        })
+        .catch((error) => {
+          console.error('获取材料清单失败:', error);
+          this.$message.error('获取材料清单失败');
+        }); */
+    },
+
     // 跳转到领料页面
     goToPickingPage(item) {
       this.$router.push({
@@ -356,6 +469,43 @@ export default {
   margin-bottom: 12px;
   animation: spin 1s linear infinite;
 }
+.work-order-list {
+  overflow-y: auto;
+  padding: 12px 16px;
+}
+
+.work-order-list {
+    padding: 8px 12px;
+}
+
+.work-order-card {
+    padding: 12px;
+  }
+
+.work-order-card {
+  background: white;
+  border-radius: 8px;
+  margin-bottom: 12px;
+  padding: 16px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  cursor: pointer;
+  transition: all 0.2s ease;
+  border: 2px solid transparent;
+}
+
+.work-order-card:hover {
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+  transform: translateY(-1px);
+}
+
+.work-order-card.selected {
+  border-color: #17b3a3;
+  background: #f0fffe;
+}
+
+.work-order-card:active {
+  transform: translateY(0);
+}
 
 @keyframes spin {
   from { transform: rotate(0deg); }