From edc17132d4226ee1bbb7e9d225168cc31d0c5182 Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Tue, 31 Mar 2026 12:48:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   1 +
 src/main.js                                   |   3 +
 .../components/addTemplateDialog.vue          |   9 +-
 .../components/afterPlatingEntryDialog.vue    |   6 +-
 .../components/beforePlatingBoundDialog.vue   |  28 +--
 .../components/beforePlatingEntryDialog.vue   |  73 +------
 .../components/handoverRec.vue                |  22 +-
 .../components/print.vue                      | 204 ++++++++++++------
 .../beforeAndAfterPlating/index.vue           |   2 +-
 .../blbWorkOrder/components/glass.vue         |  31 ++-
 .../blbWorkOrder/components/others.vue        |  29 ++-
 .../productionMonitoring/index.vue            |  83 ++++---
 .../sinTerWorkOrder/index.vue                 |  78 +++++--
 src/views/workRate/index.vue                  |  83 +++++--
 14 files changed, 416 insertions(+), 236 deletions(-)

diff --git a/package.json b/package.json
index f1933fd..1ffaa15 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "js-base64": "^3.7.4",
     "js-cookie": "^3.0.0",
     "js-md5": "^0.7.3",
+    "jsbarcode": "^3.12.3",
     "jspdf": "^3.0.4",
     "nprogress": "^0.2.0",
     "pinyin": "^4.0.0",
diff --git a/src/main.js b/src/main.js
index 866150c..d93755b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -37,6 +37,8 @@ import tenantDatasource from './views/system/tenantdatasource.vue';
 import * as echarts from 'echarts';
 import 'virtual:svg-icons-register'
 import print from 'vue3-print-nb'
+// import Barcode from 'vue-barcode';
+
 
 // import print from 'vue3-print-nb' // 打印插件
 
@@ -70,6 +72,7 @@ app.use(i18n);
 app.use(store);
 app.use(router);
 app.use(print)
