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

src/i18n/languages/en_US.json

@@ -204,7 +204,6 @@
     "未来计划方数": "CBM of future plans",
     "未来实际方数": " Actual CBM in the future",
     "创建人": "founder",
-    "已装柜仓数": "Number of warehouses installed",
     "未来": "future",
     "天货柜数": "Number of containers per day",
     "未来{futureNumber}天计划方数": "Planned cbm in the future {futureNumber} days",
@@ -3846,4 +3845,4 @@
     "CTN NO": "",
     "请输入CTN NO": "请输入CTN NO",
     "境内外类型": "Internal and external types"
-}
\ No newline at end of file
+}

src/views/ecw/box/indexFutureBox.vue

@@ -158,7 +158,7 @@
         <el-form-item :label="$t('自单代报订单方数')">
           {{form.orderReportNumber}} m³
         </el-form-item>
-        <el-form-item :label="$t('已装柜仓数')">
+        <el-form-item :label="$t('已装柜方数')">
           {{form.loadingNumber}} m³
         </el-form-item>
 

src/views/ecw/order/index.vue

@@ -796,7 +796,7 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.page = 1;
-      this.getList();
+      this.$nextTick(this.getList)
     },
     /** 重置按钮操作 */
     resetQuery() {
@@ -868,7 +868,7 @@ export default {
 ::v-deep .actions{
     .el-dropdown{
       margin-right: 10px;
-      &::last-child{
+      &:last-child {
         margin-right: 0;
       }
     }