新增财务外币查询， 询价需求新增 正式、临时客户分类

src/components/SalesModule/demandInquiry.vue

@@ -25,6 +25,7 @@
     .page_demandInquiry ._vr_left ul li>div{width:120px;height:120px;background:rgba(42,174,242,1);border-radius:46px;border: 6px solid rgba(85,190,245,1);}
     .page_demandInquiry ._vr_left ul li>div p:nth-child(1){font-weight: bold;font-size: 18px;margin-top: 30px}
     .page_demandInquiry ._vr_left ul li>p{color: #333333;margin-top: 10px}
+    .height-auto .el-input{height: auto !important}
 </style>
 <template>
     <div class="page_demandInquiry">
@@ -66,8 +67,24 @@
             <el-form class="_info_box clearfix" :model="addMsg" :rules="rules" ref="addMsg" label-width="120px">
                 <ul class="_form clearfix">
                     <li>
-                        <el-form-item label="客户：" prop="customerInfoId">
-                            <el-select filterable v-model="addMsg.customerInfoId" class="w135">
+                        <el-form-item label="客户类型：" prop="linshig">
+                            <div class="w210">
+                                <el-radio v-model="addMsg.linshig" @change="addMsg.CustomerName = '', addMsg.customerInfoId = 0, AppCoustomer = []" label="1">正式客户</el-radio>
+                                <el-radio v-model="addMsg.linshig" @change="addMsg.CustomerName = '', addMsg.customerInfoId = 0, AppCoustomer = []" label="2">临时客户</el-radio>
+                            </div>
+                        </el-form-item> 
+                    </li>
+                    <li>
+                        <el-form-item label="客户：" prop="customerInfoId" >
+                            <el-select 
+                                :multiple="false"
+                                filterable
+                                remote
+                                reserve-keyword
+                                placeholder="请输入关键词"
+                                :remote-method="getAppCoustomer"
+                                @change="getAppCoustomerName"
+                                :loading="loading" v-model="addMsg.customerInfoId"  v-if="addMsg.linshig == '1'" class="w210 height-auto">
                                 <el-option 
                                     placeholder="请选择"
                                     v-for="item in AppCoustomer" 
@@ -76,11 +93,12 @@
                                     :value="item.customerId">
                                 </el-option>
                             </el-select> 
-                        </el-form-item> 
+                            <el-input v-else v-model="addMsg.CustomerName" placeholder="请输入" class="w210"></el-input>
+                        </el-form-item>
                     </li>
                     <li>
                         <el-form-item label="询问路线：" prop="lineId">
-                            <el-select v-model="addMsg.lineId" class="w135" :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList(addMsg.lineId)">
+                            <el-select v-model="addMsg.lineId" class="w210" :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList(addMsg.lineId)">
                                 <el-option 
                                     placeholder="请选择"
                                     v-for="item in InquireLineList" 
@@ -93,7 +111,7 @@
                     </li>
                       <li>
                         <el-form-item label="系列：">
-                            <el-select v-model="addMsg.LineteamId" class="w135" :placeholder="$t('pub.pleaseSel')">
+                            <el-select v-model="addMsg.LineteamId" class="w210" :placeholder="$t('pub.pleaseSel')">
                                   <el-option label="不限" value=''></el-option>
                                 <el-option 
                                     placeholder="请选择"
@@ -107,7 +125,7 @@
                     </li>
                     <li>
                         <el-form-item label="出发时间：" prop="departTime">
-                            <el-date-picker clearable class="w220"
+                            <el-date-picker clearable class="w210"
                                     v-model="addMsg.departTime"
                                     type="datetime"
                                     value-format="yyyy-MM-dd HH:mm:ss"
@@ -117,17 +135,17 @@
                     </li>
                     <li>
                         <el-form-item label="价格预计：" prop="budgetPrice">
-                            <el-input v-model="addMsg.budgetPrice" placeholder="请输入" class="w220"></el-input>
+                            <el-input v-model="addMsg.budgetPrice" placeholder="请输入" class="w210"></el-input>
                         </el-form-item> 
                     </li>
                     <li>
                         <el-form-item label="人数预计：" prop="peopleNumber">
-                            <el-input v-model="addMsg.peopleNumber" placeholder="请输入" class="w220"></el-input>
+                            <el-input v-model="addMsg.peopleNumber" placeholder="请输入" class="w210"></el-input>
                         </el-form-item> 
                     </li>
                        <li>
                         <el-form-item label="备注" >
-                             <el-input v-model='addMsg.Remark' type='textarea' maxlength='500'></el-input>
+                             <el-input v-model='addMsg.Remark' class="w210" type='textarea' maxlength='500'></el-input>
                         </el-form-item> 
                     </li>
                 </ul>
@@ -146,8 +164,11 @@ export default {
                 budgetPrice:'',
                 peopleNumber:'',
                 LineteamId:'',
-                Remark:''
+                Remark:'',
+                linshig: '1',
+                CustomerName: ''
             },
+            loading: false,
             rules:{
                 customerInfoId:[{required: true, message: "请输选择客户", trigger: "change"}],
                 lineId:[{required: true, message: "请输选择线路", trigger: "change"}],
@@ -174,6 +195,13 @@ export default {
             LineteamList:[],
         }
     },methods:{
+        getAppCoustomerName(t){
+            this.AppCoustomer.forEach(x=>{
+                if (t == x.customerId){
+                    this.addMsg.CustomerName = x.customerName
+                }
+            })
+        },
         getInquireLineList(){  // 获取线路下拉
             this.apipost('line_post_GetAllList',{},res=>{
                 if(res.data.resultCode==1){
@@ -195,16 +223,19 @@ export default {
 					}
 				});
 			},
-        getAppCoustomer(){   // 获取客户列表      
-            this.apipost('app_get_my_select_coustomer',{},res=>{
-                // console.log(res,"safaf")
+        getAppCoustomer(query){   // 获取客户列表  
+        if (query !== '') {
+            this.apipost('app_post_GetCustomerBrandByKeyWord',{customerInfo: query},res=>{
                 if(res.data.resultCode==1){
                     this.AppCoustomer = res.data.data;
-                    // console.log("this.AppCoustomer",this.AppCoustomer)
                 }else{
                     this.$message.error(res.data.message)
                 }
             },err=>{})
+        }else {
+          this.AppCoustomer = [];
+        }
+            
         },
         getInquireLineNeed(){  //获取线条条数据
              this.apipost('app_my_inquire_line_need',{},res=>{
@@ -437,7 +468,6 @@ export default {
         // }
 
         this.getInquireLineNeed()
-        this.getAppCoustomer()
         this.getInquireLineList()
     }
 }

src/components/SalesVisa/salesOrderToday.vue

@@ -58,6 +58,19 @@
 						<em>单号/团号</em><el-input v-model="msg.TCNUM" :placeholder="$t('pub.pleaseImport')" clearable></el-input> 
 					</span>
 				</li>
+				<li>
+					<span>
+						<em>所属公司</em>
+						<el-select  filterable  v-model='msg.BranchId '  class="">
+									<el-option value="-1" label="不限"></el-option>
+									<el-option v-for='item in CompanyList'
+											:label='item.BName'
+											:value='item.Id'
+											:key='item.Id'>
+									</el-option>
+							</el-select>
+					</span>
+				</li>
 				<li v-if="isShow==0">	
 					<span>
 						<em>创建人</em>
@@ -191,6 +204,7 @@ export default {
     data(){
         return{
 			defaultImg: 'this.src="' + require("../../assets/img/litheader.png") + '"',
+			CompanyList: [],
 			nameShow: true,
             msg:{
                 pageIndex:1,
@@ -202,7 +216,8 @@ export default {
                 QEndDate:'',
                 Pid:'',
 				EmId:'-1',
-				VisaType:'-1'
+				VisaType:'-1',
+				BranchId: '-1'
             },
 			 dataList:[],
 			 EmployeeList:[],
@@ -219,6 +234,19 @@ export default {
         }
 	},
 	methods:{
+		getCompanyList(){ //获取公司列表
+			let getCompanyMsg ={  // 公司
+					RB_Group_Id:'0',
+					Status:'0',
+			}
+			let userInfo=this.getLocalStorage();
+			getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id;    //集团ID
+			this.apipost('admin_get_BranchGetList',getCompanyMsg,res=>{
+				if(res.data.resultCode==1){
+					this.CompanyList=res.data.data;
+				}else{}
+			},err=>{})
+		},
 		PerferPrice(){
 			 this.apipost('dmc_get_visa_SetVisaOrderPrice',this.EditMsg,res=>{
                 if(res.data.resultCode==1){
@@ -293,6 +321,7 @@ export default {
 	},
 	mounted(){
 		let userinfo = this.getLocalStorage();
+		this.getCompanyList()
 		this.EmployeeId = userinfo.EmployeeId;
 		if (this.$route.query.name!==undefined) {
 			this.visaProduct = this.$route.query.name+"("+this.$route.query.sendDate+")"

src/router/config.js

@@ -3015,6 +3015,13 @@ export default {
                             meta: {
                                 title: '收支款查询管理'
                             },
+                        }, { //财务 财务单据 收款查询管理
+                            path: '/RecPayQueryWB',
+                            name: 'RecPayQueryWB',
+                            component: resolve => require(['@/components/FinancialModule/RecPayQueryWB'], resolve),
+                            meta: {
+                                title: '外币单据查询'
+                            },
                         }, { //财务 财务单据 应收团款查询
                             path: '/RecPayQueryTeam',
                             name: 'RecPayQueryTeam',