From 426f307e9671ae076d99f0a7b9227fc4a6d60fda Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期二, 23 三月 2021 10:36:38 +0800
Subject: [PATCH] 1.0.3 erp出库-发货通知功能完成
---
src/main/webapp/static/js/pakStore/outStock.js | 61 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/outStock.js b/src/main/webapp/static/js/pakStore/outStock.js
index 556ff58..0725dfd 100644
--- a/src/main/webapp/static/js/pakStore/outStock.js
+++ b/src/main/webapp/static/js/pakStore/outStock.js
@@ -1,11 +1,13 @@
var pageCurr;
var tableMerge;
+var orderData;
+var outStockDetail;
function getCol() {
var cols = [];
cols.push(
{field: 'fbillNo', merge: true, align: 'center', title: '鍗曟嵁缂栧彿'}
- , {field: 'fadd', align: 'center', title: '鍦板潃'}
+ , {field: 'fnumber', align: 'center', title: '鐗╂枡缂栧彿'}
, {field: 'fentryID', align: 'center', title: '鍒嗗綍鍙�'}
, {field: 'forderInterID', align: 'center', title: '閿�鍞鍗曞崟鍙�'}
, {field: 'fauxQty', align: 'center', title: '鏁伴噺'}
@@ -13,7 +15,8 @@
, {field: 'fauxPrice', align: 'center', title: '鍗曚环'}
, {field: 'fdate', align: 'center', title: '鏃ユ湡'}
, {field: 'fnote', align: 'center', title: '澶囨敞'}
- , {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 80}
+ , {field: 'fadd', align: 'center', title: '鍦板潃'}
+ , {fixed: 'right', merge: ['fbillNo'], title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 80}
);
return cols;
}
@@ -25,13 +28,13 @@
var layDate = layui.laydate;
var form = layui.form;
var upload = layui.upload;
- tableMerge = layui.tableMerge
+ tableMerge = layui.tableMerge;
// 鏁版嵁娓叉煋
tableIns = table.render({
elem: '#salesOrder',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/outStock/query/list',
+ url: baseUrl + '/outStock/query/list',
page: true,
limit: 16,
limits: [16, 50, 100, 200, 500],
@@ -54,12 +57,12 @@
response: {
statusCode: 200
},
- done: function(res, curr, count) {
+ done: function (res, curr, count) {
if (res.code === 403) {
- top.location.href = baseUrl+"/";
+ top.location.href = baseUrl + "/";
}
- pageCurr=curr;
- tableMerge.render(this)
+ pageCurr = curr;
+ layui.tableMerge.render(this);
}
});
@@ -83,7 +86,33 @@
, type: 'datetime'
, range: true
});
+
+ table.on('tool(salesOrder)', function (obj) {
+ var data = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
+ var layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫�硷紙涔熷彲浠ユ槸琛ㄥご鐨� event 鍙傛暟瀵瑰簲鐨勫�硷級
+ orderData = data;
+ // 濡傛灉鏄偣鍑绘搷浣滄寜閽�
+ if (layEvent == 'btnOut') {
+ outStockDetail = layer.open(
+ {
+ type: 2,
+ title: '閫夋嫨鍑哄簱-鍗曟嵁缂栧彿[' + orderData.fbillNo + ']',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: 'outStockDetail.html',
+ success: function (layero, index) {
+
+ }
+ }
+ );
+ }
+ });
});
+
+function getOrderData() {
+ return orderData;
+}
/* 琛ㄦ牸鏁版嵁閲嶈浇 */
function tableReload(child) {
@@ -102,21 +131,17 @@
top.location.href = baseUrl + "/";
}
pageCurr = curr;
- if (res.data.length === 0 && count !== 0) {
- tableIns.reload({
- where: searchData,
- page: {
- curr: pageCurr - 1
- }
- });
- pageCurr -= 1;
- }
- limit(child);
tableMerge.render(this);
}
});
}
+/* 鍏抽棴鏄庣粏 */
+function closeDetail(msg) {
+ layer.close(outStockDetail);
+ layer.msg(msg);
+}
+
/* 鐩戝惉鍥炶溅浜嬩欢 */
$('body').keydown(function () {
if (event.keyCode === 13) {
--
Gitblit v1.9.1