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

src/components/FinancialModule/paySetting.vue

@@ -45,7 +45,7 @@
     font-size: 14px;
     padding: 4px;
 }
-.query-box .iconfont{
+.page_paySetting .query-box .iconfont{
     cursor: pointer;
     background-color: #E95252;
     color: white;

src/components/SalesModule/addPassenger.vue

@@ -805,12 +805,10 @@
         let birthYear = strBirthdayArr[0];
         let birthMonth = strBirthdayArr[1];
         let birthDay = strBirthdayArr[2];
-        
         let d = new Date();
         let nowYear = d.getFullYear();
         let nowMonth = d.getMonth() + 1;
         let nowDay = d.getDate();
-        
         if(nowYear == birthYear && birthMonth <= nowMonth && birthDay <= nowDay){
           returnAge = 1;//同年 则为0岁
         } else {

src/components/administrative/AirticketCommission.vue

@@ -96,9 +96,11 @@
       },
       //生成票务提成报表
       CreateAirticketCommission() {
+        this.loading=true;
         this.apipost(
           "AirTicketRules_post_CreateAirticketCommissionService", {},
           res => {
+            this.loading=false;
             if (res.data.resultCode == 1) {
               this.getList();
               this.Success('报表生成成功')

src/components/administrative/Survey.vue

@@ -69,6 +69,7 @@
         <th>发团日期</th>
         <th>订单号</th>
         <th>团号</th>
+        <th>未填写人数</th>
         <th>整体评分</th>
         <th v-for="(item,i) in fields" :key="i">{{item}}</th>
         <th>操作</th>
@@ -77,6 +78,7 @@
         <td>{{item.start}}</td>
         <td>{{item.orderId}}</td>
         <td>{{item.tCNUM}}</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>
@@ -96,13 +98,74 @@
           </td>
         
         <td>
-          <span style="cursor:pointer" @click="chaKan(item)">明细</span>
+          <span style="cursor:pointer" @click="setInfo(item)">填写</span>
         </td>
       </tr>
       <tr v-if="dataList.length==0">
         <td colspan="12" align="center">暂无数据</td>
       </tr>
     </table>
+    <el-dialog
+      title="问券填写"
+      :visible.sync="DiaoChaShow"
+      center
+      :before-close="closeDialog">
+        <div class="main NewSurveyList">
+          <el-select filterable v-model="GuestId" value-key="LineID" >
+            <el-option v-for="item in ppList" :label='item.GuestName' :value='item.GuestId' :key='item.GuestId'></el-option>
+          </el-select>
+          <div class="">
+            <table id="table">
+              <tr>
+                <td class="_name">旅客意见</td>
+                <td class="_name">非常满意</td>
+                <td class="_name">满意</td>
+                <td class="_name">基本合格</td>
+                <td class="_name">不满意</td>
+              </tr>
+              <tr v-for="(item, index) in wqList">
+                <td class="_name">{{index+1}}、{{item.Title}}</td>
+                <template v-if="item.SurveyType === 1">
+                  <td colspan="4">
+                    <el-rate
+                      v-model="item.ScoreNum"
+                      show-text
+                      :texts="texts">
+                    </el-rate>
+                  </td>
+                </template>
+                <template v-if="item.SurveyType === 2">
+                  <td colspan="4">
+                    <el-radio-group v-model="item.ScoreNum">
+                      <el-radio v-for="(radio, rIndex) in item.SurveyOptionsList" :label="radio.ID" :key="rIndex">{{radio.OptionsName}}</el-radio>
+                    </el-radio-group>
+                  </td>
+                </template>
+                <template v-if="item.SurveyType === 3">
+                  <td colspan="4">
+                    <el-checkbox-group v-model="item.SurveyOptionsList">
+                      <el-checkbox v-for="(radio, rIndex) in item.SurveyOptionsList" :label="radio.ID" :key="rIndex">{{radio.OptionsName}}</el-checkbox>
+                    </el-checkbox-group>
+                  </td>
+                </template>
+                <template v-if="item.SurveyType === 4">
+                  <td colspan="4">
+                    <el-input
+                      type="textarea"
+                      :rows="2"
+                      placeholder="请输入内容"
+                      v-model="item.TextContent">
+                    </el-input>
+                  </td>
+                </template>
+              </tr>
+            </table>
+          </div>
+          <div style="margin: 20px 0; text-align: right;">
+            <button class="normalBtn" @click="saveMessage">{{$t('fnc.tijiao')}}</button>
+          </div>
+        </div>
+    </el-dialog>
     <el-pagination
         background
         @current-change="handleCurrentChange"
@@ -117,12 +180,13 @@
 <script>
 import moment from "moment"
 export default {
-    name: 'Feedback',
     data (){
         return{
             obj:{},
             dataList:[],
             loading:false,
+            DiaoChaShow: false,
+            wqList: [],
             msg:{
                 pageSize:10,
                 pageIndex:1,
@@ -135,13 +199,24 @@ export default {
                 lineName:"不限",
                 LineteamName:"不限",
             },
+            texts: [
+              '非常不满意',
+              '不满意',
+              '感觉一般',
+              '满意',
+              '非常满意'
+            ],
             total:0,
             currentPage:1,
-            dateList:[],
-            LineList:[],
-            LineTeamList:[],
-            fields:[],
-            pickerDisabled:  {  //验证时间范围
+            dateList: [],
+            LineList: [],
+            LineTeamList: [],
+            fields: [],
+            ppList: [],
+            GuestId: '',
+            TCID: '',
+            OrderID: '',
+            pickerDisabled: {  //验证时间范围
             disabledDate:(time)=>{
               let _now = Date.now();
               return time.getTime() > _now ;
@@ -150,16 +225,88 @@ export default {
         }
     },
     created(){
-      this.dateList[0]=moment().subtract(6, "month").format("YYYY-MM-DD");
-      this.dateList[1]=moment().format("YYYY-MM-DD");
+      this.dateList[0] = moment().subtract(6, "month").format("YYYY-MM-DD");
+      this.dateList[1] = moment().format("YYYY-MM-DD");
       // console.log("this.dateList",this.dateList)
       this.getTitle();
     },
     mounted(){
-       this.getLineList();
-       this.getList();
+      this.getLineList();
+      this.getList();
+      this.GetSurveyShowList();
     },
     methods:{
+      setInfo(obj){
+        console.log(obj)
+        this.TCID = obj.tcid;
+        this.OrderID = obj.orderId;
+        this.DiaoChaShow = true;
+        this.getppList();
+      },
+      getppList: function () {
+        this.apipost('survey_post_GetTotalListAPP', {TCID: this.TCID, OrderID: this.OrderID}, res=>{
+          if (res.data.resultCode === 1) {
+            this.ppList = res.data.data.objNoScore;
+          }
+        }, null)
+      },
+      GetSurveyShowList: function () {
+        let data = {
+          IsShow: 1,
+          SurveyType: -1
+        }
+        this.apipost('survey_post_GetSurveyShowList', data, res=>{
+          if (res.data.resultCode === 1) {
+            let data = res.data.data
+            data.map(item => {
+              if (item.SurveyType === 2) {
+                item.SurveyOptionsList.map((cItem, cIndex) => {
+                  cItem.IsCheckS = false
+                })
+              }
+              if (item.SurveyType === 3) {
+                item.SurveyOptionsList.map((cItem, cIndex) => {
+                  cItem.IsCheckS = false
+                })
+              }
+              if (item.SurveyType === 1) {
+                item.ScoreNum = 5;
+              }
+            })
+            this.wqList = data;
+          }
+        }, null)
+      },
+      saveMessage: function(){
+        if (this.GuestId == '') {
+          return this.$message.error('请选择客人')
+        }
+        let data = JSON.parse(JSON.stringify(this.wqList))
+        data.forEach(x=>{
+          x.TCID = this.TCID;
+          x.OrderID = this.OrderID;
+          x.GuestId = this.GuestId;
+          if (x.SurveyType === 2 || x.SurveyType === 3) {
+            x.SurveyOptionsList.forEach(y=>{
+              y.IsCheck = x.ScoreNum == y.ID ? '1' : '0'
+            })
+            x.ScoreNum = 0
+          }
+        })
+        this.apipost('survey_post_SetGuestSurvey', data, res=>{
+          if (res.data.resultCode === 1) {
+            this.$message.success('提交成功！');
+            this.GuestId = '';
+            this.DiaoChaShow = false;
+            this.getList();
+          } else {
+            this.$message.error(res.data.message)
+          }
+        })
+      },
+      closeDialog: function () {
+        this.DiaoChaShow = false;
+      },
       chaKan(item){
      	  this.$router.push({ name:'NewSurvey',query:{"TCID":item.tcid, "OrderId": item.orderId,blank: 'y'} })
       },
@@ -254,11 +401,12 @@ export default {
                     }                   
                         if(!isHave){
                         let obj={
-                              tcid:x.tCID,
-                              orderId:x.orderId,
-                              start:"",
-                              sumScore:x.scoreNum,
-                              tCNUM:x.tCNUM
+                            tcid:x.tCID,
+                            orderId:x.orderId,
+                            start:"",
+                            sumScore:x.scoreNum,
+                            tCNUM:x.tCNUM,
+                            number: x.number
                           }
                           if(x.startDate){
                             obj.start=x.startDate.split('T')[0]
@@ -304,4 +452,49 @@ export default {
 .Feedback .singeRowTable{
     margin-top: 20px;
 }
+.NewSurveyList.main{
+      padding: 1.5rem;
+    }
+    .NewSurveyList .tit{
+      font-size: 2rem;
+      text-align: center;
+      margin-bottom: .5rem;
+    }
+    .NewSurveyList .sub_tit{
+      font-size: 1.4rem;
+      margin-bottom: .4rem;
+    }
+    .NewSurveyList .indet_2{
+      text-indent: 2.4rem;
+    }
+    .NewSurveyList .tit_det{
+      text-indent: 2.4rem;
+      font-size: 1rem;
+    }
+    .NewSurveyList table { border-collapse:collapse; border-spacing:0; }
+    .NewSurveyList table{
+      margin-top: 1rem;
+      width: 100%;
+    }
+    .NewSurveyList tr td{
+      padding: .5rem;
+      border: 1px solid #5b5653;
+      font-size: 1rem;
+    }
+    .NewSurveyList .qianming{
+      margin-top: 2.5rem;
+    }
+    .NewSurveyList .qianming label{
+      margin-right: .2rem;
+    }
+    .NewSurveyList.main{
+      width: 100%;
+      margin: 0 auto;
+    }
+    .NewSurveyList #table td,.NewSurveyList .qianming span{
+      color: #111;
+    }
+    .NewSurveyList #table td._name,.NewSurveyList .qianming label{
+      color: #5d5d5d;
+    }
 </style>

src/components/systemManagement/AccountType.vue

@@ -30,7 +30,7 @@
     ._addbox .iconfont {font-size: 48px;color: #D1D1D1;}
     ._gongsi{position: absolute;right: 20px;top: 5px}
     ._cup{cursor: pointer;}
-    .query-box .iconfont{
+    .AccountType .query-box .iconfont{
         cursor: pointer;
         background-color: #E95252;
         color: white;

src/components/systemManagement/CostType.vue

@@ -66,7 +66,7 @@
     font-size: 14px;
     padding: 4px;
 }
-.query-box .iconfont{
+.CostType .query-box .iconfont{
     cursor: pointer;
     background-color: #E95252;
     color: white;

src/components/systemManagement/HistoryRateQuery.vue

@@ -56,7 +56,7 @@
     font-size: 14px;
     padding: 4px;
 }
-.query-box .iconfont{
+.currentManage .query-box .iconfont{
     cursor: pointer;
     background-color: #E95252;
     color: white;

src/components/systemManagement/Manfunds.vue

@@ -56,7 +56,7 @@
     font-size: 14px;
     padding: 4px;
 }
-.query-box .iconfont{
+.currentManage .query-box .iconfont{
     cursor: pointer;
     background-color: #E95252;
     color: white;

src/components/systemManagement/Maninfo.vue

@@ -56,7 +56,7 @@
     font-size: 14px;
     padding: 4px;
 }
-.query-box .iconfont{
+.currentManage .query-box .iconfont{
     cursor: pointer;
     background-color: #E95252;
     color: white;

src/components/systemManagement/RoomMealImport.vue

@@ -34,7 +34,7 @@
     font-size: 14px;
     padding: 4px;
 }
-.query-box .iconfont{
+.RoomMealImport .query-box .iconfont{
     cursor: pointer;
     background-color: #E95252;
     color: white;

src/components/systemManagement/currencyManagement.vue

@@ -56,7 +56,7 @@
     font-size: 14px;
     padding: 4px;
 }
-.query-box .iconfont{
+.currentManage .query-box .iconfont{
     cursor: pointer;
     background-color: #E95252;
     color: white;

src/components/systemManagement/institutionsManagement.vue

@@ -63,7 +63,7 @@
     font-size: 14px;
     padding: 4px;
 }
-.query-box .iconfont{
+.instMg .query-box .iconfont{
     cursor: pointer;
     background-color: #E95252;
     color: white;