Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/App.vue

@@ -12,7 +12,7 @@ export default {
 
 <style>
 @import url('~assets/css/font.css');
-@import url('//at.alicdn.com/t/font_2077629_byb6agikplo.css');
+@import url('//at.alicdn.com/t/font_2077629_1f7iels6h8w.css');
 
 html,
 body,

src/api/users/user.js

@@ -111,3 +111,16 @@ export function getEmployeeAddrBook(data)
       data
     })
   }
+
+   /**
+ * 获取个人中心信息
+ */
+    export function getUserCenterInfo(data)
+    {
+      return request({
+        url: '/UserInfo/GetUserCenterInfo',
+        method: 'post',
+        data
+      })
+    }
+  

src/components/school/teacher/teacher-form.vue

@@ -28,13 +28,28 @@
           <q-select filled stack-label option-value="Id" option-label="Name" v-model="chooseSpecialty" ref="SpecialtyList"
             :options="SpecialtyList" label="老师特长" :dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value map-options
             @input="schoolChagne" multiple clearable />
+          <q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.BaseHoursEnabled"
+            ref="BaseHoursEnabled" :options="BaseHoursList" label="是否启用基础课时" :dense="false" class="col-6 q-pb-lg" emit-value map-options />
+            <q-input v-if='objOption.BaseHoursEnabled==1' filled v-model="objOption.EnableTime" mask="####-##" label="启用时间" ref="EnableTime"
+            :rules="[val => !!val || '请选择启用时间']">
+            <template v-slot:append>
+              <q-icon name="event" class="cursor-pointer">
+                <q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
+                  <div class="q-gutter-md row items-start"> 
+                     <q-date  v-model="objOption.EnableTime" mask="YYYY-MM"></q-date>
+                  </div>
+                  <q-btn v-close-popup label="关闭" color="primary" flat style="float:right" />
+                </q-popup-proxy>
+              </q-icon>
+            </template>
+          </q-input>
         </div>
 
         <div class="row wrap" style="margin-top:20px;">
           <div class="col-6 q-pr-lg q-pb-lg">
             <q-uploader style="display: inline-block;height: 320px;max-width: 100%; background-repeat:no-repeat"
               :style="{'background-image':'url(' + objOption.TeacherHead + ')'}" max-files="1" hide-upload-btn
-              @rejected="onRejected" label="教师头像" :max-file-size="5*1024*1024" accept=".jpg, image/*" auto-upload
+              @rejected="onRejected" label="教师头像" :max-file-size="5*1024*1024" accept=".jpg, image/*" auto-upload 
               :factory="uploadFile" no-thumbnails @added="getType(1)">
             </q-uploader>
           </div>
@@ -145,7 +160,10 @@
           BaseStuNum: 0, //带班基础人数
           BaseHourFee: 0, //基础课时费
           Specialty: "", //老师擅长
+          BaseHoursEnabled:1,//是否启用基础课时   1是
+          EnableTime :'',//启用时间 (存到月)
         },
+        BaseHoursList:[{Id:0,Name:'关闭'},{Id:1,Name:'开启'}],
         chooseSpecialty: [],
         optionTitle: "",
         schoolList: [],
@@ -344,6 +362,9 @@
           // } else if (this.objOption.TeacherHead == '') {
           //   err_msg = "请上传用户头像"
           // }
