diff --git a/.env.development b/.env.development
index dee540d8..344e5378 100644
--- a/.env.development
+++ b/.env.development
@@ -4,6 +4,7 @@ VUE_APP_TITLE = 管理系统
# 开发环境配置
ENV = 'development'
+VUE_APP_VERSION = '20240516'
# 开发环境
#VUE_APP_BASE_API = '/dev-api'
VUE_APP_PDOMAIN = 'tanex56'
diff --git a/.env.production b/.env.production
index f0f359e5..88459410 100644
--- a/.env.production
+++ b/.env.production
@@ -4,6 +4,8 @@ VUE_APP_TITLE = 管理系统
# 生产环境配置
ENV = 'production'
+VUE_APP_VERSION = '20240516'
+
# 管理系统/生产环境
VUE_APP_PDOMAIN = 'tanex56'
VUE_APP_BASE_API = 'https://api.emis.tanex56.com/api/bizsvr'
diff --git a/.env.staging b/.env.staging
index 797a12a3..2a9b0d09 100644
--- a/.env.staging
+++ b/.env.staging
@@ -6,6 +6,8 @@ NODE_ENV = production
# 测试环境配置
ENV = 'staging'
+VUE_APP_VERSION = '20240516'
+
# 测试环境
VUE_APP_BASE_API = '/stage-api'
VUE_APP_PDOMAIN = 'tanex56'
diff --git a/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue b/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue
index 084b3a67..3ebdf25e 100644
--- a/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue
+++ b/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue
@@ -100,7 +100,7 @@ import { getStaffList } from "@/api/emis/emisStaff";
pageNum:1,
pageSize:5,
searchValue:null,
- siteCode:0,
+ siteCode:this.sideCode,
postCode:this.postCode
}
};
@@ -110,8 +110,8 @@ import { getStaffList } from "@/api/emis/emisStaff";
this.svalue = newVal;
this.initData();
},
- postCode(newVal){
- // this.getList();
+ siteCode(newVal){
+ this.initData();
}
},
beforeDestroy(){
diff --git a/src/views/emis/emisCustomerUser/batchUpdateForm.vue b/src/views/emis/emisCustomerUser/batchUpdateForm.vue
index 7957d03c..cb6c1777 100644
--- a/src/views/emis/emisCustomerUser/batchUpdateForm.vue
+++ b/src/views/emis/emisCustomerUser/batchUpdateForm.vue
@@ -2,7 +2,7 @@
-
+
+
diff --git a/src/views/emis/emisCustomerUser/monthUserForm.vue b/src/views/emis/emisCustomerUser/monthUserForm.vue
index e6a370bf..42dd7fb7 100644
--- a/src/views/emis/emisCustomerUser/monthUserForm.vue
+++ b/src/views/emis/emisCustomerUser/monthUserForm.vue
@@ -12,6 +12,12 @@
+
+
+
+
+
+
@@ -22,12 +28,8 @@
-
-
-
-
-
-
+
+
-
-
-
-
-
@@ -77,6 +74,11 @@
+
+
+
+
+
@@ -84,7 +86,7 @@
-
+
@@ -106,21 +108,30 @@
-->
+
+
+
+
+
-
+
-
+
- 选择网点
+ 选择网点
@@ -133,8 +144,8 @@
- 是
- 否
+ 是
+ 否
@@ -142,16 +153,16 @@
- 是
- 否
+ 是
+ 否
-
+
- 是
- 否
+ 是
+ 否
@@ -177,7 +188,7 @@
-
+
@@ -226,11 +237,14 @@ export default {
form: {},
// 表单校验
rules: {
- company: [
+ // company: [
+ // { required: true, message: "客户名称不能为空", trigger: "blur" }
+ // ],
+ customerName: [
{ required: true, message: "客户名称不能为空", trigger: "blur" }
],
- customerName: [
- { required: true, message: "寄件人不能为空", trigger: "blur" }
+ contact: [
+ { required: true, message: "联系人不能为空", trigger: "blur" }
],
phone: [
{ required: true, message: "电话不能为空", trigger: "blur" }
@@ -247,15 +261,12 @@ export default {
ownerSite: [
{ required: true, message: "归属站点不能为空", trigger:["blur",'change'] }
],
- areaInfo: [
- { validator: this.validateMuti, trigger: ["blur",'change'] }
- ],
country: [
{ required: true, message: "国家不能为空", trigger: ["blur",'change'] }
],
- // province: [
- // { required: true, message: "省份不能为空", trigger: "blur" }
- // ],
+ province: [
+ { required: true, message: "省份不能为空", trigger: ["blur",'change'] }
+ ],
address: [
{ required: true, message: "地址不能为空", trigger: "blur" }
],
@@ -299,14 +310,12 @@ export default {
},
onSelectSiteTreeCheckChange(item){
this.openSiteSelectTreeForm=false;
- this.form.bizSiteName=item.selectSiteNameStr;
- this.form.bizSite=item.selectSiteCodeStr;
- // console.log(item)
+ if(item!=null){
+ this.form.bizSiteName=item.selectSiteNameStr;
+ this.form.bizSite=item.selectSiteCodeStr;
+ }
},
validateMuti (rule, value, callback) {
- // if (!this.form.country) {
- // callback(new Error("国家不能为空"));
- // }
if (!this.form.province) {
callback(new Error("省份不能为空"));
}
@@ -341,7 +350,7 @@ export default {
phone: null,
mobile: null,
customerType: null,
- settledType: null,
+ settledType: '2',
userType: null,
company: null,
deptId: null,
diff --git a/src/views/emis/emisCustomerUser/monthUserList.vue b/src/views/emis/emisCustomerUser/monthUserList.vue
index 0b5e2053..ea0f9081 100644
--- a/src/views/emis/emisCustomerUser/monthUserList.vue
+++ b/src/views/emis/emisCustomerUser/monthUserList.vue
@@ -180,7 +180,9 @@
停用
-
+
+
+
diff --git a/vue.config.js b/vue.config.js
index 8e65033c..483d3537 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -15,6 +15,7 @@ const name = process.env.VUE_APP_TITLE || '管理系统' // 网页标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口
const webpack = require("webpack");
+const Timestamp = new Date().getTime();
// vue.config.js 配置说明
//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
@@ -28,6 +29,8 @@ module.exports = {
outputDir: 'dist',
// 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
assetsDir: 'static',
+
+ indexPath: 'index.html',
// 是否开启eslint保存检测，有效值：ture | false | 'error'
lintOnSave: process.env.NODE_ENV === 'development',
// 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
@@ -74,6 +77,10 @@ module.exports = {
'@': resolve('src')
}
},
+ output: { // 输出重构 打包编译后的 文件名称 【模块名称.版本号.时间戳】
+ filename: `static/js/[name].${process.env.VUE_APP_VERSION}.${Timestamp}.js`,
+ chunkFilename: `static/js/[name].${process.env.VUE_APP_VERSION}.${Timestamp}.js`
+ },
plugins: [
new CompressionPlugin({
test: /\.(js|css|html)?$/i, // 压缩文件格式