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 3a5cf6e6..ff4ec78f 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 @@ -748,7 +748,7 @@ export default { const targetRoute = router.getRoutes().find((o) => o.path === nav); if (config.constructor === String) { const value = (await import(config)).default; - config = value.constructor === Function ? value() : value; + config = value.constructor === Function ? value(route.meta.businessType) : value; } subListQuery.value = { query: value, 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 86c8550c..f55dec6d 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 @@ -21,7 +21,7 @@ const schema = { export default function (service, detailService) { const queryUrl = `settleaccount/${service}/get-list`; const deleteUrl = `settleaccount/${service}/delete-list`; - const importUrl = `settleaccount/pub_sa_service/import-by-business-type`; + const importUrl = `settleaccount/${service}/import`; const exportUrl = `settleaccount/${detailService}/export`; const queryMethod = "POST"; const deleteMethod = "POST"; 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 new file mode 100644 index 00000000..23fa5277 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/detail.js @@ -0,0 +1,169 @@ +import version from "../version.js"; + +const schema = { + title: "通用代码", + type: "object", + properties: { + settleBillNum: { + title: "关联结算单号", + type: "string", + }, + billNum: { + title: "发票分组号", + type: "string", + }, + settleDate: { + title: "下线日期", + type: "string", + input: "datetime", + }, + invBillNum: { + title: "发票号", + type: "string", + }, + lu: { + title: "厂内零件号", + type: "string", + }, + partCode: { + title: "客户零件号", + type: "string", + }, + materialDesc: { + title: "零件描述", + type: "decimal", + }, + pn: { + title: "标识号", + type: "string", + }, + qty: { + title: "结算数量", + type: "number", + }, + price: { + title: "单价", + type: "number", + }, + groupNum: { + title: "结算分组号", + type: "decimal", + }, + site: { + title: "工厂地点", + type: "string", + }, + isReturn: { + title: "是否退货", + type: "boolean", + }, + isMaidan: { + title: "是否买单", + type: "boolean", + }, + contractDocID: { + title: "合同号", + type: "string", + }, + }, +}; + +export default function (businessType) { + let service; + if (businessType === "JisBBAC") { + service = "bbac_can_sa_service"; + } else if (businessType === "JisHBPO") { + service = "hbpo_can_sa_service"; + } else { + service = "pub_can_sa_service"; + } + if (businessType === "JisBBAC" || businessType === "JisHBPO") { + schema.properties.pn.title = "生产码"; + } + if (businessType !== "JisBBAC") { + delete schema.properties["isReturn"]; + delete schema.properties["isMaidan"]; + delete schema.properties["contractDocID"]; + } + if (businessType !== "JisHBPO") { + delete schema.properties["site"]; + } + const queryUrl = `settleaccount/${service}/detail-query`; + const queryMethod = "POST"; + + return { + query: { + url: queryUrl, + method: queryMethod, + hasFilter: true, + schema: { + title: "通用代码", + type: "object", + properties: { + filters: { + title: "筛选", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + action: "like", + column: "partCode", + value: null, + readOnly: true, + }, + { + logic: "and", + action: "like", + column: "pn", + value: null, + readOnly: true, + }, + { + logic: "and", + action: "like", + column: "groupNum", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/unable.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/unable.js new file mode 100644 index 00000000..7700a75c --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/unable.js @@ -0,0 +1,105 @@ +import version from "../version.js"; +import state from "../state.js"; + +const schema = { + title: "不可结算明细", + type: "object", + properties: { + version, + state, + billNum: { + title: "结算单据", + type: "string", + }, + settleBillNum: { + title: "关联结算单号", + type: "string", + }, + invGroupNum: { + title: "发票分组号", + type: "string", + oneToMany: "/settle/detail", + config: "/models/settle/detail.js", + }, + }, +}; + +export default function (service) { + const queryUrl = `settleaccount/${service}/detail-query`; + const exportUrl = `settleaccount/${service}/export`; + const addUrl = `settleaccount/${service}/generate-settlement-order`; + + const queryMethod = "POST"; + const exportMethod = "POST"; + const addMethod = "POST"; + + return { + query: { + url: queryUrl, + method: queryMethod, + hasFilter: true, + schema: { + title: "发票分组号", + type: "object", + properties: { + filters: { + title: "项目", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "version", + action: "equal", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + businessType: { + hidden: true, + default: 0, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + exportUrl, + addUrl, + exportMethod, + addMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/usable.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/usable.js new file mode 100644 index 00000000..0f7999e2 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/usable.js @@ -0,0 +1,105 @@ +import version from "../version.js"; +import state from "../state.js"; + +const schema = { + title: "可结算单", + type: "object", + properties: { + version, + state, + billNum: { + title: "结算单据", + type: "string", + oneToMany: "/settle/detail", + config: "/models/settle/detail.js", + }, + settleBillNum: { + title: "关联结算单号", + type: "string", + }, + invGroupNum: { + title: "发票分组号", + type: "string", + }, + }, +}; + +export default function (service) { + const queryUrl = `settleaccount/${service}/main-query`; + const exportUrl = `settleaccount/${service}/export`; + const addUrl = `settleaccount/${service}/generate-invoice`; + + const queryMethod = "POST"; + const exportMethod = "POST"; + const addMethod = "POST"; + + return { + query: { + url: queryUrl, + method: queryMethod, + hasFilter: true, + schema: { + title: "发票分组号", + type: "object", + properties: { + filters: { + title: "项目", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "version", + action: "equal", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + businessType: { + hidden: true, + default: 0, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + exportUrl, + addUrl, + exportMethod, + addMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/state.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/state.js index f547707c..5f29a488 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/state.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/state.js @@ -1,14 +1,14 @@ const options = [ - { value: 0, label: "未结状态" }, - { value: 1, label: "已开票" }, - { value: 2, label: "商务已审核" }, - { value: 3, label: "财务已审核" }, - { value: 4, label: "客户已收票" }, - { value: 5, label: "已扣减" }, + { value: "0", label: "未结状态" }, + { value: "1", label: "已开票" }, + { value: "2", label: "商务已审核" }, + { value: "3", label: "财务已审核" }, + { value: "4", label: "客户已收票" }, + { value: "5", label: "已扣减" }, ]; const state = { title: "状态", type: "string", input: "select", options }; -const state2 = Object.assign(Object.assign({}, state), { options: options.filter((a) => a.value > 0) }); -const state3 = Object.assign(Object.assign({}, state), { options: options.filter((a) => a.value > 3) }); +const state2 = Object.assign(Object.assign({}, state), { options: options.filter((a) => parseInt(a.value) > 0) }); +const state3 = Object.assign(Object.assign({}, state), { options: options.filter((a) => parseInt(a.value) > 3) }); export default state; -export { state2, state3 }; \ No newline at end of file +export { state2, state3 }; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js index 59a15307..642b351e 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js @@ -1,4 +1,4 @@ -import options from "./business-type.js"; +import businessType from "./business-type.js"; const schema = { title: "客户替换件关系", @@ -12,7 +12,7 @@ const schema = { title: "替换厂内物料号", type: "string", }, - options, + businessType, }, }; 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 a4a2268f..cb228010 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 @@ -1,5 +1,6 @@ import createRoute, { createPage, createButton } from "./utils.js"; +// #region 数据输入 function createInputJieSuanShuju(path, business, client, title = "结算数据") { return { ...createPage(path, `title=${title}&businessType=${business}&client=${client}`), @@ -35,7 +36,9 @@ function createInputEdiShuJu(path, business, client, title = "EDI数据") { ], }; } +// #endregion +// #region 数据比对 function createCompareFaYun(path, business, client, title = "EDI与发运对比") { return { ...createPage(path, `title=${title}&businessType=${business}&client=${client}`), @@ -62,10 +65,80 @@ function createCompareJieSuan(path, business, client, title = "EDI、发运与 ], }; } +// #endregion + +// #region 结算开票 +function createUsableSettleList(path, business, client, title = "可结算单") { + return { + ...createPage(path, `title=${title}&businessType=${business}&client=${client}`), + component: "/settle/usable", + children: [ + createButton("query", "title=查询&isTop=true"), + createButton("add", "title=创建发票"), //行级按钮 + createButton("export", "title=导出&isTop=true&pattern=paged"), + ], + }; +} +function createUnableSettleList(path, business, client, title = "不可结算明细") { + return { + ...createPage(path, `title=${title}&businessType=${business}&client=${client}`), + component: "/settle/unable", + children: [ + createButton("query", "title=查询&isTop=true"), + createButton("compare", "title=生成可结算单&isTop=true"), + createButton("export", "title=导出&isTop=true&pattern=paged"), + ], + }; +} +function createCommerceCheck(path, business, client, title = "商务审批") { + return { + ...createPage(path, `title=${title}&businessType=${business}&client=${client}`), + component: "/settle/commerce ", + children: [ + createButton("query", "title=查询&isTop=true"), + createButton("compare", "title=商务审核通过&isTop=true"), + createButton("reject", "title=退回&isTop=true"), + createButton("export", "title=导出&isTop=true&pattern=paged"), + createButton("????", "title=客户已收票&isTop=true"), + ], + }; +} +function createVmiCheck(path, business, client, title = "寄售库库存扣减审批") { + return { + ...createPage(path, `title=${title}&businessType=${business}&client=${client}`), + component: "/settle/finance", + children: [ + createButton("query", "title=查询&isTop=true"), + createButton("compare", "title=扣减审核通过&isTop=true"), + createButton("export", "title=导出&pattern=paged"), + ], + }; +} + +// #endregion + +function createFinanceCheck(path, business, client, title = "财务审核") { + return { + ...createPage(path, `title=${title}&businessType=${business}&client=${client}`), + component: "/settle/finance", + children: [ + createButton("query", "title=查询&isTop=true"), + createButton("import", "title=导入开票文件&isTop=true"), + createButton("compare", "title=财务审核通过&isTop=true"), + createButton("export", "title=导出&pattern=paged"), + createButton("reject", "title=退回&isTop=true"), + createButton("reject", "title=同步到QAD&isTop=true"), + ], + }; +} export default [ { - ...createPage("input/jie-suan/detail", "title=结算数据明细&isHidden=true"), + ...createPage("input/jie-suan/detail", "title=数据输入结算数据明细&isHidden=true"), + children: [createButton("query", "title=查询&isTop=true")], + }, + { + ...createPage("settle/detail", "title=结算单结算数据明细&isHidden=true"), children: [createButton("query", "title=查询&isTop=true")], }, { @@ -74,124 +147,23 @@ export default [ { ...createRoute("input", "title=数据输入"), children: [ - createInputJieSuanShuju("bbac_sa_service", "JisBBAC", "bbac"), - createInputFaYunShuJu("bbac_se_detail_service", "JisBBAC", "bbac"), - createInputEdiShuJu("bbac_se_edi_service", "JisBBAC", "bbac"), + createInputJieSuanShuju("bbac_sa_service", "JisBBAC", "bbac", "JIS-BBAC 结算数据"), + createInputFaYunShuJu("bbac_se_detail_service", "JisBBAC", "bbac", "JIS-BBAC 发运数据"), + createInputEdiShuJu("bbac_se_edi_service", "JisBBAC", "bbac", "JIS-BBAC EDI数据"), ], }, { ...createRoute("contrast", "title=数据比对"), children: [ - createCompareFaYun("bbac_sa_detail_jobservice", "JisBBAC", "bbac"), + createCompareFaYun("bbac_sa_detail_jobservice", "JisBBAC", "bbac", "JIS-BBAC EDI与发运对比"), createCompareJieSuan("first_bbac_sa_detail_jobservice", "JisBBAC", "bbac"), ], }, { - path: "settlement", - meta: { - type: "group", - title: "结算开票", - icon: "folder", - }, + ...createRoute("settlement", "title=结算开票"), children: [ - { - path: "bbac_can_sa_service", - meta: { - type: "page", - title: "可结算单", - icon: "file", - }, - children: [ - { - path: "query", - meta: { - type: "button", - title: "查询", - icon: "file", - isTop: true, - }, - }, - { - path: "export", - meta: { - type: "button", - title: "导出", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - { - path: "invoice", - meta: { - type: "button", - title: "生成发票数据", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - ], - }, - { - path: "bbac_can_sa_detail_service", - meta: { - type: "page", - title: "BBAC发票分组号明细", - icon: "file", - isHidden: true, - }, - children: [ - { - path: "query", - meta: { - type: "button", - title: "查询", - icon: "file", - isTop: true, - }, - }, - ], - }, - { - path: "bbac_not_sa_service", - meta: { - type: "page", - title: "不可结算单", - icon: "file", - }, - children: [ - { - path: "query", - meta: { - type: "button", - title: "查询", - icon: "file", - isTop: true, - }, - }, - { - path: "export", - meta: { - type: "button", - title: "导出", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - { - path: "settlement", - meta: { - type: "button", - title: "生成可结算单", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - ], - }, + createUsableSettleList("bbac_can_sa_service", "JisBBAC", "bbac"), + createUnableSettleList("bbac_not_sa_service", "JisBBAC", "bbac"), { path: "bbac_ba_service", meta: { @@ -364,124 +336,23 @@ export default [ icon: "folder", }, children: [ - createInputJieSuanShuju("hbpo_sa_service", "JisHBPO", "hbpo"), - createInputFaYunShuJu("hbpo_se_detail_service", "JisHBPO", "hbpo"), - createInputEdiShuJu("hbpo_se_edi_service", "JisHBPO", "hbpo"), + createInputJieSuanShuju("hbpo_sa_service", "JisHBPO", "hbpo", "JIS-HBPO 结算数据"), + createInputFaYunShuJu("hbpo_se_detail_service", "JisHBPO", "hbpo", "JIS-HBPO 发运数据"), + createInputEdiShuJu("hbpo_se_edi_service", "JisHBPO", "hbpo", "JIS-HBPO EDI数据"), ], }, { ...createRoute("contrast", "title=数据比对"), children: [ - createCompareFaYun("hbpo_sa_detail_jobservice", "JisHBPO", "hbpo"), + createCompareFaYun("hbpo_sa_detail_jobservice", "JisHBPO", "hbpo", "JIS-HBPO EDI与发运对比"), createCompareJieSuan("first_hbpo_sa_detail_jobservice", "JisHBPO", "hbpo"), ], }, { - path: "settlement", - meta: { - type: "group", - title: "结算开票", - icon: "folder", - }, + ...createRoute("settlement", "title=结算开票"), children: [ - { - path: "hbpo_can_sa_service", - meta: { - type: "page", - title: "可结算单", - icon: "file", - }, - children: [ - { - path: "query", - meta: { - type: "button", - title: "查询", - icon: "file", - isTop: true, - }, - }, - { - path: "export", - meta: { - type: "button", - title: "导出", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - { - path: "generateInvoice", - meta: { - type: "button", - title: "生成发票数据", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - ], - }, - { - path: "hbpo_can_sa_detail_service", - meta: { - type: "page", - title: "HBPO可结算单明细", - icon: "file", - isHidden: true, - }, - children: [ - { - path: "query", - meta: { - type: "button", - title: "查询", - icon: "file", - isTop: true, - }, - }, - ], - }, - { - path: "hbpo_not_sa_service", - meta: { - type: "page", - title: "不可结算单", - icon: "file", - }, - children: [ - { - path: "query", - meta: { - type: "button", - title: "查询", - icon: "file", - isTop: true, - }, - }, - { - path: "export", - meta: { - type: "button", - title: "导出", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - { - path: "settlement", - meta: { - type: "button", - title: "生成可结算单", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - ], - }, + createUsableSettleList("hbpo_can_sa_service", "JisHBPO", "hbpo"), + createUnableSettleList("hbpo_not_sa_service", "JisHBPO", "hbpo"), { path: "hbpo_ba_service", meta: { @@ -662,8 +533,13 @@ export default [ icon: "folder", }, children: [ - createInputJieSuanShuju("bbac_jit_pub_sa_service", "ZhiGongJianBBAC", "bbac"), - createInputFaYunShuJu("bbac_jit_pub_se_detail_service", "ZhiGongJianBBAC", "bbac"), + createInputJieSuanShuju("bbac_jit_pub_sa_service", "ZhiGongJianBBAC", "bbac", "直供件-BBAC 结算数据"), + createInputFaYunShuJu( + "bbac_jit_pub_se_detail_service", + "ZhiGongJianBBAC", + "bbac", + "直供件-BBAC 发运数据" + ), ], }, { @@ -671,121 +547,10 @@ export default [ children: [createCompareJieSuan("bbac_jit_pub_sa_detail_jobservice", "ZhiGongJianBBAC", "bbac")], }, { - path: "settlement", - meta: { - type: "group", - title: "结算开票", - icon: "folder", - }, + ...createRoute("settlement", "title=结算开票"), children: [ - { - path: "bbac_jit_pub_can_sa_service", - meta: { - type: "page", - title: "可结算单", - icon: "file", - }, - children: [ - { - path: "query", - meta: { - type: "button", - title: "查询", - icon: "file", - isTop: true, - }, - }, - { - path: "export", - meta: { - type: "button", - title: "导出", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - { - path: "generateInvoice", - meta: { - type: "button", - title: "生成发票数据", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - ], - }, - { - path: "bbac_jit_pub_can_sa_detail_service", - meta: { - type: "page", - title: "可结算单明细", - icon: "file", - isHidden: true, - }, - children: [ - { - path: "query", - meta: { - type: "button", - title: "查询", - icon: "file", - isTop: true, - }, - }, - { - path: "export", - meta: { - type: "button", - title: "导出", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - ], - }, - { - path: "bbac_jit_pub_not_sa_service", - meta: { - type: "page", - title: "不可结算单", - icon: "file", - }, - children: [ - { - path: "query", - meta: { - type: "button", - title: "查询", - icon: "file", - isTop: true, - }, - }, - { - path: "export", - meta: { - type: "button", - title: "导出", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - { - path: "generateSettlementOrder", - meta: { - type: "button", - title: "生成可结算单", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - ], - }, + createUsableSettleList("bbac_jit_pub_can_sa_service", "ZhiGongJianBBAC", "bbac"), + createUnableSettleList("bbac_jit_pub_not_sa_service", "ZhiGongJianBBAC", "bbac"), { path: "bbac_jit_pub_ba_service", meta: { @@ -958,130 +723,24 @@ export default [ icon: "folder", }, children: [ - createInputJieSuanShuju("hbpo_jit_pub_sa_service", "ZhiGongJianHBPO", "hbpo"), - createInputFaYunShuJu("hbpo_jit_pub_se_detail_service", "ZhiGongJianHBPO", "hbpo"), + createInputJieSuanShuju("hbpo_jit_pub_sa_service", "ZhiGongJianHBPO", "hbpo", "直供件-HBPO 结算数据"), + createInputFaYunShuJu( + "hbpo_jit_pub_se_detail_service", + "ZhiGongJianHBPO", + "hbpo", + "直供件-HBPO 发运数据" + ), ], }, - { - ...createRoute("contrast", "title=数据比对"), - children: [createCompareJieSuan("bbac_jit_pub_sa_detail_jobservice", "ZhiGongJianHBPO", "hbpo")], - }, - { - path: "settlement", - meta: { - type: "group", - title: "结算开票", - icon: "folder", - }, - children: [ - { - path: "hbpo_jit_pub_can_sa_service", - meta: { - type: "page", - title: "可结算单", - icon: "file", - }, - children: [ - { - path: "query", - meta: { - type: "button", - title: "查询", - icon: "file", - isTop: true, - }, - }, - { - path: "export", - meta: { - type: "button", - title: "导出", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - { - path: "generateInvoice", - meta: { - type: "button", - title: "生成发票数据", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - ], - }, - { - path: "hbpo_jit_pub_can_sa_detail_service", - meta: { - type: "page", - title: "可结算单明细", - icon: "file", - isHidden: true, - }, - children: [ - { - path: "query", - meta: { - type: "button", - title: "查询", - icon: "file", - isTop: true, - }, - }, - { - path: "export", - meta: { - type: "button", - title: "导出", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - ], - }, - { - path: "hbpo_jit_pub_not_sa_service", - meta: { - type: "page", - title: "不可结算单", - icon: "file", - }, - children: [ - { - path: "query", - meta: { - type: "button", - title: "查询", - icon: "file", - isTop: true, - }, - }, - { - path: "export", - meta: { - type: "button", - title: "导出", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - { - path: "generateSettlementOrder", - meta: { - type: "button", - title: "生成可结算单", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - ], - }, + { + ...createRoute("contrast", "title=数据比对"), + children: [createCompareJieSuan("bbac_jit_pub_sa_detail_jobservice", "ZhiGongJianHBPO", "hbpo")], + }, + { + ...createRoute("settlement", "title=结算开票"), + children: [ + createUsableSettleList("hbpo_jit_pub_can_sa_service", "ZhiGongJianBBAC", "hbpo"), + createUnableSettleList("hbpo_jit_pub_not_sa_service", "ZhiGongJianBBAC", "hbpo"), { path: "hbpo_jit_pub_ba_service", meta: { @@ -1264,8 +923,8 @@ export default [ icon: "file", }, children: [ - createInputJieSuanShuju("bbac_md_pub_sa_service", "MaiDanJianBBAC", "bbac"), - createInputFaYunShuJu("bbac_md_pub_se_detail_service", "MaiDanJianBBAC", "bbac"), + createInputJieSuanShuju("bbac_md_pub_sa_service", "MaiDanJianBBAC", "bbac", "买单件-BBAC 结算数据"), + createInputFaYunShuJu("bbac_md_pub_se_detail_service", "MaiDanJianBBAC", "bbac", "买单件-BBAC 发运数据"), ], }, { @@ -1290,8 +949,8 @@ export default [ icon: "file", }, children: [ - createInputJieSuanShuju("hbpo_md_pub_sa_service", "MaiDanJianHBPO", "hbpo"), - createInputFaYunShuJu("hbpo_md_pub_se_detail_service", "MaiDanJianHBPO", "hbpo"), + createInputJieSuanShuju("hbpo_md_pub_sa_service", "MaiDanJianHBPO", "hbpo", "买单件-HBPO 结算数据"), + createInputFaYunShuJu("hbpo_md_pub_se_detail_service", "MaiDanJianHBPO", "hbpo", "买单件-HBPO 发运数据"), ], }, { @@ -1299,121 +958,10 @@ export default [ children: [createCompareJieSuan("hbpo_md_pub_sa_detail_jobservice", "MaiDanJianHBPO", "hbpo")], }, { - path: "settlement", - meta: { - type: "group", - title: "结算开票", - icon: "folder", - }, + ...createRoute("settlement", "title=结算开票"), children: [ - { - path: "hbpo_md_pub_can_sa_service", - meta: { - type: "page", - title: "可结算单", - icon: "file", - }, - children: [ - { - path: "query", - meta: { - type: "button", - title: "查询", - icon: "file", - isTop: true, - }, - }, - { - path: "export", - meta: { - type: "button", - title: "导出", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - { - path: "generateInvoice", - meta: { - type: "button", - title: "生成发票数据", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - ], - }, - { - path: "hbpo_md_pub_can_sa_detail_service", - meta: { - type: "page", - title: "可结算单明细", - icon: "file", - isHidden: true, - }, - children: [ - { - path: "query", - meta: { - type: "button", - title: "查询", - icon: "file", - isTop: true, - }, - }, - { - path: "export", - meta: { - type: "button", - title: "导出", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - ], - }, - { - path: "hbpo_md_pub_not_sa_service", - meta: { - type: "page", - title: "不可结算单", - icon: "file", - }, - children: [ - { - path: "query", - meta: { - type: "button", - title: "查询", - icon: "file", - isTop: true, - }, - }, - { - path: "export", - meta: { - type: "button", - title: "导出", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - { - path: "generateSettlementOrder", - meta: { - type: "button", - title: "生成可结算单", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - ], - }, + createUsableSettleList("hbpo_md_pub_can_sa_service", "MaiDanJianHBPO", "hbpo"), + createUnableSettleList("hbpo_md_pub_not_sa_service", "MaiDanJianHBPO", "hbpo"), { path: "hbpo_md_pub_ba_service", meta: { @@ -1588,8 +1136,8 @@ export default [ icon: "folder", }, children: [ - createInputJieSuanShuju("bj_pub_sa_service", "BeiJian", "bbac"), - createInputFaYunShuJu("bj_pub_se_detail_service", "BeiJian", "bbac"), + createInputJieSuanShuju("bj_pub_sa_service", "BeiJian", "bbac", "备件-BBAC 结算数据"), + createInputFaYunShuJu("bj_pub_se_detail_service", "BeiJian", "bbac", "备件-BBAC 发运数据"), ], }, { @@ -1597,91 +1145,10 @@ export default [ children: [createCompareJieSuan("bj_pub_sa_detail_jobservice", "BeiJian", "bbac")], }, { - path: "settlement", - meta: { - type: "group", - title: "结算开票", - icon: "folder", - }, + ...createRoute("settlement", "title=结算开票"), children: [ - { - path: "bj_pub_can_sa_service", - meta: { - type: "page", - title: "可结算单", - icon: "file", - }, - children: [ - { - path: "query", - meta: { - type: "button", - title: "查询", - icon: "file", - isTop: true, - }, - }, - { - path: "export", - meta: { - type: "button", - title: "导出", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - { - path: "generateInvoice", - meta: { - type: "button", - title: "生成发票数据", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - ], - }, - { - path: "bj_pub_not_sa_service", - meta: { - type: "page", - title: "不可结算单", - icon: "file", - }, - children: [ - { - path: "query", - meta: { - type: "button", - title: "查询", - icon: "file", - isTop: true, - }, - }, - { - path: "export", - meta: { - type: "button", - title: "导出", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - { - path: "bj_generateSettlementOrder", - meta: { - type: "button", - title: "生成可结算单", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - ], - }, + createUsableSettleList("bj_pub_can_sa_service", "BeiJian", "bbac"), + createUnableSettleList("bj_pub_not_sa_service", "BeiJian", "bbac"), { path: "bj_pub_ba_service", meta: { @@ -1854,8 +1321,8 @@ export default [ icon: "folder", }, children: [ - createInputJieSuanShuju("in_pub_sa_service", "YinDuJian", "bbac"), - createInputFaYunShuJu("in_pub_se_detail_service", "YinDuJian", "bbac"), + createInputJieSuanShuju("in_pub_sa_service", "YinDuJian", "bbac", "印度件-BBAC 结算数据"), + createInputFaYunShuJu("in_pub_se_detail_service", "YinDuJian", "bbac", "印度件-BBAC 发运数据"), ], }, { @@ -1863,91 +1330,10 @@ export default [ children: [createCompareJieSuan("in_pub_sa_detail_jobservice", "YinDuJian", "bbac")], }, { - path: "settlement", - meta: { - type: "group", - title: "结算开票", - icon: "folder", - }, + ...createRoute("settlement", "title=结算开票"), children: [ - { - path: "in_pub_can_sa_service", - meta: { - type: "page", - title: "可结算单", - icon: "file", - }, - children: [ - { - path: "query", - meta: { - type: "button", - title: "查询", - icon: "file", - isTop: true, - }, - }, - { - path: "export", - meta: { - type: "button", - title: "导出", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - { - path: "generateInvoice", - meta: { - type: "button", - title: "生成发票数据", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - ], - }, - { - path: "in_pub_not_sa_service", - meta: { - type: "page", - title: "不可结算单", - icon: "file", - }, - children: [ - { - path: "query", - meta: { - type: "button", - title: "查询", - icon: "file", - isTop: true, - }, - }, - { - path: "export", - meta: { - type: "button", - title: "导出", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - { - path: "generateSettlementOrder", - meta: { - type: "button", - title: "生成可结算单", - icon: "file", - isTop: true, - pattern: "paged", - }, - }, - ], - }, + createUsableSettleList("in_pub_can_sa_service", "YinDuJian", "bbac"), + createUnableSettleList("in_pub_not_sa_service", "YinDuJian", "bbac"), { path: "in_pub_ba_service", meta: { diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/_check.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/_check.js index 25463e64..a0813229 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/_check.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/_check.js @@ -20,12 +20,12 @@ export default { - + - + @@ -187,10 +187,6 @@ export default { }); // const columns1 = [ - { - dataKey: "version", - title: "期间", - }, { dataKey: "invbillNum", title: "发票号", @@ -209,11 +205,6 @@ export default { }, ]; const columns2 = [ - { - key: "version", - dataKey: "version", - title: "期间", - }, { dataKey: "invbillNum", title: "发票号", @@ -244,10 +235,6 @@ export default { }, ]; const columns3 = [ - { - dataKey: "version", - title: "期间", - }, { dataKey: "invGroupNum", title: "发票分组号", diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/detail.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/detail.js new file mode 100644 index 00000000..8e8ef40d --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/detail.js @@ -0,0 +1,15 @@ +import AppList from "../../components/list/index.js"; +import html from "html"; +import useConfig from "../../models/settle/detail.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + config = useConfig("pub_can_sa_service"); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/unable.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/unable.js new file mode 100644 index 00000000..720089ca --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/unable.js @@ -0,0 +1,26 @@ +import AppList from "../../components/list/index.js"; +import html from "html"; +import { useRoute } from "vue-router"; +import useConfig from "../../models/settle/unable.js"; +import request from "../../request/index.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const route = useRoute(); + const businessType = route.meta.businessType; + let config = null; + if (businessType === "JisBBAC") { + config = useConfig("bbac_not_sa_service"); + } else if (businessType === "JisHBPO") { + config = useConfig("hbpo_not_sa_service"); + } else { + config = useConfig("pub_not_sa_service"); + } + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/usable.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/usable.js new file mode 100644 index 00000000..2d8e983e --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/usable.js @@ -0,0 +1,26 @@ +import AppList from "../../components/list/index.js"; +import html from "html"; +import { useRoute } from "vue-router"; +import useConfig from "../../models/settle/usable.js"; +import request from "../../request/index.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const route = useRoute(); + const businessType = route.meta.businessType; + let config = null; + if (businessType === "JisBBAC") { + config = useConfig("bbac_can_sa_service"); + } else if (businessType === "JisHBPO") { + config = useConfig("hbpo_can_sa_service"); + } else { + config = useConfig("pub_can_sa_service"); + } + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +};