This commit is contained in:
linfso 2024-05-16 17:08:05 +08:00
parent 970b015cf6
commit 208d8e4fb7
8 changed files with 71 additions and 50 deletions

View File

@ -4,6 +4,7 @@ VUE_APP_TITLE = 管理系统
# 开发环境配置
ENV = 'development'
VUE_APP_VERSION = '20240516'
# 开发环境
#VUE_APP_BASE_API = '/dev-api'
VUE_APP_PDOMAIN = 'tanex56'

View File

@ -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'

View File

@ -6,6 +6,8 @@ NODE_ENV = production
# 测试环境配置
ENV = 'staging'
VUE_APP_VERSION = '20240516'
# 测试环境
VUE_APP_BASE_API = '/stage-api'
VUE_APP_PDOMAIN = 'tanex56'

View File

@ -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(){

View File

@ -2,7 +2,7 @@
<div >
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="100px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="结算类型" prop="settledType">
<el-select v-model="form.settledType" placeholder="请选择">
<el-option
@ -13,14 +13,12 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
</el-col> -->
<!-- <el-col :span="12">
<el-form-item label="专属业务员" prop="opEmpCode" >
<EmisUserSimplePicker0 :placeholder="$t('专属业务员')" v-model="form.opEmpCode" ></EmisUserSimplePicker0>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="12">
<el-form-item label="回款联系人" prop="payee" >
<EmisUserSimplePicker1 :placeholder="$t('回款联系人')" v-model="form.payee" ></EmisUserSimplePicker1>

View File

@ -12,6 +12,12 @@
<el-input v-model="form.customerName" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="英文简称" prop="customerNameEn">
<el-input v-model="form.customerNameEn" placeholder="请输入英文简称" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="联系人" prop="customerName">
<el-input v-model="form.contact" placeholder="" />
@ -22,12 +28,8 @@
<el-input v-model="form.phone" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="主所属网点" prop="ownerSite">
<EmisSiteSimplePicker :placeholder="$t('所属站点')" v-model="form.ownerSite" ></EmisSiteSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item label="结算类型" prop="settledType">
<el-select v-model="form.settledType" placeholder="请选择">
<el-option
@ -38,18 +40,13 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="称呼" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入称呼" />
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="英文简称" prop="customerNameEn">
<el-input v-model="form.customerNameEn" placeholder="请输入英文简称" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="邮箱" prop="email">
@ -77,6 +74,11 @@
<el-input v-model="form.monthlyPayCode" placeholder="月结卡号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="首次签约日期" prop="firstSigningDay">
<el-input v-model="form.firstSigningDay" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所属国家" prop="country">
@ -84,7 +86,7 @@
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="省市区" prop="areaInfo">
<el-form-item label="省市区" prop="province">
<div style="display: inline-flex">
<ProvincePicker v-model="form.province" :countryCode="form.country" ></ProvincePicker>
<CityPicker v-model="form.city" :parentCode="form.province" ></CityPicker>
@ -106,21 +108,30 @@
<EmisUserSimplePicker0 :placeholder="$t('专属业务员')" v-model="form.opEmpCode" ></EmisUserSimplePicker0>
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="主所属网点" prop="ownerSite">
<EmisSiteSimplePicker :placeholder="$t('所属站点')" v-model="form.ownerSite" ></EmisSiteSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="回款联系人" prop="payee" >
<EmisUserSimplePicker1 :placeholder="$t('回款联系人')" v-model="form.payee" ></EmisUserSimplePicker1>
<EmisUserSimplePicker1 :placeholder="$t('回款联系人')" :siteCode="form.ownerSite" v-model="form.payee" ></EmisUserSimplePicker1>
</el-form-item>
</el-col>
<el-col :span="8">
<!-- postCode="OP" -->
<el-form-item label="销售联系人" prop="salesmen" >
<EmisUserSimplePicker2 :placeholder="$t('销售联系人')" v-model="form.salesmen" ></EmisUserSimplePicker2>
<EmisUserSimplePicker2 :placeholder="$t('销售联系人')" :siteCode="form.ownerSite" v-model="form.salesmen" ></EmisUserSimplePicker2>
</el-form-item>
</el-col>
<el-col :span="24">
<!-- postCode="OP" -->
<el-form-item label="业务网点范围" prop="bizSite" >
<div @click="handleSelectSite">选择网点</div>
<el-button
size="mini"
type="text"
@click="handleSelectSite"
>选择网点</el-button>
<el-input v-model="form.bizSiteName" rows="5" type="textarea" disabled placeholder="" />
</el-form-item>
</el-col>
@ -133,8 +144,8 @@
<el-col :span="12">
<el-form-item label="开通OMS" prop="blOpenOms" >
<el-radio-group v-model="form.blOpenOms">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
<el-radio :label="'1'">是</el-radio>
<el-radio :label="'0'">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@ -142,16 +153,16 @@
<el-col :span="12">
<el-form-item label="是否短信" prop="blSms">
<el-radio-group v-model="form.blSms">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
<el-radio :label="'1'">是</el-radio>
<el-radio :label="'0'">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否启用" prop="status">
<el-form-item label="启用状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
<el-radio :label="'1'">是</el-radio>
<el-radio :label="'0'">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@ -177,7 +188,7 @@
</div>
<el-dialog title="选择网点" :visible.sync="openSiteSelectTreeForm" width="40%" :destroy-on-close="true" v-dialogDrag append-to-body>
<EmisSiteSelectTreePicker :selectSiteCode="form.bizSite" :selectSiteName="form.bizSiteName" @on-changed="onSelectSiteTreeCheckChange" ></EmisSiteSelectTreePicker>
<EmisSiteSelectTreePicker :selectSiteCode="form.bizSite" :selectSiteName="form.bizSiteName" @on-changed="onSelectSiteTreeCheckChange" @on-cancel="onSelectSiteTreeCheckChange" ></EmisSiteSelectTreePicker>
</el-dialog>
</div>
@ -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,

View File

@ -180,7 +180,9 @@
<el-tag v-if="scope.row.status==0" type="danger">停用</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('专属业务员')" align="center" prop="opEmpName" min-width="100" />
<el-table-column :label="$t('首次签约日期')" align="center" prop="firstSigningDay" min-width="100" />
<!-- <el-table-column :label="$t('专属业务员')" align="center" prop="opEmpName" min-width="100" /> -->
<!-- <el-table-column :label="$t('微信昵称')" align="center" prop="nickName" min-width="120" /> -->
<!-- <el-table-column :label="$t('openid')" align="center" prop="openid" min-width="100" /> -->
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" />

View File

@ -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, // 压缩文件格式