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

从源更新

parents 3e3c1d75 6be4f901
Show whitespace changes
Inline Side-by-side
erp_web/home.html
View file @ d838c891
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
</div> </div>
<footer class="main-footer m0"> <footer class="main-footer m0">
<div class="pull-right hidden-xs">当前版本： V2.1</div> <div class="pull-right hidden-xs">当前版本： V2.1</div>
&copy; 2015-2020 华夏ERP Demo - Powered By <a href="https://www.huaxiaerp.com/" target="_blank">官方网站</a> &copy; 2015-2020 华夏ERP Demo - Powered By <a href="http://home.huaxiaerp.com/" target="_blank">官方网站</a>
</footer> </footer>
</div> </div>
...@@ -106,6 +106,7 @@ ...@@ -106,6 +106,7 @@
<script src="js/layer/3.1/layer.js"></script> <script src="js/layer/3.1/layer.js"></script>
<script src="js/my97/WdatePicker.js"></script> <script src="js/my97/WdatePicker.js"></script>
<script src="js/common/jsherp.js"></script> <script src="js/common/jsherp.js"></script>
<script src="js/common/common.js"></script>
<script src="js/common/i18n/jsherp_zh_CN.js"></script> <script src="js/common/i18n/jsherp_zh_CN.js"></script>
<script> <script>
if ($('#switchSkin').length > 0){ if ($('#switchSkin').length > 0){
......
erp_web/index.html
View file @ d838c891
...@@ -50,7 +50,11 @@ ...@@ -50,7 +50,11 @@
</a> </a>
</li> </li>
<li class="treeview"> <li class="treeview">
<a target="_blank" style="color:yellow;font-weight: bold" <a target="_blank" class="aliyun" style="color:yellow;font-weight: bold;display: none;"
href="https://www.aliyun.com/acts/hotsale?userCode=axva2vlr">
<i class="fa fa-cloud"></i> 阿里云促销中
</a>
<a target="_blank" class="tencent" style="color:yellow;font-weight: bold;display: none;"
href="https://cloud.tencent.com/act/cps/redirect?fromSource=gwzcw.3018172.3018172.3018172&redirect=10140&cps_key=4fb6482d716575dcb7b8fe600d93766a&from=activity"> href="https://cloud.tencent.com/act/cps/redirect?fromSource=gwzcw.3018172.3018172.3018172&redirect=10140&cps_key=4fb6482d716575dcb7b8fe600d93766a&from=activity">
<i class="fa fa-cloud"></i> 腾讯云促销中 <i class="fa fa-cloud"></i> 腾讯云促销中
</a> </a>
......
erp_web/js/common/common.js
View file @ d838c891
//baidu-tongji
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?1cd9bcbaae133f03a6eb19da6579aaba";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
$.fn.serializeObject = function() { $.fn.serializeObject = function() {
var o = {}; var o = {};
var a = this.serializeArray(); var a = this.serializeArray();
...@@ -48,11 +57,13 @@ ...@@ -48,11 +57,13 @@
} }
function dgResize() { function dgResize() {
var searchTabHeight = $('#searchTable').height(); var searchTabHeight = $('#searchTable').height();
if($('#tableData').length) {
$('#tableData').datagrid('resize', { $('#tableData').datagrid('resize', {
width: $(window).width() - 6, width: $(window).width() - 6,
height: $(window).height() - searchTabHeight -46 height: $(window).height() - searchTabHeight -46
}); });
} }
}
$(window).resize(function () { $(window).resize(function () {
dgResize(); dgResize();
}); });
......
erp_web/js/modules/sys/sysIndex.js
View file @ d838c891
...@@ -418,8 +418,19 @@ $(function () { ...@@ -418,8 +418,19 @@ $(function () {
}); });
}) })
//根据时间戳决定展示aliyun还是tencent
function autoChangeTip() {
var timestamp=new Date().getTime();
var checkShow = timestamp%2;
if(checkShow) {
$(".aliyun").show();
$(".tencent").hide();
} else {
$(".aliyun").hide();
$(".tencent").show();
}
}
setInterval(function () {
autoChangeTip();
},10*1000);
}); });
\ No newline at end of file
erp_web/js/pages/materials/in_out.js
View file @ d838c891
...@@ -667,7 +667,6 @@ ...@@ -667,7 +667,6 @@
//初始化表格数据-商品列表-编辑状态 //初始化表格数据-商品列表-编辑状态
function initTableData_material(type,TotalPrice){ function initTableData_material(type,TotalPrice){
var body,footer,input; //定义表格和文本框 var body,footer,input; //定义表格和文本框
var ratio = 1; //比例-品名专用
var ratioDepot = 1; //比例-仓库用 var ratioDepot = 1; //比例-仓库用
var monthTime = getNowFormatMonth(); var monthTime = getNowFormatMonth();
var isShowAnotherDepot = true; //显示对方仓库,true为隐藏,false为显示 var isShowAnotherDepot = true; //显示对方仓库,true为隐藏,false为显示
...@@ -760,6 +759,136 @@ ...@@ -760,6 +759,136 @@
param.mpList = mPropertyList; //商品属性 param.mpList = mPropertyList; //商品属性
}, },
onSelect:function(rec){ onSelect:function(rec){
materialSelect(rec);
}
}
}
},
{ title: '库存',field: 'Stock',editor:'validatebox',width:70},
{ title: anotherDepotHeadName, field: 'AnotherDepotId',editor:'validatebox',hidden:isShowAnotherDepot,width:90,
formatter: function (value, row, index) {
return row.AnotherDepotName;
},
editor: {
type: 'combobox',
options: {
valueField: 'id',
textField: anotherDepotTextField,
method: 'get',
url: anotherDepotUrl
}
}
},
{ title: '单位',field: 'Unit',editor:'validatebox',width:60},
{ title: '数量',field: 'OperNumber',editor:'validatebox',width:60},
{ title: '单价',field: 'UnitPrice',editor:'validatebox',width:60},
{ title: '含税单价',field: 'TaxUnitPrice',editor:'validatebox',hidden:isShowTaxColumn,width:75},
{ title: '金额',field: 'AllPrice',editor:'validatebox',width:75},
{ title: '税率(%)',field: 'TaxRate',editor:'validatebox',hidden:isShowTaxColumn,width:75},
{ title: '税额',field: 'TaxMoney',editor:'validatebox',hidden:isShowTaxColumn,width:75},
{ title: '价税合计',field: 'TaxLastMoney',editor:'validatebox',hidden:isShowTaxColumn,width:75},
{ title: '备注',field: 'Remark',editor:'validatebox',width:120},
{ title: '品名-别',field: 'OtherField1',editor:'validatebox',hidden:otherColumns,width:60},
{ title: '型号-别',field: 'OtherField2',editor:'validatebox',hidden:otherColumns,width:60},
{ title: '颜色-别',field: 'OtherField3',editor:'validatebox',hidden:otherColumns,width:60},
{ title: '备注1',field: 'OtherField4',editor:'validatebox',hidden:true,width:60},
{ title: '备注2',field: 'OtherField5',editor:'validatebox',hidden:true,width:60}
]],
toolbar:[
{
id:'append',
text:'新增行',
iconCls:'icon-add',
handler:function() {
append(); //新增行
}
},
{
id:'delete',
text:'删除行',
iconCls:'icon-remove',
handler:function() {
batchDel(); //删除行
}
},
{
id:'reject',
text:'撤销',
iconCls:'icon-undo',
handler:function() {
reject(); //撤销
}
},
{
id:'appendDepot',
text:'新增仓库',
iconCls:'icon-add',
handler:function() {
appendDepot(); //新增仓库
}
},
{
id:'appendMaterial',
text:'新增商品',
iconCls:'icon-add',
handler:function() {
js.addTabPage(null, "商品信息", "/pages/materials/material.html");
// appendMaterial(); //新增商品
}
}
],
onLoadError:function()
{
$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
return;
}
});
$.ajax({
type:"get",
url: '/depotItem/getDetailList',
data: {
headerId: depotHeadID,
mpList: mPropertyList
},
dataType: "json",
success: function (res) {
if(res && res.code === 200) {
var data = res.data;
var AllPrice = 0;
var TaxLastMoney = 0;
var DiscountMoney = $("#DiscountMoney").val()-0; //优惠金额
var DiscountLastMoney = $("#DiscountLastMoney").val()-0; //优惠后金额
if(type === "edit") {
AllPrice = TotalPrice;
TaxLastMoney = DiscountMoney + DiscountLastMoney;
}
var array = [];
array.push({
"AllPrice": AllPrice,
"TaxLastMoney": TaxLastMoney
});
data.footer = array;
$("#materialData").datagrid('loadData',data);
//如果是订单跳转到采购或销售
if(pageType === "skip") {
var skipList = $("#depotHeadFM .datagrid-body tr");
var input = ".datagrid-editable-input";
//逐条自动点击每行数据
skipList.each(function (i) {
setTimeout(function () {
skipList.eq(i).find("[field='Remark']").click().find(input).val("来自订单"); //此处为确保订单转销售成功，勿删
},(i+1)*200);
});
}
}
},
error:function() {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
}
});
function materialSelect(rec) {
var body,footer,input; //定义表格和文本框
var ratio = 1; //比例-品名专用
if(rec) { if(rec) {
var mId = rec.Id; var mId = rec.Id;
$.ajax({ $.ajax({
...@@ -972,131 +1101,6 @@ ...@@ -972,131 +1101,6 @@
} }
} }
} }
}
},
{ title: '库存',field: 'Stock',editor:'validatebox',width:70},
{ title: anotherDepotHeadName, field: 'AnotherDepotId',editor:'validatebox',hidden:isShowAnotherDepot,width:90,
formatter: function (value, row, index) {
return row.AnotherDepotName;
},
editor: {
type: 'combobox',
options: {
valueField: 'id',
textField: anotherDepotTextField,
method: 'get',
url: anotherDepotUrl
}
}
},
{ title: '单位',field: 'Unit',editor:'validatebox',width:60},
{ title: '数量',field: 'OperNumber',editor:'validatebox',width:60},
{ title: '单价',field: 'UnitPrice',editor:'validatebox',width:60},
{ title: '含税单价',field: 'TaxUnitPrice',editor:'validatebox',hidden:isShowTaxColumn,width:75},
{ title: '金额',field: 'AllPrice',editor:'validatebox',width:75},
{ title: '税率(%)',field: 'TaxRate',editor:'validatebox',hidden:isShowTaxColumn,width:75},
{ title: '税额',field: 'TaxMoney',editor:'validatebox',hidden:isShowTaxColumn,width:75},
{ title: '价税合计',field: 'TaxLastMoney',editor:'validatebox',hidden:isShowTaxColumn,width:75},
{ title: '备注',field: 'Remark',editor:'validatebox',width:120},
{ title: '品名-别',field: 'OtherField1',editor:'validatebox',hidden:otherColumns,width:60},
{ title: '型号-别',field: 'OtherField2',editor:'validatebox',hidden:otherColumns,width:60},
{ title: '颜色-别',field: 'OtherField3',editor:'validatebox',hidden:otherColumns,width:60},
{ title: '备注1',field: 'OtherField4',editor:'validatebox',hidden:true,width:60},
{ title: '备注2',field: 'OtherField5',editor:'validatebox',hidden:true,width:60}
]],
toolbar:[
{
id:'append',
text:'新增行',
iconCls:'icon-add',
handler:function() {
append(); //新增行
}
},
{
id:'delete',
text:'删除行',
iconCls:'icon-remove',
handler:function() {
batchDel(); //删除行
}
},
{
id:'reject',
text:'撤销',
iconCls:'icon-undo',
handler:function() {
reject(); //撤销
}
},
{
id:'appendDepot',
text:'新增仓库',
iconCls:'icon-add',
handler:function() {
appendDepot(); //新增仓库
}
},
{
id:'appendMaterial',
text:'新增商品',
iconCls:'icon-add',
handler:function() {
js.addTabPage(null, "商品信息", "/pages/materials/material.html");
// appendMaterial(); //新增商品
}
}
],
onLoadError:function()
{
$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
return;
}
});
$.ajax({
type:"get",
url: '/depotItem/getDetailList',
data: {
headerId: depotHeadID,
mpList: mPropertyList
},
dataType: "json",
success: function (res) {
if(res && res.code === 200) {
var data = res.data;
var AllPrice = 0;
var TaxLastMoney = 0;
var DiscountMoney = $("#DiscountMoney").val()-0; //优惠金额
var DiscountLastMoney = $("#DiscountLastMoney").val()-0; //优惠后金额
if(type === "edit") {
AllPrice = TotalPrice;
TaxLastMoney = DiscountMoney + DiscountLastMoney;
}
var array = [];
array.push({
"AllPrice": AllPrice,
"TaxLastMoney": TaxLastMoney
});
data.footer = array;
$("#materialData").datagrid('loadData',data);
//如果是订单跳转到采购或销售
if(pageType === "skip") {
var skipList = $("#depotHeadFM .datagrid-body tr");
var input = ".datagrid-editable-input";
//逐条自动点击每行数据
skipList.each(function (i) {
setTimeout(function () {
skipList.eq(i).find("[field='Remark']").click().find(input).val("来自订单"); //此处为确保订单转销售成功，勿删
},(i+1)*200);
});
}
}
},
error:function() {
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
}
});
}
//初始化表格数据-商品列表-查看状态 //初始化表格数据-商品列表-查看状态
function initTableData_material_show(TotalPrice){ function initTableData_material_show(TotalPrice){
var isShowAnotherDepot = true; //显示对方仓库,true为隐藏,false为显示 var isShowAnotherDepot = true; //显示对方仓库,true为隐藏,false为显示
......
erp_web/login.html
View file @ d838c891
...@@ -72,10 +72,10 @@ ...@@ -72,10 +72,10 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<a href="register.html" class="pull-left">[ 立即注册 ]</a> <a href="register.html" class="pull-left"><b>[ 立即注册 ]</b></a>
<div class="dropdown pull-right"> <div class="dropdown pull-right">
<a href="https://www.huaxiaerp.com/" class="dropdown-toggle" target="_blank"> <a href="http://home.huaxiaerp.com/" class="dropdown-toggle" target="_blank">
<i class="fa icon-globe"></i> 官方网站 <b><i class="fa icon-globe"></i> 官方网站</b>
</a> </a>
</div> </div>
</div> </div>
...@@ -103,5 +103,6 @@ ...@@ -103,5 +103,6 @@
<script src="js/jquery-validation/1.16/jquery.validate.extend.js"></script> <script src="js/jquery-validation/1.16/jquery.validate.extend.js"></script>
<script src="js/common/jsherp.js"></script> <script src="js/common/jsherp.js"></script>
<script src="js/common/i18n/jsherp_zh_CN.js"></script> <script src="js/common/i18n/jsherp_zh_CN.js"></script>
<script src="js/common/common.js"></script>
<script src="js/md5/md5.js"></script> <script src="js/md5/md5.js"></script>
<script src="js/modules/sys/sysLogin.js"></script> <script src="js/modules/sys/sysLogin.js"></script>
erp_web/register.html
View file @ d838c891
...@@ -89,10 +89,10 @@ ...@@ -89,10 +89,10 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<a href="login.html" class="pull-left">[ 立即登录 ]</a> <a href="login.html" class="pull-left"><b>[ 立即登录 ]</b></a>
<div class="dropdown pull-right"> <div class="dropdown pull-right">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown"> <a href="http://home.huaxiaerp.com/" class="dropdown-toggle" target="_blank">
<i class="fa icon-globe"></i> 官方网站 <b><i class="fa icon-globe"></i> 官方网站</b>
</a> </a>
</div> </div>
</div> </div>
......
src/main/bin/run-manage.sh
View file @ d838c891
FILE_PATH=/home/jshERP2.0 FILE_PATH=
SERVER_NAME=jshERP SERVER_NAME=jshERP
readonly APP_HOME=${FILE_PATH:-$(dirname $(cd `dirname $0`; pwd))} readonly APP_HOME=${FILE_PATH:-$(dirname $(cd `dirname $0`; pwd))}
......
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