Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/Finance/DailyFeePayment.vue

@@ -86,6 +86,7 @@
                 height="700"
                 :data="tableData"
                 border
+                :row-class-name="rowClassName"
                 style="width: 100%">
                     <el-table-column
                         prop="rouNumber"
@@ -529,6 +530,15 @@ export default {
                     message: '已取消生成'
                 });          
             });
+        },
+        rowClassName({ row, rowIndex }) {
+            console.log(row, rowIndex);
+            
+            if (rowIndex % 2 === 0) {
+                return 'warning-row';
+            }else{
+                return 'success-row';
+            }
         }
     },
     beforeRouteLeave(to,from,next) {
@@ -577,6 +587,13 @@ export default {
 }
 </script>
 <style>
+    .el-table .warning-row {
+        background: #f9f9f9;
+    }
+
+    .el-table .success-row {
+        background: #efefef;
+    }
     .visa-box{
         background-color: #fff;
         padding: 10px;

src/components/Finance/FeesPage.vue

@@ -61,7 +61,7 @@
         </el-tabs>
         <div>
             <el-table height="600" ref="multipleTable" border :data="tableData" tooltip-effect="dark" style="width: 100%"
-                @selection-change="handleSelectionChange">
+                @selection-change="handleSelectionChange" :row-class-name="rowClassName">
                 <el-table-column type="selection" width="40" v-if="formInline.Status == 0">
                 </el-table-column>
                 <el-table-column prop="priceNameContent" label="费用名称">
@@ -382,6 +382,15 @@ export default {
                 dangerouslyUseHTMLString: true,
                 customClass:'message_box_alert'
             });
+        },
+        rowClassName({ row, rowIndex }) {
+            console.log(row, rowIndex);
+            
+            if (rowIndex % 2 === 0) {
+                return 'warning-row';
+            }else{
+                return 'success-row';
+            }
         }
     },
     mounted() {
@@ -400,6 +409,13 @@ export default {
 }
 </script>
 <style>
+.el-table .warning-row {
+    background: #f9f9f9;
+}
+
+.el-table .success-row {
+    background: #efefef;
+}
 .fesspage-box {
     background-color: #fff;
     padding: 10px;

src/components/Finance/Overspend.vue

@@ -41,7 +41,7 @@
                 </div>
             </div>
             <div>
-                <el-table :data="tableData" border style="width: 100%">
+                <el-table :data="tableData" border style="width: 100%" :row-class-name="rowClassName">
                     <el-table-column prop="rowNumber" label="序号" width="60">
                     </el-table-column>
                     <el-table-column prop="priceName" label="费用名称" width="180">
@@ -493,6 +493,15 @@ export default {
                     });
                 }
             })
+        },
+        rowClassName({ row, rowIndex }) {
+            console.log(row, rowIndex);
+            
+            if (rowIndex % 2 === 0) {
+                return 'warning-row';
+            }else{
+                return 'success-row';
+            }
         }
     },
     mounted() {
@@ -515,6 +524,13 @@ export default {
 }
 </script>
 <style>
+.el-table .warning-row {
+    background: #f9f9f9;
+}
+
+.el-table .success-row {
+    background: #efefef;
+}
 .overspend-all {
     background-color: #fff;
     padding: 10px;

src/components/Finance/RvsReport.vue

@@ -21,7 +21,7 @@
                 应收合计：{{total_fr}} 已收合计：{{total_pr}} 余款合计：{{total_balance}}
             </div>
             <div class="rvsreport-table">
-                <el-table  :row-style="changRed" height="720" :data="tableData" style="width: 100%">
+                <el-table  :row-style="changRed" height="720" :data="tableData" style="width: 100%" :row-class-name="rowClassName">
                     <el-table-column label="应收报表">
                         <el-table-column prop="no" label="序号" width="50">
                         </el-table-column>
@@ -212,6 +212,15 @@ export default {
                 }
             })
         },
+        rowClassName({ row, rowIndex }) {
+            console.log(row, rowIndex);
+            
+            if (rowIndex % 2 === 0) {
+                return 'warning-row';
+            }else{
+                return 'success-row';
+            }
+        }
     },
     mounted(){
         this.userid=JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
@@ -219,6 +228,13 @@ export default {
 }
 </script>
 <style>
+.el-table .warning-row {
+    background: #f9f9f9;
+}
+
+.el-table .success-row {
+    background: #efefef;
+}
 .rvsreport-all{
     background-color: #fff;
     padding: 10px;

src/components/Finance/Sendack.vue

@@ -43,6 +43,7 @@
                 <el-table
                 :data="groupsendData"
                 border
+                :row-class-name="rowClassName"
                 style="width: 100%">
                     <el-table-column
                         type="index"
@@ -637,6 +638,15 @@ export default {
             console.log(this.value)
             this.PostShareGroupInfo();
             this.PostPaymentRefundAndOtherMoneyItemByDiId();
+        },
+        rowClassName({ row, rowIndex }) {
+            console.log(row, rowIndex);
+            
+            if (rowIndex % 2 === 0) {
+                return 'warning-row';
+            }else{
+                return 'success-row';
+            }
         }
     },
     filters:{
@@ -665,6 +675,13 @@ export default {
 }
 </script>
 <style>
+.el-table .warning-row {
+    background: #f9f9f9;
+}
+
+.el-table .success-row {
+    background: #efefef;
+}
 .sendack-all{
     background-color: #fff;
     padding: 10px;

src/components/child/index.vue

@@ -11,7 +11,7 @@
             </div>
             <template>
                 <el-table :data="tableDatas.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border
-                    style="width: 100%">
+                    style="width: 100%" :row-class-name="rowClassName">
                     <el-table-column prop="num" label="序 号" width="55">
                         <template slot-scope="scope">
                             {{ (currentPage - 1) * pageSize + scope.$index + 1 }}
@@ -163,6 +163,15 @@ export default {
                     console.log(that.tableDatas)
                 }
             })
+        },
+        rowClassName({ row, rowIndex }) {
+            console.log(row, rowIndex);
+            
+            if (rowIndex % 2 === 0) {
+                return 'warning-row';
+            }else{
+                return 'success-row';
+            }
         }
     },
     mounted() {
@@ -173,6 +182,13 @@ export default {
 }
 </script>
 <style>
+.el-table .warning-row {
+    background: #f9f9f9;
+}
+
+.el-table .success-row {
+    background: #efefef;
+}
 .communal-list {
     background-color: #fff;
     padding: 10px;

src/components/home.vue

@@ -81,6 +81,7 @@
                 <div class="avatar-name">员工: {{ userinif.userInfo.cnName }}</div>
                 <div class="avatar-division">职位: {{ userinif.userInfo.jobName }}</div>
                 <div>部门: {{ userinif.userInfo.depName }}</div>
+                <div>系统版本: {{ systemversion }}</div>
               </div>
             </div>
           </div>
@@ -253,6 +254,7 @@
 export default {
   data() {
     return {
+      systemversion: 'V1.0.1',
       userId:'',
       token:'',
       menuList: [],
@@ -870,6 +872,10 @@ html {
   background-image: linear-gradient(rgba(29, 33, 41, 0.03),
       rgba(29, 33, 41, 0.04));
   color: #967bbd;
+  transition: all 0.2s ease;
+  transform: translateY(-3px);
+    
+  
 }
 
 .btnradio {