+// app.component('vue-barcode', Barcode);
 // app.use(print)
 app.use(ElementPlus, {
   locale: messages[language],
diff --git a/src/views/processManagement/components/addTemplateDialog.vue b/src/views/processManagement/components/addTemplateDialog.vue
index dbf50d4..f377bfa 100644
--- a/src/views/processManagement/components/addTemplateDialog.vue
+++ b/src/views/processManagement/components/addTemplateDialog.vue
@@ -678,6 +678,7 @@ export default {
           _tempId: this.tempId, // 临时唯一标识
           id: null,
           processNo: this.getProcessNo(this.ruleForm.tableData),
+          isMain:'2'
         });
       }
       if (this.activeName == '2') {
@@ -796,7 +797,7 @@ export default {
           console.log('提交数据:', query);
 
           // 修改
-          if (!this.moldAddMore) {
+          if (this.title=='修改') {
             update()
               .then(res => {
                 this.formLoading = false;
@@ -805,7 +806,7 @@ export default {
                   message: '操作成功!',
                 });
                 this.$emit('closeDialog');
-                // this.getDetail();
+                this.getDetail();
               })
               .catch(err => {
                 this.formLoading = false;
@@ -819,8 +820,8 @@ export default {
                   type: 'success',
                   message: '操作成功!',
                 });
-                // this.$emit('closeDialog');
-                this.getDetail();
+                this.$emit('closeDialog');
+                // this.getDetail();
               })
               .catch(err => {
                 this.formLoading = false;
diff --git a/src/views/productionManagement/beforeAndAfterPlating/components/afterPlatingEntryDialog.vue b/src/views/productionManagement/beforeAndAfterPlating/components/afterPlatingEntryDialog.vue
index 55878aa..1bf7567 100644
--- a/src/views/productionManagement/beforeAndAfterPlating/components/afterPlatingEntryDialog.vue
+++ b/src/views/productionManagement/beforeAndAfterPlating/components/afterPlatingEntryDialog.vue
@@ -70,11 +70,11 @@
         </el-table-column>
         <el-table-column label="入库工序名称" prop="processName" align="center" width="120">
         </el-table-column>
-        <el-table-column label="下序号" prop="nextProcessCode" align="center" width="120">
+        <el-table-column label="上序号" prop="nextProcessCode" align="center" width="120">
         </el-table-column>
-        <el-table-column label="下序名称" prop="nextProcessName" align="center" width="120">
+        <el-table-column label="上序名称" prop="nextProcessName" align="center" width="120">
         </el-table-column>
-        <el-table-column label="下序班组/供应商" prop="nextTeamCode" width="200" align="center">
+        <el-table-column label="上序班组/供应商" prop="nextTeamCode" width="200" align="center">
         </el-table-column>
         <el-table-column label="入库数量" prop="inQuantity" align="center" width="120">
         </el-table-column>
diff --git a/src/views/productionManagement/beforeAndAfterPlating/components/beforePlatingBoundDialog.vue b/src/views/productionManagement/beforeAndAfterPlating/components/beforePlatingBoundDialog.vue
index c2a4a20..36b8c27 100644
--- a/src/views/productionManagement/beforeAndAfterPlating/components/beforePlatingBoundDialog.vue
+++ b/src/views/productionManagement/beforeAndAfterPlating/components/beforePlatingBoundDialog.vue
@@ -32,35 +32,23 @@
         height="500px"
       >
         <el-table-column type="selection" fixed></el-table-column>
-        <!-- <el-table-column label="单号" prop="paCode" align="center" width="200"></el-table-column> -->
-        <el-table-column label="车间订单" prop="woCode" align="center" width="200">
-          <!-- prop="woCode"<template #header>
-            <span><i style="color: red">*</i>车间订单</span>
-          </template>
-          <template #default="scope">
-            <el-form-item
-              :prop="`beforePlatingEntryData[${scope.$index}].woCode`"
-              :rules="formRules.woCode"
-            >
-              <el-input v-model="scope.row.woCode" placeholder="请输入车间订单"></el-input>
-            </el-form-item>
-          </template> -->
+        <el-table-column label="车间订单" prop="woCode" align="center" width="150">
         </el-table-column>
-        <el-table-column label="批次号" prop="batchNo" align="center" width="200"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" align="center" width="150"></el-table-column>
         <el-table-column
           label="流程卡号"
           prop="cardNo"
           align="center"
-          width="200"
+          width="150"
         ></el-table-column>
-        <el-table-column label="出库班组/供应商" prop="teamCode" width="200" align="center">
+        <el-table-column label="出库班组/供应商" prop="teamCode" width="150" align="center">
         </el-table-column>
         <el-table-column label="出库工序号" prop="processCode" align="center"> </el-table-column>
-        <el-table-column label="出库工序名称" prop="processName" align="center" width="200">
+        <el-table-column label="出库工序名称" prop="processName" align="center" width="150">
         </el-table-column>
         <el-table-column label="下序号" prop="nextProcessCode" align="center"> </el-table-column>
-        <el-table-column label="下序名称" prop="processName" align="center"> </el-table-column>
-        <el-table-column label="下序班组/供应商" prop="nextTeamCode" width="200" align="center">
+        <el-table-column label="下序名称" prop="nextProcessName" align="center"> </el-table-column>
+        <el-table-column label="下序班组/供应商" prop="nextTeamCode" width="150" align="center">
         </el-table-column>
         <el-table-column label="出库数量" prop="inQuantity" align="center"> </el-table-column>
       </el-table>
@@ -179,7 +167,7 @@ export default {
               quantity: item.inQuantity,
             });
           });
-          
+
           savePlateAroundPlateFrontIssue(query)
             .then(res => {
               this.$message.success('提交成功');
diff --git a/src/views/productionManagement/beforeAndAfterPlating/components/beforePlatingEntryDialog.vue b/src/views/productionManagement/beforeAndAfterPlating/components/beforePlatingEntryDialog.vue
index 985058c..b03c478 100644
--- a/src/views/productionManagement/beforeAndAfterPlating/components/beforePlatingEntryDialog.vue
+++ b/src/views/productionManagement/beforeAndAfterPlating/components/beforePlatingEntryDialog.vue
@@ -32,81 +32,26 @@
         :height="tableHeight"
       >
         <el-table-column type="selection" fixed></el-table-column>
-        <!-- <el-table-column label="单号" prop="paCode" align="center" width="200"></el-table-column> -->
-        <el-table-column label="车间订单" prop="woCode" align="center" width="200">
-          <!-- prop="woCode"<template #header>
-            <span><i style="color: red">*</i>车间订单</span>
-          </template>
-          <template #default="scope">
-            <el-form-item
-              :prop="`beforePlatingEntryData[${scope.$index}].woCode`"
-              :rules="formRules.woCode"
-            >
-              <el-input v-model="scope.row.woCode" placeholder="请输入车间订单"></el-input>
-            </el-form-item>
-          </template> -->
+
+        <el-table-column label="车间订单" prop="woCode" align="center" width="150">
         </el-table-column>
-        <el-table-column label="批次号" prop="batchNo" align="center" width="200"></el-table-column>
+        <el-table-column label="批次号" prop="batchNo" align="center" width="150"></el-table-column>
         <el-table-column
           label="流程卡号"
           prop="cardNo"
           align="center"
-          width="200"
+          width="150"
         ></el-table-column>
-        <el-table-column label="入库班组/供应商" prop="teamCode" width="200" align="center">
+        <el-table-column label="入库班组/供应商" prop="teamCode" width="150" align="center">
         </el-table-column>
         <el-table-column label="入库工序号" prop="processCode" align="center"> </el-table-column>
-        <el-table-column label="入库工序名称" prop="processName" align="center" width="200">
+        <el-table-column label="入库工序名称" prop="processName" align="center" width="150">
         </el-table-column>
         <el-table-column label="下序号" prop="nextProcessCode" align="center"> </el-table-column>
-        <el-table-column label="下序名称" prop="processName" align="center"> </el-table-column>
-        <el-table-column label="下序班组/供应商" prop="nextTeamCode" width="200" align="center">
+        <el-table-column label="下序名称" prop="nextProcessName" align="center"> </el-table-column>
+        <el-table-column label="下序班组/供应商" prop="nextTeamCode" width="150" align="center">
         </el-table-column>
         <el-table-column label="入库数量" prop="inQuantity" align="center"> </el-table-column>
-        <!-- <el-table-column label="入库人员" prop="userName" align="center" width="200">
-          <template #header>
-            <span><i style="color: red">*</i>入库人员</span>
-          </template>
-          <template #default="scope">
-            <el-form-item
-              :prop="`beforePlatingEntryData[${scope.$index}].userId`"
-              :rules="formRules.userId"
-            >
-              <el-select
-                filterable
-                clearable
-                v-model="scope.row.userId"
-                placeholder="请选择入库人员"
-              >
-                <el-option
-                  v-for="item in userList"
-                  :key="item.id"
-                  :label="item.realName"
-                  :value="item.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </template>
-        </el-table-column>
-        <el-table-column label="入库时间" prop="createTime" align="center" width="200">
-          <template #header>
-            <span><i style="color: red">*</i>入库时间</span>
-          </template>
-          <template #default="scope">
-            <el-form-item
-              :prop="`beforePlatingEntryData[${scope.$index}].createTime`"
-              :rules="formRules.createTime"
-            >
-              <el-date-picker
-                v-model="scope.row.createTime"
-                type="datetime"
-                placeholder="选择日期时间"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                style="width: 100%"
-              ></el-date-picker>
-            </el-form-item>
-          </template>
-        </el-table-column> -->
       </el-table>
     </el-form>
 
@@ -257,7 +202,7 @@ export default {
               wpId: item.wpId,
               tsId: item.teamId,
               ocId: item.ocId ? item.ocId : null,
-              quantity:item.inQuantity
+              quantity: item.inQuantity,
             });
           });
           savePlateAroundPlateFrontEnter(query)
