Merge branch 'ljj_dev' into dev

src/views/baseinfo/shipping/columns.tsx

@@ -114,6 +114,7 @@ export const formSchema: FormSchema[] = [
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },
+        getPopupContainer: () => document.body,
         onChange: (v, obj) => {
           if (v && obj) {
             formModel.countryName = obj.label

src/views/mapping/carrier/columns.tsx

@@ -92,7 +92,7 @@ export const formSchema: FormSchema[] = [
         api: GetCarrierSelectList,
         labelField: 'pinYinCode',
         showName: 'cnName',
-        valueField: 'cnName',
+        valueField: 'code',
         resultField: 'data',
         immediate: false,
         onChange: (e, obj) => {

src/views/operation/seaexport/index.vue

@@ -11,33 +11,33 @@
         <!-- 应收费用 -->
         <template v-if="column.dataIndex == 'arFeeStatus'">
           <span v-if="record.arFeeStatus == 0" class="ds-green-tag">
-            {{ FeeStatus[record.arFeeStatus] }}</span>
+            {{ record.arFeeStatusName }}</span>
           <span v-else-if="record.arFeeStatus == 1" class="ds-blue-tag">{{
-            FeeStatus[record.arFeeStatus]
+            record.arFeeStatusName
           }}</span>
           <span v-else-if="/^2|3|4|5|6$/.test(record.arFeeStatus)" class="ds-orange-tag">{{
-            FeeStatus[record.arFeeStatus]
+            record.arFeeStatusName
           }}</span>
           <span v-else-if="/^7|8$/.test(record.arFeeStatus)" class="ds-red-tag">{{
-            FeeStatus[record.arFeeStatus]
+            record.arFeeStatusName
           }}</span>
-          <span v-else class="ds-purple-tag">{{ FeeStatus[record.arFeeStatus] }}</span>
+          <span v-else class="ds-purple-tag">{{ record.arFeeStatusName }}</span>
         </template>
         <!-- 应付费用 -->
         <template v-if="column.dataIndex == 'apFeeStatus'">
           <span v-if="record.apFeeStatus == 0" class="ds-green-tag">{{
-            FeeStatus[record.apFeeStatus]
+            record.apFeeStatusName
           }}</span>
           <span v-else-if="record.apFeeStatus == 1" class="ds-blue-tag">{{
-            FeeStatus[record.apFeeStatus]
+            record.apFeeStatusName
           }}</span>
           <span v-else-if="/^2|3|4|5|6$/.test(record.apFeeStatus)" class="ds-orange-tag">{{
-            FeeStatus[record.apFeeStatus]
+            record.apFeeStatusName
           }}</span>
           <span v-else-if="/^7|8$/.test(record.apFeeStatus)" class="ds-red-tag">{{
-            FeeStatus[record.apFeeStatus]
+            record.apFeeStatusName
           }}</span>
-          <span v-else class="ds-purple-tag">{{ FeeStatus[record.apFeeStatus] }}</span>
+          <span v-else class="ds-purple-tag">{{ record.apFeeStatusName }}</span>
         </template>
         <!-- 主题单号 -->
         <template v-if="column.dataIndex == 'mblno'">