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

src/components/OP/EntryDetails.vue

@@ -718,8 +718,8 @@ export default {
                     
                     that.GetEnterExitCostInfobyDiId();
                     that.PostGroupTeamRateByDiIdAndCTableId();
-                    that.GetNationalTravelFeeData();
-                    that.EnterExitCostFileOwner();
+                    
+                    
                 }
             })
         },
@@ -860,6 +860,8 @@ export default {
         EnterExitCostFileOwner() {
             this.listvalueoptions=[];
             this.tablevalueoptions=[];
+            console.log(this.provinceId);
+            
             var url = "/api/Groups/EnterExitCostFileOwner/"+this.provinceId
             var that = this
             this.$axios({
@@ -876,7 +878,6 @@ export default {
         },
         //获取费用标注
         GetNationalTravelFeeData() {
-            this.fullscreenLoading = true;
             var url = "/api/Groups/GetNationalTravelFeeData"
             var that = this
             this.$axios({
@@ -1417,6 +1418,7 @@ export default {
             }).then(function (res) {
                 if (res.data.code == 200) {
                     that.ID = res.data.data.id;
+                    that.provinceId=res.data.data.provinceId;
                     //汇率
                     that.currencys = res.data.data.currencys;
                     that.isAssignPerm=res.data.data.isAssignPerm;
@@ -1484,8 +1486,13 @@ export default {
                     // that.GetNationalTravelFeeData();
                     that.fullscreenLoading = false;
                     that.GetEnterExitCostCorrelationTips(2);
+                    that.EnterExitCostFileOwner();
+                    that.GetNationalTravelFeeData();
                 } else {
                     that.fullscreenLoading = false;
+                    that.provinceId=res.data.data.provinceId;
+                    that.EnterExitCostFileOwner();
+                    that.GetNationalTravelFeeData();
                     that.GetEnterExitCostCorrelationTips(1);
                     that.$message.warning(res.data.msg);
                     if (res.data.msg=='未查询出数据!可操作该条数据!') {
@@ -1560,11 +1567,15 @@ export default {
         },
         //住宿地区选择
         changeSelect(val, item, index) {
+            var xiabiao=0
             var rate = 0
             var obj = {}
-            obj = this.placeinif.find(function (i) {
+            obj = this.placeinif.find(function (i,indexs) {
+                xiabiao=indexs
                 return i.id === item
             });
+            this.placeinif.splice(xiabiao,1);
+            this.placeinif.unshift(obj);
             this.SRrequirement(obj)
             //在change中获取到整条对象数据
             val.currencyName = obj.currencyName;
@@ -1614,11 +1625,15 @@ export default {
         },
         //伙食地区选择
         mealschangeSelect(val, item, index) {
+            var xiabiao=0
             var rate = 0
             var obj = {}
-            obj = this.placeinif.find(function (i) {
+            obj = this.placeinif.find(function (i,indexs) {
+                xiabiao=indexs
                 return i.id === item
             });
+            this.placeinif.splice(xiabiao,1);
+            this.placeinif.unshift(obj);
             //在change中获取到整条对象数据
             // if(index!=undefined){
             //     val[index].currencyName=obj.currencyName;
@@ -1668,11 +1683,15 @@ export default {
         },
         //公杂费地区选择
         MiscellaneouschangeSelect(val, item, index) {
+            var xiabiao=0
             var rate = 0
             var obj = {}
-            obj = this.placeinif.find(function (i) {
+            obj = this.placeinif.find(function (i,indexs) {
+                xiabiao=indexs
                 return i.id === item
             });
+            this.placeinif.splice(xiabiao,1);
+            this.placeinif.unshift(obj);
             //在change中获取到整条对象数据
             if (index != undefined) {
                 val[index].currencyName = obj.currencyName;
@@ -1722,11 +1741,15 @@ export default {
         },
         //培训费地区选择
         TrainingExpenseDataSelect(val, item,index) {
+            var xiabiao=0
             var rate = 0//汇率
             var obj = {}
-            obj = this.placeinif.find(function (i) {
+            obj = this.placeinif.find(function (i,indexs) {
+                xiabiao=indexs
                 return i.id === item
             });
+            this.placeinif.splice(xiabiao,1);
+            this.placeinif.unshift(obj);
             //在change中获取到整条对象数据
             // if (index != undefined) {
             //     val[index].currencyName = obj.currencyName;
@@ -2057,8 +2080,8 @@ export default {
             }
             
             this.fullscreenLoading = true;
-            this.EnterExitCostFileOwner();
-            this.GetNationalTravelFeeData();
+            // this.EnterExitCostFileOwner();
+            // this.GetNationalTravelFeeData();
             this.GetEnterExitCostInfobyDiId();
             this.PostGroupTeamRateByDiIdAndCTableId();
         },

src/components/OP/EntryDetailsdraft.vue

@@ -266,7 +266,7 @@
                             </el-table-column>
                             <el-table-column style="position: relative;" prop="city" label="城 市" width="180">
                                 <template slot-scope="scope">
-                                    <el-select size="mini" @change="changeSelect(scope.row, $event, scope.$index)"
+                                    <el-select size="mini" @change="changeSelect(scope.row, $event, scope)"
                                         v-model="scope.row.nationalTravelFeeId" filterable placeholder="请选择">
                                         <el-option v-for="item in placeinif" :key="item.id" :label="item.cityname"
                                             :value="item.id">
@@ -2184,11 +2184,15 @@ export default {
         },
         //住宿地区选择
         changeSelect(val, item, index) {
+            var xiabiao=0
             var rate = 0
             var obj = {}
-            obj = this.placeinif.find(function (i) {
+            obj = this.placeinif.find(function (i,indexs) {
+                xiabiao=indexs
                 return i.id === item
             });
+            this.placeinif.splice(xiabiao,1);
+            this.placeinif.unshift(obj);
             this.SRrequirement(obj)
             //在change中获取到整条对象数据
             val.currencyName = obj.currencyName;
@@ -2236,11 +2240,15 @@ export default {
         },
         //伙食地区选择
         mealschangeSelect(val, item, index) {
+            var xiabiao=0
             var rate = 0
             var obj = {}
-            obj = this.placeinif.find(function (i) {
+            obj = this.placeinif.find(function (i,indexs) {
+                xiabiao=indexs
                 return i.id === item
             });
+            this.placeinif.splice(xiabiao,1);
+            this.placeinif.unshift(obj);
             //在change中获取到整条对象数据
             // if(index!=undefined){
             //     val[index].currencyName=obj.currencyName;
@@ -2289,11 +2297,15 @@ export default {
         },
         //公杂费地区选择
         MiscellaneouschangeSelect(val, item, index) {
+            var xiabiao=0
             var rate = 0
             var obj = {}
-            obj = this.placeinif.find(function (i) {
+            obj = this.placeinif.find(function (i,indexs) {
+                xiabiao=indexs
                 return i.id === item
             });
+            this.placeinif.splice(xiabiao,1);
+            this.placeinif.unshift(obj);
             //在change中获取到整条对象数据
             if (index != undefined) {
                 val[index].currencyName = obj.currencyName;
@@ -2342,11 +2354,15 @@ export default {
         },
         //培训费地区选择
         TrainingExpenseDataSelect(val, item) {
+            var xiabiao=0
             var rate = 0//汇率
             var obj = {}
-            obj = this.placeinif.find(function (i) {
+            obj = this.placeinif.find(function (i,indexs) {
+                xiabiao=indexs
                 return i.id === item
             });
+            this.placeinif.splice(xiabiao,1);
+            this.placeinif.unshift(obj);
             //在change中获取到整条对象数据
             val.currencyName = obj.currencyName;
             val.currency = obj.currency;