diff --git a/src/store/getters.js b/src/store/getters.js index bcef105..d7bf605 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -11,6 +11,7 @@ const getters = { nickName: state => state.user.nickName, name: state => state.user.name, nickName: state => state.user.nickName, + customerType: state => state.user.customerType, ownerSiteCode: state => state.user.ownerSiteCode, ownerSiteName: state => state.user.ownerSiteName, introduction: state => state.user.introduction, diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 465c397..cd12301 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -8,6 +8,7 @@ const user = { empName:'', ownerSiteCode:'', ownerSiteName:'', + customerType:'', name: '', nickName: '', avatar: '', @@ -27,6 +28,7 @@ const user = { state.empName = userInfo.empName; state.ownerSiteCode = userInfo.ownerSiteCode; state.ownerSiteName = userInfo.ownerSiteName; + state.customerType = userInfo.customerType; }, SET_NICK_NAME: (state, nickName) => { state.nickName = nickName diff --git a/src/views/oms/TransProduct/index.vue b/src/views/oms/TransProduct/index.vue index a50ce5e..fb375dc 100644 --- a/src/views/oms/TransProduct/index.vue +++ b/src/views/oms/TransProduct/index.vue @@ -94,7 +94,7 @@ import CountryPicker from '@/views/oms/EmisBaseTools/CountryPicker.vue'; import TransLinePicker from '@/views/oms/EmisBaseTools/TransLinePicker.vue'; export default { - name: "TransProduct", + name: "TransProductList", components: { elDateSimplePicker, CountryPicker, @@ -222,7 +222,9 @@ export default { productType: item0.prodCode, reciever: { country: item0.country, - } + }, + totalVolume:"", + billWeight:1 } this.$router.push({ path: '/orderMgnt/OrderRecord', diff --git a/src/views/oms/emisWaybill/waybillPreCalcFee.vue b/src/views/oms/emisWaybill/waybillPreCalcFee.vue index 6bd44eb..ed40127 100644 --- a/src/views/oms/emisWaybill/waybillPreCalcFee.vue +++ b/src/views/oms/emisWaybill/waybillPreCalcFee.vue @@ -167,7 +167,7 @@ import ProvincePicker1 from '@/views/oms/EmisBaseTools/ProvincePicker.vue'; import CardWithHeader from '@/components/CardWithHeader/index.vue'; export default { - name: "WaybillPreCalcFee", + name: "OmsWaybillPreCalcFee", components: { EmisSiteSimplePicker, DestinationPicker, diff --git a/src/views/openpage/queryTraceInfo.vue b/src/views/openpage/queryTraceInfo.vue index d4974ca..87c0b68 100644 --- a/src/views/openpage/queryTraceInfo.vue +++ b/src/views/openpage/queryTraceInfo.vue @@ -21,6 +21,26 @@ {{ item }} + +
+
+
{{ extBillInfo.sendSiteName }}
+
+ + + + +
{{ extBillInfo.waybillStatus }}
+
{{ extBillInfo.productTypeName }}
+ +
+
{{ extBillInfo.destinationName }}
+
+
+
预计送达:{{ extBillInfo.estimateDate }}
+
+ +
签收底单
@@ -117,6 +137,7 @@ export default { input2: '', input3: '', latestBillList:[], + extBillInfo:null, // 遮罩层 loading: true, // 地球洲表格数据 @@ -145,6 +166,7 @@ export default { } queryTraceInfo(this.billCode,"1234").then(response => { this.traceInfoList = response.data; + this.extBillInfo=response.extBillInfo; this.recordLatestBill(this.billCode); this.loading = false; });