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

优化库存逻辑

Browse Source
This commit is contained in:
季圣华
2020-07-09 23:45:23 +08:00
parent ad5b6e9daa
commit cbba347579
8 changed files with 121 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erp_web/css/bill_detail.css
View File

@@ -28,6 +28,9 @@
#bill .allocation_out{
display: none;
}
#bill .stock_check_replay{
display: none;
}
#bill .gift_recharge{
display: none;
}

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

@@ -140,6 +140,21 @@
$("#bill .allocation_out").show();
tableString = $(".allocation_out").html();
}
else if(listSubType == "组装单") {
billType = "material";
$("#bill .allocation_out").show();
tableString = $(".allocation_out").html();
}
else if(listSubType == "拆卸单") {
billType = "material";
$("#bill .allocation_out").show();
tableString = $(".allocation_out").html();
}
else if(listSubType == "盘点复盘") {
billType = "material";
$("#bill .stock_check_replay").show();
tableString = $(".stock_check_replay").html();
}
else if(listSubType == "收入") {
billType = "account";
payTypeTitle = "收入项目";
@@ -373,6 +388,9 @@
else if(listSubType == "调拨出库") {
tableString = $(".allocation_out").html();
}
else if(listSubType == "盘点复盘") {
tableString = $(".stock_check_replay").html();
}
else if(listSubType == "收入") {
tableString = $(".item_in").html();
}
@@ -408,7 +426,8 @@
depotHeadName = "仓库名称";
}
var isShowTaxColumn = false; //是否显示税率相关的列,true为隐藏,false为显示
if(listSubType == "调拨出库" || listSubType == "其它出库" || listSubType == "其它入库" || listSubType == "零售出库" || listSubType == "零售退货入库"){
if(listSubType == "调拨出库" || listSubType == "其它出库" || listSubType == "其它入库" ||
listSubType == "零售出库" || listSubType == "零售退货入库" || listSubType == "盘点复盘"){
isShowTaxColumn = true; //隐藏
}
var isShowMaterialTypeColumn = true; //是否显示商品类型相关的列,true为隐藏,false为显示

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

@@ -559,6 +559,41 @@
</tr>
</table>
</div>
<!--盘点复盘-->
<div class="stock_check_replay" style="width:1100px;padding:10px 20px;top:70px"
closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
<td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:130px;">
<span class="OperTimeShow"></span>
</td>
<td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:140px;">
<span class="NumberShow"></span>
</td>
<td style="width:70px;">关联订单：</td>
<td style="padding:5px;width:130px;">
<span class="LinkNumberShow"></span>
</td>
<td style="width:60px;"></td>
<td style="padding:5px;width:130px;"></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:1300px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true">