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

src/components/FinancialModule/FinancialSubmodule/DjieMergeBillModule.vue

@@ -352,7 +352,7 @@
             })
             this.moneyObj = {
               benAllMoney: Math.round(benAllMoney * 100) / 100,
-              OriginalMoney: OriginalMoney,
+              OriginalMoney: Math.round(OriginalMoney * 100) / 100,
             }
             data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Merge.Money)
             data.WBChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Merge.WBMoney)
@@ -362,7 +362,6 @@
             this.GetDetail = data;
             this.loading=false
             this.$set(this.$data,"GetDetail",data);
-            console.log(this.GetDetail)
           }
         }, err => {})
       },

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -882,17 +882,12 @@ export default {
            that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,blank:'y',tab:"营收报表"} })
         }
       }else{
-        console.log("rowIndex",rowIndex)
-        console.log("column",column)
-        console.log("year",this.year)
-        console.log("rowData",rowData);
         if(rowData.ZhaiYao=="员工提成"){
           if(Number(this.year)==2019){
             
             if(column.title=="七月" || column.title=="八月" || column.title=="九月" || column.title=="十月" || column.title=="十一月" || column.title=="十二月"){
               let CostIds="";
               CostIds=rowData.CostIds.replace('112,', '');
-              console.log("CostIds",CostIds)
               that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,CostIds)
             }
             else{

src/components/TravelManager/TravelList/PassengerFeedback.vue

 
 <template>
   <div class="Feedback">
-      <ul style="overflow: initial!important">
-        
-        <li>
-          <span>
-            <em>线路</em>
-          </span>
-          <el-select filterable v-model="obj.LineID" value-key="LineID"  @change="getLineTeamList">
-            <el-option label="不限" :value='{LineName:"不限",LineID:0}'></el-option>
-            <el-option v-for="item in LineList" :label='item.LineName' :value='item' :key='item.LineID'></el-option>
-          </el-select>
-        </li>
-         <li>
-          <span>
-            <em>系列</em>
-          </span>
-          <el-select filterable v-model="obj.LineteamId" value-key="LtID" @change="getLineLtID">
-            <el-option label="不限" :value='{LtName:"不限",LtID:0}'></el-option>
-              <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item' :key='item.LtID'>
-              </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>
+      <div class="query-box">
+        <ul>
+          <li>
+            <span>
+              <em>团号</em>
+              <el-input v-model="msg.TCNUM"></el-input>
+            </span>
+          </li>
+          <li>
+            <span>
+              <em>线路</em>
+            </span>
+            <el-select filterable v-model="obj.LineID" value-key="LineID"  @change="getLineTeamList">
+              <el-option label="不限" :value='{LineName:"不限",LineID:0}'></el-option>
+              <el-option v-for="item in LineList" :label='item.LineName' :value='item' :key='item.LineID'></el-option>
             </el-select>
-        </li>
-        <li>
+          </li>
+          <li>
             <span>
-            <em>发团时间</em>
-          </span>
-             <el-date-picker
-              value-format="yyyy-MM-dd"
-             :picker-options="pickerDisabled"
-                size="small"
-                v-model="dateList"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期">
-                </el-date-picker>
-        </li>
-        <li>
-          <input
-            type="button"
-            class="hollowFixedBtn"
-            value="查询"
-            @click="resetPageIndex(),getList()"
-          >
-          <input type="button" @click="goUrl" class="normalBtn" value="旅客反馈分析"/>
-        </li>
-      </ul>
+              <em>系列</em>
+            </span>
+            <el-select filterable v-model="obj.LineteamId" value-key="LtID" @change="getLineLtID">
+              <el-option label="不限" :value='{LtName:"不限",LtID:0}'></el-option>
+                <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item' :key='item.LtID'>
+                </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>
+            </span>
+              <el-date-picker
+                value-format="yyyy-MM-dd"
+              :picker-options="pickerDisabled"
+                  size="small"
+                  v-model="dateList"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期">
+                  </el-date-picker>
+          </li>
+          <li>
+            <input
+              type="button"
+              class="hollowFixedBtn"
+              value="查询"
+              @click="resetPageIndex(),getList()"
+            >
+            <input type="button" @click="goUrl" class="normalBtn" value="旅客反馈分析"/>
+          </li>
+        </ul>
+      </div>
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
         <th>发团日期</th>
@@ -119,6 +126,7 @@ export default {
             msg:{
                 pageSize:10,
                 pageIndex:1,
+                TCNUM: '',
                 lineID:0,
                 LineteamId:0,
                 reStartDate:'',

src/components/administrative/Survey.vue

@@ -77,7 +77,7 @@
       <tr v-for="(item,i) in dataList" :key="i">
         <td>{{item.start}}</td>
         <!-- <td>{{item.orderId}}</td> -->
-        <td>{{item.tCNUM}}</td>
+        <td @click='goUrl("RegistrationList", item.tcid,"报名清单")' class="go_regis">{{item.tCNUM}}</td>
         <td>{{item.number}}</td>
         <td>
           <span v-if="fields.length>0">
@@ -235,6 +235,16 @@ export default {
       this.GetSurveyShowList();
     },
     methods:{
+      goUrl(path, id, name) {
+        this.$router.push({
+          name: path,
+          query: {
+            id: id,
+            blank: 'y',
+            tab: name
+          }
+        })
+      },
       getOrderID(id){
         this.ppList.map(x=>{
           if (id === x.GuestId){
@@ -317,9 +327,6 @@ export default {
       chaKan(item){
      	  this.$router.push({ name:'NewSurvey',query:{"TCID":item.tcid, "OrderId": item.orderId,blank: 'y'} })
       },
-      goUrl(){
-     	   this.$router.push({ name:'FeedbackChart',query:{"msg":JSON.stringify(this.msg),blank: 'y'} })
-    	},
       getLineList() {
         this.apipost("line_post_GetAllList_V2", {LineDirection: 0}, res => {
           if (res.data.resultCode == 1) {
@@ -503,4 +510,8 @@ export default {
     .NewSurveyList #table td._name,.NewSurveyList .qianming label{
       color: #5d5d5d;
     }
+    .go_regis{
+      text-decoration: underline;
+      cursor: pointer;
+    }
 </style>

src/components/index.vue

@@ -1704,7 +1704,7 @@ export default {
         { LogId: s.ID },
         r => {
           if (s.Link) {
-            this.goUrl(s.Link + '&MsgUrl=1');
+            this.goUrl(s.Link);
           }
           this.IM_bodyIsShow = false;
           this.refreshSysNoteDate();