Merge branch 'zzd'

resources/views/order/index/delivering.blade.php

@@ -34,13 +34,26 @@
                                        v-model="filterData.ordertime_start" :class="filterData.ordertime_start?'bg-warning':''">
                             </td>
                             <td style="width: 300px">
-                                <input style="max-width: 200px"  type="date" class=" form-control form-control-sm tooltipTarget" name="ordertime_end" title="选择显示指定日期的结束时间"
-                                       v-model="filterData.ordertime_end" :class="filterData.ordertime_end?'bg-warning':''" >
+                                <input style="max-width: 200px" name="orderno" v-model="filterData.orderno" class="form-control form-control-sm tooltipTarget" placeholder="编号" title="编号，糊模查找需要在左边打上%符号" autocomplete="off" :class="filterData.orderno?'bg-warning':''">
                             </td>
                             <td style="width: 300px">
                                 <input style="max-width: 200px" name="carriername" v-model="filterData.carriername" class="form-control form-control-sm tooltipTarget" placeholder="承运人" :class="filterData.carriername?'bg-warning':''">
                             </td>
-                            <td colspan="6"></td>
+                            <td style="width: 300px">
+                                <div class="form-inline">
+                                    <input style="max-width: 200px" name="notes" title="右侧选择查询范围，默认为一天内" v-model="filterData.notes" class="form-control form-control-sm tooltipTarget" placeholder="备注" autocomplete="off" :class="filterData.notes?'bg-warning':''">
+                                    <select style="max-width: 100px" title="查询范围，范围越短搜索越快"  name="addtime" v-model="filterData.addtime" class="form-control form-control-sm tooltipTarget">
+                                        <option value="31">近一月</option>
+                                        <option value="92">近三月</option>
+                                        <option value="183">近半年</option>
+                                        <option value="366">近一年</option>
+                                        <option value="0">不限期</option>
+                                    </select></div>
+                            </td>
+                            <td style="width: 300px">
+                                <input style="max-width: 200px" name="issuepartyname" v-model="filterData.issuepartyname" class="form-control form-control-sm tooltipTarget" placeholder="店铺名称" :class="filterData.issuepartyname?'bg-warning':''">
+                            </td>
+                            <td colspan="4"></td>
                         </tr>
                         <tr>
                             <td >
@@ -55,7 +68,8 @@
                                 </div>
                             </td>
                             <td>
-                                <input style="max-width: 200px" name="orderno" v-model="filterData.orderno" class="form-control form-control-sm tooltipTarget" placeholder="编号" title="编号，糊模查找需要在左边打上%符号" autocomplete="off" :class="filterData.orderno?'bg-warning':''">
+                                <input style="max-width: 200px"  type="date" class=" form-control form-control-sm tooltipTarget" name="ordertime_end" title="选择显示指定日期的结束时间"
+                                       v-model="filterData.ordertime_end" :class="filterData.ordertime_end?'bg-warning':''" >
                             </td>
                             <td >
                                 <input style="max-width: 200px" name="soreference5" placeholder="多快递单号" v-model="filterData.soreference5" class="form-control form-control-sm tooltipTarget" title="可支持多快递单号，糊模查找需要在左边打上%符号" autocomplete="off" :class="filterData.soreference5?'bg-warning':''">
@@ -63,30 +77,13 @@
                             <td>
                                 <input style="max-width: 200px" name="soreference1" v-model="filterData.soreference1" class="form-control form-control-sm tooltipTarget" placeholder="客户订单号" title="客户订单号，糊模查找需要在左边打上%符号" autocomplete="off" :class="filterData.soreference1?'bg-warning':''">
                             </td>
-                            <td colspan="6"></td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <div class="form-inline">
-                                    <input style="max-width: 200px" name="notes" title="右侧选择查询范围，默认为一天内" v-model="filterData.notes" class="form-control form-control-sm tooltipTarget" placeholder="备注" autocomplete="off" :class="filterData.notes?'bg-warning':''">
-                                    <select style="max-width: 100px" title="查询范围，范围越短搜索越快"  name="addtime" v-model="filterData.addtime" class="form-control form-control-sm tooltipTarget">
-                                        <option value="31">近一月</option>
-                                        <option value="92">近三月</option>
-                                        <option value="183">近半年</option>
-                                        <option value="366">近一年</option>
-                                        <option value="0">不限期</option>
-                                    </select></div>
-                            </td>
-                            <td>
-                                <input style="max-width: 200px" name="issuepartyname" v-model="filterData.issuepartyname" class="form-control form-control-sm tooltipTarget" placeholder="店铺名称" :class="filterData.issuepartyname?'bg-warning':''">
-                            </td>
                             <td>
                                 <input style="max-width: 200px" name="waveno" v-model="filterData.waveno" title="波次编号，模糊查找需要在左边打上%的符号" class="form-control form-control-sm tooltipTarget" placeholder="波次编号" :class="filterData.waveno?'bg-warning':''">
                             </td>
                             <td>
                                 <input style="max-width: 200px" name="alternate_sku1" v-model="filterData.alternate_sku1" title="产品条码，模糊查找需要在左边打上%的符号" class="form-control form-control-sm tooltipTarget" placeholder="产品条码" :class="filterData.alternate_sku1?'bg-warning':''">
                             </td>
