团队收支

src/assets/common/lang/zh.js

@@ -1579,7 +1579,15 @@ export const adm={
   adm_xbdkdizhi:"下班打卡地址",
   adm_dkshebei:"打卡设备",
   adm_timenomorethan:"时间跨度不能超过31天!",
-  
+  adm_time:"时间",
+  adm_exportexcel:"导出报表",
+  adm_Sunday:"星期日",
+  adm_Monday:"星期一",
+  adm_Tuesday:"星期二",
+  adm_Wednesday:"星期三",
+  adm_Thursday:"星期四",
+  adm_Friday:"星期五",
+  adm_Saturday:"星期六",
   
 }
 export const visaT = {

src/assets/css/cssReset.css

@@ -481,7 +481,10 @@ vertical-align:middle
         overflow:auto;
         padding: 0 20px;
     }
-   
+    .My_table_tell .v-table-body-cell{
+        display: block!important;
+        line-height: 30px!important;
+      }
     .column-cell-class-name-test-red .v-table-body-cell{
         background-color:#e95252;
         color:#fff;

src/components/FinancialModule/FinancialDocuments.vue

@@ -805,7 +805,7 @@ export default {
                 QStartDate:'',
                 UpdateBy:'',
                 Sort:'2',
-                IsSpecial:1
+                IsSpecial:0
             },
             getCompanyMsg:{  // 公司
                 RB_Group_Id:'0',

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -22,18 +22,14 @@
   top: 55px;
   right: 0;
 }
-.page_EasyReport .v-table-body-cell{
+/* .My_table_tell .v-table-body-cell{
   display: block!important;
   line-height: 30px!important;
 }
-/* .gourl_span>span{
-  display: block;
-  width: 100%;
-  height: 100%;
-} */
+  */
 </style>
 <template>
-  <div class="page_EasyReport" v-loading="AALloading">
+  <div class="page_EasyReport My_table_tell" v-loading="AALloading">
     <div class="page_EasyReport_set clearfix">
       <el-form class="clearfix page_EasyReport_form" label-width="110px">
         <el-row style="padding:15px 0 0 0;">

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

-<style>
+<style scoped>
 .page_fnDm {
   background-color: white;
 }
-.query-box {
+.PAGE_teamRE .query-box {
   overflow: inherit;
   padding-bottom: 0;
 }
@@ -37,7 +37,7 @@
 .el-range-editor.el-input__inner {
   border-radius: 0;
 }
-.query-box {
+.PAGE_teamRE .query-box {
   border: none;
 }
 .hight_query {
@@ -404,16 +404,13 @@ tr._item_list td:last-child {
   border-radius: 4px;
   margin-bottom: 10px;
 }
-._fnDm_content .v-table-body-cell{
-  display: block!important;
-  line-height: 30px!important;
-}
+
 
 
 </style>
 
 <template>
-  <div class="page_fnDm page_RecPayQuery PAGE_teamRE" v-loading="AALloading">
+  <div class="My_table_tell page_fnDm page_RecPayQuery PAGE_teamRE" v-loading="AALloading">
     <div class="query-box">
       <el-form class="_info_box clearfix" label-width="110px">
         <el-row style="padding:15px 20px 0 0;">

src/components/administrative/Attendance.vue

@@ -36,7 +36,7 @@
 		   		<th>{{$t('adm.adm_Bindingattendance')}}</th>
 		   		<th>{{$t('admin.admin_kqTime')}}</th>
 		   		<th >{{$t('admin.admin_czPerson')}}</th>
-		   		<th width="80">{{$t('admin.admin_operate')}}</th>
+		   		<th width="150">{{$t('admin.admin_operate')}}</th>
 		   	</tr>
 		  	<tr v-for="(item,index) in dataList">
 		   		<td>{{item.BranchName}}</td>

src/components/administrative/statisticsCheckTime.vue

@@ -30,7 +30,7 @@
 									</el-option>
 								  </el-select>
 					</span></li>					
-				<li><span><em>时间</em>
+				<li><span><em>{{$t('adm.adm_time')}}</em>
 					<el-date-picker :picker-options="pickerOptions0" v-model='msg.StartTime' class='w135'  value-format="yyyy-MM-dd" type="date"></el-date-picker>
 						                       -
 		            <el-date-picker :picker-options="pickerOptions1" v-model='msg.EndTime' class='w135'  value-format="yyyy-MM-dd" type="date"></el-date-picker>
@@ -39,7 +39,7 @@
 
 				<li>
 					<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
-					<input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" />
+					<input type="button" class="normalBtn" :value="$t('adm.adm_exportexcel')" @click="exportExcel()" />
 				</li>
 			</ul>
 		</div>
@@ -48,7 +48,7 @@
 			</el-table-column>
 			<el-table-column prop="DepartmentName" :label="$t('admin.admin_Department')" min-width="120">
 			</el-table-column>
-			<el-table-column prop="EmployeeId" label="工号" min-width="80">
+			<el-table-column prop="EmployeeId" :label="$t('adm.adm_Jobnumber')" min-width="80">
 			</el-table-column>
 			<el-table-column prop="PostName" :label="$t('admin.admin_Post')" min-width="120">
 			</el-table-column>
@@ -175,7 +175,7 @@
 				let endTime = new Date(this.msg.EndTime)
 				let starTime = new Date(this.msg.StartTime)
 				if(endTime - starTime > 2.6784e9) {
-					this.$alert('时间跨度不能超过31天！！', '提示')
+					this.$alert(this.$t('adm.adm_timenomorethan'), this.$t('tips.tips'))
 					return
 				}
 				this.apipost('User_get_GetClockTimeRecordList', this.msg, res => {
@@ -236,7 +236,7 @@
 			},			
 			getWeekByDay(dayValue) {
 				var day = new Date(Date.parse(dayValue.replace(/-/g, '/')));
-				var today = new Array("星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六");
+				var today = new Array(this.$t('adm.adm_Sunday'), this.$t('adm.adm_Monday'), this.$t('adm.adm_adm_Tuesday'), this.$t('adm.adm_Wednesday'), this.$t('adm.adm_Thursday'), this.$t('adm.adm_Friday'), this.$t('adm.adm_Saturday'));
 				return today[day.getDay()];
 			},
 			handleCurrentChange(val) {

src/components/administrative/statisticsDetail.vue

@@ -210,7 +210,7 @@
 				let endTime = new Date(this.msg.EndTime)
 				let starTime = new Date(this.msg.StartTime)
 				if(endTime - starTime > 2.6784e9) {
-					this.$alert('时间跨度不能超过31天！！', '提示')
+					this.$alert(this.$t('adm.adm_timenomorethan'), this.$t('tips.tips'))
 					return
 				}