车资增加条件导出

src/components/BusExport.vue

@@ -147,6 +147,7 @@
             MakeEndDate:'',
             CurrType:'',
             CurrName:'',
+            ClientId:''
           },
           Year:'',
           Month:'',
@@ -160,7 +161,7 @@
         this.msg.MakeStartDate = this.$route.query.MakeStartDate;
         this.msg.MakeEndDate = this.$route.query.MakeEndDate;
         this.msg.CurrType = this.$route.query.CurrType;
-
+        this.msg.ClientId=this.$route.query.ClientId;
         this.Year = this.msg.Month.split('-')[0];
         this.Month = this.msg.Month.split('-')[1];
 

src/components/SalesModule/productQuery.vue

@@ -289,7 +289,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="单地接人数" prop="AirticketNum">
+            <el-form-item label="单地接人数" prop="AirticketNum" v-show="addMsg.GroupType !== '1'">
               <el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')" @input='getNumber();getTotalPrice();getHouseNo();autoRemarks("AirticketNum","单地接数量")'></el-input>
             </el-form-item>
           </el-col>
@@ -1110,6 +1110,11 @@
           this.getNumber();
           this.getHouseNo();
           this.getTotalPrice()
+        } else if (val === '1') {
+          this.addMsg.AirticketNum = 0
+          this.getNumber();
+          this.getHouseNo();
+          this.getTotalPrice()
         }
       },
       downloadFile: function (item) {

src/components/busManagement/BusApportionManagement.vue

@@ -298,6 +298,16 @@
                 </el-option>
             </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-option :value="0" label="不限"></el-option>
+                  <el-option v-for='item in ClientAccountList'
+                      :label='item.Name'
+                      :value='item.ID'
+                      :key='item.ID'>
+                  </el-option>
+              </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <button class="normalBtn" type="primary" @click="goToExport('BusExport')">{{$t('pub.saveBtn')}}</button> &nbsp;
@@ -388,7 +398,8 @@ export default {
               DCDate:'',
               StartGroupDate:'',
               EndGroupDate:'',
-              CurrType:3
+              CurrType:3,
+              ClientId:0
             },
             pickerBeginDateBefore: {
               disabledDate: time => {
@@ -818,6 +829,7 @@ export default {
               MakeStartDate:this.exportInfo.StartGroupDate,
               MakeEndDate:this.exportInfo.EndGroupDate,
               CurrType:this.exportInfo.CurrType,
+              ClientId:this.exportInfo.ClientId
             }
           });
           window.open(routeData.href, "_blank");