From 257242567339665a587f8d66883c20df1b7bf01d Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 25 Apr 2023 13:36:51 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E6=8B=A3=E8=B4=A7=EF=BC=8C=E6=97=A0=E4=B8=89=E6=9C=9F=E6=8B=A3?= =?UTF-8?q?=E8=B4=A7=EF=BC=8C=E4=B8=BA=E9=85=8D=E8=B4=A7=E7=AD=89=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inout/order.js | 7 + src/api/inout/orderDetailBiz.js | 9 +- .../basic/busType/bussinessTypeModify.vue | 81 ++- src/views/inout/DialogCreateOrder.vue | 90 ++- src/views/inout/IoWaitAllocateOrder.vue | 677 ++++++++++++++++++ 5 files changed, 805 insertions(+), 59 deletions(-) create mode 100644 src/views/inout/IoWaitAllocateOrder.vue diff --git a/src/api/inout/order.js b/src/api/inout/order.js index 031b8d6..083084b 100644 --- a/src/api/inout/order.js +++ b/src/api/inout/order.js @@ -49,6 +49,13 @@ export function submitBiz(query) { }); } +export function submitAllocateBiz(query) { + return axios({ + url: "/warehouse/inout/waitAllocate/submitOrderWeb", + method: "post", + data: query + }); +} export function saveOrderWeb(query) { return axios({ diff --git a/src/api/inout/orderDetailBiz.js b/src/api/inout/orderDetailBiz.js index fc89016..dcbd347 100644 --- a/src/api/inout/orderDetailBiz.js +++ b/src/api/inout/orderDetailBiz.js @@ -41,7 +41,6 @@ export function insertInvoice(params) { } - export function getCheckDetailList(params) { return axios({ url: "/udiwms/inout/wditCheck/filterList", @@ -50,6 +49,14 @@ export function getCheckDetailList(params) { }); } +export function getWaitAllocateList(params) { + return axios({ + url: "/udiwms/inout/waitAllocate/filterList", + method: "get", + params: params + }); +} + export function updateOrder(params) { return axios({ diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue index 6ca76b0..88fb935 100644 --- a/src/views/basic/busType/bussinessTypeModify.vue +++ b/src/views/basic/busType/bussinessTypeModify.vue @@ -526,11 +526,14 @@ - - - + + + + + @@ -546,11 +549,14 @@ - - - + + + + + @@ -566,11 +572,14 @@ - - - + + + + + @@ -586,11 +595,14 @@ - - - + + + + + @@ -606,11 +618,14 @@ - - - + + + + + @@ -626,11 +641,14 @@ - - - + + + + + @@ -645,11 +663,14 @@ - - - + + + + + @@ -665,11 +686,14 @@ - - - + + + + + @@ -684,11 +708,14 @@ - - - + + + + + diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index cd93277..c9d3ab8 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -18,6 +18,12 @@ >立即提交 + + 未配货提交 + + @@ -232,7 +238,7 @@ + + + From d129c20613f0f6568d3c38d4abf491be759dc35a Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 25 Apr 2023 17:32:34 +0800 Subject: [PATCH 02/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inventory/InvSupPreInProducts.vue | 6 ++++++ src/views/inventory/InvSupPreProducts.vue | 4 ++++ src/views/inventory/InvSupProuducts.vue | 5 ++++- src/views/sync/SysUdimsData.vue | 8 ++++++-- 4 files changed, 20 insertions(+), 3 deletions(-) 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" > - 查询 + 查询 同步单据 @@ -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; From 43e316414d31d697c7eae4c5cbe7896320d6019c Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 26 Apr 2023 09:24:17 +0800 Subject: [PATCH 03/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=89=A9=E8=B5=84?= =?UTF-8?q?=E5=88=86=E7=B1=BB=20=E7=BB=91=E5=AE=9A=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=E6=95=B0=E6=8D=AE=E4=B8=8E=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8D=E7=AC=A6=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/product/bindHospProduct.vue | 3 ++- src/views/supplier/products/supDiProductsCheck.vue | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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/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 @@ - + From ed5dada8afa2092737a3f4d4ee608e724de00d05 Mon Sep 17 00:00:00 2001 From: CTP <630182278@qq.com> Date: Wed, 26 Apr 2023 09:25:03 +0800 Subject: [PATCH 04/22] =?UTF-8?q?=E4=BB=93=E5=BA=93=E4=BF=A1=E6=81=AF=20?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/dept/invWarehouse.vue | 590 +++++++++++++------------ vue.config.js | 159 ++++--- 2 files changed, 389 insertions(+), 360 deletions(-) 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..f9d3b19 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: `http://192.168.0.66:9160/UDI_SPMS_SERVER/`, 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: "./", //到根目录下 + }; + }); + }, +}; From adb4af1fe0b64e869aeb8ba37d85888f852eb9d6 Mon Sep 17 00:00:00 2001 From: CTP <630182278@qq.com> Date: Wed, 26 Apr 2023 10:18:16 +0800 Subject: [PATCH 05/22] =?UTF-8?q?=E6=B5=8B=E8=AF=95git=E5=BF=BD=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + vue.config.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 07179b0..c3d0516 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ selenium-debug.log *.sln *.local +/vue.config.js package-lock.json yarn.lock /UDI_SPMS_CLIENT/ diff --git a/vue.config.js b/vue.config.js index f9d3b19..7836357 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,6 +1,6 @@ "use strict"; const path = require("path"); - +/* 忽略忽略 */ function resolve(dir) { return path.join(__dirname, dir); } From b873f7e01e47cd9c0a6b92dbed0faf32a86df110 Mon Sep 17 00:00:00 2001 From: CTP <630182278@qq.com> Date: Wed, 26 Apr 2023 10:23:20 +0800 Subject: [PATCH 06/22] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- vue.config.js | 131 -------------------------------------------------- 2 files changed, 2 insertions(+), 132 deletions(-) delete mode 100644 vue.config.js diff --git a/.gitignore b/.gitignore index c3d0516..5f9c54f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,8 @@ selenium-debug.log *.sln *.local -/vue.config.js + +vue.config.js package-lock.json yarn.lock /UDI_SPMS_CLIENT/ diff --git a/vue.config.js b/vue.config.js deleted file mode 100644 index 7836357..0000000 --- a/vue.config.js +++ /dev/null @@ -1,131 +0,0 @@ -"use strict"; -const path = require("path"); -/* 忽略忽略 */ -function resolve(dir) { - return path.join(__dirname, dir); -} - -const CompressionPlugin = require("compression-webpack-plugin"); - -const name = process.env.VUE_APP_TITLE || "UDI自助平台"; // 网页标题 - -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 -// 这里只列一部分，具体配置参考文档 -module.exports = { - // 部署生产环境和开发环境下的URL。 - // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 - // 例如 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", - // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） - assetsDir: "static", - // 是否开启eslint保存检测，有效值：ture | false | 'error' - lintOnSave: process.env.NODE_ENV === "development", - // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。 - productionSourceMap: false, - // webpack-dev-server 相关配置 - devServer: { - 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/`, - changeOrigin: true, - pathRewrite: { - ["^" + process.env.VUE_APP_BASE_API]: "", - }, - }, - }, - disableHostCheck: true, - }, - css: { - loaderOptions: { - sass: { - sassOptions: { outputStyle: "expanded" }, - }, - }, - }, - configureWebpack: { - name: name, - resolve: { - alias: { - "@": 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才会压缩 - }), - ], - }, - chainWebpack(config) { - 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") - .test(/\.svg$/) - .include.add(resolve("src/assets/icons")) - .end() - .use("svg-sprite-loader") - .loader("svg-sprite-loader") - .options({ - symbolId: "icon-[name]", - }) - .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: "./", //到根目录下 - }; - }); - }, -}; From 1c4b8cd1e51746b9c8a156d44a8dda6b892f24b9 Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 26 Apr 2023 10:40:49 +0800 Subject: [PATCH 07/22] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inventory/supInoutSearchOrder.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue index 3f45e71..d1368f6 100644 --- a/src/views/inventory/supInoutSearchOrder.vue +++ b/src/views/inventory/supInoutSearchOrder.vue @@ -113,6 +113,7 @@ From bae65e478fad499a3cca9241e37c70f9764039c7 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 26 Apr 2023 11:56:21 +0800 Subject: [PATCH 11/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=20=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/corpMaintain/corpImport.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/basic/corpMaintain/corpImport.vue b/src/views/basic/corpMaintain/corpImport.vue index 136d80a..60a6549 100644 --- a/src/views/basic/corpMaintain/corpImport.vue +++ b/src/views/basic/corpMaintain/corpImport.vue @@ -13,7 +13,7 @@ - + From fb0eea653799211fc08519023a697f01fb5387c6 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 26 Apr 2023 12:01:02 +0800 Subject: [PATCH 12/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E7=89=A9=E8=B5=84=E5=AD=97=E5=85=B8=20=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=20=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/product/udiInfoManageSp.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/basic/product/udiInfoManageSp.vue b/src/views/basic/product/udiInfoManageSp.vue index 935734e..a10e42e 100644 --- a/src/views/basic/product/udiInfoManageSp.vue +++ b/src/views/basic/product/udiInfoManageSp.vue @@ -647,7 +647,7 @@ export default { } , created() { - // this.getList(); + this.getList(); this.selectSysParam(); this.getSysFilter(); this.findMethod(); From 79cfe143335494aeb6520f86fd86f775aa6aa719 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 26 Apr 2023 14:07:18 +0800 Subject: [PATCH 13/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=85=E9=83=A8?= =?UTF-8?q?=E7=A0=81=20=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=97=B6=E5=80=99=20?= =?UTF-8?q?=E5=AD=90=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=9C=AA=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inventory/inner/innerOrder.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/inventory/inner/innerOrder.vue b/src/views/inventory/inner/innerOrder.vue index b89ef05..932c7b9 100644 --- a/src/views/inventory/inner/innerOrder.vue +++ b/src/views/inventory/inner/innerOrder.vue @@ -211,6 +211,8 @@ export default { onSubmitFind() { this.filterQuery.page = 1; this.getList(); + this.detailList=[]; + }, getList() { @@ -355,10 +357,10 @@ export default { } , created() { - let end = new Date(); - let start = new Date(); - start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); - this.actDateRange = [start, end]; + // let end = new Date(); + // let start = new Date(); + // start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); + // this.actDateRange = [start, end]; this.getList(); } , From 0b018f6aaea299605cfffa75817e98846ca459e9 Mon Sep 17 00:00:00 2001 From: CTP <630182278@qq.com> Date: Wed, 26 Apr 2023 16:31:32 +0800 Subject: [PATCH 14/22] =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=20=20=E4=BE=A7=E8=BE=B9=E6=A0=91=E5=BD=A2?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/product/product.vue | 679 +++++++++++++++++++--------- 1 file changed, 468 insertions(+), 211 deletions(-) diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index 7e6892d..e834701 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -1,61 +1,86 @@ @@ -193,31 +304,87 @@ v-if="editDialogVisible" > - + - - - - - - - + + + + + + + -
+
产品标识:
- - - - - + + + + + @@ -227,10 +394,9 @@ ref="editQuery" border label-width="140px" - style="margin-top: 20px; " + style="margin-top: 20px" > - @@ -555,9 +557,9 @@ 添加业务单据类型 + >添加业务单据类型
@@ -589,9 +591,9 @@ 移除 + >移除 @@ -608,8 +610,8 @@ v-if="addBusToInDialogVisible" >
- 选入 + 选入
- 选入 + 选入
- 选入 + 选入
{}); + .catch(() => { + }); }, testConnect() { @@ -896,7 +899,8 @@ export default { this.busTypes = response.data.list || []; this.total = response.data.total || 0; }) - .catch(() => {}); + .catch(() => { + }); }, addBusTypeDialog() { From 4c2bf2476d5631b37ffc946373366c038b067c05 Mon Sep 17 00:00:00 2001 From: CTP <630182278@qq.com> Date: Thu, 27 Apr 2023 09:00:54 +0800 Subject: [PATCH 17/22] .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5f9c54f..ee47d0f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ selenium-debug.log *.sln *.local - vue.config.js package-lock.json yarn.lock From 43d0bed4bd304ea01bab7334dfca5b81fc82b7a3 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 27 Apr 2023 10:39:04 +0800 Subject: [PATCH 18/22] =?UTF-8?q?=E6=8B=A3=E8=B4=A7=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/busType/bussinessTypeModify.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue index 88fb935..808fc2b 100644 --- a/src/views/basic/busType/bussinessTypeModify.vue +++ b/src/views/basic/busType/bussinessTypeModify.vue @@ -532,7 +532,7 @@ - + @@ -555,7 +555,7 @@ - + @@ -578,7 +578,7 @@ - + @@ -601,7 +601,7 @@ - + @@ -624,7 +624,7 @@ - + @@ -647,7 +647,7 @@ - + @@ -669,7 +669,7 @@ - + @@ -692,7 +692,7 @@ - + @@ -714,7 +714,7 @@ - + From 72c7693ccde0c99321a50cdf9b32356e3e1276b0 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Thu, 27 Apr 2023 14:23:18 +0800 Subject: [PATCH 19/22] =?UTF-8?q?=E5=A2=9E=E5=8A=A0test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.test | 20 ++++++++++++++++++++ package.json | 3 ++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 .env.test diff --git a/.env.test b/.env.test new file mode 100644 index 0000000..52b5985 --- /dev/null +++ b/.env.test @@ -0,0 +1,20 @@ +# 页面标题 +VUE_APP_TITLE = 供应商自助管理平台 + +# 开发环境配置 +ENV = 'test' + +# 若依管理系统/开发环境 +VUE_APP_BASE_API = 'http://192.168.0.66:8881/UDI_SPMS_SERVER' + +# 应用访问路径 例如使用前缀 /admin/ +VUE_APP_CONTEXT_PATH = '/' + +# 监控地址 +VUE_APP_MONITRO_ADMIN = 'http://localhost:9090/admin/login' + +# xxl-job 控制台地址 +VUE_APP_XXL_JOB_ADMIN = 'http://localhost:9100/xxl-job-admin' + +# 路由懒加载 +VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/package.json b/package.json index 57441c3..7b3dd22 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "license": "MIT", "scripts": { "dev": "vue-cli-service serve", - "build:prod": "vue-cli-service build", + "build:prod": "vue-cli-service build --mode production", + "build:test": "vue-cli-service build --mode test", "preview": "node build/index.js --preview", "lint": "eslint --ext .js,.vue src" }, From d5eedc2d25ffb44ae518a983ddd9afed220f626e Mon Sep 17 00:00:00 2001 From: CTP <630182278@qq.com> Date: Thu, 27 Apr 2023 14:55:13 +0800 Subject: [PATCH 20/22] =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=20=E8=A1=A8=E6=A0=BC=E5=86=85=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E6=9D=A1=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/product/product.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index e834701..de2d6d5 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -17,7 +17,13 @@ > - + Date: Thu, 27 Apr 2023 15:44:28 +0800 Subject: [PATCH 21/22] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/sync/spsSyncDownload.js | 9 +++ src/views/sync/SysUdimsDownloadData.vue | 86 +++++++++++++++++-------- 2 files changed, 67 insertions(+), 28 deletions(-) diff --git a/src/api/sync/spsSyncDownload.js b/src/api/sync/spsSyncDownload.js index 7498d4d..ffebc1a 100644 --- a/src/api/sync/spsSyncDownload.js +++ b/src/api/sync/spsSyncDownload.js @@ -25,4 +25,13 @@ export function findConfig(query) { }); } +export function downloadFile(query) { + return axios({ + url: "/sps/sync/download/info/file", + method: "get", + params: query, + responseType: 'blob' + }); +} + diff --git a/src/views/sync/SysUdimsDownloadData.vue b/src/views/sync/SysUdimsDownloadData.vue index 8fdf4c1..73e63f7 100644 --- a/src/views/sync/SysUdimsDownloadData.vue +++ b/src/views/sync/SysUdimsDownloadData.vue @@ -12,9 +12,8 @@ - - - + + @@ -79,30 +78,32 @@ show-overflow-tooltip > + + @@ -121,7 +122,7 @@ From 1664afe3128e40f37960a61e2bbb280472797590 Mon Sep 17 00:00:00 2001 From: CTP <630182278@qq.com> Date: Thu, 27 Apr 2023 15:44:43 +0800 Subject: [PATCH 22/22] =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=20=E4=B8=8B=E6=96=B9=E6=A8=AA=E5=90=91?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/product/product.vue | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index de2d6d5..7f7e35d 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -17,13 +17,7 @@ > - +