Skip to content
GitLab
Commit 0d6f1449 authored by qiankunpingtai's avatar qiankunpingtai
Browse files

从远程仓库更新

parents c868c071 2195b8bf
Expand all Hide whitespace changes
Inline Side-by-side
erp_web/js/pages/materials/bill_detail.js
View file @ 0d6f1449
...@@ -210,6 +210,7 @@ ...@@ -210,6 +210,7 @@
$("#bill .OrganIdShow").text(data.organName); $("#bill .OrganIdShow").text(data.organName);
$("#bill .OperTimeShow").text(data.opertimeStr); $("#bill .OperTimeShow").text(data.opertimeStr);
$("#bill .NumberShow").text(data.number); $("#bill .NumberShow").text(data.number);
$("#bill .LinkNumberShow").text(data.linknumber? data.linknumber : "");
$("#bill .RemarkShow").text(data.remark); $("#bill .RemarkShow").text(data.remark);
$("#bill .DiscountShow").text(data.discount); $("#bill .DiscountShow").text(data.discount);
$("#bill .DiscountMoneyShow").text(data.discountmoney); $("#bill .DiscountMoneyShow").text(data.discountmoney);
......
erp_web/js/pages/materials/in_out.js
View file @ 0d6f1449
This diff is collapsed.
erp_web/js/print/print.js
View file @ 0d6f1449
...@@ -21,11 +21,9 @@ function CreateFormPage(strPrintName, printDatagrid) { ...@@ -21,11 +21,9 @@ function CreateFormPage(strPrintName, printDatagrid) {
if (res && res.code === 200) { if (res && res.code === 200) {
if(res.data && res.data.page) { if(res.data && res.data.page) {
var array = res.data.page.rows; var array = res.data.page.rows;
for (var i = 0; i < array.length; i++) { if(array.length > 0) {
var name = array[i].name; var info = array[0];
if (name === "company_name") { companyName = info.companyName;
companyName = array[i].value;
}
} }
} }
} }
......
erp_web/pages/manage/systemConfig.html
View file @ 0d6f1449
This diff is collapsed.
erp_web/pages/materials/bill_detail.html
View file @ 0d6f1449
...@@ -173,8 +173,10 @@ ...@@ -173,8 +173,10 @@
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span class="NumberShow"></span> <span class="NumberShow"></span>
</td> </td>
<td style="width:70px;"></td> <td style="width:70px;">关联订单：</td>
<td style="padding:5px;width:140px;"></td> <td style="padding:5px;width:130px;">
<span class="LinkNumberShow"></span>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -222,10 +224,8 @@ ...@@ -222,10 +224,8 @@
<td style="padding:5px"> <td style="padding:5px">
<span class="OtherMoneyShow"></span> <span class="OtherMoneyShow"></span>
</td> </td>
<td>结算天数：</td> <td></td>
<td style="padding:5px"> <td style="padding:5px"></td>
<span class="AccountDayShow"></span>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
</table> </table>
...@@ -312,18 +312,18 @@ ...@@ -312,18 +312,18 @@
<td style="padding:5px;width:130px;"> <td style="padding:5px;width:130px;">
<span class="OrganIdShow"></span> <span class="OrganIdShow"></span>
</td> </td>
<td style="width:70px;">销售人员：</td> <td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:130px;">
<span class="SalesmanShow"></span>
</td>
<td style="width:80px;">单据日期：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span class="OperTimeShow"></span> <span class="OperTimeShow"></span>
</td> </td>
<td style="width:70px;">单据编号：</td> <td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span class="NumberShow"></span> <span class="NumberShow"></span>
</td> </td>
<td style="width:70px;">关联订单：</td>
<td style="padding:5px;width:130px;">
<span class="LinkNumberShow"></span>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -371,9 +371,9 @@ ...@@ -371,9 +371,9 @@
<td style="padding:5px"> <td style="padding:5px">
<span class="OtherMoneyShow"></span> <span class="OtherMoneyShow"></span>
</td> </td>
<td>结算天数：</td> <td>销售人员：</td>
<td style="padding:5px"> <td style="padding:5px">
<span class="AccountDayShow"></span> <span class="SalesmanShow"></span>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
...@@ -388,10 +388,6 @@ ...@@ -388,10 +388,6 @@
<td style="padding:5px;width:130px;"> <td style="padding:5px;width:130px;">
<span class="OrganIdShow"></span> <span class="OrganIdShow"></span>
</td> </td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px;width:130px;">
<span class="SalesmanShow"></span>
</td>
<td style="width:80px;">单据日期：</td> <td style="width:80px;">单据日期：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span class="OperTimeShow"></span> <span class="OperTimeShow"></span>
...@@ -400,6 +396,8 @@ ...@@ -400,6 +396,8 @@
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span class="NumberShow"></span> <span class="NumberShow"></span>
</td> </td>
<td style="width:70px;"></td>
<td style="padding:5px;width:130px;"></td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -447,8 +445,9 @@ ...@@ -447,8 +445,9 @@
<td style="padding:5px"> <td style="padding:5px">
<span class="OtherMoneyShow"></span> <span class="OtherMoneyShow"></span>
</td> </td>
<td></td> <td>销售人员：</td>
<td style="padding:5px"> <td style="padding:5px">
<span class="SalesmanShow"></span>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
......
erp_web/pages/materials/purchase_in_list.html
View file @ 0d6f1449
...@@ -82,8 +82,9 @@ ...@@ -82,8 +82,9 @@
<input name="Number" id="Number" class="easyui-validatebox" <input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/> data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
</td> </td>
<td style="width:70px;"></td> <td style="width:70px;">关联订单：</td>
<td style="padding:5px"> <td style="padding:5px">
<input name="LinkNumber" id="LinkNumber" class="easyui-validatebox" style="width: 150px;" readonly/>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
...@@ -135,10 +136,8 @@ ...@@ -135,10 +136,8 @@
<input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/> <input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/>
<img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/> <img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/>
</td> </td>
<td>结算天数：</td> <td></td>
<td style="padding:5px"> <td style="padding:5px">
<input id="AccountDay" name="AccountDay" class="easyui-validatebox"
data-options="validType:'length[1,3]'" style="width:120px;"/>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
...@@ -167,8 +166,10 @@ ...@@ -167,8 +166,10 @@
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span id="NumberShow"></span> <span id="NumberShow"></span>
</td> </td>
<td style="width:70px;"></td> <td style="width:70px;">关联订单：</td>
<td style="padding:5px;width:140px;"></td> <td style="padding:5px;width:140px;">
<span id="LinkNumberShow"></span>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -216,10 +217,8 @@ ...@@ -216,10 +217,8 @@
<td style="padding:5px"> <td style="padding:5px">
<span id="OtherMoneyShow"></span> <span id="OtherMoneyShow"></span>
</td> </td>
<td>结算天数：</td> <td></td>
<td style="padding:5px"> <td style="padding:5px"></td>
<span id="AccountDayShow"></span>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
</table> </table>
......
erp_web/pages/materials/sale_back_list.html
View file @ 0d6f1449
...@@ -65,10 +65,6 @@ ...@@ -65,10 +65,6 @@
<td style="padding:5px"> <td style="padding:5px">
<input id="OrganId" name="OrganId" style="width:110px;"/> <input id="OrganId" name="OrganId" style="width:110px;"/>
</td> </td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px">
<input id="Salesman" name="Salesman" style="width:130px;"/>
</td>
<td>单据日期：</td> <td>单据日期：</td>
<td style="padding:5px"> <td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" <input type="text" name="OperTime" id="OperTime"
...@@ -80,6 +76,8 @@ ...@@ -80,6 +76,8 @@
<input name="Number" id="Number" class="easyui-validatebox" <input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/> data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
</td> </td>
<td style="width:70px;"></td>
<td style="padding:5px"></td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -130,8 +128,9 @@ ...@@ -130,8 +128,9 @@
<input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/> <input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/>
<img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/> <img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/>
</td> </td>
<td></td> <td>销售人员：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="Salesman" name="Salesman" style="width:130px;"/>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
...@@ -151,10 +150,6 @@ ...@@ -151,10 +150,6 @@
<td style="padding:5px;width:130px;"> <td style="padding:5px;width:130px;">
<span id="OrganIdShow"></span> <span id="OrganIdShow"></span>
</td> </td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px;width:130px;">
<span id="SalesmanShow"></span>
</td>
<td style="width:80px;">单据日期：</td> <td style="width:80px;">单据日期：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span id="OperTimeShow"></span> <span id="OperTimeShow"></span>
...@@ -163,6 +158,8 @@ ...@@ -163,6 +158,8 @@
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span id="NumberShow"></span> <span id="NumberShow"></span>
</td> </td>
<td style="width:70px;"></td>
<td style="padding:5px;width:130px;"></td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -210,8 +207,9 @@ ...@@ -210,8 +207,9 @@
<td style="padding:5px"> <td style="padding:5px">
<span id="OtherMoneyShow"></span> <span id="OtherMoneyShow"></span>
</td> </td>
<td></td> <td>销售人员：</td>
<td style="padding:5px"> <td style="padding:5px">
<span id="SalesmanShow"></span>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
......
erp_web/pages/materials/sale_orders_list.html
View file @ 0d6f1449
...@@ -65,21 +65,21 @@ ...@@ -65,21 +65,21 @@
<td style="padding:5px"> <td style="padding:5px">
<input id="OrganId" name="OrganId" style="width:130px;"/> <input id="OrganId" name="OrganId" style="width:130px;"/>
</td> </td>
<td style="width:70px;">销售人员：</td> <td style="width:70px;">单据日期：</td>
<td style="padding:5px">
<input id="Salesman" name="Salesman" style="width:130px;"/>
</td>
<td style="width:80px;">单据日期：</td>
<td style="padding:5px"> <td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" <input type="text" name="OperTime" id="OperTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width:140px;" readonly/> style="width:140px;" readonly/>
</td> </td>
<td style="width:70px;">单据编号：</td> <td style="width:80px;">单据编号：</td>
<td style="padding:5px"> <td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox" <input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/> data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
</td> </td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px">
<input id="Salesman" name="Salesman" style="width:130px;"/>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -110,18 +110,18 @@ ...@@ -110,18 +110,18 @@
<td style="padding:5px;width:130px;"> <td style="padding:5px;width:130px;">
<span id="OrganIdShow"></span> <span id="OrganIdShow"></span>
</td> </td>
<td style="width:70px;">销售人员：</td> <td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:130px;">
<span id="SalesmanShow"></span>
</td>
<td style="width:80px;">单据日期：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span id="OperTimeShow"></span> <span id="OperTimeShow"></span>
</td> </td>
<td style="width:70px;">单据编号：</td> <td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span id="NumberShow"></span> <span id="NumberShow"></span>
</td> </td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px;width:130px;">
<span id="SalesmanShow"></span>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
......
erp_web/pages/materials/sale_out_list.html
View file @ 0d6f1449
...@@ -65,21 +65,21 @@ ...@@ -65,21 +65,21 @@
<td style="padding:5px"> <td style="padding:5px">
<input id="OrganId" name="OrganId" style="width:130px;"/> <input id="OrganId" name="OrganId" style="width:130px;"/>
</td> </td>
<td style="width:70px;">销售人员：</td> <td style="width:70px;">单据日期：</td>
<td style="padding:5px">
<input id="Salesman" name="Salesman" style="width:130px;"/>
</td>
<td style="width:80px;">单据日期：</td>
<td style="padding:5px"> <td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" <input type="text" name="OperTime" id="OperTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width:140px;" readonly/> style="width:140px;" readonly/>
</td> </td>
<td style="width:70px;">单据编号：</td> <td style="width:80px;">单据编号：</td>
<td style="padding:5px"> <td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox" <input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/> data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
</td> </td>
<td style="width:70px;">关联订单：</td>
<td style="padding:5px">
<input name="LinkNumber" id="LinkNumber" class="easyui-validatebox" style="width: 150px;" readonly/>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -130,10 +130,9 @@ ...@@ -130,10 +130,9 @@
<input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/> <input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/>
<img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/> <img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/>
</td> </td>
<td>结算天数：</td> <td>销售人员：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="AccountDay" name="AccountDay" class="easyui-numberbox" <input id="Salesman" name="Salesman" style="width:130px;"/>
data-options="validType:'length[1,3]'" style="width:120px;"/>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
...@@ -153,18 +152,18 @@ ...@@ -153,18 +152,18 @@
<td style="padding:5px;width:130px;"> <td style="padding:5px;width:130px;">
<span id="OrganIdShow"></span> <span id="OrganIdShow"></span>
</td> </td>
<td style="width:70px;">销售人员：</td> <td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:130px;">
<span id="SalesmanShow"></span>
</td>
<td style="width:80px;">单据日期：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span id="OperTimeShow"></span> <span id="OperTimeShow"></span>
</td> </td>
<td style="width:70px;">单据编号：</td> <td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span id="NumberShow"></span> <span id="NumberShow"></span>
</td> </td>
<td style="width:70px;">关联订单：</td>
<td style="padding:5px;width:130px;">
<span id="LinkNumberShow"></span>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -212,9 +211,9 @@ ...@@ -212,9 +211,9 @@
<td style="padding:5px"> <td style="padding:5px">
<span id="OtherMoneyShow"></span> <span id="OtherMoneyShow"></span>
</td> </td>
<td>结算天数：</td> <td>销售人员：</td>
<td style="padding:5px"> <td style="padding:5px">
<span id="AccountDayShow"></span> <span id="SalesmanShow"></span>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
......
erp_web/pages/reports/customer_account.html
View file @ 0d6f1449
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<td>&nbsp;</td> <td>&nbsp;</td>
<td> <td>
期初应收：<span class="first-total">0</span>&nbsp;&nbsp; 期初应收：<span class="first-total">0</span>&nbsp;&nbsp;
期末应收：<span class="last-total">0</span> 期末应收：<span class="last-total">0</span><span id="pleaseSelect">（请选择客户）</span>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
supType: "customer" supType: "customer"
}), }),
success: function (res) { success: function (res) {
if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney) { if (res && res.code === 200 && res.data && res.data.rows) {
var moneyA = res.data.rows.getAllMoney.toFixed(2) - 0; var moneyA = res.data.rows.getAllMoney.toFixed(2) - 0;
$.ajax({ $.ajax({
type: "get", type: "get",
...@@ -254,13 +254,14 @@ ...@@ -254,13 +254,14 @@
supType: "customer" supType: "customer"
}), }),
success: function (res) { success: function (res) {
if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney) { if (res && res.code === 200 && res.data && res.data.rows) {
var moneyB = res.data.rows.getAllMoney.toFixed(2) - 0; var moneyB = res.data.rows.getAllMoney.toFixed(2) - 0;
var money = moneyA + moneyB; var money = moneyA + moneyB;
var moneyBeginNeedGet = beginNeedGet - 0; //期初应收 var moneyBeginNeedGet = beginNeedGet - 0; //期初应收
var moneyBeginNeedPay = beginNeedPay - 0; //期初应付 var moneyBeginNeedPay = beginNeedPay - 0; //期初应付
money = (money + moneyBeginNeedGet - moneyBeginNeedPay).toFixed(2); money = (money + moneyBeginNeedGet - moneyBeginNeedPay).toFixed(2);
$(".first-total").text(money); //期初结存 $(".first-total").text(money); //期初结存
$("#pleaseSelect").hide();
} }
}, },
error: function () { error: function () {
...@@ -289,7 +290,7 @@ ...@@ -289,7 +290,7 @@
supType: "customer" supType: "customer"
}), }),
success: function (res) { success: function (res) {
if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney) { if (res && res.code === 200 && res.data && res.data.rows) {
var moneyA = res.data.rows.getAllMoney.toFixed(2) - 0; var moneyA = res.data.rows.getAllMoney.toFixed(2) - 0;
$.ajax({ $.ajax({
type: "get", type: "get",
...@@ -302,13 +303,14 @@ ...@@ -302,13 +303,14 @@
supType: "customer" supType: "customer"
}), }),
success: function (res) { success: function (res) {
if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney) { if (res && res.code === 200 && res.data && res.data.rows) {
var moneyB = res.data.rows.getAllMoney.toFixed(2) - 0; var moneyB = res.data.rows.getAllMoney.toFixed(2) - 0;
var money = moneyA + moneyB; var money = moneyA + moneyB;
var moneyBeginNeedGet = beginNeedGet - 0; //期初应收 var moneyBeginNeedGet = beginNeedGet - 0; //期初应收
var moneyBeginNeedPay = beginNeedPay - 0; //期初应付 var moneyBeginNeedPay = beginNeedPay - 0; //期初应付
money = (money + moneyBeginNeedGet - moneyBeginNeedPay).toFixed(2); money = (money + moneyBeginNeedGet - moneyBeginNeedPay).toFixed(2);
$(".last-total").text(money); //期末合计 $(".last-total").text(money); //期末合计
$("#pleaseSelect").hide();
} }
}, },
error: function () { error: function () {
......
erp_web/pages/reports/vendor_account.html
View file @ 0d6f1449
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<td>&nbsp;</td> <td>&nbsp;</td>
<td> <td>
期初应付：<span class="first-total">0</span>&nbsp;&nbsp; 期初应付：<span class="first-total">0</span>&nbsp;&nbsp;
期末应付：<span class="last-total">0</span> 期末应付：<span class="last-total">0</span><span id="pleaseSelect">（请选择供应商）</span>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
supType: "vendor" supType: "vendor"
}), }),
success: function (res) { success: function (res) {
if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney) { if (res && res.code === 200 && res.data && res.data.rows) {
var moneyA = res.data.rows.getAllMoney.toFixed(2) - 0; var moneyA = res.data.rows.getAllMoney.toFixed(2) - 0;
$.ajax({ $.ajax({
type: "get", type: "get",
...@@ -253,13 +253,14 @@ ...@@ -253,13 +253,14 @@
supType: "vendor" supType: "vendor"
}), }),
success: function (res) { success: function (res) {
if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney) { if (res && res.code === 200 && res.data && res.data.rows) {
var moneyB = res.data.rows.getAllMoney.toFixed(2) - 0; var moneyB = res.data.rows.getAllMoney.toFixed(2) - 0;
var money = moneyA + moneyB; var money = moneyA + moneyB;
var moneyBeginNeedGet = beginNeedGet - 0; //期初应收 var moneyBeginNeedGet = beginNeedGet - 0; //期初应收
var moneyBeginNeedPay = beginNeedPay - 0; //期初应付 var moneyBeginNeedPay = beginNeedPay - 0; //期初应付
money = (money + moneyBeginNeedPay - moneyBeginNeedGet).toFixed(2); money = (money + moneyBeginNeedPay - moneyBeginNeedGet).toFixed(2);
$(".first-total").text(money); //期初结存 $(".first-total").text(money); //期初结存
$("#pleaseSelect").hide();
} }
}, },
error: function () { error: function () {
...@@ -288,7 +289,7 @@ ...@@ -288,7 +289,7 @@
supType: "vendor" supType: "vendor"
}), }),
success: function (res) { success: function (res) {
if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney) { if (res && res.code === 200 && res.data && res.data.rows) {
var moneyA = res.data.rows.getAllMoney.toFixed(2) - 0; var moneyA = res.data.rows.getAllMoney.toFixed(2) - 0;
$.ajax({ $.ajax({
type: "get", type: "get",
...@@ -301,13 +302,14 @@ ...@@ -301,13 +302,14 @@
supType: "vendor" supType: "vendor"
}), }),
success: function (res) { success: function (res) {
if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney) { if (res && res.code === 200 && res.data && res.data.rows) {
var moneyB = res.data.rows.getAllMoney.toFixed(2) - 0; var moneyB = res.data.rows.getAllMoney.toFixed(2) - 0;
var money = moneyA + moneyB; var money = moneyA + moneyB;
var moneyBeginNeedGet = beginNeedGet - 0; //期初应收 var moneyBeginNeedGet = beginNeedGet - 0; //期初应收
var moneyBeginNeedPay = beginNeedPay - 0; //期初应付 var moneyBeginNeedPay = beginNeedPay - 0; //期初应付
money = (money + moneyBeginNeedPay - moneyBeginNeedGet).toFixed(2); money = (money + moneyBeginNeedPay - moneyBeginNeedGet).toFixed(2);
$(".last-total").text(money); //期末合计 $(".last-total").text(money); //期末合计
$("#pleaseSelect").hide();
} }
}, },
error: function () { error: function () {
......
sql/jsh_erp.sql
View file @ 0d6f1449
...@@ -1307,10 +1307,57 @@ INSERT INTO `jsh_functions`(`Number`, `Name`, `PNumber`, `URL`, `State`, `Sort`, ...@@ -1307,10 +1307,57 @@ INSERT INTO `jsh_functions`(`Number`, `Name`, `PNumber`, `URL`, `State`, `Sort`,
-- 添加根机构 -- 添加根机构
-- ---------------------------- -- ----------------------------
INSERT INTO `jsh_organization`(`org_no`, `org_full_name`, `org_abr`, `org_tpcd`, `org_stcd`, `org_parent_no`, `sort`, `remark`, `create_time`, `creator`, `update_time`, `updater`, `org_create_time`, `org_stop_time`) VALUES ('01', '根机构', '根机构', NULL, '2', '-1', '1', '根机构，初始化存在', NULL, NULL, NULL, NULL, NULL, NULL); INSERT INTO `jsh_organization`(`org_no`, `org_full_name`, `org_abr`, `org_tpcd`, `org_stcd`, `org_parent_no`, `sort`, `remark`, `create_time`, `creator`, `update_time`, `updater`, `org_create_time`, `org_stop_time`) VALUES ('01', '根机构', '根机构', NULL, '2', '-1', '1', '根机构，初始化存在', NULL, NULL, NULL, NULL, NULL, NULL);
-- ---------------------------- -- ----------------------------
-- 时间：2019年3月8日 -- 时间：2019年3月9日
-- version：1.0.6 -- version：1.0.6
-- 此次更新 -- 此次更新
-- 整改jsh_systemconfig表的字段
-- ----------------------------
alter table jsh_systemconfig drop type;
alter table jsh_systemconfig drop name;
alter table jsh_systemconfig drop value;
alter table jsh_systemconfig drop description;
alter table jsh_systemconfig add company_name varchar(50) DEFAULT null COMMENT '公司名称';
alter table jsh_systemconfig add company_contacts varchar(20) DEFAULT null COMMENT '公司联系人';
alter table jsh_systemconfig add company_address varchar(50) DEFAULT null COMMENT '公司地址';
alter table jsh_systemconfig add company_tel varchar(20) DEFAULT null COMMENT '公司电话';
alter table jsh_systemconfig add company_fax varchar(20) DEFAULT null COMMENT '公司传真';
alter table jsh_systemconfig add company_post_code varchar(20) DEFAULT null COMMENT '公司邮编';
delete from jsh_systemconfig;
insert into jsh_systemconfig (`company_name`, `company_contacts`, `company_address`, `company_tel`, `company_fax`, `company_post_code`) values("南通jshERP公司","张三","南通市通州区某某路","0513-10101010","0513-18181818","226300");
-- ----------------------------
-- 时间：2019年3月9日
-- version：1.0.7
-- 改管理员的功能权限
-- ----------------------------
update jsh_userbusiness SET
Value = '[13][12][16][243][14][15][234][236][22][23][220][240][25][217][218][26][194][195][31][59][207][208][209][226][227][228][229][235][237][210][211][241][33][199][242][41][200][201][202][40][232][233][197][203][204][205][206][212]'
where Id = 5;
-- ----------------------------
-- 给订单功能加审核和反审核的功能按钮权限
-- ----------------------------
update jsh_functions SET PushBtn = '3' where Number = '050202' and PNumber = '0502';
update jsh_functions SET PushBtn = '3' where Number = '060301' and PNumber = '0603';
-- ----------------------------
-- 改管理员的按钮权限
-- ----------------------------
update jsh_userbusiness SET
BtnStr = '[{"funId":"25","btnStr":"1"},{"funId":"217","btnStr":"1"},{"funId":"218","btnStr":"1"},{"funId":"241","btnStr":"3"},{"funId":"242","btnStr":"3"}]'
where Id = 5;
-- ----------------------------
-- 时间：2019年3月10日
-- version：1.0.8
-- 改状态字段的类型，增加关联单据字段
-- ----------------------------
alter table jsh_depothead change Status Status varchar(1) DEFAULT '0' COMMENT '状态，0未审核、1已审核、2已转采购|销售';
alter table jsh_depothead add `LinkNumber` varchar(50) DEFAULT null COMMENT '关联订单号';
-- ----------------------------
-- 时间：2019年3月12日
-- version：1.0.9
-- 此次更新
-- 1、根据本地用户表中现有部门生成机构表数据，同时重建机构和用户的关联关系 -- 1、根据本地用户表中现有部门生成机构表数据，同时重建机构和用户的关联关系
-- 特别提醒：之后的sql都是在之前基础上迭代，可以对已存在的系统进行数据保留更新 -- 特别提醒：之后的sql都是在之前基础上迭代，可以对已存在的系统进行数据保留更新
-- ---------------------------- -- ----------------------------
......
src/main/java/com/jsh/erp/constants/BusinessConstants.java
View file @ 0d6f1449
...@@ -51,6 +51,12 @@ public class BusinessConstants { ...@@ -51,6 +51,12 @@ public class BusinessConstants {
* */ * */
public static final String ENABLE_SERIAL_NUMBER_ENABLED = "1"; public static final String ENABLE_SERIAL_NUMBER_ENABLED = "1";
public static final String ENABLE_SERIAL_NUMBER_NOT_ENABLED = "0"; public static final String ENABLE_SERIAL_NUMBER_NOT_ENABLED = "0";
/**
* 单据状态 billsStatus '0'未审核 '1'审核 '2'已转采购|销售
* */
public static final String BILLS_STATUS_UN_AUDIT = "0";
public static final String BILLS_STATUS_AUDIT = "1";
public static final String BILLS_STATUS_SKIP = "2";
/** /**
* 出入库分类 * 出入库分类
*采购、采购退货、其它、零售、销售、调拨 *采购、采购退货、其它、零售、销售、调拨
......
src/main/java/com/jsh/erp/controller/DepotHeadController.java
View file @ 0d6f1449
...@@ -51,7 +51,7 @@ public class DepotHeadController { ...@@ -51,7 +51,7 @@ public class DepotHeadController {
* @return * @return
*/ */
@PostMapping(value = "/batchSetStatus") @PostMapping(value = "/batchSetStatus")
public String batchSetStatus(@RequestParam("status") Boolean status, public String batchSetStatus(@RequestParam("status") String status,
@RequestParam("depotHeadIDs") String depotHeadIDs, @RequestParam("depotHeadIDs") String depotHeadIDs,
HttpServletRequest request) { HttpServletRequest request) {
Map<String, Object> objectMap = new HashMap<String, Object>(); Map<String, Object> objectMap = new HashMap<String, Object>();
...@@ -64,20 +64,12 @@ public class DepotHeadController { ...@@ -64,20 +64,12 @@ public class DepotHeadController {
} }
/** /**
* 单据编号生成接口，规则：查找当前类型单据下的当天最大的单据号，并加1 * 单据编号生成接口
* @param type
* @param subType
* @param beginTime
* @param endTime
* @param request * @param request
* @return * @return
*/ */
@GetMapping(value = "/buildNumber") @GetMapping(value = "/buildNumber")
public BaseResponseInfo buildNumber(@RequestParam("type") String type, public BaseResponseInfo buildNumber(HttpServletRequest request) {
@RequestParam("subType") String subType,
@RequestParam("beginTime") String beginTime,
@RequestParam("endTime") String endTime,
HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo(); BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
try { try {
......
src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java
View file @ 0d6f1449
...@@ -11,35 +11,51 @@ public class SystemConfig { ...@@ -11,35 +11,51 @@ public class SystemConfig {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.type * This field corresponds to the database column jsh_systemconfig.company_name
* *
* @mbggenerated * @mbggenerated
*/ */
private String type; private String companyName;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.name * This field corresponds to the database column jsh_systemconfig.company_contacts
* *
* @mbggenerated * @mbggenerated
*/ */
private String name; private String companyContacts;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.value * This field corresponds to the database column jsh_systemconfig.company_address
* *
* @mbggenerated * @mbggenerated
*/ */
private String value; private String companyAddress;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.description * This field corresponds to the database column jsh_systemconfig.company_tel
* *
* @mbggenerated * @mbggenerated
*/ */
private String description; private String companyTel;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.company_fax
*
* @mbggenerated
*/
private String companyFax;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.company_post_code
*
* @mbggenerated
*/
private String companyPostCode;
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
...@@ -67,97 +83,145 @@ public class SystemConfig { ...@@ -67,97 +83,145 @@ public class SystemConfig {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.type * This method returns the value of the database column jsh_systemconfig.company_name
*
* @return the value of jsh_systemconfig.company_name
*
* @mbggenerated
*/
public String getCompanyName() {
return companyName;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.company_name
*
* @param companyName the value for jsh_systemconfig.company_name
*
* @mbggenerated
*/
public void setCompanyName(String companyName) {
this.companyName = companyName == null ? null : companyName.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.company_contacts
*
* @return the value of jsh_systemconfig.company_contacts
*
* @mbggenerated
*/
public String getCompanyContacts() {
return companyContacts;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.company_contacts
*
* @param companyContacts the value for jsh_systemconfig.company_contacts
*
* @mbggenerated
*/
public void setCompanyContacts(String companyContacts) {
this.companyContacts = companyContacts == null ? null : companyContacts.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.company_address
* *
* @return the value of jsh_systemconfig.type * @return the value of jsh_systemconfig.company_address
* *
* @mbggenerated * @mbggenerated
*/ */
public String getType() { public String getCompanyAddress() {
return type; return companyAddress;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.type * This method sets the value of the database column jsh_systemconfig.company_address
* *
* @param type the value for jsh_systemconfig.type * @param companyAddress the value for jsh_systemconfig.company_address
* *
* @mbggenerated * @mbggenerated
*/ */
public void setType(String type) { public void setCompanyAddress(String companyAddress) {
this.type = type == null ? null : type.trim(); this.companyAddress = companyAddress == null ? null : companyAddress.trim();
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.name * This method returns the value of the database column jsh_systemconfig.company_tel
* *
* @return the value of jsh_systemconfig.name * @return the value of jsh_systemconfig.company_tel
* *
* @mbggenerated * @mbggenerated
*/ */
public String getName() { public String getCompanyTel() {
return name; return companyTel;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.name * This method sets the value of the database column jsh_systemconfig.company_tel
* *
* @param name the value for jsh_systemconfig.name * @param companyTel the value for jsh_systemconfig.company_tel
* *
* @mbggenerated * @mbggenerated
*/ */
public void setName(String name) { public void setCompanyTel(String companyTel) {
this.name = name == null ? null : name.trim(); this.companyTel = companyTel == null ? null : companyTel.trim();
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.value * This method returns the value of the database column jsh_systemconfig.company_fax
* *
* @return the value of jsh_systemconfig.value * @return the value of jsh_systemconfig.company_fax
* *
* @mbggenerated * @mbggenerated
*/ */
public String getValue() { public String getCompanyFax() {
return value; return companyFax;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.value * This method sets the value of the database column jsh_systemconfig.company_fax
* *
* @param value the value for jsh_systemconfig.value * @param companyFax the value for jsh_systemconfig.company_fax
* *
* @mbggenerated * @mbggenerated
*/ */
public void setValue(String value) { public void setCompanyFax(String companyFax) {
this.value = value == null ? null : value.trim(); this.companyFax = companyFax == null ? null : companyFax.trim();
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.description * This method returns the value of the database column jsh_systemconfig.company_post_code
* *
* @return the value of jsh_systemconfig.description * @return the value of jsh_systemconfig.company_post_code
* *
* @mbggenerated * @mbggenerated
*/ */
public String getDescription() { public String getCompanyPostCode() {
return description; return companyPostCode;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.description * This method sets the value of the database column jsh_systemconfig.company_post_code
* *
* @param description the value for jsh_systemconfig.description * @param companyPostCode the value for jsh_systemconfig.company_post_code
* *
* @mbggenerated * @mbggenerated
*/ */
public void setDescription(String description) { public void setCompanyPostCode(String companyPostCode) {
this.description = description == null ? null : description.trim(); this.companyPostCode = companyPostCode == null ? null : companyPostCode.trim();
} }
} }
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java
View file @ 0d6f1449
package com.jsh.erp.datasource.mappers; package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.DepotHead; import com.jsh.erp.datasource.entities.DepotHead;
import com.jsh.erp.datasource.entities.DepotHeadExample; import com.jsh.erp.datasource.entities.DepotHeadExample;
import java.util.List;
import java.math.BigDecimal; import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface DepotHeadMapper {
import com.jsh.erp.datasource.vo.DepotHeadVo4InDetail; /**
import com.jsh.erp.datasource.vo.DepotHeadVo4InOutMCount; * This method was generated by MyBatis Generator.
import com.jsh.erp.datasource.vo.DepotHeadVo4List; * This method corresponds to the database table jsh_depothead
import com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount; *
import org.apache.ibatis.annotations.Param; * @mbggenerated
*/
public interface DepotHeadMapper { int countByExample(DepotHeadExample example);
/**
* This method was generated by MyBatis Generator. /**
* This method corresponds to the database table jsh_depothead * This method was generated by MyBatis Generator.
* * This method corresponds to the database table jsh_depothead
* @mbggenerated *
*/ * @mbggenerated
int countByExample(DepotHeadExample example); */
int deleteByExample(DepotHeadExample example);
/**
* This method was generated by MyBatis Generator. /**
* This method corresponds to the database table jsh_depothead * This method was generated by MyBatis Generator.
* * This method corresponds to the database table jsh_depothead
* @mbggenerated *
*/ * @mbggenerated
int deleteByExample(DepotHeadExample example); */
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator. /**
* This method corresponds to the database table jsh_depothead * This method was generated by MyBatis Generator.
* * This method corresponds to the database table jsh_depothead
* @mbggenerated *
*/ * @mbggenerated
int deleteByPrimaryKey(Long id); */
int insert(DepotHead record);
/**
* This method was generated by MyBatis Generator. /**
* This method corresponds to the database table jsh_depothead * This method was generated by MyBatis Generator.
* * This method corresponds to the database table jsh_depothead
* @mbggenerated *
*/ * @mbggenerated
int insert(DepotHead record); */
int insertSelective(DepotHead record);
/**
* This method was generated by MyBatis Generator. /**
* This method corresponds to the database table jsh_depothead * This method was generated by MyBatis Generator.
* * This method corresponds to the database table jsh_depothead
* @mbggenerated *
*/ * @mbggenerated
int insertSelective(DepotHead record); */
List<DepotHead> selectByExample(DepotHeadExample example);
/**
* This method was generated by MyBatis Generator. /**
* This method corresponds to the database table jsh_depothead * This method was generated by MyBatis Generator.
* * This method corresponds to the database table jsh_depothead
* @mbggenerated *
*/ * @mbggenerated
List<DepotHead> selectByExample(DepotHeadExample example); */
DepotHead selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator. /**
* This method corresponds to the database table jsh_depothead * This method was generated by MyBatis Generator.
* * This method corresponds to the database table jsh_depothead
* @mbggenerated *
*/ * @mbggenerated
DepotHead selectByPrimaryKey(Long id); */
int updateByExampleSelective(@Param("record") DepotHead record, @Param("example") DepotHeadExample example);
/**
* This method was generated by MyBatis Generator. /**
* This method corresponds to the database table jsh_depothead * This method was generated by MyBatis Generator.
* * This method corresponds to the database table jsh_depothead
* @mbggenerated *
*/ * @mbggenerated
int updateByExampleSelective(@Param("record") DepotHead record, @Param("example") DepotHeadExample example); */
int updateByExample(@Param("record") DepotHead record, @Param("example") DepotHeadExample example);
/**
* This method was generated by MyBatis Generator. /**
* This method corresponds to the database table jsh_depothead * This method was generated by MyBatis Generator.
* * This method corresponds to the database table jsh_depothead
* @mbggenerated *
*/ * @mbggenerated
int updateByExample(@Param("record") DepotHead record, @Param("example") DepotHeadExample example); */
int updateByPrimaryKeySelective(DepotHead record);
/**
* This method was generated by MyBatis Generator. /**
* This method corresponds to the database table jsh_depothead * This method was generated by MyBatis Generator.
* * This method corresponds to the database table jsh_depothead
* @mbggenerated *
*/ * @mbggenerated
int updateByPrimaryKeySelective(DepotHead record); */
int updateByPrimaryKey(DepotHead record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table jsh_depothead
*
* @mbggenerated
*/
int updateByPrimaryKey(DepotHead record);
} }
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java
View file @ 0d6f1449
...@@ -9,8 +9,10 @@ import java.util.List; ...@@ -9,8 +9,10 @@ import java.util.List;
public interface SystemConfigMapperEx { public interface SystemConfigMapperEx {
List<SystemConfig> selectByConditionSystemConfig( List<SystemConfig> selectByConditionSystemConfig(
@Param("companyName") String companyName,
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
Long countsBySystemConfig(); Long countsBySystemConfig(
@Param("companyName") String companyName);
} }
\ No newline at end of file
Supports Markdown
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