Merge pull request '运单录入同行单号导致的单号变化' (#123) from master-dev into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/123

src/views/emis/emisWaybill/waybillRecord.vue

@@ -1038,7 +1038,6 @@ data() {
     categorySender:null,
     // 收件
     categoryReciever:null,
-    hasTBillCode:null,
     noTBillCode:null,
     // 表单校验
     rules: {
@@ -2565,7 +2564,6 @@ methods: {
       let useSiteCode=this.form.sendSiteCode;
       realMatchWaybill(useSiteCode).then(response => {
           this.form.billCode=response.data;
-          this.hasTBillCode = response.data;
           this.initGetTotalAvailablePag(this.form.sendSiteCode);
           this.handleGenSubbill();
           this.autoAjustBillCode();
@@ -2814,18 +2812,24 @@ methods: {
     this.autoAjustBillCodeSender(country.code);
   },
   //根据寄件国家处理单号格式
-  autoAjustBillCodeSender(code){
-   if(code === '0095' || code === '0855'){
-      //单号去掉T
-      this.form.billCode = this.form.billCode.replace('T', '');
-      this.noTBillCode = this.form.billCode;
-    }else{
-      this.form.billCode = this.hasTBillCode;
+  autoAjustBillCodeSender(code) {
+    if (code === '0095' || code === '0855') {
+      //如果单号是否包含7080 去掉首字母的T 否则保持不变
+      if (this.form.billCode.includes('7080')) {
+        this.form.billCode = this.form.billCode.replace('T', '');
+        this.noTBillCode = this.form.billCode;
+      }
+    } else {
+      if (this.form.billCode.includes('7080')) {
+        if (!this.form.billCode.startsWith('T')) {
+          this.form.billCode = 'T' + this.form.billCode;
+        }
+      }
     }
   }
-
 }
-};
+}
+
 </script>
 
 <style lang="scss">