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

src/components/FinancialModule/accDetail/CashAccDetail.vue

@@ -752,7 +752,8 @@ export default {
             let msg = {
                     TypeId:0,
                     BranchId:-1,
-                    Alias:''
+                    Alias:'',
+                    IsCompanyPermission:1
             };
             this.apipost('BankAccount_post_GetCashAccountList',msg, res => {
                 if(res.data.resultCode === 1) {
@@ -845,6 +846,7 @@ export default {
                     TypeId:this.accType,
                     BranchId:-1,
                     Alias:'',
+                    IsCompanyPermission:1
             };
             this.apipost('BankAccount_post_GetCashAccountList',msg, res => {
                 if(res.data.resultCode === 1) {

src/components/Ticketing/TicketManager.vue

@@ -2139,6 +2139,14 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="5">
+            <el-form-item label="机票类型" prop="AirTicketType">
+              <el-select v-model="sales.AirTicketType" :placeholder="$t('pub.pleaseSel')">
+                <el-option label="国际机票" value="1" selected></el-option>
+                <el-option label="国内机票" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </ul>
       </div>
 
@@ -2330,7 +2338,8 @@
           AirTicketNum: 0,
           B2BPrice: '',
           B2CPrice: '',
-          IsDiscounts: '0'
+          IsDiscounts: '0',
+          AirTicketType:'1'
         },
 
         //1-一般导入，2-多航段导入
@@ -3227,6 +3236,11 @@
         } else {
           this.sales.IsDiscounts = '0';
         }
+        if(item.AirTicketType!=null){
+          this.sales.AirTicketType=item.AirTicketType.toString();
+        }else {
+          this.sales.AirTicketType='1';
+        }
       },
       //保存
       saveSales() {