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

src/components/FinancialModule/FinancialSubmodule/ReceivablesModule.vue

@@ -326,6 +326,7 @@ export default {
                     platName: this.GetDetail.PlatFormName,
                     TradeWay: this.GetDetail.OrderTradeWay,
                     PlatformAccount: this.GetDetail.PlatformAccountId,
+                    blank: 'y',
                     tab: '平台订单查询'
                 }
             })

src/components/FinancialModule/platOrderquery.vue

@@ -2,14 +2,14 @@
   <div class="flexOne groupts">
     <div class="enrollTotalSearch">
       <ul>
-        <li><span><em>{{$t('advmanager.v_line')}}</em>
+        <!-- <li><span><em>{{$t('advmanager.v_line')}}</em>
             <el-select class='w200' v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')">
               <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
               <el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
               </el-option>
             </el-select>
           </span>
-        </li>
+        </li> -->
         <li><span><em>{{$t('system.table_company')}}</em>
             <el-select class='w200' v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')" @change='linkageDepartment()'>
               <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
@@ -48,7 +48,15 @@
           <span><em>{{$t('hotel.order_Number')}}</em></span>
           <el-input class='w200' v-model='msg.tempOrderId'></el-input>
         </li>
-        <li>
+        <!-- <li>
+          <span><em>{{$t('hotel.hotel_OrderStates')}}</em></span>
+          <el-select v-model='msg.OrderState' filterable :placeholder="$t('pub.pleaseSel')"   style="width:180px">
+            <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
+            <el-option v-for="item in ddztList" :label='item.Name' :value='item.Id' :key='item.Id'>
+            </el-option>
+          </el-select>
+        </li>-->
+        <li> 
           <span><em>{{$t('hotel.hotel_OrderStates')}}</em></span>
           <el-select v-model='msg.OrderState' filterable :placeholder="$t('pub.pleaseSel')"   style="width:180px">
             <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
@@ -84,7 +92,20 @@
             <el-date-picker v-model='msg.CEndDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
           </span>
         </li>
-        
+        <li>
+          <span><em>交易方式</em></span>
+          <el-select v-model='msg.TradeWay' filterable :placeholder="$t('pub.pleaseSel')" @change='tradeWayMethods'>
+            <el-option v-for="item in jyfsList" :label='item.Name' :value='item.Id' :key='item.Id'>
+            </el-option>
+          </el-select>
+        </li>
+        <li v-if='msg.TradeWay==1 || msg.TradeWay==3'>
+          <span><em>收款账户</em></span>
+          <el-select filterable v-model='msg.PlatformAccount' :placeholder="$t('pub.pleaseSel')">
+            <el-option v-for='item in PlatformAccountList' :label='item.Alias' :value='item.ID' :key='item.ID'>
+            </el-option>
+          </el-select>
+        </li>
         <li>
           <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList();resetPageIndex()" />
         </li>
@@ -464,6 +485,7 @@
           }
           return obj;
         },
+        jyfsList:[],
         redBagList:[],
         happy:false,
         defaultImg: 'this.src="' + require("../../assets/img/litheader.png") + '"',
@@ -488,8 +510,8 @@
           BranchId:'-1',
           IsOneDay: '-1',
           IsCollectMoney:0,
