no message

src/components/FinancialModule/domesticCommissionTW.vue

@@ -92,9 +92,9 @@
                         :style="{'border-top': y!=0? '1px solid #eeee':''}"
                         style="text-align: left;">
                             <span style="cursor: pointer;">
-                                {{x.Rate}}
+                                {{x.Rate?x.Rate:'未设汇率'}}
                             </span>
-                           {{x.CurrencyName}}
+                           <span style="color: #6E6E6E;">{{x.CurrencyName}}</span>
                            
                         </div>
                     </div>
@@ -370,7 +370,7 @@
                     Money: Money,
                     CurrencyId: 1,
                     XSTC: 1,
-                    OtherType:43,
+                    OtherType:69,
                     ReFinanceId:item.Id
                 }
                 let query = {

src/components/FinancialModule/domesticCommissiondetailsTW.vue

@@ -33,7 +33,8 @@
           <em>期数</em>
           <el-select v-model="msg.PeriodId" size="mini" @change="handleCurrentChange(1)">
             <el-option label="不限" :value="0"></el-option>
-            <el-option v-for="(item,index) in PeriodsList" :key="item.index" :label="item.Name" :value="item.Id">
+            <el-option v-for="(item,index) in PeriodsList" :key="item.index" 
+            :label="item.Name" :value="item.Id">
             </el-option>
           </el-select>
         </li>
@@ -41,21 +42,25 @@
           <em>出团公司</em>
           <el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)">
             <el-option label="不限" :value="-1"></el-option>
-            <el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName" :value="item.Id">
+            <el-option v-for="(item,index) in BranchList" :key="item.index" 
+            :label="item.BName" :value="item.Id">
             </el-option>
           </el-select>
         </li>
         <li>
           <em>公司</em>
-          <el-select v-model="msg.RB_Branch_Id" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'>
+          <el-select v-model="msg.RB_Branch_Id" size="mini" @change="handleCurrentChange(1)" 
+          :disabled='disabled'>
             <el-option label="不限" :value="-1"></el-option>
-            <el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName" :value="item.Id">
+            <el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName" 
+            :value="item.Id">
             </el-option>
           </el-select>
         </li>
         <li>
           <em>部门</em>
-          <el-select v-model="msg.RB_Department_Id" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'>
+          <el-select v-model="msg.RB_Department_Id" size="mini" @change="handleCurrentChange(1)" 
+          :disabled='disabled'>
             <el-option label="不限" :value="-1"></el-option>
             <el-option v-for="(item,index) in departMentList" :key="item.index" :label="item.DepartmentName"
               :value="item.DepartmentID"></el-option>
@@ -63,7 +68,8 @@
         </li>
         <li>
           <em>人员</em>
-          <el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'>
+          <el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" 
+          filterable :disabled='disabled'>
             <el-option label="不限" :value="-1"></el-option>
             <el-option v-for="(item,index) in searchList" :key="item.index" :label="item.name" :value="item.empId">
             </el-option>
@@ -78,7 +84,8 @@
         <li>
           <em>团号</em>
           <el-input maxlength="50" v-model="msg.TCNUM" class="permiss-input w200"
-            @keyup.native.enter="handleCurrentChange(1)" :placeholder="$t('pub.pleaseImport')"></el-input>
+            @keyup.native.enter="handleCurrentChange(1)" @change="handleCurrentChange(1)" 
+            :placeholder="$t('pub.pleaseImport')"></el-input>
         </li>
 
 
@@ -130,7 +137,7 @@
 
         </td>
         <td>{{item.LineName}}</td>
-        <td>{{item.OrderId}}</td>
+        <td>{{item.OrderId?item.OrderId:'-'}}</td>
         <!-- <td>{{item.TCProfit}}</td> -->
         <td>{{item.GuestCount}}</td>
         <td>{{item.CommissionMoney}}</td>