diff --git a/src/views/productionManagement/beforeAndAfterPlating/components/handoverRec.vue b/src/views/productionManagement/beforeAndAfterPlating/components/handoverRec.vue
index aa695bf..26f7ba9 100644
--- a/src/views/productionManagement/beforeAndAfterPlating/components/handoverRec.vue
+++ b/src/views/productionManagement/beforeAndAfterPlating/components/handoverRec.vue
@@ -31,7 +31,13 @@
     </avue-crud>
 
     <!-- 打印 -->
-    <print v-if="printShow" :showPrint="printShow" @cancel="cancel"></print>
+    <print
+      ref="printNew"
+      v-if="printShow"
+      :showPrint="printShow"
+      :rowData="rowData"
+      @cancel="cancel"
+    ></print>
   </div>
 </template>
 
@@ -240,6 +246,7 @@ export default {
       },
 
       data: [],
+      rowData: [],
     };
   },
   methods: {
@@ -257,10 +264,17 @@ export default {
         this.list.push(item.id);
       });
       this.printShow = true;
-      handoverRecordPrint({ hrIds: this.list.join(',') }).then(res => {
-        console.log(res, 'res');
+      this.rowData = this.list;
+      setTimeout(() => {
         this.printLoading = false;
-      });
+      }, 1000);
+      // this.$refs.printNew.open()
+      // handoverRecordPrint({ hrIds: this.list.join(',') }).then(res => {
+      //   console.log(res, 'res');
+      //   this.printLoading = false;
+      // }).catch(err=>{
+      //   this.printLoading = false;
+      // })
       //   this.$refs.printClick.open('prHandoverRecord/print', {
       //     list: this.list,
       //     hrType: this.hrType
diff --git a/src/views/productionManagement/beforeAndAfterPlating/components/print.vue b/src/views/productionManagement/beforeAndAfterPlating/components/print.vue
index 060ffbb..4703c05 100644
--- a/src/views/productionManagement/beforeAndAfterPlating/components/print.vue
+++ b/src/views/productionManagement/beforeAndAfterPlating/components/print.vue
@@ -1,39 +1,51 @@
 <template>
-  <el-dialog v-drag v-loading="loading" title="打印预览" :modelValue="showPrint" :before-close="cancel" :def-width="1200" top="0" fullscreen >
+  <el-dialog
+    v-drag
+    v-loading="loading"
+    title="打印预览"
+    :modelValue="showPrint"
+    :before-close="cancel"
+    :def-width="1200"
+    top="0"
+    fullscreen
+  >
     <el-button v-print="printObj" type="primary" class="printButton">打印</el-button>
     <div v-if="showPrint" id="printMe" ref="printContent" class="printBox">
       <template v-for="(item, index) in tablist">
-
-        <table v-if="item.hrType == 1"  border="0" class="table_box" style="width:100%">
+        <table v-if="item.hrType == 1" border="0" class="table_box" style="width: 100%">
           <tr class="tr_fist">
-            <td style="border:0;font-size:20px">
-              <div class="tableTitleBarcodeCenter" style="transform: translate(-50%);">转工交接单</div>
+            <td style="border: 0; font-size: 20px">
+              <div class="tableTitleBarcodeCenter" style="transform: translate(-50%)">
+                转工交接单
+              </div>
             </td>
           </tr>
           <tr class="tr_fist">
-            <td style="border:0;font-size:20px;">
-              <div class="tableTitleBarcode tableTitleBarcodeCenter" style="height:20px">
-                <vue-barcode :value="item.hrCode" format="CODE128" class="barCode" width="2" height="36" />
+            <td style="border: 0; font-size: 20px">
+              <div class="tableTitleBarcode tableTitleBarcodeCenter" style="height: 20px">
+                <svg
+                  v-if="item.hrCode"
+                  :ref="`barcode-${index}-${item.hrType}`"
+                  class="barCode"
+                ></svg>
               </div>
             </td>
           </tr>
 
           <tr class="tr_fist">
-            <td colspan="10" style="border:0;font-size:12px;padding-bottom:30px">
+            <td colspan="10" style="border: 0; font-size: 12px; padding-bottom: 30px">
               <div class="tableTitle">
-                <div style="z-index:9999">车间订单:{{ item.woCode }}</div>
+                <div style="z-index: 9999">车间订单:{{ item.woCode }}</div>
               </div>
             </td>
           </tr>
           <tr class="tr_fist">
             <td>委托车间</td>
             <td>{{ item.entrustDept }}</td>
-
           </tr>
           <tr class="tr_fist">
             <td>承制车间</td>
             <td>4A</td>
-
           </tr>
           <tr class="tr_fist">
             <td rowspan="2" colspan="3">工作订单</td>
@@ -55,9 +67,9 @@
             <td colspan="2">{{ item.partCode }}</td>
             <td>{{ item.prodIdent }}</td>
             <td>{{ item.makeQty }}</td>
-            <td>{{  }}</td>
+            <td>{{}}</td>
             <td>{{ item.handoverQty }}</td>
-            <td>{{  }}</td>
+            <td>{{}}</td>
           </tr>
           <tr class="tr_fist">
             <td rowspan="2">废品数</td>
@@ -66,7 +78,7 @@
             <td colspan="2">定额</td>
             <td colspan="2">金额</td>
             <td colspan="3" rowspan="2">转工人:{{ item.createMan }}</td>
