From f5e27ac7c4a241e36aed0de3402017f22ce75a77 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Wed, 23 Aug 2023 16:28:55 +0800 Subject: [PATCH] update --- .../wwwroot/components/list/index.js | 4 ++-- .../wwwroot/models/input/jie-suan.js | 2 +- .../wwwroot/models/settle/commerce.js | 9 ++++++++- .../wwwroot/router/base-data.js | 4 ++-- .../wwwroot/router/business.js | 12 +++++++++--- .../wwwroot/router/utils.js | 9 ++++++--- .../wwwroot/styles/site.css | 2 +- 7 files changed, 29 insertions(+), 13 deletions(-) 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 01a11f72..1b8e7e4e 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 { :class="item.meta.htmlClass??'el-button--primary'" v-if="item.meta.isTop" @click="click(item,selectedRows)" - :disabled="item.meta.disabled && item.meta.disabled.constructor === Function && item.meta.disabled(selectedRows,queryModel)" + v-show="item.meta.disabled && item.meta.disabled.constructor === Function && item.meta.disabled(selectedRows,queryModel)" > {{item.meta.title}} @@ -127,7 +127,7 @@ export default { :class="item.meta.htmlClass??'el-button--primary'" v-if="!item.meta.isTop" @click="click(item,[scope.row])" - :disabled="item.meta.disabled && item.meta.disabled(scope.row)" + v-show="item.meta.disabled && item.meta.disabled(scope.row)" > {{item.meta.title}} 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 50b2b2c5..3244527f 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 @@ -68,7 +68,7 @@ const querySchema = { export default function (businessType, meta) { let service = null; let detailService = null; - if (businessType === "JisBBAC") { + if (businessType === "JisBBAC" || businessType === "MaiDanJianBBAC" || businessType === "MaiDanJianHBPO") { service = "bbac_sa_service"; detailService = "bbac_sa_detail_service"; } else if (businessType === "JisHBPO") { diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js index 51f184b8..3da777b9 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js @@ -33,7 +33,7 @@ const schema = { invoiceState: { title: "发票状态", type: "string", - input: "select", + input: "tabs", options: [ { value: 1, label: "正常" }, { value: 2, label: "报废" }, @@ -116,6 +116,13 @@ export default function (businessType, type) { value: null, readOnly: true, }, + { + logic: "and", + column: "invoiceState", + action: "equal", + value: null, + readOnly: true, + }, ], }, skipCount: { diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js index 66603861..3c149eeb 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js @@ -10,13 +10,13 @@ export default [ createButton("query", "title=查询&isTop=true"), createButton("create", "title=新建&isTop=true"), createButton("update", "title=编辑"), - createButton("delete", "title=删除&disabled=o=>o.userName==='admin'"), + createButton("delete", "title=删除", (o) => o.userName !== "admin"), createButton("reset-password", "title=重置密码&method=PUT"), ], }, { ...createPage("role", "title=角色管理"), - children: [createButton("query", "title=查询&isTop=true"), createButton("create", "title=新建&isTop=true"), createButton("delete", "title=删除&disabled=o => o.isStatic")], + children: [createButton("query", "title=查询&isTop=true"), createButton("create", "title=新建&isTop=true"), createButton("delete", "title=删除", (o) => o.isStatic)], }, { ...createPage("material", "title=物料主数据"), 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 e73239a3..e47960be 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 @@ -2,16 +2,21 @@ import createRoute, { createPage, createButton } from "./utils.js"; // #region 数据输入 function createInputJieSuanShuju(path, business, client, title = "结算数据") { - return { + const routes = { ...createPage(path, `title=${title}&businessType=${business}&client=${client}`), component: "/input/jie-suan", children: [ createButton("query", "title=查询&isTop=true"), - createButton("import", "title=导入&isTop=true"), + //createButton("import", "title=导入&isTop=true"), createButton("export", "title=导出&pattern=row&key=billNum"), - createButton("delete", "title=删除&isTop=true"), + //createButton("delete", "title=删除&isTop=true"), ], }; + if (business !== "MaiDanJianBBAC" && business !== "MaiDanJianHBPO") { + routes.children.push(createButton("import", "title=导入&isTop=true")); + routes.children.push(createButton("delete", "title=删除&isTop=true")); + } + return routes; } function createInputFaYunShuJu(path, business, client, title = "发运数据") { @@ -341,6 +346,7 @@ export default [ createButton("import", "title=导入开票文件&isTop=true"), createButton("approval", "title=财务审核通过&isTop=true"), createButton("export-group", "title=导出发票分组&pattern=paged"), + createButton("approval", "title=发票重开"), createButton("reject", "title=退回&isTop=true"), createButton("sync", "title=同步到QAD&isTop=true"), ], diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/utils.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/utils.js index ceb85c08..f943c439 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/utils.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/utils.js @@ -25,12 +25,15 @@ function createPage(path, meta = null, component = null) { }; } -function createButton(path, meta = null, component = null) { - return { +function createButton(path, meta = null, show = null) { + const result = { path, - component, meta: Object.assign(createDefaultRoute("button", "file"), qs.parse(meta)), }; + if (show) { + result.meta.show = show; + } + return result; } export default createRoute; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/styles/site.css b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/styles/site.css index 146479e7..cd348c82 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/styles/site.css +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/styles/site.css @@ -96,7 +96,7 @@ a.logo { } .el-form--inline .el-form-item__content { - width: 192px; + min-width: 192px; /* height: 32px; */ }