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 0475a916..edad5ec0 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
@@ -36,7 +36,7 @@ export default {
v-if="item.meta.isTop"
@click="click(item,selectedRows)"
:class="item.meta.htmlClass??'el-button--primary'"
- v-show="true||!item.meta.show||item.meta.show(selectedRows,queryModel)"
+ v-show="!item.meta.show||item.meta.show(selectedRows,queryModel)"
:disabled="item.meta.disabled && item.meta.disabled.constructor === Function && item.meta.disabled(selectedRows,queryModel)"
>
@@ -127,6 +127,7 @@ export default {
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js
index 4b857028..1269bd3e 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js
@@ -5,7 +5,7 @@ const schema = {
type: "object",
properties: {
version,
- state,
+ //state,
billNum: {
title: "结算单号",
type: "string",
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/finance.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/finance.js
index 319a70f2..fd8ec2b8 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/finance.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/finance.js
@@ -1,8 +1,7 @@
//财务审核
import version from "../version.js";
import { state2 } from "../state.js";
-import businessType from "../businessType.js";
-import invoiceState from "../invoiceState.js";
+import { businessType, invoiceState } from "../_options.js";
const state = Object.assign({}, state2);
state.input = "tabs";
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
index c3c8d845..b6b0be71 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
@@ -90,10 +90,27 @@ function createCommerceCheckList(path, business, client, title = "商务审批")
component: "/settle/commerce",
children: [
createButton("query", "title=查询&isTop=true"),
- createButton("approval", "title=商务审核通过&isTop=true"),
- createButton("reject", "title=退回"),
+ createButton(
+ "approval",
+ "title=商务审核通过&isTop=true",
+ (_, q) => q.filters.some((o) => o.column === "state" && o.value === 1) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
+ ),
+ createButton(
+ "reject",
+ "title=退回",
+ (_, q) => q.filters.some((o) => o.column === "state" && o.value === 1) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
+ ),
createButton("export-group", "title=导出发票分组&pattern=paged"),
- createButton("receive", "title=客户已收票&isTop=true"),
+ createButton(
+ "receive",
+ "title=客户已收票&isTop=true",
+ (_, q) => q.filters.some((o) => o.column === "state" && o.value === 3) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
+ ),
+ createButton(
+ "bao-fei",
+ "title=报废&isTop=true",
+ (_, q) => q.filters.some((o) => o.column === "state" && (o.value === 3 || o.value === 4)) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
+ ),
],
};
}
@@ -343,11 +360,23 @@ export default [
component: "/settle/finance",
children: [
createButton("query", "title=查询&isTop=true"),
- createButton("import", "title=导入开票文件&isTop=true", "(a, b) => false"),
- createButton("approval", "title=财务审核通过&isTop=true"),
+ createButton(
+ "import",
+ "title=导入开票文件&isTop=true",
+ (_, q) => q.filters.some((o) => o.column === "state" && o.value === 3) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
+ ),
+ createButton(
+ "approval",
+ "title=财务审核通过&isTop=true",
+ (_, q) => q.filters.some((o) => o.column === "state" && o.value === 2) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
+ ),
createButton("export-group", "title=导出发票分组&pattern=paged"),
createButton("approval", "title=发票重开"),
- createButton("reject", "title=退回&isTop=true"),
+ createButton(
+ "reject",
+ "title=退回&isTop=true",
+ (_, q) => q.filters.some((o) => o.column === "state" && o.value === 2) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
+ ),
createButton("sync", "title=同步到QAD&isTop=true"),
],
},
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/index.js
index 9604ce6b..44cbc3d3 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/index.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/index.js
@@ -85,7 +85,7 @@ const refreshRouter = async () => {
await connect();
const appStore = useAppStore();
const permissions = appStore.user.permissions;
- const serverRoutes = JSON.parse(JSON.stringify(remoteRoutes));
+ const serverRoutes = Object.assign([], remoteRoutes);
const setPermission = (list, parent = null) => {
list.forEach((o) => {
// full path
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs
index 316d9ef4..53786407 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs
@@ -162,12 +162,11 @@ public class VmiAppService : ApplicationService, IJobService, ITransientDependen
try
{
var now = DateTime.Now;
- var time = now.ToString("yyyy-MM-dd_HH:mm");
- var table = $"Set_VmiBalance_{time}";
+ var table = $"Set_VmiBalance_{now.ToString("yyyy_MM_dd_HH_mm_ss")}";
var snapshot = db.Set().Where(o => o.Name == table).FirstOrDefault();
if (snapshot == null)
{
- snapshot = new VmiSnapshot { Name = time, Start = now, Description = table };
+ snapshot = new VmiSnapshot { Name = now.ToString("yyyy-MM-dd HH:mm:ss"), Start = now, Description = table };
db.Set().Add(snapshot);
db.SaveChanges();
var result = db.Database.ExecuteSqlRaw($"select * into {table} from Set_VmiBalance;");