-            <td colspan="2" rowspan="3">收件人:{{  }}</td>
+            <td colspan="2" rowspan="3">收件人:{{}}</td>
           </tr>
           <tr class="tr_fist">
             <td>单件</td>
@@ -78,36 +90,46 @@
             <td>{{ item.scrapQty }}</td>
             <td>{{ item.testQty }}</td>
             <td>{{ item.useQty }}</td>
-            <td>{{  }}</td>
-            <td>{{  }}</td>
-            <td>{{  }}</td>
-            <td>{{  }}</td>
+            <td>{{}}</td>
+            <td>{{}}</td>
+            <td>{{}}</td>
+            <td>{{}}</td>
             <td colspan="3">时间:{{ item.tableDate }}</td>
           </tr>
-
         </table>
-        <table v-if="item.hrType == 0"  border="0" class="table_box" style="width:100%">
+        <table v-if="item.hrType == 0" border="0" class="table_box" style="width: 100%">
           <tr class="tr_fist">
-            <td colspan="16" style="border:0;font-size:20px">
-              <div class="tableTitleBarcode" style="height:50px">
-                <vue-barcode :value="item.hrCode" format="CODE128" class="barCode" width="3" height="36" />
+            <td colspan="16" style="border: 0; font-size: 20px">
+              <div class="tableTitleBarcode" style="height: 50px">
+                <svg
+                  v-if="item.hrCode"
+                  :ref="`barcode-${index}-${item.hrType}`"
+                  class="barCode"
+                ></svg>
+                <!-- <vue-barcode
+                  :value="item.hrCode"
+                  format="CODE128"
+                  class="barCode"
+                  width="3"
+                  height="36"
+                /> -->
               </div>
             </td>
           </tr>
           <tr class="tr_fist">
-            <td colspan="16" style="border:0;font-size:20px;padding-top:30px">
+            <td colspan="16" style="border: 0; font-size: 20px; padding-top: 30px">
               <div>热表分厂零部件入库支出卡</div>
             </td>
           </tr>
-          <tr class="tr_fist" style="border:0">
-            <td colspan="16" style="border:0">
-              <div style="width:100%;border:1px #000 solid" />
+          <tr class="tr_fist" style="border: 0">
+            <td colspan="16" style="border: 0">
+              <div style="width: 100%; border: 1px #000 solid" />
             </td>
           </tr>
           <tr class="tr_fist">
-            <td colspan="16" style="border:0;font-size:12px">
+            <td colspan="16" style="border: 0; font-size: 12px">
               <div class="tableTitle">
-                <div style="z-index:9999">工作订单:{{ item.poCode }}</div>
+                <div style="z-index: 9999">工作订单:{{ item.poCode }}</div>
                 <div>车间订单:{{ item.woCode }}</div>
                 <div>入库单号:{{ item.hrCode }}</div>
                 <div>计划部门:{{ item.useDept }}</div>
@@ -139,9 +161,9 @@
             <td>{{ item.oldCode }}</td>
             <td>{{ item.makeQty }}</td>
             <td>{{ item.weight }}</td>
-            <td>{{ }}</td>
-            <td>{{ }}</td>
-            <td>{{ }}</td>
+            <td>{{}}</td>
+            <td>{{}}</td>
+            <td>{{}}</td>
           </tr>
           <tr class="tr_fist">
             <td colspan="2">批次号</td>
@@ -149,17 +171,15 @@
             <td colspan="2">提交数量</td>
             <td>{{ item.handoverQty }}</td>
             <td colspan="2">实收数量</td>
-            <td>{{  }}</td>
+            <td>{{}}</td>
             <td>实收重量</td>
-            <td>{{  }}</td>
+            <td>{{}}</td>
             <td colspan="2">收件人</td>
-            <td>{{  }}</td>
-
+            <td>{{}}</td>
           </tr>
           <tr class="tr_fist">
             <td colspan="2">相似物料号</td>
-            <td colspan="12">{{  }}</td>
-
+            <td colspan="12">{{}}</td>
           </tr>
           <tr class="tr_fist">
             <td>序号</td>
@@ -177,15 +197,15 @@
             <td>支出数</td>
             <td>库存数</td>
           </tr>
-          <tr v-for="(item, index) in 8"  class="textTd" style="page-break-inside: avoid">
-            <td>{{ index+1 }}</td>
+          <tr v-for="(item, index) in 8" class="textTd" style="page-break-inside: avoid">
+            <td>{{ index + 1 }}</td>
             <td />
             <td />
             <td />
             <td />
             <td />
             <td />
-            <td>{{ (index+1)*2 }}</td>
+            <td>{{ (index + 1) * 2 }}</td>
             <td />
             <td />
             <td />
@@ -194,11 +214,11 @@
             <td />
           </tr>
           <tr class="tr_fist">
-            <td colspan="16" style="border:0;font-size:12px">
+            <td colspan="16" style="border: 0; font-size: 12px">
               <div class="tableTitle">
                 <div>保管员:{{ item.custodian }}</div>
-                <div>库房号:{{  }}</div>
-                <div>库位号:{{  }}</div>
+                <div>库房号:{{}}</div>
+                <div>库位号:{{}}</div>
                 <div>车间提交人:{{ item.createMan }}</div>
                 <div>计划员:{{ item.planUser }}</div>
                 <div />
@@ -206,43 +226,52 @@
             </td>
           </tr>
           <tr class="tr_fist">
-            <td colspan="16" style="border:0;font-size:12px">
+            <td colspan="16" style="border: 0; font-size: 12px">
               <div class="tableTitle">
-                <div style="z-index:9999">审理单号:{{  }}</div>
-                <div>备注:{{  }}</div>
+                <div style="z-index: 9999">审理单号:{{}}</div>
+                <div>备注:{{}}</div>
                 <div>使用部门:{{ item.recDept }}</div>
                 <div>制表日期:{{ item.tableDate }}</div>
                 <div />
               </div>
             </td>
           </tr>
