From 406aadb1077e1661b35576df62e9531bf0985fb9 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Thu, 24 Aug 2023 10:46:12 +0800 Subject: [PATCH 1/3] up --- .../SettleAccount.HttpApi.Host/appsettings.json | 2 +- .../host/SettleAccount.HttpApi.Host/start.cmd | 2 +- .../wwwroot/views/vmi/balance.js | 17 +++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) 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 28279f84..b3fef962 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://dev.ccwin-in.com:10582", + "Authority": "http://dev.ccwin-in.com:16082", "ClientId": "basic-web", "ClientSecret": "1q2w3e*" }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/start.cmd b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/start.cmd index 4171afe4..7ad8f0f8 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/start.cmd +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/start.cmd @@ -8,4 +8,4 @@ if %errorlevel% == 0 ( %1 start mshta vbscript:createobject("wscript.shell").run("""%~0"" ::",0)(window.close)&&exit -start /b SettleAccount.HttpApi.Host.exe --urls http://*:10582 +start /b SettleAccount.HttpApi.Host.exe --urls http://*:16082 diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/vmi/balance.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/vmi/balance.js index a78c2278..f078dddf 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/vmi/balance.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/vmi/balance.js @@ -10,7 +10,6 @@ export default { setup() { const config = ref(null); const route = useRoute(); - const messageCount = ref(-1); const onCommand = async (item, rows) => { console.log(item.path, item, rows); }; @@ -19,16 +18,18 @@ export default { const model = "vmi/balance"; const useConfig = (await import(`../../models/${model}.js`)).default; config.value = useConfig(route.meta?.businessType, route.meta); + let notify = null; PubSub.subscribe(event, async (_, data) => { - messageCount.value = parseInt(data); - }); - ElNotification({ - title: "Prompt", - message: messageCount.value, - duration: 0, + notify?.close(); + notify = ElNotification({ + position: "bottom-right", + title: "待同步库存数量", + message: data, + duration: 0, + }); }); }); onUnmounted(() => PubSub.unsubscribe(event)); - return { config, onCommand, messageCount }; + return { config, onCommand }; }, }; From 1c701a7982efe92b6bd84b4c8b1486611d4bf1ee Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Thu, 24 Aug 2023 11:37:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8C=89=E7=85=A7=E8=B4=BE=E6=80=BB?= =?UTF-8?q?=E5=BB=BA=E8=AE=AE=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E4=B8=BA=E6=9A=97=E8=89=B2=E6=A8=A1=E5=BC=8F=EF=BC=8C=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E7=89=88=E6=9D=83=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/styles/site.css | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) 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 cd348c82..9f4fb1bc 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 @@ -133,3 +133,41 @@ a.logo { box-sizing: border-box; margin: 0 auto; } + +/*RongGuo Jia*/ + +.el-main { + height: calc(100% - 40px); + overflow: auto; +} +.el-footer { + display: none; +} +.el-aside *, +.el-header { + background-color: #141414; + color: #e5eaf3; +} +.el-aside *:hover, +.el-header *:hover { + background-color: #292218; +} + +.el-aside .el-menu-item.is-active * { + color: #409eff; +} + +.el-aside .el-scrollbar__thumb { + background-color: #e5eaf3 !important; + opacity: 0.5 !important; +} +.el-aside el-scrollbar__thumb:hover { + background-color: #e5eaf3 !important; +} + +.el-header { + border-bottom-color: #4c4d4f; +} +.el-header .el-icon { + color: #e5eaf3 !important; +} From 1806a511a54711180f8fc14f2e48afb4d27986f8 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Thu, 24 Aug 2023 11:50:53 +0800 Subject: [PATCH 3/3] up --- .../SettleAccount.HttpApi.Host/wwwroot/models/settle/detail.js | 2 +- .../wwwroot/models/settle/{unable.js => unable-bk.js} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/{unable.js => unable-bk.js} (96%) 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 index 5f926fe2..b57c8145 100644 --- 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 @@ -72,7 +72,7 @@ export default function (businessType, type) { if (type === "unable") { if (businessType === "JisBBAC") { service = "bbac_not_sa_service"; - } else if (businessType === "JisHBPO") { + } else if (businessType === "JisHBPO" || businessType === "MaiDanJianHBPO") { service = "hbpo_not_sa_service"; } else { service = "pub_not_sa_service"; 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-bk.js similarity index 96% rename from code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/unable.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/unable-bk.js index d27d1a09..ee817361 100644 --- 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-bk.js @@ -28,7 +28,7 @@ export default function (businessType) { let service; if (businessType === "JisBBAC") { service = "bbac_can_sa_service"; - } else if (businessType === "JisHBPO") { + } else if (businessType === "JisHBPO" || businessType === "MaiDanJianHBPO") { service = "hbpo_can_sa_service"; } else { service = "pub_can_sa_service";