Browse Source

update

master
wanggang 1 year ago
parent
commit
2b11e1d66e
  1. 10
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Program.cs
  2. 6
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
  3. 30
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/xiao-shou.js
  4. 18
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/detail.js

10
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Program.cs

@ -1,5 +1,4 @@
using System; using System;
using System.IO;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
@ -13,20 +12,21 @@ public class Program
{ {
var configuration = new ConfigurationBuilder() var configuration = new ConfigurationBuilder()
.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) .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() 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 , rollingInterval: RollingInterval.Day
, rollOnFileSizeLimit: true , rollOnFileSizeLimit: true
, fileSizeLimitBytes: 30 * 1024 * 1024)) , fileSizeLimitBytes: 30 * 1024 * 1024))
.WriteTo.Async(c => c.Console())
.CreateLogger(); .CreateLogger();
try try
{ {
Log.Information("Starting web host."); Log.Information("Starting web host.");
CreateHostBuilder(args).Build().Run(); CreateHostBuilder(args).UseSerilog().Build().Run();
return 0; return 0;
} }
catch (Exception ex) catch (Exception ex)

6
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js

@ -92,7 +92,7 @@ export default {
</template> </template>
<template v-else> <template v-else>
<template v-if="!item.hideForList&&showColumn(item,key)"> <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 #header="scope">{{item.title}}</template>
<template #default="scope"> <template #default="scope">
<app-form-input mode="details" :schema="item" :prop="key" v-model="scope.row" /> <app-form-input mode="details" :schema="item" :prop="key" v-model="scope.row" />
@ -441,6 +441,9 @@ export default {
} }
return null; return null;
}; };
const filterHandler = (value, row, column) => {
return row[column.property] === value;
};
const handleSelectionChange = (rows) => (selectedRows.value = rows); const handleSelectionChange = (rows) => (selectedRows.value = rows);
const load = async () => { const load = async () => {
tableLoading.value = true; tableLoading.value = true;
@ -863,6 +866,7 @@ export default {
pushfilterList, pushfilterList,
getOperators, getOperators,
getFilters, getFilters,
filterHandler,
}; };
}, },
}; };

30
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/xiao-shou.js

@ -82,6 +82,36 @@ export default function () {
value: null, value: null,
readOnly: true, 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: { skipCount: {

18
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/detail.js

@ -139,6 +139,24 @@ export default function (businessType, type) {
}, },
}, },
default: [ 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", logic: "and",
action: "like", action: "like",

Loading…
Cancel
Save