+          if(this.objOption.BaseHoursEnabled==1 && this.objOption.EnableTime==''){
+            err_msg = "请选择日期"
+          }
           if (err_msg == "") {
             this.objOption.TeachTag = JSON.stringify(this.tags)
             saveTeacher(this.objOption).then(res => {

src/pages/activity/activeDetail.vue

 <style scoped>
-.header-box{
+  .header-box {
     display: flex;
     align-items: center;
     justify-content: space-between;
     margin-bottom: 40px;
-}
+  }
+
   .p_title {
     color: #000000;
     font-size: 20px;
     /* height: 30px !important; */
     display: flex;
     align-items: center;
-}
-.activeDetail{
+  }
+
+  .activeDetail {
     overflow-y: scroll;
-}
+  }
+  .conbox{
+    height: calc(100vh - 220px);
+    overflow-y: scroll;
+  }
+    .conbox::-webkit-scrollbar {
+    /*滚动条整体样式*/
+    width : 5px;  /*宽度竖滚动条的尺寸*/
+    height: 10px; /*高度横滚动条的尺寸*/
+  }
+  .conbox::-webkit-scrollbar-thumb {
+    /*滚动条里面的条*/
+    border-radius: 10px;
+    box-shadow   : inset 0 0 5px rgba(0, 0, 0, 0.2);
+    background   : #eee;
+  }
+  .conbox::-webkit-scrollbar-track {
+    /*滚动条里面轨道*/
+    border-radius: 5px;
+    background   : #ffffff;
+  }
+  .listTitle{
+    font-size: 18px
+  }
 </style>
 <template>
   <div class="page-body activeDetail">
     <div class="header-box">
       <div class="flex">
-          <q-btn color="accent" size="sm" class="q-mr-md" label="返回" @click="goBack" />
-                <span class="p_title">活动详情</span>
+        <q-btn color="accent" size="sm" class="q-mr-md" label="返回" @click="goBack" />
+        <span class="p_title">活动详情</span>
       </div>
       <div>
-           <q-btn color="accent" size="sm" class="q-mr-md" label="新增活动" @click="addActiveList" />
-            <q-btn color="accent" size="sm"  label="保存" @click="save" />
+         <q-btn color="accent" size="sm" class="q-mr-sm" label="新增活动" @click="addActiveList" />
+        <q-btn color="accent" size="sm" label="保存" @click="save" />
       </div>
-     
     </div>
-    <div class="">
-      <div v-for="(item,index) in ActivityTitle" :key="item.id" class="flex " >
-        <DetailItem :itemData="item" :index="index+1" @success="getItemData($event,index)" ref="child"/>
 
-        <el-tooltip class="item" effect="dark" content="删除当前活动" placement="top"  v-if="index>0">
-                      <i class="iconfont icon-img_delete_small q-ml-sm" style="color: #2961FE" @click="delActiveList(index)"></i>
-        </el-tooltip>
+    <div class="conbox">
+      <ActiveForm :save-obj="activedata" :activeTypeOptions="activityTypeList" ref="childForm"
+        @success="getactivedata" />
+
+      <div class="">
+       <div class="q-mt-lg q-mb-lg listTitle">
+         活动列表
+       </div>
+        <div v-for="(item,index) in ActivityTitle" :key="item.id" class="flex ">
+          <DetailItem :itemData="item" :index="index+1" @success="getItemData($event,index)" ref="child" />
+
+          <el-tooltip class="item" effect="dark" content="删除当前活动" placement="top" v-if="index>0">
+            <i class="iconfont icon-img_delete_small q-ml-sm" style="color: #2961FE" @click="delActiveList(index)"></i>
+          </el-tooltip>
+        </div>
 
       </div>
-        
     </div>
-    
   </div>
 </template>
 <script>
-import DetailItem from "../../components/activity/activeDetail-item"
+  import DetailItem from "../../components/activity/activeDetail-item"
+  import ActiveForm from '../../components/activity/active-from'
   export default {
     meta: {
       title: "活动详情"
     },
     components: {
-      DetailItem
+      DetailItem,
+      ActiveForm
     },
     data() {
       return {
-       msg:{
-         Id:0,
-         ActivityTitle:[]
-       },
-       ActivityTitle:[
-         {
-            Title:"",//活动大标题
-            TripSort:0,//活动排序
-            ActivityPlanList:[//活动安排
-                {
-                    TripSort:0,//排序
-                    StartTime:"",//开始时间
-                    ActivityDuration:"",//活动时长（单位：分钟）
-                    LonLat:"",//活动地址经纬度
-                    LocationName:"",//活动地址
-                    TripTitle:"",//安排标题
-                    TripContent:"",//内容
-                    TripPicList:[]//图片
-                }
-            ]
-        }
-       ],
-       item:{
-         
-       }
+        msg: {
+          Id: 0,
+          ActivityTitle: []
+        },
+        activeBaseData: {
+
+        },
+        ActivityTitle: [{
+          Title: "", //活动大标题
+          TripSort: 0, //活动排序
+          ActivityPlanList: [ //活动安排
+            {
+              TripSort: 0, //排序
+              StartTime: "", //开始时间
+              ActivityDuration: "", //活动时长（单位：分钟）
+              LonLat: "", //活动地址经纬度
+              LocationName: "", //活动地址
+              TripTitle: "", //安排标题
+              TripContent: "", //内容
+              TripPicList: [] //图片
+            }
+          ]
+        }],
+        activedata: {
+
+        },
+        activityTypeList: [],
       }
     },
 
-     mounted(){
-          if(this.$route.query.Id){
-            this.msg.Id=this.$route.query.Id
-            this.getDetail()
-          }
-      },
+    mounted() {
+      this.getActiveTypeList();
+      if (this.$route.query.Id) {
+        this.msg.Id = this.$route.query.Id
+        this.getDetail()
+      }
+    },
     methods: {
-      goBack(){
-          this.$router.go(-1)
+      goBack() {
+        this.$router.go(-1)
       },
-      
-      addActiveList(){
-        let obj={
-          Title:"",//活动大标题
-            TripSort:this.ActivityTitle.length,//活动排序
-            ActivityPlanList:[//活动安排
-                {
-                    TripSort:0,//排序
-                    StartTime:"",//开始时间
-                    ActivityDuration:"",//活动时长（单位：分钟）
-                    LonLat:"",//活动地址经纬度
-                    LocationName:"",//活动地址
-                    TripTitle:"",//安排标题
-                    TripContent:"",//内容
-                    TripPicList:[]//图片
-                }
-            ]
+
+      addActiveList() {
+        let obj = {
+          Title: "", //活动大标题
+          TripSort: this.ActivityTitle.length, //活动排序
+          ActivityPlanList: [ //活动安排
+            {
+              TripSort: 0, //排序
+              StartTime: "", //开始时间
+              ActivityDuration: "", //活动时长（单位：分钟）
+              LonLat: "", //活动地址经纬度
+              LocationName: "", //活动地址
+              TripTitle: "", //安排标题
+              TripContent: "", //内容
+              TripPicList: [] //图片
+            }
+          ]
         }
-        
+
         this.ActivityTitle.push(obj)
       },
-      delActiveList(index){
-         this.ActivityTitle.splice(index,1)
+      delActiveList(index) {
+        this.ActivityTitle.splice(index, 1)
       },
-      getItemData(val,index){
-        this.msg.ActivityTitle[index]=val
+      //活动详情列表数据
+      getItemData(val, index) {
+        this.msg.ActivityTitle[index] = val
       },
       //保存信息
       save() {
-        this.msg.ActivityTitle=this.ActivityTitle
-        this.$refs.child.map(x=>{
+        this.msg.ActivityTitle = this.ActivityTitle
+        this.$refs.child.map(x => {
           x.ruleVerification();
         })
-        let res= this.$refs.child.every(x=>{
-           return x.ruleVerification();
+        let res = this.$refs.child.every(x => {
+          return x.ruleVerification();
         })
-        if(res){
-           this.apipostDS("/api/Education/GetSetActivityPlan", this.msg, (res) => {
+        let res2 = this.$refs.childForm.saveRule()
+        if (res && res2) {
+          let msg = {
+            ...this.msg,
+            ...this.activeBaseData
+          }
+          console.log(144, msg)
+          this.apipostDS("/api/Education/SetActivity", msg, (res) => {
             if (res.data.resultCode === 1) {
               this.Success(res.data.message);
+              this.getDetail()
             } else {
               this.Error(res.data.message);
             }
           })
-        } 
+        }
+      },
+      getDetail() {
+        this.apipostDS("/api/Education/GetActivity", {
+          Id: this.msg.Id
+        }, (res) => {
+          if (res.data.resultCode === 1) {
+            this.ActivityTitle = res.data.data.ActivityTitleList
+            this.activedata = res.data.data
+          }
+        })
       },
-        getDetail(){
-        this.apipostDS("/api/Education/GetActivity", {Id:this.msg.Id}, (res) => {
-            if (res.data.resultCode === 1) {
-              this.ActivityTitle=res.data.data.ActivityTitleList
-            } 
-          })
-      }
+      //获取活动类型下拉
+      getActiveTypeList() {
+        this.apipostDS("/api/Education/GetCommerceActivityTypeList", {}, (res) => {
+          if (res.data.resultCode === 1) {
+            this.activityTypeList = res.data.data;
+            this.activityTypeList.unshift({
+              Id: -1,
+              TypeName: "不限"
+            })
+          }
+        })
+      },
+      //活动基础数据
+      getactivedata(val) {
+        this.activeBaseData = val
+      }
     }
   }
 

src/pages/activity/copyActive.vue

+<style scoped>
+  .header-box {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 40px;
+  }
+
+  .p_title {
+    color: #000000;
+    font-size: 20px;
+    /* height: 30px !important; */
+    display: flex;
+    align-items: center;
+  }
+
+  .activeDetail {
+    overflow-y: scroll;
+  }
+  .conbox{
+    height: calc(100vh - 220px);
+    overflow-y: scroll;
+  }
+    .conbox::-webkit-scrollbar {
+    /*滚动条整体样式*/
+    width : 5px;  /*宽度竖滚动条的尺寸*/
+    height: 10px; /*高度横滚动条的尺寸*/
+  }
+  .conbox::-webkit-scrollbar-thumb {
+    /*滚动条里面的条*/
+    border-radius: 10px;
+    box-shadow   : inset 0 0 5px rgba(0, 0, 0, 0.2);
+    background   : #eee;
+  }
+  .conbox::-webkit-scrollbar-track {
+    /*滚动条里面轨道*/
+    border-radius: 5px;
+    background   : #ffffff;
+  }
+  .listTitle{
+    font-size: 18px
+  }
+</style>
+<template>
+  <div class="page-body activeDetail">
+    <div class="header-box">
+      <div class="flex">
+        <q-btn color="accent" size="sm" class="q-mr-md" label="返回" @click="goBack" />
+        <span class="p_title">复制活动</span>
+      </div>
+      <div>
+         <q-btn color="accent" size="sm" class="q-mr-sm" label="新增活动" @click="addActiveList" />
+        <q-btn color="accent" size="sm" label="保存" @click="save" />
+      </div>
+    </div>
+
+    <div class="conbox">
+      <ActiveForm :save-obj="activedata" :activeTypeOptions="activityTypeList" ref="childForm"
+        @success="getactivedata" />
+
+      <div class="">
+       <div class="q-mt-lg q-mb-lg listTitle">
+         活动列表
+       </div>
+        <div v-for="(item,index) in ActivityTitle" :key="item.id" class="flex ">
+          <DetailItem :itemData="item" :index="index+1" @success="getItemData($event,index)" ref="child" />
+
+          <el-tooltip class="item" effect="dark" content="删除当前活动" placement="top" v-if="index>0">
+            <i class="iconfont icon-img_delete_small q-ml-sm" style="color: #2961FE" @click="delActiveList(index)"></i>
+          </el-tooltip>
+        </div>
+
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import DetailItem from "../../components/activity/activeDetail-item"
+  import ActiveForm from '../../components/activity/active-from'
+  export default {
+    meta: {
+      title: "活动详情"
+    },
+    components: {
+      DetailItem,
+      ActiveForm
+    },
+    data() {
+      return {
+        msg: {
+          Id: 0,
+          ActivityTitle: []
+        },
+        activeBaseData: {
+
+        },
+        ActivityTitle: [{
+          Title: "", //活动大标题
+          TripSort: 0, //活动排序
+          ActivityPlanList: [ //活动安排
+            {
+              TripSort: 0, //排序
+              StartTime: "", //开始时间
+              ActivityDuration: "", //活动时长（单位：分钟）
+              LonLat: "", //活动地址经纬度
+              LocationName: "", //活动地址
+              TripTitle: "", //安排标题
+              TripContent: "", //内容
+              TripPicList: [] //图片
+            }
+          ]
+        }],
+        activedata: {
+
+        },
+        activityTypeList: [],
+      }
+    },
+
+    mounted() {
+      this.getActiveTypeList();
+      if (this.$route.query.Id) {
+        this.msg.Id = this.$route.query.Id
+        this.getDetail()
+      }
+    },
+    methods: {
+      goBack() {
+        this.$router.go(-1)
+      },
+
+      addActiveList() {
+        let obj = {
+          Title: "", //活动大标题
+          TripSort: this.ActivityTitle.length, //活动排序
+          ActivityPlanList: [ //活动安排
+            {
+              TripSort: 0, //排序
+              StartTime: "", //开始时间
+              ActivityDuration: "", //活动时长（单位：分钟）
+              LonLat: "", //活动地址经纬度
+              LocationName: "", //活动地址
+              TripTitle: "", //安排标题
+              TripContent: "", //内容
+              TripPicList: [] //图片
+            }
+          ]
+        }
+
+        this.ActivityTitle.push(obj)
+      },
+      delActiveList(index) {
+        this.ActivityTitle.splice(index, 1)
+      },
+      //活动详情列表数据
+      getItemData(val, index) {
+        this.msg.ActivityTitle[index] = val
+      },
+      //保存信息
+      save() {
+        this.msg.ActivityTitle = this.ActivityTitle
+        this.$refs.child.map(x => {
+          x.ruleVerification();
+        })
+        let res = this.$refs.child.every(x => {
+          return x.ruleVerification();
+        })
+        let res2 = this.$refs.childForm.saveRule()
+        if (res && res2) {
+          let msg = {
+            ...this.msg,
+            ...this.activeBaseData
+          }
+          msg.Id=0
+          this.apipostDS("/api/Education/SetActivity", msg, (res) => {
+            if (res.data.resultCode === 1) {
+              this.Success("操作成功");
+              // this.getDetail()
+              this.$router.push("/activity/activityList")
+            } else {
+              this.Error(res.data.message);
+            }
+          })
+        }
+      },
+      getDetail() {
+        this.apipostDS("/api/Education/GetActivity", {
+          Id: this.msg.Id
+        }, (res) => {
+          if (res.data.resultCode === 1) {
+            this.ActivityTitle = res.data.data.ActivityTitleList
+            this.activedata = res.data.data
+            this.activedata.StartTime=""
+            this.activedata.StartTimeStr=""
+            this.activedata.EndTime=""
+            this.activedata.EndTimeStr=""
+            this.activedata.SignStartTime=""
+            this.activedata.SignStartTimeStr=""
+            this.activedata.SignEndTime=""
+            this.activedata.SignEndTimeStr=""
+          }
+        })
+      },
+      //获取活动类型下拉
+      getActiveTypeList() {
+        this.apipostDS("/api/Education/GetCommerceActivityTypeList", {}, (res) => {
+          if (res.data.resultCode === 1) {
+            this.activityTypeList = res.data.data;
+            this.activityTypeList.unshift({
+              Id: -1,
+              TypeName: "不限"
+            })
+          }
+        })
+      },
+      //活动基础数据
+      getactivedata(val) {
+        this.activeBaseData = val
+      }
+    }
+  }
+
+</script>
+<style lang="sass">
+  @import url('~assets/css/table.sass')
+
+</style>

src/pages/course/chapter.vue

@@ -81,17 +81,17 @@
         <q-card-section>
           <div class="text-subtitle1 q-mb-md">章节学习内容</div>
           <div v-html="viewObj.ChapterContent" v-if="viewObj.ChapterContent!=''"
-            class="q-pa-md bg-grey-2 rounded-borders"></div>
+            class="q-pa-md bg-grey-2 rounded-borders chapter-Content"></div>
           <div class="text-grey-3 text-center" v-else>未添加内容</div>
         </q-card-section>
         <q-card-section>
           <div class="text-subtitle1 q-mb-md">教学重点</div>
-          <div v-html="viewObj.Objectives" v-if="viewObj.ChapterContent!=''"></div>
+          <div v-html="viewObj.Objectives" class="chapter-Content" v-if="viewObj.ChapterContent!=''"></div>
           <div class="text-grey-3 text-center" v-else>未添加内容</div>
         </q-card-section>
         <q-card-section>
           <div class="text-subtitle1 q-mb-md">学生学习要求</div>
-          <div v-html="viewObj.Requirement" v-if="viewObj.ChapterContent!=''"></div>
+          <div v-html="viewObj.Requirement" class="chapter-Content" v-if="viewObj.ChapterContent!=''"></div>
           <div class="text-grey-3 text-center" v-else>未添加内容</div>
         </q-card-section>
       </q-card>
@@ -389,5 +389,14 @@
   }
 
   /**@import url('~assets/css/table.sass')*/
-
+  .chapter-Content h6,
+  .chapter-Content h5,
+  .chapter-Content h4,
+  .chapter-Content h3,
+  .chapter-Content h2,
+  .chapter-Content h1{
+    font-size: unset !important;
+    line-height: unset !important;
+    letter-spacing: unset !important;
+  }
 </style>

src/pages/course/classManage.vue

@@ -327,8 +327,8 @@
       }
     },
     created() {
-      if (this.$route.query) {
-        this.msg.ClassName = this.$route.query.ClassName
+      if (this.$route.query && this.$route.query.ClassName) {
+        this.msg.ClassName = decodeURI(this.$route.query.ClassName) 
       }
       this.getClassStatus();
       this.getSchool();
@@ -517,9 +517,10 @@
         this.isShowClassInfo = true;
       },
       gomonthLessonCost(row){
+        let ClassName = encodeURI(row.ClassName)
         this.OpenNewUrl('/course/monthLessonCost' , {
           ClassId: row.ClassId,
-          ClassName: row.ClassName,
+          ClassName: ClassName,
         });
       }
     }

src/pages/course/course.vue

@@ -332,7 +332,7 @@
     }),
     mounted() {
       if(this.$route.query && this.$route.query.Name){//从订单完成统计跳转过来的带的参数
-        this.msg.CourseName = this.$route.query.Name
+        this.msg.CourseName =  decodeURI(this.$route.query.Name) 
       }
       this.getCategorytree();
       this.currentUrl = this.$route.path;

src/pages/course/lessonNotes.vue

@@ -210,12 +210,12 @@
             align: "left",
             format: (val, row) => `${val}课时`
           },
-          {
-            name: "CreateByName",
-            label: "创建人",
-            field: "CreateByName",
-            align: "left"
-          },
+        //   {
+        //     name: "CreateByName",
+        //     label: "创建人",
+        //     field: "CreateByName",
+        //     align: "left"
+        //   },
           {
             name: "UpdateTimeStr",
             label: "更新时间",

src/pages/course/prepareclassDetails.vue

@@ -134,12 +134,23 @@
     opacity: 0.8;
   }
   .prePare_Content{
-    width:430px;
+    /* width:430px; */
     min-height:100px;
     height:auto;
     background-color: #F0F5FB;
     padding:20px;
     margin:20px auto;
+    font-family: '微软雅黑' !important;
+  }
+  .prePare_Content h6,
+  .prePare_Content h5,
+  .prePare_Content h4,
+  .prePare_Content h3,
+  .prePare_Content h2,
+  .prePare_Content h1{
+    font-size: unset !important;
+    line-height: unset !important;
+    letter-spacing: unset !important;
   }
 </style>
 
@@ -227,7 +238,7 @@
                 <div class="text14-o" v-html="x.ProjectContent"></div>
                 <template v-if="data.IsEditSummary>0">
                   <div v-if="x.Summary" style="width: 100%;background: #F0F5FB;border-radius: 5px;padding:10px;margin-bottom:20px;">
-                    {{x.Summary}}
+                    单项总结：{{x.Summary}}
                   </div>
                 </template>
                 <template v-else>

src/pages/financial/TeamRevenueReport.vue

@@ -526,12 +526,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="班号":">
+            <el-form-item label="班号:">
               <el-input v-model="msg.ClassNo"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="班级id:">
+            <el-form-item label="班级编号:">
               <el-input v-model="msg.ClassId"></el-input>
             </el-form-item>
           </el-col>
@@ -573,7 +573,7 @@
               关闭团队收支</el-button>
           </el-col>
           
-          <el-col :span="4" style="margin-left:110px">
+          <el-col :span="2" >
             <div style="height: 40px;padding-top: 5px;">
               <!-- <button class="normalBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button> -->
               <q-btn color="primary" size="11px" :label="$t('pub.searchBtn')" @click="resetPageIndex(),getPageList()" style="marginRight:10px"/>
@@ -1478,9 +1478,10 @@
           })
         }else if(column.title == '已上课时'){
           if(rowData.ClassId>0){
+            let ClassName = encodeURI(rowData.ClassName)
             this.OpenNewUrl('/course/monthLessonCost' , {
               ClassId: rowData.ClassId,
-              ClassName:rowData.ClassName,
+              ClassName:ClassName,
             });
           }
         }

src/pages/financial/financalDocument/BasicDocuments.vue

@@ -3332,10 +3332,11 @@
       },
       jumpbjPage(path, item) {
         if (path == 'classManage') {
+          let Name = encodeURI(item.ClassName)
           this.$router.push({
             path: '/course/' + path,
             query: {
-              'ClassName': item.ClassName
+              'ClassName': Name
             }
           })
         } else if (path == 'paymentDetail') {

src/pages/financial/financalDocument/FinancialDocuments.vue

@@ -2424,16 +2424,21 @@
         this.currentPage = 1;
       },
       goUrl(path, id, Conditon, pageIndex) {
-        this.$router.push({
-          path: '/financial/financalDocument/' + path,
-          query: {
-            "id": id,
+        this.OpenNewUrl('/financial/financalDocument/' + path, {
+          "id": id,
             "Conditon": Conditon,
             "pageIndex": pageIndex,
-            blank: 'y',
-            tab: '单据详情'
-          }
-        })
+        });
+        // this.$router.push({
+        //   path: '/financial/financalDocument/' + path,
+        //   query: {
+        //     "id": id,
+        //     "Conditon": Conditon,
+        //     "pageIndex": pageIndex,
+        //     blank: 'y',
+        //     tab: '单据详情'
+        //   }
+        // })
       },
       goUrlWeituo(path) {
         let tempStr = '/financial/financalDocument/' + path;

src/pages/financial/financalDocument/FinancialDocumentsDetail.vue

@@ -2192,10 +2192,11 @@
       },
       jumpbjPage(path, item) {
         if (path == 'classManage') {
+          let Name = encodeURI(item.ClassName)
           this.$router.push({
             path: '/course/' + path,
             query: {
-              'ClassName': item.ClassName
+              'ClassName': Name
             }
           })
         } else if (path == 'paymentDetail') {

src/pages/financial/orderCompleteStatistics.vue

@@ -628,12 +628,15 @@
       
       }
     },
-    goUrl(path,Name){
+    goUrl(path,Names){
+      let Name = encodeURI(Names)
+      console.log(Name)
       this.OpenNewUrl(path, {
           Name: Name,
       });
     },
-    goUrl2(path,Name){//班级
+    goUrl2(path,Names){//班级
+      let Name = encodeURI(Names)
       this.OpenNewUrl(path, {
         ClassName: Name,
       });

src/pages/financial/saleAchievementsRank.vue

@@ -118,20 +118,6 @@
                 <el-table-column prop="GuestNum" label="报名人数"> </el-table-column>
                 <el-table-column prop="JKNum" label="结课人数"> </el-table-column>
                 <el-table-column prop="OrderNum" label="订单数量"> </el-table-column>
-                <!-- <el-table-column label="操作">
-                    <template slot-scope="scope">
-                        <div class="_icon_btn">
-                            <el-tooltip class="item" effect="dark" content="查看老师" placement="top">
-                                <i class="iconfont icon-sousuo"
-                                    @click="goUrl('teacherclassfee',scope.row.AccountId)"></i>
-                            </el-tooltip>
-                            <el-tooltip class="item" effect="dark" content="查看学生" placement="top">
-                                <i class="iconfont icon-sousuo"
-                                    @click="goUrl('studentsClassfee',scope.row.AccountId)"></i>
-                            </el-tooltip>
-                        </div>
-                    </template>
-                </el-table-column> -->
 
             </el-table>
             <div style="margin-top: 10px;text-align: center;">

src/pages/financial/teacherclassfee.vue

@@ -222,7 +222,8 @@
                 this.msg.EndMonth = this.$route.query.EndMonth
             }
             if(this.$route.query && this.$route.query.ClassName){
-                this.ClassName = [this.$route.query.ClassName]
+                let Name = decodeURI(this.$route.query.ClassName)
+                this.ClassName = [Name]
             }
             
         },

src/pages/sale/contractManage.vue

@@ -251,7 +251,7 @@
     created() {},
     mounted() {
       if(this.$route.query && this.$route.query.Name){//从订单完成统计跳转过来的带的参数
-        this.msg.ContractNo = this.$route.query.Name
+        this.msg.ContractNo = decodeURI(this.$route.query.Name)
       }
       this.getList()
     },

src/pages/sale/orderStatistics.vue

@@ -2,9 +2,17 @@
   <div class="page-body myOrder">
     <div style="width: 100%;display: flex;justify-content: space-between">
       <span style="font-size: 20px;font-weight: 400; ">报名统计</span>
-      <span>
-        <q-toggle v-model="msg.Q_NotCollect" label="只看款未收齐订单" class="q-mb-md" false-value="0" true-value="1"
-          @input="resetSearch" /></span>
+      
+        <div style="display: flex;align-items: center;">
+          <span>
+            <q-toggle v-model="msg.Q_NotCollect" label="只看款未收齐订单" class="q-mb-md" false-value="0" true-value="1"
+            @input="resetSearch" />
+          </span>
+          <div class="page-option" style="margin-left: 10px;">
+            <q-btn color="accent" size="sm" class="q-mr-md"  label="导出" @click="goexport()" />
+          </div>
+        </div>
+        
     </div>
     <div class="page-search row items-center">
       <div class="col row wrap q-mr-lg q-col-gutter-md">
@@ -131,7 +139,10 @@
   import myOrderForm from '../../components/sale/myOrder-form'
   import classinfoForm from '../../components/course/classinfo-form';
   import orderlist from '../../components/sale/orderlist'
-  import {    queryEmployee  } from '../../api/users/user'
+  import {    queryEmployee  } from '../../api/users/user';
+  import {
+        EduDownLoad,
+    } from '../../api/common/common';
   export default {
     meta: {
       title: "报名统计"
@@ -345,6 +356,10 @@
                 }
             })
         },
+        goexport(){//导出
+          var msg = JSON.parse(JSON.stringify(this.msg));
+            EduDownLoad("/order/GetOrderPageListStatisticsToExcel", msg, "订单列表.xls")
+        }
     }
   }
 

src/pages/sale/studyOrderStatistics.vue

@@ -2,9 +2,15 @@
   <div class="page-body myOrder">
     <div style="width: 100%;display: flex;justify-content: space-between">
       <span style="font-size: 20px;font-weight: 400; ">留学就业统计</span>
-      <span>
-        <q-toggle v-model="msg.Q_NotCollect" label="只看款未收齐订单" class="q-mb-md" false-value="0" true-value="1"
-          @input="resetSearch" /></span>
+      <div style="display: flex;align-items: center;">
+        <span>
+          <q-toggle v-model="msg.Q_NotCollect" label="只看款未收齐订单" class="q-mb-md" false-value="0" true-value="1"
+            @input="resetSearch" /></span>
+            <div class="page-option" style="margin-left: 10px;">
+              <q-btn color="accent" size="sm" class="q-mr-md"  label="导出" @click="goexport()" />
+            </div>
+      </div>
+      
     </div>
     <div class="page-search row items-center">
       <div class="col row wrap q-mr-lg q-col-gutter-md">
@@ -111,6 +117,9 @@
   import {
     queryEmployee
   } from '../../api/users/user'
+  import {
+        EduDownLoad,
+    } from '../../api/common/common';
   export default {
     meta: {
       title: "留学就业统计"
@@ -293,6 +302,10 @@
 
         })
       },
+      goexport(){//导出
+        var msg = JSON.parse(JSON.stringify(this.msg));
+            EduDownLoad("/order/GetStudyOrderPageListStatisticsToExcel", msg, "留学就业统计.xls")
+      }
     }
   }
 

