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

src/components/SalesModule/groupTourOrder.vue

@@ -942,12 +942,12 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="商务舱" prop="ESeatNum">
-              <el-input v-model='addMsg.ESeatNum' :disabled="true"></el-input>
+              <el-input v-model='addMsg.ESeatNum' @input="getNumber()"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="头等舱" prop="FSeatNum">
-              <el-input v-model='addMsg.FSeatNum' :disabled="true"></el-input>
+              <el-input v-model='addMsg.FSeatNum' @input="getNumber()"></el-input>
             </el-form-item>
           </el-col>
           <!-- <el-col :span="4">
@@ -2678,10 +2678,10 @@
           Number(this.addMsg.ChirdNum) +
           Number(this.addMsg.BabyNum) +
           Number(this.addMsg.OldPeopleNum)
-        this.addMsg.YSeatNum =
-          Number(this.addMsg.ManNum) +
-          Number(this.addMsg.ChirdNum) +
-          Number(this.addMsg.OldPeopleNum)
+
+        var SeatNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum))-
+                    (Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum));
+        this.addMsg.YSeatNum = SeatNum<0?0:SeatNum;
       },
       getTotalPrice () {
         this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -733,7 +733,7 @@
                 <el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
                 </el-option>
               </el-select> -->
-              <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
+              <el-input v-model='addMsg.Unit_Price' @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
             </el-form-item>
 						<!-- <el-form-item>
 							<p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
@@ -845,12 +845,12 @@
 					</el-col>
 					<el-col :span="4">
 						<el-form-item label="商务舱" prop="ESeatNum">
-						   <el-input v-model='addMsg.ESeatNum' :disabled="true"></el-input>
+						   <el-input v-model='addMsg.ESeatNum' @input="getNumber()"></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :span="4">
 						<el-form-item label="头等舱" prop="FSeatNum">
-						   <el-input v-model='addMsg.FSeatNum' :disabled="true"></el-input>
+						   <el-input v-model='addMsg.FSeatNum' @input="getNumber()"></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :span="4">
@@ -1176,12 +1176,12 @@
 					</el-col>
 					<el-col :span="4">
 						<el-form-item label="商务舱" prop="ESeatNum">
-						   <el-input v-model='addMsg.ESeatNum' :disabled="true"></el-input>
+						   <el-input v-model='addMsg.ESeatNum' @input="getNumber()"></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :span="4">
 						<el-form-item label="头等舱" prop="FSeatNum">
-						   <el-input v-model='addMsg.FSeatNum' :disabled="true"></el-input>
+						   <el-input v-model='addMsg.FSeatNum' @input="getNumber()"></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :span="4">
@@ -3053,10 +3053,10 @@ export default {
         Number(this.addMsg.ChirdNum) +
         Number(this.addMsg.BabyNum) +
         Number(this.addMsg.OldPeopleNum);
-      this.addMsg.YSeatNum =
-        Number(this.addMsg.ManNum) +
-        Number(this.addMsg.ChirdNum) +
-        Number(this.addMsg.OldPeopleNum);
+
+      var SeatNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum))-
+          (Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum));
+        this.addMsg.YSeatNum = SeatNum<0?0:SeatNum;
     },
     getTotalPrice() {
       if (this.addMsg.GroupType !=5) {

src/components/SalesModule/productQuery.vue

@@ -366,12 +366,12 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="商务舱" prop="ESeatNum">
-              <el-input v-model='addMsg.ESeatNum' :disabled="true"></el-input>
+              <el-input v-model='addMsg.ESeatNum' @input='getNumber()'></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="头等舱" prop="FSeatNum">
-              <el-input v-model='addMsg.FSeatNum' :disabled="true"></el-input>
+              <el-input v-model='addMsg.FSeatNum' @input='getNumber()'></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
@@ -1577,7 +1577,9 @@
           Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum))
         this.addMsg.SafeNum = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
           Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum))
-        this.addMsg.YSeatNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum))
+          var SeatNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum))-
+                               (Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum));
+        this.addMsg.YSeatNum = SeatNum<0?0:SeatNum;
         this.autoRemarks("VisaNum", "不要签证数量")
       },
       getTotalPrice() {
@@ -1758,7 +1760,9 @@
           this.$message.warning('保险数量不能大于人数总和！')
           return
         }
