xlyErp / xlyUmi

Commit 8b8c89b60f77aa89768a9dbb18f175de7b64629e

Authored by Min
1 parent da399e85

阻止单据等接收消息

Inline Side-by-side
Showing 6 changed files with 94 additions and 3 deletions
.idea/codeStyles/Project.xml 0 → 100644
  View file @8b8c89b
  1 +<component name="ProjectCodeStyleConfiguration">
  2 + <code_scheme name="Project" version="173">
  3 + <option name="LINE_SEPARATOR" value="&#10;" />
  4 + <HTMLCodeStyleSettings>
  5 + <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
  6 + </HTMLCodeStyleSettings>
  7 + <JSCodeStyleSettings version="0">
  8 + <option name="FORCE_SEMICOLON_STYLE" value="true" />
  9 + <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
  10 + <option name="FORCE_QUOTE_STYlE" value="true" />
  11 + <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
  12 + <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
  13 + <option name="SPACES_WITHIN_IMPORTS" value="true" />
  14 + </JSCodeStyleSettings>
  15 + <TypeScriptCodeStyleSettings version="0">
  16 + <option name="FORCE_SEMICOLON_STYLE" value="true" />
  17 + <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
  18 + <option name="FORCE_QUOTE_STYlE" value="true" />
  19 + <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
  20 + <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
  21 + <option name="SPACES_WITHIN_IMPORTS" value="true" />
  22 + </TypeScriptCodeStyleSettings>
  23 + <VueCodeStyleSettings>
  24 + <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
  25 + <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
  26 + </VueCodeStyleSettings>
  27 + <codeStyleSettings language="HTML">
  28 + <option name="SOFT_MARGINS" value="150" />
  29 + <indentOptions>
  30 + <option name="INDENT_SIZE" value="2" />
  31 + <option name="CONTINUATION_INDENT_SIZE" value="2" />
  32 + <option name="TAB_SIZE" value="2" />
  33 + </indentOptions>
  34 + </codeStyleSettings>
  35 + <codeStyleSettings language="JavaScript">
  36 + <option name="SOFT_MARGINS" value="150" />
  37 + <indentOptions>
  38 + <option name="INDENT_SIZE" value="2" />
  39 + <option name="CONTINUATION_INDENT_SIZE" value="2" />
  40 + <option name="TAB_SIZE" value="2" />
  41 + </indentOptions>
  42 + </codeStyleSettings>
  43 + <codeStyleSettings language="TypeScript">
  44 + <option name="SOFT_MARGINS" value="150" />
  45 + <indentOptions>
  46 + <option name="INDENT_SIZE" value="2" />
  47 + <option name="CONTINUATION_INDENT_SIZE" value="2" />
  48 + <option name="TAB_SIZE" value="2" />
  49 + </indentOptions>
  50 + </codeStyleSettings>
  51 + <codeStyleSettings language="Vue">
  52 + <option name="SOFT_MARGINS" value="150" />
  53 + <indentOptions>
  54 + <option name="CONTINUATION_INDENT_SIZE" value="2" />
  55 + </indentOptions>
  56 + </codeStyleSettings>
  57 + </code_scheme>
  58 +</component>
0 59 \ No newline at end of file
... ...
.idea/codeStyles/codeStyleConfig.xml 0 → 100644
  View file @8b8c89b
  1 +<component name="ProjectCodeStyleConfiguration">
  2 + <state>
  3 + <option name="USE_PER_PROJECT_SETTINGS" value="true" />
  4 + </state>
  5 +</component>
0 6 \ No newline at end of file
... ...
.idea/git_toolbox_blame.xml 0 → 100644
  View file @8b8c89b
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="GitToolBoxBlameSettings">
  4 + <option name="version" value="2" />
  5 + </component>
  6 +</project>
0 7 \ No newline at end of file
... ...
.idea/prettier.xml 0 → 100644
  View file @8b8c89b
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="PrettierConfiguration">
  4 + <option name="myConfigurationMode" value="AUTOMATIC" />
  5 + </component>
  6 +</project>
