合并

src/js/qcList.js

@@ -164,14 +164,7 @@ function renderTab(data,hisId){
     let str = ``
     let hasSelectAll = true;
     if(data.length===0){
-<<<<<<< HEAD
-      $('tbody').html(`<tr><td colspan="18" style="text-align: center;color: #aaa">
-          <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-          <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-      </td></tr>`)
-=======
       $('tbody').html(emptyBox())
->>>>>>> byll
       return;
     }
     for(let i = 0; i < data.length; i++){

src/js/qcListDept.js

@@ -184,14 +184,7 @@ function renderTab(data){
     let str = ``
     let hasSelectAll = true;
     if(data.length===0){
-<<<<<<< HEAD
-      $('tbody').html(str?str:`<tr><td colspan="18" style="text-align: center;color: #aaa">
-          <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-          <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-      </td></tr>`)
-=======
       $('tbody').html(str?str:emptyBox())
->>>>>>> byll
       return;
     }
     for(let i = 0; i < data.length; i++){

src/js/qcListPerson.js

@@ -183,14 +183,7 @@ function renderTab(data){
     let str = ``
     let hasSelectAll = true;
     if(data.length===0){
-<<<<<<< HEAD
-        $('tbody').html(str?str:`<tr><td colspan="18" style="text-align: center;color: #aaa">
-            <img style="margin-top:50px;width:100px;" src="${require('../images/empty.png')}" />
-            <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
-        </td></tr>`)
-=======
         $('tbody').html(str?str:emptyBox())
->>>>>>> byll
         return;
     }
     for(let i = 0; i < data.length; i++){