Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/accDetail/GuideAccount.vue

@@ -13,14 +13,8 @@
         cursor: pointer;
         text-decoration: underline;
     }
-    ._bg__ ._bg_red:hover{
-        color: rgb(230, 97, 97);
-    }
-    ._bg__ ._bg_green:hover{
-        color:rgb(66, 182, 132);
-    }
-    ._bg_red{color: #E95252;}
-    ._bg_green{color: #2BB87C}
+    .Guid_bg_red{color: #E95252;}
+    .Guid_bg_green{color: #2BB87C}
     ._addChuNa_tit{color: gray;margin-bottom: 10px;}
     ._addChuNa_tit span{ color:#333333}
 </style>
@@ -95,7 +89,7 @@
                         </el-form-item>
                     </el-col>
                     
-                    <el-col :span="8" :gutter="35">
+                    <!-- <el-col :span="8" :gutter="35">
                         <el-form-item :label="$t('fnc.a_hkfkriqi')">
                                 <el-date-picker class="h34"
                                     @change="timeAdd"
@@ -105,17 +99,32 @@
                                     :range-separator="$t('restaurant.res_To')">
                                 </el-date-picker>
                             </el-form-item>
+                    </el-col> -->
+                    <el-col :span="6">
+                      <el-form-item label="汇款/付款日期">
+                        <el-date-picker
+                          @change="timeAdd"
+                          v-model="productionDate"
+                          type="daterange"
+                          range-separator="-"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"
+                          value-format="yyyy-MM-dd"
+                        ></el-date-picker>
+                      </el-form-item>
                     </el-col>
-                    <el-col :span="8" :gutter="35">
-                        <el-form-item label="发团日期">
-                                <el-date-picker class="h34"
-                                    @change="timeAddByTC"
-                                    v-model="productionDateByTC"
-                                    type="daterange"
-                                    value-format="yyyy-MM-dd"
-                                    :range-separator="$t('restaurant.res_To')">
-                                </el-date-picker>
-                            </el-form-item>
+                    <el-col :span="6">
+                      <el-form-item label="发团日期">
+                        <el-date-picker
+                          @change="timeAddByTC"
+                          v-model="productionDateByTC"
+                          type="daterange"
+                          range-separator="-"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"
+                          value-format="yyyy-MM-dd"
+                        ></el-date-picker>
+                      </el-form-item>
                     </el-col>
                     <!-- <el-col :span="4" :gutter="35">
                         <el-form-item label="费用类型">
@@ -148,8 +157,8 @@
                     <th>{{$t('fnc.a_hkfkshijian')}}</th>
                     <th>{{$t('fnc.jylshuihao')}}</th>
                     <th>制单人</th>
-                    <th>{{$t('fnc.skjine')}}</th>
-                    <th>{{$t('fnc.fkjine')}}</th>
+                    <th>待收金额</th>
+                    <th>待付金额</th>
                     <th>总计</th>
                 </tr>
                 <!-- <tr>
@@ -170,9 +179,9 @@
                     </td> -->
                     <td>{{item.TypeName}}</td>
                     <td>{{item.BName}}</td>
-                    <!-- <td><span class="cursorpointer" :class="item.Type==1?'_bg_green':'_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td> -->
+                    <!-- <td><span class="cursorpointer" :class="item.Type==1?'Guid_bg_green':'Guid_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td> -->
                      <td>
-                        <span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrlNew(item)">
+                        <span class="cursorpointer" :class=" item.Type === 1 ? 'Guid_bg_green' : 'Guid_bg_red'" @click="goUrlNew(item)">
                             {{ item.FinanceId }}</span>
                     </td>
                     <td>