diff --git a/.env.production b/.env.production
index 51a50f6..28ea126 100644
--- a/.env.production
+++ b/.env.production
@@ -14,7 +14,7 @@ ENV = 'production'
# 平潭
# 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/'
# 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
diff --git a/src/views/inout/DialogEditCode.vue b/src/views/inout/DialogEditCode.vue
index 17f2557..021b4a3 100644
--- a/src/views/inout/DialogEditCode.vue
+++ b/src/views/inout/DialogEditCode.vue
@@ -49,6 +49,7 @@
diff --git a/src/views/inout/IoSupSecAuditOrder.vue b/src/views/inout/IoSupSecAuditOrder.vue
index c6029e7..60b046c 100644
--- a/src/views/inout/IoSupSecAuditOrder.vue
+++ b/src/views/inout/IoSupSecAuditOrder.vue
@@ -944,7 +944,7 @@ export default {
},
//单据撤回
rollback(row) {
- this.$confirm('此操作将撤回单据至已校验未审核状态并删除对应库存信息, 是否继续?', '提示', {
+ this.$confirm('此操作将撤回单据至已校验未审核状态, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
diff --git a/src/views/inventory/AllInoutSearchOrder.vue b/src/views/inventory/AllInoutSearchOrder.vue
index 1c3ad7b..359f819 100644
--- a/src/views/inventory/AllInoutSearchOrder.vue
+++ b/src/views/inventory/AllInoutSearchOrder.vue
@@ -89,8 +89,8 @@
-
-
+
+
diff --git a/src/views/purchase/company/companyProducts.vue b/src/views/purchase/company/companyProducts.vue
index 0c2bdba..cb94190 100644
--- a/src/views/purchase/company/companyProducts.vue
+++ b/src/views/purchase/company/companyProducts.vue
@@ -436,7 +436,7 @@ export default {
};
this.checked = row.isUseDy == 1;
this.detailQuery = {
- cpmctymc: row.cpmctymc,
+ entireCpmctymc: row.cpmctymc,
manufactory: row.manufactory,
page: 1,
limit: 10,
diff --git a/src/views/system/device/phoneRegisterManage.vue b/src/views/system/device/phoneRegisterManage.vue
index e45b482..599b05c 100644
--- a/src/views/system/device/phoneRegisterManage.vue
+++ b/src/views/system/device/phoneRegisterManage.vue
@@ -47,11 +47,12 @@
size="small"
placeholder="请输入内容"
clearable
- v-model="companyInfo.name"
+ disabled="false"
+ v-model="locSystem"
>
-
+
@@ -242,6 +243,7 @@ export default {
qrCodeVisible: false,
serverUrl: false,
companyInfo: {},
+ locSystem: process.env.VUE_APP_TITLE,
};
},
@@ -259,11 +261,11 @@ export default {
},
onSubmit() {
- this.filterQuery.page=1;
+ this.filterQuery.page = 1;
this.getList();
},
- closeDialogVisible(){
- this.centerDialogVisible=false;
+ closeDialogVisible() {
+ this.centerDialogVisible = false;
this.getList();
},
getList() {
diff --git a/vue.config.js b/vue.config.js
index 2eee3de..99df03e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- target: process.env.VUE_APP_BASE_API,
+ target: `http://192.168.0.166:9993/`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
@@ -47,7 +47,7 @@ module.exports = {
css: {
loaderOptions: {
sass: {
- sassOptions: { outputStyle: "expanded" }
+ sassOptions: {outputStyle: "expanded"}
}
}
},
@@ -97,39 +97,39 @@ module.exports = {
.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$/
}])
.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
- }
+ 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: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
+ to: './' //到根目录下
+ }
}
)
}