From ed72baa5f60f2d86cc58799ce96c658321a54d79 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 30 四月 2021 13:53:54 +0800
Subject: [PATCH] 1.erp立库出库对接 2.erp平仓出库对接
---
src/main/webapp/static/js/pakStore/outStock.js | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/outStock.js b/src/main/webapp/static/js/pakStore/outStock.js
index 50fc770..2e70dac 100644
--- a/src/main/webapp/static/js/pakStore/outStock.js
+++ b/src/main/webapp/static/js/pakStore/outStock.js
@@ -7,16 +7,19 @@
var cols = [];
cols.push(
{field: 'fbillNo', merge: true, align: 'center', title: '鍗曟嵁缂栧彿'}
+ , {field: 'fsourceBillNo', align: 'center', title: '璁㈠崟鍗曞彿' }
, {field: 'fnumber', align: 'center', title: '鐗╂枡缂栧彿'}
+ , {field: 'fname', align: 'center', title: '鐗╂枡鍚嶇О'}
+ , {field: 'fmodel', align: 'center', title: '瑙勬牸'}
, {field: 'fentryID', align: 'center', title: '鍒嗗綍鍙�'}
- , {field: 'forderInterID', align: 'center', title: '閿�鍞鍗曞崟鍙�'}
+ , {field: 'forderInterID', align: 'center', title: '鍗曟嵁缂栧彿', hide: true}
, {field: 'fauxQty', align: 'center', title: '鏁伴噺'}
, {field: 'fcommitQty', align: 'center', title: '鍙戣揣鏁伴噺'}
, {field: 'fauxPrice', align: 'center', title: '鍗曚环'}
- , {field: 'fdate', align: 'center', title: '鏃ユ湡'}
- , {field: 'fnote', align: 'center', title: '澶囨敞'}
- , {field: 'fadd', align: 'center', title: '鍦板潃'}
- , {merge: ['fbillNo'], title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 80}
+ , {field: 'fdate', align: 'center', title: '鏃ユ湡', hide: true}
+ , {field: 'fnote', align: 'center', title: '澶囨敞', hide: true}
+ , {field: 'fadd', align: 'center', title: '鍦板潃', hide: true}
+ , {merge: ['fbillNo'], title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 140}
);
return cols;
}
@@ -96,7 +99,7 @@
outStockDetail = layer.open(
{
type: 2,
- title: '閫夋嫨鍑哄簱-鍗曟嵁缂栧彿[' + orderData.fbillNo + ']',
+ title: '绔嬪簱鍑哄簱-鍗曟嵁缂栧彿[' + orderData.fbillNo + ']',
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: false,
@@ -107,6 +110,21 @@
}
);
}
+ if (layEvent == 'btnNormalOut') {
+ outStockDetail = layer.open(
+ {
+ type: 2,
+ title: '骞充粨鍑哄簱-鍗曟嵁缂栧彿[' + orderData.fbillNo + ']',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: 'outStockNormalDetail.html',
+ success: function (layero, index) {
+
+ }
+ }
+ );
+ }
});
});
--
Gitblit v1.9.1