From 2b8c48b30fe92dd50b81f15ec1d28d549b9192a5 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Tue, 5 Jul 2022 11:29:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=88=86=E5=8D=B7=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E4=BF=A1=E6=81=AF,fqc=E5=88=86=E5=8D=B7=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=20=202022-07-05=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/common/com-roll-label.vue                 | 2 +-
 .../purchasingManagement/beginMaterialSlittedSet.vue        | 4 ++--
 src/views/modules/sys/user.vue                              | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/common/com-roll-label.vue b/src/views/modules/common/com-roll-label.vue
index ea48df7..e32391f 100644
--- a/src/views/modules/common/com-roll-label.vue
+++ b/src/views/modules/common/com-roll-label.vue
@@ -521,7 +521,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/purchasingManagement/beginMaterialSlittedSet.vue b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue
index d01b2ca..c51061f 100644
--- a/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue
+++ b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue
@@ -230,8 +230,8 @@
           suppDeliveryNote: '*',
           rollQty: '',
           rollNumber: '',
-          customerID: '无',
-          fGPartNo: '无',
+          customerID: '全部',
+          fGPartNo: '全部',
           referencePartDesc: '',
           checked: false,
           referenceSupplierID:'',
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index 085ba57..48e8185 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -367,8 +367,10 @@ export default {
     // 获取所有可用工厂
     searchSiteList() {
       getSiteList({active: 'Y'}).then(({data}) => {
-        this.siteList = data.dataList
-        this.searchUserAccessSiteList()
+        if(data.code == 0 ){
+          this.siteList = data.dataList
+          this.searchUserAccessSiteList()
+        }
       })
     },
     // 选中行