update

src/components/administrative/WorkOvertime.vue

@@ -15,7 +15,18 @@
 					</span>	
 				</li>
 				<li>
-                    <li>
+					<span><em>公司</em>
+						<el-select @change="getEmployee" filterable  clearable v-model='msg.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 filterable  clearable v-model='msg.EmployeeId' :placeholder="$t('pub.unlimitedSel')">   
                             <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
@@ -47,6 +58,7 @@
 		<p style="padding:15px">
 			<span>总计分钟数：{{dataList.TotalMinutes}}</span>
 			<span style="margin-left:10px">总计天数：{{dataList.TotalDays}}</span>
+			<span style="float:right;color:red">注：每天超过19：00算加班，每天按8小时计算</span>
 		</p>
 	   <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
 		   
@@ -97,8 +109,9 @@ import moment from 'moment'
 					pageSize:15,
                     StartTime:moment().format("YYYY-MM-DD"),
                     EndTime:'',
-                    EmployeeId:'',
-                    IsLeave:-1,
+                    EmployeeId:'-1',
+					IsLeave:-1,
+					BranchId:-1,
 				},
 				companyMsg:{
 					RB_Group_Id:"0",
@@ -111,11 +124,17 @@ import moment from 'moment'
 			}
 		},
 		methods:{
-			getEmployee() { //员工
+			
+			getEmployee(val) { //员工
+				console.log("val",val)
+				let str='-1';
+				if(val){
+					str=val;
+				}
 				let userInfo = this.getLocalStorage()
 				let msg = {
 					GroupId: userInfo.RB_Group_id,
-					BranchId: '49',
+					BranchId: str,
 					DepartmentId: '-1',
 					PostId: '-1',
 					IsLeave: '0'
@@ -126,6 +145,11 @@ import moment from 'moment'
 					} 
 				}, err => {})
 			},
+			getCompany(){ //公司
+				this.apipost('admin_get_BranchGetList', this.companyMsg, res => {
+				    this.companyList = res.data.data;
+				}, err => {})	
+			},
 			getList(){
 				this.loading=true;
                 if(this.dateList && this.dateList.length>0){
@@ -163,7 +187,8 @@ import moment from 'moment'
 		},
 		mounted() {
 			this.getList();
-            this.getEmployee();
+			this.getEmployee();
+			this.getCompany();
 			let userInfo=this.getLocalStorage();
 			this.companyMsg.RB_Group_Id=userInfo.RB_Group_id;//集团
 		},

src/components/index.vue

@@ -3610,6 +3610,7 @@ export default {
       obj.SecretKey=userinfo.SecretKey;
       let ObjInfo=JSON.stringify(obj);
       if (!this.isOnline()) {
+        // url="http://zcyx.oytour.com/#/Autologin?ObjInfo="+userinfo.token+"&SecretKey="+userinfo.SecretKey;
           url="http://www.test.com:8080/#/Autologin?token="+userinfo.token+"&SecretKey="+userinfo.SecretKey;
       }else{
           url="http://zcyx.oytour.com/#/Autologin?ObjInfo="+userinfo.token+"&SecretKey="+userinfo.SecretKey;