commit

index.html

@@ -28,6 +28,11 @@
       margin: 0 auto;
       box-sizing: border-box;
     }
+
+    .nav .dropdown-menu {
+      max-height: 300px;
+      overflow: auto;
+    }
   </style>
 </head>
 

js/common/common.js

@@ -759,15 +759,19 @@
           title = data[0].orderNo
           html = data.map(function (e) {
             return `<li>
-                  <div class="dropdown-messages-box">
-                    <div class="media-body">
-                      <strong>${e.createTime}</strong>
-                      <small class="pull-right text-navy">${e.xs}小时前</small>
-                      <br>
-                      <small class="text-danger">${e.orderNo}</small>
-                    </div>
-                  </div>
-                </li>`
+                      <div class="dropdown-messages-box">
+                        <div class="media-body">
+                          <strong>${e.createTime}</strong>
+                          <small class="pull-right text-navy">${e.xs}小时前</small>
+                          <br>
+                          <small class="text-danger">${e.orderNo}</small>
+                          <br>
+                          <small>${e.log || ''}</small>
+                          <br>
+                          <small>${e.remark ? '备注: ' + e.remark : ''}</small>
+                        </div>
+                      </div>
+                    </li>`
           }).join('<li class="divider"></li>')
         }
         $('#' + name + 'Content').html(html).on('click', function () { return false })

js/root/orderSearch.js

@@ -339,6 +339,14 @@ require(['common', 'template', 'momentLocale', 'clipboard', 'pinyin', 'serialize
           return attr
         },
         responseHandler(res) {
+          res.rows.forEach(function (e) {
+            if (e.receiver) {
+              e.receiver.split('#').forEach(function (item) {
+                var arr = item.split(':')
+                e['receiver_' + arr[0]] = arr[1]
+              })
+            }
+          })
           result = res.rows
           //获取航段数
           $.send({
@@ -350,16 +358,6 @@ require(['common', 'template', 'momentLocale', 'clipboard', 'pinyin', 'serialize
               $('.segmentCount').text(count.total || 0)
             }
           })
-          // $.send({
-          //     crossDomain: null,
-          //     xhrFields: {
-          //         withCredentials: null
-          //     },
-          //     url: 'http://fly.tripto.cn/jsp/utils/oa_danger_order.jsp',
-          //     success: function(result) {
-          //         $("#table").bootstrapTable('prepend', result)
-          //     }
-          // })
           if (sort) {
             return sort(res)
           } else {
@@ -541,12 +539,12 @@ require(['common', 'template', 'momentLocale', 'clipboard', 'pinyin', 'serialize
           field: 'passengerCount',
           title: '乘客总数'
         }, {
-          field: 'receiver',
+          field: 'receiver_STATUS',
           title: `<div class="btn-group">
                                 <button data-toggle="dropdown" class="btn btn-link btn-xs dropdown-toggle" style="font-size:13px;font-weight:700;margin-bottom:0;">是否占座 <span class="caret"></span></button>
                                 <ul class="dropdown-menu"><li><a href=#" class="receiver_sort">不限</a></li><li><a href=#" class="receiver_sort">未占仓</a></li><li><a href=#" class="receiver_sort">占位中</a></li><li><a href=#" class="receiver_sort">占位成功</a></li><li><a href=#" class="receiver_sort">占位失败</a></li></ul>
                             </div>`,
-          format: receiverFormat
+          state: SEAT_STATUS
         }, {
           field: 'profits',
           title: '利润'
@@ -646,10 +644,12 @@ require(['common', 'template', 'momentLocale', 'clipboard', 'pinyin', 'serialize
         }, {
           field: 'log',
           title: '查看',
+          width: 100,
           visible: !!Number(localStorage.showLog),
           format(value, row) {
-            return `<button type='button' class='btn btn-xs btn-primary checkLog' data-orderno='${row.orderNo}'>日志</button>
-            <button type='button' class='btn btn-xs btn-primary checkPolicy' data-data='${JSON.stringify(row)}'>报价</button>`
+            return `<div><button type='button' class='btn btn-xs btn-primary checkLog' data-orderno='${row.orderNo}'>查看日志</button></div>
+                    <div><button type='button' class='btn btn-xs btn-primary checkPolicy' data-data='${JSON.stringify(row)}'>报价</button>
+                    <button type='button' class='btn btn-xs btn-danger btn-outline refreshCabin' data-orderno='${row.orderNo}'>刷舱</button></div>`
           }
         }, {
           field: 'refundChange',
@@ -661,16 +661,17 @@ require(['common', 'template', 'momentLocale', 'clipboard', 'pinyin', 'serialize
                             <button type='button' class='btn btn-xs btn-danger btn-outline change' ${row.status == 2 ? '' : 'disabled'} data-orderno='${row.orderNo}'>改</button>
                         `
           }
-        }, {
-          field: 'refreshCabin',
-          title: '刷舱',
-          visible: false,
-          format(value, row) {
-            return `
-                    <button type='button' class='btn btn-xs btn-danger btn-outline refreshCabin' data-orderno='${row.orderNo}'>刷舱</button>
-                    `
-          }
-        }])
+        }
+          // , {
+          // field: 'refreshCabin',
+          // title: '刷舱',
+          // // visible: false,
+          // format(value, row) {
+          //   return `
+          //           `
+          // }
+          // }
+        ])
     }
 
     //是否占座 格式化