-        //				if((Number(this.addMsg.ManNum)+Number(this.addMsg.ChirdNum)+Number(this.addMsg.OldPeopleNum)+Number(this.addMsg.BabyNum))<Number(this.addMsg.AirticketNum))
+
+        // if((Number(this.addMsg.ManNum)+Number(this.addMsg.ChirdNoNeedBedNum)+Number(this.addMsg.ChirdNeedBedNum)+Number(this.addMsg.OldPeopleNum))
+        //   <(Number(this.addMsg.YSeatNum)+Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum)))
         // {
         //   this.$message.warning('机票数量不能大于人数总和！')
         //   return

src/components/SalesVisa/VisaProductEditOrder.vue

@@ -157,10 +157,10 @@
 						<el-tooltip   v-else class="item" effect="dark" content="修改备注" placement="top-start">
 			              <el-button type="primary" style='background:#409EFF; border-color:#409EFF' icon="iconfont icon-img_bianji_small" @click='getDetail(item,true)'></el-button>
 			            </el-tooltip>
-			            <el-tooltip   effect="dark" content="结算"  placement="top-start">
+			            <el-tooltip  v-if="item.visaOrderStatus==1&&item.visaStatus==1" effect="dark" content="结算"  placement="top-start">
 			               <el-button type="primary"  style='background:#5EBB64; border-color:#5EBB64' @click='goUrl(item)'  icon="iconfont icon-qian"></el-button>
 			            </el-tooltip>
-			              <el-tooltip   effect="dark" content="旅客名单"  placement="top-start">
+			              <el-tooltip v-if="item.visaOrderStatus==1&&item.visaStatus==1"  effect="dark" content="旅客名单"  placement="top-start">
 			               <el-button v-show='item.visaManagementId>0' type="primary"  style='background:#00a1f1; border-color:#00a1f1' @click='goUrlT(item)'  icon="iconfont icon-bumen"></el-button>
 			             </el-tooltip>
 						  <el-tooltip v-if="item.income<=0&&item.visaOrderStatus==1"  class="item" effect="dark" content="取消" placement="top-start">

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -877,7 +877,7 @@
                 <el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
                 </el-option>
               </el-select> -->
-              <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
+              <el-input v-model='addMsg.Unit_Price' @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
             </el-form-item>
             <!-- <el-form-item label="成交单价" prop="Unit_Price">
               <el-input v-model='addMsg.Unit_Price' @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
@@ -945,12 +945,12 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="商务舱" prop="ESeatNum">
-              <el-input v-model='addMsg.ESeatNum' :disabled="true"></el-input>
+              <el-input v-model='addMsg.ESeatNum' @input='getNumber()'></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="头等舱" prop="FSeatNum">
-              <el-input v-model='addMsg.FSeatNum' :disabled="true"></el-input>
+              <el-input v-model='addMsg.FSeatNum' @input='getNumber()'></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -1231,12 +1231,12 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="商务舱" prop="ESeatNum">
-              <el-input v-model='addMsg.ESeatNum' :disabled="true"></el-input>
+              <el-input v-model='addMsg.ESeatNum' @input='getNumber()'></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="头等舱" prop="FSeatNum">
-              <el-input v-model='addMsg.FSeatNum' :disabled="true"></el-input>
+              <el-input v-model='addMsg.FSeatNum' @input='getNumber()'></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
@@ -3008,10 +3008,9 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
           Number(this.addMsg.ChirdNum) +
           Number(this.addMsg.BabyNum) +
           Number(this.addMsg.OldPeopleNum);
-        this.addMsg.YSeatNum =
-          Number(this.addMsg.ManNum) +
-          Number(this.addMsg.ChirdNum) +
-          Number(this.addMsg.OldPeopleNum);
+        var SeatNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum))-
+                    (Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum));
+        this.addMsg.YSeatNum = SeatNum<0?0:SeatNum;
         let totalNum =
           Number(this.addMsg.AirticketNum) +
           Number(this.addMsg.ManNum) +

src/components/busManagement/BusApportionManagement.vue

@@ -151,10 +151,10 @@
     ></v-table>
     <div class="_bus_edit _scrollbar" v-if="addShow" :class="addShow==true?'BusedHeight':''">
       <el-row>
-        <el-col :span="20">
+        <el-col :span="21">
           <p class="_tit">添加分摊</p>
         </el-col>
-        <el-col :span="4" class="_add_saveBtn">
+        <el-col :span="3" class="_add_saveBtn">
           <button
             type="button"
             class="normalBtn"
@@ -202,7 +202,7 @@
           </el-col>
           <el-col :span="4" :gutter="35">
             <el-form-item label="客户名称">
-              <el-select filterable  v-model='customId' placeholder="客户名称" @change="GetClientAccountList(customId)" class="w200 _border_b_1">
+              <el-select filterable  v-model='customId' placeholder="客户名称" @change="GetClientAccountList(customId)" class="_border_b_1">
                   <el-option :value="0" label="不限"></el-option>
                   <el-option v-for='item in ClientAccountList'
                       :label='item.Name'
@@ -214,7 +214,7 @@
           </el-col>
           <el-col :span="4" :gutter="35">
             <el-form-item label="付款账户">
-              <el-select  filterable  v-model='addMsg.ClientID' placeholder="请选择付款账户"  class="w200 _border_b_1">
+              <el-select  filterable  v-model='addMsg.ClientID' placeholder="请选择付款账户"  class="_border_b_1">
                   <el-option :value="0" label="不限"></el-option>
                   <el-option v-for='item in ClientAccountListS'
                       :label='item.allName'
@@ -247,13 +247,7 @@
         <el-row>
           <el-col :span="4" :gutter="35">
             <el-form-item label="金额" prop="f_UnitPrice">
-                <el-input v-model="addMsg.f_UnitPrice" placeholder="请输入" @keyup.native="checkPrice(addMsg,'f_UnitPrice'),getTotalMoney()" maxlength="20"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4" :gutter="35">
-            <el-form-item label="汇率">
-                <el-input v-model="addMsg.f_rate" placeholder="请输入" @keyup.native="checkRate(addMsg,'f_rate')" maxlength="20" class="w90"></el-input>
-                <el-input  disabled class="w100" v-model="TotalMoney"></el-input>
+                <el-input v-model="addMsg.f_UnitPrice" placeholder="请输入" @keyup.native="checkPrice(addMsg,'f_UnitPrice'),getTotalMoney(),getSingelePrice()" maxlength="20"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4" :gutter="35">
@@ -268,6 +262,12 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="4" :gutter="35">
+            <el-form-item label="汇率">
+                <el-input v-model="addMsg.f_rate" placeholder="请输入" @keyup.native="checkRate(addMsg,'f_rate'),getTotalMoney()" maxlength="20" class="w90"></el-input>
+                <el-input  disabled class="w100" v-model="TotalMoney"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="4" :gutter="35">
             <el-form-item label="总价">
                 <el-input  disabled v-model="TotalMoney"></el-input>
@@ -402,7 +402,7 @@
             </el-select>
         </el-form-item>
         <el-form-item label="客户名称" class='multiple_input countryList'>
-            <el-select filterable  v-model='exportInfo.ClientId' placeholder="请选择客户名称"  class="w200 _border_b_1">
+            <el-select filterable  v-model='exportInfo.ClientId' placeholder="请选择客户名称"  class=" _border_b_1">
                   <el-option :value="0" label="不限"></el-option>
                   <el-option v-for='item in ClientAccountList'
                       :label='item.Name'
@@ -812,8 +812,8 @@ export default {
         getInfo(){
           this.addShow = true;
           var rate = this.addMsg.f_currency;
-          this.getRate(rate);
           this.initAddMsg();
+          this.getRate(rate);
         },
         //输入金额得到总价
         getTotalMoney(){

src/plug/index.js

@@ -553,7 +553,7 @@ export default {
           co(function* () {
             for (let index = 0; index < files.length; index++) {
               let fileName = nameList[index]
-              fileName = path + fileName + "." + files[index].name.split('.').pop()
+              fileName ="/New"+ path + fileName + "." + files[index].name.split('.').pop()
               var result = yield oss.multipartUpload(fileName, files[index], {
                 progress: function* (p) {},
                 mime: 'application/octet-stream'