Merge remote-tracking branch 'origin/master'

ywj_dev
郑明梁 2 years ago
commit 6c46433cb7

@ -5,7 +5,7 @@ VUE_APP_TITLE = 供应商自助管理系统
ENV = 'development' ENV = 'development'
# 若依管理系统/开发环境 # 若依管理系统/开发环境
VUE_APP_BASE_API = 'http://localhost:9993/' VUE_APP_BASE_API = '/dev-api'
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/' VUE_APP_CONTEXT_PATH = '/'

@ -9,24 +9,13 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/'
# 吴总测试服务器 # 吴总测试服务器
VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
# 平潭 # 平潭
# VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
# 文明东 # 文明点
# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/' VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
# 实施测试服务器 ljy
# VUE_APP_BASE_API = 'http://192.168.0.66:8504/UDI_SPMS_SERVER/'
# 实施测试服务器 wqq
# VUE_APP_BASE_API = 'http://192.168.0.66:9160/UDI_SPMS_SERVER/'
# 平潭内网
# VUE_APP_BASE_API = 'http://10.200.200.253:9160/UDI_SPMS_SERVER/'
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/' VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'

@ -5,8 +5,8 @@
"author": "LionLi", "author": "LionLi",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"dev": "vue-cli-service serve --mode development", "dev": "vue-cli-service serve",
"build:prod": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build --mode production", "build:prod": "vue-cli-service build",
"preview": "node build/index.js --preview", "preview": "node build/index.js --preview",
"lint": "eslint --ext .js,.vue src" "lint": "eslint --ext .js,.vue src"
}, },

@ -906,7 +906,7 @@
</el-row> </el-row>
</div> </div>
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="是否人工审核据设置(二次审核)"> <el-collapse-item title="是否人工审核据设置(二次审核)">
<div> <div>
<div style="width: 100%;margin: 0 auto;margin-top: 20px"> <div style="width: 100%;margin: 0 auto;margin-top: 20px">
<el-row style="margin-bottom: 15px"> <el-row style="margin-bottom: 15px">

