From c8daca7ba2dafb6b6167f2c85cf3529d0f74c590 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:04 +0800
Subject: [PATCH] fix:1.班次页面:月度统计时间调整为上月26到本月25;班次支持右键添加批注 2.外购下单:KJNS域订单免检自动更新批次属性;外购下单-全部页新增【更新IFS批次属性】按钮,支持更新已提交订单的批次属性 3.资源要求-设备:设备核查计划:核查负责人回显问题修复;设备使用授权:检验项目导出数据错误问题修复

---
 src/views/business/materialOrderComponents/materialOrder/printDialog.vue |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/views/business/materialOrderComponents/materialOrder/printDialog.vue b/src/views/business/materialOrderComponents/materialOrder/printDialog.vue
index 9889033..3dca547 100644
--- a/src/views/business/materialOrderComponents/materialOrder/printDialog.vue
+++ b/src/views/business/materialOrderComponents/materialOrder/printDialog.vue
@@ -47,7 +47,7 @@
                   </div>
                   <div style="font-weight: bold;display: flex;align-items: center;">
                     <span class="full-title">鏍峰搧鐘舵��</span>:
-                    <el-radio-group v-model="item.labelStatus" style="margin-top: 7px;margin-left: 4px;" v-removeAriaHidden>
+                    <el-radio-group v-model="item.labelStatus" style="margin-top: 7px;margin-left: 4px;">
                       <el-radio label="0" style="font-weight: bold;margin-right: 7px;">寰呮</el-radio>
                       <el-radio label="1" style="font-weight: bold;margin-right: 7px;">鍦ㄦ</el-radio>
                       <el-radio label="2" style="font-weight: bold;margin-right: 7px;">宸叉</el-radio>
@@ -127,6 +127,8 @@
 
 <script>
 import PrintJS from "print-js";
+import {printLabel} from "@/api/business/rawMaterialOrder";
+import {stringToBase64} from '@/utils/base64Util'
 
 export default {
   name: "printDialog",
@@ -161,20 +163,13 @@
         selection.map(m=> {
           ids.push(m.id)
         })
-        this.$axios.post(this.$api.materialInspection.printLabel,{
-          ids: ids
-        },{
-          headers: {
-            'Content-Type': 'application/json'
-          },
-          noQs:true
-        }).then(res => {
+        printLabel({ids: ids}).then(res => {
           if (res.code === 200 && res.data.length > 0) {
             res.data.forEach(item => {
               console.log('item---', item)
               item.sendTime = item.sendTime && item.sendTime.substring(0, 10)
               item.sampleNumber = item.qtyArrived + item.buyUnitMeas
-              this.$set(item, 'barcode', item.entrustCode)
+              this.$set(item, 'barcode', item.entrustCode+","+stringToBase64(item.color))
               this.$set(item, 'isLeave', item.labelStatus === '2')
             })
             this.barcodeData = res.data

--
Gitblit v1.9.3