Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

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*"
   },

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

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";

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/unable.js → 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";

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;
+}

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);
+        notify?.close();
-      });
+        notify = ElNotification({
-      ElNotification({
+          position: "bottom-right",
-        title: "Prompt",
+          title: "待同步库存数量",
-        message: messageCount.value,
+          message: data,
           duration: 0,
         });
       });
+    });
     onUnmounted(() => PubSub.unsubscribe(event));
-    return { config, onCommand, messageCount };
+    return { config, onCommand };
   },
 };