Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas

resources/js/queryForm/header.js

@@ -41,7 +41,7 @@ window.Header = function getHeader(object) {
         div.style.position = "-webkit-sticky";
         div.style.top = _fixedTop+"px";
         div.style.backgroundColor = "white";
-        div.style.zIndex = "1030";
+        div.style.zIndex = "999";
         table.className = "table table-bordered mb-0 text-center";
         let tr = document.createElement("tr");
         let firstTr = _targetDom.getElementsByTagName("tr")[0];
@@ -52,6 +52,7 @@ window.Header = function getHeader(object) {
         if (_isCheckAllBox){
             let th = document.createElement("th");
             if (firstTr) th.style.minWidth = tds[0].offsetWidth+"px";
+            th.className = "text-left";
             let check = document.createElement("input");
             check.type = "checkbox";
             check.id = "checkAll";
@@ -61,7 +62,7 @@ window.Header = function getHeader(object) {
                 if (event.target.checked){
                     for (let i=0;i<trs.length;i++){
                         let checkbox = getTargetChildNode(trs[i].children[0]);
-                        if (!checkbox.checked){
+                        if (checkbox && !checkbox.checked){
                             checkData.push(checkbox.value);
                             checkbox.checked = true;
                         }
@@ -70,7 +71,7 @@ window.Header = function getHeader(object) {
                     checkData = [];
                     for (let i=0;i<trs.length;i++){
                         let checkbox = getTargetChildNode(trs[i].children[0]);
-                        if (checkbox.checked)checkbox.checked = false;
+                        if (checkbox && checkbox.checked)checkbox.checked = false;
                     }
                 }
             };

resources/sass/text.scss

@@ -225,7 +225,4 @@
 //规定最小宽度
 .td-min-width-80 tr td{
     min-width: 80px;
-}
-.z-index-1099{
-    z-index: 1099;
 }

resources/views/customer/project/area.blade.php

@@ -16,7 +16,7 @@
                         data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                     导出Excel
                 </button>
-                <div class="dropdown-menu z-index-1099">
+                <div class="dropdown-menu">
                     <a class="dropdown-item" @click="areaExport(false)" href="javascript:">导出勾选内容</a>
                     <a class="dropdown-item" @click="areaExport(true)" href="javascript:">导出所有页</a>
                 </div>

resources/views/customer/project/index.blade.php

@@ -47,7 +47,7 @@
                     data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                 导出Excel
             </button>
-            <div class="dropdown-menu z-index-1099">
+            <div class="dropdown-menu">
                 <a class="dropdown-item" @click="executeExport(false)" href="javascript:">导出勾选内容</a>
                 <a class="dropdown-item" @click="executeExport(true)" href="javascript:">导出所有页</a>
             </div>

resources/views/inventory/statement/changeInventory.blade.php

@@ -9,7 +9,7 @@
                 data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
             导出Excel
         </button>
-        <div class="dropdown-menu z-index-1099">
+        <div class="dropdown-menu">
             <a class="dropdown-item" @click="processExport(false)" href="javascript:">导出勾选内容</a>
             <a class="dropdown-item" @click="processExport(true)" href="javascript:">导出所有页</a>
         </div>

resources/views/inventory/statement/dailyLog.blade.php

@@ -32,7 +32,7 @@
                         data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
                     导出Excel
                 </button>
-                <div class="dropdown-menu z-index-1099">
+                <div class="dropdown-menu">
                     <a class="dropdown-item" @click="dailyLogExport(false)" href="javascript:">导出勾选内容</a>
                     <a class="dropdown-item" @click="dailyLogExport(true)" href="javascript:">导出所有页</a>
                 </div>

resources/views/inventory/statement/inventoryCompare.blade.php

@@ -83,7 +83,7 @@
                         data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
                     导出Excel
                 </button>
-                <div class="dropdown-menu z-index-1099">
+                <div class="dropdown-menu">
                     <a class="dropdown-item" @click="inventoryCompareExport(false)" href="javascript:">导出勾选内容</a>
                     <a class="dropdown-item" @click="inventoryCompareExport(true)" href="javascript:">导出所有页</a>
                 </div>

resources/views/inventory/stockInventory/inventoryMission.blade.php

@@ -30,7 +30,7 @@
                         data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
                     导出Excel
                 </button>
-                <div class="dropdown-menu z-index-1099">
+                <div class="dropdown-menu">
                     <a class="dropdown-item" @click="inventoryAccountMissionExport(false)" href="javascript:">导出勾选内容</a>
                     <a class="dropdown-item" @click="inventoryAccountMissionExport(true)" href="javascript:">导出所有</a>
                 </div>
@@ -374,7 +374,7 @@
                         </a>
                         <div
                             style="position: absolute;width:320px;margin-left:-100px;background-color: white;max-height:150px ;overflow-y:auto"
-                            class="small mt-0 dropdown-menu z-index-1099">
+                            class="small mt-0 dropdown-menu">
                             <table class="table table-sm table-striped table-bordered">
                                 <tr>
                                     <th>盘点人</th>

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

@@ -13,7 +13,7 @@
                                 data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                             导出Excel
                         </button>
-                        <div class="dropdown-menu z-index-1099">
+                        <div class="dropdown-menu">
                             <a class="dropdown-item" @click="orderExport(false)" href="javascript:">导出勾选内容</a>
                             <a class="dropdown-item" @click="orderExport(true)" href="javascript:">导出所有页</a>
                         </div>
@@ -52,7 +52,7 @@
                         </div><!-- /.modal-content -->
                     </div><!-- /.modal -->
                 </div>
-                <table class="table table-sm table-striped table-bordered table-hover card-body mt-2 ml-3 td-min-width-80" id="table">
+                <table class="table table-sm table-striped table-bordered table-hover card-body td-min-width-80" id="table">
                     <tr v-for="(order,i) in orders" @click="selectedColor(order.orderno)" :style="{'background-color': order.orderno==selectedStyle?'#aac7ea':''}">
                         <td>
                             <input class="checkItem" type="checkbox" :value="order.orderno">
@@ -629,7 +629,6 @@
                             });
                             checkData = []
                         }else{
-                            console.log(res.data);
                             if(res.data.exitsOrderNos){
                                 _this.message.checkOrderIssueMessage = res.data.fail_info+res.data.exitsOrderNos;
                                 $("#checkModal").modal('show');

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

@@ -14,7 +14,7 @@
                                 :class="[checkData.length>0?'btn-dark text-light':'']"
                                 data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">导出Excel
                         </button>
-                        <div class="dropdown-menu z-index-1099">
+                        <div class="dropdown-menu">
                             <a class="dropdown-item" @click="orderIssueExport(false)" href="javascript:">导出勾选内容</a>
                             <a class="dropdown-item" @click="orderIssueExport(true)" href="javascript:">导出所有页</a>
                         </div>

resources/views/order/issue/performance.blade.php

@@ -14,7 +14,7 @@
                             :class="[checkData.length>0?'btn-dark text-light':'']"
                             data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">导出Excel
                     </button>
-                    <div class="dropdown-menu z-index-1099">
+                    <div class="dropdown-menu">
                         <a class="dropdown-item" @click="exportAll()" href="javascript:">导出所有页</a>
                     </div>
                 </span>

resources/views/order/issue/workload.blade.php

@@ -12,7 +12,7 @@
                             class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget"
                             data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">导出Excel
                     </button>
-                    <div class="dropdown-menu z-index-1099">
+                    <div class="dropdown-menu">
                         <a class="dropdown-item" @click="exportSelected()" href="javascript:">导出勾选内容</a>
                         <a class="dropdown-item" @click="exportAll()" href="javascript:">导出所有页</a>
                     </div>

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

@@ -35,7 +35,7 @@
                                 :class="[checkData.length>0?'btn-dark text-light':'']"
                                 data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">导出Excel
                         </button>
-                        <div class="dropdown-menu z-index-1099">
+                        <div class="dropdown-menu">
                             <a class="dropdown-item" @click="exportSelect()" href="javascript:">导出勾选内容</a>
                             <a class="dropdown-item" @click="exportAll()" href="javascript:">导出所有页</a>
                         </div>

resources/views/order/wave/search.blade.php

@@ -17,7 +17,7 @@
                                 data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                             导出Excel
                         </button>
-                        <div class="dropdown-menu z-index-1099">
+                        <div class="dropdown-menu">
                             <a class="dropdown-item" @click="exportExcel('pitch')" href="javascript:">导出勾选内容</a>
                             <a class="dropdown-item" @click="exportExcel()" href="javascript:">导出所有页</a>
                         </div>

resources/views/package/weigh/index.blade.php

@@ -16,7 +16,7 @@
                         data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                     导出Excel
                 </button>
-                <div class="dropdown-menu z-index-1099">
+                <div class="dropdown-menu">
                     <a class="dropdown-item" @click="packageExport(false)" href="javascript:">导出勾选内容</a>
                     <a class="dropdown-item" @click="packageExport(true)" href="javascript:">导出所有页</a>
                 </div>

resources/views/package/weigh/statistics.blade.php

@@ -15,7 +15,7 @@
                 data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                     导出Excel
                 </button>
-                <div class="dropdown-menu z-index-1099">
+                <div class="dropdown-menu">
                     <a class="dropdown-item"  @click="statisticExport(false)" href="javascript:">导出勾选内容</a>
                     <a class="dropdown-item"  @click="statisticExport(true)" href="javascript:">导出所有页</a>
                 </div>

resources/views/package/weightExcepted/index.blade.php

@@ -31,7 +31,7 @@
                                                 data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                                             导出Excel
                                         </button>
-                                        <div class="dropdown-menu z-index-1099">
+                                        <div class="dropdown-menu">
                                             <a class="dropdown-item" @click="weightExport(false)" href="javascript:">导出勾选内容</a>
                                             <a class="dropdown-item" @click="weightExport(true)" href="javascript:">导出所有页</a>
                                         </div>

resources/views/rejected/search/analyze.blade.php

@@ -14,7 +14,7 @@
                     data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                 导出Excel
             </button>
-            <div class="dropdown-menu z-index-1099">
+            <div class="dropdown-menu">
                 <a class="dropdown-item" @click="exportExcel(false)"
                    href="javascript:">导出勾选内容</a>
                 <a class="dropdown-item" @click="exportExcel(true)"

resources/views/rejected/search/general.blade.php

@@ -17,7 +17,7 @@
                             data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                         导出Excel
                     </button>
-                    <div class="dropdown-menu z-index-1099">
+                    <div class="dropdown-menu">
                         <a class="dropdown-item" @click="exportExcel(false)" href="javascript:">导出勾选内容</a>
                         <a class="dropdown-item" @click="exportExcel(true)" href="javascript:">导出所有页</a>
                     </div>
@@ -33,7 +33,7 @@
                             data-toggle="dropdown" title="将勾选记录的入库状态设定为是或否，仅对未完结状态的记录有效">
                         修改入库
                     </button>
-                    <div class="dropdown-menu z-index-1099">
+                    <div class="dropdown-menu">
                         <a class="dropdown-item" @click="setIsLoaded_batch(1)" href="javascript:">设定为是</a>
                         <a class="dropdown-item" @click="setIsLoaded_batch(0)" href="javascript:">设定为否</a>
                         <a class="dropdown-item" @click="setIsLoaded_batch('null')" href="javascript:">无需入库</a>

resources/views/transport/waybill/waybillFinancialSnapshot/index.blade.php

@@ -48,7 +48,7 @@
                     data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                 导出Excel
             </button>
-            <div class="dropdown-menu z-index-1099">
+            <div class="dropdown-menu">
                 <a class="dropdown-item" @click="waybillExport(false)" href="javascript:">导出勾选内容</a>
                 <a class="dropdown-item" @click="waybillExport(true)" href="javascript:">导出所有页</a>
             </div>