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

src/App.vue

@@ -113,7 +113,7 @@ export default {
 }
 </script>
 <style>
-  @import "//at.alicdn.com/t/font_635492_k0w3yrpxjyg.css";
+  @import "//at.alicdn.com/t/font_635492_te20a5sctn.css";
   @import "./assets/css/Semibold.css";
   @import "./assets/css/global/config.css";
   @import "./assets/css/fileIcon.css";

src/components/Complaints/ComplaintsDetail.vue

@@ -235,7 +235,7 @@
               <span>已赔金额：</span>{{getBackMoney()}}
             </li>
             <li
-              v-if="ComplainInfo.DisposeStatus===4&&(getLocalStorage().EmployeeId===ComplainInfo[ComplainInfo.length-1].CreateBy||getLocalStorage().EmployeeId===ComplainDetial[ComplainDetial.length-1].CreateBy||authority.indexOf('S_Complain_Finance')!=-1)">
+              v-if="ComplainInfo.DisposeStatus===4&&(getLocalStorage().EmployeeId===ComplainInfo.CreateBy || getLocalStorage().EmployeeId===ComplainDetial[ComplainDetial.length-1].CreateBy||authority.indexOf('S_Complain_Finance')!=-1)">
               <span>立即制单：</span>
               <span v-for="compensation in ComplainCompensation" class="CD_dealResult" href="javascript:void(0)"
                     @click="setFinance(compensation)">{{compensation.CompensateMoney}}</span>

src/components/FinancialModule/ReportForm/ChangeRevenueDetail.vue

@@ -411,6 +411,7 @@ tr._item_list td:last-child {
 
 <template>
   <div class="My_table_tell page_fnDm page_RecPayQuery PAGE_teamRE" v-loading="AALloading">
+    <button style="float:right;margin:15px 0" class="normalBtn" type="primary" @click="Export">导出</button>
     <div class="_fnDm_content" v-loading="loading">
       <v-table
         is-horizontal-resize
@@ -1305,6 +1306,8 @@ export default {
     if(this.msg.LineId==-4){
       this.msg.DataType="3";
     }
+    let userInfo = this.getLocalStorage();
+    this.userId = userInfo.EmployeeId;
   },
   components: {},
   mounted() {
@@ -1325,6 +1328,15 @@ export default {
     //this.getPageList();
   },
   methods: {
+    Export(){
+      let msg ={};
+      msg.EmployeeId = this.userId;
+      this.GetLocalFile(
+        "financestatistics_post_OutToExcelChangeHistoryReportList",
+        msg,
+        "变更报表详情.xls"
+      );
+    },
     goEasyReport: function() {
       let year = this.productionDate[0]
         ? this.productionDate[0].substring(0, 4)

src/components/FinancialModule/ReportForm/ChangeRevenueReport.vue

@@ -640,7 +640,7 @@ Vue.component("TCIDJump", {
   }
 });
 // v-show="rowData.IsHaveChange==1&&rowData.LineName!='合计'"
-Vue.component("TCNUMJump", {
+Vue.component("TCNUMJumpChange", {
   //  团队跳转
   template: `<div>
   <span style="cursor: pointer" v-if="rowData.DataType===1"  @click="goUrl('TravelControlList',rowData.TCNUM)">{{rowData.TCNUM}}</span> 
@@ -649,7 +649,7 @@ Vue.component("TCNUMJump", {
   <span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer" v-if="rowData.DataType===6">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer" v-if="rowData.DataType===7">{{rowData.TCNUM}}</span>
-  <span style="cursor: pointer;background:#e95252;color:#fff;padding:3px 10px;" v-show="rowData.IsHaveChange==1&&rowData.LineName!='合计'" @click="goUrlExtend('ChangeRevenueDetail',rowData.TCID)">查看历史</span>
+  <span style="cursor: pointer;background:#e95252;color:#fff;padding:3px 10px;" v-show="rowData.LineName!='合计'" @click="goUrlExtend('ChangeRevenueDetail',rowData.TCID)">查看历史</span>
   </div>`,
   props: {
     rowData: {
@@ -663,7 +663,7 @@ Vue.component("TCNUMJump", {
     }
   },
   created(){
-    
+    console.log("rowData",this.rowData)
   },
   methods: {
     goUrl(path, id) {
@@ -871,7 +871,7 @@ export default {
           filterMultiple: false,
           type: "text",
           isFrozen: true,
-          componentName: "TCNUMJump"
+          componentName: "TCNUMJumpChange"
         },
         {
           field: "Is_Transport",

src/components/Ticketing/TicketManager.vue

@@ -1638,16 +1638,16 @@
       </div>
                   <div style="margin-top:5px;" >
                     <el-button-group size="mini">
-                      <el-tooltip class="item" effect="dark" content="出票完成" placement="top-start" v-show="item.TicketState!=1">
-                        <el-button type="primary" icon="iconfont icon-ico_shezhi" @click="UpdateTicketState(item.ID,1)"></el-button>
+                      <el-tooltip class="item" effect="dark" content="部分出票" placement="top-start"  v-show="item.TicketState==0">
+                        <el-button type="primary" class="iconfont icon-icon_status-half-dot"
+                          @click="UpdateTicketState(item.ID,3)" ></el-button>
                       </el-tooltip>
-                      <el-tooltip class="item" effect="dark" content="已出中段" placement="top-start"  v-show="item.TicketState==0">
-                        <el-button type="primary" icon="iconfont icon-ico_shezhi" @click="UpdateTicketState(item.ID,2)">
+                       <el-tooltip class="item" effect="dark" content="已出中段" placement="top-start"  v-show="item.TicketState==0">
+                        <el-button type="primary" class="iconfont icon-zhongzhuan" @click="UpdateTicketState(item.ID,2)">
                         </el-button>
                       </el-tooltip>
-                      <el-tooltip class="item" effect="dark" content="部分出票" placement="top-start"  v-show="item.TicketState==0">
-                        <el-button type="primary" icon="iconfont icon-ico_shezhi"
-                          @click="UpdateTicketState(item.ID,3)" ></el-button>
+                      <el-tooltip class="item" effect="dark" content="出票完成" placement="top-start" v-show="item.TicketState!=1">
+                        <el-button type="primary" class="iconfont icon-duigou" @click="UpdateTicketState(item.ID,1)"></el-button>
                       </el-tooltip>
                     </el-button-group>
                     </div>