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

从源更新

parents eb775654 c13026d3
Hide whitespace changes
Inline Side-by-side
erp_web/home.html
View file @ 6a0e9ff2
......@@ -94,7 +94,7 @@
</div>
</div>
<footer class="main-footer m0">
<div class="pull-right hidden-xs">当前版本： V1.0</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>
</footer>
</div>
......
erp_web/index.html
View file @ 6a0e9ff2
......@@ -44,7 +44,17 @@
</div>
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
<li class="treeview"><a href="javascript:" data-href="/pages/user/userHelp.html" class="addTabPage"><i class="fa fa-diamond"></i> 新手引导</a></li>
<li class="treeview">
<a href="javascript:" data-href="/pages/user/userHelp.html" class="addTabPage">
<i class="fa fa-diamond"></i> 新手引导
</a>
</li>
<li class="treeview">
<a target="_blank" style="color:yellow;font-weight: bold"
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> 腾讯云促销中
</a>
</li>
<li><a href="javascript:" id="fullScreen" title="全屏" data-placement="bottom"
data-container="body"><i class="fa fa-arrows-alt"></i></a></li>
<li class="dropdown messages-menu">
......
erp_web/js/common/common.js
View file @ 6a0e9ff2
......@@ -334,4 +334,18 @@
function turnBillDetailPage(number, type) {
js.addTabPage(null, "单据明细", "/pages/materials/bill_detail.html?n="+ number + "&type=" + type);
}
/**
* 验证手机号码
* @param phoneInput
* @returns {boolean}
*/
function isPhoneAvailable(phoneInput) {
var myreg=/^[1][3,4,5,7,8,9][0-9]{9}$/;
if (!myreg.test(phoneInput.val())) {
return false;
} else {
return true;
}
}
\ No newline at end of file
erp_web/js/pages/materials/add_temp.js
View file @ 6a0e9ff2
......@@ -57,5 +57,256 @@ $.get("../../pages/template/base.html?789", function(tem) {
$("#cancelDepot").linkbutton({
iconCls: 'icon-cancel'
});
/**
* 加载账户
*/
$("#account").html(template({
accountSelect: true
}));
$('#accountDlg').dialog({
closed: true,
modal: true,
collapsible: false,
closable: true
});
$("#accountDlg #name,#accountDlg #serialNo").validatebox({
required: true,
validType: 'length[2,30]'
});
$("#accountDlg #initialAmount").numberbox({
min:0,
precision:2
});
$("#saveAccount").linkbutton({
iconCls: 'icon-ok'
});
$("#cancelAccount").linkbutton({
iconCls: 'icon-cancel'
});
}
});
//绑定供应商、客户事件
function bindSupplierEvent() {
if(listTitle === "采购入库列表" || listTitle === "其它入库列表" || listTitle === "采购订单列表"
|| listTitle === "零售出库列表"|| listTitle === "销售出库列表"|| listTitle === "销售订单列表"){
var supplierType = "供应商";
if(listTitle === "零售出库列表"){
supplierType = "会员";
}else if(listTitle === "销售出库列表" || listTitle === "销售订单列表"){
supplierType = "客户";
}
//检查单位名称是否存在 ++ 重名无法提示问题需要跟进
function checkSupplierName() {
var supplierName = $.trim($("#supplier").val());
var orgSupplier = "";
//表示是否存在 true == 存在 false = 不存在
var flag = false;
//开始ajax名称检验，不能重名
if(supplierName.length > 0 &&( orgSupplier.length ==0 || supplierName != orgSupplier))
{
$.ajax({
type:"get",
url: "/supplier/checkIsNameExist",
dataType: "json",
async : false,
data: ({
id : 0,
name : supplierName
}),
success: function (res) {
if(res && res.code === 200) {
if(res.data && res.data.status) {
flag = res.data.status;
if (flag) {
$.messager.alert('提示', '单位名称已经存在', 'info');
return;
}
}
}
},
//此处添加错误处理
error:function() {
$.messager.alert('提示','检查单位名称是否存在异常，请稍后再试！','error');
return;
}
});
}
return flag;
}
//保存供应商信息
$("#saveSupplier").off("click").on("click",function() {
if(validateForm("supplierFM")) {
return;
}
if(checkSupplierName()){
return;
}
var reg = /^([0-9])+$/;
var phonenum = $.trim($("#phonenum").val());
if(phonenum.length>0 && !reg.test(phonenum))
{
$.messager.alert('提示','电话号码只能是数字','info');
$("#phonenum").val("").focus();
return;
}
var beginNeedGet = $.trim($("#BeginNeedGet").val());
var beginNeedPay = $.trim($("#BeginNeedPay").val());
if(beginNeedGet && beginNeedPay) {
$.messager.alert('提示','期初应收和期初应付不能同时输入','info');
return;
}
var url = '/supplier/add';
var supObj = $("#supplierFM").serializeObject();
supObj.type = supplierType;
supObj.enabled = 1;
$.ajax({
url: url,
type:"post",
dataType: "json",
data:{
info: JSON.stringify(supObj)
},
success: function(res) {
if (res) {
$('#supplierDlg').dialog('close');
initSupplier(); //刷新供应商
}
}
});
});
}
}
//绑定仓库事件
function bindDepotEvent() {
$("#depotFM #name").focus();
$("#selectType").val("principal");
//检查名称是否存在 ++ 重名无法提示问题需要跟进
function checkDepotName() {
var name = $.trim($("#depotDlg #name").val());
//表示是否存在 true == 存在 false = 不存在
var flag = false;
//开始ajax名称检验，不能重名
if (name.length > 0) {
$.ajax({
type: "get",
url: "/depot/checkIsNameExist",
dataType: "json",
async: false,
data: ({
id: 0,
name: name
}),
success: function (res) {
if(res && res.code === 200) {
if(res.data && res.data.status) {
flag = res.data.status;
if (flag) {
$.messager.alert('提示', '仓库名称已经存在', 'info');
return;
}
}
}
},
//此处添加错误处理
error: function () {
$.messager.alert('提示', '检查仓库名称是否存在异常，请稍后再试！', 'error');
return;
}
});
}
return flag;
}
});
\ No newline at end of file
$("#saveDepot").off("click").on("click", function () {
var infoObj = $("#depotFM").serializeObject();
infoObj.type = 0;
if (checkDepotName()) {
return;
}
$.ajax({
url: "/depot/add",
type: "post",
dataType: "json",
data: ({
info: JSON.stringify(infoObj)
}),
success: function(res) {
if(res && res.code === 200) {
$('#depotDlg').dialog('close');
}
},
//此处添加错误处理
error: function () {
$.messager.alert('提示', '保存仓库信息异常，请稍后再试！', 'error');
return;
}
});
});
}
//绑定账户事件
function bindAccountEvent() {
function checkAccountName() {
var accountName = $.trim($("#accountDlg #name").val());
//表示是否存在 true == 存在 false = 不存在
var flag = false;
//开始ajax名称检验，不能重名
if (accountName.length > 0) {
$.ajax({
type: "get",
url: "/account/checkIsNameExist",
dataType: "json",
async: false,
data: ({
id: 0,
name: accountName
}),
success: function (res) {
if(res && res.code === 200) {
if(res.data && res.data.status) {
flag = res.data.status;
if (flag) {
$.messager.alert('提示', '结算账户名称已经存在', 'info');
return;
}
}
}
},
//此处添加错误处理
error: function () {
$.messager.alert('提示', '检查结算账户名称是否存在异常，请稍后再试！', 'error');
return;
}
});
}
return flag;
}
//保存结算账户
$("#saveAccount").off("click").on("click", function () {
if (checkAccountName()) {
return;
}
$.ajax({
url: '/account/add',
type: "post",
dataType: "json",
data: ({
info: JSON.stringify($("#accountFM").serializeObject())
}),
success: function(res) {
if(res && res.code === 200) {
$('#accountDlg').dialog('close');
initSystemData_account(); //刷新账户
}
},
//此处添加错误处理
error: function () {
$.messager.alert('提示', '保存结算账户异常，请稍后再试！', 'error');
return;
}
});
});
}
\ No newline at end of file
erp_web/js/pages/materials/in_out.js
View file @ 6a0e9ff2
......@@ -1042,7 +1042,8 @@
text:'新增商品',
iconCls:'icon-add',
handler:function() {
appendMaterial(); //新增商品
js.addTabPage(null, "商品信息", "/pages/materials/material.html");
// appendMaterial(); //新增商品
}
}
],
......@@ -1454,7 +1455,9 @@
supplierDlgFun("客户");
});
$("#addAccount").off("click").on("click",function(){
alert("增加结算账户");
$('#accountDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加结算账户');
$('#accountFM').form('clear');
bindAccountEvent();
});
url = '/depotHead/addDepotHeadAndDetail';
......@@ -2372,98 +2375,7 @@
});
}
//绑定供应商、客户事件
function bindSupplierEvent() {
if(listTitle === "采购入库列表" || listTitle === "其它入库列表" || listTitle === "采购订单列表"
|| listTitle === "零售出库列表"|| listTitle === "销售出库列表"|| listTitle === "销售订单列表"){
var supplierType = "供应商";
if(listTitle === "零售出库列表"){
supplierType = "会员";
}else if(listTitle === "销售出库列表" || listTitle === "销售订单列表"){
supplierType = "客户";
}
//检查单位名称是否存在 ++ 重名无法提示问题需要跟进
function checkSupplierName() {
var supplierName = $.trim($("#supplier").val());
var orgSupplier = "";
//表示是否存在 true == 存在 false = 不存在
var flag = false;
//开始ajax名称检验，不能重名
if(supplierName.length > 0 &&( orgSupplier.length ==0 || supplierName != orgSupplier))
{
$.ajax({
type:"get",
url: "/supplier/checkIsNameExist",
dataType: "json",
async : false,
data: ({
id : 0,
name : supplierName
}),
success: function (res) {
if(res && res.code === 200) {
if(res.data && res.data.status) {
flag = res.data.status;
if (flag) {
$.messager.alert('提示', '单位名称已经存在', 'info');
return;
}
}
}
},
//此处添加错误处理
error:function() {
$.messager.alert('提示','检查单位名称是否存在异常，请稍后再试！','error');
return;
}
});
}
return flag;
}
//保存供应商信息
$("#saveSupplier").off("click").on("click",function() {
if(validateForm("supplierFM")) {
return;
}
if(checkSupplierName()){
return;
}
var reg = /^([0-9])+$/;
var phonenum = $.trim($("#phonenum").val());
if(phonenum.length>0 && !reg.test(phonenum))
{
$.messager.alert('提示','电话号码只能是数字','info');
$("#phonenum").val("").focus();
return;
}
var beginNeedGet = $.trim($("#BeginNeedGet").val());
var beginNeedPay = $.trim($("#BeginNeedPay").val());
if(beginNeedGet && beginNeedPay) {
$.messager.alert('提示','期初应收和期初应付不能同时输入','info');
return;
}
var url = '/supplier/add';
var supObj = $("#supplierFM").serializeObject();
supObj.type = supplierType;
supObj.enabled = 1;
$.ajax({
url: url,
type:"post",
dataType: "json",
data:{
info: JSON.stringify(supObj)
},
success: function(res) {
if (res) {
$('#supplierDlg').dialog('close');
initSupplier(); //刷新供应商
}
}
});
});
}
}
//查询单据列表信息
function showDepotHeadDetails(pageNo,pageSize){
var materialParam = $.trim($("#searchMaterial").val());
......@@ -2699,76 +2611,11 @@
$('#depotDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加仓库信息');
$(".window-mask").css({width: webW, height: webH});
$('#depotFM').form('clear');
$("#depotFM #name").focus();
$("#selectType").val("principal");
oldDepot = "";
depotID = 0;
url = '/depot/add';
//检查名称是否存在 ++ 重名无法提示问题需要跟进
function checkDepotName() {
var name = $.trim($("#name").val());
//表示是否存在 true == 存在 false = 不存在
var flag = false;
//开始ajax名称检验，不能重名
if (name.length > 0 && (oldDepot.length == 0 || name != oldDepot)) {
$.ajax({
type: "get",
url: "/depot/checkIsNameExist",
dataType: "json",
async: false,
data: ({
id: depotID,
name: name
}),
success: function (res) {
if(res && res.code === 200) {
if(res.data && res.data.status) {
flag = res.data.status;
if (flag) {
$.messager.alert('提示', '仓库名称已经存在', 'info');
return;
}
}
}
},
//此处添加错误处理
error: function () {
$.messager.alert('提示', '检查仓库名称是否存在异常，请稍后再试！', 'error');
return;
}
});
}
return flag;
}
$("#saveDepot").off("click").on("click", function () {
var infoObj = $("#depotFM").serializeObject();
infoObj.type = 0;
if (checkDepotName()) {
return;
}
$.ajax({
url: url,
type: "post",
dataType: "json",
data: ({
info: JSON.stringify(infoObj)
}),
success: function(res) {
if(res && res.code === 200) {
$('#depotDlg').dialog('close');
}
},
//此处添加错误处理
error: function () {
$.messager.alert('提示', '保存仓库信息异常，请稍后再试！', 'error');
return;
}
});
});
bindDepotEvent();
}
//新增商品
function appendMaterial() {
alert("新增商品");
js.addTabPage(null, "商品信息", "/pages/materials/material.html");
}
//判断明细
function CheckData(type) {
......
erp_web/pages/materials/allocation_out_list.html
View file @ 6a0e9ff2
......@@ -17,6 +17,7 @@
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/materials/allocation_out_list.js"></script>
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>
......@@ -133,5 +134,6 @@
<a href="javascript:void(0)" id="cancelDepotHeadShow" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#depotHeadDlgShow').dialog('close')">取消</a>
</div>
<div id="depot"></div>
</body>
</html>
\ No newline at end of file
erp_web/pages/materials/assemble_list.html
View file @ 6a0e9ff2
......@@ -17,6 +17,7 @@
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/materials/assemble_list.js"></script>
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>
......@@ -132,5 +133,6 @@
<a href="javascript:void(0)" id="cancelDepotHeadShow" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#depotHeadDlgShow').dialog('close')">取消</a>
</div>
<div id="depot"></div>
</body>
</html>
\ No newline at end of file
erp_web/pages/materials/disassemble_list.html
View file @ 6a0e9ff2
......@@ -138,5 +138,6 @@
<a href="javascript:void(0)" id="cancelDepotHeadShow" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#depotHeadDlgShow').dialog('close')">取消</a>
</div>
<div id="depot"></div>
</body>
</html>
\ No newline at end of file
erp_web/pages/materials/other_in_list.html
View file @ 6a0e9ff2
......@@ -17,6 +17,7 @@
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/materials/other_in_list.js"></script>
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>
......@@ -144,5 +145,6 @@
onclick="javascript:$('#depotHeadDlgShow').dialog('close')">取消</a>
</div>
<div id="supplier"></div>
<div id="depot"></div>
</body>
</html>
erp_web/pages/materials/other_out_list.html
View file @ 6a0e9ff2
......@@ -17,6 +17,7 @@
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/materials/other_out_list.js"></script>
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>
......@@ -137,5 +138,6 @@
<a href="javascript:void(0)" id="cancelDepotHeadShow" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#depotHeadDlgShow').dialog('close')">取消</a>
</div>
<div id="depot"></div>
</body>
</html>
\ No newline at end of file
erp_web/pages/materials/purchase_back_list.html
View file @ 6a0e9ff2
......@@ -17,6 +17,7 @@
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/materials/purchase_back_list.js"></script>
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>
......@@ -53,7 +54,7 @@
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="depotHeadFM" method="post" novalidate>
<table>
......@@ -140,7 +141,7 @@
<a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
</div>
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
......@@ -269,5 +270,6 @@
<a href="javascript:void(0)" id="saveOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
</div>
<div id="depot"></div>
</body>
</html>
erp_web/pages/materials/purchase_in_list.html
View file @ 6a0e9ff2
......@@ -17,6 +17,7 @@
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/materials/purchase_in_list.js"></script>
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>
......@@ -53,7 +54,7 @@
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="depotHeadFM" method="post" novalidate>
<table>
......@@ -155,7 +156,7 @@
<a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
</div>
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
......@@ -287,5 +288,6 @@
</div>
<div id="supplier"></div>
<div id="depot"></div>
<div id="account"></div>
</body>
</html>
erp_web/pages/materials/purchase_orders_list.html
View file @ 6a0e9ff2
......@@ -198,5 +198,6 @@
<a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
</div>
<div id="supplier"></div>
<div id="depot"></div>
</body>
</html>
erp_web/pages/materials/retail_back_list.html
View file @ 6a0e9ff2
......@@ -17,6 +17,7 @@
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/materials/retail_back_list.js"></script>
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>
......@@ -209,5 +210,6 @@
<a href="javascript:void(0)" id="cancelDepotHeadShow" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#depotHeadDlgShow').dialog('close')">取消</a>
</div>
<div id="depot"></div>
</body>
</html>
\ No newline at end of file
erp_web/pages/materials/retail_out_list.html
View file @ 6a0e9ff2
......@@ -17,6 +17,7 @@
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/materials/retail_out_list.js"></script>
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>
......@@ -247,5 +248,6 @@
<a href="javascript:void(0)" id="cancelDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
</div>
<div id="supplier"></div>
<div id="depot"></div>
</body>
</html>
erp_web/pages/materials/sale_back_list.html
View file @ 6a0e9ff2
......@@ -17,6 +17,7 @@
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/materials/sale_back_list.js"></script>
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>
......@@ -53,7 +54,7 @@
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="depotHeadFM" method="post" novalidate>
<table>
......@@ -139,7 +140,7 @@
<a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
</div>
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
......@@ -269,5 +270,6 @@
<a href="javascript:void(0)" id="saveOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
</div>
<div id="depot"></div>
</body>
</html>
\ No newline at end of file
erp_web/pages/materials/sale_orders_list.html
View file @ 6a0e9ff2
......@@ -200,5 +200,6 @@
<a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
</div>
<div id="supplier"></div>
<div id="depot"></div>
</body>
</html>
erp_web/pages/materials/sale_out_list.html
View file @ 6a0e9ff2
......@@ -17,6 +17,7 @@
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/materials/sale_out_list.js"></script>
<script src="/js/common/jsherp.js"></script>
<script src="/js/pages/materials/add_temp.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
</head>
......@@ -53,7 +54,7 @@
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div>
<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="depotHeadFM" method="post" novalidate>
<table>
......@@ -120,7 +121,13 @@
<tr>
<td>结算账户：</td>
<td style="padding:5px">
<select name="AccountId" id="AccountId" style="width:120px;"></select>
<div class="account-list">
<select name="AccountId" id="AccountId" style="width:110px;"></select>
</div>
<div class="add-account-btn">
<img id="addAccount" src="/js/easyui-1.3.5/themes/icons/edit_add.png"
style="cursor: pointer;" alt="增加结算账户" title="增加结算账户"/>
</div>
<img class="many-account-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"
style="display: none;"/>
</td>
......@@ -147,7 +154,7 @@
<a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
</div>
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:40px"
closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
......@@ -280,5 +287,7 @@
<a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
</div>
<div id="supplier"></div>
<div id="depot"></div>
<div id="account"></div>
</body>
</html>
erp_web/pages/template/base.html
View file @ 6a0e9ff2
......@@ -141,4 +141,36 @@
<a href="javascript:void(0)" id="saveDepot">保存</a>
<a href="javascript:void(0)" id="cancelDepot" onclick="javascript:$('#depotDlg').dialog('close')">取消</a>
</div>
{{/if}}
{{#if accountSelect}}
<div id="accountDlg" style="width:380px;padding:10px 20px" buttons="#accountDlgBtn">
<form id="accountFM">
<table>
<tr>
<td>名称</td>
<td style="padding:5px">
<input name="name" id="name" style="width: 230px;height: 20px"/>
</td>
</tr>
<tr>
<td>编号</td>
<td style="padding:5px">
<input name="serialNo" id="serialNo" style="width: 230px;height: 20px"/>
</td>
</tr>
<tr>
<td>期初金额</td>
<td style="padding:5px">
<input name="initialAmount" id="initialAmount" style="width: 230px;height: 20px"></input>
</td>
</tr>
</table>
</form>
</div>
<div id="accountDlgBtn">
<a href="javascript:void(0)" id="saveAccount" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelAccount" iconCls="icon-cancel"
onclick="javascript:$('#accountDlg').dialog('close')">取消</a>
</div>
{{/if}}
\ No newline at end of file
erp_web/register.html
View file @ 6a0e9ff2
......@@ -48,9 +48,9 @@
</div>
<div class="register-box-body">
<div class="form-group has-feedback">
<span class="glyphicon glyphicon-user form-control-feedback" title="登录账号"></span>
<span class="glyphicon glyphicon-user form-control-feedback" title="登录账户"></span>
<input type="text" id="username" name="username" class="form-control required"
data-msg-required="请填写登录账号." placeholder="登录账号"/>
data-msg-required="请填写登录账号." placeholder="登录账户(请输入手机号码）"/>
</div>
<div class="form-group has-feedback">
<span class="glyphicon glyphicon-lock form-control-feedback"
......@@ -127,10 +127,13 @@
if($("#validCode").val()) {
var res = verifyCode.validate($("#validCode").val());
if(res){
if(!$("#username").val()) {
alert("用户名不能为空!");
var userName = $("#username");
if(!userName.val()) {
alert("登录账户不能为空!");
} else if(!isPhoneAvailable(userName)) {
alert("请输入正确的手机号码!");
} else if(!$("#password").val()) {
alert("密码不能为空!");
alert("登录密码不能为空!");
} else if(!$("#confirmPassword").val()) {
alert("确认密码不能为空!");
} else if($("#password").val()!=$("#confirmPassword").val()) {
......
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