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

src/components/Details.vue

@@ -820,7 +820,7 @@ export default {
     filterRouter(){
       let that=this
       this.$router.beforeEach((to, from, next) => {
-        console.log("to.query.blank && to.query.blank=='y'",to.query)
+        // console.log("to.query.blank && to.query.blank=='y'",to.query,"666")
         if(to.path=="/ModifyVisaProduct"){
           this.reloadpage();
         }

src/components/SalesModule/VisaFinancialDocuments.vue

@@ -531,7 +531,6 @@ export default {
         this.Error("至少选择一人！");
         return;
       }
-      
       sessionStorage.setItem("saveGuestInfo",JSON.stringify(userInfo))
       // this.$store.commit('saveGuestInfo',userInfo)
       // console.log("getGuestInfo",this.$store.getters.getGuestInfo)

src/components/SalesVisa/ModifyVisaProduct.vue

@@ -404,19 +404,19 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="成本价" prop="CostPrice">
-                    <el-input v-model.number="addMsg.CostPrice" @keyup.native="checkInteger(addMsg,'CostPrice')" placeholder="请输入" maxlength="20"></el-input>
+                    <el-input v-model="addMsg.CostPrice"  @keyup.native="checkPrice(addMsg,'CostPrice')" placeholder="请输入" maxlength="20"></el-input>
                     </el-form-item>
                     
                    
                     <el-form-item label="同业价" prop="VisaPrice">
-                    <el-input v-model.number="addMsg.VisaPrice" @keyup.native="checkInteger(addMsg,'VisaPrice')" placeholder="请输入" maxlength="20"></el-input>
+                    <el-input v-model.number="addMsg.VisaPrice" @keyup.native="checkPrice(addMsg,'VisaPrice')" placeholder="请输入" maxlength="20"></el-input>
                     </el-form-item>
                     <el-form-item label="直客价" prop="VisaB2CPrice">
-                    <el-input v-model.number="addMsg.VisaB2CPrice" @keyup.native="checkInteger(addMsg,'VisaB2CPrice')" placeholder="请输入" maxlength="20"></el-input>
+                    <el-input v-model.number="addMsg.VisaB2CPrice" @keyup.native="checkPrice(addMsg,'VisaB2CPrice')" placeholder="请输入" maxlength="20"></el-input>
                     </el-form-item>
                     
                     <el-form-item label="提成金额" prop="CommissionPrice">
-                    <el-input v-model="addMsg.CommissionPrice" placeholder="请输入"  @keyup.native="checkInteger(addMsg,'CommissionPrice')"></el-input>
+                    <el-input v-model="addMsg.CommissionPrice" placeholder="请输入"  @keyup.native="checkPrice(addMsg,'CommissionPrice')"></el-input>
                     </el-form-item>
                     
                     <el-form-item label="提前预定天数" prop="BookAdvance">
@@ -764,7 +764,7 @@ export default {
         VisaType: 1,
         SendVisaDate: "",
         VisaPrice: "",
-        PeopleNum: 0,
+        PeopleNum: "0",
         CostPrice: "",
         EntryType:0,
         CommissionPrice: "",
@@ -779,8 +779,6 @@ export default {
     
       rules: {
         Name: [{ required: true, message: "请输入产品名称", trigger: "blur" }],
-        // ManageDuration:[{ type: 'number', message: '必须为数字值'}],
-        
         customerName: [
           { required: true, message: "请输入客户名", trigger: "blur" }
         ],
@@ -795,14 +793,14 @@ export default {
           { required: true, message: "请输入直客价", trigger: "blur" },
           {
             pattern: this.$commonUtils.Regex.el_Isdecimal,
-            message: "请输入数字"
+            message: "请输入直客价"
           }
         ],
         CostPrice: [
           { required: true, message: "请输入成本价", trigger: "blur" },
           {
             pattern: this.$commonUtils.Regex.el_Isdecimal,
-            message: "请输入数字"
+            message: "请输入成本价"
           }
         ],
         VisaType: [
@@ -895,7 +893,7 @@ export default {
             "dmc_get_visa_GetVisaProductInfo_V1",
             {Pid:Pid},
             res => {
-              // console.log(res);
+              console.log(res);
               if (res.data.resultCode == 1) {
                   let data=res.data.data;
                   this.addMsg=res.data.data;
@@ -975,7 +973,6 @@ export default {
             "YYYY-MM-DD"
           );
         //   console.log("this.addMsg", this.addMsg);
-        this.loading=true;
           this.apipost(
             "dmc_post_visa_SetVisaProduct_V1",
             this.addMsg,

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -233,7 +233,7 @@
           <div class="TB_comtitle TB-Title">团费收入：
             <span v-if="moneyAll.Moneyall>0 || moneyAll.PayMoneyall>0">
               <span class="span_all">应收：¥{{moneyFormat(moneyAll.Moneyall)}}</span>
-              <span class="span_all">实收：¥{{moneyFormat(moneyAll.PayMoneyall)}}</span>
+              <span class="span_all">实收：¥{{moneyFormat(moneyAll.PayMoneyall)}}</span> 
             </span>
             
             
@@ -1573,8 +1573,8 @@
               // 车资
               if(that.isExists(item.CostTypeList,'车资')){
            
-                this.moneyAll.zheziyf+=item.Money;
-                this.moneyAll.zhezisf+=item.PayMoney;
+                this.moneyAll.cheziyf+=item.Money;
+                this.moneyAll.chezisf+=item.PayMoney;
               }
               // 机票款
               if(that.isExists(item.CostTypeList,'国际段机票') || item.OrderSource===4 || that.isExists(item.CostTypeList,'机票退税') || that.isExists(item.CostTypeList,'机票罚金') || that.isExists(item.CostTypeList,'机票税金') || that.isExists(item.CostTypeList,'国内联运段机票')){

src/components/platformModule/platformManagement.vue

-
-<style  lang="less" scoped>
-   @import "../../assets/css/main.less";
-   @import "../../assets/css/cssReset.css";
+<style lang="less" scoped>
+  @import "../../assets/css/main.less";
+  @import "../../assets/css/cssReset.css";
 </style>
-
 <template>
   <div>
-  	 	 <leftNav></leftNav>
+    <leftNav></leftNav>
   </div>
 </template>
-
 <script>
-    import leftNav from '../public/leftNav.vue'		
-	export default {
-		data (){
-			return{
-				
-			}
-		},
-		components:{
-			leftNav
-		},
-		mounted(){
-			
-		},
-		methods:{
-			goUrl (path,id) {
-				this.$router.push({ path: "Details",query:{path,id} }) 
-			},
-		}	
-	}
-
-
-
-		
+  import leftNav from '../public/leftNav.vue'
+  export default {
+    data() {
+      return {
+      }
+    },
+    components: {
+      leftNav
+    },
+    mounted() {
+    },
+    methods: {
+      goUrl(path, id) {
+        this.$router.push({
+          path: "Details",
+          query: {
+            path,
+            id
+          }
+        })
+      },
+    }
+  }
 </script>
\ No newline at end of file