src/pages/user/personalData.vue

@@ -21,6 +21,12 @@
         width: 1px;
         padding: 20px 26px;
     }
+    .personalData .box_r2{
+        flex: 1;
+        width: 1px;
+        padding: 0px 0px;
+
+    }
 
     .personalData .box_l_t {
         margin-top: 28px;
@@ -126,11 +132,16 @@
                 <span>{{showObj.DeptName}}</span>
             </div>
             <!-- <div class="box_l_title" style="margin-top: 55px;">概要信息</div> -->
+            <div :class="rightType==0?'box_l_title':'box_l_cen'" @click='rightType=0'>概要信息</div>
             <div :class="rightType==3?'box_l_title':'box_l_cen'" @click='rightType=3'>预警信息</div>
             <div :class="rightType==1?'box_l_title':'box_l_cen'" @click='rightType=1'>账户资料</div>
             <div :class="rightType==2?'box_l_title':'box_l_cen'" @click='rightType=2'>密码修改</div>
         </div>
-        <div class="box_r">
+        <!-- 个人资料 -->
+        <div v-if='rightType == 0' class="box_r2">
+            <summaryInfo></summaryInfo>
+        </div>
+        <div class="box_r" v-if='rightType !=0'>
             <template v-if='rightType == 1'>
                 <div style="font-size: 16px;font-weight: bold;color: #000000;">账户资料</div>
                 <div class="box_r_title">账户资料</div>
@@ -213,19 +224,20 @@
         NewPassWord:'',
         NewSurePassWord:'',
     }
