Merge branch 'release2.2' of...

Merge branch 'release2.2' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into release2.2

src/i18n/languages/en_US.json

@@ -4045,5 +4045,7 @@
     "报关退税，请备齐资料。":"Customs refund, prepare necessary documents.",
     "订单号、唛头、提单号": "order number、marks、B/L NO",
     "发货人名称、手机号": "sender name or mobile",
-    "收货人名称、手机号": "Receiver Name or Mobile"
+    "收货人名称、手机号": "Receiver Name or Mobile",
+  "订单费用报表": "Order cost report",
+  "请先选择目的国": "select the destination country first"
 }

src/views/ecw/financial/selfNoReport.vue

@@ -27,7 +27,7 @@
               <el-option
                 v-for="item in countryList"
                 :key="item.id"
-                :label="$l(item, 'name')"
+                :label="$l(item, 'title')"
                 :value="item.id"
               />
             </el-select>
@@ -119,6 +119,7 @@ import store from "@/store";
 import {boxSettlementPage, exportSettlementExcel} from "@/api/ecw/box";
 import {DICT_TYPE} from "@/utils/dict";
 import {getCountryListAll} from "@/api/ecw/country";
+import {getListTree} from "@/api/ecw/region";
 
 export default {
   data() {
@@ -147,10 +148,16 @@ export default {
     // getTradeCityList().then((res) => (this.tradeCityList = res.data));
     this.getList();
     getWarehouseList().then(res => this.warehouseList = res.data)
-    getCountryListAll().then(r => {
+    getListTree({treeType: 1}).then(r => {
       this.countryList = r.data
     })
   },
+  watch:{
+    // 目的国变更后要重置目的仓
+    'queryParams.destCountryId': function(){
+      this.$set(this.queryParams, 'destWarehouseId', '')
+    }
+  },
   computed: {
     DICT_TYPE() {
       return DICT_TYPE
@@ -198,6 +205,9 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.page = 1;
+      if(!this.queryParams.destCountryId){
+        return this.$message.error(this.$t('请选择目的国'))
+      }
       this.getList();
     },
     handleReset(){

src/views/ecw/financial/selfNoReportDetail.vue

@@ -95,16 +95,18 @@
       </el-table-column>
       <el-table-column :label="$t('是否重泡货')">
         <template slot-scope="{row}">
-          <el-tooltip v-if="row.orderType != 1" effect="dark" content="111" placement="top-start">
-            <!--1 普货 2 重货 3 泡货-->
-            <span>{{$t('是')}}</span>
+          <el-tooltip v-if="row.orderType !== 1" effect="dark" :content="row.orderType == 3 ? `${row.vweight}kg` : `${row.wvolume}m³`" placement="top-start">
+            <dict-tag :type="DICT_TYPE.ECW_YESNO" :value="row.orderType !== 1 ? '1' : '0'"></dict-tag>
           </el-tooltip>
-          <span v-else>{{$t('否')}}</span>
+          <template v-else>{{$t('否')}}</template>
         </template>
       </el-table-column>
       <el-table-column :label="$t('收费数据')">
         <template slot-scope="{row}">
-          {{row.realityChargeNum}}{{$t('箱')}},{{row.realityChargeVolume}}m³,{{row.realityChargeWeight}}kg
+          <el-tooltip v-if="row.orderType !== 1" effect="dark" :content="row.orderType == 3 ? `${row.vweight}kg` : `${row.wvolume}m³`" placement="top-start">
+            <span>{{row.realityChargeNum}}{{$t('箱')}},{{row.realityChargeVolume}}m³,{{row.realityChargeWeight}}kg</span>
+          </el-tooltip>
+          <template v-else>{{row.realityChargeNum}}{{$t('箱')}},{{row.realityChargeVolume}}m³,{{row.realityChargeWeight}}kg</template>
         </template>
       </el-table-column>
       <el-table-column :label="$t('订单状态')" prop="statusMsg"></el-table-column>