Skip to content
GitLab
Commit 693a7558 authored by cjl's avatar cjl
Browse files

从jsh远程仓库更新 

(cherry picked from commit 36139e26)
parent 1e1e5f6e
Show whitespace changes
Inline Side-by-side
README.md
View file @ 693a7558
......@@ -16,22 +16,20 @@
* 日志管理：Log4j 1.2.16
* JS框架：Jquery 1.8.0
* UI框架: EasyUI 1.3.5
* 桌面框架: HoorayOS
* 项目管理框架: Maven3.2.3
* 桌面框架: HoorayOS 2.0.0
* 项目管理框架: Maven 3.2.3
# 开发环境
建议开发者使用以下环境，可以避免版本带来的问题
* IDE: MyEclipse8.5+/Eclipse4.4+
* DB: Mysql5.1
* JDK: JDK1.7+
* WEB: Tomcat6.0+
* IDE: IntelliJ IDEA 2017+
* DB: Mysql5.7.4
* JDK: JDK1.8
* Maven: Maven3.2.3+
* 为方便大家搭建开发环境，分享了下载地址 **http://pan.baidu.com/s/1nuKnlNV**
# 运行环境
* WEB服务器：Tomcat6.0+
* 数据库服务器：Mysql5.1
* JAVA平台: JRE1.7+
* 数据库服务器：Mysql5.7.4
* JAVA平台: JRE1.8
* 操作系统：Windows、Linux等
# 开源说明
......
erp_web/js/pages/manage/supplier.js
View file @ 693a7558
......@@ -343,7 +343,12 @@
//导出数据
function setOutputFun(){
window.location.href = "/supplier/exportExcel.action?browserType=" + getOs() + "&type=" + listTypeEn;
var supplier = $.trim($("#searchSupplier").val());
var phonenum = $.trim($("#searchPhonenum").val());
var telephone = $.trim($("#searchTelephone").val());
var description = $.trim($("#searchDesc").val());
window.location.href = "/supplier/exportExcel?browserType=" + getOs()
+ "&supplier=" + supplier + "&type=" + listType + "&phonenum=" + phonenum + "&telephone=" + telephone + "&description=" + description;
}
//增加单位
......
erp_web/js/pages/materials/in_out.js
View file @ 693a7558
......@@ -571,6 +571,8 @@
+ 'AaBb' + rec.discount + 'AaBb' + rec.discountmoney + 'AaBb' + rec.discountlastmoney
+ 'AaBb' + rec.accountidlist + 'AaBb' + rec.accountmoneylist
+ 'AaBb' + rec.othermoney + 'AaBb' + rec.othermoneylist + 'AaBb' + rec.othermoneyitem + 'AaBb' + rec.accountday;
rowInfo = rowInfo.replace(/\"/g, "");
rowInfo = rowInfo.replace(/\[|]/g,"");
var orgId = rec.organid? rec.organid:0;
str += '<img title="查看" src="/js/easyui-1.3.5/themes/icons/list.png" style="cursor: pointer;" onclick="showDepotHead(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepotHead(\'' + rowInfo + '\''+',' + rec.status + ');"/>&nbsp;&nbsp;&nbsp;';
......@@ -1556,7 +1558,7 @@
initTableData_material("add"); //商品列表
reject(); //撤销下、刷新商品列表
$("#addOrgan").off("click").on("click",function(){
$('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加供应商');
$('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加供应商信息');
});
url = '/depotHead/add';
......@@ -1725,10 +1727,9 @@
$("#OperTimeShow").text(depotHeadInfo[4]);
$('#OrganIdShow').text(depotHeadInfo[11]);
$("#HandsPersonIdShow").text(depotHeadInfo[12]);
if(depotHeadInfo[13]){
if(depotHeadInfo[13] && depotHeadInfo[13]!="undefined"){
$("#AccountIdShow").text(depotHeadInfo[13]); //结算账户
}
else if(depotHeadInfo[22] && depotHeadInfo[23]){
} else {
var accountArr = depotHeadInfo[22].split(","); //账户id列表
var accountMoneyArr = depotHeadInfo[23].split(","); //账户金额列表
var accountIdShow = "";
......@@ -2553,28 +2554,15 @@
return;
}
var url = '/supplier/add';
var supObj = $("#supplierFM").serializeObject();
supObj.type = "供应商";
supObj.enabled = 1;
$.ajax({
url: url,
type:"post",
dataType: "json",
data:{
supplier:$("#supplier").val(),
type: "供应商",
contacts:$("#contacts").val(),
phonenum:$("#phonenum").val(),
telephone:$("#telephone").val(),
email:$("#email").val(),
address:$("#address").val(),
fax:$("#fax").val(),
BeginNeedGet:$("#BeginNeedGet").val(),
BeginNeedPay:$("#BeginNeedPay").val(),
taxNum:$("#taxNum").val(),
taxRate:$("#taxRate").val(),
bankName:$("#bankName").val(),
accountNumber:$("#accountNumber").val(),
description:$("#description").val(),
enabled:1,
clientIp: clientIp
info: JSON.stringify(supObj)
},
success: function(res) {
if (res) {
......
erp_web/js/print/print.js
View file @ 693a7558
// strPrintName 打印任务名
// printDatagrid 要打印的datagrid
function CreateFormPage(strPrintName, printDatagrid, path) {
function CreateFormPage(strPrintName, printDatagrid) {
var beginDate= $("#searchBeginTime").val();
var endDate= $("#searchEndTime").val();
var getMonth= $("#searchMonth").val();
......@@ -10,19 +10,25 @@ function CreateFormPage(strPrintName, printDatagrid, path) {
//加载公司信息
$.ajax({
type:"get",
url: path + "/systemConfig/findBy.action",
url: "/systemConfig/list",
dataType: "json",
data: ({
currentPage: 1,
pageSize: 100
}),
async: false,
success: function (res) {
if(res && res.rows) {
var array = res.rows;
for(var i=0; i<array.length; i++){
if (res && res.code === 200) {
if(res.data && res.data.page) {
var array = res.data.page.rows;
for (var i = 0; i < array.length; i++) {
var name = array[i].name;
if(name === "company_name") {
if (name === "company_name") {
companyName = array[i].value;
}
}
}
}
},
//此处添加错误处理
error:function() {
......
erp_web/pages/manage/app.html
View file @ 693a7558
......@@ -351,7 +351,7 @@
url = '/app/add';
$("#Icon").empty();//清除上传控件数据
$(".fileUploadContent").initUpload({
"uploadUrl": "/app/uploadImg.action",//上传文件信息地址
"uploadUrl": "/app/uploadImg",//上传文件信息地址
"progressUrl": "#",//获取进度信息地址，可选，注意需要返回的data格式如下（{bytesRead: 102516060, contentLength: 102516060, items: 1, percent: 100, startTime: 1489223136317, useTime: 2767}）
//"showSummerProgress":false,//总进度条，默认限制
//"size":350,//文件大小限制，单位kb,默认不限制
......@@ -369,13 +369,20 @@
if (checkAppName()) {
return;
}
var infoObj = $("#appFM").serializeObject();
if($("#Icon .fileItem .fileName").length){
infoObj.Icon = $.trim($("#Icon .fileItem .fileName").text());
}
infoObj.ReSize = $("#ReSize").is(':checked');
infoObj.OpenMax = $("#OpenMax").is(':checked');
infoObj.Flash = $("#Flash").is(':checked');
infoObj.Enabled = $("#Enabled").is(':checked');
$.ajax({
url: url,
type: "post",
dataType: "json",
fileElementId: 'Icon',
data: ({
info: JSON.stringify($("#appFM").serializeObject())
info: JSON.stringify(infoObj)
}),
success: function(res) {
if(res && res.code === 200) {
......@@ -420,7 +427,7 @@
appID = appInfo[0];
//焦点在名称输入框==定焦在输入文字后面
$("#name").val("").focus().val(appInfo[1]);
url = '/depot/update?id=' + appInfo[0];
url = '/app/update?id=' + appInfo[0];
}
//检查名称是否存在 ++ 重名无法提示问题需要跟进
......
erp_web/pages/manage/customer.html
View file @ 693a7558
......@@ -160,7 +160,7 @@
<!-- 导入excel表格 -->
<div id="importExcelDlg" style="padding:10px 20px">
<form id="importExcelFM" method="post" enctype="multipart/form-data"
action="/supplier/importExcelCustomer.action">
action="/supplier/importExcelCustomer">
<div class="fitem" style="padding:5px">
<label>文件名称&nbsp;&nbsp;</label>
<input name="supplierFile" id="supplierFile" type="file" style="width: 230px;height: 20px"/>
......@@ -175,7 +175,6 @@
<option value="1" selected="selected">否</option>
</select>
</div>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
<div id="dlg-buttons5">
<a href="javascript:void(0)" id="saveimport" class="easyui-linkbutton" iconCls="icon-ok">导入</a>
<a href="javascript:void(0)" id="cancelimport" class="easyui-linkbutton" iconCls="icon-cancel"
......
erp_web/pages/manage/functions.html
View file @ 693a7558
......@@ -252,12 +252,14 @@
//绑定事件
function bindEvent() {
var url = '/js/pages/manage/pushBtn.json';
$('#PushBtn').combobox({
url: '/js/pages/manage/pushBtn.json',
url: url,
valueField: 'id',
textField: 'text',
panelHeight: 120,
multiple: true
multiple: true,
method: 'get'
});
}
......@@ -353,12 +355,17 @@
if (checkFunctionsName()) {
return;
}
var infoObj = $("#functionsFM").serializeObject();
infoObj.State = $("#State").is(':checked');
infoObj.Enabled = $("#Enabled").is(':checked');
var PushBtn = JSON.stringify($("#PushBtn").combobox('getValues'));
infoObj.PushBtn = PushBtn.replace(/\"/g, "").replace(/\[|]/g,"");
$.ajax({
url: url,
type: "post",
dataType: "json",
data: ({
info: JSON.stringify($("#functionsFM").serializeObject())
info: JSON.stringify(infoObj)
}),
success: function(res) {
if(res && res.code === 200) {
......
erp_web/pages/manage/member.html
View file @ 693a7558
......@@ -160,7 +160,7 @@
<!-- 导入excel表格 -->
<div id="importExcelDlg" style="padding:10px 20px">
<form id="importExcelFM" method="post" enctype="multipart/form-data"
action="/supplier/importExcelMember.action">
action="/supplier/importExcelMember">
<div class="fitem" style="padding:5px">
<label>文件名称&nbsp;&nbsp;</label>
<input name="supplierFile" id="supplierFile" type="file" style="width: 230px;height: 20px"/>
......@@ -175,7 +175,6 @@
<option value="1" selected="selected">否</option>
</select>
</div>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
<div id="dlg-buttons5">
<a href="javascript:void(0)" id="saveimport" class="easyui-linkbutton" iconCls="icon-ok">导入</a>
<a href="javascript:void(0)" id="cancelimport" class="easyui-linkbutton" iconCls="icon-cancel"
......
erp_web/pages/manage/vendor.html
View file @ 693a7558
......@@ -160,7 +160,7 @@
<!-- 导入excel表格 -->
<div id="importExcelDlg" style="padding:10px 20px">
<form id="importExcelFM" method="post" enctype="multipart/form-data"
action="/supplier/importExcelVendor.action">
action="/supplier/importExcelVendor">
<div class="fitem" style="padding:5px">
<label>文件名称&nbsp;&nbsp;</label>
<input name="supplierFile" id="supplierFile" type="file" style="width: 230px;height: 20px"/>
......@@ -175,7 +175,6 @@
<option value="1" selected="selected">否</option>
</select>
</div>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
<div id="dlg-buttons5">
<a href="javascript:void(0)" id="saveimport" class="easyui-linkbutton" iconCls="icon-ok">导入</a>
<a href="javascript:void(0)" id="cancelimport" class="easyui-linkbutton" iconCls="icon-cancel"
......
erp_web/pages/materials/material.html
View file @ 693a7558
......@@ -244,7 +244,7 @@
<!-- 导入excel表格 -->
<div id="importExcelDlg" class="easyui-dialog" style="width:400px; padding:10px 20px;"
closed="true" buttons="#dlg-buttons5" modal="true" collapsible="false" closable="true">
<form id="importExcelFM" method="post" enctype="multipart/form-data" action="/material/importExcel.action">
<form id="importExcelFM" method="post" enctype="multipart/form-data" action="/material/importExcel">
<div class="fitem" style="padding:5px">
<label>文件名称&nbsp;&nbsp;</label>
<input name="materialFile" id="materialFile" type="file" style="width: 230px;height: 20px"/>
......@@ -259,7 +259,6 @@
<option value="1" selected="selected">否</option>
</select>
</div>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
<div id="dlg-buttons5">
<a href="javascript:void(0)" id="saveimport" class="easyui-linkbutton" iconCls="icon-ok">导入</a>
<a href="javascript:void(0)" id="cancelimport" class="easyui-linkbutton" iconCls="icon-cancel"
......@@ -1041,7 +1040,15 @@
//导出数据
function setOutputFun() {
window.location.href = "/material/exportExcel.action?browserType=" + getOs();
var name = $.trim($("#searchName").val());
var model = $.trim($("#searchModel").val());
if (setCategoryId != "1") {
cid = 2;
} else {
cid = 1;
}
window.location.href = "/material/exportExcel?browserType=" + getOs()
+ "&name=" + name + "&model=" + model + "&categoryId=" + cid + "&categoryIds=" + setCategoryId;
}
//增加
......
erp_web/pages/materials/purchase_in_list.html
View file @ 693a7558
......@@ -292,22 +292,22 @@
</td>
</tr>
<tr>
<td>联系电话</td>
<td style="padding:1px;">
<input name="phonenum" id="phonenum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
</td>
<td>手机</td>
<td>手机号码</td>
<td style="padding:1px;">
<input name="telephone" id="telephone" class="easyui-validatebox"
style="width: 160px;height: 20px"/>
</td>
</tr>
<tr>
<td>电子邮箱</td>
<td style="padding:1px">
<input name="email" id="email" class="easyui-validatebox" validType="email"
style="width: 160px;height: 20px"/>
</td>
</tr>
<tr>
<td>联系电话</td>
<td style="padding:1px;">
<input name="phonenum" id="phonenum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
</td>
<td>传真</td>
<td style="padding:1px">
<input name="fax" id="fax" class="easyui-validatebox" style="width: 160px;height: 20px"/>
......
erp_web/pages/reports/account_report.html
View file @ 693a7558
......@@ -311,8 +311,7 @@
//报表打印
function print() {
$("#printBtn").off("click").on("click", function () {
var path = "<%=path %>";
CreateFormPage('打印报表', $('#tableData'), path);
CreateFormPage('打印报表', $('#tableData'));
});
}
</script>
......
erp_web/pages/reports/buy_in_report.html
View file @ 693a7558
......@@ -252,8 +252,7 @@
//报表打印
function print() {
$("#printBtn").off("click").on("click", function () {
var path = "<%=path %>";
CreateFormPage('打印报表', $('#tableData'), path);
CreateFormPage('打印报表', $('#tableData'));
});
}
</script>
......
erp_web/pages/reports/customer_account.html
View file @ 693a7558
......@@ -344,8 +344,7 @@
//报表打印
function print() {
$("#printBtn").off("click").on("click", function () {
var path = "<%=path %>";
CreateFormPage('打印报表', $('#tableData'), path);
CreateFormPage('打印报表', $('#tableData'));
});
}
</script>
......
erp_web/pages/reports/in_detail.html
View file @ 693a7558
......@@ -306,8 +306,7 @@
//报表打印
function print() {
$("#printBtn").off("click").on("click", function () {
var path = "<%=path %>";
CreateFormPage('打印报表', $('#tableData'), path);
CreateFormPage('打印报表', $('#tableData'));
});
}
</script>
......
erp_web/pages/reports/in_material_count.html
View file @ 693a7558
......@@ -295,8 +295,7 @@
//报表打印
function print() {
$("#printBtn").off("click").on("click", function () {
var path = "<%=path %>";
CreateFormPage('打印报表', $('#tableData'), path);
CreateFormPage('打印报表', $('#tableData'));
});
}
</script>
......
erp_web/pages/reports/in_out_stock_report.html
View file @ 693a7558
......@@ -325,7 +325,7 @@
var mIds = res.data.mIds;
if (mIds) {
if (pageSize === 3000) {
window.location.href = "/depotItem/exportExcel.action?browserType=" + getOs() + "&pageNo=" + pageNo + "&pageSize=" + pageSize + "&ProjectId=" + $.trim($("#searchProjectId").val()) + "&MonthTime=" + $("#searchMonth").val() + "&HeadIds=" + HeadIds + "&MaterialIds=" + MIds;
window.location.href = "/depotItem/exportExcel?browserType=" + getOs() + "&currentPage=" + pageNo + "&pageSize=" + pageSize + "&projectId=" + $.trim($("#searchProjectId").val()) + "&monthTime=" + $("#searchMonth").val() + "&headIds=" + HeadIds + "&materialIds=" + mIds;
}
else {
$.ajax({
......@@ -411,8 +411,7 @@
//报表打印
function print() {
$("#printBtn").off("click").on("click", function () {
var path = "<%=path %>";
CreateFormPage('打印报表', $('#tableData'), path);
CreateFormPage('打印报表', $('#tableData'));
});
}
</script>
......
erp_web/pages/reports/out_detail.html
View file @ 693a7558
......@@ -306,8 +306,7 @@
//报表打印
function print() {
$("#printBtn").off("click").on("click", function () {
var path = "<%=path %>";
CreateFormPage('打印报表', $('#tableData'), path);
CreateFormPage('打印报表', $('#tableData'));
});
}
</script>
......
erp_web/pages/reports/out_material_count.html
View file @ 693a7558
......@@ -295,8 +295,7 @@
//报表打印
function print() {
$("#printBtn").off("click").on("click", function () {
var path = "<%=path %>";
CreateFormPage('打印报表', $('#tableData'), path);
CreateFormPage('打印报表', $('#tableData'));
});
}
</script>
......
erp_web/pages/reports/sale_out_report.html
View file @ 693a7558
......@@ -255,8 +255,7 @@
//报表打印
function print() {
$("#printBtn").off("click").on("click", function () {
var path = "<%=path %>";
CreateFormPage('打印报表', $('#tableData'), path);
CreateFormPage('打印报表', $('#tableData'));
});
}
</script>
......
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