+    import summaryInfo from '../../components/user/summaryInfo'
     export default {
         meta: {
             title: "个人资料"
         },
         components: {
-
+            summaryInfo
         },
         data() {
             return {
                 loading1: false,
                 loading2:false,
                 showObj: {},
-                rightType: 1,//右边显示类型
+                rightType: 0,//右边显示类型
                 datamodify: {},
                 CompanyList: [],
                 passwordMsg:Object.assign({},defaultpassword),

src/router/routes.js

@@ -741,6 +741,11 @@ const routes = [{
     component: () =>
       import("pages/activity/activeDetail.vue")
   },
+  {
+    path: "/activity/copyActive", //活动 复制活动
+    component: () =>
+      import("pages/activity/copyActive.vue")
+  },
   {
     path: "/activity/advmanager", //活动 广告图管理
     component: () =>
@@ -835,7 +840,7 @@ const routes = [{
       component: () =>
         import("pages/course/chapter.vue")
     },
-		
+
     {
       path: "/course/coursejob", //作业管理
       component: () =>
@@ -985,9 +990,9 @@ const routes = [{
   },
 },
 {
-	path: "/course/chapter-editor", //章节管理
-	component: () =>
-		import("pages/course/chapterEditor.vue")
+  path: "/course/chapter-editor", //章节管理
+  component: () =>
+    import("pages/course/chapterEditor.vue")
 },
 {
   path: "*",