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

src/components/Hotel/HotelProductManage2.vue

@@ -280,6 +280,7 @@
                 <el-option :key="1" label="税入R0" :value="1"></el-option>
                 <el-option :key="2" label="税别R10" :value="2"></el-option>
                 <el-option :key="3" label="税别R0" :value="3"></el-option>
+                <el-option :key="4" label="税入R10" :value="4"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -527,6 +528,7 @@
                 <el-option :key="1" label="税入R0" :value="1"></el-option>
                 <el-option :key="2" label="税别R10" :value="2"></el-option>
                 <el-option :key="3" label="税别R0" :value="3"></el-option>
+                <el-option :key="4" label="税入R10" :value="4"></el-option>
               </el-select>
             </el-form-item>
           </el-col>

src/components/PersonalInfoSet.vue

@@ -636,8 +636,8 @@
                 <li>
                     <span class="Person_Pname">部门</span>
                     <span class="Person_Company">
-                        {{companyName}}
-                        <span class="Person_Jobs" v-if="Gangwei">{{Gangwei}}</span>
+                        {{u.BranchName}}
+                        <span class="Person_Jobs">{{u.PostName}}</span>
                     </span>
                 </li>
                 <li>
@@ -870,6 +870,7 @@
       return {
         //页面切换方式
         openMode:0,
+        u:{},
         outerVisible:false,
         nameA:'账户名称',
         nameB:'开户人',
@@ -924,27 +925,6 @@
           CardNum:[{ required: true, message: '请填写卡号', trigger: 'blur' }],
           AccountAlias:[{ required: true, message: '请填写账户别名', trigger: 'blur' }],
         },
-
-        //公司
-        companyName:'',
-        //岗位
-        Gangwei:'',
-        //获取公司参数
-        getCompanyMsg:{
-            RB_Group_Id:'2',
-            Status:'0',
-        },
-        //获取部门参数
-        getDepartmentMsg:{
-            RB_Group_Id:'0',
-            RB_Branch_Id:'-1',
-            Status:'0',
-        },
-        getPostMsg:{ 
-            RB_Group_Id:'0',
-            RB_Branch_Id:'-1',
-            RB_Department_Id:'0',
-        },
         //获取银行账户参数
         AccountMsg:{
             BranchId:'-1',
@@ -1185,33 +1165,6 @@
                 }
             },err=>{})
         },