-
         </table>
         <table>
-          <tr v-for="i in 3"  class="tr_fist">
-            <td colspan="16" style="border:0;font-size:12px">
+          <tr v-for="i in 3" class="tr_fist">
+            <td colspan="16" style="border: 0; font-size: 12px">
               <div class="tableTitle" />
             </td>
           </tr>
         </table>
       </template>
-
     </div>
   </el-dialog>
 </template>
 
 <script>
+import { handoverRecordPrint } from '@/api/productionManagement/beforeAndAfterPlating';
+// import VueBarcode from 'vue-barcode';
+import JsBarcode from 'jsbarcode';
+
 export default {
   name: 'Print',
+  components: {
+    //  'vue-barcode': VueBarcode
+  },
   props: {
     showPrint: {
       type: Boolean,
-      default: false
+      default: false,
     },
     idList: {
       type: Array,
-      default: () => []
-    }
+      default: () => [],
+    },
+    rowData: {
+      type: Array,
+      default: () => [],
+    },
   },
   data() {
     return {
@@ -252,34 +281,67 @@ export default {
         id: 'printMe',
         popTitle: '打印66',
         ignoreClass: 'noprint',
-        endCallback: (e) => {
+        endCallback: e => {
           console.log(e, 5555);
-        }
-      }
+        },
+      },
     };
   },
-  watch: {},
+  watch: {
+    // 监听 tablist 变化，数据加载完成后生成条形码
+    tablist: {
+      handler() {
+        if (this.tablist.length > 0) {
+          this.$nextTick(() => {
+            this.generateBarcodes();
+          });
+        }
+      },
+      deep: true,
+    },
+  },
 
   created() {},
