Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

廖井涛

4 小时以前 e73c7b07535af2593083d21c9c5ba7761a5c40df

 north-glass-erp/northglass-erp/package-lock.json

@@ -10,7 +10,6 @@
      "dependencies": {
        "@element-plus/icons-vue": "^2.1.0",
        "@vue-macros/reactivity-transform": "^0.3.23",
        "@vxe-ui/plugin-export-xlsx": "^4.3.0",
        "axios": "^1.5.1",
        "decimal.js": "^10.4.3",
        "dxf-parser": "^1.1.2",
@@ -34,8 +33,9 @@
        "vue-router": "^4.2.4",
        "vue3-grid-layout": "^1.0.0",
        "vue3-print-nb": "^0.1.4",
        "vxe-pc-ui": "^4.9.41",
        "vxe-table": "^4.16.20",
        "vxe-pc-ui": "^4.0.78",
        "vxe-table": "^4.7.57",
        "vxe-table-plugin-export-xlsx": "^4.0.6",
        "xe-utils": "^3.5.14",
        "xlsx": "^0.18.5"
      },
@@ -1596,15 +1596,6 @@
      },
      "peerDependencies": {
        "vue": "^3.2.0"
      }
    },
    "node_modules/@vxe-ui/plugin-export-xlsx": {
      "version": "4.3.0",
      "resolved": "https://registry.npmmirror.com/@vxe-ui/plugin-export-xlsx/-/plugin-export-xlsx-4.3.0.tgz",
      "integrity": "sha512-pSv1zsWkV4GFdSxQXN1Zyv9IeXCaz637ehDvUwLWkGHdOkAsqimEFUMDpApKeI+OdUa4nP4keoAD9yyyYpQPrw==",
      "license": "MIT",
      "peerDependencies": {
        "vxe-table": "^4.12"
      }
    },
    "node_modules/acorn": {
@@ -8866,21 +8857,39 @@
      }
    },
    "node_modules/vxe-pc-ui": {
      "version": "4.9.41",
      "resolved": "https://registry.npmmirror.com/vxe-pc-ui/-/vxe-pc-ui-4.9.41.tgz",
      "integrity": "sha512-CsaRv7d2NGRkVUOWhF+vHdcS7j1NgGZ5A16564645zS4lIUxkn4pADEieyDsA8GTlNwCZmyYmGtjMfOsUKlcNg==",
      "version": "4.0.96",
      "resolved": "https://registry.npmmirror.com/vxe-pc-ui/-/vxe-pc-ui-4.0.96.tgz",
      "integrity": "sha512-Di8D0NYTeAdlOCcnJ/j2Hm2YZNepg6Loi54iCnGPYssIMbJWVW140ECF5oBzIBcSjktcxhmlwDhCs2+/562IWA==",
      "license": "MIT",
      "dependencies": {
        "@vxe-ui/core": "^4.2.12"
        "@vxe-ui/core": "^4.0.3"
      }
    },
    "node_modules/vxe-table": {
      "version": "4.16.20",
      "resolved": "https://registry.npmmirror.com/vxe-table/-/vxe-table-4.16.20.tgz",
      "integrity": "sha512-AUEOqgr/4fFZ9SBg2akepkadI3c8Ct7/zG/gkurUvCIbixsoZr78c4NStmdhLxlFjUeQkiKb8ukesZsjLloAhA==",
      "version": "4.7.97",
      "resolved": "https://registry.npmmirror.com/vxe-table/-/vxe-table-4.7.97.tgz",
      "integrity": "sha512-sh5KOW9V1A7pTWlesyeQAKh0JmCYIraCl+5tr3Xpo+xZG1kT9OOiMmo3h6eJsgwCTEl1iLAhew9Mgpk6pZbi+A==",
      "license": "MIT",
      "dependencies": {
        "vxe-pc-ui": "^4.8.0"
        "vxe-pc-ui": "^4.2.32"
      }
    },
    "node_modules/vxe-table-plugin-export-xlsx": {
      "version": "4.0.6",
      "resolved": "https://registry.npmmirror.com/vxe-table-plugin-export-xlsx/-/vxe-table-plugin-export-xlsx-4.0.6.tgz",
      "integrity": "sha512-SNZsEgFQbO5nPj5SuPw2l0pPj6pIZKQkdtsr1yTMAjLAbXqhROinSMoZcN9RWJwarsvhiFg9tfcFahOoTLWy3A==",
      "license": "MIT",
      "peerDependencies": {
        "vxe-table": "^4.5.0"
      }
    },
    "node_modules/vxe-table/node_modules/vxe-pc-ui": {
      "version": "4.9.43",
      "resolved": "https://registry.npmmirror.com/vxe-pc-ui/-/vxe-pc-ui-4.9.43.tgz",
      "integrity": "sha512-cSaMU+A6NAzqzIxb81z5K3DfDCLKW7TdUubrQxjE/m81M6wRU/RPZE92hhmXLY8St3gg6yBVvAjY6qJzLsfRKQ==",
      "license": "MIT",
      "dependencies": {
        "@vxe-ui/core": "^4.2.12"
      }
    },
    "node_modules/webpack-sources": {
@@ -10237,12 +10246,6 @@
        "xe-utils": "^3.7.9"
      }
    },
    "@vxe-ui/plugin-export-xlsx": {
      "version": "4.3.0",
      "resolved": "https://registry.npmmirror.com/@vxe-ui/plugin-export-xlsx/-/plugin-export-xlsx-4.3.0.tgz",
      "integrity": "sha512-pSv1zsWkV4GFdSxQXN1Zyv9IeXCaz637ehDvUwLWkGHdOkAsqimEFUMDpApKeI+OdUa4nP4keoAD9yyyYpQPrw==",
      "requires": {}
    },
    "acorn": {
      "version": "8.15.0",
      "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.15.0.tgz",
@@ -11327,7 +11330,6 @@
        "@types/sortablejs": "^1.15.7",
        "@vitejs/plugin-vue": "^4.3.4",
        "@vue-macros/reactivity-transform": "^0.3.23",
        "@vxe-ui/plugin-export-xlsx": "^4.3.0",
        "axios": "^1.5.1",
        "decimal.js": "^10.4.3",
        "dom-zindex": "^1.0.4",
@@ -11353,8 +11355,9 @@
        "vue-router": "^4.2.4",
        "vue3-grid-layout": "^1.0.0",
        "vue3-print-nb": "^0.1.4",
        "vxe-pc-ui": "^4.9.41",
        "vxe-table": "^4.16.20",
        "vxe-pc-ui": "^4.0.78",
        "vxe-table": "^4.7.57",
        "vxe-table-plugin-export-xlsx": "^4.0.6",
        "xe-utils": "^3.5.14",
        "xlsx": "^0.18.5"
      },
