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

src/views/ecw/order/cargoControl.vue

@@ -26,11 +26,12 @@
       <el-form-item :label="$t('品名')" prop="prodId">
         <product-selector v-model="queryParams.prodId" @keyup.enter.native="handleQuery" clearable  @change="handleQuery"/>
       </el-form-item>
-      <el-form-item :label="$t('控货')" prop="isCargoControl">
-        <dict-selector v-model="queryParams.isCargoControl" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" clearable  @change="handleQuery"/>
+      <el-form-item :label="$t('控货状态')" prop="isCargoControl">
+        <dict-selector v-model="queryParams.cargoControlStatus" :type="DICT_TYPE.CONTROL_GOODS_STATUS" clearable  @change="handleQuery"/>
       </el-form-item>
       <el-form-item :label="$t('订单状态')" prop="status">
-        <dict-selector :type="DICT_TYPE.PAY_ORDER_STATUS" v-model="queryParams.status" clearable  @change="handleQuery" />
+        <dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.status"
+          @keyup.enter.native="handleQuery" clearable />
       </el-form-item>
        <el-form-item :label="$t('提单号')" prop="tidanNo">
         <el-input v-model="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" />
@@ -89,9 +90,9 @@
       <el-table-column :label="$t('已放箱数')" align="center" prop="sumWeight">
         <template slot-scope="{row}">{{row.releaseNum}}</template>
       </el-table-column>
-      <el-table-column :label="$t('订单状态')" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.status" />
+      <el-table-column :label="$t('订单状态')" align="left" prop="status">
+        <template slot-scope="{row}">
+          {{row.statusMsg}}
         </template>
       </el-table-column>
       <el-table-column :label="$t('提单号')" align="center" prop="status">
@@ -260,7 +261,7 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.page = 1;
-      this.getList();
+      this.$nextTick(this.getList)
     },
     /** 重置按钮操作 */
     resetQuery() {

src/views/ecw/order/special/index.vue

@@ -60,7 +60,7 @@
             <template v-else>
               {{$t('运费')}}：{{ row.originalCostSeaFreight }} {{ currencyMap[row.seaFreightCurrency] }}/{{ unitMap[row.seaFreightVolume] }}
               <br>
-              {{$t('清关费')}}：{{ row.originalClearanceFreight }} {{ currencyMap[row.clearanceFreightCurrency] }}/{{ unitMap[row.clearanceFreightVolume] }}
+              {{$t('清关费')}}：{{ row.originalCostClearanceFreight }} {{ currencyMap[row.clearanceFreightCurrency] }}/{{ unitMap[row.clearanceFreightVolume] }}
             </template>
           </template>
         </el-table-column>
@@ -74,7 +74,7 @@
             <template v-else>
               {{$t('运费')}}：{{ row.costSeaFreight }} {{ currencyMap[row.seaFreightCurrency] }}/{{ unitMap[row.seaFreightVolume] }}
               <br>
-              {{$t('清关费')}}：{{ row.oneClearanceFreight }} {{ currencyMap[row.clearanceFreightCurrency] }}/{{ unitMap[row.clearanceFreightVolume] }}
+              {{$t('清关费')}}：{{ row.costClearanceFreight }} {{ currencyMap[row.clearanceFreightCurrency] }}/{{ unitMap[row.clearanceFreightVolume] }}
             </template>
           </template>
         </el-table-column>

src/views/ecw/order/warehousing/components/Warehouse.vue

@@ -642,7 +642,7 @@ export default {
         const {boxGauge1, boxGauge2, boxGauge3, specificationType, cartonsNum} = (val === 1 ? this.form1.table : this.form.table)[index]
         let result = ''
         if (boxGauge1 && boxGauge2 && boxGauge3 && specificationType && cartonsNum) {
-          result = (((specificationType === 1 || specificationType === '1') ? cartonsNum : 1) * (boxGauge1 * boxGauge2 * boxGauge3) / 1000000)?.toFixed(2) || ''
+          result = (((specificationType === 1 || specificationType === '1') ? cartonsNum : 1) * (boxGauge1 * boxGauge2 * boxGauge3) / 1000000 + 0.000001)?.toFixed(2) || ''
         } else {
           result = ''
         }