Merge branch 'custom' of http://8.136.199.33:3000/eta_front/eta_front into fix_jb

src/views/ppt_manage/newVersion/components/formatEl/SheetEl.vue

@@ -93,6 +93,7 @@ export default {
     td{
         width: auto;
         height: auto;
+        padding: 0.4em 0;
 			/* 	min-width: 35px; */
 				border: 1px solid #747474;
         word-break: break-all;

src/views/system_manage/components/addUserDialog.vue

@@ -163,19 +163,19 @@ import {patternEmail,isMobileNo,checkPassWord} from '@/utils/commonOptions';
                         }
                     }, trigger: 'blur'}],
                     depart:[{ required: true, message: this.$t('SystemManage.DepartManage.use_add_valid_msg08'), trigger: 'change' }],
-                    employeeNumber:[{validator:(rule,value,callback)=>{
-                        if(!value){
-                            callback()
-                            return 
-                        }
-                        // 取消空格
-                        let tempValue = parseInt(value.replaceAll(' ',''))
-                        if(!tempValue || value.replaceAll(' ','').length!=4){
-                            callback(new Error(this.$t('SystemManage.DepartManage.use_add_valid_msg09')))
-                        }else{
-                            callback()
-                        }
-                    },trigger:'blur'}],
+                    // employeeNumber:[{validator:(rule,value,callback)=>{
+                    //     if(!value){
+                    //         callback()
+                    //         return 
+                    //     }
+                    //     // 取消空格
+                    //     let tempValue = parseInt(value.replaceAll(' ',''))
+                    //     if(!tempValue || value.replaceAll(' ','').length!=4){
+                    //         callback(new Error(this.$t('SystemManage.DepartManage.use_add_valid_msg09')))
+                    //     }else{
+                    //         callback()
+                    //     }
+                    // },trigger:'blur'}],
                     role:[{ required: true, message: this.$t('SystemManage.DepartManage.use_add_valid_msg10'), trigger: 'change' }],
                 }
                 },

src/views/system_manage/departManage.vue

@@ -970,7 +970,7 @@ export default {
 		/* 新建用户 */
 		addUser() {
 			this.isAddUser = true;
-			this.hasEmployeeNo=false
+			// this.hasEmployeeNo=false
 			this.userForm = {
 				title:this.$t('SystemManage.DepartManage.user_add_btn'),
 				account:'',
@@ -1265,7 +1265,7 @@ export default {
 				areacode:item.TelAreaCode,
 				IsLdap:item.IsLdap||0
 			}
-			this.hasEmployeeNo=!!item.EmployeeId
+			// this.hasEmployeeNo=!!item.EmployeeId
 			this.isAddUser = true;
 		},
 		/* 删除用户 */

src/views/system_manage/etaBaseConfig.vue

@@ -452,9 +452,9 @@ export default {
                 WxAppSecret:'',
                 WxId:'',
                 H5ReportShareImg:'',
-                SmartReportSheetSize: '9',//智能研报表格字号
-                ReportSheetSize: '9',//研报表格字号
-                EnReportSheetSize: '9',//英文研报表格字号
+                SmartReportSheetSize: '12',//智能研报表格字号
+                ReportSheetSize: '12',//研报表格字号
+                EnReportSheetSize: '12',//英文研报表格字号
 
                 UseXf:0,//是否启用科大讯飞服务 0否 1是
                 XfAppid:'',
@@ -468,8 +468,8 @@ export default {
                 EnPptCoverImgs:[],//英文ppt封面列表
                 EnPptBackgroundImg:'',//英文ppt背景图
                 EnPptBottomImg:'',//英文ppt封底图
-                CnPptSheetSize: '9',//中文ppt表格字号
-                EnPptSheetSize: '9',//英文ppt表格字号
+                CnPptSheetSize: '12',//中文ppt表格字号
+                EnPptSheetSize: '12',//英文ppt表格字号
 
                 WatermarkReport:false,//研报分享水印