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

src/components/CarDealerOrder/components/ReservationOrder.vue

@@ -154,20 +154,27 @@
         <li>
           <span>
             <em>{{ $t('OrderList.search.status') }}</em>
-            <el-select v-model="msg.OrderState">
+            <el-select v-model="msg.OrderState" @change="handleCurrentChange(1)">
               <el-option :key="0" :value="0" :label="$t('OrderList.orderStatus.normal')"></el-option>
               <el-option v-for="item in OrderStatusType" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
           </span>
         </li>
+        <!-- <li>
+          <span><em>主{{ $t('OrderList.search.orderId') }}</em>
+            <el-input clearable type="Number" v-model="msg.MainId" :placeholder="$t('objFill.orderid')"
+            @keyup.native="handleCurrentChange(1)"/>
+          </span>
+        </li> -->
         <li>
           <span><em>{{ $t('OrderList.search.orderId') }}</em>
-            <el-input clearable type="Number" v-model="msg.OrderId" :placeholder="$t('objFill.v100.orderid')" />
+            <el-input clearable type="Number" v-model="msg.OrderId" :placeholder="$t('objFill.orderid')"
+            @keyup.native="handleCurrentChange(1)"/>
           </span>
         </li>
         <li>
           <span><em>{{$t('fnc.khmingcheng')}}</em>
-            <el-select v-model="msg.CustomerId" filterable>
+            <el-select v-model="msg.CustomerId" filterable @change="handleCurrentChange(1)">
               <el-option :key="0" :value="0" :label="$t('pub.unlimitedSel')"></el-option>
               <el-option v-for="item in CustomerList" :key="item.Id" :label="item.CustomerName" :value="item.Id"></el-option>
             </el-select>
@@ -185,7 +192,7 @@
 
         <li>
           <input type="button" class="normalBtn" :value="$t('pub.searchBtn')"
-            @click="msg.pageIndex = 1, currentPage = 1, GetList()" />
+            @click="handleCurrentChange(1)" />
         </li>
       </ul>
     </div>
@@ -238,12 +245,15 @@ export default {
       msg: {
         pageIndex: 1,
         pageSize: 5,
-        OrderId: '0',
         CustomerId: 0,
         UseSTime: "",
         UseETime: "",
         OrderState: 0,
         IsFinish: -1,
+        Sort: 1,
+        OrderId: null,
+        MainId: null,
+        OrderTCNUM: '',
       },
       total: 0,
       currentPage: 1,
@@ -310,6 +320,7 @@ export default {
         this.msg.UseSTime = ''
         this.msg.UseETime = ''
       }
+      this.handleCurrentChange(1)
     },
     setEdate() {
       return this.addMoth(new Date().Format("yyyy-MM-dd"), 1)
@@ -357,32 +368,44 @@ export default {
     },
     //获取酒店订单列表
     GetList() {
-      if(this.msg.OrderId=='') this.msg.OrderId = 0
+      // if(this.msg.OrderId=='') this.msg.OrderId = 0
       this.loading = true
       let url
       // 销售 OP
       if (this.pagesTitle == '销售') {
-        url = "JapanCar_get_GetJapanOrderPageList"
+        url = "JapanCar_get_GetJapanOrderMainPageList"
       } else {
-        url = "JapanCar_get_GetJapanOrderPageList"
+        url = "JapanCar_get_GetJapanOrderMainPageList"
       }
       this.apipost(url, this.msg,
         res => {
           this.loading = false
           if (res.data.resultCode == 1) {
             let data = res.data.data.pageData
+            let addLists = function(arr){
+              arr.forEach(x=>{
+                x.typeInfo = {}
+                x.paymentInfo = {}
+              })
+            }
             let addList = function(arr){
               arr.forEach(x=>{
+                x.typeInfo = ''
+                x.paymentInfo = {}
                 x.list = []
                 x.isMore = false
                 x.upIcon = false
                 x.NewOrderDetailList = []
               })
             }
-            addList(data)
-            data.forEach(item => {
+            // addLists(data)
+            data.forEach(k => {
+              addList(k.OrderList)
+              k.typeInfo = this.OrderStatusType.find(y => y.ID == k.OrderState) ?? this.OrderStatusType[1]
+              k.paymentInfo = this.PaymentMethods.find(y => y.Id == k.PayWay) ?? this.PaymentMethods[1]
+              k.OrderList.forEach(item=>{
                 item.typeInfo = this.OrderStatusType.find(y => y.ID == item.OrderState) ?? this.OrderStatusType[1]
-              item.paymentInfo = this.PaymentMethods.find(y => y.Id == item.PayWay) ?? this.PaymentMethods[1]
+                item.paymentInfo = this.PaymentMethods.find(y => y.Id == k.PayWay) ?? this.PaymentMethods[1]
                 if(item.OrderDetailList.length>2){
                   item.isMore = true
                 }
@@ -396,6 +419,8 @@ export default {
                 item.NewOrderDetailList = JSON.parse(JSON.stringify(dataLists))
               })
 
+            })
+
             this.OrderList = data;
             this.total = res.data.data.count;
           } else {
@@ -430,6 +455,9 @@ export default {
     if (this.$route.query.OrderId) {
       this.msg.OrderId = this.$route.query.OrderId
     }
+    if (this.$route.query.MainId) {
+      this.msg.MainId = this.$route.query.MainId
+    }
     // crm自动登陆传过来的参数
     if(this.$route.query.crmOrderObj){
       let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1889,6 +1889,7 @@
                 event_id: 'CarDealerOrder',
                 data: {
                   OrderId: this.GetDetail.ReFinanceId,
+                  type:2
                 }
               }, `${href}`)
             } else {
@@ -1908,6 +1909,7 @@
                 event_id: 'CarDealerOrder',
                 data: {
                   MainId: this.GetDetail.ReFinanceId,
+                  type:1
                 }
               }, `${href}`)
             } else {