-          tradeWay:'',
-          platformAccount:'',
+          TradeWay:'',
+          PlatformAccount:'',
         },
         employeeMsg: {
           RB_Group_id: "0",
@@ -548,10 +570,70 @@
         userId:0,
         //修改订单业务员1-有权限
         isEditOrderCreate:0,
+        PlatformAccountList:[],
+        PlatformAccountList1:[],
+        PlatformAccountList2:[],
         
       };
     },
     methods: {
+      tradeWayMethods(val) {
+        this.msg.PlatformAccount=''
+
+        if(val==3){
+          this.PlatformAccountList=this.PlatformAccountList2;
+        }
+        if(val==1){
+          this.PlatformAccountList=this.PlatformAccountList1;
+        }
+        
+      },
+      getJyfs() {
+        this.apipost('sellorder_get_GetSellTradeWayEnumList', {}, res => {
+          if (res.data.resultCode == 1) {
+            this.jyfsList = res.data.data
+          }
+        }, err => {})
+      },
+      getPlatformAccount() {
+        let platBranchId=this.getLocalStorage().RB_Branch_id;
+        this.apipost('FinancialInstitutions_post_GetALLAccountList', {
+          TypeId: 12,BranchId:platBranchId
+        }, res => {
+          if (res.data.resultCode == 1) {
+            this.PlatformAccountList1 = res.data.data
+            if (this.msg.TradeWay==3){
+              this.PlatformAccountList=this.PlatformAccountList2;
+            }
+            if(this.msg.TradeWay==1){
+              this.PlatformAccountList=this.PlatformAccountList1;
+            }
+
+          }
+        }, err => {})
+      },
+      getPlatformAccountNew() {
+        this.apipost('Financial_get_GetDiplomacyPlatformList', {}, res => {
+          if (res.data.resultCode == 1) {
+            this.PlatformAccountList2= [];
+            let data=res.data.data;
+            data.forEach(item=>{
+              let obj={
+                Alias:item.Name,
+                ID:item.ID,
+              }
+              this.PlatformAccountList2.push(obj)
+              
+            })
+            if (this.msg.TradeWay==3){
+              this.PlatformAccountList=this.PlatformAccountList2;
+            }
+            if(this.msg.TradeWay==1){
+              this.PlatformAccountList=this.PlatformAccountList1;
+            }
+          }
+        }, err => {})
+      },
        goUrlHappy(item){
          this.happy=false;
         this.$router.push({
@@ -693,15 +775,15 @@
           err => {}
         );
       },
-      getLineList() {
-        this.apipost("line_post_GetAllList", {}, res => {
-          if (res.data.resultCode == 1) {
-            this.LineList = res.data.data;
-          } else {
-            this.$message.error(res.data.message);
-          }
-        });
-      },
+      // getLineList() {
+      //   this.apipost("line_post_GetAllList", {}, res => {
+      //     if (res.data.resultCode == 1) {
+      //       this.LineList = res.data.data;
+      //     } else {
+      //       this.$message.error(res.data.message);
+      //     }
+      //   });
+      // },
       //获取公司
       getCompany() {
         this.apipost('admin_get_BranchGetList', this.getCompanyMsg, res => {
@@ -793,9 +875,13 @@
         
       },
     },
+    created(){
+      this.getJyfs();
+      this.getPlatformAccount();
+      this.getPlatformAccountNew();
+    },
     mounted() {
-      this.msg.tradeWay = this.$route.query.tradeWay?this.$route.query.tradeWay:'';
-      this.msg.platformAccount = this.$route.query.platformAccount?this.$route.query.platformAccount:'';
+      
       let userInfo = this.getLocalStorage();
       this.userId = userInfo.EmployeeId;
       this.GetEditOrderCreateByAuth();
@@ -804,7 +890,7 @@
 
       this.getCtlxList()
       this.getEmployee();
-      this.getLineList();
+      // this.getLineList();
     //   this.getDepartment();
       this.getDdztList();
       if (this.$route.query.id) {
@@ -827,7 +913,11 @@
         this.msg.QStartDate = "";
         this.msg.QEndDate = "";
       }
+      this.msg.TradeWay = this.$route.query.TradeWay?this.$route.query.TradeWay:'';
+      this.msg.PlatformAccount = this.$route.query.PlatformAccount?Number(this.$route.query.PlatformAccount):'';
+      
       this.getList();
+      
     }
   };
 

src/components/SalesModule/productQuery.vue

@@ -1576,12 +1576,10 @@
       tradeWayMethods(val) {
         
         if(val==3){
-          this.addMsg.TradeWay=='';
           this.addMsg.PlatformAccount=''
           this.PlatformAccountList=this.PlatformAccountList2;
         }
         if(val==1){
-          this.addMsg.TradeWay=='';   
           this.addMsg.PlatformAccount=''
           this.PlatformAccountList=this.PlatformAccountList1;
         }