From 35d3a536280683d3445e83edfa2dbb1c031c3e1c Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Fri, 21 Feb 2025 03:10:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=8F=E5=85=8D=E5=AE=A1=E6=89=B9=E6=B5=81?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/reduction-apply/index.js | 10 +- .../receive-apply/business-details.vue | 13 +- .../business-examine/receive-apply/index.vue | 17 +- .../reduction-apply/business-details.vue | 77 +++++- .../reduction-apply/index.vue | 18 +- .../countersign/config/config-data.vue | 8 +- vue.config.js | 252 +++++++++--------- 7 files changed, 224 insertions(+), 171 deletions(-) diff --git a/src/api/reduction-apply/index.js b/src/api/reduction-apply/index.js index 0e71c358..0723c7fb 100644 --- a/src/api/reduction-apply/index.js +++ b/src/api/reduction-apply/index.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 获取减免申请审核列表 export function getReceiveApplyApi(query) { return request({ - url: '/material/leaseTask/auditList', + url: '/material/derateRecordQuery/getAuditList', method: 'get', params: query }) @@ -25,10 +25,10 @@ export function getAuditingDetailsApi(query) { }) } // 减免申请审核提交接口 -export function submitAuditingApi(query) { +export function submitAuditingApi(data) { return request({ - url: '/material/ma_type/getMaTypeTreeSelect', - method: 'get', - params: query + url: '/material/sysWorkflowRecordHistory/update', + method: 'post', + data }) } diff --git a/src/views/business-examine/receive-apply/business-details.vue b/src/views/business-examine/receive-apply/business-details.vue index 9da96494..dc02df80 100644 --- a/src/views/business-examine/receive-apply/business-details.vue +++ b/src/views/business-examine/receive-apply/business-details.vue @@ -83,7 +83,7 @@ @@ -366,6 +366,7 @@ import { downloadFile, downloadFileData } from '@/utils/download' import { getToken } from '@/utils/auth' import Treeselect from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' +import { getReceiveApplyApi } from '@/api/reduction-apply/index.js' export default { name: '', data() { @@ -487,7 +488,7 @@ export default { endTime: this.queryParams.time && this.queryParams.time[1] } - getReliefRecordList(params).then(response => { + getReceiveApplyApi(params).then(response => { this.total = response.total this.formList = response.rows // console.log('22222222',this.pushReviewList) @@ -600,12 +601,13 @@ export default { }, //编辑 - handleAuditing(row) { + handleAuditing(row, type) { this.$router.push({ name: 'reduction-apply', query: { id: row.id, - taskId: row.taskId + taskId: row.taskId, + type } }) // 跳转审核详情页面 // this.isView = false diff --git a/src/views/material/countersign/config/config-data.vue b/src/views/material/countersign/config/config-data.vue index e98373a3..0273d6e3 100644 --- a/src/views/material/countersign/config/config-data.vue +++ b/src/views/material/countersign/config/config-data.vue @@ -306,10 +306,10 @@ export default { const isSortPass = this.dataList.findIndex(e => e.nodeSort === this.form.nodeSort) // 判断当前输入顺序是否存在 - if (isSortPass > -1) { - this.$modal.msgError('当前输入的流程顺序已存在，请重新输入') - return - } + // if (isSortPass > -1) { + // this.$modal.msgError('当前输入的流程顺序已存在，请重新输入') + // return + // } // 组装参数 this.form.configValues = this.form.configValuesList.join(',') diff --git a/vue.config.js b/vue.config.js index c06515e0..b88a0095 100644 --- a/vue.config.js +++ b/vue.config.js @@ -2,7 +2,7 @@ const path = require('path') function resolve(dir) { - return path.join(__dirname, dir) + return path.join(__dirname, dir) } const CompressionPlugin = require('compression-webpack-plugin') @@ -15,131 +15,131 @@ const port = process.env.port || process.env.npm_config_port || 80 // 端口 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions // 这里只列一部分，具体配置参考文档 module.exports = { - // 部署生产环境和开发环境下的URL。 - // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 - // 例如 https://www.bonus.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.bonus.vip/admin/，则设置 baseUrl 为 /admin/。 - publicPath: process.env.NODE_ENV === 'production' ? '/' : '/', - // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） - outputDir: 'dist', - // 用于放置生成的静态资源 (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: true, - proxy: { - // detail: https://cli.vuejs.org/config/#devserver-proxy - [process.env.VUE_APP_BASE_API]: { - // target: `http://localhost:18080`, - // target: `http://192.168.0.15:18080`,//马 - // target: `http://192.168.0.244:18580`,//测试 - // target: `http://192.168.2.223:18080`,//山 - // target: `http://192.168.2.23:18080`,//洪 - // target: `http://192.168.0.234:18080`,//阮 - // target: `http://192.168.137.1:18080`,// - // target: `http://192.168.0.15:18080`,// 韩傲宇 - target: `http://192.168.2.209:18080`, // 赵福海 - changeOrigin: true, - pathRewrite: { - ['^' + process.env.VUE_APP_BASE_API]: '' - } - }, - '/api': { - target: 'http://192.168.0.21:17861', - //设置允许跨域——此处我经过测试发现可有可无 - changeOrigin: true, - pathRewrite: { - '^/api': '' - } - } + // 部署生产环境和开发环境下的URL。 + // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 + // 例如 https://www.bonus.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.bonus.vip/admin/，则设置 baseUrl 为 /admin/。 + publicPath: process.env.NODE_ENV === 'production' ? '/' : '/', + // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） + outputDir: 'dist', + // 用于放置生成的静态资源 (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: true, + proxy: { + // detail: https://cli.vuejs.org/config/#devserver-proxy + [process.env.VUE_APP_BASE_API]: { + // target: `http://localhost:18080`, + // target: `http://192.168.0.15:18080`,//马 + // target: `http://192.168.0.244:18580`,//测试 + // target: `http://192.168.2.223:18080`,//山 + // target: `http://192.168.2.23:18080`,//洪 + target: `http://192.168.0.234:18080`, //阮 + // target: `http://192.168.137.1:18080`,// + // target: `http://192.168.0.15:18080`,// 韩傲宇 + // target: `http://192.168.2.209:18080`, // 赵福海 + changeOrigin: true, + pathRewrite: { + ['^' + process.env.VUE_APP_BASE_API]: '' + } + }, + '/api': { + target: 'http://192.168.0.21:17861', + //设置允许跨域——此处我经过测试发现可有可无 + changeOrigin: true, + pathRewrite: { + '^/api': '' + } + } + }, + disableHostCheck: true }, - disableHostCheck: true - }, - css: { - loaderOptions: { - sass: { - sassOptions: { outputStyle: 'expanded' } - } + css: { + loaderOptions: { + sass: { + sassOptions: { outputStyle: 'expanded' } + } + } + }, + configureWebpack: { + name: name, + resolve: { + alias: { + '@': resolve('src') + } + }, + plugins: [ + // http://doc.bonus.vip/bonus-vue/other/faq.html#使用gzip解压缩静态文件 + new CompressionPlugin({ + cache: false, // 不启用文件缓存 + test: /\.(js|css|html|jpe?g|png|gif|svg)?$/i, // 压缩文件格式 + filename: '[path][base].gz[query]', // 压缩后的文件名 + algorithm: 'gzip', // 使用gzip压缩 + minRatio: 0.8, // 压缩比例，小于 80% 的文件不会被压缩 + deleteOriginalAssets: false // 压缩后删除原文件 + }) + ] + }, + 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 + test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm + priority: 20 // the weight needs to be larger than libs and app or it will be packaged into libs or app + }, + 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') + }) } - }, - configureWebpack: { - name: name, - resolve: { - alias: { - '@': resolve('src') - } - }, - plugins: [ - // http://doc.bonus.vip/bonus-vue/other/faq.html#使用gzip解压缩静态文件 - new CompressionPlugin({ - cache: false, // 不启用文件缓存 - test: /\.(js|css|html|jpe?g|png|gif|svg)?$/i, // 压缩文件格式 - filename: '[path][base].gz[query]', // 压缩后的文件名 - algorithm: 'gzip', // 使用gzip压缩 - minRatio: 0.8, // 压缩比例，小于 80% 的文件不会被压缩 - deleteOriginalAssets: false // 压缩后删除原文件 - }) - ] - }, - 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 - test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm - priority: 20 // the weight needs to be larger than libs and app or it will be packaged into libs or app - }, - 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') - }) - } }