+  mounted() {
+    this.open();
+  },
   methods: {
+    generateBarcodes() {
+      this.tablist.forEach((item, index) => {
+        const refName = `barcode-${index}-${item.hrType}`;
+        const el = this.$refs[refName];
+        if (el && el[0] && item.hrCode) {
+          JsBarcode(el[0], item.hrCode, {
+            format: 'CODE128',
+            width: 2,
+            height: 36,
+            displayValue: false,
+            margin: 0,
+          });
+        }
+      });
+    },
     open() {
       this.loading = true;
-      this.$ajax
-        .post('prHandoverRecord/newPrint', {
-          list: this.idList
-        })
-        .then((res) => {
-          if (this.$ifAjax(res)) {
-            this.tablist = res.data;
-          }
-          this.loading = false;
-        });
+      handoverRecordPrint({ hrIds: this.rowData.join(',') }).then(res => {
+        this.tablist = res.data.data;
+      });
+      // this.$ajax
+      //   .post('prHandoverRecord/newPrint', {
+      //     list: this.idList
+      //   })
+      //   .then((res) => {
+      //     if (this.$ifAjax(res)) {
+      //       this.tablist = res.data;
+      //     }
+      //     this.loading = false;
+      //   });
     },
     cancel() {
       this.tablist = [];
       this.$emit('cancel');
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped lang="scss">
diff --git a/src/views/productionManagement/beforeAndAfterPlating/index.vue b/src/views/productionManagement/beforeAndAfterPlating/index.vue
index f0b845f..e55eadd 100644
--- a/src/views/productionManagement/beforeAndAfterPlating/index.vue
+++ b/src/views/productionManagement/beforeAndAfterPlating/index.vue
@@ -10,7 +10,7 @@
 
     <!-- 维护记录 -->
     <maintainRecords v-if="tabPosition == 'maintainRecords'"></maintainRecords>
-    <!-- 入库记录 -->
+    <!-- 入库单 -->
     <handoverRec v-if="tabPosition == 'handoverRec'"></handoverRec>
     <!-- 镀后入库表格数据 -->
     <template v-if="tabPosition == 'afterPlatingEntry'">
diff --git a/src/views/productionManagement/blbWorkOrder/components/glass.vue b/src/views/productionManagement/blbWorkOrder/components/glass.vue
index b07fab7..6813fba 100644
--- a/src/views/productionManagement/blbWorkOrder/components/glass.vue
+++ b/src/views/productionManagement/blbWorkOrder/components/glass.vue
@@ -29,7 +29,7 @@
         <!-- <el-button type="primary" @click="queryOrdersHandle('')">全部</el-button> -->
       </template>
       <template #menu="scope">
-        <el-row>
+        <!-- <el-row>
           <el-col :span="6">
             <el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
           </el-col>
@@ -45,7 +45,30 @@
           <el-col :span="6" v-if="scope.row.runStatus < 15">
             <el-button type="text" @click="handleClose(scope.row)">关闭</el-button>
           </el-col>
-        </el-row>
+        </el-row> -->
+        <el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
+        <el-button type="text" @click="printCraftCard_new(scope.row)">流程卡</el-button>
+        <el-dropdown size="small" style="margin-top: 2px; margin-left: 10px">
+          <span class="el-dropdown-link">
+            更多
+            <el-icon class="el-icon--right">
+              <arrow-down />
+            </el-icon>
+          </span>
+          <template #dropdown>
+            <el-dropdown-menu>
+              <el-dropdown-item v-if="scope.row.runStatus === 2">
+                <el-button type="text" @click="priorityFn(scope.row)">优先级</el-button>
+              </el-dropdown-item>
+              <el-dropdown-item v-if="[2, 3, 4, 6].includes(scope.row.runStatus)">
+                <el-button type="text" @click="handleBatches(scope.row)">分批</el-button>
+              </el-dropdown-item>
+              <el-dropdown-item v-if="scope.row.runStatus < 15">
+                <el-button type="text" @click="handleClose(scope.row)">关闭</el-button>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </template>
+        </el-dropdown>
       </template>
     </avue-crud>
     <el-dialog append-to-body v-model="printDialog" title="打印标签">
@@ -175,7 +198,7 @@ export default {
         editBtnIcon: ' ',
         viewBtnText: '详情',
         labelWidth: 120,
-        menuWidth: 220,
+        menuWidth: 180,
         dialogWidth: 1200,
         dialogClickModal: false,
         searchEnter: true,
@@ -598,7 +621,7 @@ export default {
       getList(
         page.currentPage,
         page.pageSize,
-        Object.assign(params, this.query, { yieldType: '120003' })
+        Object.assign(params, this.query, { yieldType: '12003' })
       ).then(res => {
         this.data = res.data.data.records;
         this.loading = false;
diff --git a/src/views/productionManagement/blbWorkOrder/components/others.vue b/src/views/productionManagement/blbWorkOrder/components/others.vue
index 9752279..6a63ede 100644
--- a/src/views/productionManagement/blbWorkOrder/components/others.vue
+++ b/src/views/productionManagement/blbWorkOrder/components/others.vue
@@ -29,7 +29,30 @@
         <!-- <el-button type="primary" @click="queryOrdersHandle('')">全部</el-button> -->
       </template>
       <template #menu="scope">
-        <el-row>
+        <el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
+        <el-button type="text" @click="printCraftCard_new(scope.row)">流程卡</el-button>
+        <el-dropdown size="small" style="margin-top: 2px; margin-left: 10px">
+          <span class="el-dropdown-link">
+            更多
+            <el-icon class="el-icon--right">
+              <arrow-down />
+            </el-icon>
+          </span>
+          <template #dropdown>
+            <el-dropdown-menu>
+              <el-dropdown-item v-if="scope.row.runStatus === 2">
+                <el-button type="text" @click="priorityFn(scope.row)">优先级</el-button>
+              </el-dropdown-item>
+              <el-dropdown-item v-if="[2, 3, 4, 6].includes(scope.row.runStatus)">
+                <el-button type="text" @click="handleBatches(scope.row)">分批</el-button>
+              </el-dropdown-item>
+              <el-dropdown-item v-if="scope.row.runStatus < 15">
+                <el-button type="text" @click="handleClose(scope.row)">关闭</el-button>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </template>
+        </el-dropdown>
+        <!-- <el-row>
           <el-col :span="6">
             <el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
           </el-col>
@@ -45,7 +68,7 @@
           <el-col :span="6" v-if="scope.row.runStatus < 15">
             <el-button type="text" @click="handleClose(scope.row)">关闭</el-button>
           </el-col>
-        </el-row>
+        </el-row> -->
       </template>
     </avue-crud>
     <el-dialog append-to-body v-model="printDialog" title="打印标签">
@@ -175,7 +198,7 @@ export default {
         editBtnIcon: ' ',
         viewBtnText: '详情',
         labelWidth: 120,
-        menuWidth: 220,
+        menuWidth: 180,
         dialogWidth: 1200,
         dialogClickModal: false,
         searchEnter: true,
diff --git a/src/views/productionManagement/productionMonitoring/index.vue b/src/views/productionManagement/productionMonitoring/index.vue
index fa85268..da97e39 100644
--- a/src/views/productionManagement/productionMonitoring/index.vue
+++ b/src/views/productionManagement/productionMonitoring/index.vue
@@ -29,32 +29,38 @@
       </template>
 
       <template #menu="scope">
-        <el-row>
-          <el-col :span="6">
-            <el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
-          </el-col>
-          <el-col :span="6">
-            <el-button type="text" @click="printCraftCard_new(scope.row)">流程卡</el-button>
-          </el-col>
-          <el-col :span="6" v-if="scope.row.runStatus === 2">
-            <el-button type="text" @click="priorityFn(scope.row)">优先级</el-button>
-          </el-col>
-          <el-col :span="6" v-if="[2, 3, 4, 6].includes(scope.row.runStatus)">
-            <el-button type="text" @click="handleBatches(scope.row)">分批</el-button>
-          </el-col>
-          <el-col :span="6" v-if="scope.row.runStatus === 3 || scope.row.runStatus === 4">
-            <el-button type="text" @click="handleAbnormal(scope.row)">异常申报</el-button>
-          </el-col>
-          <el-col :span="6" v-if="scope.row.runStatus <= 6 && scope.row.runStatus !== 5">
-            <el-button type="text" @click="handleOutsource(scope.row)">转外协</el-button>
-          </el-col>
-          <el-col :span="6" v-if="scope.row.runStatus <= 6 && scope.row.runStatus !== 5">
-            <el-button type="text" @click="handleSintering(scope.row)">转烧结</el-button>
-          </el-col>
-          <el-col :span="6" v-if="scope.row.runStatus < 15">
-            <el-button type="text" @click="handleClose(scope.row)">关闭</el-button>
-          </el-col>
-        </el-row>
+        <el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
+        <el-button type="text" @click="printCraftCard_new(scope.row)">流程卡</el-button>
+        <el-dropdown size="small" style="margin-top: 2px;margin-left:10px">
+          <span class="el-dropdown-link">
+            更多
+            <el-icon class="el-icon--right">
+              <arrow-down />
+            </el-icon>
+          </span>
+          <template #dropdown>
+            <el-dropdown-menu>
+              <el-dropdown-item v-if="scope.row.runStatus === 2">
+                <el-button type="text" @click="priorityFn(scope.row)">优先级</el-button>
+              </el-dropdown-item>
+              <el-dropdown-item v-if="[2, 3, 4, 6].includes(scope.row.runStatus)">
+                <el-button type="text" @click="handleBatches(scope.row)">分批</el-button>
+              </el-dropdown-item>
+              <el-dropdown-item v-if="scope.row.runStatus === 3 || scope.row.runStatus === 4">
+                <el-button type="text" @click="handleAbnormal(scope.row)">异常申报</el-button>
+              </el-dropdown-item>
+              <el-dropdown-item v-if="scope.row.runStatus <= 6 && scope.row.runStatus !== 5">
+                <el-button type="text" @click="handleOutsource(scope.row)">转外协</el-button>
+              </el-dropdown-item>
+              <el-dropdown-item v-if="scope.row.runStatus <= 6 && scope.row.runStatus !== 5">
+                <el-button type="text" @click="handleSintering(scope.row)">转烧结</el-button>
+              </el-dropdown-item>
+              <el-dropdown-item v-if="scope.row.runStatus < 15">
+                <el-button type="text" @click="handleClose(scope.row)">关闭</el-button>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </template>
+        </el-dropdown>
       </template>
     </avue-crud>
     <!-- 打印标签 -->
@@ -185,7 +191,7 @@ export default {
         editBtnText: '修改',
         viewBtnText: '详情',
         labelWidth: 120,
-        menuWidth: 240,
+        menuWidth: 180,
         dialogWidth: 1200,
         dialogClickModal: false,
         searchEnter: true,
@@ -762,4 +768,25 @@ export default {
 };
 </script>
 
-<style></style>
+<style lang="scss" scoped>
+:deep(.el-dropdown-link) {
+  cursor: pointer;
+  color: var(--el-color-primary);
+  display: flex;
+  align-items: center;
+  font-size: 12px;  // 与 el-button type="text" 字体一致
+  
+  &:hover {
+    color: var(--el-color-primary-light-3);
+  }
+}
+
+:deep(.el-dropdown-menu__item) {
+  font-size: 12px;  // 下拉项字体与按钮一致
+  padding: 8px 16px;
+  
+  &:hover {
+    background-color: var(--el-fill-color-light);
+  }
+}
+</style>
diff --git a/src/views/productionManagement/sinTerWorkOrder/index.vue b/src/views/productionManagement/sinTerWorkOrder/index.vue
index 684d36c..0a0920c 100644
--- a/src/views/productionManagement/sinTerWorkOrder/index.vue
+++ b/src/views/productionManagement/sinTerWorkOrder/index.vue
@@ -30,15 +30,38 @@
         <el-button type="success" plain @click="queryOrdersHandle('15')">已完工</el-button>
       </template>
       <template #menu="scope">
-        <el-row>
+        <el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
+        <el-button type="text" @click="printCraftCard_new(scope.row)">流程卡</el-button>
+        <el-dropdown size="small" style="margin-top: 2px; margin-left: 10px">
+          <span class="el-dropdown-link">
+            更多
+            <el-icon class="el-icon--right">
+              <arrow-down />
+            </el-icon>
+          </span>
+          <template #dropdown>
+            <el-dropdown-menu>
+              <el-dropdown-item v-if="scope.row.runStatus === 2">
+                <el-button type="text" @click="priorityFn(scope.row)">优先级</el-button>
+              </el-dropdown-item>
+              <el-dropdown-item v-if="[2, 3, 4, 6].includes(scope.row.runStatus)">
+                <el-button type="text" @click="handleBatches(scope.row)">分批</el-button>
+              </el-dropdown-item>
+              <el-dropdown-item v-if="scope.row.runStatus < 15">
+                <el-button type="text" @click="handleClose(scope.row)">关闭</el-button>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </template>
+        </el-dropdown>
+        <!-- <el-row>
           <el-col :span="6">
-            <el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
+            
           </el-col>
           <el-col :span="6">
-            <el-button type="text" @click="printCraftCard_new(scope.row)">流程卡</el-button>
+            
           </el-col>
-          <el-col :span="6" v-if="scope.row.runStatus === 2">
-            <el-button type="text" @click="priorityFn(scope.row)">优先级</el-button>
+          <el-col :span="6" >
+           
           </el-col>
           <el-col :span="6" v-if="[2, 3, 4, 6].includes(scope.row.runStatus)">
             <el-button type="text" @click="handleBatches(scope.row)">分批</el-button>
@@ -46,7 +69,7 @@
           <el-col :span="6" v-if="scope.row.runStatus < 15">
             <el-button type="text" @click="handleClose(scope.row)">关闭</el-button>
           </el-col>
-        </el-row>
+        </el-row> -->
 
         <!-- <el-button
           type="text"
@@ -108,7 +131,6 @@
       @closeDialog="closeDialog"
     ></productionMonitoringDialog>
 
-    
     <!-- 生产监控 -->
     <workRate
       v-if="isWorkRateOpen"
@@ -136,12 +158,12 @@ export default {
     closedDialog,
     abnormalDialog,
     productionMonitoringDialog,
-    workRate
+    workRate,
   },
   data() {
     return {
       itemData: [],
-isWorkRateOpen: false,
+      isWorkRateOpen: false,
       isPriorityOpen: false,
       showAbnormal: false,
       showRadio: true,
@@ -189,7 +211,7 @@ isWorkRateOpen: false,
         viewBtnText: '详情',
         labelWidth: 120,
         // searchLabelWidth: 120,
-        menuWidth: 220,
+        menuWidth: 180,
         dialogWidth: 1200,
         dialogClickModal: false,
         searchEnter: true,
@@ -569,7 +591,7 @@ isWorkRateOpen: false,
     },
     // 生产监控
     clickProduction(row) {
-        this.rowItem = row;
+      this.rowItem = row;
       this.isWorkRateOpen = true;
     },
     // 打印标签
@@ -604,14 +626,13 @@ isWorkRateOpen: false,
     handlePrint() {
       if (this.selectionList.length == 0) {
         this.$message.error('请先选择数据');
-        return false
-      } 
-      if(this.selectionList.length > 1){
+        return false;
+      }
+      if (this.selectionList.length > 1) {
         this.$message.error('只能选择一条数据');
-        return false
+        return false;
       }
-      window.open(window.PROCESS_FLOW_CARD_PRINT_SUPPORT+'?yold='+this.selectionList[0].yoId);
-      
+      window.open(window.PROCESS_FLOW_CARD_PRINT_SUPPORT + '?yold=' + this.selectionList[0].yoId);
     },
     // 异常申报
     handleAbnormal(row) {
@@ -676,4 +697,25 @@ isWorkRateOpen: false,
 };
 </script>
 
-<style></style>
+<style lang="scss" scoped>
+:deep(.el-dropdown-link) {
+  cursor: pointer;
+  color: var(--el-color-primary);
+  display: flex;
+  align-items: center;
+  font-size: 12px;  // 与 el-button type="text" 字体一致
+  
+  &:hover {
+    color: var(--el-color-primary-light-3);
+  }
+}
+
+:deep(.el-dropdown-menu__item) {
+  font-size: 12px;  // 下拉项字体与按钮一致
+  padding: 8px 16px;
+  
+  &:hover {
+    background-color: var(--el-fill-color-light);
+  }
+}
+</style>
diff --git a/src/views/workRate/index.vue b/src/views/workRate/index.vue
index 87ec351..e1ac287 100644
--- a/src/views/workRate/index.vue
+++ b/src/views/workRate/index.vue
@@ -7,22 +7,39 @@
     @close="closeDialog"
     fullscreen
   >
-    <el-descriptions title="订单信息"></el-descriptions>
+    <el-descriptions title="订单信息">
+      <template #extra>
+        <el-button type="primary" @click="refreshData" :loading="refreshLoading">刷新</el-button>
+      </template>
+    </el-descriptions>
     <div class="order-box">
-      <div class="order-item" v-for="(item, index) in displayOrderItems" :key="index">
-        {{ item.label }}：
-        <span
-          v-if="item.clickable"
-          style="cursor: pointer; font-weight: 500"
-          @dblclick="item.clickHandler"
-          >{{ item.value }}</span
-        >
-        <span v-else-if="item.style" :style="item.style">{{ item.value }}</span>
-        <span v-else>{{ item.value }}</span>
+      <div
+        class="order-item"
+        v-for="(item, index) in displayOrderItems"
+        :key="index"
+        :class="{ 'expand-item': item.isExpandBtn }"
+      >
+        <!-- 展开按钮 -->
+        <template v-if="item.isExpandBtn">
+          <el-button type="text" @click="toggleOrderInfo" class="expand-btn">
+            {{ orderInfoExpanded ? '收起 ▲' : '展开更多 ▼' }}
+          </el-button>
+        </template>
+        <template v-else>
+          {{ item.label }}：
+          <span
+            v-if="item.clickable"
+            style="cursor: pointer; font-weight: 500"
+            @dblclick="item.clickHandler"
+            >{{ item.value }}</span
+          >
+          <span v-else-if="item.style" :style="item.style">{{ item.value }}</span>
+          <span v-else>{{ item.value }}</span>
+        </template>
       </div>
 
       <!-- 展开/收起按钮 -->
-      <div class="order-item" style="width: 100%; text-align: center; margin-top: 10px">
+      <div class="order-item" style="width: 100%; text-align: center" v-if="orderInfoExpanded">
         <el-button type="text" @click="toggleOrderInfo" class="expand-btn">
           {{ orderInfoExpanded ? '收起 ▲' : '展开更多 ▼' }}
         </el-button>
@@ -565,7 +582,7 @@ export default {
       };
 
       return [
-        { label: '车间订单号', value: this.detailsForm.orderWoCode || '' },
+        { label: '车间订单号', value: this.detailsForm.woCode || '' },
         { label: '流程卡号', value: this.detailsForm.cardNo || '' },
         {
           label: '零件号',
@@ -652,15 +669,27 @@ export default {
     displayOrderItems() {
       if (this.orderInfoExpanded) {
         // 展开时显示全部
-        return  this.orderItems;
+        // this.orderItems.forEach(item => {
+        //   item.isExpandBtn = true; // 重置所有按钮的显示状态
+        // });
+        return this.orderItems;
       } else {
-        // 收起时只显示前 10 个（约 2 行）
-        return this.orderItems.slice(0, 10);
+        // 收起时显示前 9 个，第 10 个位置显示"展开更多"按钮
+        const items = this.orderItems.slice(0, 9);
+        return [
+          ...items,
+          {
+            label: '',
+            value: '',
+            isExpandBtn: true, // 标记为展开按钮
+          },
+        ];
       }
     },
   },
   data() {
     return {
+      refreshLoading:false,
       processSelectLoading: false,
       selectedItemId: null,
       selectedItemInfo: {},
@@ -712,6 +741,13 @@ export default {
     });
   },
   methods: {
+    refreshData() {
+      this.refreshLoading = true
+      this.getOrderDetail();
+      setTimeout(() => {
+        this.refreshLoading = false
+      }, 500);
+    },
     // 切换订单信息展开/收起
     toggleOrderInfo() {
       this.orderInfoExpanded = !this.orderInfoExpanded;
@@ -906,6 +942,21 @@ i {
     width: 20%;
     margin-bottom: 10px;
   }
+  // 展开按钮项样式
+  .expand-item {
+    width: 100%;
+    text-align: left;
+    margin-top: 5px;
+  }
+}
+.expand-btn {
+  font-size: 13px;
+  color: #409eff;
+  padding: 5px 10px;
+
+  &:hover {
+    color: #66b1ff;
+  }
 }
 :deep(.el-collapse-item__header) {
   background-color: rgb(246, 248, 252);