@ -7,8 +7,7 @@
<template slot="extra"> <template slot="extra">
<el-button type="primary" size="small" @click="saveConfig()" <el-button type="primary" size="small" @click="saveConfig()"
>保存 >保存
</el-button </el-button>
>
</template> </template>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 同步服务</template> <template slot="label"> 同步服务</template>
@ -65,7 +64,7 @@
<!-- 参数设置 --> <!-- 参数设置 -->
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 参数设置</template> <template slot="label"> 参数设置</template>
<el-row :gutter="20" class="el-row" type="flex"> <!-- <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="20" class="el-col"> <el-col :span="20" class="el-col">
<div> <div>
<span>数据上传时间间隔(单位:分钟):&nbsp;</span> <span>数据上传时间间隔(单位:分钟):&nbsp;</span>
@ -102,12 +101,51 @@
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
</el-row> </el-row> -->
<el-form
label-positiom="right"
label-width="200px"
:inline="true"
disabled
>
<el-form-item label="数据上传时间间隔(单位:分钟):">
<el-input
style="width: 100px"
size="small"
type="number"
v-model="configQuery.syncTime"
splaceholder="请输入内容"
></el-input>
</el-form-item>
<el-form-item label="延时上传(单位:分钟):">
<el-input
style="width: 100px"
size="small"
type="number"
v-model="configQuery.delaySyncTime"
splaceholder="请输入内容"
></el-input>
</el-form-item>
<el-form-item label="数据下载时间间隔(单位:分钟):">
<el-input
style="width: 100px"
size="small"
type="number"
v-model="configQuery.syncDownloadTime"
splaceholder="请输入内容"
></el-input>
</el-form-item>
</el-form>
</el-descriptions-item> </el-descriptions-item>
<!-- 系统设置信息 --> <!-- 系统设置信息 -->
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 系统设置信息</template> <template slot="label"> 系统设置信息</template>
<el-form label-positiom="right" label-width="200px" :inline="true"> <el-form
label-positiom="right"
label-width="200px"
:inline="true"
disabled
>
<el-form-item label="系统运行参数"> <el-form-item label="系统运行参数">
<el-select v-model="configQuery.systemConfig"> <el-select v-model="configQuery.systemConfig">
<el-option :value="0" label="不同步"></el-option> <el-option :value="0" label="不同步"></el-option>
@ -132,7 +170,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form label-positiom="right" label-width="200px" :inline="true"> <el-form
label-positiom="right"
label-width="200px"
:inline="true"
disabled
>
<el-form-item label="自动建出入库单设置"> <el-form-item label="自动建出入库单设置">
<el-select v-model="configQuery.scanChangeConfig"> <el-select v-model="configQuery.scanChangeConfig">
<el-option :value="0" label="不同步"></el-option> <el-option :value="0" label="不同步"></el-option>
@ -153,7 +196,12 @@
<!-- 单据类型 --> <!-- 单据类型 -->
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 单据类型</template> <template slot="label"> 单据类型</template>
<el-form label-positiom="right" label-width="200px" :inline="true"> <el-form
label-positiom="right"
label-width="200px"
:inline="true"
disabled
>
<el-form-item label="业务单据类型"> <el-form-item label="业务单据类型">
<el-select v-model="configQuery.typeBus"> <el-select v-model="configQuery.typeBus">
<el-option :value="0" label="不同步"></el-option> <el-option :value="0" label="不同步"></el-option>
@ -180,7 +228,12 @@
<!-- 用户信息 --> <!-- 用户信息 -->
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 用户信息</template> <template slot="label"> 用户信息</template>
<el-form label-positiom="right" label-width="200px" :inline="true"> <el-form
label-positiom="right"
label-width="200px"
:inline="true"
disabled
>
<el-form-item label="部门信息"> <el-form-item label="部门信息">
<el-select v-model="configQuery.basicDept"> <el-select v-model="configQuery.basicDept">
<el-option :value="0" label="不同步"></el-option> <el-option :value="0" label="不同步"></el-option>
@ -207,7 +260,12 @@
<!-- 基础数据 --> <!-- 基础数据 -->
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 基础数据</template> <template slot="label"> 基础数据</template>
<el-form label-positiom="right" label-width="200px" :inline="true"> <el-form
label-positiom="right"
label-width="200px"
:inline="true"
disabled
>
<el-form-item label="耗材字典"> <el-form-item label="耗材字典">
<el-select v-model="configQuery.basicProducts"> <el-select v-model="configQuery.basicProducts">
<el-option :value="0" label="不同步"></el-option> <el-option :value="0" label="不同步"></el-option>
@ -234,7 +292,12 @@
<!-- 第三方基础信息 --> <!-- 第三方基础信息 -->
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 第三方基础信息</template> <template slot="label"> 第三方基础信息</template>
<el-form label-positiom="right" label-width="200px" :inline="true"> <el-form
label-positiom="right"
label-width="200px"
:inline="true"
disabled
>
<el-form-item label="第三方产品信息"> <el-form-item label="第三方产品信息">
<el-select v-model="configQuery.basicThirdProducts"> <el-select v-model="configQuery.basicThirdProducts">
<el-option :value="0" label="不同步"></el-option> <el-option :value="0" label="不同步"></el-option>
@ -270,7 +333,12 @@
<!-- 国家库DI数据 --> <!-- 国家库DI数据 -->
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 国家库DI数据</template> <template slot="label"> 国家库DI数据</template>
<el-form label-positiom="right" label-width="200px" :inline="true"> <el-form
label-positiom="right"
label-width="200px"
:inline="true"
disabled
>
<el-form-item label="DI产品信息"> <el-form-item label="DI产品信息">
<el-select v-model="configQuery.dbDiProducts"> <el-select v-model="configQuery.dbDiProducts">
<el-option :value="0" label="不同步"></el-option> <el-option :value="0" label="不同步"></el-option>
@ -542,8 +610,7 @@
<div style="float: right; margin-bottom: 10px; margin-right: 25px"> <div style="float: right; margin-bottom: 10px; margin-right: 25px">
<el-button type="primary" size="small" @click="addToInBusType()" <el-button type="primary" size="small" @click="addToInBusType()"
>选入 >选入
</el-button </el-button>
>
</div> </div>
<el-table <el-table
:data="busTypes" :data="busTypes"
@ -588,8 +655,7 @@
<div style="float: right; margin-bottom: 10px; margin-right: 25px"> <div style="float: right; margin-bottom: 10px; margin-right: 25px">
<el-button type="primary" size="small" @click="addBusType()" <el-button type="primary" size="small" @click="addBusType()"
>选入 >选入
</el-button </el-button>
>
</div> </div>
<el-table <el-table
:data="busTypes" :data="busTypes"
@ -635,8 +701,7 @@
<div style="float: right; margin-bottom: 10px; margin-right: 25px"> <div style="float: right; margin-bottom: 10px; margin-right: 25px">
<el-button type="primary" size="small" @click="addChangeBusType()" <el-button type="primary" size="small" @click="addChangeBusType()"
>选入 >选入
</el-button </el-button>
>
</div> </div>
<el-table <el-table
:data="changeBusTypes" :data="changeBusTypes"
@ -798,8 +863,7 @@ export default {
this.loading = false; this.loading = false;
}); });
}) })
.catch(() => { .catch(() => {});
});
}, },
testConnect() { testConnect() {
@ -832,8 +896,7 @@ export default {
this.busTypes = response.data.list || []; this.busTypes = response.data.list || [];
this.total = response.data.total || 0; this.total = response.data.total || 0;
}) })
.catch(() => { .catch(() => {});
});
}, },
addBusTypeDialog() { addBusTypeDialog() {

@ -31,8 +31,7 @@
<el-button-group> <el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset" <el-button type="primary" icon="el-icon-refresh" @click="onReset"
>重置 >重置
</el-button </el-button>
>
<el-button type="primary" @click="onSubmit" icon="el-icon-search" <el-button type="primary" @click="onSubmit" icon="el-icon-search"
>查询 >查询
</el-button> </el-button>
@ -589,6 +588,7 @@ export default {
this.loading = false; this.loading = false;
let depList = response.data.list || []; let depList = response.data.list || [];
this.list = this.handleTree(depList, "code", "pcode"); this.list = this.handleTree(depList, "code", "pcode");
//
this.$nextTick(() => { this.$nextTick(() => {
console.log(qwe); console.log(qwe);
if (qwe === null) { if (qwe === null) {
@ -629,8 +629,7 @@ export default {
} }
}); });
}) })
.catch(() => { .catch(() => {});
});
}, },
toggleExpandAll() { toggleExpandAll() {
this.refreshTable = false; this.refreshTable = false;
@ -751,8 +750,7 @@ export default {
} }
}); });
}) })
.catch(() => { .catch(() => {});
});
}, },
// //
@ -774,8 +772,7 @@ export default {
}, },
}, },
components: { Treeselect }, components: { Treeselect },
mounted() { mounted() {},
},
created() { created() {
this.getList(); this.getList();
}, },

