Commit 64ad139a authored by xishifeng's avatar xishifeng

修改

parent 11d6baf4
...@@ -1214,7 +1214,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function ...@@ -1214,7 +1214,7 @@ define(['doT', 'css!style/shop_edit.css', 'ckfinder', 'ckfinderStart'], function
var _vv = $.trim(item.val()); var _vv = $.trim(item.val());
var _index1 = _vv.indexOf('路'); var _index1 = _vv.indexOf('路');
var _index2 = _vv.indexOf('号'); var _index2 = _vv.indexOf('号');
if(_index1>0 && _index2>2 && /^[1-9]\d*$/.test(_vv.slice(_index1+1, _index2))){ if(_index1>0 && _index2>2){
}else{ }else{
alert(item.attr('data-alert')); alert(item.attr('data-alert'));
......
<script id="reportList_list_tpl" type="text/template"> <script id="reportList_list_tpl" type="text/template">
[% if(it["list"] && it["list"].length && it["list"].length>0) { %] [% if(it["list"] && it["list"].length && it["list"].length>0) { %]
[% var sw=function(s){switch(Number(s)){case 10:return"出租";case 20:return"增佣";case 30:return"代理";case 40:return"好处费";default:return s}}; %] [% var sw=function(s){switch(Number(s)){case 10:return"出租";case 20:return"增佣";case 30:return"代理";case 40:return"好处费";default:return s}}; %]
[% var sw2=function(s){switch(Number(s)){case 0:return"开始审核";case 1:return"一级";case 2:return"二级";case 3:return"已结单";case 3:default:return s}}; %] [% var sw2=function(s){switch(Number(s)){case 0:return"一级";case 1:return"二级";case 2:return"三级";case 3:return"已结单";default:return s}}; %]
[% for(var item in it["list"]){ %] [% for(var item in it["list"]){ %]
<tr data-id="[%= it['list'][item]['id'] %]" data-orderid="[%= it['list'][item]['order_id'] %]"> <tr data-id="[%= it['list'][item]['id'] %]" data-orderid="[%= it['list'][item]['order_id'] %]">
<td class="text-center" >行号 </td> <td class="text-center" >行号 </td>
<td class="text-center" > <td class="text-center" >
[%= it["list"][item]['id'] %] [%= it["list"][item]['id'] %]
[% if(!it["step"]) { %] [% if(it["step"]==10) { %]
&nbsp;<span class="btn1 btn-success btn-xs">[%= sw2(it["list"][item]['audit_level']) %]</span> &nbsp;<span class="btn1 btn-success btn-xs">[%= sw2(it["list"][item]['audit_level']) %]</span>
[% } %] [% } %]
</td> </td>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
[% if(check_auth('index/bargainInfo')) { %] [% if(check_auth('index/bargainInfo')) { %]
<a class="btn1 btn-success details-btn" href="#modal_detail" data-toggle="modal">详情</a>&nbsp; <a class="btn1 btn-success details-btn" href="#modal_detail" data-toggle="modal">详情</a>&nbsp;
[% } %] [% } %]
[% if(it["step"] && it["step"]<3) { %] [% if(it["step"]<3) { %]
[% if(check_auth('index/checkReportAttache/1')||check_auth('index/checkReportManager/2')||check_auth('index/checkReportMajordomo/3')||check_auth('index/checkReportCashier/4')) { %] [% if(check_auth('index/checkReportAttache/1')||check_auth('index/checkReportManager/2')||check_auth('index/checkReportMajordomo/3')||check_auth('index/checkReportCashier/4')) { %]
<a class="btn1 btn-success" href="#modal-pass" data-toggle="modal">通过</a>&nbsp; <a class="btn1 btn-success" href="#modal-pass" data-toggle="modal">通过</a>&nbsp;
[% } %] [% } %]
...@@ -115,7 +115,11 @@ ...@@ -115,7 +115,11 @@
<span contenteditable class="detail-modal-maid-span-cash">[%= it['data'][i]['partial_commission'][j]['cash'] %]</span> <span contenteditable class="detail-modal-maid-span-cash">[%= it['data'][i]['partial_commission'][j]['cash'] %]</span>
<span contenteditable class="detail-modal-maid-span-practical-fee">[%= it['data'][i]['partial_commission'][j]['practical_fee'] %]</span> <span contenteditable class="detail-modal-maid-span-practical-fee">[%= it['data'][i]['partial_commission'][j]['practical_fee'] %]</span>
[% if(!it['data'][i]['partial_commission'][j]['income_time'] || (Array.isArray(it['data'][i]['partial_commission'][j]['income_time']) && it['data'][i]['partial_commission'][j]['income_time'].length<1) ) { %] [% if(!it['data'][i]['partial_commission'][j]['income_time'] || (Array.isArray(it['data'][i]['partial_commission'][j]['income_time']) && it['data'][i]['partial_commission'][j]['income_time'].length<1) ) { %]
[% if(it['data'][i]['partial_commission'][j]['income_time_add']) { %]
<span class="detail-modal-maid-span-date" data-dateid="[%= it['data'][i]['partial_commission'][j]['income_time_add']['id'] %]">[%= it['data'][i]['partial_commission'][j]['income_time_add']['income_time'] %]</span>
[% }else{ %]
<span class="detail-modal-maid-span-date" data-dateid="">请点击选择</span> <span class="detail-modal-maid-span-date" data-dateid="">请点击选择</span>
[% } %]
[% }else{ %] [% }else{ %]
<span class="detail-modal-maid-span-date" data-dateid="[%= it['data'][i]['partial_commission'][j]['income_time']['id'] %]">[%= it['data'][i]['partial_commission'][j]['income_time']['income_time'] %]</span> <span class="detail-modal-maid-span-date" data-dateid="[%= it['data'][i]['partial_commission'][j]['income_time']['id'] %]">[%= it['data'][i]['partial_commission'][j]['income_time']['income_time'] %]</span>
[% } %] [% } %]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment