11

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -397,7 +397,7 @@
                         <span v-if="(GetDetail.TemplateId==29 || GetDetail.TemplateId==31) && OPState" @click="GoOPurl(GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
                         <span v-if="CostTypeState" @click="GourlCostType('VisitRecord',1)" style="margin:0 10px;cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">拜访记录</span>
                         <span v-if="CostTypeState" @click="GourlCostType('yingyanMap',2)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">鹰眼轨迹</span>
-                        <span v-if="OtherType!=''" @click="GourlHotelZr" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">酒店折让</span>
+                        <span v-if="GetDetail.OtherType==5" @click="GourlHotelZr" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">酒店折让</span>
                     </p>
                     <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
                         <tr v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" class="_fujiashuoming_tr">
@@ -927,7 +927,6 @@ export default {
           showModel: false,
           CostTypeState:false,
           huijiShow:false,
-          OtherType:'',
         }
     },components:{
         'my-FlowChartModule': myFlowChartModule,
@@ -954,7 +953,6 @@ export default {
         if(ActionMenuCode.indexOf('F_Update_KJCostType')!=-1){
             this.huijiShow=true;
         }
-        this.OtherType=this.$route.query.OtherType?this.$route.query.OtherType:'';
     },methods:{
         GourlHotelZr(){
             this.$router.push({

src/components/Hotel/HotelDiscount.vue

@@ -157,7 +157,7 @@
                 </el-date-picker>
             </el-form-item>
           </div>
-          <div>
+          <div style="margin-bottom:5px">
             收款账户 ：日本地接部专户（人民币）
           </div>
           <el-form-item label="折让金额" prop="Money">
@@ -291,7 +291,6 @@ export default {
             name: path,
             query: {
                 id: id,
-                OtherType:5,
                 blank: 'y',
             }
             })
@@ -344,7 +343,6 @@ export default {
                     }
 
                     this.apipost("Financial_post_SetHotelServiceBetchImport", this.addMsg, res => {
-                        console.log("addMsg",res);
                         if (res.data.resultCode == 1) {
                             this.getList();
                             this.moneyR=false;
@@ -361,21 +359,21 @@ export default {
             
         },
         checkedAll() {   //全选
-				if(this.isCkedAll == true) {
-					this.customerList = []
-				} else {
-					this.customerListAll.forEach(item => {
-						this.customerList.push(item)
-					})
-				}
-			},
-			ckeckedOne() {   //单选
-				if(this.customerList.length  < this.allLength) {
-					this.isCkedAll = false
-				} else {
-					this.isCkedAll = true
-				}
-			},
+            if(this.isCkedAll == true) {
+                this.customerList = []
+            } else {
+                this.customerListAll.forEach(item => {
+                    this.customerList.push(item)
+                })
+            }
+        },
+        ckeckedOne() {   //单选
+            if(this.customerList.length  < this.customerListAll.length) {
+                this.isCkedAll = false
+            } else {
+                this.isCkedAll = true
+            }
+        },
         showUpLoadFile(i) {
             // 预览上传文件
             if (i.Type == 3) {
@@ -486,22 +484,22 @@ export default {
                 let data=res.data.data.pageData;
                 this.dataList=[];
                 this.total = res.data.data.count;
-                this.allLength=res.data.data.pageData.length
                 this.customerListAll=[];
                 data.forEach(item=>{
                     item.disabled=false;
                     if(item.FinanceId!=0){
                         item.disabled=true;
                     }
-                    
                     this.dataList.push(item)
                     item.AirTicketId=item.NewHotelID;
-                    if(item.FinanceId!=0){
+                    if(item.FinanceId==0){
                         this.customerListAll.push(item)
                     }
                     
                     
                 })
+                console.log("this.customerListAll",this.customerListAll)
+
             }
         });
       },