@ -98,7 +98,7 @@
<el-row> <el-row>
<el-form-item label="参数值" prop="paramValue" label-width="100px"> <el-form-item label="参数值" prop="paramValue" label-width="100px">
<el-input <el-input
type="" type="number"
v-model="formData.paramValue" v-model="formData.paramValue"
auto-complete="off" auto-complete="off"
style="width: 90%" style="width: 90%"
@ -294,10 +294,6 @@ export default {
} }
}, },
formSubmit() { formSubmit() {
// if (!Number.isInteger(parseInt(this.formData.paramValue))) {
// this.$message.warning("");
// return;
// }
this.$refs["dataForm"].validate((valid) => { this.$refs["dataForm"].validate((valid) => {
if (valid) { if (valid) {
this.formLoading = true; this.formLoading = true;

@ -1,15 +1,15 @@
'use strict' "use strict";
const path = require('path') const path = require("path");
function resolve(dir) { 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 配置说明
//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions //官方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/。 // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。
publicPath: process.env.VUE_APP_CONTEXT_PATH, publicPath: process.env.VUE_APP_CONTEXT_PATH,
// 在npm run build 或 yarn build 时 生成文件的目录名称要和baseUrl的生产环境路径一致默认dist // 在npm run build 或 yarn build 时 生成文件的目录名称要和baseUrl的生产环境路径一致默认dist
outputDir: 'UDI_SPMS_CLIENT', outputDir: "UDI_SPMS_CLIENT",
// 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下) // 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下)
assetsDir: 'static', assetsDir: "static",
// 是否开启eslint保存检测有效值ture | false | 'error' // 是否开启eslint保存检测有效值ture | false | 'error'
lintOnSave: process.env.NODE_ENV === 'development', lintOnSave: process.env.NODE_ENV === "development",
// 如果你不需要生产环境的 source map可以将其设置为 false 以加速生产环境构建。 // 如果你不需要生产环境的 source map可以将其设置为 false 以加速生产环境构建。
productionSourceMap: false, productionSourceMap: false,
// webpack-dev-server 相关配置 // webpack-dev-server 相关配置
devServer: { devServer: {
host: '0.0.0.0', host: "0.0.0.0",
port: port, port: port,
open: false, open: false,
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: process.env.VUE_APP_BASE_API, target: `http://192.168.0.66:9160/UDI_SPMS_SERVER/`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: '' ["^" + process.env.VUE_APP_BASE_API]: "",
} },
} },
}, },
disableHostCheck: true disableHostCheck: true,
}, },
css: { css: {
loaderOptions: { loaderOptions: {
sass: { sass: {
sassOptions: { outputStyle: "expanded" } sassOptions: { outputStyle: "expanded" },
} },
} },
}, },
configureWebpack: { configureWebpack: {
name: name, name: name,
resolve: { resolve: {
alias: { alias: {
'@': resolve('src') "@": resolve("src"),
} },
}, },
plugins: [ plugins: [
// http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件 // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
new CompressionPlugin({ new CompressionPlugin({
cache: false, // 不启用文件缓存 cache: false, // 不启用文件缓存
test: /\.(js|css|html)?$/i, // 压缩文件格式 test: /\.(js|css|html)?$/i, // 压缩文件格式
filename: '[path].gz[query]', // 压缩后的文件名 filename: "[path].gz[query]", // 压缩后的文件名
algorithm: 'gzip', // 使用gzip压缩 algorithm: "gzip", // 使用gzip压缩
minRatio: 0.8 // 压缩率小于1才会压缩 minRatio: 0.8, // 压缩率小于1才会压缩
}) }),
], ],
}, },
chainWebpack(config) { chainWebpack(config) {
config.plugins.delete('preload') // TODO: need test config.plugins.delete("preload"); // TODO: need test
config.plugins.delete('prefetch') // TODO: need test config.plugins.delete("prefetch"); // TODO: need test
// set svg-sprite-loader // set svg-sprite-loader
config.module.rule("svg").exclude.add(resolve("src/assets/icons")).end();
config.module config.module
.rule('svg') .rule("icons")
.exclude.add(resolve('src/assets/icons'))
.end()
config.module
.rule('icons')
.test(/\.svg$/) .test(/\.svg$/)
.include.add(resolve('src/assets/icons')) .include.add(resolve("src/assets/icons"))
.end() .end()
.use('svg-sprite-loader') .use("svg-sprite-loader")
.loader('svg-sprite-loader') .loader("svg-sprite-loader")
.options({ .options({
symbolId: 'icon-[name]' symbolId: "icon-[name]",
}) })
.end() .end();
config.when(process.env.NODE_ENV !== "development", (config) => {
config config
.when(process.env.NODE_ENV !== 'development', .plugin("ScriptExtHtmlWebpackPlugin")
config => { .after("html")
config .use("script-ext-html-webpack-plugin", [
.plugin('ScriptExtHtmlWebpackPlugin') {
.after('html')
.use('script-ext-html-webpack-plugin', [{
// `runtime` must same as runtimeChunk name. default is `runtime` // `runtime` must same as runtimeChunk name. default is `runtime`
inline: /runtime\..*\.js$/ inline: /runtime\..*\.js$/,
}]) },
.end() ])
config .end();
.optimization.splitChunks({ config.optimization.splitChunks({
chunks: 'all', chunks: "all",
cacheGroups: { cacheGroups: {
libs: { libs: {
name: 'chunk-libs', name: "chunk-libs",
test: /[\\/]node_modules[\\/]/, test: /[\\/]node_modules[\\/]/,
priority: 10, priority: 10,
chunks: 'initial' // only package third parties that are initially dependent chunks: "initial", // only package third parties that are initially dependent
}, },
elementUI: { elementUI: {
name: 'chunk-elementUI', // split elementUI into a single package 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 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 test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
}, },
commons: { commons: {
name: 'chunk-commons', name: "chunk-commons",
test: resolve('src/components'), // can customize your rules test: resolve("src/components"), // can customize your rules
minChunks: 3, // minimum common number minChunks: 3, // minimum common number
priority: 5, priority: 5,
reuseExistingChunk: true reuseExistingChunk: true,
} },
} },
}) });
config.optimization.runtimeChunk('single'), config.optimization.runtimeChunk("single"),
{ {
from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件 from: path.resolve(__dirname, "./public/robots.txt"), //防爬虫文件
to: './' //到根目录下 to: "./", //到根目录下
} };
} });
) },
} };
}

Loading…
Cancel
Save