修复BUG:月售销利润 成本其他费用数据

Bailun.DC.Services/WebApiService/FinanceService.cs

@@ -570,11 +570,11 @@ SUM(t1.amount_sales * (IFNULL(t3.exchange_rate,t1.seller_order_exchange_rate)) *
                 sqlText.Append(" AND t1.platform_type = @PlatformType ");
                 parameters.Add("PlatformType", input.PlatformType);
             }
-            if (!string.IsNullOrWhiteSpace(input.FinanceCategory) && (input.FinanceCategory != "其他" || input.FinanceCategory != "其它"))
+            if (!string.IsNullOrWhiteSpace(input.FinanceCategory) && (input.FinanceCategory != "其他" && input.FinanceCategory != "其它"))
             {
                 sqlText.Append($" AND t1.financecategoryname like '{input.FinanceCategory.Replace("产品", "")}%' ");
             }
-            else if (input.FinanceCategory == "其他" || input.FinanceCategory != "其它")
+            else if (input.FinanceCategory == "其他" || input.FinanceCategory == "其它")
             {
                 sqlText.Append(" and t1.financecategoryname = '' ");
             }

Bailun.DC.Web/Areas/Component/Views/Table/Control.cshtml

@@ -10,7 +10,8 @@
           v-on:select="(selection, row)=> onRowClick(row)"
           v-on:select-all="(selection)=> onRowClick()"
           v-on:row-click="onRowClick"
-          v-on:current-change="setting.selectRowMethod == 1 && onCurrentChange">
+          v-on:current-change="setting.selectRowMethod == 1 && onCurrentChange"
+          v-bind:class="{search:setting.isShowColumnSearch}">
     <el-table-column v-if="setting.selectRowMethod == 2"
                      header-align="center"
                      type="selection"

Bailun.DC.Web/wwwroot/css/component/el-table-query.css

@@ -3,6 +3,10 @@
     height: calc(100% - 40px);
 }
 
+.el-table-query .el-main .el-table.search .el-table__body-wrapper {
+    height: calc(100% - 65px);
+}
+
 #app, #app .el-container.is-vertical {
     height: 100%;
 }