ETA1.0.6 准备提测

src/views/system_manage/etaBaseConfig.vue

@@ -38,9 +38,9 @@
             </div>
             <div class="part-base-tow part" >
                 <div class="side">
-                    <el-form-item label="短信模板" prop="SMSTemplateId" >
+                    <el-form-item label="短信模板" prop="LoginSmsTpId" >
                         <div class="form-item-type-two">
-                            <el-input type="text" v-model="formData.SMSTemplateId" placeholder="请输入短信模板ID" >
+                            <el-input type="text" v-model="formData.LoginSmsTpId" placeholder="请输入短信模板ID" >
                                 <template slot="suffix">
                                     <el-tooltip content="登陆系统或找回密码或验证身份" placement="top">
                                         <div class="input-suffix">
@@ -51,9 +51,9 @@
                             </el-input>
                         </div>
                     </el-form-item>
-                    <el-form-item label="邮件模板" prop="EmailTemplateTitle" >
+                    <el-form-item label="邮件模板" prop="LoginEmailTemplateSubject" >
                         <div class="form-item-type-two">
-                            <el-input type="text" v-model="formData.EmailTemplateTitle" placeholder="请输入邮件标题" >
+                            <el-input type="text" v-model="formData.LoginEmailTemplateSubject" placeholder="请输入邮件标题" >
                                 <template slot="suffix">
                                         <el-tooltip content="登陆系统或找回密码或验证身份" placement="top">
                                     <div class="input-suffix">
@@ -64,35 +64,35 @@
                             </el-input>
                         </div>
                     </el-form-item>
-                    <el-form-item prop="EmailTemplateContent" >
+                    <el-form-item prop="LoginEmailTemplateContent" >
                         <froala id="email-content-editor"
                             ref="emailContentEditor" 
                             tag="textarea" 
-                            :config="{...disclaimerConfig,...emailEditorConfig}" v-model="formData.EmailTemplateContent">
+                            :config="{...disclaimerConfig,...emailEditorConfig}" v-model="formData.LoginEmailTemplateContent">
                         </froala>
                         <ConfigAnnotation picName="emailContentTemplate" @showImage="previewImage" picHintText=""/>
                     </el-form-item>
                 </div>
                 <div class="side">
-                    <el-form-item label="研报分享抬头" prop="ShareLetterhead">
-                        <el-input type="text" v-model="formData.ShareLetterhead" placeholder="请输入抬头名称" />
+                    <el-form-item label="研报分享抬头" prop="H5ShareName">
+                        <el-input type="text" v-model="formData.H5ShareName" placeholder="请输入抬头名称" />
                     </el-form-item>
-                    <el-form-item label="关联公众号" prop="AppID">
-                        <el-input type="text" v-model="formData.AppID" placeholder="请输入AppID" />
+                    <el-form-item label="关联公众号" prop="WxAppId">
+                        <el-input type="text" v-model.trim="formData.WxAppId" placeholder="请输入AppID" />
                     </el-form-item>
-                    <el-form-item prop="AppSecret">
-                        <el-input type="text" v-model="formData.AppSecret" placeholder="请输入AppSecret" />
+                    <el-form-item prop="WxAppSecret">
+                        <el-input type="text" v-model.trim="formData.WxAppSecret" placeholder="请输入AppSecret" />
                     </el-form-item>
-                    <el-form-item prop="PrimevalId">
-                        <el-input type="text" v-model="formData.PrimevalId" placeholder="请输入原始Id" />
+                    <el-form-item prop="WxId">
+                        <el-input type="text" v-model.trim="formData.WxId" placeholder="请输入原始Id" />
                     </el-form-item>
                     <div class="input-hint">注：关联公众号填写时，AppID、AppSecret原始ID均需填写。</div>
-                    <el-form-item  prop="OfficialAccountsLogo">
+                    <el-form-item  prop="H5ReportShareImg">
                         <ImgUpload 
-                            :imgUrl="formData.OfficialAccountsLogo"
+                            :imgUrl="formData.H5ReportShareImg"
                             @showImage="showImage"
-                            @upload="(file)=>handleUploadImage(file,'OfficialAccountsLogo')"
-                            @remove="deleteFormImg('OfficialAccountsLogo')"
+                            @upload="(file)=>handleUploadImage(file,'H5ReportShareImg')"
+                            @remove="deleteFormImg('H5ReportShareImg')"
                             />
                         <!-- <ConfigAnnotation picName="OfficialAccountsLogoPic" @showImage="previewImage"
                             picHintText=""/> -->