@@ -12524,12 +12527,6 @@
            "dom-zindex": "^1.0.6",
            "xe-utils": "^3.7.9"
          }
        },
        "@vxe-ui/plugin-export-xlsx": {
          "version": "4.3.0",
          "resolved": "https://registry.npmmirror.com/@vxe-ui/plugin-export-xlsx/-/plugin-export-xlsx-4.3.0.tgz",
          "integrity": "sha512-pSv1zsWkV4GFdSxQXN1Zyv9IeXCaz637ehDvUwLWkGHdOkAsqimEFUMDpApKeI+OdUa4nP4keoAD9yyyYpQPrw==",
          "requires": {}
        },
        "acorn": {
          "version": "8.15.0",
@@ -19287,20 +19284,36 @@
          }
        },
        "vxe-pc-ui": {
          "version": "4.9.41",
          "resolved": "https://registry.npmmirror.com/vxe-pc-ui/-/vxe-pc-ui-4.9.41.tgz",
          "integrity": "sha512-CsaRv7d2NGRkVUOWhF+vHdcS7j1NgGZ5A16564645zS4lIUxkn4pADEieyDsA8GTlNwCZmyYmGtjMfOsUKlcNg==",
          "version": "4.0.96",
          "resolved": "https://registry.npmmirror.com/vxe-pc-ui/-/vxe-pc-ui-4.0.96.tgz",
          "integrity": "sha512-Di8D0NYTeAdlOCcnJ/j2Hm2YZNepg6Loi54iCnGPYssIMbJWVW140ECF5oBzIBcSjktcxhmlwDhCs2+/562IWA==",
          "requires": {
            "@vxe-ui/core": "^4.2.12"
            "@vxe-ui/core": "^4.0.3"
          }
        },
        "vxe-table": {
          "version": "4.16.20",
          "resolved": "https://registry.npmmirror.com/vxe-table/-/vxe-table-4.16.20.tgz",
          "integrity": "sha512-AUEOqgr/4fFZ9SBg2akepkadI3c8Ct7/zG/gkurUvCIbixsoZr78c4NStmdhLxlFjUeQkiKb8ukesZsjLloAhA==",
          "version": "4.7.97",
          "resolved": "https://registry.npmmirror.com/vxe-table/-/vxe-table-4.7.97.tgz",
          "integrity": "sha512-sh5KOW9V1A7pTWlesyeQAKh0JmCYIraCl+5tr3Xpo+xZG1kT9OOiMmo3h6eJsgwCTEl1iLAhew9Mgpk6pZbi+A==",
          "requires": {
            "vxe-pc-ui": "^4.8.0"
            "vxe-pc-ui": "^4.2.32"
          },
          "dependencies": {
            "vxe-pc-ui": {
              "version": "4.9.43",
              "resolved": "https://registry.npmmirror.com/vxe-pc-ui/-/vxe-pc-ui-4.9.43.tgz",
              "integrity": "sha512-cSaMU+A6NAzqzIxb81z5K3DfDCLKW7TdUubrQxjE/m81M6wRU/RPZE92hhmXLY8St3gg6yBVvAjY6qJzLsfRKQ==",
              "requires": {
                "@vxe-ui/core": "^4.2.12"
              }
            }
          }
        },
        "vxe-table-plugin-export-xlsx": {
          "version": "4.0.6",
          "resolved": "https://registry.npmmirror.com/vxe-table-plugin-export-xlsx/-/vxe-table-plugin-export-xlsx-4.0.6.tgz",
          "integrity": "sha512-SNZsEgFQbO5nPj5SuPw2l0pPj6pIZKQkdtsr1yTMAjLAbXqhROinSMoZcN9RWJwarsvhiFg9tfcFahOoTLWy3A==",
          "requires": {}
        },
        "webpack-sources": {
          "version": "3.2.3",
@@ -25120,21 +25133,37 @@
      }
    },
    "vxe-pc-ui": {
      "version": "4.9.41",
      "resolved": "https://registry.npmmirror.com/vxe-pc-ui/-/vxe-pc-ui-4.9.41.tgz",
      "integrity": "sha512-CsaRv7d2NGRkVUOWhF+vHdcS7j1NgGZ5A16564645zS4lIUxkn4pADEieyDsA8GTlNwCZmyYmGtjMfOsUKlcNg==",
      "version": "4.0.96",
      "resolved": "https://registry.npmmirror.com/vxe-pc-ui/-/vxe-pc-ui-4.0.96.tgz",
      "integrity": "sha512-Di8D0NYTeAdlOCcnJ/j2Hm2YZNepg6Loi54iCnGPYssIMbJWVW140ECF5oBzIBcSjktcxhmlwDhCs2+/562IWA==",
      "requires": {
        "@vxe-ui/core": "^4.2.12"
        "@vxe-ui/core": "^4.0.3"
      }
    },
    "vxe-table": {
      "version": "4.16.20",
      "resolved": "https://registry.npmmirror.com/vxe-table/-/vxe-table-4.16.20.tgz",
      "integrity": "sha512-AUEOqgr/4fFZ9SBg2akepkadI3c8Ct7/zG/gkurUvCIbixsoZr78c4NStmdhLxlFjUeQkiKb8ukesZsjLloAhA==",
      "version": "4.7.97",
      "resolved": "https://registry.npmmirror.com/vxe-table/-/vxe-table-4.7.97.tgz",
      "integrity": "sha512-sh5KOW9V1A7pTWlesyeQAKh0JmCYIraCl+5tr3Xpo+xZG1kT9OOiMmo3h6eJsgwCTEl1iLAhew9Mgpk6pZbi+A==",
      "requires": {
        "vxe-pc-ui": "^4.8.0"
        "vxe-pc-ui": "^4.2.32"
      },
      "dependencies": {
        "vxe-pc-ui": {
          "version": "4.9.43",
          "resolved": "https://registry.npmmirror.com/vxe-pc-ui/-/vxe-pc-ui-4.9.43.tgz",
          "integrity": "sha512-cSaMU+A6NAzqzIxb81z5K3DfDCLKW7TdUubrQxjE/m81M6wRU/RPZE92hhmXLY8St3gg6yBVvAjY6qJzLsfRKQ==",
          "requires": {
            "@vxe-ui/core": "^4.2.12"
          }
        }
      }
    },
    "vxe-table-plugin-export-xlsx": {
      "version": "4.0.6",
      "resolved": "https://registry.npmmirror.com/vxe-table-plugin-export-xlsx/-/vxe-table-plugin-export-xlsx-4.0.6.tgz",
      "integrity": "sha512-SNZsEgFQbO5nPj5SuPw2l0pPj6pIZKQkdtsr1yTMAjLAbXqhROinSMoZcN9RWJwarsvhiFg9tfcFahOoTLWy3A==",
      "requires": {}
    },
    "webpack-sources": {
      "version": "3.2.3",
      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",