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

src/components/TravelManager/TravelList/PassengerFeedback.vue

@@ -7,8 +7,8 @@
           <span>
             <em>线路</em>
           </span>
-          <el-select filterable v-model="msg.CreateBy" @change="getLineTeamList(msg.LineId)">
-            <el-option label="不限" value='-1'></el-option>
+          <el-select filterable v-model="msg.lineID" @change="getLineTeamList(msg.lineID)">
+            <el-option label="不限" :value='0'></el-option>
             <el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'></el-option>
           </el-select>
         </li>
@@ -16,8 +16,8 @@
           <span>
             <em>系列</em>
           </span>
-          <el-select filterable v-model="msg.CreateBy">
-            <el-option label="不限" value='-1'></el-option>
+          <el-select filterable v-model="msg.LineteamId">
+            <el-option label="不限" :value='0'></el-option>
               <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
               </el-option>
           </el-select>
@@ -26,11 +26,10 @@
           <span>
             <em>只看有评分</em>
           </span>
-            <el-select filterable  class='multiple_input'  v-model='msg.Brand' :placeholder="$t('pub.pleaseSel')">
-                <el-option label="不限" :value="-1"></el-option>
-                <el-option label="是" :value="-1"></el-option>
+            <el-select filterable  class='multiple_input'  v-model='msg.isScore' :placeholder="$t('pub.pleaseSel')">
+                <el-option label="不限" :value="0"></el-option>
+                <el-option label="是" :value="1"></el-option>
                 <el-option label="否" :value="-1"></el-option>
-            
             </el-select>
         </li>
         <li>
@@ -54,7 +53,7 @@
             value="查询"
             @click="resetPageIndex(),getList()"
           >
-          <el-button @click="goUrl" type="danger" style="border-radius:14px;margin-left:8px" size="small">旅客反馈分析</el-button>
+          <input type="button" @click="goUrl" class="normalBtn" value="旅客反馈分析"/>
         </li>
       </ul>
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
@@ -67,7 +66,7 @@
       </tr>
       <tr v-for="(item,i) in dataList" :key="i">
         <td>{{item.start}}</td>
-        <td>没有字段({{item.tcid}})</td>
+        <td>{{item.tCNUM}}</td>
         <td>
           {{(item.sumScore/fields.length).toFixed(1)}}
         </td>
@@ -78,7 +77,7 @@
         </td>
       </tr>
       <tr v-if="dataList.length==0">
-        <td colspan="10" align="center">暂无数据</td>
+        <td colspan="12" align="center">暂无数据</td>
       </tr>
     </table>
     <el-pagination
@@ -103,6 +102,11 @@ export default {
             msg:{
                 pageSize:10,
                 pageIndex:1,
+                lineID:0,
+                LineteamId:0,
+                reStartDate:'',
+                reEndDate:'',
+                isScore:0
             },
             total:0,
             currentPage:1,
@@ -118,10 +122,7 @@ export default {
     },
     methods:{
       chaKan(item){        
-        console.log("item",item)
-        
      	  this.$router.push({ name:'investigationList',query:{"TCID":item.tcid,blank: 'y'} })
-
       },
         goUrl(){
      	   this.$router.push({ name:'FeedbackChart',query:{"customerId":1,blank: 'y'} })
@@ -149,23 +150,20 @@ export default {
 
         getList(){
             if(this.dateList){
-                this.msg.startDate=this.dateList[0];
-                this.msg.endDate=this.dateList[1];
+                this.msg.reStartDate=this.dateList[0];
+                this.msg.reEndDate=this.dateList[1];
             }else{
-              this.msg.startDate="";
-              this.msg.endDate="";  
+              this.msg.reStartDate="";
+              this.msg.reEndDate="";  
             }
-
-            
+            this.loading=true;
             this.apiJavaPost("/api/erp/survey//getSurveyList", this.msg, res => {
-                // this.loading = false;
-                console.log(res);
-                
+                this.loading = false;
                 if (res.data.resultCode === 1) {
                 let arrays=[]
                 res.data.data.pageData.forEach(x => {
                     let isHave=false
-                    if(this.fields.indexOf(x.title)==-1){
+                    if(this.fields.indexOf(x.title)==-1&&x.title!=''){
                         this.fields.push(x.title)
                     }
                     if(arrays.length>0){
@@ -182,7 +180,8 @@ export default {
                         let obj={
                             tcid:x.tCID,
                             start:x.startDate.split('T')[0],
-                            sumScore:x.scoreNum
+                            sumScore:x.scoreNum,
+                            tCNUM:x.tCNUM
                         }
                         obj[x.title]=x.scoreNum
                         arrays.push(obj)
@@ -191,10 +190,6 @@ export default {
                 });
                 this.dataList=arrays;
                 this.total=this.dataList.length;
-                console.log(this.dataList,'datalist');
-
-
-
                 } else {
                   this.Error(res.data.message)
                 }

src/components/systemManagement/HistoryRateQuery.vue

@@ -234,12 +234,12 @@
             },
            timeAdd(){
                if(!this.productionDate){
-                    this.msg.sDate = '';
-                    this.msg.eDate = '';
+                    this.msg.StartTime = '';
+                    this.msg.EndTime = '';
                     return
                 }
-                this.msg.sDate = this.productionDate[0];
-                this.msg.eDate = this.productionDate[1];
+                this.msg.StartTime = this.productionDate[0];
+                this.msg.EndTime = this.productionDate[1];
            },
            financeinfo_post_GetList(){  // 币种类型
             this.apipost('financeinfo_post_GetList',{Name:''},res=>{