@@ -269,14 +269,14 @@ export default {
                 CompanyName:'',//公司名称
                 CompanyWatermark:'',//公司水印
                 WatermarkChart:0,//是否在研报图表中使用水印 0否 1是
-                SMSTemplateId:'',//短信模板Id
-                EmailTemplateTitle:'', // 邮件标题
-                EmailTemplateContent:'', // 邮件内容
-                ShareLetterhead:'', // 分享抬头名称
-                AppID:'',
-                AppSecret:'',
-                PrimevalId:'',
-                OfficialAccountsLogo:'',
+                LoginSmsTpId:'',//短信模板Id
+                LoginEmailTemplateSubject:'', // 邮件标题
+                LoginEmailTemplateContent:'', // 邮件内容
+                H5ShareName:'', // 分享抬头名称
+                WxAppId:'',
+                WxAppSecret:'',
+                WxId:'',
+                H5ReportShareImg:'',
 
                 UseXf:0,//是否启用科大讯飞服务 0否 1是
                 XfAppid:'',
@@ -295,10 +295,10 @@ export default {
             rules: {
                 Disclaimer:[{ required: true, message: '请输入免责声明', trigger: 'blur' }],
                 CompanyName:[{ required: true, message: '请输入公司名称', trigger: 'blur' }],
-                SMSTemplateId:[{ required: true, message: '请输入短信模板ID', trigger: 'blur' }],
-                EmailTemplateTitle:[{ required: true, message: '请输入邮件标题', trigger: 'blur' }],
-                EmailTemplateContent:[{ required: true, message: '请输入邮件内容', trigger: 'blur' }],
-                ShareLetterhead:[{ required: true, message: '请输入抬头名称', trigger: 'blur' }],
+                LoginSmsTpId:[{ required: true, message: '请输入短信模板ID', trigger: 'blur' }],
+                LoginEmailTemplateSubject:[{ required: true, message: '请输入邮件标题', trigger: 'blur' }],
+                LoginEmailTemplateContent:[{ required: true, message: '请输入邮件内容', trigger: 'blur' }],
+                H5ShareName:[{ required: true, message: '请输入抬头名称', trigger: 'blur' }],
                 
                 //CompanyWatermark:[{ required: true, message: '请选择水印图片', trigger: 'blur' }],
                 CnPptBackgroundImg:[{ required: true, message: '请选择中文PPT背景图', trigger: 'blur' }],
@@ -471,27 +471,10 @@ export default {
             })
         },
         saveBaseConfig(){
-            //froala 在非本地环境会有版权标识，在表单验证前去掉
-            this.formData.Disclaimer = this.formData.Disclaimer.replace(/<p data-f-id=\"pbf\".*?<\/p>/g, "");
-            this.formData.EmailTemplateContent = this.formData.EmailTemplateContent.replace(/<p data-f-id=\"pbf\".*?<\/p>/g, "");
             //rules验证
             this.$refs.baseConfigForm.validate((valid,obj)=>{
-
                 console.log('valid',valid)
                 console.log('obj',obj)
-                if(this.formData.AppID || this.formData.AppSecret || this.formData.PrimevalId){
-                    // 只要有一个填，其他必填
-                    if(!this.formData.AppID){
-                        this.$message.warning('AppID 不能为空')
-                        return 
-                    }else if(!this.formData.AppSecret){
-                        this.$message.warning('AppSecret 不能为空')
-                        return 
-                    }else{
-                        this.$message.warning('PrimevalId 不能为空')
-                        return 
-                    }
-                }
                 //如果是中英文ppt没填写，切换标签栏
                 const keys = Object.keys(obj)
                 const cnProps = ['CnPptCoverImgs','CnPptBackgroundImg','CnPptBottomImg']
@@ -507,6 +490,22 @@ export default {
                     }
                 }
                 if(valid){
+                    if(!(this.formData.WxAppId && this.formData.WxAppSecret && this.formData.WxId)){
+                        // 只要有一个填，其他必填
+                        if(!this.formData.WxAppId){
+                            this.$message.warning('AppID 不能为空')
+                            return 
+                        }else if(!this.formData.WxAppSecret){
+                            this.$message.warning('AppSecret 不能为空')
+                            return 
+                        }else{
+                            this.$message.warning('原始Id 不能为空')
+                            return 
+                        }
+                    }
+                    //froala 在非本地环境会有版权标识，在表单验证前去掉
+                    this.formData.Disclaimer = this.formData.Disclaimer.replace(/<p data-f-id=\"pbf\".*?<\/p>/g, "");
+                    this.formData.LoginEmailTemplateContent = this.formData.LoginEmailTemplateContent.replace(/<p data-f-id=\"pbf\".*?<\/p>/g, "");
                     this.formData.WatermarkChart = ''+(this.checkList.includes('研报图表')?true:false)
                     this.formData.UseXf = ''+(this.Iflytek?true:false)
                     const CnPptCoverImgs = this.formData.CnPptCoverImgs.join(',')