-                            <td colspan="6"><input hidden type="submit"></td>
+                            <td colspan="4"><input hidden type="submit"></td>
                         </tr>
                         <tr>
                             <td colspan="10">
@@ -147,9 +144,9 @@
                         <th>仓库</th>
                         <th>快递获取标记</th>
                         <th>快递获取时间</th>
-                        <th style="min-width: 200px">产品代码</th>
-                        <th style="min-width: 200px">产品条码</th>
-                        <th style="min-width: 200px">产品名称</th>
+                        <th style="min-width: 150px">产品代码</th>
+                        <th style="min-width: 150px">产品条码</th>
+                        <th style="min-width: 180px">产品名称</th>
                         <th>订单数量</th>
                         <th>复核时间</th>
                         <th style="min-width:260px;">备注</th>
@@ -206,7 +203,7 @@
                         <td>
                             @can('订单管理-编辑')
                                 <button v-if="order.releasestatus!=='H'" @click="freeze(order.orderno,order.waveno)" class="btn btn-sm btn-outline-dark text-nowrap"
-                                :disabled="!(order.codename_c==='创建订单'||order.codename_c==='分配完成'||order.codename_c==='拣货完成'||order.codename_c==='播种完成')">冻结</button>
+                                        :disabled="!(order.codename_c==='创建订单'||order.codename_c==='分配完成'||order.codename_c==='拣货完成'||order.codename_c==='播种完成')">冻结</button>
                                 <button v-else @click="thaw(order.orderno,order.waveno)" class="btn btn-sm btn-outline-danger text-nowrap"
                                         :disabled="!(order.codename_c==='创建订单'||order.codename_c==='分配完成'||order.codename_c==='拣货完成'||order.codename_c==='播种完成')">解冻</button>
                             @else
@@ -430,10 +427,10 @@
                     this.selectedStyle=orderno;
                 },
                 freeze(orderno,waveno){
-                  if(!confirm('确定要冻结“'+orderno+'”吗？'))return;
-                  let _this=this;
-                  axios.post('{{url('order/freeze')}}',{orderno:orderno,waveno:waveno})
-                      .then(function (response) {
+                    if(!confirm('确定要冻结“'+orderno+'”吗？'))return;
+                    let _this=this;
+                    axios.post('{{url('order/freeze')}}',{orderno:orderno,waveno:waveno})
+                        .then(function (response) {
                             if (response.data.success){
                                 _this.orders.some(function (order) {
                                     if (order.orderno===orderno){
@@ -445,16 +442,16 @@
                                 tempTip.setDuration(3000);
                                 tempTip.showSuccess('订单已被冻结！');
                             }
-                      }).catch(function (err) {
+                        }).catch(function (err) {
                         tempTip.setDuration(3000);
                         tempTip.show('网络异常：'+err);
-                      });
+                    });
                 },
                 thaw(orderno,waveno){
-                  if(!confirm('确定要解冻“'+orderno+'”吗？'))return;
-                  let _this=this;
-                  axios.post('{{url('order/thaw')}}',{orderno:orderno,waveno:waveno})
-                      .then(function (response) {
+                    if(!confirm('确定要解冻“'+orderno+'”吗？'))return;
+                    let _this=this;
+                    axios.post('{{url('order/thaw')}}',{orderno:orderno,waveno:waveno})
+                        .then(function (response) {
                             if (response.data.success){
                                 _this.orders.some(function (order) {
                                     if (order.orderno===orderno){
@@ -465,10 +462,10 @@
                                 tempTip.setDuration(3000);
                                 tempTip.showSuccess('订单已成功冻结！');
                             }
-                      }).catch(function (err) {
+                        }).catch(function (err) {
                         tempTip.setDuration(3000);
                         tempTip.show('网络异常：'+err);
-                      });
+                    });
                 },
             },
         });