diff --git a/package.json b/package.json index 203c7865..57441c3d 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,6 @@ "clipboard": "2.0.8", "core-js": "3.19.1", "echarts": "4.9.0", - "element-china-area-data": "^5.0.2", "element-ui": "2.15.8", "file-saver": "2.0.5", "fuse.js": "6.4.3", diff --git a/src/api/inout/order.js b/src/api/inout/order.js index 2d74ff33..59da4dc4 100644 --- a/src/api/inout/order.js +++ b/src/api/inout/order.js @@ -421,8 +421,13 @@ export function getOrderList(params) { params: params }); } - - +export function getOrderFilter(params) { + return axios({ + url: "udiwms/inout/preInorder/filter", + method: "get", + params: params + }); +} export function updateStatus(query) { return axios({ url: "/spms/inout/order/web/updateStatus", diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index 1e187225..24ea270d 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -1,30 +1,40 @@ diff --git a/src/views/remind/invRemindSetModify.vue b/src/views/remind/invRemindSetModify.vue index 53f9f938..1469d289 100644 --- a/src/views/remind/invRemindSetModify.vue +++ b/src/views/remind/invRemindSetModify.vue @@ -93,7 +93,7 @@ - 1 + 1 diff --git a/vue.config.js b/vue.config.js index eef5677e..2a85f322 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,16 +20,16 @@ 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_WMS_NEW", + outputDir: 'UDI_WMS_NEW', // 用于放置生成的静态资源 (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: { @@ -38,94 +38,99 @@ module.exports = { target: `http://192.168.0.166:9991/`, 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", [ - { - // `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: "./", //到根目录下 - }; - }); - }, -}; + 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: './' //到根目录下 + } + } + ) + } +}