no message

src/assets/common/lang/zhTW/fill.js

@@ -1012,7 +1012,7 @@ export const obj = {
     t1: '車/使用時間/天數',
     t2: '用車詳情',
     t3: '總金額',
-    t4: '代收金額',
+    t4: '待收金額',
     t5: '實收',
     t6: '退款',
     t7: '平台在途金額',

src/components/CarDealerOrder/components/ReservationOrder.vue

@@ -160,9 +160,14 @@
             </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')" />
+          </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')" />
           </span>
         </li>
         <li>
@@ -238,12 +243,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,
@@ -357,7 +365,7 @@ 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
@@ -373,7 +381,8 @@ export default {
             let data = res.data.data.pageData
             let addLists = function(arr){
               arr.forEach(x=>{
-                x.typeInfo = ''
+                x.typeInfo = {}
+                x.paymentInfo = {}
               })
             }
             let addList = function(arr){
@@ -389,10 +398,11 @@ export default {
             // addLists(data)
             data.forEach(k => {
               addList(k.OrderList)
-              // k.typeInfo = this.OrderStatusType.find(y => y.ID == k.OrderState) ?? this.OrderStatusType[1]
+              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 == k.PayWay) ?? this.PaymentMethods[1]
+                item.typeInfo = this.OrderStatusType.find(y => y.ID == item.OrderState) ?? this.OrderStatusType[1]
+                item.paymentInfo = this.PaymentMethods.find(y => y.Id == k.PayWay) ?? this.PaymentMethods[1]
                 if(item.OrderDetailList.length>2){
                   item.isMore = true
                 }
@@ -409,7 +419,6 @@ export default {
             })
 
             this.OrderList = data;
-            console.log(data,'--------------')
             this.total = res.data.data.count;
           } else {
             this.Error(res.data.message);
@@ -443,6 +452,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

@@ -1888,7 +1888,7 @@
                 }
               });
             }
-          } 
+          }
           else if(this.GetDetail.OtherType == 83){
             if (this.typeSystem == 1) {
               let href = this.domainManager().CarUrl