1

src/api/administration/administration.js

@@ -97,6 +97,66 @@ export function getConditionAndAuditInfo(data) {
     data
   });
 }
+/**
+ *获取我发起的列表
+ */
+export function myInitiateAudit(data) {
+  return request({
+    url: '/workflow/MyInitiateAudit',
+    method: 'post',
+    data
+  });
+}
+/**
+ *获取审核类型
+ */
+export function gettemplatetype(data) {
+  return request({
+    url: '/workflow/GetWfTmplateType',
+    method: 'post',
+    data
+  });
+}
+/**
+ *获取审核状态
+ */
+export function getMyInitiateAuditStatus(data) {
+  return request({
+    url: '/workflow/GetMyInitiateAuditStatus',
+    method: 'post',
+    data
+  });
+}
+/**
+ *获取发起审批类型
+ */
+export function auditworkflowTemplate(data) {
+  return request({
+    url: '/workflow/AuditworkflowTemplate',
+    method: 'post',
+    data
+  });
+}
+/**
+ *
+ */
+export function getDictValueList(data) {
+  return request({
+    url: '/usercenter/GetDictValueList',
+    method: 'post',
+    data
+  });
+}
+/**
+ *
+ */
+export function calculateDuration(data) {
+  return request({
+    url: '/workflow/CalculateDuration',
+    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>
+    <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
+      <tr>
+        <th width="400">{{$t('admin.admin_company')}}</th>
+        <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 width="150">{{$t('admin.admin_operate')}}</th>
+      </tr>
+      <tr v-for="(item,index) in dataList">
+        <td>{{item.BranchName}}</td>
+        <td>{{item.PeopleNum}}</td>
+        <td>{{item.IsBind=='1'?$t('adm.adm_binded'):$t('admin.adm_binding')}}</td>
+        <td>{{item.AttendanceDate}}</td>
+        <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-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>
+
+  </div>
+</template>
+
+<script>
+  export default{
+
+    data() {
+      return {
+        loading:true,
+        //分页
+        total: 0,
+        pageSize: '',
+        currentPage: 1,
+        //请求数据
+        msg:{
+          pageIndex:1,
+          pageSize:15,
+          RB_BranchId:'-1',
+          Status:'-1',
+          IsBind:'0'
+        },
+        companyMsg:{
+          RB_Group_Id:"0",
+          Status:0,
+        },
+        //返回数据
+        dataList:[],
+        companyList:[]
+      }
+    },
+    methods:{
+      getList(){
+        this.loading=true;
+        this.apipost('User_get_AttendanceGetPageList',this.msg,res=>{
+          if(res.data.resultCode==1){
+            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 => {})
+      },
+      handleCurrentChange(val) {
+        this.msg.pageIndex = val;
+        this.getList();
+      },
+      resetPageIndex() {
+        this.msg.pageIndex = 1;
+        this.currentPage=1
+      },
+      goUrl (path,id,bId) {
+        this.$router.push({ name: path,query:{"id":id,"bId":bId} })
+      }
+    },
+    mounted() {
+      this.getList();
+      this.getCompany();
+      let userInfo=this.getLocalStorage();
+      this.companyMsg.RB_Group_Id=userInfo.RB_Group_id;//集团
+    },
+
+  }
+</script>
+
+<style>
+  .singeRowTable th{text-align: left; padding-left: 10px;}
+  .singeRowTable td{text-align: left;padding-left: 10px}
+</style>

src/pages/administration/leaveApproval.vue

@@ -61,6 +61,10 @@
   import {
     UploadSelfFile
   } from '../../api/common/common'
+  import {
+    getDictValueList,
+    calculateDuration
+  } from '../../api/administration/administration';
   export default {
     data() {
       return {
@@ -111,6 +115,20 @@
           }
         }, err => {})
 
+        // getDictValueList({Key: 'SK_AskForLeaveSet_LunchBreak'}).then(res => {
+        //   if(res.Code == 1) {
+        //
+        //   }
+        // }).catch(() => {
+        //   this.getList()
+        //       if(res.data.data[0].Content!=''&&res.data.data[0].Content!=null)
+        //       {
+        //         this.lunchTime = res.data.data[0].Content
+        //       }else{
+        //         this.lunchTime='12:00-13:00'
+        //       }
+        // })
+
       },
       getKey() {
         this.apipost('dict_post_GetList', {
@@ -308,6 +326,21 @@
           })
         }
         if(starTime != '' && endTime != '') {
+
+
+          // calculateDuration({
+          //   startTime: starTime,
+          //   endTime: endTime,
+          //   templateId: this.type,
+          //   LunchTime: this.lunchTime
+          // }).then(res => {
+          //   if(res.Code == 1) {
+          //
+          //   }
+          // }).catch(() => {
+          //
+          // })
+
           this.apipost('app_user_workflow_calculate_duration', {
             startTime: starTime,
             endTime: endTime,

src/pages/administration/myApproval.vue

@@ -30,6 +30,9 @@
 </template>
 
 <script>
+  import {
+    auditworkflowTemplate,
+  } from '../../api/administration/administration';
   export default {
     data() {
       return {
@@ -47,13 +50,16 @@
     },
     methods: {
       getList(){
-        this.apipost('app_user_workflow_auditworkflow_template',this.msg,res=>{
-          if(res.data.resultCode == 1) {
-            this.typeList=res.data.data[0].templateList
-            this.myTitle=res.data.data[0].groupName
-            this.typeLength=res.data.data[0].templateList.length
+        auditworkflowTemplate(this.msg).then(res => {
+          if(res.Code == 1) {
+            this.typeList=res.Data[0].templateList
+            this.myTitle=res.Data[0].groupName
+            this.typeLength=res.Data[0].templateList.length
           }
-        },err=>{})
+        }).catch(() => {
+
+        })
+
       },
       goUrl (path,cmd,submitCmd,id) {
         this.$router.push({ path: path,query:{"cmd":cmd,"submitCmd":submitCmd,'templateId':id}})

src/pages/administration/myApprovalList.vue

@@ -251,6 +251,11 @@
 </template>
 
 <script>
+  import {
+    myInitiateAudit,
+    gettemplatetype,
+    getMyInitiateAuditStatus
+  } from '../../api/administration/administration';
   export default {
     data() {
       return {
@@ -511,18 +516,20 @@
       },
       getList(){
         this.loading=true;
-        this.apipost('app_user_workflow_my_initiateaudit',this.msg,res=>{
-          if(res.data.resultCode == 1) {
-            this.list=res.data.data.pageData;
-            this.total=res.data.data.count;
+        myInitiateAudit({}).then(res => {
+          if(res.Code == 1) {
+            this.list=res.Data.pageData;
+            this.total=res.Data.Count;
             this.loading=false
           }
-        },err=>{})
+        }).catch(() => {
+
+        })
       },
       getApplyType(){  //模板类型
-        this.apipost('app_user_workflow_get_templatetype',{},res=>{
-          if(res.data.resultCode == 1) {
-            res.data.data.forEach(item=>{
+        gettemplatetype({}).then(res => {
+          if(res.Code == 1) {
+            res.Data.forEach(item=>{
               for(let key in item){
                 if (item.hasOwnProperty(key)){
                   this.ApplyTypeList.push({label:key,value:item[key]})
@@ -530,12 +537,14 @@
               }
             })
           }
-        },err=>{})
+        }).catch(() => {
+
+        })
       },
       getAppAuditStatus(){
-        this.apipost('app_user_workflow_get_myinitiate_auditstatus',{},res=>{
-          if(res.data.resultCode == 1) {
-            res.data.data.forEach(item=>{
+        getMyInitiateAuditStatus({}).then(res => {
+          if(res.Code == 1) {
+            res.Data.forEach(item=>{
               for(let key in item){
                 if (item.hasOwnProperty(key)){
                   this.appAuditStatusList.push({label:key,value:item[key]})
@@ -543,7 +552,9 @@
               }
             })
           }
-        },err=>{})
+        }).catch(() => {
+
+        })
       },
       handleCurrentChange(val) {
         this.msg.pageIndex = val;

src/pages/financial/empBankAccount.vue

@@ -244,7 +244,8 @@
       addData(){  //添加角色
         let userInfo=this.getLocalStorage();
 
-        this.addMsg.ObjID=this.$route.query.id?this.$route.query.id.Id:userInfo.Id
+        this.addMsg.ObjID=this.$route.query.id?this.$route.query.id:userInfo.Id;
+        console.log(this.addMsg.ObjID)
         if(this.addMsg.AccountClassify!='3' && this.addMsg.AccountClassify!='4'){
           if(this.addMsg.OpenBankName==''){
             this.$message.error(this.$t('visaT.Pleasefillin')+this.nameA)

src/router/routes.js

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