md

src/layout/components/AppMain.vue

@@ -4,6 +4,12 @@
       <keep-alive :include="cachedViews">
         <router-view :key="key" />
       </keep-alive>
+<!--
+      <BaseKeepAlive :include="cachedViews">
+        <router-view :key="key" />
+      </BaseKeepAlive> -->
+
+
     <!-- </transition> -->
   </section>
 </template>

src/main.js

@@ -58,6 +58,8 @@ import XdDialog from "@/components/XdDialog"
 import SearchForm from "@/components/SearchForm"
 
 import CustomDatePicker from '@/components/DatePickerAdv/CustomDatePicker'
+import BaseKeepAlive from '@/utils/base/keepalive'
+Vue.component('BaseKeepAlive', BaseKeepAlive)
 
 import { Base64 } from "js-base64"
 import md5 from 'js-md5';

src/views/emis/emisWaybill/emisWaybillRecord.vue

@@ -61,14 +61,14 @@
 
 
                   <el-col :span="6">
-                    <el-form-item label="目的国" prop="reciever.country">
-                        <CountryPicker0 v-model="form.reciever.country"></CountryPicker0>
+                    <el-form-item label="目的国" prop="destinationCountry">
+                        <CountryPicker0 v-model="form.destinationCountry" @onChange="onDestCountryChange"></CountryPicker0>
                     </el-form-item>
                   </el-col>
 
                   <el-col :span="8">
                     <el-form-item label="产品类型" prop="productType">
-                      <TransProductCasPicker v-model="form.productTypeSelArr" :countryCode="form.reciever.country" @onChange="onProductChange" ></TransProductCasPicker>
+                      <TransProductCasPicker v-model="form.productTypeSelArr" :countryCode="form.destinationCountry" @onChange="onProductChange" ></TransProductCasPicker>
                       <!-- <trans-product-picker v-model="form.productType" :transLineCode="form.transLine"></trans-product-picker> -->
                     </el-form-item>
                   </el-col>
@@ -869,6 +869,9 @@ data() {
         phone: [
           { required: true, message: "收货人手机号不能为空", trigger: "blur" }
         ],
+        destinationCountry: [
+          { required: true, message: "目的国不能为空",  trigger: ["blur",'change'] }
+        ],
         country: [
           { required: true, message: "收货人国家不能为空",  trigger: ["blur",'change'] }
         ],
@@ -1093,6 +1096,7 @@ methods: {
       // this.tanexPrinter.setOnGetPrinter(this.onGetPrinter);
       // this.tanexPrinter.setOnGetPrintTpl(this.onGetPrintTpl);
     },
+
     onPrinterOpen(evt){
       console.log("onPrinterOpen")
       this.printerStatus = 1;
@@ -1208,6 +1212,9 @@ methods: {
       }
 
   },
+  onDestCountryChange(item){
+    this.form.reciever.country=item.code;
+  },
   onSelectMonthUser(item){
     console.log(item);
     this.form.payee=item.payee;
@@ -1277,6 +1284,7 @@ methods: {
 
           this.isNeedSave=true;
           this.form.printTypeCheckList=[1,5]
+          this.form.destinationCountry=this.form.reciever.country;
 
         });
       }else{
@@ -1395,6 +1403,7 @@ methods: {
       takePieceEmployeeCode: null,
       sendSiteCode: null,
       sendSiteName: null,
+      destinationCountry:  null,
       destinationCode:  null,
       dispatchUnderlingSiteCode: null,
       destinationCenterCode: null,
@@ -1429,6 +1438,12 @@ methods: {
   submitForm() {
     this.$refs["form"].validate(valid => {
       if (valid) {
+
+        if(this.form.destinationCountry!=this.form.reciever.country){
+          this.$modal.msgError("收件国和目的国不一致");
+          return ;
+        }
+
         realSubmitOrder(this.form).then(response => {
             this.$modal.msgSuccess("下单成功");