Merge branch 'test' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into test

src/views/ecw/box/indexAir.vue

@@ -103,7 +103,7 @@
           <supplierSelect v-model="queryParams.dcCompanyId" :companyType="'2'" :placeholder="$t('请选择报关公司')" :allSupplier="allSupplier" clearable  multiple collapse-tags />
         </el-form-item>
         <el-form-item :label="$t('放行时间')" v-show="showSearch">
-          <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="queryParams.dcPassTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+          <el-date-picker type="datetimerange" :start-placeholder="$t('放行开始日期')" :end-placeholder="$t('放行结束日期')" v-model="queryParams.dcPassBeginTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
         </el-form-item>
 
       </el-row>
@@ -756,6 +756,7 @@ export default {
       params.transportType = 3
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime')
       this.addBeginAndEndTimeNew(params, params.flyBeginTime, 'fly');// 预计起飞时间
+      this.addBeginAndEndTimeNew(params, params.dcPassBeginTime, 'dcPass');// 放行时间
       // 执行查询
       getboxPage(params).then((response) => {
         this.list = response.data.list
@@ -854,6 +855,7 @@ export default {
       params.pageSize = undefined
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime')
       this.addBeginAndEndTimeNew(params, params.flyBeginTime, 'fly');// 预计起飞时间
+      this.addBeginAndEndTimeNew(params, params.dcPassBeginTime, 'dcPass');// 放行时间
       // 执行导出
       this.$modal
         .confirm(this.$t('是否确认导出所有出货数据项?'))

src/views/ecw/box/indexSea.vue

@@ -195,7 +195,7 @@
         <supplierSelect v-model="queryParams.dcCompanyId" :companyType="'2'" :placeholder="$t('请选择报关公司')" :allSupplier="allSupplier" clearable  multiple collapse-tags />
       </el-form-item>
       <el-form-item :label="$t('放行时间')" v-show="showSearch">
-        <el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="queryParams.dcPassTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+        <el-date-picker type="datetimerange" :start-placeholder="$t('放行开始日期')" :end-placeholder="$t('放行结束日期')" v-model="queryParams.dcPassBeginTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
       <el-form-item :label="$t('实际开船时间')" v-show="showSearch">
         <el-date-picker type="datetimerange" :start-placeholder="$t('实际开船开始日期')" :end-placeholder="$t('实际开船结束日期')" v-model="queryParams.bgRealShipBeginTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
@@ -978,6 +978,7 @@ export default {
       this.addBeginAndEndTimeNew(params, params.clEstBeginTime, 'clEst');// 预计清关时间
       this.addBeginAndEndTimeNew(params, params.bgRealShipBeginTime, 'bgRealShip');// 实际开船时间
       this.addBeginAndEndTimeNew(params, params.estBeginTime, 'est');// 预计到港时间
+      this.addBeginAndEndTimeNew(params, params.dcPassBeginTime, 'dcPass');// 放行时间
       // 执行查询
       getboxPage(params).then((response) => {
         this.list = response.data.list;
@@ -1053,6 +1054,7 @@ export default {
       this.addBeginAndEndTimeNew(params, params.clEstBeginTime, 'clEst');// 预计清关时间
       this.addBeginAndEndTimeNew(params, params.bgRealShipBeginTime, 'bgRealShip');// 实际开船时间
       this.addBeginAndEndTimeNew(params, params.estBeginTime, 'est');// 预计到港时间
+      this.addBeginAndEndTimeNew(params, params.dcPassBeginTime, 'dcPass');// 放行时间
       // 执行导出
       this.$modal
         .confirm(this.$t("是否确认导出所有出货数据项?"))