0 7 \ No newline at end of file
... ...
src/models/app.js
  View file @8b8c89b
... ... @@ -649,6 +649,16 @@ export default {
649 649 const msgObj = utils.isJSON(msgStr) ? JSON.parse(msgStr) : {};
650 650 const msgPopupData = utils.isNotEmptyArr(msgObj.popup) ? msgObj.popup : [];
651 651 const msgHeadData = utils.isNotEmptyObject(msgObj.data) ? msgObj.data : [];
  652 + // 检查是否在 CommonBill 相关页面
  653 + const isCommonBillPage = location.pathname.indexOf("/indexPage/commonBill") > -1 ||
  654 + location.pathname.indexOf("/indexPage/commonCheckBill") > -1 ||
  655 + location.pathname.indexOf("/indexPage/commonBillDeliver") > -1 ||
  656 + location.pathname.indexOf("/indexPage/commonNewBill") > -1 ||
  657 + location.pathname.indexOf("/indexPage/commonSubBill") > -1 ||
  658 + location.pathname.indexOf("/indexPage/commonNewTabBill") > -1 ||
  659 + location.pathname.indexOf("/indexPage/commonCostomTabBill") > -1 ||
  660 + location.pathname.indexOf("/indexPage/commonNewListBill") > -1 ||
  661 + location.pathname.indexOf("/indexPage/commonGroupBill") > -1;
652 662 if (utils.isNotEmptyObject(msgHeadData)) {
653 663 if (utils.isNotEmptyArr(msgPopupData)) {
654 664 if (location.pathname.indexOf("/indexMobile") < 0) {
... ... @@ -675,9 +685,15 @@ export default {
675 685 }
676 686 commonFunc.sendWebSocketMessage(ws, "noAction", "usertodo", null, userinfo.sId, userinfo.sUserName, userinfo.sId, userinfo.sId);
677 687 }
678   - dispatch({ type: "app/saveMsgCount", payload: { msgCount: msgStr } });
  688 + // 不在 CommonBill 相关页面时才更新消息计数，避免组件重新渲染
  689 + if (!isCommonBillPage) {
  690 + dispatch({ type: "app/saveMsgCount", payload: { msgCount: msgStr } });
  691 + }
679 692 } else {
680   - dispatch({ type: "app/saveMsgCount", payload: { msgCount: msgData.msg } });
  693 + // 不在 CommonBill 相关页面时才更新消息计数，避免组件重新渲染
  694 + if (!isCommonBillPage) {
  695 + dispatch({ type: "app/saveMsgCount", payload: { msgCount: msgData.msg } });
  696 + }
681 697 }
682 698 } else if (rtmsg.action === "loginOut") {
683 699 if (location.pathname.indexOf("/indexOee") > -1) {
... ...
src/utils/config.js
  View file @8b8c89b
... ... @@ -9,7 +9,7 @@ const API = process.env.API;
9 9 const bHttps = false;
10 10 export const webSite = {
11 11 faceAddress: isDev ? '//118.178.19.35:8088/xlyFace' : '//' + location.host + '/xlyFace',
12   - ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '///118.178.19.35:8088/xlyEntry/' : '//' + location.host + '/xlyEntry/',
  12 + ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//8.130.144.93:8088/xlyEntry/' : '//' + location.host + '/xlyEntry/',
13 13 // ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//118.178.19.35:8088/xlyEntry/' : '//' + location.host + '/xlyEntry/',
14 14 // ipAddress: localStorage.ipAddress ? localStorage.ipAddress : isDev ? '//8.130.144.93:8088/xlyEntry/' : '//' + location.host + '/xlyEntry/',
15 15 interfaceAddress: localStorage.apiAddress ? localStorage.apiAddress : isDev ? '//118.178.19.35:8088/xlyApi/' : '//' + location.host + '/xlyApi/', // 接口地址
... ...