purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

清理和礼品卡相关的代码

Browse Source
This commit is contained in:
季圣华
2019-02-22 23:27:46 +08:00
parent 6bffcd8f28
commit 086b7d486f
8 changed files with 10 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
erp_web/js/pages/materials/bill_detail.js
View File

@@ -128,14 +128,6 @@
billType = "material";
$("#bill .allocation_out").show();
}
else if(listSubType == "礼品充值") {
billType = "material";
$("#bill .gift_recharge").show();
}
else if(listSubType == "礼品销售出库") {
billType = "material";
$("#bill .gift_out").show();
}
else if(listSubType == "收入") {
billType = "account";
payTypeTitle = "收入项目";
@@ -334,19 +326,11 @@
if(listSubType == "调拨出库"){
isShowAnotherDepot = false; //调拨时候显示对方仓库
anotherDepotHeadName = "调入仓库";
}
if(listSubType == "礼品充值"){
isShowAnotherDepot = false; //礼品充值时候显示礼品卡
anotherDepotHeadName = "礼品卡";
}
if(listSubType == "礼品销售"){
depotHeadName = "礼品卡";
}
else {
} else {
depotHeadName = "仓库名称";
}
var isShowTaxColumn = false; //是否显示税率相关的列,true为隐藏,false为显示
if(listSubType == "调拨出库" || listSubType == "其它出库" || listSubType == "其它入库" || listSubType == "零售出库" || listSubType == "零售退货入库" || listSubType == "礼品充值" || listSubType == "礼品销售"){
if(listSubType == "调拨出库" || listSubType == "其它出库" || listSubType == "其它入库" || listSubType == "零售出库" || listSubType == "零售退货入库"){
isShowTaxColumn = true; //隐藏
}
var isShowMaterialTypeColumn = true; //是否显示商品类型相关的列,true为隐藏,false为显示

66
erp_web/pages/materials/bill_detail.html
View File

@@ -557,72 +557,6 @@
</tr>
</table>
</div>
<!--礼品充值-->
<div class="gift_recharge" style="width:1100px;padding:10px 20px;top:60px"
closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
<td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:140px;">
<span class="OperTimeShow"></span>
</td>
<td style="width:70px;">单据编号：</td>
<td style="padding:5px;width:140px;">
<span class="NumberShow"></span>
</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td style="width:100px;"></td>
</tr>
<tr>
<td colspan="9" style="width: 1130px;">
<!-- 商品列表table -->
<table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
<tr>
<td style="width:60px;">单据备注：</td>
<td colspan="8" style="height:35px;">
<span class="RemarkShow" style="width: 1070px; height:35px;"></span>
</td>
</tr>
</table>
</div>
<!--礼品销售-->
<div class="gift_out" style="width:1100px;padding:10px 20px;top:60px"
closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
<td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:140px;">
<span class="OperTimeShow"></span>
</td>
<td style="width:70px;">单据编号：</td>
<td style="padding:5px;width:140px;">
<span class="NumberShow"></span>
</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td style="width:100px;"></td>
</tr>
<tr>
<td colspan="9" style="width: 1130px;">
<!-- 商品列表table -->
<table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
<tr>
<td style="width:60px;">单据备注：</td>
<td colspan="8" style="height:35px;">
<span class="RemarkShow" style="width: 1070px; height:35px;"></span>
</td>
</tr>
</table>
</div>
<!--收入单-->
<div class="item_in" style="width:1100px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true">