diff --git a/.gitignore b/.gitignore index 07179b0..5f9c54f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,8 @@ selenium-debug.log *.sln *.local + +vue.config.js package-lock.json yarn.lock /UDI_SPMS_CLIENT/ diff --git a/src/views/basic/product/bindHospProduct.vue b/src/views/basic/product/bindHospProduct.vue index d010fca..667afa4 100644 --- a/src/views/basic/product/bindHospProduct.vue +++ b/src/views/basic/product/bindHospProduct.vue @@ -159,7 +159,8 @@ export default { page: 1, limit: 20, addType: 1, - diType: 1 + diType: 1, + bindType: 1 }; this.getList(); }, diff --git a/src/views/inventory/InvSupPreInProducts.vue b/src/views/inventory/InvSupPreInProducts.vue index 1c33e53..a0e5fe9 100644 --- a/src/views/inventory/InvSupPreInProducts.vue +++ b/src/views/inventory/InvSupPreInProducts.vue @@ -88,6 +88,7 @@ :loading="corpLoading" @change="corpChange" style="width: 90%" + @clear="clear" > import {getResultDetailList, getResultOrderList} from '@/api/inout/orderDetailResult' +import {isBlank} from "@/utils/strUtil"; export default { name: "supInoutSearchOrder", @@ -190,7 +191,7 @@ export default { limit: 10, startAduditTime: null, endAduditTime: null, - actionType: "norDetail", + actionType: this.actionType, }; this.actDateRange = []; this.getList(); @@ -216,6 +217,9 @@ export default { getList() { this.loading = true; this.filterQuery.actionType = this.actionType; + if (isBlank(this.filterQuery.actionType)) { + this.filterQuery.actionType = "norDetail"; + } getResultOrderList(this.filterQuery) .then((response) => { if (response.code === 20000) { diff --git a/src/views/supplier/products/supDiProductsCheck.vue b/src/views/supplier/products/supDiProductsCheck.vue index 5d337ab..42011ae 100644 --- a/src/views/supplier/products/supDiProductsCheck.vue +++ b/src/views/supplier/products/supDiProductsCheck.vue @@ -4,7 +4,7 @@ - + diff --git a/src/views/sync/SysUdimsData.vue b/src/views/sync/SysUdimsData.vue index 7d461d9..c46c6dd 100644 --- a/src/views/sync/SysUdimsData.vue +++ b/src/views/sync/SysUdimsData.vue @@ -28,7 +28,7 @@ - 查询 + 查询 同步单据 @@ -191,12 +191,16 @@ export default { id: null, status: null, page: 1, - limit: 20, + limit: 10, }; this.syncTime = null; this.getList(); }, + search(){ + this.filterQuery.page=1; + this.getList(); + }, getList() { this.loading = true; this.filterQuery.syncTime = this.syncTime; diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue index c4d0da4..6df606c 100644 --- a/src/views/system/dept/invWarehouse.vue +++ b/src/views/system/dept/invWarehouse.vue @@ -1,4 +1,5 @@ @@ -266,17 +300,22 @@
取消 - 提交 - + 提交 +
- - + + - 查询 - 重置 + 查询 + 重置 - - - - - - + + + 取消 - 提交 + 提交 @@ -344,9 +376,10 @@ :close-on-press-escape="false" v-if="relUserVisible" > - @@ -359,21 +392,21 @@ :close-on-press-escape="false" v-if="relBusTypeVisible" > - - {{ currentRow.name }}-用户列表 - - @@ -383,29 +416,28 @@ - - diff --git a/vue.config.js b/vue.config.js index 99df03e..7d5fee7 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,117 +20,112 @@ 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.166:9993/`, + 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('svg') - .exclude.add(resolve('src/assets/icons')) - .end() - config.module - .rule('icons') + .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: "./", //到根目录下 + }; + }); + }, +};