Merge branch 'master' of http://git.echepei.com/caojunjie/digital_transformation_ui

src/views/iosBasicData/ImportExchange/index.vue

@@ -336,7 +336,7 @@ export default {
             width: "80",
             overHidden: true
           },
-          {
+/*          {
             label: "实收本币",
             prop: "receivedAmountDr",
             width: "80",
@@ -347,7 +347,7 @@ export default {
             prop: "receivedAmountDrUsd",
             width: "80",
             overHidden: true
-          },
+          },*/
           {
             label: "制单人",
             prop: "createUserName",

src/views/iosBasicData/costcenter/soc/index.vue

@@ -760,4 +760,4 @@ export default {
 ::v-deep .el-col-md-8 {
     width: 24.33333%;
 }
-</style>
+</style>

src/views/iosBasicData/financialManagement/finstlbills/detailsPage.vue

@@ -627,6 +627,12 @@ export default {
                         search: true,
                     },
                     {
+                        label: "订舱代理",
+                        prop: "bookingAgentCnName",
+                        width: 120,
+                        overHidden: true
+                    },
+                    {
                         label: "仅未结算",
                         prop: "isStl",
                         search: true,