Merge pull request 'master-dev' (#93) from master-dev into develop

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

src/views/emis/emisSpecialCalcWeight/emisSpecialCalcWeightForm.vue

@@ -96,7 +96,7 @@ import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vu
 
 
 
-import {addDateTimeByDay,dateToStr} from '@/utils/custom'
+import {addDateTimeByDay,dateToStr, parseTime} from '@/utils/custom'
 
 export default {
   name: "emisSpecialCalcWeightForm",
@@ -171,7 +171,9 @@ export default {
         }
     },
     onStartDateChange(){
-      this.form.endDate=dateToStr(addDateTimeByDay(this.form.beginDate,365));
+      // 时效时间 延迟5年
+      const date = new Date(this.form.beginDate)
+      this.form.endDate = parseTime(date.setFullYear(date.getFullYear() + 5), '{y}-{m}-{d} {h}:{i}:{s}')
     },
     onProdChange(item){
       console.log(item)

src/views/emis/emisSpecialCalcWeight/index.vue

@@ -61,7 +61,7 @@
            :total="total"
            @queryTable="getList"
            @selection-change="handleSelectionChange"
-           @sort-change="handleSortChange"
+          
            >
 
       <div slot="toolbar">

src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue

@@ -335,7 +335,7 @@ export default {
       this.form.countryCode=item.code;
     },
     onScanSiteSelect(item){
-      this.queryParams.createSite=item && item.siteName;
+      // this.queryParams.createSite=item && item.siteName;
       // this.queryParams.createSiteCode=item && item.siteCode;
     },
     onPreOrNextSiteSelect(item){

src/views/emis/emisWaybillAjustApply/adjustPanel.vue

@@ -1523,6 +1523,19 @@ export default {
       oldValue: {
         handler (newValue, oldValue) {
           this.billDetail = this.oldValue;
+          if (['2', '4', '5'].includes(this.billDetail.paymentType)) { //月结
+            this.selectedMonthUserEnterpriseName = this.billDetail.sender.enterpriseName;
+            this.selectedMonthUserEnterpriseTaxId = this.billDetail.sender.enterpriseTaxId;
+            this.selectedSenderEnterpriseName = '';
+            this.selectedSenderEnterpriseTaxId = '';
+          } else {
+            this.selectedMonthUserEnterpriseName = '';
+            this.selectedMonthUserEnterpriseTaxId = '';
+            this.selectedSenderEnterpriseName = this.billDetail.sender.enterpriseName;
+            this.selectedSenderEnterpriseTaxId = this.billDetail.sender.enterpriseTaxId;
+          }
+          this.senderCountryCode = this.billDetail.sender.country;
+          this.recieverCountryCode = this.billDetail.reciever.country;
         },
         deep: true
       },
@@ -1541,7 +1554,7 @@ export default {
             this.form.blSpecialQuote='0';
           }
         },
-        deep: true
+        deep: true 
       },
       applyType: {
         handler (newVa, oldValue) {
@@ -1667,8 +1680,6 @@ export default {
       console.log("====>this.oldValue==>",this.oldValue);
       console.log("====>this.form==>",this.form);
       this.billDetail=this.oldValue;
-      this.senderCountryCode = this.form.sender.country;
-      this.recieverCountryCode = this.form.reciever.country;
     },
     getJsonData(){
       if(this.form.packType&&this.form.packType.length>0){