From 4ac640c59a8fa0b48ae936a35cd448ccb2335950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Fri, 23 Oct 2020 00:03:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=94=80=E5=94=AE=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=8D=AE=EF=BC=8C=E6=94=B9=E4=B8=BA=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=85=B3=E8=81=94=E5=8D=95=E6=8D=AE=E7=9A=84=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp_web/css/bill_detail.css | 6 + erp_web/css/common.css | 6 + erp_web/js/pages/bill/bill_detail.js | 23 +++- erp_web/pages/bill/bill_detail.html | 72 +++++++++++ erp_web/pages/bill/purchase_in_list.html | 38 ++++-- erp_web/pages/bill/purchase_orders_list.html | 2 +- erp_web/pages/bill/sale_orders_list.html | 5 +- erp_web/pages/bill/sale_out_list.html | 123 ++++++++++++++++++- 8 files changed, 258 insertions(+), 17 deletions(-) diff --git a/erp_web/css/bill_detail.css b/erp_web/css/bill_detail.css index daf5c8b4..76bdba6c 100644 --- a/erp_web/css/bill_detail.css +++ b/erp_web/css/bill_detail.css @@ -7,12 +7,18 @@ #bill .retail_back{ display: none; } +#bill .purchase_orders{ + display: none; +} #bill .purchase_in{ display: none; } #bill .purchase_back{ display: none; } +#bill .sale_orders{ + display: none; +} #bill .sale_out{ display: none; } diff --git a/erp_web/css/common.css b/erp_web/css/common.css index 39d98f14..cb79a728 100644 --- a/erp_web/css/common.css +++ b/erp_web/css/common.css @@ -54,4 +54,10 @@ color:blue; text-decoration:underline; cursor:pointer; +} + +#depotHeadDlgShow .n-link{ + color:blue; + text-decoration:underline; + cursor:pointer; } \ No newline at end of file diff --git a/erp_web/js/pages/bill/bill_detail.js b/erp_web/js/pages/bill/bill_detail.js index c28e677c..6ff31b78 100644 --- a/erp_web/js/pages/bill/bill_detail.js +++ b/erp_web/js/pages/bill/bill_detail.js @@ -95,7 +95,12 @@ if(listSubType) { listSubType = decodeURI(listSubType); } - if(listSubType == "采购入库") { + if(listSubType == "采购订单") { + billType = "material"; + $("#bill .purchase_orders").show(); + tableString = $(".purchase_orders").html(); + } + else if(listSubType == "采购入库") { billType = "material"; $("#bill .purchase_in").show(); tableString = $(".purchase_in").html(); @@ -105,6 +110,11 @@ $("#bill .purchase_back").show(); tableString = $(".purchase_back").html(); } + else if(listSubType == "销售订单") { + billType = "material"; + $("#bill .sale_orders").show(); + tableString = $(".sale_orders").html(); + } else if(listSubType == "销售出库") { billType = "material"; $("#bill .sale_out").show(); @@ -361,12 +371,18 @@ //打印table $("#print_bill_detail").off("click").on("click",function(){ var tableString = "";//打印table - if(listSubType == "采购入库") { + if(listSubType == "采购订单") { + tableString = $(".purchase_orders").html(); + } + else if(listSubType == "采购入库") { tableString = $(".purchase_in").html(); } else if(listSubType == "采购退货出库") { tableString = $(".purchase_back").html(); } + else if(listSubType == "销售订单") { + tableString = $(".sale_orders").html(); + } else if(listSubType == "销售出库") { tableString = $(".sale_out").html(); } @@ -426,7 +442,8 @@ depotHeadName = "仓库名称"; } var isShowTaxColumn = false; //是否显示税率相关的列,true为隐藏,false为显示 - if(listSubType == "调拨出库" || listSubType == "其它出库" || listSubType == "其它入库" || + if(listSubType == "采购订单" || listSubType == "销售订单" || listSubType == "调拨出库" || + listSubType == "其它出库" || listSubType == "其它入库" || listSubType == "零售出库" || listSubType == "零售退货入库" || listSubType == "盘点复盘"){ isShowTaxColumn = true; //隐藏 } diff --git a/erp_web/pages/bill/bill_detail.html b/erp_web/pages/bill/bill_detail.html index 46add577..3e46f8d7 100644 --- a/erp_web/pages/bill/bill_detail.html +++ b/erp_web/pages/bill/bill_detail.html @@ -159,6 +159,41 @@ + +
+ + + + + + + + + + + + + + + + + + + +
供应商： + + 单据日期： + + 单据编号： + +
+ +
+
单据备注： + +
+
@@ -306,6 +341,43 @@
+ +
+ + + + + + + + + + + + + + + + + + + +
客户： + + 单据日期： + + 单据编号： + + 销售人员： + +
+ +
+
单据备注： + +
+
diff --git a/erp_web/pages/bill/purchase_in_list.html b/erp_web/pages/bill/purchase_in_list.html index 265b2bba..b4c8a931 100644 --- a/erp_web/pages/bill/purchase_in_list.html +++ b/erp_web/pages/bill/purchase_in_list.html @@ -381,7 +381,7 @@ }, { title: '供应商名称', field: 'organName',width:120}, { title: '单据编号',field: 'number',width:155, formatter:function (value,rec) { - if(rec.linknumber) { + if(rec.linkNumber) { return value + "[转]"; } else { return value; @@ -459,12 +459,13 @@ onClickButton:function(){ $('#linkBillDlg').dialog('open').dialog('setTitle', ' 选择关联单据'); $("#linkBillDlg").panel("move",{top:$(document).scrollTop() + ($(window).height()-400) * 0.5}); - initLinkBillTableData(); + initLinkBillTableData(1,initPageSize); + initLinkBillPager(); } }); url = '/depotHead/addDepotHeadAndDetail'; } - function initLinkBillTableData() { + function initLinkBillTableData(pageNo,pageSize) { $('#linkBillData').datagrid({ height:300, rownumbers: false, @@ -476,7 +477,7 @@ pagination: true, //交替出现背景 striped : true, - pageSize: 10, + pageSize: 2, pageList: initPageNum, columns:[[ { field: 'id',width:35,align:"center",checkbox:true}, @@ -513,8 +514,8 @@ materialParam: "", depotIds: depotString }), - currentPage: 1, - pageSize: initPageSize + currentPage: pageNo, + pageSize: pageSize }), success: function (res) { if(res && res.code === 200){ @@ -540,6 +541,26 @@ } }); } + function initLinkBillPager() { + try { + var opts = $("#linkBillData").datagrid('options'); + var pager = $("#linkBillData").datagrid('getPager'); + pager.pagination({ + onSelectPage:function(pageNum, pageSize) { + opts.pageNumber = pageNum; + opts.pageSize = pageSize; + pager.pagination('refresh', { + pageNumber:pageNum, + pageSize:pageSize + }); + initLinkBillTableData(pageNum,pageSize); + } + }); + } + catch (e) { + $.messager.alert('异常处理提示',"分页信息异常 : " + e.name + ": " + e.message,'error'); + } + } //编辑信息 function editDepotHead(index) { var res = $("#tableData").datagrid("getRows")[index]; @@ -634,7 +655,10 @@ } $("#DebtShow").text(debt); $("#AccountDayShow").text(res.accountDay); //结算天数 - $("#LinkNumberShow").text(res.linkNumber); //关联订单号 + //关联订单号 + $("#LinkNumberShow").text(res.linkNumber).addClass("n-link").off("click").on("click",function () { + turnBillDetailPage(res.linkNumber, "采购订单"); + }); var otherMoney = res.otherMoney?res.otherMoney:0; if(otherMoney!=0 && res.otherMoneyList && res.otherMoneyItem){ var itemArr = res.otherMoneyList.split(","); //支出项目id列表 diff --git a/erp_web/pages/bill/purchase_orders_list.html b/erp_web/pages/bill/purchase_orders_list.html index 857c3e0f..9bd2e6e0 100644 --- a/erp_web/pages/bill/purchase_orders_list.html +++ b/erp_web/pages/bill/purchase_orders_list.html @@ -305,7 +305,7 @@ }, { title: '供应商名称', field: 'organName',width:120}, { title: '单据编号',field: 'number',width:155, formatter:function (value,rec) { - if(rec.linknumber) { + if(rec.linkNumber) { return value + "[转]"; } else { return value; diff --git a/erp_web/pages/bill/sale_orders_list.html b/erp_web/pages/bill/sale_orders_list.html index a1195c0c..86e6360f 100644 --- a/erp_web/pages/bill/sale_orders_list.html +++ b/erp_web/pages/bill/sale_orders_list.html @@ -293,7 +293,7 @@ pageList: initPageNum, columns:[[ { field: 'id',width:35,align:"center",checkbox:true}, - { title: '操作',field: 'op',align:"center", width:120, + { title: '操作',field: 'op',align:"center", width:90, formatter:function(value,rec,index) { var str = ''; var orgId = rec.organId? rec.organId:0; @@ -302,13 +302,12 @@ str += '   '; str += ''; } - str += '   '; return str; } }, { title: '客户名称', field: 'organName',width:120}, { title: '单据编号',field: 'number',width:155, formatter:function (value,rec) { - if(rec.linknumber) { + if(rec.linkNumber) { return value + "[转]"; } else { return value; diff --git a/erp_web/pages/bill/sale_out_list.html b/erp_web/pages/bill/sale_out_list.html index f1168ba2..efd0942e 100644 --- a/erp_web/pages/bill/sale_out_list.html +++ b/erp_web/pages/bill/sale_out_list.html @@ -82,7 +82,7 @@ 关联订单 - + @@ -288,6 +288,15 @@ 保存 取消
+
+
+
+
+ 选择 + 取消 +
@@ -374,7 +383,7 @@ }, { title: '客户名称', field: 'organName',width:120}, { title: '单据编号',field: 'number',width:155, formatter:function (value,rec) { - if(rec.linknumber) { + if(rec.linkNumber) { return value + "[转]"; } else { return value; @@ -457,8 +466,113 @@ $('#accountFM').form('clear'); bindAccountEvent(); }); + //关联订单的选择事件 + $('#LinkNumber').textbox({ + onClickButton:function(){ + $('#linkBillDlg').dialog('open').dialog('setTitle', ' 选择关联单据'); + $("#linkBillDlg").panel("move",{top:$(document).scrollTop() + ($(window).height()-400) * 0.5}); + initLinkBillTableData(1,initPageSize); + initLinkBillPager(); + } + }); url = '/depotHead/addDepotHeadAndDetail'; } + function initLinkBillTableData(pageNo,pageSize) { + $('#linkBillData').datagrid({ + height:300, + rownumbers: false, + //动画效果 + animate:false, + //选中单行 + singleSelect: true, + collapsible: false, + pagination: true, + //交替出现背景 + striped : true, + pageSize: 10, + pageList: initPageNum, + columns:[[ + { field: 'id',width:35,align:"center",checkbox:true}, + { title: '供应商名称', field: 'organName',width:120}, + { title: '单据编号',field: 'number',width:155}, + { title: '商品信息',field: 'materialsList',width:200,formatter:function(value){ + if(value) { + return value.replace(",","，"); + } + } + }, + { title: '单据日期',field: 'operTimeStr',width:145}, + { title: '操作员',field: 'userName',width:60}, + { title: '金额合计',field: 'totalPrice',width:70} + ]], + onLoadError:function() { + $.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error'); + return; + } + }); + $.ajax({ + type: "get", + url: "/depotHead/list", + dataType: "json", + data: ({ + search: JSON.stringify({ + type: "其它", + subType: "销售订单", + roleType: roleType, + status: "1", + number: "", + beginTime: "", + endTime: "", + materialParam: "", + depotIds: depotString + }), + currentPage: 1, + pageSize: initPageSize + }), + success: function (res) { + if(res && res.code === 200){ + if(res.data && res.data.page) { + $("#linkBillData").datagrid('loadData', res.data.page); + $("#saveLinkBill").off("click").on("click", function(){ + var res = $('#linkBillData').datagrid('getChecked')[0]; + $('#OrganId').combobox('setValue', res.organId); + $("#LinkNumber").textbox("setValue",res.number); //关联订单号 + $("#DiscountLastMoney").val(res.totalPrice); //优惠后金额 + $("#ChangeAmount").val(res.totalPrice).attr("data-changeamount", res.totalPrice); + depotHeadID = res.id; + initTableData_material("edit",res.totalPrice); //商品列表 + $('#linkBillDlg').dialog('close'); + }); + } + } + }, + //此处添加错误处理 + error: function () { + $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error'); + return; + } + }); + } + function initLinkBillPager() { + try { + var opts = $("#linkBillData").datagrid('options'); + var pager = $("#linkBillData").datagrid('getPager'); + pager.pagination({ + onSelectPage:function(pageNum, pageSize) { + opts.pageNumber = pageNum; + opts.pageSize = pageSize; + pager.pagination('refresh', { + pageNumber:pageNum, + pageSize:pageSize + }); + initLinkBillTableData(pageNum,pageSize); + } + }); + } + catch (e) { + $.messager.alert('异常处理提示',"分页信息异常 : " + e.name + ": " + e.message,'error'); + } + } //编辑信息 function editDepotHead(index) { var res = $("#tableData").datagrid("getRows")[index]; @@ -579,7 +693,10 @@ } $("#DebtShow").text(debt); $("#AccountDayShow").text(res.accountDay); //结算天数 - $("#LinkNumberShow").text(res.linkNumber); //关联订单号 + //关联订单号 + $("#LinkNumberShow").text(res.linkNumber).addClass("n-link").off("click").on("click",function () { + turnBillDetailPage(res.linkNumber, "销售订单"); + }); var otherMoney = res.otherMoney?res.otherMoney:0; if(otherMoney!=0 && res.otherMoneyList && res.otherMoneyItem){ var itemArr = res.otherMoneyList.split(","); //支出项目id列表