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

src/components/FinancialModule/FinancialSubmodule/BillModule.vue

@@ -410,23 +410,19 @@ export default {
                            }
                        }) 
                       if(status){
-                        // console.log("this.GetDetail.DetailList[0].Remark",this.GetDetail.DetailList[0].Remark)
-                        this.apipost('Financial_post_GetFinanceSwipingCard',{FrId:this.ID},res=>{
-                            if(res.data.resultCode==1){
-                              // console.log("res.data.data",res.data.data);
-                                if(res.data.data.length>0){
-                                  this.GetDetail.DetailList[0].Remark+="刷卡:"
-                                  res.data.data.forEach(item=>{
-                                    this.GetDetail.DetailList[0].Remark+=`${item.Name}，`;
-                                  })
-                                } 
+                        // this.apipost('Financial_post_GetFinanceSwipingCard',{FrId:this.ID},res=>{
+                        //     if(res.data.resultCode==1){
+                        //         if(res.data.data.length>0){
+                        //           this.GetDetail.DetailList[0].Remark+=`   `+"刷卡:"
+                        //           res.data.data.forEach(item=>{
+                        //             this.GetDetail.DetailList[0].Remark+=`${item.Name}，`;
+                        //           })
+                        //         } 
                                 
-                            }else{
-                                this.Error(res.data.message)
-                            }
-                        },err=>{})
-                       
-
+                        //     }else{
+                        //         this.Error(res.data.message)
+                        //     }
+                        // },err=>{})
                       }
                     }
                 }

src/components/LeaderManagement/leaderScheduleManager.vue

@@ -376,7 +376,7 @@
           <span>
             <em>领队/导游</em>
             <el-select v-model="msg.LeaderId" filterable :placeholder="$t('admin.admin_phBirthPlace')" class="w210">
-              <el-option :label="$t('pub.unlimitedSel')" :value="0"> </el-option>
+              <el-option :label="$t('pub.unlimitedSel')" :value="-1"> </el-option>
               <el-option v-for='item in leaderList' :key="item.ID" :label="item.Name" :value="item.ID">
               </el-option>
             </el-select>
@@ -509,7 +509,7 @@
         msg: {
           pageIndex: 1,
           pageSize: 10,
-          LeaderId: 0,
+          LeaderId: -1,
           ScheduleType: 0,
           YearMonth: "",
           TCID: 0,