diff --git a/src/store/getters.js b/src/store/getters.js index 09e2de65..f2b05410 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -11,7 +11,7 @@ const getters = { empName: state => state.user.empName, nickName: state => state.user.nickName, name: state => state.user.name, - nickName: state => state.user.nickName, + ownerCountryCode: state => state.user.ownerCountryCode, ownerSiteCode: state => state.user.ownerSiteCode, ownerSiteName: state => state.user.ownerSiteName, introduction: state => state.user.introduction, diff --git a/src/views/emis/customerService/traceWaybillDetailView.vue b/src/views/emis/customerService/traceWaybillDetailView.vue index 0674cda4..80f0b5f3 100644 --- a/src/views/emis/customerService/traceWaybillDetailView.vue +++ b/src/views/emis/customerService/traceWaybillDetailView.vue @@ -139,7 +139,8 @@ export default { this.billDetail = Object.assign({},response.data); - // console.log("===>",this.billDetail); + // console.log("==ownerCountryCode=>",this.ownerCountryCode); + // console.log("==his.billDetail.reciever.country=>",this.billDetail.reciever.country); //bug:848 调整后:与运单号关联的:寄件网点、目的网点、签收网点、总部、销售联系人、回款联系人 允许查看 运单信息;其他网点或员工若不相关则不允许查看; if( ownerSiteCode == this.billDetail.sendSiteCode diff --git a/src/views/emis/emisWaybill/UserOrderList.vue b/src/views/emis/emisWaybill/UserOrderList.vue index ec0d732e..bd67503f 100644 --- a/src/views/emis/emisWaybill/UserOrderList.vue +++ b/src/views/emis/emisWaybill/UserOrderList.vue @@ -51,7 +51,7 @@ - + @@ -348,7 +348,6 @@ @@ -628,26 +627,7 @@ export default { id:null, titleView:"", openView: false, - // 更新网点时间范围 - daterangeOrderDate: [], - // 更新网点时间范围 - daterangeEstimateDate: [], - // 更新网点时间范围 - daterangePickStartDate: [], - // 更新网点时间范围 - daterangePickFinishDate: [], - // 更新网点时间范围 - daterangeDispFdDate: [], - // 更新网点时间范围 - daterangeRegisterDate: [], - // 更新网点时间范围 - daterangeSendDate: [], - // 更新网点时间范围 - daterangeProduceBillDate: [], - // 更新网点时间范围 - daterangeCreateTime: [], - // 更新网点时间范围 - daterangeUpdateTime: [], + // 查询参数 queryParams: { pageNum: 1,