diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json index 7c9c32ad..28279f84 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json @@ -70,7 +70,7 @@ "AuthServer": { - "Authority": "http://localhost:44378", + "Authority": "http://dev.ccwin-in.com:10582", "ClientId": "basic-web", "ClientSecret": "1q2w3e*" }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/inventory-detail.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/inventory-detail.js index 9ef56e43..7dd7cf09 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/inventory-detail.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/inventory-detail.js @@ -71,43 +71,7 @@ export default function (businessType) { }, }, }, - default: [ - { - logic: "and", - column: "version", - action: "equal", - value: null, - readOnly: true, - }, - { - logic: "and", - column: "billNum", - action: "equal", - value: null, - readOnly: true, - }, - { - logic: "and", - column: "settleBillNum", - action: "equal", - value: null, - readOnly: true, - }, - { - logic: "and", - column: "invGroupNum", - action: "equal", - value: null, - readOnly: true, - }, - { - logic: "and", - column: "state", - action: "equal", - value: null, - readOnly: true, - }, - ], + default: [], }, skipCount: { hidden: true, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/inventory.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/inventory.js index d5bc6874..c5724164 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/inventory.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/inventory.js @@ -20,7 +20,6 @@ const schema = { invGroupNum: { title: "发票分组号", type: "string", - link: true, }, site: { title: "地点", @@ -95,13 +94,6 @@ export default function (businessType) { value: null, readOnly: true, }, - { - logic: "and", - column: "settleBillNum", - action: "equal", - value: null, - readOnly: true, - }, { logic: "and", column: "invGroupNum", 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 e86414c7..e73239a3 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 @@ -224,10 +224,10 @@ export default [ { ...createRoute("settlement", "title=结算开票"), children: [ - createUsableSettleList("hbpo_jit_pub_can_sa_service", "ZhiGongJianBBAC", "hbpo", "直供件-HBPO 可结算单"), - createUnableSettleList("hbpo_jit_pub_not_sa_service", "ZhiGongJianBBAC", "hbpo", "直供件-HBPO 不可结算明细"), - createCommerceCheckList("hbpo_jit_pub_ba_service", "ZhiGongJianBBAC", "hbpo", "直供件-HBPO 商务审批"), - createVmiOutCheckList("hbpo_jit_pub_pd_service", "ZhiGongJianBBAC", "hbpo", "直供件-HBPO 寄售库库存扣减审批"), + createUsableSettleList("hbpo_jit_pub_can_sa_service", "ZhiGongJianHBPO", "hbpo", "直供件-HBPO 可结算单"), + createUnableSettleList("hbpo_jit_pub_not_sa_service", "ZhiGongJianHBPO", "hbpo", "直供件-HBPO 不可结算明细"), + createCommerceCheckList("hbpo_jit_pub_ba_service", "ZhiGongJianHBPO", "hbpo", "直供件-HBPO 商务审批"), + createVmiOutCheckList("hbpo_jit_pub_pd_service", "ZhiGongJianHBPO", "hbpo", "直供件-HBPO 寄售库库存扣减审批"), ], }, ],