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() + } }) }, // 选中行