@@ -1850,7 +1851,7 @@ require(['common', 'template', 'momentLocale', 'clipboard', 'pinyin', 'serialize
         }
       } else if (orderData.orderInfo.orderSource == 'snctrip' && temp.otherCost == 0) {
         // sn携程利润*2 放入其他支出
-        temp.otherCost = (allProfitCalculation() * 0.5).toFixed(2)
+        temp.otherCost = (allProfitCalculation() * 0.8).toFixed(2)
         if (temp.remark && /\[自动计算sn携程 其他支出 :.*\]/.test(temp.remark)) {
           temp.remark = temp.remark.replace(/\[自动计算sn携程 其他支出 :.*\]/, function (all, $1) {
             return '[自动计算sn携程 其他支出 :' + temp.otherCost + ']'
@@ -2597,7 +2598,6 @@ require(['common', 'template', 'momentLocale', 'clipboard', 'pinyin', 'serialize
         currency: '币种加价'
       }
       var otherInfoData = result.verifyRecord.map(function (e) {
-        console.log(e)
         var result = {
           api: e.api,
           createtime: e.createtime,
@@ -2714,6 +2714,7 @@ require(['common', 'template', 'momentLocale', 'clipboard', 'pinyin', 'serialize
               type = 'edit'
               refreshCabinData = JSON.parse(res.data)
               refreshCabinData.orderNo = data.orderNo
+              refreshCabinData.log = res.log
             }
             cb && cb(type, refreshCabinData)
           } catch (error) {
@@ -2732,11 +2733,16 @@ require(['common', 'template', 'momentLocale', 'clipboard', 'pinyin', 'serialize
         4: '刷舱结束'
       }
       var html = `<form id="refreshCabinForm">
-              <div>阈值:</div>
-              <input type="number" class="form-control" name="threshold" placeholder="阈值" value="${data.threshold || 0}" required>
-              <div>刷舱结束时间:</div>
-              <input type="text" class="form-control" name="brushTankOverDate" placeholder="刷舱结束时间" value="${data.brushTankOverDate || ''}" required>
-            </form>`
+                    <div>阈值:</div>
+                    <input type="number" class="form-control" name="threshold" placeholder="阈值" value="${data.threshold || 0}" required>
+                    <div>刷舱结束时间:</div>
+                    <input type="text" class="form-control" name="brushTankOverDate" placeholder="刷舱结束时间" value="${data.brushTankOverDate || ''}" required>
+                    <div>刷舱原因:</div>
+                    <input type="text" class="form-control" name="remark" placeholder="刷舱原因" value="${data.remark || ''}" required>
+                    <button type="button" class="btn btn-xs btn-link remark_select" data-data="占座成功刷降仓">占座成功刷降仓</button>
+                    <button type="button" class="btn btn-xs btn-link remark_select" data-data="未占座刷仓">未占座刷仓</button>
+                    <button type="button" class="btn btn-xs btn-link remark_select" data-data="支付成功票号异常">支付成功票号异常</button>
+                  </form>`
       var title = ''
       if (type === 'add') {
         title = '新增刷舱数据'
@@ -2750,6 +2756,9 @@ require(['common', 'template', 'momentLocale', 'clipboard', 'pinyin', 'serialize
         skin: 'layui-layer-molv',
         success: function () {
           $.dateInit('#refreshCabinForm input[name=brushTankOverDate]', { dateFmt: 'yyyy-MM-dd HH:mm' })
+          $('#refreshCabinForm .remark_select').on('click', function () {
+            $('#refreshCabinForm input[name=remark]').val($(this).data('data'))
+          })
         },
         yes: function () {
           if ($('#refreshCabinForm').valid()) {
@@ -3766,4 +3775,4 @@ require(['common', 'template', 'momentLocale', 'clipboard', 'pinyin', 'serialize
 
     init()
   })
-})
+})

orderSearch.html

@@ -486,7 +486,7 @@
   <div class="wrapper wrapper-content">
     <div class="ibox float-e-margins">
       <div class="ibox-title">
-        <h5>搜索 v0.3.8</h5>
+        <h5>搜索 v0.4.0</h5>
         <div class="ibox-tools">
           <a class="collapse-link">
             <i class="fa fa-chevron-up searchClose"></i>
@@ -2647,6 +2647,6 @@
 </script>
 <script src="js/require.js"></script>
 <script src="js/require-config.js"></script>
-<script src="js/root/orderSearch.js?v=0.3.8"></script>
+<script src="js/root/orderSearch.js?v=0.4.0"></script>
 
 </html>