页面修改

src/pages/administration/Approval.vue

@@ -3,12 +3,8 @@
     <div class="query-box ">
       <ul>
         <li><span><em>所属校区</em>
-					<el-select :disabled="IsParentCompany!=1" v-model="QueryMsg.BranchId" @change="getList()"  >
-			            <el-option
-                    v-for="item in companyList"
-                    :label='item.BName'
-                    :value='item.Id'
-                    :key='item.Id'>
+            <el-select :disabled="IsParentCompany!=1" v-model="QueryMsg.BranchId" @change="getList()">
+              <el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'>
               </el-option>
             </el-select>
           </span></li>
@@ -19,7 +15,8 @@
       <div class="approval_title">出勤休假(4)</div>
       <div class="approval_list" v-loading='loading'>
         <div class="row">
-          <div class="approval_item col  shadow-1" v-for="(item,index) in dataList" :style="{'margin-right':dataList.length!=index+1?'40px':'0' }">
+          <div class="approval_item col  shadow-1" v-for="(item,index) in dataList"
+            :style="{'margin-right':dataList.length!=index+1?'40px':'0' }">
             <img :src="item.Icon" width="86" style="" />
             <span class="tit">{{item.Name}}</span>
             <p class="updateP">全部可见</p>
@@ -29,17 +26,17 @@
             <p class="tim">{{item.UpdateTime}}</p>
             <div class="row" style="margin-top: 50px;justify-content: space-around;width: 100%" v-if='item.Status==1'>
               <q-btn color="primary" label="审批流程" style="padding: 0 20px" @click="workflow(item.Id)"></q-btn>
-              <q-btn outline style="color: #2961FE;padding: 0 10px" label="停用" @click="updateTempStatus(item.Id,item.TemplateType,item.Status)"></q-btn>
-
+              <q-btn outline style="color: #2961FE;padding: 0 10px" label="停用"
+                @click="updateTempStatus(item.Id,item.TemplateType,item.Status)"></q-btn>
             </div>
             <div class="row" style="margin-top: 50px;justify-content: center;" v-if='item.Status==2'>
-              <q-btn  outline style="color: #2961FE;padding: 0 10px" label="启用" @click="updateTempStatus(item.Id,item.TemplateType,item.Status)"></q-btn>
+              <q-btn outline style="color: #2961FE;padding: 0 10px" label="启用"
+                @click="updateTempStatus(item.Id,item.TemplateType,item.Status)"></q-btn>
             </div>
           </div>
         </div>
       </div>
     </div>
-
   </div>
 </template>
 
