From 2b11e1d66ea68dfcc6f699e24bf90a0671e3124f Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Thu, 7 Sep 2023 09:18:20 +0800
Subject: [PATCH] update

---
 .../SettleAccount.HttpApi.Host/Program.cs     | 10 +++----
 .../wwwroot/components/list/index.js          |  6 +++-
 .../wwwroot/models/base-data/xiao-shou.js     | 30 +++++++++++++++++++
 .../wwwroot/models/settle/detail.js           | 18 +++++++++++
 4 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Program.cs b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Program.cs
index 86eecc29..679ab321 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Program.cs
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Program.cs
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
@@ -13,20 +12,21 @@ public class Program
     {
         var configuration = new ConfigurationBuilder()
             .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
-            .AddJsonFile($"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")}.json", optional: true, reloadOnChange: true);
+            .AddJsonFile($"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")}.json", optional: true, reloadOnChange: true)
+            .Build();
 
         Log.Logger = new LoggerConfiguration()
-            .WriteTo.Async(c => c.File(Path.Combine(Directory.GetCurrentDirectory(), "../Logs/logs.txt")
+            .WriteTo.Async(c => c.Console())
+            .WriteTo.Async(c => c.File("Logs/logs.txt"
                     , rollingInterval: RollingInterval.Day
                     , rollOnFileSizeLimit: true
                     , fileSizeLimitBytes: 30 * 1024 * 1024))
-            .WriteTo.Async(c => c.Console())
             .CreateLogger();
 
         try
         {
             Log.Information("Starting web host.");
-            CreateHostBuilder(args).Build().Run();
+            CreateHostBuilder(args).UseSerilog().Build().Run();
             return 0;
         }
         catch (Exception ex)
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
index 48afc6ce..48539e4d 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
@@ -92,7 +92,7 @@ export default {
               </template>
               <template v-else>
                 <template v-if="!item.hideForList&&showColumn(item,key)">
-                  <el-table-column :prop="key" sortable="custom" :sort-orders="['descending', 'ascending', null]" :filters="getFilters(item,key)">
+                  <el-table-column :prop="key" sortable="custom" :sort-orders="['descending', 'ascending', null]" :filters="getFilters(item,key)" :filter-method="filterHandler">
                     <template #header="scope">{{item.title}}</template>
                     <template #default="scope">
                       <app-form-input mode="details" :schema="item" :prop="key" v-model="scope.row" />
@@ -441,6 +441,9 @@ export default {
       }
       return null;
     };
+    const filterHandler = (value, row, column) => {
+      return row[column.property] === value;
+    };
     const handleSelectionChange = (rows) => (selectedRows.value = rows);
     const load = async () => {
       tableLoading.value = true;
@@ -863,6 +866,7 @@ export default {
       pushfilterList,
       getOperators,
       getFilters,
+      filterHandler,
     };
   },
 };
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/xiao-shou.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/xiao-shou.js
index 8bcd6d6d..3cc2d226 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/xiao-shou.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/xiao-shou.js
@@ -82,6 +82,36 @@ export default function () {
                 value: null,
                 readOnly: true,
               },
+              {
+                logic: "and",
+                column: "beginTime",
+                action: "biggerThanOrEqual",
+                value: null,
+                readOnly: true,
+                clearable: true,
+              },
+              {
+                logic: "and",
+                column: "endTime",
+                action: "smallThan",
+                value: null,
+                readOnly: true,
+                clearable: true,
+              },
+              {
+                logic: "and",
+                column: "clientCode",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+              {
+                logic: "and",
+                column: "contractNo",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
             ],
           },
           skipCount: {
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/detail.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/detail.js
index 36bc7ce8..7a2abe49 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/detail.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/detail.js
@@ -139,6 +139,24 @@ export default function (businessType, type) {
               },
             },
             default: [
+              {
+                logic: "and",
+                column: "settleDate",
+                action: "biggerThanOrEqual",
+                value: null,
+                readOnly: true,
+                clearable: true,
+                title: "下线开始",
+              },
+              {
+                logic: "and",
+                column: "settleDate",
+                action: "smallThan",
+                value: null,
+                readOnly: true,
+                clearable: true,
+                title: "下线结束",
+              },
               {
                 logic: "and",
                 action: "like",