Merge remote-tracking branch 'origin/release2.2' into release2.2

src/views/ecw/box/shippingSea/nodePage/cabinet/supplementOrder.vue

@@ -50,16 +50,16 @@
               <el-form-item :label="$t('始发地')">
                 <p>{{importCityName(queryParams.startWarehouseId)}}</p>
               </el-form-item>
+              <el-form-item :label="$t('国家')" prop="destination">
+                <el-select v-model="queryParams.destCountryId" :placeholder="$t('请选择国家')" @change="clearDestWarehouseIdList">
+                  <el-option v-for="item in countryList" :key="item.id" :label="$l(item, 'title')" :value="item.id" />
+                </el-select>
+              </el-form-item>
               <el-form-item :label="$t('目的地')" prop="destination">
                 <el-select v-model="queryParams.destWarehouseIdList" :placeholder="$t('请选择目的地')" multiple>
                   <el-option v-for="item in importWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item :label="$t('国家')" prop="destination">
-                <el-select v-model="queryParams.destCountryId" :placeholder="$t('请选择国家')">
-                  <el-option v-for="item in countryList" :key="item.id" :label="$l(item, 'name')" :value="item.id" />
-                </el-select>
-              </el-form-item>
               <el-form-item :label="$t('订单号')" prop="orderNo">
                 <el-input v-model="queryParams.orderNo" :placeholder="$t('请输入订单号')" clearable />
               </el-form-item>
@@ -159,6 +159,7 @@ import {
   createGoods,
   remove,
 } from "@/api/ecw/boxSea";
+import { getWarehouseList } from "@/api/ecw/warehouse"
 import {
   formatDate,
   getTotlContent,
@@ -166,7 +167,7 @@ import {
   getCapacity,
   sumStatistics,
 } from "../../utils";
-import {getCountryListAll} from "@/api/ecw/country";
+import { getListTree } from "@/api/ecw/region";
 /**
  * 补单
  */
@@ -177,6 +178,8 @@ export default {
     return {
       //国家列表
       countryList:[],
+      //仓库列表
+      warehouseList: [],
       // 二维码/条码编号
       cabinetNo: "",
       // 表格数据
@@ -201,11 +204,21 @@ export default {
   },
   created() {
     this.queryAllData();
-    getCountryListAll().then(r => {
-      this.countryList = r.data
-    })
+    this.getCountry()
   },
   methods: {
+    //获取国家
+    async getCountry() {
+      let countryList = await getListTree({treeType: 1})
+      this.countryList = countryList.data
+      let warehouseList = await getWarehouseList()
+      this.warehouseList = warehouseList.data
+      let warehouse = this.warehouseList.find(item=>item.id == this.$attrs.shipmentObj.destWarehouseId)
+      console.log(warehouse,'warehouse')
+      if(warehouse){
+        this.$set(this.queryParams,'destCountryId', warehouse.guojia)
+      }
+    },
     /* 查询已预装 */
     getSecGoods() {
       loadSecGoodsList({ shipmentId: this.$attrs.shipmentObj.id }).then(
@@ -443,12 +456,16 @@ export default {
     formatDate,
     getTotlContent,
     sumStatistics,
+    //切换国家时清除目的仓
+    clearDestWarehouseIdList() {
+      this.queryParams.destWarehouseIdList = []
+    }
   },
   computed: {
     /** 目的地 */
     importWarehouseList() {
       return this.$attrs.warehouseList.filter(
-        (item) => item.tradeType == "1" || item.type == "3"
+        (item) => (item.tradeType == "1" || item.type == "3") && item.guojia == this.queryParams.destCountryId
       );
     },
     /* 容量 */

src/views/ecw/box/shippingSea/nodePage/tally/index.vue

@@ -178,7 +178,7 @@ export default {
             list.push({
               ...oItem,
               warehouseInInfo,
-              multiSpecification: item.multiSpecification,
+              multiSpecification: oItem.multiSpecification,
               positionNo: oItem.positionNo,
               tallyStatus: item.tallyStatus,
               tallyTime: item.tallyTime,