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

src/components/OP/Groupedit.vue

@@ -47,7 +47,7 @@
                         <!-- <el-input el-input v-model="ruleForm.customerunits"></el-input> -->
                     </el-form-item>
                     <el-form-item label-width="120px" label="出访国家:" prop="countriesvisited">
-                        <el-input @blur="splicingname" el-input v-model="ruleForm.countriesvisited"></el-input>
+                        <el-input @blur="splicingname" el-input v-model="ruleForm.countriesvisited" placeholder="按照“国家1、国家2、国家3”录入"></el-input>
                     </el-form-item>
                     <el-form-item label-width="120px" label="出访时间:" prop="visitingtime">
                         <el-date-picker type="date" placeholder="选择日期" v-model="ruleForm.visitingtime"

src/components/statistics/Reportstbale.vue

@@ -194,6 +194,9 @@
                             prop="cardType"
                             label="卡类型"
                             width="80">
+                                <template slot-scope="scope">
+                                    {{ scope.row.cardType=='其他'?'—':scope.row.cardType==''?'—':scope.row.cardType }}
+                                </template>
                             </el-table-column>
                             <el-table-column
                             label="状态"
@@ -293,7 +296,8 @@
                 <div class="reportsbale-table-li">
                     <el-table
                     :data="groupHotelFeeViews"
-                    style="width: 100%">
+                    style="width: 100%"
+                    :row-style="TableRowStyle">
                         <el-table-column
                         label="酒店预订费用">
                             <el-table-column
@@ -434,6 +438,9 @@
                                     prop="cardType"
                                     label="卡类型"
                                     width="50">
+                                        <template slot-scope="scope">
+                                            {{ scope.row.cardType=='其他'?'—':scope.row.cardType==''?'—':scope.row.cardType }}
+                                        </template>
                                     </el-table-column>
                                     <el-table-column
                                     label="状态"
@@ -457,7 +464,8 @@
                     <el-table
                     :data="groupCTGGRFeeViews"
                     border
-                    style="width: 100%;">
+                    style="width: 100%;"
+                    :row-style="TableRowStyle">
                         <el-table-column
                         label="地接费用">
                             <el-table-column
@@ -549,7 +557,8 @@
                     <el-table
                     :data="groupAirFeeViews"
                     border
-                    style="width: 100%;">
+                    style="width: 100%;"
+                    :row-style="TableRowStyle">
                         <el-table-column
                         label="机票费用">
                             <el-table-column
@@ -621,6 +630,9 @@
                             prop="cardType"
                             label="卡类型"
                             width="80">
+                                <template slot-scope="scope">
+                                    {{ scope.row.cardType=='其他'?'—':scope.row.cardType==''?'—':scope.row.cardType }}
+                                </template>
                             </el-table-column>
                             <el-table-column
                             label="状态"
@@ -642,7 +654,8 @@
                     <el-table
                     :data="groupVisaFeeViews"
                     border
-                    style="width: 100%;">
+                    style="width: 100%;"
+                    :row-style="TableRowStyle">
                         <el-table-column
                         label="签证费用">
                             <el-table-column
@@ -694,6 +707,9 @@
                             prop="cardType"
                             label="卡类型"
                             width="80">
+                                <template slot-scope="scope">
+                                    {{ scope.row.cardType=='其他'?'—':scope.row.cardType==''?'—':scope.row.cardType }}
+                                </template>
                             </el-table-column>
                             <el-table-column
                             label="状态"
@@ -715,7 +731,8 @@
                     <el-table
                     :data="groupInvitationalFeeViews"
                     border
-                    style="width: 100%;">
+                    style="width: 100%;"
+                    :row-style="TableRowStyle">
                         <el-table-column
                         label="邀请/公务活动费用">
                             <el-table-column
@@ -816,7 +833,8 @@
                     <el-table
                     :data="groupInsuranceFeeViews"
                     border
-                    style="width: 100%;">
+                    style="width: 100%;"
+                    :row-style="TableRowStyle">
                         <el-table-column
                         label="保险费用">
                             <el-table-column
@@ -877,7 +895,8 @@
                     <el-table
                     :data="groupDecreaseFeeViews"
                     border
-                    style="width: 100%;">
+                    style="width: 100%;"
+                    :row-style="TableRowStyle">
                         <el-table-column
                         label="其他款项费用">
                             <el-table-column
@@ -1081,6 +1100,17 @@ export default {
                 }
             }, 16);
         },
+        TableRowStyle({ row, rowIndex }) {
+            // 注意，这里返回的是一个对象
+            let rowBackground = {};
+            if (row.isPay==1) {
+                rowBackground.background = "#f0f9ff";
+                return rowBackground;
+            }else{
+                rowBackground.background = "#FFFFFF";
+                return rowBackground;
+            }
+        },
         // 为了计算距离顶部的高度，当高度大于60显示回顶部图标，小于60则隐藏
         scrollToTop() {
             console.log(123);