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

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

@@ -112,30 +112,34 @@
 
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
-      <el-col :span="4">
+      <el-col :span="1.5">
         <el-button type="primary" size="mini" @click="exportSearch" v-hasPermi="['ecw:exception:export']">导出</el-button>
       </el-col>
-      <el-col :span="16">
-        <el-descriptions :column="4">
-          <el-descriptions-item :label="$t('箱数')">
+      <el-col :span="17.5">
+        <div class="total" v-if="totalData">
+          <div :label="$t('箱数')">
+              <div>{{$t('箱数')}}:</div>
               <span v-if="totalData.totalNum">{{totalData.totalNum+$t('箱')}}</span>
               <span v-else></span>
-          </el-descriptions-item>
-            <el-descriptions-item :label="$t('测量方数汇总')">
+          </div>
+            <div>
+                <div>{{$t('测量方数汇总')}}:</div>
                 <span v-if="totalData.totalVolume">{{totalData.totalVolume}}m³</span>
                 <span v-else></span>
-            </el-descriptions-item>
-            <el-descriptions-item :label="$t('收费方数汇总')">
+            </div>
+            <div>
+               <div>{{$t('收费方数汇总')}}:</div>
                 <span v-if="totalData.totalChargeVolume">{{totalData.totalChargeVolume}}m³</span>
                 <span v-else></span>
-            </el-descriptions-item>
-            <el-descriptions-item :label="$t('重量汇总')">
+            </div>
+            <div>
+               <div>{{$t('重量汇总')}}:</div>
                <span v-if="totalData.totalWeight">{{totalData.totalWeight}}KG</span>
                <span v-else></span>
-            </el-descriptions-item>
-        </el-descriptions>
+            </div>
+        </div>
       </el-col>
-      <el-col :span="4"><right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar></el-col>
+     <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <!-- 列表 -->
@@ -389,3 +393,15 @@ export default {
   }
 }
 </script>
+<style scoped>
+  .total{
+    display:flex;
+    align-items: center;
+  }
+  .total div{
+    margin-right:10px;
+    font-size:14px;
+    display:flex;
+    align-items: center;
+  }
+</style>

src/views/ecw/region/index.vue

@@ -153,6 +153,12 @@
                             :key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/>
               </el-select>
             </el-form-item>
+            <el-form-item :label="$t('应收额币种')" prop="importCurrency5">
+              <el-select v-model="form.importCurrency5" :placeholder="$t('请选择')">
+                <el-option  v-for="dict in currencyList "
+                            :key="dict.id" :label="dict.titleZh" :value="dict.id.toString()"/>
+              </el-select>
+            </el-form-item>
           </div>
 <!--          <el-col :span="12">-->
 <!--            <el-form-item :label="$t('部门状态')" prop="status">-->