From aefcad6d44077e465b995bb25322247b51a4d332 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 19 三月 2024 16:15:20 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/out.js | 77 +++++++++++++++++++++++++++++---------
1 files changed, 59 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 9829cbb..1ec550c 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -4,7 +4,7 @@
base: baseUrl + "/static/layui/lay/modules/"
}).extend({
notice: 'notice/notice',
-}).use(['table','laydate', 'form', 'util', 'admin', 'notice', 'treeTable', 'xmSelect', 'tableMerge'], function(){
+}).use(['table','laydate', 'form', 'util', 'admin', 'notice', 'treeTable', 'xmSelect', 'tableMerge', 'tableX'], function(){
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
@@ -16,6 +16,7 @@
var treeTable = layui.treeTable;
var xmSelect = layui.xmSelect;
var tableMerge = layui.tableMerge;
+ var tableX = layui.tableX;
insTb2 = table.render({
elem: '#orderDetlTable',
@@ -26,19 +27,20 @@
limits: [15, 30, 50, 100, 200, 500],
toolbar: '#orderDetToolbar',
height: 'full-120',
+ where: {order_id: 9999999999},
cols: [[
{type: 'checkbox'}
,{type: 'numbers', title: '#'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
+ ,{field: 'matnr', align: 'center',title: '瑙勬牸', width: 160}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'batch', align: 'center',title: '绠卞彿'}
+ ,{field: 'specs', align: 'center',title: '鎺ュご'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
// ,{field: 'name', align: 'center',title: '鍚嶇О'}
- // ,{field: 'model', align: 'center',title: '鍨嬪彿'}
+ ,{field: 'model', align: 'center',title: '鍗峰彿', hide: false}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜', hide: true}
// ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
@@ -77,6 +79,7 @@
limit();
}
});
+
/* 琛ㄦ牸2鎼滅储 */
form.on('submit(sensorTbSearch)', function (data) {
insTb2.reload({where: data.field, page: {curr: 1}});
@@ -85,6 +88,7 @@
/* 琛ㄦ牸2澶村伐鍏锋爮鐐瑰嚮浜嬩欢 */
table.on('toolbar(orderDetlTable)', function (obj) {
+
var checkStatus = table.checkStatus(obj.config.id).data;
if (obj.event === 'pakoutPreview') { // 娣诲姞
if (checkStatus.length === 0) {
@@ -109,6 +113,7 @@
/* 琛ㄦ牸2宸ュ叿鏉＄偣鍑讳簨浠� */
table.on('tool(orderDetlTable)', function (obj) {
+ console.log(obj);
var data = obj.data;
switch (obj.event) {
// 鍑哄簱
@@ -135,7 +140,7 @@
,title: false
,closeBtn: false
,offset: '50px'
- ,area: ['1200px', '700px']
+ ,area: ['1500px', '700px']
,shade: 0.5
,shadeClose: false
,btn: ['绔嬪嵆鍑哄簱', '绋嶅悗澶勭悊']
@@ -154,11 +159,17 @@
// {type: 'checkbox', merge: ['orderNo']},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
- {field: 'batch', title: '搴忓垪鐮�', align: 'center'},
+ {field: 'batch', title: '绠卞彿', align: 'center'},
+ {field: 'model', title: '鍗峰彿', align: 'center', hide: false},
+ {field: 'specs', title: '鎺ュご', align: 'center'},
+ {field: 'brand', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true},
+ {field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false},
+ {field: 'zpallet', title: '鎵樼洏鐮�', align: 'center'},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
+ {field: 'count', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
- {field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
- {type: 'checkbox', merge: ['locNo']},
+ // {field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
+ // {type: 'checkbox', merge: ['locNo']},
]],
done: function (res) {
tableMerge.render(this);
@@ -192,15 +203,22 @@
// 鍑哄簱绔欏彇浜ら泦
let staBatchSelectVal = [];
for(let i = 0; i<stoPreTabData.length; i++) {
- if (i === 0) {
- staBatchSelectVal = stoPreTabData[i].staNos;
- } else {
- let staNos = stoPreTabData[i].staNos;
- staBatchSelectVal = staBatchSelectVal.filter( val => {
- return new Set(staNos).has(val)
- }
- )
+ let staNos = stoPreTabData[i].staNos;
+ if (staNos !== null) {
+ if (staBatchSelectVal.length === 0) {
+ staBatchSelectVal = staNos;
+ } else {
+ staBatchSelectVal = staBatchSelectVal.filter(val =>
+ {
+ return new Set(staNos).has(val)
+ }
+ )
+ }
}
+ }
+ if (staBatchSelectVal.length === 0) {
+ layer.msg("鍑哄簱绔欐病鏈変氦闆嗭紝鏃犳硶鎵归噺淇敼", {icon: 2});
+ return;
}
admin.open({
type: 1,
@@ -228,7 +246,6 @@
}
}
stoPreTabIdx.reload({data: tableCache});
- console.log(arr)
arr.forEach(item => {
$('div[lay-id=stoPreTab] tr[data-index="' + item + '"] .order-sta-select').val(batchSta);
});
@@ -332,6 +349,8 @@
})
})
+ window.pakoutPreview = pakoutPreview;
+
});
function tableReload(child) {
@@ -347,3 +366,25 @@
});
}
+/**
+ * 涓�閿嚭搴�
+ */
+function autoOut(orderId) {
+ let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
+ $.ajax({
+ url: baseUrl + "/out/pakout/orderDetlIds/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: { orderId : orderId },
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ pakoutPreview(res.data);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+}
--
Gitblit v1.9.1