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

src/components/FinancialModule/domesticCommissionTW.vue

@@ -86,23 +86,23 @@
                     </span>
                 </td>
                 <td>
-                    <div style="display: flex;justify-content: space-between;align-items: center;padding: 0 5px;">
-                    <div>
-                        <div v-for="(x,y) in item.CurrencyRateList" 
-                        :style="{'border-top': y!=0? '1px solid #eeee':''}"
-                        style="text-align: left;">
-                            <span style="cursor: pointer;">
-                                {{x.Rate?x.Rate:'未设汇率'}}
-                            </span>
-                           <span style="color: #6E6E6E;">{{x.CurrencyName}}</span>
-                           
-                        </div>
-                    </div>
-                    <div style="flex-shrink: 0;">
-                        <i v-if="item.FinanceIdList.length==0" 
-                       class="el-icon-edit" 
-                       style="color: #409eff;cursor: pointer;" @click="editRate(item)"></i>
-                    </div>
+                    <div style="display: flex;justify-content: space-between;align-items: center;padding: 0 5px;"
+                    v-for="(x,y) in item.CurrencyRateList" :key="y">
+                            <div
+                            :style="{'border-top': y!=0? '1px solid #eeee':''}"
+                            style="text-align: left;">
+                                <span style="cursor: pointer;">
+                                    {{x.Rate?x.Rate:'未设汇率'}}
+                                </span>
+                               <span style="color: #6E6E6E;">{{x.CurrencyName}}</span>
+                               
+                            </div>
+                            <div style="flex-shrink: 0;justify-content: end;align-items: flex-end;" 
+                            v-if="y==item.CurrencyRateList.length-1">
+                                <i v-if="item.FinanceIdList.length==0" 
+                               class="el-icon-edit" 
+                               style="color: #409eff;cursor: pointer;" @click="editRate(item)"></i>
+                            </div>
                     </div>
                 </td>
                 <td>
@@ -115,7 +115,7 @@
                             <el-button type="primary" class="CM_look" @click="goUrl('domesticCommissionUserTW',item.Id)"
                                 icon="iconfont icon-chakan" circle></el-button>
                         </el-tooltip>
-                        <el-tooltip v-if="cMaker==true&&item.BranchCommission>0" class="item" effect="dark" content="制单" placement="top">
+                        <el-tooltip v-if="cMaker==true&&item.BranchCommission>0&&item.CurrencyRateList[0].Rate>0" class="item" effect="dark" content="制单" placement="top">
                             <el-button @click="YijianZD(item)" type="danger" class="CM_look" v-if="cMaker==true" 
                                 icon="iconfont icon-mui-icon-add" circle></el-button>
                         </el-tooltip>
@@ -131,12 +131,17 @@
         <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
             layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
         </el-pagination>
-        <el-dialog title="修改本位币汇率" :visible.sync="showVisible" width="400px">
+        <el-dialog title="修改本位币汇率" :visible.sync="showVisible" width="450px">
             <el-form ref="addMsg" :model="addMsg" :rules="rules" label-width="110px">
                 <div v-for="(x,y) in addMsg.CurrencyRate" :key="y">
                     <el-row>
-                        <el-col :span="24">
-                            <el-form-item label="本位币汇率" :prop="'CurrencyRate.'+ y +'.Rate'"
+                        <el-col :span="5">
+                            <el-form-item :label="x.OutBranchName">
+
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="19">
+                            <el-form-item label="发放汇率" :prop="'CurrencyRate.'+ y +'.Rate'"
                             :rules="productCurrencyRate.Rate">
                                 <el-input type="Number" v-model="x.Rate">
                                     <template slot="append" style="width: 100%;">{{x.CurrencyName}}</template>
@@ -368,10 +373,11 @@
                 let obj = {
                     CostType: 16,
                     Money: Money,
-                    CurrencyId: 1,
+                    CurrencyId: item.CurrencyRateList[0].CurrencyId,
                     XSTC: 1,
                     OtherType:69,
-                    ReFinanceId:item.Id
+                    ReFinanceId:item.Id,
+                    Rate: item.CurrencyRateList[0].Rate
                 }
                 let query = {
                     blank: "y",