diff --git a/.env.development b/.env.development index 3d5a50f..a8d313a 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = 供应商自助管理系统 ENV = 'development' # 若依管理系统/开发环境 -VUE_APP_BASE_API = '/dev-api' +VUE_APP_BASE_API = 'http://localhost:9993/dev-api/' # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/' diff --git a/package.json b/package.json index 57441c3..c77df60 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,8 @@ "author": "LionLi", "license": "MIT", "scripts": { - "dev": "vue-cli-service serve", - "build:prod": "vue-cli-service build", + "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --mode development", + "build:prod": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build --mode production", "preview": "node build/index.js --preview", "lint": "eslint --ext .js,.vue src" }, diff --git a/src/api/sync/spsSyncStatus.js b/src/api/sync/spsSyncStatus.js index d3425b4..091be2f 100644 --- a/src/api/sync/spsSyncStatus.js +++ b/src/api/sync/spsSyncStatus.js @@ -43,3 +43,12 @@ export function updateConfig(query) { }); } +export function infoByStatus(query) { + return axios({ + url: "/spssync/basic/udiinfo/infoByStatus", + method: "post", + data: query, + responseType: 'blob' + }); +} + diff --git a/src/utils/request.js b/src/utils/request.js index b02dfd7..86a9ce2 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -86,7 +86,7 @@ service.interceptors.response.use(res => { if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') { return res.data } - if (code === 401) { + if (code === 2) { if (!isRelogin.show) { isRelogin.show = true; MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue index 2f8f704..7fc3c66 100644 --- a/src/views/basic/business/stockOrder.vue +++ b/src/views/basic/business/stockOrder.vue @@ -152,7 +152,7 @@ - + - - - + + + + - + @@ -32,135 +29,74 @@ 查询 - 同步单据 + 同步单据 - + + v-if="!configParms.typeBus&& !configParms.typeScan&& !configParms.typeThird"> 同步单据类型 - 同步基础信息 + && !configParms.basicThirdBusOrder&& !configParms.sysUser">同步基础信息 同步国家库DI数据 + v-if="configParms.dbDiProducts==2">同步国家库DI数据 - + - - - + + + - + - + - - - - + + + + + + - + - + @@ -168,319 +104,346 @@ diff --git a/vue.config.js b/vue.config.js index f9d3b19..2eee3de 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,15 +1,15 @@ -"use strict"; -const path = require("path"); +'use strict' +const path = require('path') function resolve(dir) { - return path.join(__dirname, dir); + return path.join(__dirname, dir) } -const CompressionPlugin = require("compression-webpack-plugin"); +const CompressionPlugin = require('compression-webpack-plugin') -const name = process.env.VUE_APP_TITLE || "UDI自助平台"; // 网页标题 +const name = process.env.VUE_APP_TITLE || 'UDI自助平台' // 网页标题 -const port = process.env.port || process.env.npm_config_port || 80; // 端口 +const port = process.env.port || process.env.npm_config_port || 80 // 端口 // vue.config.js 配置说明 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions @@ -20,112 +20,117 @@ module.exports = { // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 publicPath: process.env.VUE_APP_CONTEXT_PATH, // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） - outputDir: "UDI_SPMS_CLIENT", + outputDir: 'UDI_SPMS_CLIENT', // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） - assetsDir: "static", + assetsDir: 'static', // 是否开启eslint保存检测，有效值：ture | false | 'error' - lintOnSave: process.env.NODE_ENV === "development", + lintOnSave: process.env.NODE_ENV === 'development', // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。 productionSourceMap: false, // webpack-dev-server 相关配置 devServer: { - host: "0.0.0.0", + host: '0.0.0.0', port: port, open: false, proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://192.168.0.66:9160/UDI_SPMS_SERVER/`, + target: process.env.VUE_APP_BASE_API, changeOrigin: true, pathRewrite: { - ["^" + process.env.VUE_APP_BASE_API]: "", - }, - }, + ['^' + process.env.VUE_APP_BASE_API]: '' + } + } }, - disableHostCheck: true, + disableHostCheck: true }, css: { loaderOptions: { sass: { - sassOptions: { outputStyle: "expanded" }, - }, - }, + sassOptions: { outputStyle: "expanded" } + } + } }, configureWebpack: { name: name, resolve: { alias: { - "@": resolve("src"), - }, + '@': resolve('src') + } }, plugins: [ // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件 new CompressionPlugin({ - cache: false, // 不启用文件缓存 - test: /\.(js|css|html)?$/i, // 压缩文件格式 - filename: "[path].gz[query]", // 压缩后的文件名 - algorithm: "gzip", // 使用gzip压缩 - minRatio: 0.8, // 压缩率小于1才会压缩 - }), + cache: false, // 不启用文件缓存 + test: /\.(js|css|html)?$/i, // 压缩文件格式 + filename: '[path].gz[query]', // 压缩后的文件名 + algorithm: 'gzip', // 使用gzip压缩 + minRatio: 0.8 // 压缩率小于1才会压缩 + }) ], }, chainWebpack(config) { - config.plugins.delete("preload"); // TODO: need test - config.plugins.delete("prefetch"); // TODO: need test + config.plugins.delete('preload') // TODO: need test + config.plugins.delete('prefetch') // TODO: need test // set svg-sprite-loader - config.module.rule("svg").exclude.add(resolve("src/assets/icons")).end(); config.module - .rule("icons") + .rule('svg') + .exclude.add(resolve('src/assets/icons')) + .end() + config.module + .rule('icons') .test(/\.svg$/) - .include.add(resolve("src/assets/icons")) + .include.add(resolve('src/assets/icons')) .end() - .use("svg-sprite-loader") - .loader("svg-sprite-loader") + .use('svg-sprite-loader') + .loader('svg-sprite-loader') .options({ - symbolId: "icon-[name]", + symbolId: 'icon-[name]' }) - .end(); + .end() - config.when(process.env.NODE_ENV !== "development", (config) => { - config - .plugin("ScriptExtHtmlWebpackPlugin") - .after("html") - .use("script-ext-html-webpack-plugin", [ - { + config + .when(process.env.NODE_ENV !== 'development', + config => { + config + .plugin('ScriptExtHtmlWebpackPlugin') + .after('html') + .use('script-ext-html-webpack-plugin', [{ // `runtime` must same as runtimeChunk name. default is `runtime` - inline: /runtime\..*\.js$/, - }, - ]) - .end(); - config.optimization.splitChunks({ - chunks: "all", - cacheGroups: { - libs: { - name: "chunk-libs", - test: /[\\/]node_modules[\\/]/, - priority: 10, - chunks: "initial", // only package third parties that are initially dependent - }, - elementUI: { - name: "chunk-elementUI", // split elementUI into a single package - priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app - test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm - }, - commons: { - name: "chunk-commons", - test: resolve("src/components"), // can customize your rules - minChunks: 3, // minimum common number - priority: 5, - reuseExistingChunk: true, - }, - }, - }); - config.optimization.runtimeChunk("single"), - { - from: path.resolve(__dirname, "./public/robots.txt"), //防爬虫文件 - to: "./", //到根目录下 - }; - }); - }, -}; + inline: /runtime\..*\.js$/ + }]) + .end() + config + .optimization.splitChunks({ + chunks: 'all', + cacheGroups: { + libs: { + name: 'chunk-libs', + test: /[\\/]node_modules[\\/]/, + priority: 10, + chunks: 'initial' // only package third parties that are initially dependent + }, + elementUI: { + name: 'chunk-elementUI', // split elementUI into a single package + priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app + test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm + }, + commons: { + name: 'chunk-commons', + test: resolve('src/components'), // can customize your rules + minChunks: 3, // minimum common number + priority: 5, + reuseExistingChunk: true + } + } + }) + config.optimization.runtimeChunk('single'), + { + from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件 + to: './' //到根目录下 + } + } + ) + } +}