Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/OP/EntryDetails.vue

@@ -708,7 +708,9 @@ export default {
 
             //又憋两坨
             airDataArr:[],
-            airDataArrvalue:''
+            airDataArrvalue:'',
+            //实时汇率
+            liveRateInfos:[],
         }
     },
     methods: {
@@ -1944,11 +1946,16 @@ export default {
         },
         //保存
         storage: debounce(function () {
+            
             return new Promise((resolve, reject) => {
+
+                //已使用币种
+                let usedCurrencys = [];
                 //住宿费
                 this.fullscreenLoading = true
                 var quarterageDatas = [];
                 for (let m = 0; m < this.quarterageData.length; m++) {
+                        usedCurrencys.push(this.quarterageData[m].curremcyCode);
                     if (this.quarterageData[m].nationalTravelFeeId != '') {
                         quarterageDatas.push({
                             id: this.quarterageData[m].id,
@@ -1966,6 +1973,7 @@ export default {
                 //伙食费
                 var boardWagesDatas = [];
                 for (let n = 0; n < this.boardWagesData.length; n++) {
+                        usedCurrencys.push(this.boardWagesData[n].curremcyCode);
                     if (this.boardWagesData[n].nationalTravelFeeId != '') {
                         boardWagesDatas.push({
                             id: this.boardWagesData[n].id,
@@ -1983,6 +1991,7 @@ export default {
                 //公杂费miscellaneousFeeData
                 var miscellaneousFeeDatas = [];
                 for (let b = 0; b < this.miscellaneousFeeData.length; b++) {
+                    usedCurrencys.push(this.miscellaneousFeeData[b].curremcyCode);
                     if (this.miscellaneousFeeData[b].nationalTravelFeeId != '') {
                         miscellaneousFeeDatas.push({
                             id: this.miscellaneousFeeData[b].id,
@@ -2000,6 +2009,7 @@ export default {
                 //培训费
                 var trainingExpenseDatas = [];
                 for (let p = 0; p < this.trainingExpenseData.length; p++) {
+                    usedCurrencys.push(this.trainingExpenseData[p].curremcyCode);
                     if (this.trainingExpenseData[p].nationalTravelFeeId != '') {
                         trainingExpenseDatas.push({
                             id: this.trainingExpenseData[p].id,
@@ -2017,6 +2027,7 @@ export default {
                 //其他费
                 var otherDatas = [];
                 for (let c = 0; c < this.otherData.length; c++) {
+                        //usedCurrencys.push(this.otherData[c].curremcyCode);
                     if (this.otherData[c].setDataId != '') {
                         otherDatas.push({
                             id: this.otherData[c].id,
@@ -2030,8 +2041,38 @@ export default {
                         })
                     }
                 }
-                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(() => {
+                    //取消操作
+                });
+            });
         }, 1000, true),
         //导出保存
         //保存API
@@ -2102,8 +2143,6 @@ export default {
             }).catch(function (error) {
                 that.$message.error(error.message);
             });
-
-
         },
         //选择团组名称调用
         chengvalue(val) {
@@ -2842,6 +2881,10 @@ export default {
 }
 </script>
 <style>
+
+/* .el-message-box__status {
+  color: greenyellow;
+} */
 .Entry-all {
     background-color: #fff;
     padding: 10px;