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

给单据主表增加单据类型字段

Browse Source
This commit is contained in:
jsh
2020-11-25 22:07:55 +08:00
parent 0ffe35a4a2
commit 0bb674db9e
9 changed files with 193 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erp_web/js/pages/bill/bill_detail.js
View File

@@ -250,7 +250,7 @@
}
$("#bill .AccountIdShow").text(accountIdShow);
}
$("#bill .OrganIdShow").text(data.organName);
$("#bill .OrganIdShow").text(data.organName==null ? "":data.organName);
$("#bill .OperTimeShow").text(data.operTimeStr);
$("#bill .NumberShow").text(data.number);
$("#bill .LinkNumberShow").text(data.linkNumber? data.linkNumber : "");

16
erp_web/pages/bill/other_in_list.html
View File

@@ -121,9 +121,13 @@
<td style="padding:5px;width:140px;">
<span id="NumberShow"></span>
</td>
<td style="width:70px;"></td>
<td style="padding:5px;width:140px;"></td>
<td style="width:100px;"></td>
<td style="width:70px;">关联单号：</td>
<td style="padding:5px;width:140px;">
<span id="LinkNumberShow"></span>
</td>
<td style="width:100px;">
<span id="billTypeShow"></span>
</td>
</tr>
<tr>
<td colspan="9" style="width: 1130px;">
@@ -423,6 +427,7 @@
$("#DebtShow").text(debt);
$("#AccountDayShow").text(res.accountDay); //结算天数
$("#LinkNumberShow").text(res.linkNumber); //关联订单号
$("#billTypeShow").text(res.billType); //单据类型
var otherMoney = res.otherMoney?res.otherMoney:0;
if(otherMoney!=0 && res.otherMoneyList && res.otherMoneyItem){
var itemArr = res.otherMoneyList.split(","); //支出项目id列表
@@ -700,11 +705,6 @@
return;
}
}
//输入框提示
if(!$('#OrganId').combobox('getValue')){
$.messager.alert('提示','请选择往来单位！','warning');
return;
}
//进行明细的校验
if(depotHeadID ==0) {
//新增模式下

16
erp_web/pages/bill/other_out_list.html
View File

@@ -115,9 +115,13 @@
<td style="padding:5px;width:140px;">
<span id="NumberShow"></span>
</td>
<td style="width:70px;"></td>
<td style="padding:5px;width:140px;"></td>
<td style="width:100px;"></td>
<td style="width:70px;">关联单号：</td>
<td style="padding:5px;width:140px;">
<span id="LinkNumberShow"></span>
</td>
<td style="width:100px;">
<span id="billTypeShow"></span>
</td>
</tr>
<tr>
<td colspan="9" style="width: 1130px;">
@@ -416,6 +420,7 @@
$("#DebtShow").text(debt);
$("#AccountDayShow").text(res.accountDay); //结算天数
$("#LinkNumberShow").text(res.linkNumber); //关联订单号
$("#billTypeShow").text(res.billType); //单据类型
var otherMoney = res.otherMoney?res.otherMoney:0;
if(otherMoney!=0 && res.otherMoneyList && res.otherMoneyItem){
var itemArr = res.otherMoneyList.split(","); //支出项目id列表
@@ -693,11 +698,6 @@
return;
}
}
//输入框提示
if(!$('#OrganId').combobox('getValue')){
$.messager.alert('提示','请选择往来单位！','warning');
return;
}
//进行明细的校验
if(depotHeadID ==0) {
//新增模式下