liuhj před 6 dny
rodič
revize
f5348036a3
1 změnil soubory, kde provedl 49 přidání a 34 odebrání
  1. 49 34
      src/components/OP/EntryDetails.vue

+ 49 - 34
src/components/OP/EntryDetails.vue

@@ -1,6 +1,16 @@
 <template>
     <div v-loading.fullscreen.lock="fullscreenLoading">
         <div class="Entry-all">
+            <el-dialog :close-on-click-modal="false" title="实时汇率提示" :visible.sync="SSHLVisible">
+                <el-table border :data="currencyss">
+                    <el-table-column property="currName" label="币种" width="150"></el-table-column>
+                    <el-table-column property="rate" label="汇率" width="200"></el-table-column>
+                    <el-table-column property="lastUpdateDt" label="更新时间"></el-table-column>
+                </el-table>
+                <div style="margin-top: 15px;text-align: right;">
+                    <el-button type="primary" @click="SSHLVisible=false">已知晓</el-button>
+                </div>
+            </el-dialog>
             <el-dialog v width="400px" title="设置查看权限" class="permissionsbox" :visible.sync="setpermissions" :close-on-click-modal="false">
                 <el-checkbox-group v-model="viewUsers" @change="handleCheckAllChange">
                     <el-checkbox v-for="item in viewUsersarr" :label="item.id" :key="item.id">{{item.name}}</el-checkbox>
@@ -210,7 +220,7 @@
                                 v-model="item.rate"></el-input-number>
                         </div>
                         <span style="color:red;">* 若客户有意见,需要与财务商量后进行适当调整 </span>
-                        <!-- <el-popover
+                        <el-popover
                         placement="top"
                         width="402"
                         trigger="hover">
@@ -219,10 +229,12 @@
                                 <el-table-column width="100" property="rate" label="汇率"></el-table-column>
                                 <el-table-column width="200" property="lastUpdateDt" label="更新时间"></el-table-column>
                             </el-table>
-                            <span v-show="cubtn" slot="reference" class="redzhu">{{CurrencysRemark}}</span>
+                            <span style="color: #409EFF;" slot="reference" class="redzhu">{{CurrencysRemark}}</span>
+                            <div style="margin-top: 5px;text-align: right;">
+                                <el-button  @click="adoptRealtime" type="primary" size="mini">采用最新汇率</el-button>
+                            </div>
                         </el-popover>
                         &nbsp;&nbsp;&nbsp;&nbsp;
-                        <el-button v-if="cubtn" @click="adoptRealtime" type="primary" size="mini">采用最新汇率</el-button> -->
                     </div>
                 </div>
                 <div class="Entry-form-li">
@@ -711,6 +723,7 @@ export default {
             airDataArrvalue:'',
             //实时汇率
             liveRateInfos:[],
+            SSHLVisible:false,
         }
     },
     methods: {
@@ -868,13 +881,14 @@ export default {
                         // }
                         that.visainfo = res.data.data.visaData;
                         that.currencyss = res.data.data.reteInfos;
+                        that.SSHLVisible=true;
                         if (that.DomesticFees.visafees != res.data.data.visaData.feeTotal && res.data.data.visaData.feeTotal != 0) {
                             that.getvisafeebtn = true;
                         }
                         for (let s = 0; s < that.currencys.length; s++) {
                             if (that.currencys[s].rate != that.currencyss[s].rate) {
                                 that.cubtn = true;
-                                that.CurrencysRemark = '当前汇率与实时汇率不同!移上查看'
+                                that.CurrencysRemark = '移上查看实时汇率'
                                 return
                             } else {
                                 that.cubtn = false;
@@ -2042,37 +2056,37 @@ export default {
                         })
                     }
                 }
-                
-                let uniqueUsedCurrencys = [...new Set(usedCurrencys)];
-                let confirmText='';
-                for(let i = 0;i < this.currencyss.length;i++)
-                {
-                    let rate = this.currencyss[i];
-                    if(uniqueUsedCurrencys.includes(rate.currCode))   {
-                        confirmText += rate.currName + "("+ rate.currCode +"):"+ rate.rate +"\t\t";
-                    }
-                }
+                this.storageAPI(quarterageDatas, boardWagesDatas, miscellaneousFeeDatas, trainingExpenseDatas, otherDatas)
+                // let uniqueUsedCurrencys = [...new Set(usedCurrencys)];
+                // let confirmText='';
+                // for(let i = 0;i < this.currencyss.length;i++)
+                // {
+                //     let rate = this.currencyss[i];
+                //     if(uniqueUsedCurrencys.includes(rate.currCode))   {
+                //         confirmText += rate.currName + "("+ rate.currCode +"):"+ rate.rate +"\t\t";
+                //     }
+                // }
 
-                const h = this.$createElement;
-                this.$confirm("实时汇率提示",{
-                    title:'实时汇率提示',
-                    message: h('p', null, [
-                        h('div', null, confirmText),
-                        //h('div', { style: 'color: red' }, '是否前往编辑!')
-                    ]),
-                    iconClass: "el-icon-warning-outline colorGreen",//自定义图标样式
-                    confirmButtonText: "已知晓",//确认按钮文字更换
-                    showCancelButton: false,
-                    //cancelButtonText: "取消",//取消按钮文字更换
-                    showClose: false,//是否显示右上角关闭按钮
-                    type: "warning",//提示类型  success/info/warning/error
-                }).then(()=>{
-                    //确认操作
-                    //this.fullscreenLoading = false;
-                    this.storageAPI(quarterageDatas, boardWagesDatas, miscellaneousFeeDatas, trainingExpenseDatas, otherDatas)
-                }).catch(() => {
-                    //取消操作
-                });
+                // const h = this.$createElement;
+                // this.$confirm("实时汇率提示",{
+                //     title:'实时汇率提示',
+                //     message: h('p', null, [
+                //         h('div', null, confirmText),
+                //         //h('div', { style: 'color: red' }, '是否前往编辑!')
+                //     ]),
+                //     iconClass: "el-icon-warning-outline colorGreen",//自定义图标样式
+                //     confirmButtonText: "已知晓",//确认按钮文字更换
+                //     showCancelButton: false,
+                //     //cancelButtonText: "取消",//取消按钮文字更换
+                //     showClose: false,//是否显示右上角关闭按钮
+                //     type: "warning",//提示类型  success/info/warning/error
+                // }).then(()=>{
+                //     //确认操作
+                //     //this.fullscreenLoading = false;
+                //     this.storageAPI(quarterageDatas, boardWagesDatas, miscellaneousFeeDatas, trainingExpenseDatas, otherDatas)
+                // }).catch(() => {
+                //     //取消操作
+                // });
             });
         }, 1000, true),
         //导出保存
@@ -2953,6 +2967,7 @@ export default {
 }
 
 .Entry-form .redzhu {
+    margin-left: 25px;
     font-size: 14px;
     color: red;
 }