From 54582973aa92e8cc7985393e27bcc80f79bd4a4e Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Wed, 22 Jun 2022 17:48:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=BC=96=E7=A0=81=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=20=202022-06-22=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/labelPrint/roll-label.vue                  | 5 +++--
 .../yieldReport/otherReport/fqc_produce_report_normal.vue    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/labelPrint/roll-label.vue b/src/views/modules/labelPrint/roll-label.vue
index 0974ef4..616188a 100644
--- a/src/views/modules/labelPrint/roll-label.vue
+++ b/src/views/modules/labelPrint/roll-label.vue
@@ -291,7 +291,7 @@ export default {
       orderInfo: {
         userName: this.$store.state.user.name,
         rollNo: '',
-        customerId: '',
+        customerId: '0000',
         totalQty: 0,
         perBoxQty: 0,
         boxQty: 0,
@@ -470,6 +470,7 @@ export default {
         if (data.code === 0) {
           getRollCustomer(rollNoList[0]).then(({data}) => {
             if (data.code === 0){
+              this.orderInfo.customerId = data.data.customerId ? data.data.customerId : '*'
               let query = {
                 customerId: data.data.customerId ? data.data.customerId : '*',
                 reportFamily: '卷标签'
@@ -509,7 +510,7 @@ export default {
         reportId: val.reportid,
         defaultFlag: val.DefaultFlag,
         reportFile: val.Reportfile,
-        reportFamily: '外箱标签',
+        reportFamily: '卷标签',
         customerId: this.orderInfo.customerId,
       }
       this.selectReportFileList.push(query)
diff --git a/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
index c18f70b..4d1bbc3 100644
--- a/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
@@ -263,7 +263,7 @@
                   width="115"
                   :label="'操作'">
                   <template slot-scope="scope">
-                    <a class="customer-a"
+                    <a v-if="scope.row.virtualRollFlag=='N'" class="customer-a"
                        @click="rollPrintLabel(scope.row)"
                     >打印</a>
                     <a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.finishedFlag != 'N'"