页面修改

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -1776,10 +1776,7 @@
         this.queryMsg.StartGroupDate = nowDate;
       }
 
-      if (
-        this.queryCommonData.IsParentCompany != 1 &&
-        userInfo.RB_Branch_id != 49
-      ) {
+      if ( this.queryCommonData.IsParentCompany != 1 &&  userInfo.RB_Branch_id != 49 && userInfo.RB_Branch_id!=1224) {
         this.queryMsg.OutBranchIds.push(userInfo.RB_Branch_id);
       }
       //默认查询全部团队状态

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -174,7 +174,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/TravelManager/TravelNewQuotation/CostNewPriceForm.vue

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

src/components/administrative/Survey.vue

@@ -27,16 +27,6 @@
             </el-option>
           </el-select>
         </li>
-        <!-- <li>
-          <span>
-            <em>只看有评分</em>
-          </span>
-            <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>
           <span>
             <em>发团时间</em>
@@ -47,7 +37,6 @@
         </li>
         <li>
           <input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()">
-          <input type="button" class="hollowFixedBtn" value="导出" @click="Export">
         </li>
       </ul>
     </div>
@@ -55,38 +44,18 @@
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
         <th>发团日期</th>
-        <!-- <th>订单号</th> -->
         <th>团号</th>
         <th>领队</th>
         <th>未填写人数</th>
         <th>整体评分</th>
-        <th v-for="(item,i) in fields" :key="i">{{item}}</th>
+
         <th>操作</th>
       </tr>
       <tr v-for="(item,i) in dataList" :key="i">
         <td>{{item.start}}</td>
-        <!-- <td>{{item.orderId}}</td> -->
         <td @click='goUrl("RegistrationList", item.tcid,"报名清单")' class="go_regis">{{item.tCNUM}}</td>
         <td>{{item.lname}}</td>
-
         <td>{{item.number}}</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>
-
-        </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>
 
         <td>
           <span style="cursor:pointer" @click="setInfo(item)">填写</span>
@@ -213,17 +182,6 @@
       this.GetSurveyShowList();
     },
     methods: {
-      Export() {
-        let msg = JSON.parse(JSON.stringify(this.msg));
-        delete msg.pageIndex;
-        delete msg.pageSize;
-        msg.EmployeeId = this.userId;
-        this.JavaGetLocalFile(
-          "/api/erp/survey/exportSurverExcel",
-          msg,
-          "意见调查.xls"
-        );
-      },
       goUrl(path, id, name) {
         this.$router.push({
           name: path,
@@ -388,14 +346,14 @@
           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 = [];
+            console.log("survey_post_GetTravelSurveyPage", res.data);
             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) {
@@ -408,23 +366,17 @@
                 }
                 if (!isHave) {
                   let obj = {
-                    tcid: x.tCID,
-                    start: "",
-                    sumScore: x.scoreNum,
-                    tCNUM: x.tCNUM,
-                    number: x.number,
-                    lname: x.lname
+                    tcid: x.TCID,
+                    start: x.StartDate,
+                    sumScore: x.ScoreNum,
+                    tCNUM: x.TCNUM,
+                    number: x.TotalNum,
+                    lname: x.LeaderName
                   }
-                  if (x.startDate) {
-                    obj.start = x.startDate.split('T')[0]
-                  }
-
                   obj[x.title] = x.scoreNum
                   arrays.push(obj)
                 }
               }
-
-
             });
             this.dataList = arrays;