Merge branch 'fix' into dev

src/views/ecw/financial/selfNoReport.vue

@@ -20,7 +20,7 @@
         >
           <el-select
             v-model="queryParams.startWarehouseIdList"
-            
+
             multiple
             :placeholder="$t('请选择')"
             clearable
@@ -104,7 +104,7 @@
             :start-placeholder="$t('开始日期')"
             :end-placeholder="$t('结束日期')"
             value-format="yyyy-MM-dd HH:mm:ss"
-            
+
           >
           </el-date-picker>
         </el-form-item>
@@ -117,7 +117,7 @@
             :start-placeholder="$t('开始日期')"
             :end-placeholder="$t('结束日期')"
             value-format="yyyy-MM-dd HH:mm:ss"
-           
+
           >
           </el-date-picker>
         </el-form-item>
@@ -130,7 +130,7 @@
             :start-placeholder="$t('开始日期')"
             :end-placeholder="$t('结束日期')"
             value-format="yyyy-MM-dd HH:mm:ss"
-          
+
           >
           </el-date-picker>
         </el-form-item>
@@ -272,7 +272,7 @@
           prop="summaryInfo.netReceiptsAdvanceFreightFeeGroup"
         >
           <template slot-scope="{ row }">
-            {{ row.summaryInfo.netReceiptsAdvanceFreightFee
+            {{ row.summaryInfo.totalNetReceiptsAdvanceFreightFee
             }}{{ row.summaryInfo.totalFreightFeeCurrency }}
           </template>
         </el-table-column>
@@ -407,20 +407,20 @@ export default {
       let da=  res.data.filter(
         (item) => +item.tradeType === 2 || +item.tradeType === 3
       );
-    
-      let ids = da.map(item => item.id);   
-  
+
+      let ids = da.map(item => item.id);
+
       this.$set(this.queryParams, "startWarehouseIdList", ids);
-      
+
       this.exportWarehouseList = da;//下拉框数据
-     
-    } 
-    
+
+    }
+
     );
     getListTree({ treeType: 1 }).then((r) => {
       this.countryList = r.data;
     });
-    
+
   },
   watch: {
     // 目的国变更后要重置目的仓
@@ -486,8 +486,8 @@ export default {
     handleSelect(val){
       console.log("带")
       //console.log(this.currencyList)
-    }, 
-   
+    },
+
     getCurrencyLabel(id) {
       const item = this.currencyList.find((item) => item.id === id);
       if (!item) return "";
@@ -506,7 +506,7 @@ export default {
 
       this.addBeginAndEndTime(params, this.daogangTime, "DaogangTime", false);
       this.addBeginAndEndTime(params, this.qingguanTime, "QingguanTime", false);
-      
+
       // 执行查询
       boxSettlementPage(params)
         .then((response) => {
@@ -561,7 +561,7 @@ export default {
         // 其他费用折扣
         this.getTotal("discountOtherFee") + OtherCurrencyName,
       ];
-     
+
       return data;
     },
     /** 搜索按钮操作 */

src/views/report/EcwReportPermission/index.vue

@@ -131,7 +131,6 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="用户姓名" prop="userId">
           <user-selector
-            manage
             v-model="form.userId"
             clearable
             @change="handleQuery"
@@ -411,4 +410,3 @@ export default {
   },
 };
 </script>
-  
\ No newline at end of file