三公费用修改

src/components/OP/EntryDetails.vue

@@ -1804,6 +1804,9 @@ export default {
                     that.provinceId=res.data.data.provinceId;
                     //汇率
                     that.currencys = res.data.data.currencys;
+                    if (that.currencys == null || that.currencys.length <= 0) {
+                        that.currencys = that.currencyss;
+                    }
                     that.isAssignPerm=res.data.data.isAssignPerm;
                     //权限
                     that.isSave=res.data.data.isSave;
@@ -3333,9 +3336,9 @@ export default {
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
-                    that.TotalExpenses.TravellingExpensesJJ=that.numFilters(that.Transportationdatatotal + that.pullCartFeeTotal + that.trainFeeTotal + that.cityAirTicketFeeTotal);
-                    that.TotalExpenses.TravellingExpensesGW=that.numFilters(that.Transportationdatatotal + that.pullCartFeeTotal + that.trainFeeTotal + that.cityAirTicketFeeTotal);
-                    that.TotalExpenses.TravellingExpensesTD=that.numFilters(that.Transportationdatatotal + that.pullCartFeeTotal + that.trainFeeTotal + that.cityAirTicketFeeTotal);
+                    that.TotalExpenses.TravellingExpensesJJ=that.numFilters(res.data.data.jjcQuote);
+                    that.TotalExpenses.TravellingExpensesGW=that.numFilters(res.data.data.gwcQuote);
+                    that.TotalExpenses.TravellingExpensesTD=that.numFilters(res.data.data.tdcQuote);
                     if (that.TotalExpenses.twoItemRemark=='') {
                         that.TotalExpenses.twoItemRemark=res.data.data.label;
                     }else{

src/components/Resource/OfficialActivities.vue

@@ -302,6 +302,37 @@ export default {
             }
             this.QueryOfficialActivitiesByDiId();
         },
+        //导出
+        ExportOfficialActivitiesInfo(val){
+             var url = "/api/Resource/ExportOfficialActivitiesInfo"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + this.token
+                },
+                data: {
+                    startTime: that.datetime(val[0]),
+                    endTime: that.datetime(val[1]),
+                    groupId: that.DiId,
+                    state:-1
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    window.open(res.data.data);
+                    that.dialogFormVisible = false;
+                    that.$message({
+                        message: res.data.msg,
+                        type: 'success'
+                    });
+                } else {
+                    that.$message.error(res.data.msg);
+                }
+            }).catch(function (error) {
+                that.$message.error(error);
+            });
+        },
         //团组信息绑定
         QueryOfficialActivitiesByDiId() {
             this.tableData = [];
@@ -351,8 +382,11 @@ export default {
             this.dialogFormVisible = true;
         },
         Confirmexport() {
-            console.log(this.datetime(this.valuedate[0]));
-
+            if(this.valuedate==''||this.valuedate==null||this.valuedate==undefined){
+                 this.$message.error('请选择日期范围！');
+                 return;
+            }
+            this.ExportOfficialActivitiesInfo(this.valuedate);
         },
         del(index, row) {
             this.$confirm('此操作将删除该数据, 是否继续?', '提示', {