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

src/components/FinancialModule/FProcessManagement.vue

@@ -206,7 +206,7 @@
                                         <ul class="changLogList" v-if="FinanceInfoChangeLog">
                                             <li class="changLogList_l" v-for="(log,li) in FinanceInfoChangeLog">
                                                 <span style="background-color: #47BF8C"  class="_radius_green"></span>
-                                                <p> <span class="_color_blue">{{log.emName}}</span>  <span class="fr changLog_time">{{log.Time}}</span> </p>
+                                                <p> <span class="_color_blue">{{log.emName}}</span>  <span class="fr changLog_time">{{log.UpdateDate}}</span> </p>
                                                 <p class="_dtel">{{log.StartValue}}</p>
                                             </li>
                                         </ul>

src/components/FinancialModule/MonthlyCostStatement/index.vue

@@ -121,17 +121,31 @@
                       </el-select>
                     </el-form-item>
                   </el-col> -->
+                  <!--
                   <el-col :span="4">
-                    <el-form-item label="付款对象：">
-                      <el-select  filterable  v-model='msg.ClientID' >
-                        <el-option value="" label="不限"></el-option>
-                        <el-option v-for='item in ClientAccountList'
+                    <el-form-item label="客户类型：">
+                      <el-select filterable  v-model='msg.ClientType'
+                      @change="financeinfo_post_GetClientAccountList(msg.ClientType)">
+                        <el-option value="0" label="不限"></el-option>
+                        <el-option v-for='item in ClientTypeList'
                                    :label='item.Name'
                                    :value='item.ID'
                                    :key='item.ID'>
                         </el-option>
                       </el-select>
                     </el-form-item>
+                  </el-col>  -->
+                  <el-col :span="4">
+                    <el-form-item label="付款对象：">
+                      <el-select filterable  v-model='msg.ClientID' >
+                        <el-option value="" label="不限"></el-option>
+                        <el-option v-for='item in ClientAccountList'
+                          :label='`${item.AccountAlias}(${item.AccountHolder}/${item.CardNum})`'
+                          :value='item.ID'
+                          :key='item.ID'>
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
                   </el-col>
                   <el-col :span="6">
                     <el-form-item label="金额：">
@@ -498,7 +512,7 @@ export default {
               RB_Depart_Id:'',
               sTradeDate:'',
               eTradeDate:'',
-              ClientType:'',
+              ClientType:'0',
               RemitterName:'',
               ClientID:'',
               sMoney:'',
@@ -817,16 +831,7 @@ export default {
           this.apipost('financeinfo_post_GetClientAccountList',msg, res => {
               if(res.data.resultCode == 1) {
                   let data = res.data.data;
-                  let ClientAccountList = [];
-                  data.forEach(x=>{
-                      let obj = {
-                          ID:x.ID,
-                          Name:x.AccountAlias,
-                          Nom:x.CardNum
-                      }
-                      ClientAccountList.push(obj)
-                  })
-                  this.ClientAccountList = ClientAccountList;
+                  this.ClientAccountList = data
               }
           }, err => {})
       },

src/components/FinancialModule/accDetail/CompanyAccDetail.vue

@@ -115,7 +115,7 @@
                         <el-form-item :label="$t('fnc.fkduixiang')">
                             <el-select  filterable  v-model='msg.ClientID' @change='getClientId(msg.ClientID)'>
                                 <el-option v-for='item in ClientAccountList'
-                                    :label='`${item.AccountAlias}(${item.AccountHolder})`'
+                                    :label='`${item.AccountAlias}(${item.AccountHolder}/${item.CardNum})`'
                                     :value='item.ID'
                                     :key='item.ID'>
                                 </el-option>

src/components/temp/operation.vue

@@ -406,7 +406,7 @@
                         </div>
                       </template>
                       <div class="ladder-list">
-                        <div class="ladder-title">额外奖励 {{isBranchCompany?'(需独立成团、不含落地团)':''}}</div>
+                        <div class="ladder-title">额外奖励 (散拼/单团){{isBranchCompany?' (需独立成团、不含落地团)':''}}</div>
                         <div class="CommissionInfor">
                           <span>
                             团数：<span>{{item.TravelAward.TravelNum}}</span>