页面修改

src/components/TravelManager/TravelList/PassengerFeedback.vue

@@ -47,7 +47,7 @@
         </li>
         <li>
           <input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()">
-          <input type="button" @click="goUrl" class="normalBtn" value="旅客反馈分析" />
+          <input type="button" @click="goUrl" class="normalBtn" value="旅客反馈分析" style="display:none;" />
         </li>
       </ul>
     </div>
@@ -55,33 +55,25 @@
       <tr>
         <th>发团日期</th>
         <th>团号</th>
-        <th>未填写人数</th>
+        <th>领队</th>
+        <th>未填写人数/总人数</th>
         <th>整体评分</th>
-        <th v-for="(item,i) in fields" :key="i">{{item}}</th>
+        <template v-if="dataList&&dataList.length>0">
+          <th v-for="(item,i) in dataList[0].SurveyItemList" :key="i">{{item.Title}}</th>
+        </template>
         <th>操作</th>
       </tr>
       <tr v-for="(item,i) in dataList" :key="i">
-        <td>{{item.start}}</td>
-        <td>{{item.tCNUM}}</td>
-        <td>{{item.number}}</td>
+        <td>{{item.StartDate}}</td>
+        <td @click='goUrl("RegistrationList", item.TCID,"报名清单")' class="go_regis">{{item.TCNUM}} ({{item.TCID}})</td>
+        <td>{{item.LeaderName}}</td>
+        <td>{{item.FinishNum}}/{{item.TotalNum}}</td>
         <td>
-          <span v-if="fields.length>0">
-            <span v-if="item.sumScore/fields.length>3.5">{{(item.sumScore/fields.length).toFixed(1)}}</span>
-            <span v-else style="color:red">{{(item.sumScore/fields.length).toFixed(1)}}</span>
-          </span>
-          <span v-else>
-            <span v-if="item.sumScore>3.5">{{item.sumScore}}</span>
-            <span v-else style="color:red">{{item.sumScore}}</span>
-
-          </span>
-
+          {{item.ScoreNum}}
         </td>
-        <td v-for="(c,childIndex) in fields" :key="childIndex">
-
-          <span v-if="item[c]&&item[c]>3.5">{{item[c]?item[c]:0}}</span>
-          <span v-else style="color:red">{{item[c]?item[c]:0}}</span>
-        </td>
-
+        <template v-if="item.SurveyItemList&&item.SurveyItemList.length>0">
+          <td v-for="(subItem,subIndex) in item.SurveyItemList" :key="subIndex">{{subItem.ItemValue}}</td>
+        </template>
         <td>
           <span style="cursor:pointer" @click="chaKan(item)">明细</span>
         </td>
@@ -144,7 +136,7 @@
         this.$router.push({
           name: 'investigationList',
           query: {
-            "TCID": item.tcid,
+            "TCID": item.TCID,
             blank: 'y'
           }
         })
@@ -171,7 +163,6 @@
         this.msg.LineteamId = val.LtID;
         this.msg.LineteamName = val.LtName;
       },
-
       //获取系列列表
       getLineTeamList(val) {
         let lineId = val.LineID;
@@ -188,7 +179,7 @@
         });
       },
       getTitle() {
-        this.apiJavaPost("/api/erp/survey/getSurveyTitleList", {}, res => {
+        this.apipost("survey_post_GetSurveyShowList", {}, res => {
             if (res.data.resultCode === 1) {
               res.data.data.forEach(item => {
                 this.fields.push(item.title)
@@ -217,40 +208,10 @@
           this.msg.reEndDate = "";
         }
         this.loading = true;
-        this.apiJavaPost("/api/erp/survey/getSurveyList", this.msg, res => {
+        this.apipost("survey_post_GetTravelSurveyPage", this.msg, res => {
           this.loading = false;
           if (res.data.resultCode === 1) {
-            let arrays = [];
-            res.data.data.pageData.forEach(x => {
-              let isHave = false
-              if (x.tCID != 0 || x.tCID || x.tCID != '') {
-                if (arrays.length > 0) {
-                  arrays.forEach(y => {
-                    if (y.tcid == x.tCID) {
-                      y[x.title] = x.scoreNum
-                      y.sumScore += x.scoreNum
-                      isHave = true
-                      return false
-                    }
-                  })
-                }
-                if (!isHave) {
-                  let obj = {
-                    tcid: x.tCID,
-                    start: "",
-                    sumScore: x.scoreNum,
-                    tCNUM: x.tCNUM,
-                    number: x.number ? x.number : 0
-                  }
-                  if (x.startDate) {
-                    obj.start = x.startDate.split('T')[0]
-                  }
-                  obj[x.title] = x.scoreNum
-                  arrays.push(obj)
-                }
-              }
-            });
-            this.dataList = arrays;
+            this.dataList = res.data.data.pageData;
             this.total = res.data.data.count;
           } else {
             this.Error(res.data.message)

src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue

@@ -81,7 +81,7 @@
           </tr>
           <tr>
             <td class="CP_ComTitle2 CostcomCenter" style="width:150px">酒店名称</td>
-            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格/间</td>
+            <td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格/人</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:50px">车资/天</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:50px">过路费<br />停车费/天</td>
             <td class="CP_ComTitle2 CostcomCenter" style="width:110px">餐厅名称</td>

src/components/administrative/Survey.vue

@@ -40,7 +40,6 @@
         </li>
       </ul>
     </div>
-
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
         <th>发团日期</th>
@@ -48,6 +47,9 @@
         <th>领队</th>
         <th>未填写人数/总人数</th>
         <th>整体评分</th>
+        <template v-if="dataList&&dataList.length>0">
+          <th v-for="(item,i) in dataList[0].SurveyItemList" :key="i">{{item.Title}}</th>
+        </template>
         <th>操作</th>
       </tr>
       <tr v-for="(item,i) in dataList" :key="i">
@@ -58,6 +60,9 @@
         <td>
           {{item.ScoreNum}}
         </td>
+        <template v-if="item.SurveyItemList&&item.SurveyItemList.length>0">
+          <td v-for="(subItem,subIndex) in item.SurveyItemList" :key="subIndex">{{subItem.ItemValue}}</td>
+        </template>
         <td>
           <span style="cursor:pointer" @click="setInfo(item)">填写</span>
         </td>
@@ -301,7 +306,6 @@
         this.msg.LineteamId = val.LtID;
         this.msg.LineteamName = val.LtName;
       },
-
       //获取系列列表
       getLineTeamList(val) {
         let lineId = val.LineID;
@@ -349,7 +353,6 @@
         this.loading = true;
         this.apipost("survey_post_GetTravelSurveyPage", this.msg, res => {
           this.loading = false;
-          console.log("survey_post_GetTravelSurveyPage", res.data);
           if (res.data.resultCode === 1) {
             this.dataList = res.data.data.pageData;
             this.total = res.data.data.count;