@@ -52,10 +49,12 @@
     getSchoolDropdown //校区下拉
   } from '../../api/school/index'
   export default {
-
+    meta: {
+      title: "审批"
+    },
     data() {
       return {
-        loading:true,
+        loading: true,
         //请求数据
         QueryMsg: {
           BranchId: '-1'
@@ -63,25 +62,25 @@
         //返回数据
         dataList: [],
         companyList: [],
-        IsParentCompany:2,
-        drawer:false,
-        SpId:0
+        IsParentCompany: 2,
+        drawer: false,
+        SpId: 0
       }
     },
     methods: {
-      workflow(Id){
+      workflow(Id) {
         this.$router.push({
-          path: '/administration/ApprovalProcess?Id='+Id+'&Bid='+this.QueryMsg.BranchId
+          path: '/administration/ApprovalProcess?Id=' + Id + '&Bid=' + this.QueryMsg.BranchId
         });
-
       },
       getList() {
         let describe = ['适用于请假申请', '适用于出差申请', '适用于外出申请', '当员工考勤出现缺卡时，可发起补卡审批']
         let describe2 = ['精确扣减出勤时间，并同步考勤报表', '精确汇总至考勤报表', '精确汇总至考勤报表', '审批通过后考勤报表中的缺卡记录改为正常']
-
-        getTemplateList({BranchId:this.QueryMsg.BranchId}).then(res => {
-          if(res.Code == 1) {
-            this.loading=false;
+        getTemplateList({
+          BranchId: this.QueryMsg.BranchId
+        }).then(res => {
+          if (res.Code == 1) {
+            this.loading = false;
             this.dataList = res.Data[0].List;
             this.dataList.forEach((item, index) => {
               item.describe = describe[index]
@@ -94,7 +93,7 @@
       },
       getCompanyList() {
         getSchoolDropdown({}).then(res => {
-          if(res.Code == 1) {
+          if (res.Code == 1) {
             res.Data.forEach(x => {
               var obj = {
                 Id: '',
@@ -105,13 +104,10 @@
               this.companyList.push(obj);
             })
           }
-
-        }).catch(() => {
-
-        })
+        }).catch(() => {})
       },
       updateTempStatus(id, type, status) {
-        if(status == 1) {
+        if (status == 1) {
           this.$confirm('是否停用?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
@@ -121,22 +117,20 @@
               Id: id,
               TemplateType: type,
               Status: 2,
-              BranchId:this.QueryMsg.BranchId
+              BranchId: this.QueryMsg.BranchId
             }).then(res => {
-              if(res.Code == 1) {
+              if (res.Code == 1) {
                 this.$message.success("已经停用")
                 this.getList()
-              }else {
+              } else {
                 this.$message.error("操作失败")
               }
-            }).catch(() => {
-
-            })
+            }).catch(() => {})
           }).catch(() => {
             this.$message.info('已取消停用')
           });
         }
-        if(status == 2) {
+        if (status == 2) {
           this.$confirm('是否启用?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
@@ -146,38 +140,42 @@
               Id: id,
               TemplateType: type,
               Status: 1,
-              BranchId:this.QueryMsg.BranchId
+              BranchId: this.QueryMsg.BranchId
             }).then(res => {
-              if(res.Code == 1) {
+              if (res.Code == 1) {
                 this.$message.success("启用成功")
                 this.getList()
               } else {
                 this.$message.error("操作失败")
               }
-            }).catch(() => {
-
-            })
+            }).catch(() => {})
           }).catch(() => {
             this.$message.info('已取消启用')
-
           });
         }
       },
-      goUrl (path,id) {
-        this.$router.push({ name: path,query:{"id":id,"Bid":this.QueryMsg.BranchId} })
+      goUrl(path, id) {
+        this.$router.push({
+          name: path,
+          query: {
+            "id": id,
+            "Bid": this.QueryMsg.BranchId
+          }
+        })
       }
     },
     mounted() {
       let userInfo = this.getLocalStorage();
-      this.QueryMsg.BranchId=userInfo.School_Id.toString();
-      let RefBranchId=this.$route.query.Bid;
-      if(RefBranchId!=null){
-        this.QueryMsg.BranchId=RefBranchId.toString();
+      this.QueryMsg.BranchId = userInfo.School_Id.toString();
+      let RefBranchId = this.$route.query.Bid;
+      if (RefBranchId != null) {
+        this.QueryMsg.BranchId = RefBranchId.toString();
       }
       this.getCompanyList();
       this.getList()
     }
   }
+
 </script>
 
 <style>
@@ -190,13 +188,15 @@
     border-left: 3px solid #E95252;
     margin: 30px 0;
   }
-  .appProval{
+
+  .appProval {
     background: white;
     height: 90%;
     padding: 0 20px;
   }
-  .appProval .el-input__inner{
-    height: 34px!important;
+
+  .appProval .el-input__inner {
+    height: 34px !important;
   }
 
   .approval_desDiv {
@@ -254,12 +254,14 @@
     padding: 5px 10px;
     align-items: center;
   }
+
   .el-drawer__body {
     overflow: auto;
   }
+
   /*2.隐藏滚动条，太丑了*/
-  .el-drawer__container ::-webkit-scrollbar{
+  .el-drawer__container ::-webkit-scrollbar {
     display: none;
   }
-</style>
 
+</style>

src/pages/administration/Attendance.vue

@@ -3,9 +3,9 @@
     <div class="page-search row items-center">
       <div class="col row wrap q-mr-lg q-col-gutter-md">
         <div class="col-3">
-          <q-select filled stack-label @input="resetSearch()" option-value="SId"
-                    option-label="SName" v-model="msg.RB_BranchId" ref="School_Id" :options="schoolList" label="所属校区"
-                    :dense="false" emit-value map-options />
+          <q-select filled stack-label @input="resetSearch()" option-value="SId" option-label="SName"
+            v-model="msg.RB_BranchId" ref="School_Id" :options="schoolList" label="所属校区" :dense="false" emit-value
+            map-options />
         </div>
       </div>
     </div>
@@ -15,7 +15,7 @@
         <th>{{$t('admin.admin_personNumber')}}</th>
         <th>{{$t('adm.adm_Bindingattendance')}}</th>
         <th>{{$t('admin.admin_kqTime')}}</th>
-        <th >{{$t('admin.admin_czPerson')}}</th>
+        <th>{{$t('admin.admin_czPerson')}}</th>
         <th width="150">{{$t('admin.admin_operate')}}</th>
       </tr>
       <tr v-for="(item,index) in dataList">
@@ -26,20 +26,15 @@
         <td>{{item.UpdateName}}</td>
         <td>
           <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="right">
-            <el-button type="primary" icon="el-icon-edit" @click="goUrl('AttendanceRules',item.Id,item.RB_BranchId)" circle></el-button>
+            <el-button type="primary" icon="el-icon-edit" @click="goUrl('AttendanceRules',item.Id,item.RB_BranchId)"
+              circle></el-button>
           </el-tooltip>
         </td>
       </tr>
     </table>
-    <el-pagination
-      background
-      @current-change="handleCurrentChange"
-      :current-page.sync="currentPage"
-      layout="total,prev, pager, next, jumper"
-      :page-size=msg.pageSize
-      :total=total>
+    <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
+      layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
     </el-pagination>
-
   </div>
 </template>
 
@@ -50,47 +45,48 @@
   import {
     getAttendancePageList
   } from '../../api/administration/administration'
-  export default{
-
+  export default {
+    meta: {
+      title: "考勤管理"
+    },
     data() {
       return {
-        loading:true,
+        loading: true,
         //分页
         total: 0,
         pageSize: '',
         currentPage: 1,
         //请求数据
-        msg:{
-          pageIndex:1,
-          pageSize:15,
-          RB_BranchId:'-1',
-          Status:'-1',
-          IsBind:'0'
+        msg: {
+          pageIndex: 1,
+          pageSize: 15,
+          RB_BranchId: '-1',
+          Status: '-1',
+          IsBind: '0'
         },
-        companyMsg:{
-          RB_Group_Id:"0",
-          Status:0,
+        companyMsg: {
+          RB_Group_Id: "0",
+          Status: 0,
         },
         //返回数据
-        dataList:[],
+        dataList: [],
         schoolList: [], //校区数组
-
       }
     },
-    methods:{
-      getList(){
-        this.loading=true;
+    methods: {
+      getList() {
+        this.loading = true;
         getAttendancePageList(this.msg).then(res => {
-          if(res.Code ==1){
-            this.loading=false;
-            this.dataList=res.Data.PageData;
+          if (res.Code == 1) {
+            this.loading = false;
+            this.dataList = res.Data.PageData;
             this.total = res.Data.Count;
-          }else {
-            this.loading=false;
+          } else {
+            this.loading = false;
           }
         })
       },
-      getCompany(){ //公司
+      getCompany() { //公司
         getSchoolDropdown({}).then(res => {
           this.schoolList = res.Data;
           var obj = {
@@ -106,26 +102,40 @@
       },
       resetSearch() {
         this.msg.pageIndex = 1;
-        this.currentPage=1;
+        this.currentPage = 1;
         this.getList();
       },
-      goUrl (path,id,bId) {
-        this.$router.push({ path: path,query:{"id":id,"bId":bId} })
+      goUrl(path, id, bId) {
+        this.$router.push({
+          path: path,
+          query: {
+            "id": id,
+            "bId": bId
+          }
+        })
       }
     },
     mounted() {
       this.getList();
       this.getCompany();
-      let userInfo=this.getLocalStorage();
-      this.companyMsg.RB_Group_Id=userInfo.RB_Group_id;//集团
+      let userInfo = this.getLocalStorage();
+      this.companyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
     },
-
   }
+
 </script>
 
 <style>
   @import "../financial/css/cssReset.css";
 
-  .singeRowTable th{text-align: left; padding-left: 10px;}
-  .singeRowTable td{text-align: left;padding-left: 10px}
+  .singeRowTable th {
+    text-align: left;
+    padding-left: 10px;
+  }
+
+  .singeRowTable td {
+    text-align: left;
+    padding-left: 10px
+  }
+
 </style>

src/pages/course/baseSet.vue

@@ -18,8 +18,8 @@
           基础课时费：
         </div>
         <div class="col-3">
-          <q-input filled stack-label maxlength="8" :dense="false" v-model="msg.BasicHourFee" ref="BasicHourFee" class="q-pb-lg"
-           @keyup.native="checkPrice(msg,'BasicHourFee')" :rules="[val => !!val || '请填写基础课时费']" />
+          <q-input filled stack-label maxlength="8" :dense="false" v-model="msg.BasicHourFee" ref="BasicHourFee"
+            class="q-pb-lg" @keyup.native="checkPrice(msg,'BasicHourFee')" :rules="[val => !!val || '请填写基础课时费']" />
         </div>
       </div>
       <div class="col row wrap">
@@ -27,8 +27,8 @@
           基础带班人数：
         </div>
         <div class="col-3">
-          <q-input filled stack-label maxlength="6" :dense="false" v-model="msg.BasicClassNum" ref="BasicClassNum" class="q-pb-lg"
-           @keyup.native="checkInteger(msg,'BasicClassNum')" :rules="[val => !!val || '请填写基础带班人数']" />
+          <q-input filled stack-label maxlength="6" :dense="false" v-model="msg.BasicClassNum" ref="BasicClassNum"
+            class="q-pb-lg" @keyup.native="checkInteger(msg,'BasicClassNum')" :rules="[val => !!val || '请填写基础带班人数']" />
         </div>
       </div>
       <div class="col row wrap">
@@ -36,8 +36,8 @@
           课时分钟数：
         </div>
         <div class="col-3">
-          <q-input filled stack-label maxlength="6" :dense="false" v-model="msg.BasicMinutes" ref="BasicMinutes" class="q-pb-lg"
-           @keyup.native="checkInteger(msg,'BasicMinutes')" :rules="[val => !!val || '请填写课时分钟数']" />
+          <q-input filled stack-label maxlength="6" :dense="false" v-model="msg.BasicMinutes" ref="BasicMinutes"
+            class="q-pb-lg" @keyup.native="checkInteger(msg,'BasicMinutes')" :rules="[val => !!val || '请填写课时分钟数']" />
         </div>
         <div class="col-3" style="padding:18px 0 0 10px;color:gray">
           每节课的分钟数，单位为分钟计算
@@ -99,12 +99,14 @@
         <q-card-section>
           <div class="text-h6">{{commonTitle}}</div>
         </q-card-section>
-        <q-input filled stack-label maxlength="20" :dense="false" v-model="addMsg.CTypeName" label="类型名称" ref="CTypeName"
-          class="q-pb-lg" :rules="[val => !!val || '请填写类型名称']" />
-        <q-input filled stack-label :dense="false" maxlength="6" style="margin:20px 0;" v-model="addMsg.AddHourFee" label="基础课时费"
-          ref="AddHourFee" class="q-pb-lg" @keyup.native="checkPrice(addMsg,'AddHourFee')" :rules="[val => !!val || '请填写基础课时费']" />
-        <q-input filled stack-label :dense="false" maxlength="8" v-model="addMsg.DefaultClassNum" label="默认班级人数" ref="DefaultClassNum"
-          class="q-pb-lg" @keyup.native="checkInteger(addMsg,'DefaultClassNum')" :rules="[val => !!val || '请填写默认班级人数']" />
+        <q-input filled stack-label maxlength="20" :dense="false" v-model="addMsg.CTypeName" label="类型名称"
+          ref="CTypeName" class="q-pb-lg" :rules="[val => !!val || '请填写类型名称']" />
+        <q-input filled stack-label :dense="false" maxlength="6" style="margin:20px 0;" v-model="addMsg.AddHourFee"
+          label="基础课时费" ref="AddHourFee" class="q-pb-lg" @keyup.native="checkPrice(addMsg,'AddHourFee')"
+          :rules="[val => !!val || '请填写基础课时费']" />
+        <q-input filled stack-label :dense="false" maxlength="8" v-model="addMsg.DefaultClassNum" label="默认班级人数"
+          ref="DefaultClassNum" class="q-pb-lg" @keyup.native="checkInteger(addMsg,'DefaultClassNum')"
+          :rules="[val => !!val || '请填写默认班级人数']" />
         <q-card-actions align="right" class="bg-white">
           <q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="persistent=false" />
           <q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="saveClassType()" />
@@ -123,6 +125,9 @@
   } from '../../api/system/index';
 
   export default {
+    meta: {
+      title: "基础设置"
+    },
     props: {},
     components: {},
     data() {

src/pages/course/classHourReward.vue

@@ -13,7 +13,8 @@
         <div class="col-3 Sysuser_Date">
           <q-field filled>
              <template v-slot:control>
-              <el-date-picker v-model="msg.Month" @change="resetSearch" type="month" clearable @clear="resetSearch"></el-date-picker>       
+              <el-date-picker v-model="msg.Month" @change="resetSearch" type="month" clearable @clear="resetSearch">
+              </el-date-picker>       
             </template>
           </q-field>
         </div>
@@ -73,7 +74,6 @@
             </div>
           </q-td>
         </template>
-
         <template v-slot:body-cell-optioned="props">
           <q-td :props="props">
             <q-btn flat size="xs" icon="iconfont icon-xiangqing-" style="font-weight:400;color: #3FC4FF" class="q-mr-xs"
@@ -96,12 +96,6 @@
                     <q-item-label>制单</q-item-label>
                   </q-item-section>
                 </q-item>
-                <!--                            <q-item clickable v-close-popup v-if="props.row.State==1||props.row.State==2">-->
-                <!--                                <q-item-section @click="goexport(props.row)">-->
-                <!--                                    <q-item-label>导出</q-item-label>-->
-                <!--                                </q-item-section>-->
-                <!--                            </q-item>-->
-
               </q-list>
             </q-btn-dropdown>
           </q-td>
@@ -161,7 +155,6 @@
             </q-field>
           </div>
         </div>
-
         <div class="row col" style="margin-top: 30px">
           <q-btn class="q-mr-md" label="取消" @click="drawer=false" />
           <q-btn color="accent" class="q-mr-md" label="保存" @click="saveOrderInfo()" :loading="Dloading" />
@@ -183,6 +176,9 @@
     getTeacherDropDownList,
   } from '../../api/school/index';
   export default {
+    meta: {
+      title: "教师课时奖励"
+    },
     name: "classHourReward",
     data() {
       return {

src/pages/course/socialclass.vue

@@ -235,6 +235,9 @@
   import classFee from '../../components/course/classFee'
 
   export default {
+    meta: {
+      title: "社会班设置"
+    },
     props: {},
     components: {
       classFee

src/pages/course/studentClass.vue

@@ -234,6 +234,9 @@
   import studentFee from '../../components/course/studentFee'
 
   export default {
+    meta: {
+      title: "学生班设置"
+    },
     props: {},
     components: {
       studentFee
@@ -242,9 +245,6 @@
       return {
         tabCheck: 'first', //默认选第一个
         dense: false,
-        msg: {
-
-        },
         FullClassRateList: [], //头部列数据
         dataList: [], //列表数据
         isShowAddMenu: false, //显示新增上课率弹出

src/pages/sale/japaneseTrain.vue

@@ -23,7 +23,8 @@
             <q-field filled>
                <template v-slot:control>
                 <el-date-picker v-model="dateList" @change="resetSearch" value-format="yyyy-MM-dd" type="daterange" style="border:none;"
-                    range-separator="至"  start-placeholder="开学日期"  end-placeholder="结束日期" clearable @clear="resetSearch">
+                    range-separator="至"  start-placeholder="开学日期"  end-placeholder="结束日期" clearable
+                  @clear="resetSearch">
                 </el-date-picker>       
               </template>
             </q-field>
@@ -233,6 +234,9 @@
     queryCourseDropdownList,
   } from '../../api/course/index'
   export default {
+    meta: {
+      title: "日语培训"
+    },
     components: {},
     data() {
       return {
@@ -521,11 +525,11 @@
               SaleRemark: '', //备注
             }
           }
-        }).catch(() => {
-        })
+        }).catch(() => {})
       }
     }
   }
+
 </script>
 <style>
   li {

src/pages/sale/myOrder.vue

@@ -122,6 +122,9 @@
   import classinfoForm from '../../components/course/classinfo-form';
   import orderlist from '../../components/sale/orderlist'
   export default {
+    meta: {
+      title: "我的订单"
+    },
     components: {
       myOrderForm,
       classinfoForm,

src/pages/school/sysuser.vue

@@ -199,7 +199,7 @@
   import selectTree from '../../components/common/select-tree'
   export default {
     meta: {
-      title: "后台用户管理"
+      title: "员工管理"
     },
     components: {
       managerForm,

src/pages/school/teacher.vue

@@ -135,7 +135,7 @@
   import teacherShenhe from '../../components/school/teacher/teacher-shenhe'
   export default {
     meta: {
-      title: "教师管理"
+      title: "讲师管理"
     },
     components: {
       teacherForm,

src/pages/system/processSet.vue

@@ -239,6 +239,9 @@
     saveBackClassFlow
   } from '../../api/system/index'
   export default {
+    meta: {
+      title: "流程设置"
+    },
     components: {
       processForm
     },