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

src/api/administration/administration.js

@@ -157,6 +157,46 @@ export function calculateDuration(data) {
     data
   });
 }
+/**
+ *考勤管理
+ */
+export function getAttendancePageList(data) {
+  return request({
+    url: '/usercenter/GetAttendancePageList',
+    method: 'post',
+    data
+  });
+}
+/**
+ *校区的岗位
+ */
+export function getDepartmentGetList(data) {
+  return request({
+    url: '/usercenter/GetDepartmentGetList',
+    method: 'post',
+    data
+  });
+}
+/**
+ *获取当前校区的考勤
+ */
+export function getAttendanceInfo(data) {
+  return request({
+    url: '/usercenter/GetAttendanceInfo',
+    method: 'post',
+    data
+  });
+}
+/**
+ *设置当前校区的考勤
+ */
+export function setAttendanceInfo(data) {
+  return request({
+    url: '/usercenter/SetAttendanceInfo',
+    method: 'post',
+    data
+  });
+}
 
 
 

src/pages/administration/Attendance.vue

 <template>
   <div class="flexOne">
-    <div class="query-box">
-      <ul>
-        <li>
-					<span><em>{{$t('system.table_company')}}</em>
-						  <el-select filterable   v-model='msg.RB_BranchId' :placeholder="$t('pub.unlimitedSel')">
-						        <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
-								<el-option v-for='item in companyList'
-                           :label='item.BName'
-                           :value='item.Id'
-                           :key='item.Id'>
-								</el-option>
-							</el-select>
-					</span>
-        </li>
-        <!--<li>
-                    <span><em>状态</em>
-                        <el-select v-model="msg.Status" placeholder="请选项">
-                             <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
-                                <el-option label='开启' value='0'></el-option>
-                                <el-option label='关闭' value='1'></el-option>
-                            </el-select>
-                    </span>
-                </li>-->
-        <li>
-          <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
-          <!--<input type="button" @click="" class="normalBtn" :value="$t('pub.addBtn')" @click="$router.push('AttendanceRules')"/> -->
-        </li>
-      </ul>
+    <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 />
+        </div>
     </div>
+  </div>
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
       <tr>
         <th width="400">{{$t('admin.admin_company')}}</th>
@@ -64,6 +44,12 @@
 </template>
 
 <script>
+  import {
+    getSchoolDropdown,
+  } from '../../api/school/index'
+  import {
+    getAttendancePageList
+  } from '../../api/administration/administration'
   export default{
 
     data() {
@@ -87,35 +73,44 @@
         },
         //返回数据
         dataList:[],
-        companyList:[]
+        schoolList: [], //校区数组
+
       }
     },
     methods:{
       getList(){
         this.loading=true;
-        this.apipost('User_get_AttendanceGetPageList',this.msg,res=>{
-          if(res.data.resultCode==1){
+        getAttendancePageList(this.msg).then(res => {
+          if(res.Code ==1){
+            this.loading=false;
+            this.dataList=res.Data.PageData;
+            this.total = res.Data.Count;
+          }else {
             this.loading=false;
-            this.dataList=res.data.data.pageData;
-            this.total = res.data.data.count;
-          }else{}
-        },err=>{})
+          }
+        })
       },
       getCompany(){ //公司
-        this.apipost('admin_get_BranchGetList', this.companyMsg, res => {
-          this.companyList = res.data.data;
-        }, err => {})
+        getSchoolDropdown({}).then(res => {
+          this.schoolList = res.Data;
+          var obj = {
+            SName: '全部',
+            SId: '-1'
+          }
+          this.schoolList.unshift(obj);
+        })
       },
       handleCurrentChange(val) {
         this.msg.pageIndex = val;
         this.getList();
       },
-      resetPageIndex() {
+      resetSearch() {
         this.msg.pageIndex = 1;
-        this.currentPage=1
+        this.currentPage=1;
+        this.getList();
       },
       goUrl (path,id,bId) {
-        this.$router.push({ name: path,query:{"id":id,"bId":bId} })
+        this.$router.push({ path: path,query:{"id":id,"bId":bId} })
       }
     },
     mounted() {
@@ -129,6 +124,8 @@
 </script>
 
 <style>
+  @import "../financial/css/cssReset.css";
+
   .singeRowTable th{text-align: left; padding-left: 10px;}
   .singeRowTable td{text-align: left;padding-left: 10px}
 </style>

src/pages/financial/financalDocument/BasicDocuments.vue

@@ -2296,6 +2296,7 @@
         this.AuditOrRefundMsg.TemplateType=this.GetDetail.TemplateType
         this.AuditOrRefundMsg.Image=JSON.stringify(imgArr);
         this.AuditOrRefundMsg.emList = this.chosenPeople;
+        this.AuditOrRefundMsg.emStrList = this.chosenPeople;
         // this.GetDetail.AuditSteps.forEach(x=>{
         //   if(x.SpecialNode === 1 && x.AuditWay === 3) {
         //     if (this.GetDetail.CashierDetail.length>0) {

src/router/routes.js

@@ -395,6 +395,11 @@ const routes = [{
         component: () =>
           import("pages/administration/Attendance.vue")
       },
+      {
+        path: "/administration/AttendanceRules", //考勤设置
+        component: () =>
+          import("pages/administration/AttendanceRules.vue")
+      },
       {
         path: "/sale/japaneseTrain", //日语培训列表
         component: () =>