Merge remote-tracking branch 'origin/dev' into dev

src/views/kaihe/domesticTrade/myOrder/index.vue

@@ -62,9 +62,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="开船日期" prop="timeInterval">
+          <el-form-item label="订舱日期" prop="cLoadDate">
             <el-date-picker
-              v-model="queryParams.timeInterval"
+              v-model="queryParams.cLoadDate"
               type="daterange"
               range-separator="至"
               style="width: 240px"
@@ -189,9 +189,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="订舱日期" prop="cLoadDate">
+              <el-form-item label="开船日期" prop="timeInterval">
                 <el-date-picker
-                  v-model="queryParams.cLoadDate"
+                  v-model="queryParams.timeInterval"
                   type="daterange"
                   range-separator="至"
                   style="width: 240px"
@@ -748,7 +748,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        timeInterval:defaultDate(),
+        cLoadDate: defaultDate(),
       },
       fMblnoOptions: [],
       createBy: [],
@@ -1041,7 +1041,7 @@ export default {
         fCntrcount: null,
         cLoadDate: null,
         fCntrno: null,
-        timeInterval:null
+        timeInterval: null,
       };
       this.resetForm("queryForm");
       this.handleQuery();

src/views/kaihe/domesticTrade/orderInformation/index.vue

@@ -1811,6 +1811,7 @@ export default {
   },
   //页面跳转后传递参数
   activated() {
+    this.jumpDonot=false;
     if (this.$route.query.testing)this.dataElist = true
     this.modify = true
     let formDate