sunChengjie 11 months ago
parent
commit
f598dc3e9f
4 changed files with 14 additions and 7 deletions
  1. 3 2
      src/api/index.js
  2. 5 1
      src/pages/express.vue
  3. 2 2
      src/pages/inexpress.vue
  4. 4 2
      src/pages/mailInfo.vue

+ 3 - 2
src/api/index.js

@@ -38,12 +38,13 @@ export function saveInternal(data) {
     })
 }
 // 寄件-内部件-收件人
-export function getUserByName(data) {
+export function getUserByName(data, config) {
     return request({
         url: '/tianzong/client/user/getUserByName',
         method: 'post',
         data: data,
-        emulateJSON: true
+        emulateJSON: true,
+        ...config
     })
 }
 

+ 5 - 1
src/pages/express.vue

@@ -277,7 +277,7 @@ export default {
 	async mounted() {
 		const res = await getSendInfo({ userId: localStorage.getItem("userId") }, { emulateJSON: true, loading: true, message: '获取寄件人信息...' })
 		if (res.code == 444) {
-			Toast(res.msg)
+			Toast(res.error)
 		} else {
 			this.SendInfoValue = res
 		}
@@ -597,6 +597,10 @@ export default {
 			} else {
 				wptypeValue = 1
 			}
+			// 去掉金额前的0
+			if (this.declaredValue != 0) {
+				this.declaredValue = this.declaredValue.replace(/^0+/, '')
+			}
 			let parmas = {
 				expressInfo: this.expressInfo,//快递公司1-顺丰
 				userAddressId: this.isAddressIdTransfer == false ? '' : this.transmitMessageVlaue.id,//收发室ID

+ 2 - 2
src/pages/inexpress.vue

@@ -221,7 +221,7 @@ export default {
 		},
 		// 搜索关键
 		async searchCrux() {
-			const res = await getUserByName({ NAME: this.searchKey })
+			const res = await getUserByName({ NAME: this.searchKey }, { loading: true })
 			if (res.userByName != '' && res.userByName != undefined && res.userByName != null) {
 				if (res.msg == 'success') {
 					this.searchNameList = res.userByName
@@ -235,7 +235,7 @@ export default {
 			if (!/^\d{4}$/.test(this.searchKeyPhone)) {
 				return Toast('请输入手机号后四位')
 			}
-			const res = await getUserByName({ PHONE: this.searchKeyPhone })
+			const res = await getUserByName({ PHONE: this.searchKeyPhone }, { loading: true })
 			if (res.userByName != '' && res.userByName != undefined && res.userByName != null) {
 				if (res.msg == 'success') {
 					this.searchNameListPhone = res.userByName

+ 4 - 2
src/pages/mailInfo.vue

@@ -28,9 +28,11 @@
 			<!-- 外部 -->
 			<div class="info" v-if="mailDetail.type == 1">
 				<img style="margin: 0 auto;display: block;" id="barcode" />
-				<p>部门:{{ ObjectVlaue.sendDeptName }}</p>
-				<p>收件人:{{ ObjectVlaue.addresseeName }}</p>
+				<p>寄件人姓名:{{ ObjectVlaue.sendName }}</p>
+				<p>寄件人手机号:{{ ObjectVlaue.sendPhone }}</p>
+				<p>收件人姓名:{{ ObjectVlaue.addresseeName }}</p>
 				<p>收件人手机:{{ ObjectVlaue.addresseePhone }}</p>
+				<p>部门:{{ ObjectVlaue.sendDeptName }}</p>
 				<p>快件类型:{{ ObjectVlaue.expressType === 1 ? '文件' : '物品' }}</p>
 				<p>数量(件数):{{ ObjectVlaue.expressNum }}</p>
 				<p>重量(KG):{{ ObjectVlaue.expressWeight }}</p>