diff --git a/src/api/production/production-issue.js b/src/api/production/production-issue.js
index aa8bfc1..d6da869 100644
--- a/src/api/production/production-issue.js
+++ b/src/api/production/production-issue.js
@@ -32,3 +32,11 @@ export const getIssureNotifyByNo = data => createAPI(`/pda/production/issue/getI
 // 获取工单列表
 export const getIssureNotifyListByNo = data => createAPI(`/pda/production/issue/getIssureNotifyListByNo`,'post',data)
 
+// 直接领料相关接口
+// 获取工单信息
+export const getWorkOrderInfo = data => createAPI(`/pda/production/issue/getWorkOrderInfo`,'post',data)
+// 扫描材料标签（直接领料）
+export const scanMaterialLabelDirect = data => createAPI(`/pda/production/issue/scanMaterialLabelDirect`,'post',data)
+// 确认直接发料
+export const confirmDirectIssue = data => createAPI(`/pda/production/issue/confirmDirectIssue`,'post',data)
+
diff --git a/src/router/index.js b/src/router/index.js
index 406aea6..511526d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -46,9 +46,12 @@ const globalRoutes = [
   {path: "/productionissue",name: "productionissue", component: resolve => require(["@/views/modules/production-issue/production.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
   { path: "/productionPicking", name: "productionPicking", component: resolve => require(["@/views/modules/production-issue/productionPicking.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
   { path: "/productionPickingDetail/:outboundNo", name: "productionPickingDetail", component: resolve => require(["@/views/modules/production-issue/productionPickingDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
+  { path: "/directIssue", name: "directIssue", component: resolve => require(["@/views/modules/production-issue/directIssue.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
+  { path: "/directIssueDetail/:workOrderNo/:partNo/:partDesc/:requiredQty/:issuedQty", name: "directIssueDetail", component: resolve => require(["@/views/modules/production-issue/directIssueDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
 //生产退料
   {path: "/productionreturn",name: "productionreturn", component: resolve => require(["@/views/modules/production-return/production.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
   {path: "/productionReturnPicking", name: "productionReturnPicking", component: resolve => require(["@/views/modules/production-return/productionReturnPicking.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
+  {path: "/productionReturnPickingDetail/:orderNo/:orderType", name: "productionReturnPickingDetail", component: resolve => require(["@/views/modules/production-return/productionReturnPickingDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
   {path: '/production-return/pick/:orderNo',
     name: 'ProductionIssuePick',component: resolve => require(["@/views/modules/production-return/pick.vue"], resolve),
     meta: { transition: 'instant' ,preload: true,keepAlive: true}},
@@ -60,7 +63,6 @@ const globalRoutes = [
   {path: "/inboundRegisterDetail/:inboundNo",name: "inboundRegisterDetail", component: resolve => require(["@/views/modules/production-inbound/inboundRegisterDetail.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
 
   // 委外
-  {path: "/outsource",name: "outsource", component: resolve => require(["@/views/modules/outsourcing-issue/index.vue"], resolve), meta: { transition: 'instant' ,preload: true,keepAlive: true}},
   { path: "/outsourcingPicking", name: "outsourcingPicking", component: resolve => require(["@/views/modules/outsourcing-issue/outsourcingPicking.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
   { path: "/outsourcingPickingDetail/:outsourcingNo", name: "outsourcingPickingDetail", component: resolve => require(["@/views/modules/outsourcing-issue/outsourcingPickingDetail.vue"], resolve), meta: { transition: 'instant', preload: true, keepAlive: true } },
 
diff --git a/src/views/modules/production-inbound/production.vue b/src/views/modules/production-inbound/production.vue
index 1245b42..69bae82 100644
--- a/src/views/modules/production-inbound/production.vue
+++ b/src/views/modules/production-inbound/production.vue
@@ -5,9 +5,7 @@
         <i class="el-icon-arrow-left"></i>
         <span>生产订单入库</span>
       </div>
-      <div class="header-right" @click="$router.push({ path: '/' })">
-        首页
-      </div>
+      <div class="header-right" @click="$router.push({ path: '/' })">首页</div>
     </div>
 
     <!-- 功能菜单 -->
@@ -16,7 +14,7 @@
         class="menu-item"
         v-for="(btn, index) in buttons"
         :key="index"
-        :class="{ 'disabled': btn.disabled }"
+        :class="{ disabled: btn.disabled }"
         @click="handleButtonClick(btn)"
       >
         <div class="menu-icon" :class="btn.iconClass">
@@ -33,22 +31,40 @@ export default {
   data() {
     return {
       buttons: [
-        { icon: 'scan', label: '包装', iconClass: 'purchase', to: 'productionPick', disabled: false },
-        { icon: 'records', label: '装托盘', iconClass: 'qualified', to: 'productionPick', disabled: true },
-        { icon: 'box', label: '入库登记', iconClass: 'inspection', to: 'inboundRegister', disabled: false },
-      ]
-    }
+        {
+          icon: "scan",
+          label: "包装",
+          iconClass: "purchase",
+          to: "productionPick",
+          disabled: false,
+        },
+        {
+          icon: "records",
+          label: "装托盘",
+          iconClass: "qualified",
+          to: "productionPick",
+          disabled: true,
+        },
+        {
+          icon: "box",
+          label: "入库登记",
+          iconClass: "inspection",
+          to: "inboundRegister",
+          disabled: false,
+        },
+      ],
+    };
   },
   methods: {
     handleButtonClick(btn) {
       if (btn.disabled) {
-        this.$message.warning('正在开发中，敬请期待...');
+        this.$message.warning("正在开发中，敬请期待...");
       } else {
         this.$router.push(btn.to);
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style>
@@ -63,7 +79,7 @@ export default {
   justify-content: space-between;
   align-items: center;
   padding: 8px 16px;
-  background: #17B3A3;
+  background: #17b3a3;
   color: white;
   height: 40px;
   min-height: 40px;
@@ -119,7 +135,7 @@ export default {
 }
 
 .menu-item.disabled::after {
-  content: '开发中';
+  content: "开发中";
   position: absolute;
   top: 8px;
   right: 8px;
diff --git a/src/views/modules/production-issue/directIssue.vue b/src/views/modules/production-issue/directIssue.vue
new file mode 100644
index 0000000..ac41184
--- /dev/null
+++ b/src/views/modules/production-issue/directIssue.vue
@@ -0,0 +1,756 @@
+<template>
+  <div class="pda-container">
+    <!-- 头部栏 -->
+    <div class="header-bar">
+      <div class="header-left" @click="$router.back()">
+        <i class="el-icon-arrow-left"></i>
+        <span>直接领料</span>
+      </div>
+      <div class="header-right" @click="$router.push({ path: '/' })">首页</div>
+    </div>
+
+    <!-- 工单号输入 -->
+    <div class="search-container">
+      <el-input
+        clearable
+        v-model="workOrderNo"
+        placeholder="请输入工单号"
+        prefix-icon="el-icon-search"
+        @keyup.enter.native="handleSearchWorkOrder"
+        ref="workOrderInput"
+      />
+    </div>
+
+    <!-- 工单信息卡片列表 -->
+    <div class="work-order-list" v-if="workOrderList.length > 0">
+      <div
+        v-for="(workOrder, index) in workOrderList"
+        :key="index"
+        class="work-order-card"
+        @click="selectWorkOrder(workOrder)"
+      >
+        <div class="card-title">
+          <span class="title-label">工单号：{{ workOrder.orderNo }}</span>
+          <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.qtyComplete }}</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="selectMaterial(material)"
+      >
+        <div class="card-title">
+          <span class="title-label"
+            >物料编码：{{ material.componentPartNo }} &nbsp;&nbsp; 行号：{{
+              material.lineNo || index + 1
+            }}</span
+          >
+          <!-- <span class="title-value">{{ material.componentPartNo }}</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
+      v-if="selectedWorkOrder && materialList.length === 0"
+      class="empty-state"
+    >
+      <i class="el-icon-box"></i>
+      <p>该工单暂无材料清单</p>
+    </div>
+
+    <!-- 加载状态 -->
+    <div v-if="loading" class="loading-state">
+      <i class="el-icon-loading"></i>
+      <p>加载中...</p>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  getWorkOrderInfo,
+  getWorkOrderMaterials,
+} from "@/api/production/production-issue";
+import moment from "moment";
+
+export default {
+  data() {
+    return {
+      workOrderNo: "",
+      workOrderList: [],
+      selectedWorkOrder: null,
+      materialList: [],
+      selectedMaterial: null,
+      loading: false,
+    };
+  },
+  methods: {
+    formatDate(date) {
+      return date ? moment(date).format("YYYY-MM-DD") : "";
+    },
+
+    // 查询工单信息
+    handleSearchWorkOrder() {
+      if (!this.workOrderNo.trim()) {
+        this.$message.warning("请输入工单号");
+        return;
+      }
+
+      this.loading = true;
+      const params = {
+        workOrderNo: this.workOrderNo.trim(),
+        site: this.$store.state.user.site,
+      };
+
+      getWorkOrderInfo(params)
+        .then(({ data }) => {
+          this.loading = false;
+          console.log("工单信息", data);
+
+          if (
+            data.workOrders &&
+            data.workOrders.length > 0 &&
+            data.code === 0
+          ) {
+            this.workOrderList = data.workOrders;
+            this.selectedWorkOrder = null;
+            this.materialList = [];
+          } else {
+            this.$message.error("未找到该工单信息");
+            this.workOrderList = [];
+            this.selectedWorkOrder = null;
+            this.materialList = [];
+          }
+        })
+        .catch((error) => {
+          this.loading = false;
+          console.error("查询工单信息失败:", error);
+          this.$message.error("查询工单信息失败");
+        });
+    },
+
+    // 选择工单
+    selectWorkOrder(workOrder) {
+      this.selectedWorkOrder = workOrder;
+      this.loadMaterialList();
+    },
+
+    // 加载材料清单
+    loadMaterialList() {
+      if (!this.selectedWorkOrder) {
+        this.materialList = [];
+        return;
+      }
+
+      const params = {
+        workOrderNo: this.selectedWorkOrder.orderNo,
+        site: this.$store.state.user.site,
+      };
+
+      getWorkOrderMaterials(params)
+        .then(({ data }) => {
+          console.log("材料清单", 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("获取材料清单失败");
+        });
+    },
+
+    // 选择材料，跳转到扫描明细页
+    selectMaterial(material) {
+      console.log("选择材料", material);
+      if(material.reserveIssueMethod != 'Reserve And Backflush'){
+        this.$message.warning('该物料为'+material.reserveIssueMethod+',不支持直接领料，请选择其他物料！');
+        return;
+      }
+      this.$router.push({
+        name: "directIssueDetail",
+        params: {
+          workOrderNo: this.selectedWorkOrder.orderNo,
+          partNo: material.componentPartNo,
+          partDesc: material.componentPartDesc,
+          requiredQty: material.qtyRequired,
+          issuedQty: material.qtyIssued || 0,
+        },
+      });
+    },
+  },
+
+  mounted() {
+    // 聚焦工单号输入框
+    this.$nextTick(() => {
+      if (this.$refs.workOrderInput) {
+        this.$refs.workOrderInput.focus();
+      }
+    });
+  },
+};
+</script>
+
+<style scoped>
+.pda-container {
+  width: 100vw;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  background: #f5f5f5;
+}
+
+/* 头部栏 */
+.header-bar {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 8px 16px;
+  background: #17b3a3;
+  color: white;
+  height: 40px;
+  min-height: 40px;
+}
+
+.header-left {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  font-size: 16px;
+  font-weight: 500;
+}
+
+.header-left i {
+  margin-right: 8px;
+  font-size: 18px;
+}
+
+.header-right {
+  cursor: pointer;
+  font-size: 16px;
+  font-weight: 500;
+}
+
+/* 搜索容器 */
+.search-container {
+  padding: 12px 16px;
+  background: white;
+  display: flex;
+  align-items: center;
+  gap: 12px;
+}
+
+.search-container .el-input {
+  flex: 1;
+}
+
+.search-btn {
+  padding: 8px 16px;
+  background: #17b3a3;
+  color: white;
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+  font-size: 14px;
+  transition: background-color 0.2s;
+}
+
+.search-btn:hover {
+  background: #0d8f7f;
+}
+
+.search-btn:disabled {
+  background: #ccc;
+  cursor: not-allowed;
+}
+
+/* 工单列表 */
+.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;
+  overflow-y: auto;
+  padding: 12px 16px;
+}
+
+/* 材料卡片 */
+.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;
+}
+
+.material-card:hover {
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+  transform: translateY(-1px);
+}
+
+.material-card.selected {
+  border-color: #17b3a3;
+  background: #f0fffe;
+}
+
+.material-card:active {
+  transform: translateY(0);
+}
+
+/* 卡片标题 */
+.card-title {
+  margin-bottom: 12px;
+}
+
+.title-label {
+  font-size: 12px;
+  color: #666;
+  display: block;
+  margin-bottom: 4px;
+}
+
+.title-value {
+  font-size: 16px;
+  font-weight: bold;
+  color: #333;
+  margin-left: 16px;
+}
+
+/* 物料描述行 */
+.part-desc-row {
+  margin-bottom: 12px;
+  padding: 0 4px;
+}
+
+.desc-text {
+  font-size: 12px;
+  color: #666;
+  line-height: 1.3;
+  word-break: break-all;
+}
+
+/* 卡片详情 */
+.card-details {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  gap: 4px;
+}
+
+.detail-item {
+  flex: 1;
+  text-align: center;
+  min-width: 50px;
+  max-width: 70px;
+}
+
+.detail-label {
+  font-size: 11px;
+  color: #666;
+  margin-bottom: 4px;
+  line-height: 1.2;
+  margin-left: -12px;
+}
+
+.detail-value {
+  font-size: 13px;
+  color: #333;
+  line-height: 1.2;
+  margin-left: -12px;
+}
+
+/* 扫描区域 */
+.scan-section {
+  margin-top: 16px;
+}
+
+/* 扫描容器 */
+.scan-container {
+  padding: 12px 16px;
+  background: white;
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  border-radius: 0 0 8px 8px;
+  margin-bottom: 12px;
+}
+
+.scan-container .el-input {
+  width: 240px;
+  margin-right: 12px;
+}
+
+/* 紧凑型输入框样式 */
+.compact-input ::v-deep .el-input__inner {
+  height: 36px;
+  padding: 0 12px 0 35px;
+  font-size: 14px;
+}
+
+.compact-input ::v-deep .el-input__prefix {
+  left: 10px;
+}
+
+.compact-input ::v-deep .el-input__suffix {
+  right: 30px;
+}
+
+/* 模式切换开关 */
+.mode-switch {
+  position: relative;
+  display: inline-block;
+}
+
+.custom-switch {
+  transform: scale(1.3);
+}
+
+/* 中间文字 */
+.switch-text {
+  position: absolute;
+  left: 25%;
+  top: 53%;
+  transform: translate(-50%, -50%);
+  font-size: 12px;
+  font-weight: bold;
+  color: white;
+  pointer-events: none;
+  z-index: 2;
+}
+
+.switch-text2 {
+  position: absolute;
+  left: 75%;
+  top: 53%;
+  transform: translate(-50%, -50%);
+  font-size: 12px;
+  font-weight: bold;
+  color: white;
+  pointer-events: none;
+  z-index: 2;
+}
+
+/* 调整 switch 尺寸以便容纳文字 */
+.custom-switch ::v-deep .el-switch__core {
+  width: 60px;
+  height: 28px;
+}
+
+/* 已选材料信息 */
+.selected-material-info {
+  background: #e8f5e8;
+  padding: 12px 16px;
+  margin-bottom: 12px;
+  border-radius: 8px;
+  border-left: 4px solid #17b3a3;
+}
+
+.info-title {
+  font-size: 14px;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 8px;
+}
+
+.info-details {
+  display: flex;
+  gap: 16px;
+  font-size: 12px;
+  color: #666;
+}
+
+/* 标签列表 */
+.label-list {
+  background: white;
+  margin-bottom: 12px;
+  border-radius: 8px;
+  overflow: hidden;
+}
+
+.list-header {
+  display: flex;
+  background: #f8f9fa;
+  padding: 12px 8px;
+  border-bottom: 1px solid #e0e0e0;
+  font-size: 12px;
+  color: #666;
+  font-weight: 500;
+}
+
+.list-item {
+  display: flex;
+  padding: 12px 8px;
+  border-bottom: 1px solid #f0f0f0;
+  font-size: 12px;
+  color: #333;
+}
+
+.list-item:last-child {
+  border-bottom: none;
+}
+
+.col-no {
+  width: 30px;
+  text-align: center;
+}
+
+.col-label {
+  flex: 2;
+  text-align: center;
+}
+
+.col-batch {
+  flex: 1;
+  text-align: center;
+}
+
+.col-qty {
+  width: 60px;
+  text-align: center;
+}
+
+.empty-labels {
+  padding: 40px 20px;
+  text-align: center;
+  color: #999;
+}
+
+.empty-labels p {
+  margin: 0;
+  font-size: 14px;
+}
+
+/* 底部操作按钮 */
+.bottom-actions {
+  display: flex;
+  padding: 16px;
+  gap: 20px;
+  background: white;
+  border-radius: 8px;
+}
+
+.action-btn {
+  flex: 1;
+  padding: 12px;
+  border: 1px solid #17b3a3;
+  background: white;
+  color: #17b3a3;
+  border-radius: 20px;
+  font-size: 14px;
+  cursor: pointer;
+  transition: all 0.2s ease;
+}
+
+.action-btn.primary {
+  background: #17b3a3;
+  color: white;
+}
+
+.action-btn.primary:hover {
+  background: #0d8f7f;
+}
+
+.action-btn.secondary:hover {
+  background: #17b3a3;
+  color: white;
+}
+
+.action-btn:active {
+  transform: scale(0.98);
+}
+
+.action-btn:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+.action-btn:disabled:hover {
+  background: #17b3a3;
+  color: white;
+}
+
+/* 空状态 */
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 60px 20px;
+  color: #999;
+}
+
+.empty-state i {
+  font-size: 48px;
+  margin-bottom: 16px;
+}
+
+.empty-state p {
+  font-size: 14px;
+  margin: 0;
+}
+
+/* 加载状态 */
+.loading-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 60px 20px;
+  color: #17b3a3;
+}
+
+.loading-state i {
+  font-size: 24px;
+  margin-bottom: 12px;
+  animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+.loading-state p {
+  font-size: 14px;
+  margin: 0;
+}
+
+/* 响应式设计 */
+@media (max-width: 360px) {
+  .header-bar {
+    padding: 8px 12px;
+  }
+
+  .search-container {
+    padding: 8px 12px;
+  }
+
+  .work-order-list {
+    padding: 8px 12px;
+  }
+
+  .work-order-card {
+    padding: 12px;
+  }
+
+  .content-area {
+    padding: 8px 12px;
+  }
+
+  .material-card {
+    padding: 12px;
+  }
+
+  .card-details {
+    flex-wrap: wrap;
+    gap: 6px;
+  }
+
+  .detail-item {
+    flex: 0 0 48%;
+    margin-bottom: 6px;
+    min-width: 50px;
+  }
+
+  .list-header,
+  .list-item {
+    font-size: 11px;
+  }
+
+  .col-label {
+    flex: 1.5;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/production-issue/directIssueDetail.vue b/src/views/modules/production-issue/directIssueDetail.vue
new file mode 100644
index 0000000..76996e1
--- /dev/null
+++ b/src/views/modules/production-issue/directIssueDetail.vue
@@ -0,0 +1,568 @@
+<template>
+  <div class="pda-container">
+    <!-- 头部栏 -->
+    <div class="header-bar">
+      <div class="header-left" @click="$router.back()">
+        <i class="el-icon-arrow-left"></i>
+        <span>直接领料</span>
+      </div>
+      <div class="header-right" @click="$router.push({ path: '/' })">
+        首页
+      </div>
+    </div>
+
+    <!-- 扫描框 -->
+    <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" />
+      <div class="mode-switch">
+        <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>
+      </div>
+    </div>
+
+    <!-- 工单及物料信息 -->
+    <div class="work-order-list" v-if="workOrderNo && componentPartNo">
+      <div class="work-order-card">
+        <div class="card-title">
+          <span class="title-label">工单号：{{ workOrderNo }}</span>
+        </div>
+
+        <!-- 物料描述单独一行 -->
+        <div class="part-desc-row">
+          <span class="desc-text">物料编码：{{ componentPartNo }}</span>
+        </div>
+        <div class="part-desc-row">
+          <span class="desc-text">物料名称：{{ componentPartDesc }}</span>
+        </div>
+
+        <div class="card-details">
+          <div class="detail-item">
+            <div class="detail-label">需求数量</div>
+            <div class="detail-value">{{ requiredQty }}</div>
+          </div>
+          <div class="detail-item">
+            <div class="detail-label">已发数量</div>
+            <div class="detail-value">{{ issuedQty }}</div>
+          </div>
+          <div class="detail-item">
+            <div class="detail-label">本次</div>
+            <div class="detail-value">{{ totalScannedQty }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="section-title">
+      <div class="title-left">
+        <i class="el-icon-circle-check"></i>
+        <span>出库信息确认</span>
+      </div>
+    </div>
+    <!-- 标签列表 -->
+    <div class="label-list">
+      <div class="list-header">
+        <div class="col-no">NO.</div>
+        <div class="col-label">标签条码</div>
+        <div class="col-batch">仓库</div>
+        <div class="col-batch">批次号</div>
+        <div class="col-qty">数量</div>
+      </div>
+
+      <div v-for="(label, index) in scannedLabels" :key="label.id" class="list-item">
+        <div class="col-no">{{ index+1 }}</div>
+        <div class="col-label">{{ label.labelCode }}</div>
+        <div class="col-batch">{{label.warehouseId}}</div>
+        <div class="col-batch">{{ label.batchNo || '-' }}</div>
+        <div class="col-qty">{{ label.quantity }}</div>
+      </div>
+
+      <div v-if="scannedLabels.length === 0" class="empty-labels">
+        <p>暂无扫描标签</p>
+      </div>
+    </div>
+
+    <!-- 底部操作按钮 -->
+    <div class="bottom-actions">
+      <button class="action-btn secondary" @click="confirmIssue" :disabled="scannedLabels.length === 0">
+        确定
+      </button>
+      <button class="action-btn secondary" style="margin-left: 10px;">
+        打印
+      </button>
+      <button class="action-btn secondary" style="margin-left: 10px;" @click="clearScannedLabels">
+        清空
+      </button>
+    </div>
+  </div>
+
+</template>
+
+<script>
+import {
+  scanMaterialLabel,
+  confirmDirectIssue,
+} from '@/api/production/production-issue'
+import moment from 'moment'
+
+export default {
+  data() {
+    return {
+      scanCode: '',
+      isRemoveMode: false,
+      scannedLabels: [],
+      workOrderNo: '',
+      componentPartNo: '',
+      componentPartDesc: '',
+      requiredQty: 0,
+      issuedQty: 0,
+    }
+  },
+  computed: {
+    totalScannedQty() {
+      return this.scannedLabels.reduce((sum, l) => sum + (l.quantity || 0), 0)
+    },
+  },
+  methods: {
+    formatDate(date) {
+      return date ? moment(date).format('YYYY-MM-DD') : ''
+    },
+    handleScan() {
+      if (!this.scanCode.trim()) return
+      if (this.isRemoveMode) {
+        this.removeLabelByCode(this.scanCode.trim())
+      } else {
+        this.validateAndAddLabel(this.scanCode.trim())
+      }
+      this.scanCode = ''
+    },
+    validateAndAddLabel(labelCode) {
+      const params = {
+        labelCode,
+        workOrderNo: this.workOrderNo,
+        componentPartNo: this.componentPartNo,
+        site: this.$store.state.user.site,
+      }
+      scanMaterialLabel(params)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            const exists = this.scannedLabels.find(
+              (item) => item.labelCode === labelCode
+            )
+            if (exists) {
+              this.$message.warning('该标签已扫描，请勿重复扫描')
+              return
+            }
+            /* if (data.labelInfo.materialCode !== this.materialCode) {
+            this.$message.error('标签物料编码与选择的材料不匹配')
+            return
+          } */
+            this.scannedLabels.push({
+              id: Date.now(),
+              labelCode,
+              componentPartNo: data.labelInfo.materialCode,
+              quantity: data.labelInfo.availableQty,
+              batchNo: data.labelInfo.batchNo,
+              warehouseId: data.labelInfo.warehouseId,
+            })
+            this.$message.success('扫描成功')
+          } else {
+            this.$message.error(data.msg || '标签验证失败')
+          }
+        })
+        .catch(() => {
+          this.$message.error('扫描失败')
+        })
+    },
+    removeLabelByCode(labelCode) {
+      const index = this.scannedLabels.findIndex(
+        (item) => item.labelCode === labelCode
+      )
+      if (index !== -1) {
+        this.scannedLabels.splice(index, 1)
+        this.$message.success('移除成功')
+      } else {
+        this.$message.warning('未找到该标签')
+      }
+    },
+    clearScannedLabels() {
+      if (this.scannedLabels.length === 0) return
+      this.$confirm('确定清空所有已扫描的标签吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.scannedLabels = []
+          this.$message.success('已清空')
+        })
+        .catch(() => {})
+    },
+    confirmIssue() {
+      if (this.scannedLabels.length === 0) {
+        this.$message.warning('请先扫描材料标签')
+        return
+      }
+      const params = {
+        site: this.$store.state.user.site,
+        workOrderNo: this.workOrderNo,
+        componentPartNo: this.componentPartNo,
+        labels: this.scannedLabels.map((l) => ({
+          labelCode: l.labelCode,
+          quantity: l.quantity,
+          batchNo: l.batchNo,
+          materialCode: l.materialCode,
+        })),
+      }
+      confirmDirectIssue(params)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.$message.success('发料成功')
+            this.$router.back()
+          } else {
+            this.$message.error(data.msg || '发料失败')
+          }
+        })
+        .catch(() => {
+          this.$message.error('发料失败')
+        })
+    },
+    initFromRoute() {
+      this.workOrderNo = this.$route.params.workOrderNo
+      this.componentPartNo = this.$route.params.partNo
+      this.componentPartDesc = this.$route.params.partDesc || ''
+      this.requiredQty = Number(this.$route.params.requiredQty || 0)
+      this.issuedQty = Number(this.$route.params.issuedQty || 0)
+
+      /* if (!this.workOrderNo || !this.materialCode) {
+        this.$message.error('参数错误')
+        this.$router.back()
+      } */
+    },
+  },
+  mounted() {
+    this.initFromRoute()
+    this.$nextTick(() => {
+      if (this.$refs.scanInput) {
+        this.$refs.scanInput.focus()
+      }
+    })
+  },
+}
+</script>
+
+<style scoped>
+.pda-container {
+  width: 100vw;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  background: #f5f5f5;
+}
+.header-bar {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 8px 16px;
+  background: #17b3a3;
+  color: white;
+  height: 40px;
+  min-height: 40px;
+}
+.header-left {
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  font-size: 16px;
+  font-weight: 500;
+}
+.header-left i {
+  margin-right: 8px;
+  font-size: 18px;
+}
+.header-right {
+  cursor: pointer;
+  font-size: 16px;
+  font-weight: 500;
+}
+.search-container {
+  padding: 12px 16px;
+  background: white;
+  display: flex;
+  align-items: center;
+  gap: 12px;
+}
+.search-container .el-input {
+  width: 240px;
+  margin-right: 12px;
+}
+.compact-input ::v-deep .el-input__inner {
+  height: 36px;
+  padding: 0 12px 0 35px;
+  font-size: 14px;
+}
+.compact-input ::v-deep .el-input__prefix {
+  left: 10px;
+}
+.compact-input ::v-deep .el-input__suffix {
+  right: 30px;
+}
+.mode-switch {
+  position: relative;
+  display: inline-block;
+}
+.custom-switch {
+  transform: scale(1.3);
+}
+.switch-text {
+  position: absolute;
+  left: 25%;
+  transform: translateX(-50%);
+  top: 50%;
+  transform: translateY(-50%) translateX(-50%);
+  font-size: 12px;
+  font-weight: 500;
+  color: #606266;
+  white-space: nowrap;
+  pointer-events: none;
+  z-index: 1;
+  top: 53%;
+  transform: translate(-50%, -50%);
+  font-size: 12px;
+  font-weight: bold;
+  color: white;
+  pointer-events: none;
+  z-index: 2;
+}
+
+.switch-text2 {
+  position: absolute;
+  left: 75%;
+  transform: translateX(-50%);
+  top: 50%;
+  transform: translateY(-50%) translateX(-50%);
+  font-size: 12px;
+  font-weight: 500;
+  color: #606266;
+  white-space: nowrap;
+  pointer-events: none;
+  z-index: 1;
+  top: 53%;
+  transform: translate(-50%, -50%);
+  font-size: 12px;
+  font-weight: bold;
+  color: white;
+  pointer-events: none;
+  z-index: 2;
+}
+/* 调整 switch 尺寸以便容纳文字 */
+.custom-switch ::v-deep .el-switch__core {
+  width: 60px;
+  height: 28px;
+}
+/* 工单列表 */
+.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);
+}
+
+/* 卡片标题 */
+.card-title {
+  margin-bottom: 12px;
+}
+
+.title-label {
+  font-size: 12px;
+  color: #666;
+  display: block;
+  margin-bottom: 4px;
+}
+
+.title-value {
+  font-size: 16px;
+  font-weight: bold;
+  color: #333;
+  margin-left: 20px;
+}
+
+.section-title {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 6px 8px;
+  background: white;
+  margin: 0 16px;
+  margin-top: 4px;
+  border-radius: 8px 8px 0 0;
+  border-bottom: 2px solid #17B3A3;
+}
+
+/* 物料描述行 */
+.part-desc-row {
+  margin-bottom: 12px;
+  padding: 0 4px;
+}
+
+.desc-text {
+  font-size: 12px;
+  color: #666;
+  line-height: 1.3;
+  word-break: break-all;
+}
+
+/* 卡片详情 */
+.card-details {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  gap: 4px;
+}
+
+.detail-item {
+  flex: 1;
+  text-align: center;
+  min-width: 50px;
+  max-width: 70px;
+}
+
+.detail-label {
+  font-size: 11px;
+  color: #666;
+  margin-bottom: 4px;
+  line-height: 1.2;
+  margin-left: -12px;
+}
+
+.detail-value {
+  font-size: 13px;
+  color: #333;
+  line-height: 1.2;
+  margin-left: -12px;
+}
+.label-list {
+  background: white;
+  margin: 0 16px 12px;
+  border-radius: 8px;
+  overflow: hidden;
+}
+.list-header {
+  display: flex;
+  background: #f8f9fa;
+  padding: 12px 8px;
+  border-bottom: 1px solid #e0e0e0;
+  font-size: 12px;
+  color: #666;
+  font-weight: 500;
+}
+.list-item {
+  display: flex;
+  padding: 12px 8px;
+  border-bottom: 1px solid #f0f0f0;
+  font-size: 12px;
+  color: #333;
+}
+.list-item:last-child {
+  border-bottom: none;
+}
+.col-no {
+  width: 20px;
+  text-align: center;
+}
+.col-label {
+  flex: 2;
+  text-align: center;
+}
+.col-batch {
+  flex: 1;
+  text-align: center;
+}
+.col-qty {
+  width: 60px;
+  text-align: center;
+}
+.empty-labels {
+  padding: 40px 20px;
+  text-align: center;
+  color: #999;
+}
+.bottom-actions {
+  display: flex;
+  padding: 16px;
+  gap: 20px;
+  background: white;
+  margin-top: auto;
+}
+.action-btn {
+  flex: 1;
+  padding: 12px;
+  border: 1px solid #17b3a3;
+  background: white;
+  color: #17b3a3;
+  border-radius: 20px;
+  font-size: 14px;
+  cursor: pointer;
+  transition: all 0.2s ease;
+}
+.action-btn:hover {
+  background: #17b3a3;
+  color: white;
+}
+.action-btn:active {
+  transform: scale(0.98);
+}
+@media (max-width: 360px) {
+  .header-bar {
+    padding: 8px 12px;
+  }
+  .search-container {
+    padding: 8px 12px;
+  }
+  .work-order-list {
+    padding: 8px 12px;
+  }
+  .work-order-card {
+    padding: 12px;
+  }
+  .card-details {
+    flex-wrap: wrap;
+    gap: 6px;
+  }
+  .detail-item {
+    flex: 0 0 48%;
+    margin-bottom: 6px;
+    min-width: 50px;
+  }
+  .label-list {
+    margin: 0 12px 8px;
+  }
+}
+</style>
+
+
diff --git a/src/views/modules/production-issue/index.vue b/src/views/modules/production-issue/index.vue
deleted file mode 100644
index c3418d4..0000000
--- a/src/views/modules/production-issue/index.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<template>
-  <div>
-    <div class="pda-container">
-      <div class="status-bar">
-        <div class="goBack" @click="$router.back()"><i class="el-icon-arrow-left"></i>上一页</div>
-        <div class="goBack">生产发料</div>
-        <div class="network" style="color: #fff" @click="$router.push({ path: '/' })">🏠首页</div>
-      </div>
-      <div style="overflow-y: auto">
-        <!-- 搜索栏 -->
-        <div class="search-section">
-          <van-search
-            v-model="searchValue"
-            placeholder="请输入生产订单号"
-            @search="handleSearch"
-            @clear="handleClear"
-          />
-        </div>
-
-        <!-- 状态筛选 -->
-        <div class="filter-section">
-          <van-tabs v-model="activeTab" @change="handleTabChange">
-            <van-tab title="全部" name="all" />
-            <van-tab title="待发料" name="0" />
-            <van-tab title="部分发料" name="1" />
-            <van-tab title="已完成" name="2" />
-          </van-tabs>
-        </div>
-
-        <!-- 生产订单列表 -->
-        <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
-          <van-list
-            v-model="loading"
-            :finished="finished"
-            finished-text="没有更多了"
-            @load="onLoad"
-          >
-            <div
-              v-for="item in orderList"
-              :key="item.id"
-              class="order-item"
-              @click="handleOrderClick(item)"
-            >
-              <div class="order-header">
-                <div class="order-no">{{ item.orderNo }}</div>
-                <div class="order-status" :class="getStatusClass(item.status)">
-                  {{ getStatusText(item.status) }}
-                </div>
-              </div>
-              <div class="order-info">
-                <div class="info-row">
-                  <span class="label">产品编码：</span>
-                  <span class="value">{{ item.productCode }}</span>
-                </div>
-                <div class="info-row">
-                  <span class="label">产品名称：</span>
-                  <span class="value">{{ item.productName }}</span>
-                </div>
-                <div class="info-row">
-                  <span class="label">生产数量：</span>
-                  <span class="value">{{ item.planQuantity }}</span>
-                </div>
-                <div class="info-row">
-                  <span class="label">工作中心：</span>
-                  <span class="value">{{ item.workCenter }}</span>
-                </div>
-                <div class="info-row">
-                  <span class="label">计划开始：</span>
-                  <span class="value">{{ item.planStartDate }}</span>
-                </div>
-              </div>
-              <div class="progress-section">
-                <van-progress 
-                  :percentage="Math.round((item.issuedQuantity / item.totalMaterialQuantity) * 100)" 
-                  :stroke-width="6"
-                  color="#1989fa"
-                />
-                <div class="progress-text">发料进度：{{ item.issuedQuantity }}/{{ item.totalMaterialQuantity }}</div>
-              </div>
-            </div>
-          </van-list>
-        </van-pull-refresh>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'ProductionIssue',
-  data() {
-    return {
-      searchValue: '',
-      activeTab: 'all',
-      refreshing: false,
-      loading: false,
-      finished: false,
-      orderList: [
-        {
-          id: 1,
-          orderNo: 'MO202401001',
-          productCode: 'PROD001',
-          productName: '成品A',
-          planQuantity: 100,
-          workCenter: '装配线1',
-          planStartDate: '2024-01-20',
-          totalMaterialQuantity: 500,
-          issuedQuantity: 0,
-          status: 0
-        },
-        {
-          id: 2,
-          orderNo: 'MO202401002',
-          productCode: 'PROD002',
-          productName: '成品B',
-          planQuantity: 200,
-          workCenter: '装配线2',
-          planStartDate: '2024-01-18',
-          totalMaterialQuantity: 800,
-          issuedQuantity: 400,
-          status: 1
-        },
-        {
-          id: 3,
-          orderNo: 'MO202401003',
-          productCode: 'PROD003',
-          productName: '成品C',
-          planQuantity: 150,
-          workCenter: '装配线1',
-          planStartDate: '2024-01-16',
-          totalMaterialQuantity: 600,
-          issuedQuantity: 600,
-          status: 2
-        }
-      ]
-    }
-  },
-  mounted() {
-    this.loadData()
-  },
-  methods: {
-    loadData() {
-      this.loading = true
-      setTimeout(() => {
-        this.loading = false
-        this.finished = true
-      }, 1000)
-    },
-    onRefresh() {
-      this.refreshing = true
-      setTimeout(() => {
-        this.refreshing = false
-        this.$toast.success('刷新成功')
-      }, 1000)
-    },
-    onLoad() {
-      this.loadData()
-    },
-    handleSearch() {
-      this.loadData()
-    },
-    handleClear() {
-      this.searchValue = ''
-      this.loadData()
-    },
-    handleTabChange() {
-      this.loadData()
-    },
-    handleOrderClick(item) {
-      if (item.status === 0 || item.status === 1) {
-        this.$router.push(`/production-issue/pick/${item.orderNo}`)
-      } else {
-        this.$toast('该订单已完成发料')
-      }
-    },
-    getStatusText(status) {
-      const statusMap = {
-        0: '待发料',
-        1: '部分发料',
-        2: '已完成'
-      }
-      return statusMap[status] || '未知'
-    },
-    getStatusClass(status) {
-      const classMap = {
-        0: 'status-pending',
-        1: 'status-partial',
-        2: 'status-completed'
-      }
-      return classMap[status] || ''
-    }
-  }
-}
-</script>
-
-<style scoped>
-.production-issue-container {
-  min-height: 100vh;
-  background-color: #f7f8fa;
-}
-
-.search-section {
-  padding: 10px 16px;
-  background: white;
-}
-
-.filter-section {
-  background: white;
-  border-bottom: 1px solid #ebedf0;
-}
-
-.order-item {
-  background: white;
-  margin: 10px 16px;
-  border-radius: 8px;
-  padding: 16px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
-}
-
-.order-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 12px;
-}
-
-.order-no {
-  font-size: 16px;
-  font-weight: bold;
-  color: #323233;
-}
-
-.order-status {
-  padding: 4px 8px;
-  border-radius: 4px;
-  font-size: 12px;
-  color: white;
-}
-
-.status-pending {
-  background-color: #ff976a;
-}
-
-.status-partial {
-  background-color: #1989fa;
-}
-
-.status-completed {
-  background-color: #07c160;
-}
-
-.order-info {
-  font-size: 14px;
-  margin-bottom: 12px;
-}
-
-.info-row {
-  display: flex;
-  margin-bottom: 6px;
-}
-
-.info-row:last-child {
-  margin-bottom: 0;
-}
-
-.label {
-  color: #969799;
-  width: 80px;
-  flex-shrink: 0;
-}
-
-.value {
-  color: #323233;
-  flex: 1;
-}
-
-.progress-section {
-  margin-top: 12px;
-}
-
-.progress-text {
-  font-size: 12px;
-  color: #646566;
-  margin-top: 4px;
-  text-align: center;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/production-issue/production.vue b/src/views/modules/production-issue/production.vue
index 0d37328..c4fef07 100644
--- a/src/views/modules/production-issue/production.vue
+++ b/src/views/modules/production-issue/production.vue
@@ -35,8 +35,8 @@ export default {
           icon: "scan",
           label: "直接领料",
           iconClass: "purchase",
-          to: "productionPicking",
-          disabled: true,
+          to: "directIssue",
+          disabled: false,
         },
         {
           icon: "records",
@@ -45,6 +45,12 @@ export default {
           to: "productionPicking",
           disabled: false,
         },
+        {
+          icon: "records",
+          label: "分拣",
+          iconClass: "qualified",
+          disabled: true,
+        },
       ],
     };
   },
diff --git a/src/views/modules/production-issue/productionIssuePda.vue b/src/views/modules/production-issue/productionIssuePda.vue
deleted file mode 100644
index 1e81ede..0000000
--- a/src/views/modules/production-issue/productionIssuePda.vue
+++ /dev/null
@@ -1,1362 +0,0 @@
-<template>
-  <div>
-    <div class="pda-container">
-      <div class="status-bar">
-        <div class="goBack" @click="handleBack"><i class="el-icon-arrow-left"></i>上一页</div>
-        <div class="goBack">{{ functionTitle }}</div>
-        <div class="network" style="color: #fff" @click="$router.push({ path: '/' })">🏠首页</div>
-      </div>
-      <div style="overflow-y: auto">
-        <!-- 功能选择 -->
-        <div class="function-selector" v-if="processFlag === 1">
-          <div class="function-card" @click="selectFunction('direct')">
-            <div class="function-icon">📦</div>
-            <div class="function-title">直接发料</div>
-            <div class="function-desc">输入工单号，扫描物料标签直接发料</div>
-          </div>
-
-          <div class="function-card" @click="selectFunction('picking')">
-            <div class="function-icon">🏗️</div>
-            <div class="function-title">拣选装托盘</div>
-            <div class="function-desc">基于申请单创建托盘，扫描箱卷绑定</div>
-          </div>
-
-          <div class="function-card" @click="selectFunction('request')">
-            <div class="function-icon">📋</div>
-            <div class="function-title">申请单发料</div>
-            <div class="function-desc">基于申请单扫描物料标签发料</div>
-          </div>
-        </div>
-
-        <!-- 直接发料 -->
-        <div class="direct-issue" v-if="processFlag === 2 && selectedFunction === 'direct'">
-          <!-- 工单输入 -->
-          <div class="input-section">
-            <div class="input-group">
-              <label>工单号</label>
-              <div class="input-with-scan">
-                <input v-model="directIssueForm.workOrderNo" placeholder="请输入或扫描工单号"
-                  @keyup.enter="loadWorkOrderMaterials" />
-                <button @click="loadWorkOrderMaterials" class="scan-btn">确认</button>
-              </div>
-            </div>
-          </div>
-
-          <!-- 物料列表 -->
-          <div class="materials-section" v-if="workOrderMaterials.length">
-            <div class="material-list">
-              <div v-for="(material, index) in workOrderMaterials" :key="index" class="material-item"
-                :class="{ selected: (selectedMaterial?selectedMaterial.partNo:'') === (material&&material.partNo?material.partNo:'') }"
-                @click="goToScanLabel(material)">
-                <div class="material-info">
-                  <div class="part-no">{{ material.partNo }}</div>
-                  <div class="part-desc">{{ material.partDesc }}</div>
-                  <div class="qty-info">
-                    需求: {{ material.requiredQty }} |
-                    已发: {{ material.issuedQty }} |
-                    剩余: {{ material.remainQty }}
-                  </div>
-                </div>
-                <div class="material-status">
-                  <span v-if="material.remainQty > 0" class="status-pending">待发料</span>
-                  <span v-else class="status-complete">已完成</span>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <!-- 拣选装托盘 -->
-        <div class="picking-pallet" v-if="processFlag === 2 && selectedFunction === 'picking'">
-          <!-- 申请单输入 -->
-          <div class="input-section" v-if="!currentPallet.palletId">
-            <div class="input-group">
-              <label>申请单号</label>
-              <div class="input-with-scan">
-                <input v-model="palletForm.notifyNo" placeholder="请输入申请单号" @keyup.enter="createPallet" />
-                <button @click="createPallet" class="scan-btn">创建托盘</button>
-              </div>
-            </div>
-          </div>
-
-          <!-- 托盘信息 -->
-          <div class="pallet-info" v-if="currentPallet.palletId">
-            <div class="section-header">
-              <h3>托盘信息</h3>
-            </div>
-
-            <div class="info-card">
-              <div class="info-row">
-                <span class="label">托盘ID:</span>
-                <span class="value">{{ currentPallet.palletId }}</span>
-              </div>
-              <div class="info-row">
-                <span class="label">申请单号:</span>
-                <span class="value">{{ currentPallet.notifyNo }}</span>
-              </div>
-              <div class="info-row">
-                <span class="label">已绑定单元:</span>
-                <span class="value">{{ currentPallet.unitCount || 0 }}</span>
-              </div>
-            </div>
-
-            <!-- 扫描绑定 -->
-            <div class="scan-bind-section">
-              <div class="input-group">
-                <label>扫描箱/卷</label>
-                <div class="input-with-scan">
-                  <input v-model="scannedUnit" placeholder="请扫描处理单元条码" @keyup.enter="bindUnit" />
-                  <button @click="bindUnit" class="scan-btn">绑定</button>
-                </div>
-              </div>
-            </div>
-
-            <!-- 已绑定单元列表 -->
-            <div class="bound-units" v-if="currentPallet.scannedUnits.length">
-              <div class="section-header">
-                <h4>已绑定单元 ({{ currentPallet.scannedUnits.length }})</h4>
-              </div>
-              <div class="unit-list">
-                <div v-for="unit in currentPallet.scannedUnits" :key="unit" class="unit-item">
-                  {{ unit }}
-                </div>
-              </div>
-            </div>
-
-            <!-- 打印标签 -->
-            <div class="print-section">
-              <div class="input-group">
-                <label>打印机</label>
-                <select v-model="palletForm.printerName">
-                  <option value="">请选择打印机</option>
-                  <option value="PRINTER_01">打印机01</option>
-                  <option value="PRINTER_02">打印机02</option>
-                </select>
-              </div>
-
-              <button @click="printPalletLabel" class="print-btn" :disabled="!palletForm.printerName">
-                打印托盘标签
-              </button>
-            </div>
-          </div>
-        </div>
-
-        <!-- 申请单发料 -->
-        <div class="request-issue" v-if="processFlag === 2 && selectedFunction === 'request'">
-          <!-- 申请单输入 -->
-          <div class="input-section">
-            <div class="input-group">
-              <!-- <label>申请单号</label> -->
-              <div class="input-with-scan">
-                <input v-model="requestIssueForm.notifyNo" placeholder="请输入申请单号"
-                  @keyup.enter="loadRequestMaterials(false)" />
-                <!-- <button @click="loadRequestMaterials" class="scan-btn">确认</button> -->
-              </div>
-            </div>
-          </div>
-
-          <!-- 申请发料单列表 -->
-          <div class="materials-section" v-if="requestList.length">
-            <!-- <div class="section-header">
-              <h3>申请发料单列表</h3>
-            </div> -->
-            <div class="material-list" @scroll.passive="handleRequestListScroll"
-              style="overflow-y:auto;max-height:70vh;">
-              <div v-for="request in requestList" :key="request.requestId" class="material-item"
-                @click="selectRequest(request)">
-                <div class="material-info">
-                  <div class="part-no">申请单: {{ request.notifyNo }}</div>
-                  <div class="part-desc">{{ request.requestDesc }}</div>
-                  <div class="work-order">工单: {{ request.workOrderNo }}</div>
-                  <div class="qty-info">
-                    申请数量: {{ request.requestQty }} |
-                    已发数量: {{ request.issuedQty }} |
-                    剩余数量: {{ request.remainQty }}
-                  </div>
-                </div>
-                <div class="material-status">
-                  <span v-if="request.remainQty > 0" class="status-pending">待发料</span>
-                  <span v-else class="status-complete">已完成</span>
-                </div>
-              </div>
-              <div v-if="requestLoading" class="loading-text">加载中...</div>
-              <div v-if="!requestHasMore && requestList.length" class="loading-text">没有更多了</div>
-            </div>
-          </div>
-        </div>
-
-      </div>
-
-      <!-- 加载提示 -->
-      <div class="loading" v-if="loading">
-        <div class="loading-spinner"></div>
-        <div class="loading-text">{{ loadingText }}</div>
-      </div>
-
-      <!-- 消息提示 -->
-      <div class="message" v-if="message" :class="messageType">
-        {{ message }}
-      </div>
-
-      <!-- 扫描标签页面 -->
-      <div v-if="processFlag === 3" class="scan-label-page">
-        <div class="scan-content">
-          <div class="input-section">
-            <div class="label-info" v-if="scanLabelData.labelInfo">
-              <div class="info-row"><span class="label">申请单号:</span><span
-                  class="value">{{ scanLabelData.labelInfo.notifyNo }}</span></div>
-              <div class="info-row"><span class="label">工单号:</span><span
-                  class="value">{{ scanLabelData.labelInfo.workOrderNo }}</span></div>
-              <div class="info-row"><span class="label">可用数量:</span><span
-                  class="value">{{ scanLabelData.labelInfo.availableQty }}</span></div>
-            </div>
-
-            <div class="input-group">
-              <button @click="showMaterialListDialog" class="scan-btn" style="margin-bottom: 10px;">查看物料列表</button>
-              <div class="input-with-scan">
-                <input v-model="scanTableInput" placeholder="请扫描材料编号" @keyup.enter="handleScanTableInput" />
-                <!-- <button @click="handleScanTableInput" class="scan-btn">添加</button> -->
-              </div>
-            </div>
-            <div class="input-group">
-              <el-table :data="scanTableData" border highlight-current-row ref="mainTable" style="width: 100%; ">
-                <el-table-column v-for="(item,index) in columnList" :key="index" :sortable="item.columnSortable"
-                  :prop="item.columnProp" :header-align="item.headerAlign"
-                  :show-overflow-tooltip="item.showOverflowTooltip" :align="item.align"
-                  :fixed="item.fixed==''?false:item.fixed" :min-width="item.columnWidth" :label="item.columnLabel">
-                  <template slot-scope="scope">
-                    <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
-                    <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
-                        style="width: 100px; height: 80px" /></span>
-                  </template>
-                </el-table-column>
-                <el-table-column fixed="left" header-align="center" align="center" width="60" label="操作">
-                  <template slot-scope="scope">
-                    <a type="text" size="small" @click="deleteScanTalbeData(scope.row)">删除</a>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
-
-            <div class="message" v-if="scanLabelData.message" :class="scanLabelData.messageType">
-              {{ scanLabelData.message }}</div>
-          </div>
-        </div>
-
-        <!-- 固定在底部的确认按钮 -->
-        <div class="scan-bottom-actions">
-          <button @click="confirmScanLabelIssue" class="confirm-btn">确认发料</button>
-        </div>
-      </div>
-      <!-- 材料列表弹窗 -->
-      <el-dialog title="物料列表" :visible.sync="materialListDialogVisible" :append-to-body='true' width="100%">
-        <el-table :data="materialListData" border highlight-current-row style="width: 100%;">
-          <el-table-column prop="partNo" label="材料编号"></el-table-column>
-          <el-table-column prop="batchNo" label="批号"></el-table-column>
-          <el-table-column prop="qty" label="数量" align="right" header-align="left"></el-table-column>
-          <el-table-column prop="location" label="已扫数量"></el-table-column>
-        </el-table>
-        <span slot="footer" class="dialog-footer">
-          <el-button @click="materialListDialogVisible = false">关闭</el-button>
-        </span>
-      </el-dialog>
-    </div>
-  </div>
-</template>
-
-<script>
-import {
-  getWorkOrderMaterials,
-  parseMaterialLabel,
-  directIssue,
-  getRequestMaterials,
-  requestIssue,
-  createPickingPallet,
-  bindUnitsToPallet,
-  printPalletLabel,
-  getPalletInfo,
-  scanMaterialLabel,
-  getIssureNotifyByNo,
-} from '@/api/production/production-issue'
-
-export default {
-  name: 'ProductionIssuePDA',
-  data() {
-    return {
-      processFlag: 1, // 1=功能选择, 2=主表单, 3=物料列表, 4=扫描标签
-      selectedFunction: null,
-      loading: false,
-      loadingText: '',
-      message: '',
-      messageType: 'info',
-
-      // 直接发料
-      directIssueForm: {
-        site: this.$store.state.user.site,
-        workOrderNo: '',
-        operatorName: 'PDA_USER',
-        remark: '',
-        selectedMaterials: [],
-      },
-      workOrderMaterials: [],
-      selectedMaterial: {
-        partNo: '',
-        partDesc: '',
-        requiredQty: 0,
-        issuedQty: 0,
-        remainQty: 0,
-      },
-
-      // 申请单发料
-      requestIssueForm: {
-        site: this.$store.state.user.site,
-        notifyNo: '',
-        workOrderNo: '',
-        operatorName: 'PDA_USER',
-        remark: '',
-        selectedMaterials: [],
-      },
-      requestList: [], // 申请发料单列表
-      selectedRequest: null, // 选中的申请发料单
-      requestPageNum: 1,
-      requestPageSize: 5,
-      requestHasMore: true,
-      requestLoading: false,
-
-      // 托盘拣选
-      palletForm: {
-        site: this.$store.state.user.site,
-        notifyNo: '',
-        operatorName: 'PDA_USER',
-        printerName: '',
-        remark: '',
-      },
-      currentPallet: {},
-      scannedUnit: '',
-
-      // 通用
-      scannedLabel: '',
-      labelInfo: null,
-      issueQty: null,
-      showScanLabel: false,
-      scanLabelContext: {},
-      scanLabelData: {},
-      scanTableInput: '',
-      scanTableData: [],
-      columnList: [
-        {
-          userId: this.$store.state.user.name,
-          functionId: 701002,
-          serialNumber: '701002Table1NotifyNo',
-          tableId: '701002Table1',
-          tableName: '生产入库申请主表',
-          columnProp: 'partNo',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '物料号',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100,
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 701002,
-          serialNumber: '701002Table1WorkShopName',
-          tableId: '701002Table1',
-          tableName: '生产入库申请主表',
-          columnProp: 'desc',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '批号',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 50,
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 701002,
-          serialNumber: '701002Table1WorkShopName',
-          tableId: '701002Table1',
-          tableName: '生产入库申请主表',
-          columnProp: 'qty',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '数量',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 60,
-        },
-      ],
-      materialListDialogVisible: false,
-      materialListData: [
-        {
-          partNo: 'MAT001',
-          partDesc: '材料描述1',
-          batchNo: 'BATCH001',
-          qty: 100,
-          location: 'A-01-01',
-        },
-        {
-          partNo: 'MAT002',
-          partDesc: '材料描述2',
-          batchNo: 'BATCH002',
-          qty: 50,
-          location: 'A-01-02',
-        },
-        {
-          partNo: 'MAT003',
-          partDesc: '材料描述3',
-          batchNo: 'BATCH003',
-          qty: 200,
-          location: 'B-02-01',
-        },
-      ],
-    }
-  },
-  computed: {
-    functionTitle() {
-      if (!this.selectedFunction) return '生产发料'
-      if (this.selectedFunction === 'direct') return '直接发料'
-      if (this.selectedFunction === 'picking') return '拣选装托盘'
-      if (this.selectedFunction === 'request') return '申请单发料'
-      return '生产发料'
-    },
-  },
-  methods: {
-    handleBack() {
-      if (this.processFlag === 3) {
-        this.processFlag = 2
-        this.showScanLabel = false
-        // 重新查询申请单列表
-        this.requestPageNum = 1
-        this.requestHasMore = true
-        this.loadRequestMaterials(false)
-      } else if (this.processFlag === 2) {
-        this.processFlag = 1
-        this.selectedFunction = null
-      } else if (this.processFlag === 1) {
-        this.$router.push('/')
-      }
-    },
-    selectFunction(func) {
-      this.selectedFunction = func
-      this.resetAll()
-      this.processFlag = 2
-    },
-    goToScanLabel(material) {
-      if (material.remainQty <= 0) {
-        this.showMessage('该物料已发料完成', 'warning')
-        return
-      }
-      this.scanLabelContext = {
-        type: 'direct',
-        workOrderNo: this.directIssueForm.workOrderNo,
-        partNo: material.partNo,
-        material,
-      }
-      this.scanLabelData = {
-        scannedLabel: '',
-        labelInfo: {
-          partNo: this.partNo,
-          batchNo: 'BATCH001',
-          availableQty: 100,
-        },
-        issueQty: null,
-        remark: '',
-        message: '',
-        messageType: 'info',
-      }
-      this.showScanLabel = true
-      this.processFlag = 3
-    },
-    selectRequest(request) {
-      this.selectedRequest = request
-      this.scanLabelContext = {
-        type: 'request',
-        notifyNo: request.notifyNo,
-        workOrderNo: request.workOrderNo,
-        request,
-      }
-      this.scanLabelData = {
-        scannedLabel: '',
-        labelInfo: {
-          notifyNo: request.notifyNo,
-          workOrderNo: request.workOrderNo,
-          availableQty: 100,
-        },
-        issueQty: null,
-        remark: '',
-        message: '',
-        messageType: 'info',
-      }
-      this.showScanLabel = true
-      this.processFlag = 3
-    },
-    closeScanLabel() {
-      this.handleBack()
-    },
-    resetAll() {
-      this.workOrderMaterials = []
-      this.requestList = []
-      this.selectedMaterial = null
-      this.selectedRequest = null
-      this.currentPallet = {}
-      this.scannedLabel = ''
-      this.labelInfo = null
-      this.issueQty = null
-      this.message = ''
-      this.requestPageNum = 1
-      this.requestHasMore = true
-      this.requestList = []
-    },
-
-    // 直接发料相关方法
-    async loadWorkOrderMaterials() {
-      if (!this.directIssueForm.workOrderNo) {
-        this.$message.error('请输入工单号', 'error')
-        return
-      }
-
-      this.loading = true
-      this.loadingText = '加载工单物料...'
-
-      try {
-        const response = await getWorkOrderMaterials({
-          site: this.directIssueForm.site,
-          workOrderNo: this.directIssueForm.workOrderNo,
-        })
-
-        if (response.data.code === 0) {
-          this.workOrderMaterials = response.data.materials || []
-          if (this.workOrderMaterials.length === 0) {
-            this.showMessage('该工单没有物料需求', 'warning')
-          }
-        } else {
-          this.showMessage(response.data.msg, 'error')
-        }
-      } catch (error) {
-        this.showMessage('加载工单物料失败', 'error')
-      } finally {
-        this.loading = false
-      }
-    },
-
-    async confirmDirectIssue() {
-      if (!this.issueQty || this.issueQty <= 0) {
-        this.showMessage('请输入有效的发料数量', 'error')
-        return
-      }
-
-      this.loading = true
-      this.loadingText = '发料中...'
-
-      try {
-        const issueData = {
-          ...this.directIssueForm,
-          selectedMaterials: [
-            {
-              ...this.selectedMaterial,
-              issueQty: this.issueQty,
-            },
-          ],
-          scannedLabel: this.scannedLabel,
-        }
-
-        const response = await directIssue(issueData)
-
-        if (response.data.code === 0) {
-          this.showMessage('发料成功', 'success')
-          // 刷新物料列表
-          await this.loadWorkOrderMaterials()
-          // 重置选择
-          this.selectedMaterial = null
-          this.scannedLabel = ''
-          this.labelInfo = null
-          this.issueQty = null
-        } else {
-          this.showMessage(response.data.msg, 'error')
-        }
-      } catch (error) {
-        this.showMessage('发料失败', 'error')
-      } finally {
-        this.loading = false
-      }
-    },
-
-    // 申请单发料相关方法
-    async loadRequestMaterials(isLoadMore) {
-      if (!this.requestIssueForm.notifyNo) {
-        this.showMessage('请输入申请单号', 'error')
-        return
-      }
-      if (this.requestLoading) return
-      this.requestLoading = true
-      try {
-        const response = await getIssureNotifyByNo({
-          site: this.requestIssueForm.site,
-          notifyNo: this.requestIssueForm.notifyNo,
-          pageNum: this.requestPageNum,
-          pageSize: this.requestPageSize,
-        })
-        if (response.data.code === 0) {
-          const records = response.data.page.records || []
-          console.log(isLoadMore)
-          if (isLoadMore) {
-            this.requestList = this.requestList.concat(records)
-          } else {
-            this.requestList = []
-            this.requestList = records
-          }
-          this.requestHasMore = records.length === this.requestPageSize
-          if (!isLoadMore && this.requestList.length === 0) {
-            this.showMessage('该申请单没有发料需求', 'warning')
-          }
-        } else {
-          this.showMessage(response.data.msg, 'error')
-        }
-      } catch (error) {
-        this.showMessage('加载申请发料单失败', 'error')
-      } finally {
-        this.requestLoading = false
-      }
-    },
-    handleRequestListScroll(e) {
-      const el = e.target
-      if (el.scrollTop + el.clientHeight >= el.scrollHeight - 10) {
-        if (this.requestHasMore && !this.requestLoading) {
-          this.requestPageNum += 1
-          this.loadRequestMaterials(true)
-        }
-      }
-    },
-    // 选择申请发料单
-    selectRequest(request) {
-      this.selectedRequest = request
-      this.scanLabelContext = {
-        type: 'request',
-        notifyNo: request.notifyNo,
-        workOrderNo: request.workOrderNo,
-        request,
-      }
-      this.scanLabelData = {
-        scannedLabel: '',
-        labelInfo: {
-          notifyNo: request.notifyNo,
-          workOrderNo: request.workOrderNo,
-          availableQty: 100,
-        },
-        issueQty: null,
-        remark: '',
-        message: '',
-        messageType: 'info',
-      }
-      this.showScanLabel = true
-      this.processFlag = 3
-    },
-
-    // 托盘拣选相关方法
-    async createPallet() {
-      /* if (!this.palletForm.notifyNo) {
-        this.showMessage('请输入申请单号', 'error')
-        return
-      }
-
-      this.loading = true
-      this.loadingText = '创建托盘...'
-
-      try {
-        const response = await createPickingPallet({
-          ...this.palletForm,
-          palletType: 'PALLET',
-        })
-
-        if (response.data.code === 0) {
-          this.currentPallet = {
-            palletId: response.data.palletId,
-            notifyNo: this.palletForm.notifyNo,
-            scannedUnits: [],
-            unitCount: 0,
-          }
-          this.showMessage('托盘创建成功: ' + response.data.palletId, 'success')
-        } else {
-          this.showMessage(response.data.msg, 'error')
-        }
-      } catch (error) {
-        this.showMessage('创建托盘失败', 'error')
-      } finally {
-        this.loading = false
-      } */
-      this.currentPallet = {
-        palletId: 'qeqweqeqweq',
-        notifyNo: 'SOIA00000035',
-        scannedUnits: [],
-        unitCount: 0,
-      }
-    },
-
-    async bindUnit() {
-      if (!this.scannedUnit) {
-        this.showMessage('请扫描处理单元条码', 'error')
-        return
-      }
-
-      if (this.currentPallet.scannedUnits.includes(this.scannedUnit)) {
-        this.showMessage('该处理单元已绑定', 'warning')
-        this.scannedUnit = ''
-        return
-      }
-
-      this.loading = true
-      this.loadingText = '绑定处理单元...'
-
-      try {
-        const response = await bindUnitsToPallet({
-          site: this.palletForm.site,
-          palletId: this.currentPallet.palletId,
-          scannedUnits: [this.scannedUnit],
-        })
-
-        if (response.data.code === 0) {
-          this.currentPallet.scannedUnits.push(this.scannedUnit)
-          this.currentPallet.unitCount = this.currentPallet.scannedUnits.length
-          this.showMessage('绑定成功', 'success')
-          this.scannedUnit = ''
-        } else {
-          this.showMessage(response.data.msg, 'error')
-        }
-      } catch (error) {
-        this.showMessage('绑定失败', 'error')
-      } finally {
-        this.loading = false
-      }
-    },
-
-    async printPalletLabel() {
-      if (!this.palletForm.printerName) {
-        this.showMessage('请选择打印机', 'error')
-        return
-      }
-
-      this.loading = true
-      this.loadingText = '打印标签...'
-
-      try {
-        const response = await printPalletLabel({
-          site: this.palletForm.site,
-          palletId: this.currentPallet.palletId,
-          printerName: this.palletForm.printerName,
-        })
-
-        if (response.data.code === 0) {
-          this.showMessage('标签打印成功', 'success')
-        } else {
-          this.showMessage(response.data.msg, 'error')
-        }
-      } catch (error) {
-        this.showMessage('打印失败', 'error')
-      } finally {
-        this.loading = false
-      }
-    },
-
-    // 通用方法
-    async parseMaterialLabel() {
-      /* if (!this.scannedLabel) {
-        this.showMessage('请扫描物料标签', 'error')
-        return
-      }
-
-      this.loading = true
-      this.loadingText = '解析标签...'
-
-      try {
-        const response = await parseMaterialLabel({
-          site: this.directIssueForm.site || this.requestIssueForm.site,
-          scannedLabel: this.scannedLabel
-        })
-
-        if (response.data.code === 0 && response.data.labelInfo) {
-          this.labelInfo = response.data.labelInfo
-          this.issueQty = null // 重置发料数量
-          this.showMessage('标签解析成功', 'success')
-        } else {
-          this.showMessage('无法解析标签或标签无效', 'error')
-          this.labelInfo = null
-        }
-      } catch (error) {
-        this.showMessage('标签解析失败', 'error')
-        this.labelInfo = null
-      } finally {
-        this.loading = false
-      } */
-      this.labelInfo = {
-        partNo: this.selectedMaterial.partNo,
-        batchNo: 'BATCH001',
-        availableQty: 100,
-      }
-      this.issueQty = null // 重置发料数量
-      this.showMessage('标签解析成功', 'success')
-    },
-
-    showMessage(text, type = 'info') {
-      this.message = text
-      this.messageType = type
-      setTimeout(() => {
-        this.message = ''
-      }, 3000)
-    },
-
-    async confirmScanLabelIssue() {
-      this.loading = true
-      this.scanLabelData.message = ''
-      try {
-        if (this.scanLabelContext.type === 'direct') {
-          // 直接发料
-          const issueData = {
-            ...this.directIssueForm,
-            selectedMaterials: [
-              {
-                ...this.scanLabelContext.material,
-                issueQty: this.scanLabelData.issueQty,
-              },
-            ],
-            scannedLabel: this.scanLabelData.scannedLabel,
-            remark: this.scanLabelData.remark,
-          }
-          const response = await directIssue(issueData)
-          if (response.data.code === 0) {
-            this.scanLabelData.message = '发料成功'
-            this.scanLabelData.messageType = 'success'
-            await this.loadWorkOrderMaterials()
-            setTimeout(() => {
-              this.showScanLabel = false
-              this.processFlag = 2
-            }, 1000)
-          } else {
-            this.scanLabelData.message = response.data.msg || '发料失败'
-            this.scanLabelData.messageType = 'error'
-          }
-        } else if (this.scanLabelContext.type === 'request') {
-          // 申请单发料
-          const issueData = {
-            ...this.requestIssueForm,
-            selectedMaterials: [
-              {
-                ...this.scanLabelContext.material,
-                issueQty: this.scanLabelData.issueQty,
-              },
-            ],
-            scannedLabel: this.scanLabelData.scannedLabel,
-            remark: this.scanLabelData.remark,
-          }
-          const response = await requestIssue(issueData)
-          if (response.data.code === 0) {
-            this.scanLabelData.message = '发料成功'
-            this.scanLabelData.messageType = 'success'
-            await this.loadRequestMaterials(false)
-            setTimeout(() => {
-              this.showScanLabel = false
-              this.processFlag = 2
-            }, 1000)
-          } else {
-            this.scanLabelData.message = response.data.msg || '发料失败'
-            this.scanLabelData.messageType = 'error'
-          }
-        }
-      } catch (error) {
-        this.scanLabelData.message = '发料异常'
-        this.scanLabelData.messageType = 'error'
-      } finally {
-        this.loading = false
-      }
-    },
-    handleScanTableInput() {
-      if (!this.scanTableInput) return
-      // 假设扫描内容为材料编号，自动生成描述（实际可根据业务查接口）
-      let params = {
-        scanTableInput: this.scanTableInput,
-      }
-      scanMaterialLabel(params)
-        .then(({ data }) => {
-          if (data.code === 0) {
-            let material = {
-              partNo: data.labelInfo.partNo,
-              desc:
-                data.labelInfo.partDesc || '材料描述-' + this.scanTableInput,
-              qty: 1, // 默认数量为1
-            }
-            this.scanTableData.push(material)
-            this.scanTableInput = ''
-          } else {
-            this.$message.error(data.msg || '扫描失败')
-            return
-          }
-        })
-        .catch((error) => {
-          this.$message.error('扫描异常: ' + error.message)
-          return
-        })
-    },
-    showMaterialListDialog() {
-      this.materialListDialogVisible = true
-    },
-    selectMaterialFromList(material) {
-      this.scanTableInput = material.partNo
-      this.materialListDialogVisible = false
-      this.handleScanTableInput()
-    },
-    deleteScanTalbeData(row) {
-      this.scanTableData = this.scanTableData.filter(item => item.partNo !== row.partNo)
-      this.$message.success('删除成功')
-    },
-  },
-}
-</script>
-
-<style scoped>
-.production-issue-pda {
-  padding: 10px;
-  font-family: Arial, sans-serif;
-  background-color: #f5f5f5;
-  min-height: 100vh;
-}
-
-/* 功能选择 */
-.function-selector {
-  display: flex;
-  flex-direction: column;
-  gap: 15px;
-  padding: 20px 0;
-}
-
-.function-card {
-  background: white;
-  border-radius: 8px;
-  padding: 20px;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-  cursor: pointer;
-  transition: all 0.3s;
-  text-align: center;
-}
-
-.function-card:hover {
-  transform: translateY(-2px);
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
-}
-
-.function-icon {
-  font-size: 48px;
-  margin-bottom: 10px;
-}
-
-.function-title {
-  font-size: 18px;
-  font-weight: bold;
-  margin-bottom: 8px;
-  color: #333;
-}
-
-.function-desc {
-  font-size: 14px;
-  color: #666;
-}
-
-/* 输入区域 */
-.input-section,
-.materials-section,
-.scan-section,
-.pallet-info,
-.print-section {
-  background: white;
-  border-radius: 8px;
-  padding: 15px;
-  margin-bottom: 15px;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-}
-
-.section-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 15px;
-  padding-bottom: 10px;
-  border-bottom: 1px solid #eee;
-}
-
-.section-header h3,
-.section-header h4 {
-  margin: 0;
-  color: #333;
-}
-
-.reset-btn {
-  background: #17b3a3;
-  color: white;
-  border: none;
-  padding: 6px 12px;
-  border-radius: 4px;
-  cursor: pointer;
-  font-size: 12px;
-}
-
-.input-group {
-  margin-bottom: 15px;
-}
-
-.input-group label {
-  display: block;
-  margin-bottom: 5px;
-  font-weight: bold;
-  color: #333;
-}
-
-.input-with-scan {
-  display: flex;
-  gap: 10px;
-}
-
-.input-with-scan input {
-  flex: 1;
-  padding: 10px;
-  border: 1px solid #ddd;
-  border-radius: 4px;
-  font-size: 16px;
-}
-
-/* 申请单号输入框绿色边框 */
-.request-issue .input-with-scan input {
-  border: 2px solid #17b3a3;
-  border-radius: 6px;
-}
-
-.request-issue .input-with-scan input:focus {
-  border-color: #13998c;
-  outline: none;
-  box-shadow: 0 0 0 2px rgba(23, 179, 163, 0.2);
-}
-
-.scan-btn,
-.confirm-btn,
-.print-btn {
-  background: #17b3a3;
-  color: white;
-  border: none;
-  padding: 10px 15px;
-  border-radius: 4px;
-  cursor: pointer;
-  font-size: 14px;
-  white-space: nowrap;
-}
-
-.scan-btn:hover,
-.confirm-btn:hover,
-.print-btn:hover {
-  background: #13998c;
-}
-
-.confirm-btn:disabled,
-.print-btn:disabled {
-  background: #6c757d;
-  cursor: not-allowed;
-}
-
-/* 物料列表 */
-.material-list {
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-}
-
-.material-item {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 15px;
-  border: 1px solid #ddd;
-  border-radius: 6px;
-  cursor: pointer;
-  transition: all 0.3s;
-}
-
-.material-item:hover {
-  border-color: #007bff;
-  background-color: #f8f9fa;
-}
-
-.material-item.selected {
-  border-color: #007bff;
-  background-color: #e3f2fd;
-}
-
-.material-info {
-  flex: 1;
-}
-
-.part-no {
-  font-weight: bold;
-  font-size: 16px;
-  color: #333;
-  margin-bottom: 4px;
-}
-
-.part-desc {
-  color: #666;
-  font-size: 14px;
-  margin-bottom: 4px;
-}
-
-.work-order {
-  color: #007bff;
-  font-size: 12px;
-  margin-bottom: 4px;
-}
-
-.qty-info {
-  font-size: 12px;
-  color: #666;
-}
-
-.material-status {
-  text-align: right;
-}
-
-.status-pending {
-  background: #ffc107;
-  color: #212529;
-  padding: 4px 8px;
-  border-radius: 12px;
-  font-size: 12px;
-}
-
-.status-complete {
-  background: #28a745;
-  color: white;
-  padding: 4px 8px;
-  border-radius: 12px;
-  font-size: 12px;
-}
-
-/* 标签信息 */
-.label-info,
-.info-card {
-  background: #f8f9fa;
-  border-radius: 6px;
-  padding: 15px;
-  margin-bottom: 15px;
-}
-
-.info-row {
-  display: flex;
-  justify-content: space-between;
-  margin-bottom: 8px;
-  padding: 5px 0;
-  border-bottom: 1px solid #eee;
-}
-
-.info-row:last-child {
-  border-bottom: none;
-  margin-bottom: 0;
-}
-
-.info-row .label {
-  font-weight: bold;
-  color: #666;
-}
-
-.info-row .value {
-  color: #333;
-}
-
-/* 数量输入 */
-.qty-input {
-  margin-top: 15px;
-}
-
-.qty-input input[type='number'] {
-  width: 100%;
-  padding: 10px;
-  border: 1px solid #ddd;
-  border-radius: 4px;
-  font-size: 16px;
-}
-
-/* 托盘相关 */
-.scan-bind-section {
-  margin: 20px 0;
-}
-
-.bound-units {
-  margin-top: 20px;
-}
-
-.unit-list {
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-  max-height: 200px;
-  overflow-y: auto;
-}
-
-.unit-item {
-  background: #e9ecef;
-  padding: 10px;
-  border-radius: 4px;
-  font-family: monospace;
-  font-size: 14px;
-}
-
-/* 加载和消息 */
-.loading {
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  background: rgba(0, 0, 0, 0.8);
-  color: white;
-  padding: 20px;
-  border-radius: 8px;
-  text-align: center;
-  z-index: 1000;
-}
-
-.loading-spinner {
-  width: 40px;
-  height: 40px;
-  border: 4px solid #f3f3f3;
-  border-top: 4px solid #007bff;
-  border-radius: 50%;
-  animation: spin 1s linear infinite;
-  margin: 0 auto 10px;
-}
-
-@keyframes spin {
-  0% {
-    transform: rotate(0deg);
-  }
-  100% {
-    transform: rotate(360deg);
-  }
-}
-
-.loading-text {
-  font-size: 14px;
-}
-
-.message {
-  position: fixed;
-  top: 20px;
-  left: 50%;
-  transform: translateX(-50%);
-  padding: 12px 20px;
-  border-radius: 6px;
-  font-weight: bold;
-  z-index: 1001;
-  max-width: 90%;
-  text-align: center;
-}
-
-.message.success {
-  background: #d4edda;
-  color: #155724;
-  border: 1px solid #c3e6cb;
-}
-
-.message.error {
-  background: #f8d7da;
-  color: #721c24;
-  border: 1px solid #f5c6cb;
-}
-
-.message.warning {
-  background: #fff3cd;
-  color: #856404;
-  border: 1px solid #ffeaa7;
-}
-
-.message.info {
-  background: #d1ecf1;
-  color: #0c5460;
-  border: 1px solid #bee5eb;
-}
-
-/* 响应式设计 */
-@media (max-width: 768px) {
-  .production-issue-pda {
-    padding: 5px;
-  }
-
-  .function-card {
-    padding: 15px;
-  }
-
-  .function-icon {
-    font-size: 36px;
-  }
-
-  .input-with-scan {
-    flex-direction: column;
-  }
-
-  .material-item {
-    flex-direction: column;
-    align-items: flex-start;
-    gap: 10px;
-  }
-
-  .material-status {
-    align-self: flex-end;
-  }
-}
-.confirm-btn {
-  width: 100%;
-}
-
-/* 扫描标签页面固定底部按钮样式 */
-.scan-label-page {
-  display: flex;
-  flex-direction: column;
-  height: 100vh;
-  position: relative;
-}
-
-.scan-content {
-  flex: 1;
-  overflow-y: auto;
-  padding: 10px;
-  padding-bottom: 80px; /* 为底部按钮留出空间 */
-}
-
-.scan-bottom-actions {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  background: #fff;
-  padding: 15px;
-  border-top: 1px solid #eee;
-  box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.1);
-  z-index: 100;
-}
-.materials-section .material-list .material-item {
-  background: #fff;
-  border-radius: 8px;
-  box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.18);
-  padding: 18px 20px;
-  margin-bottom: 1px;
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-}
-</style>
diff --git a/src/views/modules/production-return/pick.vue b/src/views/modules/production-return/pick.vue
index 7cf7165..15f934a 100644
--- a/src/views/modules/production-return/pick.vue
+++ b/src/views/modules/production-return/pick.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="pick-container">
     <van-nav-bar title="生产拣料" left-arrow @click-left="$router.back()" />
-    
+
     <!-- 订单信息 -->
     <div class="order-info">
       <div class="info-header">
@@ -25,10 +25,14 @@
         class="material-item"
       >
         <div class="material-info">
-          <div class="material-name">{{ item.materialCode }} - {{ item.materialName }}</div>
+          <div class="material-name">
+            {{ item.materialCode }} - {{ item.materialName }}
+          </div>
           <div class="material-spec">规格：{{ item.specification }}</div>
           <div class="material-location">
-            <van-tag type="primary" size="small">{{ item.locationCode }}</van-tag>
+            <van-tag type="primary" size="small">{{
+              item.locationCode
+            }}</van-tag>
             <span class="stock-info">库存：{{ item.stock }}</span>
           </div>
           <div class="material-quantity">
@@ -39,7 +43,9 @@
           <van-stepper
             v-model="item.currentPick"
             :min="0"
-            :max="Math.min(item.requiredQuantity - item.issuedQuantity, item.stock)"
+            :max="
+              Math.min(item.requiredQuantity - item.issuedQuantity, item.stock)
+            "
             integer
           />
         </div>
@@ -94,96 +100,98 @@
 
 <script>
 export default {
-  name: 'ProductionIssuePick',
+  name: "ProductionIssuePick",
   data() {
     return {
       orderInfo: {
-        orderNo: 'MO202401001',
-        productCode: 'PROD001',
-        productName: '成品A',
+        orderNo: "MO202401001",
+        productCode: "PROD001",
+        productName: "成品A",
         planQuantity: 100,
-        workCenter: '装配线1',
-        status: 0
+        workCenter: "装配线1",
+        status: 0,
       },
       materialList: [
         {
-          materialCode: 'MAT001',
-          materialName: '原材料A',
-          specification: '100*50*20mm',
-          locationCode: 'A01-01-01',
+          materialCode: "MAT001",
+          materialName: "原材料A",
+          specification: "100*50*20mm",
+          locationCode: "A01-01-01",
           stock: 500,
           requiredQuantity: 200,
           issuedQuantity: 0,
-          currentPick: 0
+          currentPick: 0,
         },
         {
-          materialCode: 'MAT002',
-          materialName: '原材料B',
-          specification: '200*100*30mm',
-          locationCode: 'A01-02-01',
+          materialCode: "MAT002",
+          materialName: "原材料B",
+          specification: "200*100*30mm",
+          locationCode: "A01-02-01",
           stock: 300,
           requiredQuantity: 150,
           issuedQuantity: 0,
-          currentPick: 0
-        }
+          currentPick: 0,
+        },
       ],
       batchInfo: {
-        batchNo: '',
-        workOrder: ''
+        batchNo: "",
+        workOrder: "",
       },
-      remark: '',
-      submitting: false
-    }
+      remark: "",
+      submitting: false,
+    };
   },
   mounted() {
-    this.loadOrderData()
+    this.loadOrderData();
   },
   methods: {
     loadOrderData() {
-      const orderNo = this.$route.params.orderNo
-      console.log('加载生产订单数据:', orderNo)
+      const orderNo = this.$route.params.orderNo;
+      console.log("加载生产订单数据:", orderNo);
     },
     handleScanBatch() {
-      this.$toast('扫描批次功能开发中...')
+      this.$toast("扫描批次功能开发中...");
     },
     async handleSubmit() {
       // 验证发料数量
-      const hasPick = this.materialList.some(item => item.currentPick > 0)
+      const hasPick = this.materialList.some((item) => item.currentPick > 0);
       if (!hasPick) {
-        this.$toast('请输入发料数量')
-        return
+        this.$toast("请输入发料数量");
+        return;
       }
 
       // 检查库存
-      const insufficientStock = this.materialList.find(item => item.currentPick > item.stock)
+      const insufficientStock = this.materialList.find(
+        (item) => item.currentPick > item.stock
+      );
       if (insufficientStock) {
-        this.$toast(`${insufficientStock.materialName} 库存不足`)
-        return
+        this.$toast(`${insufficientStock.materialName} 库存不足`);
+        return;
       }
 
-      this.submitting = true
-      
+      this.submitting = true;
+
       try {
-        await new Promise(resolve => setTimeout(resolve, 2000))
-        
-        this.$toast.success('发料成功')
-        this.$router.back()
+        await new Promise((resolve) => setTimeout(resolve, 2000));
+
+        this.$toast.success("发料成功");
+        this.$router.back();
       } catch (error) {
-        this.$toast.fail('发料失败')
+        this.$toast.fail("发料失败");
       } finally {
-        this.submitting = false
+        this.submitting = false;
       }
     },
     getStatusText(status) {
       const statusMap = {
-        0: '待发料',
-        1: '部分发料',
-        2: '已完成'
-      }
-      return statusMap[status] || '未知'
-    }
-  }
-}
+        0: "待发料",
+        1: "部分发料",
+        2: "已完成",
+      };
+      return statusMap[status] || "未知";
+    },
+  },
+};
 </script>
 
 <style scoped>
diff --git a/src/views/modules/production-return/productionReturnPicking.vue b/src/views/modules/production-return/productionReturnPicking.vue
index 5f4f878..731c9d3 100644
--- a/src/views/modules/production-return/productionReturnPicking.vue
+++ b/src/views/modules/production-return/productionReturnPicking.vue
@@ -11,216 +11,234 @@
       </div>
     </div>
 
-    <!-- 搜索框 -->
+    <!-- 工单号输入 -->
     <div class="search-container">
-      <el-input  clearable
-                 v-model="searchCode"
-                 placeholder="请扫描工单号或退料申请单号"
-                 prefix-icon="el-icon-search"
-                 @keyup.enter.native="handleSearch"
-                 ref="searchInput"
+      <el-input
+        clearable
+        v-model="workOrderNo"
+        placeholder="请输入工单号"
+        prefix-icon="el-icon-search"
+        @keyup.enter.native="handleSearchWorkOrder"
+        ref="workOrderInput"
       />
     </div>
 
-    <!-- 退料单列表 -->
-    <div class="content-area">
+    <!-- 工单信息卡片列表 -->
+    <div class="work-order-list" v-if="workOrderList.length > 0">
       <div
-        v-for="(item, index) in returnList"
+        v-for="(workOrder, index) in workOrderList"
         :key="index"
-        class="return-card"
-        @click="goToReturnPage(item)"
+        class="work-order-card"
+        @click="selectWorkOrder(workOrder)"
       >
         <div class="card-title">
-          <span class="title-label">{{ item.type === 'workOrder' ? '工单号' : '退料申请单号' }}</span>
-          <span class="title-value">{{ item.orderNo }}</span>
+          <span class="title-label">工单号：{{ workOrder.orderNo }}</span>
+          <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">{{ item.type === 'workOrder' ? '产品编码' : '关联工单' }}</div>
-            <div class="detail-value">{{ item.relatedNo }}</div>
+            <div class="detail-label">计划数量</div>
+            <div class="detail-value">{{ workOrder.qtyComplete }}</div>
           </div>
           <div class="detail-item">
-            <div class="detail-label">退料物料</div>
-            <div class="detail-value">
-              <span class="qualified">{{ item.returnedMaterials }}</span><span class="total">{{ item.totalMaterials }}</span>
-            </div>
+            <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">
-              <span class="qualified">{{ item.returnedQty }}</span><span class="total">{{ item.totalQty }}</span>
-            </div>
+            <div class="detail-label">单位</div>
+            <div class="detail-value">{{ workOrder.uom || "个" }}</div>
           </div>
         </div>
       </div>
+    </div>
 
-      <!-- 空状态 -->
-      <div v-if="returnList.length === 0 && !loading" class="empty-state">
-        <i class="el-icon-box"></i>
-        <p>暂无待退料订单</p>
-      </div>
+    <!-- 材料列表 -->
+    <div
+      class="content-area"
+      v-if="selectedWorkOrder && 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.componentPartNo }} &nbsp;&nbsp; 行号：{{
+              material.lineNo || index + 1
+            }}</span
+          >
+        </div>
+
+        <!-- 物料描述单独一行 -->
+        <div class="part-desc-row">
+          <span class="desc-text">{{ material.componentPartDesc }}</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.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
+      v-if="selectedWorkOrder && materialList.length === 0"
+      class="empty-state"
+    >
+      <i class="el-icon-box"></i>
+      <p>该工单暂无材料清单</p>
+    </div>
+
+    <!-- 加载状态 -->
+    <div v-if="loading" class="loading-state">
+      <i class="el-icon-loading"></i>
+      <p>加载中...</p>
+    </div>
   </div>
 </template>
 
 <script>
-import { getWorkOrderMaterials, getReturnRequestMaterials } from '@/api/production/production-return'
+import {
+  getWorkOrderInfo,
+  getWorkOrderMaterials,
+} from '@/api/production/production-issue';
 import moment from 'moment';
 
 export default {
   data() {
     return {
-      searchCode: '',
-      returnList: [],
-      loading: false
+      workOrderNo: "",
+      workOrderList: [],
+      selectedWorkOrder: null,
+      materialList: [],
+      selectedMaterial: null,
+      loading: false,
     };
   },
   methods: {
     formatDate(date) {
       return date ? moment(date).format('YYYY-MM-DD') : '';
     },
-    // 处理搜索
-    handleSearch() {
-      if (this.searchCode.trim()) {
-        this.searchReturnList(this.searchCode.trim());
-      } else {
-        this.loadReturnList();
+    // 查询工单信息
+    handleSearchWorkOrder() {
+      if (!this.workOrderNo.trim()) {
+        this.$message.warning("请输入工单号");
+        return;
       }
-    },
 
-    // 加载生产退料单列表
-    loadReturnList() {
       this.loading = true;
       const params = {
+        workOrderNo: this.workOrderNo.trim(),
         site: this.$store.state.user.site,
-        status: '待退料',
-      }
-      console.log('params', params);
-      
-      // 模拟获取退料数据
-      this.simulateReturnList(params).then((data) => {
-        this.loading = false;
-        if (data && data.code === 0) {
-          this.returnList = data.list || [];
-        } else {
-          this.$message.error(data.msg || '获取数据失败');
-        }
-      }).catch(() => {
-        this.loading = false;
-        this.$message.error('获取数据失败');
-      });
+      };
+
+      getWorkOrderInfo(params)
+        .then(({ data }) => {
+          this.loading = false;
+          console.log("工单信息", data);
+
+          if (
+            data.workOrders &&
+            data.workOrders.length > 0 &&
+            data.code === 0
+          ) {
+            this.workOrderList = data.workOrders;
+            this.selectedWorkOrder = null;
+            this.materialList = [];
+          } else {
+            this.$message.error("未找到该工单信息");
+            this.workOrderList = [];
+            this.selectedWorkOrder = null;
+            this.materialList = [];
+          }
+        })
+        .catch((error) => {
+          this.loading = false;
+          console.error("查询工单信息失败:", error);
+          this.$message.error("查询工单信息失败");
+        });
     },
 
-    // 搜索特定退料单
-    searchReturnList(searchCode) {
-      this.loading = true;
+    // 选择工单
+    selectWorkOrder(workOrder) {
+      this.selectedWorkOrder = workOrder;
+      this.loadMaterialList();
+    },
+
+    // 加载材料清单
+    loadMaterialList() {
+      if (!this.selectedWorkOrder) {
+        this.materialList = [];
+        return;
+      }
+
       const params = {
-        orderNo: searchCode,
+        workOrderNo: this.selectedWorkOrder.orderNo,
         site: this.$store.state.user.site,
-        status: '待退料'
       };
 
-      this.simulateReturnList(params).then((data) => {
-        this.loading = false;
-        if (data && data.code === 0) {
-          if (data.list.length === 0) {
-            this.$message.warning('未找到匹配的退料订单');
+      getWorkOrderMaterials(params)
+        .then(({ data }) => {
+          console.log("材料清单", 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 = [];
           }
-          this.returnList = data.list || [];
-        } else {
-          this.$message.error(data.msg || '查询失败');
-        }
-      }).catch(() => {
-        this.loading = false;
-        this.$message.error('查询失败');
-      });
+        })
+        .catch((error) => {
+          console.error("获取材料清单失败:", error);
+          this.$message.error("获取材料清单失败");
+        });
     },
 
-    // 模拟退料列表API
-    simulateReturnList(params) {
-      return new Promise((resolve) => {
-        setTimeout(() => {
-          const mockData = [
-            {
-              orderNo: 'WO202401001',
-              type: 'workOrder',
-              relatedNo: 'PROD001',
-              returnedMaterials: 2,
-              totalMaterials: 5,
-              returnedQty: 150,
-              totalQty: 500,
-              status: '待退料'
-            },
-            {
-              orderNo: 'RT202401001',
-              type: 'returnRequest',
-              relatedNo: 'WO202401002',
-              returnedMaterials: 0,
-              totalMaterials: 3,
-              returnedQty: 0,
-              totalQty: 200,
-              status: '待退料'
-            },
-            {
-              orderNo: 'WO202401003',
-              type: 'workOrder',
-              relatedNo: 'PROD003',
-              returnedMaterials: 1,
-              totalMaterials: 4,
-              returnedQty: 80,
-              totalQty: 300,
-              status: '待退料'
-            }
-          ];
-
-          // 如果有搜索条件，过滤数据
-          let filteredData = mockData;
-          if (params.orderNo) {
-            filteredData = mockData.filter(item => 
-              item.orderNo.includes(params.orderNo) || 
-              item.relatedNo.includes(params.orderNo)
-            );
-          }
-
-          resolve({
-            code: 0,
-            list: filteredData,
-            msg: '成功'
-          });
-        }, 500);
-      });
-    },
+    // 选择材料，跳转到扫描明细页
+    selectMaterial(material) {
+      console.log("选择材料", material);
 
-    // 跳转到退料页面
-    goToReturnPage(item) {
       this.$router.push({
-        name: 'productionReturnPickingDetail',
+        name: "productionReturnPickingDetail",
         params: {
-          orderNo: item.orderNo,
-          orderType: item.type
-        }
+          orderNo: this.selectedWorkOrder.orderNo,
+          orderType:'workOrder'
+        },
       });
-    }
+    },
+
   },
 
   mounted() {
-    // 聚焦搜索框
+    // 聚焦工单号输入框
     this.$nextTick(() => {
-      if (this.$refs.searchInput) {
-        this.$refs.searchInput.focus();
+      if (this.$refs.workOrderInput) {
+        this.$refs.workOrderInput.focus();
       }
     });
-
-    // 加载数据
-    this.loadReturnList();
-  }
+  },
 };
 </script>
 
@@ -268,6 +286,45 @@ export default {
 .search-container {
   padding: 12px 16px;
   background: white;
+  display: flex;
+  align-items: center;
+  gap: 12px;
+}
+
+.search-container .el-input {
+  flex: 1;
+}
+
+/* 工单列表 */
+.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);
 }
 
 /* 内容区域 */
@@ -277,8 +334,8 @@ export default {
   padding: 12px 16px;
 }
 
-/* 退料卡片 */
-.return-card {
+/* 材料卡片 */
+.material-card {
   background: white;
   border-radius: 8px;
   margin-bottom: 12px;
@@ -286,15 +343,20 @@ export default {
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
   cursor: pointer;
   transition: all 0.2s ease;
-  border-left: 4px solid #17B3A3;
+  border: 2px solid transparent;
 }
 
-.return-card:hover {
+.material-card:hover {
   box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
   transform: translateY(-1px);
 }
 
-.return-card:active {
+.material-card.selected {
+  border-color: #17b3a3;
+  background: #f0fffe;
+}
+
+.material-card:active {
   transform: translateY(0);
 }
 
@@ -314,7 +376,20 @@ export default {
   font-size: 16px;
   font-weight: bold;
   color: #333;
-  margin-left: 20px;
+  margin-left: 16px;
+}
+
+/* 物料描述行 */
+.part-desc-row {
+  margin-bottom: 12px;
+  padding: 0 4px;
+}
+
+.desc-text {
+  font-size: 12px;
+  color: #666;
+  line-height: 1.3;
+  word-break: break-all;
 }
 
 /* 卡片详情 */
@@ -328,8 +403,8 @@ export default {
 .detail-item {
   flex: 1;
   text-align: center;
-  min-width: 60px;
-  max-width: 60px;
+  min-width: 50px;
+  max-width: 70px;
 }
 
 .detail-label {
@@ -347,21 +422,6 @@ export default {
   margin-left: -12px;
 }
 
-.detail-value .qualified {
-  color: #17B3A3;
-  font-weight: 500;
-}
-
-.detail-value .total {
-  color: #333;
-  font-weight: 500;
-}
-
-.detail-value .total::before {
-  content: '/';
-  color: #333;
-}
-
 /* 空状态 */
 .empty-state {
   display: flex;
@@ -418,11 +478,19 @@ export default {
     padding: 8px 12px;
   }
 
+  .work-order-list {
+    padding: 8px 12px;
+  }
+
+  .work-order-card {
+    padding: 12px;
+  }
+
   .content-area {
     padding: 8px 12px;
   }
 
-  .return-card {
+  .material-card {
     padding: 12px;
   }