-        //获取公司
-        getCompany(){
-            this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
-                if(res.data.resultCode==1){
-                    let data = res.data.data;
-                    data.forEach(x=>{
-                        if(this.dataList.RB_Branch_id==x.Id){
-                            this.companyName=x.BName;
-                        }
-                    })
-                }else{}
-            },err=>{})
-        },
-        getPost(){ //岗位
-            this.getPostMsg.RB_Branch_Id = this.dataList.RB_Branch_Id;
-            this.getPostMsg.RB_Department_Id = this.dataList.RB_Department_Id;
-            this.apipost('admin_get_PostGetList',this.getPostMsg,res=>{
-                if(res.data.resultCode==1){
-                    let data=res.data.data;
-                    data.forEach(x=>{
-                        if(this.dataList.RB_Post_Id==x.PostId){
-                            this.Gangwei = x.PostName;
-                        }
-                    })
-                }else{}
-            },err=>{})				
-        },
         //过滤电话号码
         getBangding(val){
          if(val){
@@ -1397,9 +1350,8 @@
 
     },
     mounted() {
+      this.u = this.getLocalStorage();
       this.getList();
-      this.getCompany();
-      this.getPost();
       this.openMode=localStorage.openMode;
       this.radio=localStorage.openMode;
 

src/components/Ticketing/flightPerformance.vue

@@ -3,25 +3,38 @@
     border-bottom: 1px solid #d1d1d1;
     border-right: 1px solid #d1d1d1;
     background: #E6E6E6;
-    height:40px;
-    font-size: 14px;   
+    height: 40px;
+    font-size: 14px;
     color: #333;
   }
-  .flightPerformance .fpTable{
-    width:1000px;
-    margin-bottom:30px;
-    border-collapse:collapse;
+
+  .flightPerformance .fpTable {
+    width: 1000px;
+    margin-bottom: 30px;
+    border-collapse: collapse;
   }
-  .flightPerformance .creatName{
-    color:green;
+
+  .flightPerformance .creatName {
+    color: green;
     font-weight: bold;
-    margin-right:10px;
+    margin-right: 10px;
+  }
+
+  .flightPerformance .fpTable tr {
+    background: #fff;
+    text-align: center;
+    height: 40px;
+  }
+
+  .flightPerformance .fpTable tr td {
+    font-size: 12px;
+    border: 1px solid #E5E5E5;
   }
-  .flightPerformance .fpTable tr{background: #fff;text-align: center; height: 40px;}
-  .flightPerformance .fpTable tr td{font-size: 12px;border: 1px solid #E5E5E5;}
+
   .flightPerformance .fpTable tbody tr:last-child {
     border-bottom: 2px solid #333;
   }
+
 </style>
 
 <template>
@@ -50,7 +63,8 @@
         </li>
       </ul>
     </div>
-    <table class="fpTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading" v-for="(item,index) in dataList.resultList">
+    <table class="fpTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading"
+      v-for="(item,index) in dataList.resultList">
       <tbody v-for="(subItem,subIndex) in item.TicketList">
         <tr v-if="subIndex==0">
           <td colspan="6">
@@ -71,13 +85,14 @@
             <td width="10%">
               {{childIndex+1}}
             </td>
-            <td width="20%" :rowspan="subItem.SubList.length+1" style="border-bottom:2px solid black" v-if="childIndex==0">
-                {{subItem.OutBranchName}}
+            <td width="20%" :rowspan="subItem.SubList.length+1" style="border-bottom:2px solid black"
+              v-if="childIndex==0">
+              {{subItem.OutBranchName}}
             </td>
             <td width="30%">
               <template v-if="childItem.TCID>0">
                 <a style="color:blue;cursor:pointer" @click='goUrlT("RegistrationList",childItem.TCID,"报名清单")'>
-                  ({{childItem.TCID}}){{childItem.TCNUM}} 
+                  ({{childItem.TCID}}){{childItem.TCNUM}}
                 </a>
               </template>
               <template v-else>
@@ -85,18 +100,19 @@
               </template>
             </td>
             <td width="10%">{{childItem.TicketNum}}</td>
-            <td width="10%" :rowspan="subItem.SubList.length+1" style="border-bottom:2px solid black" v-if="childIndex==0">{{dataList.UnitPrice}}</td>
+            <td width="10%" :rowspan="subItem.SubList.length+1" style="border-bottom:2px solid black"
+              v-if="childIndex==0">{{dataList.UnitPrice}}</td>
             <td width="10%">{{childItem.TicketNum*dataList.UnitPrice}}</td>
           </tr>
           <tr v-if="childIndex==subItem.SubList.length-1">
-              <td></td>
-              <td style="font-weight:bold;">合计</td>
-              <td style="color:red;">
-                {{getPeopleCount(subItem.SubList)}}
-              </td>
-              <td style="color:red;">
-                {{getCount(subItem.SubList)}}
-              </td>
+            <td></td>
+            <td style="font-weight:bold;">合计</td>
+            <td style="color:red;">
+              {{getPeopleCount(subItem.SubList)}}
+            </td>
+            <td style="color:red;">
+              {{getCount(subItem.SubList)}}
+            </td>
           </tr>
         </template>
         <tr v-if="subIndex==item.TicketList.length-1">
@@ -168,41 +184,43 @@
           this.loading = false;
           if (res.data.resultCode == 1) {
             this.dataList = res.data.data;
+          } else {
+            this.Error(res.data.message);
           }
         });
       },
       //获取没个的人数
-      getPeopleCount(subList){
-        let count=0;
+      getPeopleCount(subList) {
+        let count = 0;
         subList.forEach(x => {
-            count+=x.TicketNum;
+          count += x.TicketNum;
         });
         return count;
       },
       //计算小计
-      getCount(list){
-        let count=0;
+      getCount(list) {
+        let count = 0;
         list.forEach(x => {
-            count+=x.TicketNum;
+          count += x.TicketNum;
         });
-        return count*this.dataList.UnitPrice;
+        return count * this.dataList.UnitPrice;
       },
       //计算总计
-      getTotalCount(list){
-        let count=0;
-        list.forEach(x=>{
-          x.SubList.forEach(y=>{
-            count+=y.TicketNum
+      getTotalCount(list) {
+        let count = 0;
+        list.forEach(x => {
+          x.SubList.forEach(y => {
+            count += y.TicketNum
           })
         })
-        return count*this.dataList.UnitPrice;
+        return count * this.dataList.UnitPrice;
       },
       //获取总计人数
-      getTotalNum(list){
-        let count=0;
-        list.forEach(x=>{
-          x.SubList.forEach(y=>{
-            count+=y.TicketNum
+      getTotalNum(list) {
+        let count = 0;
+        list.forEach(x => {
+          x.SubList.forEach(y => {
+            count += y.TicketNum
           })
         })
         return count;