From 0838262e15ed86d6d58485250e19622efd7607e9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 02 四月 2021 11:10:05 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/custOrder/custOrder.js | 50 +++++++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index 932e1f0..131ae19 100644
--- a/src/main/webapp/static/js/custOrder/custOrder.js
+++ b/src/main/webapp/static/js/custOrder/custOrder.js
@@ -16,13 +16,14 @@
}
layui.config({
base: baseUrl + "/static/layui/lay/modules/" // 閰嶇疆妯″潡鎵�鍦ㄧ殑鐩綍
-}).use(['table', 'laydate', 'form', 'tableX'], function(){
+}).use(['table', 'laydate', 'form', 'tableX', 'tableMerge'], function(){
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
var tableX = layui.tableX;
+ var tableMerge = layui.tableMerge;
// 鏁版嵁娓叉煋
tableIns = table.render({
@@ -38,7 +39,7 @@
cols: [[
{type: 'checkbox'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
- ,{field: 'number', align: 'center',title: '閿�鍞崟鍙�'}
+ ,{field: 'number', align: 'center',title: '鍗曞彿'}
,{field: 'btypeId', align: 'center',title: '瀹㈡埛缂栧彿'}
,{field: 'etypeId', align: 'center',title: '缁忔墜浜虹紪鍙�', hide: true}
@@ -206,7 +207,7 @@
,closeBtn: false
,offset: '100px'
// ,area: ['800px','450px']
- ,area: '800px'
+ ,area: '1000px'
,shade: 0.5
,shadeClose: true
,id: 'LAY_layuipro'
@@ -223,16 +224,18 @@
// ,width: admin.screen() > 1 ? 892 : ''
height: 432,
cols: [[
- {field: 'title', title: '鍟嗗搧', align: 'center'},
- {field: 'anfme', title: '鎬绘暟閲�', align: 'center', style: 'font-weight: bold', width: 80},
+ {field: 'title', title: '鍟嗗搧', merge: true, align: 'center'},
+ {field: 'anfme', title: '鎬绘暟閲�', merge: ['title'], align: 'center', style: 'font-weight: bold', width: 90},
+ {field: 'type', title: '浠撳簱', merge: true, align: 'center', templet: '#typeTpl', width: 90},
{field: 'locNo', title: '璐т綅', align: 'center'},
{field: 'prior$', title: '鎺ㄨ崘璐т綅', align: 'center', width: 100},
- {field: 'reduce', title: '鏁伴噺', align: 'center', width: 80, style: 'font-weight: bold'},
+ {field: 'reduce', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
// {field: 'remQty', title: '浣欓噺', align: 'center', width: 80},
- {field: 'total', title: '鎬婚噺', align: 'center', width: 80},
+ {field: 'total', title: '鎬婚噺', align: 'center', width: 90},
]],
done: function () {
- tableX.merges('stoPreTab', [0,1]);
+ tableMerge.render(this);
+ // tableX.merges('stoPreTab', [0,1,2]);
$('.layui-table-body.layui-table-main').css("overflow", "auto")
}
});
@@ -249,23 +252,24 @@
});
// 缂烘枡
} else if (res.code === 20001) {
- layer.confirm(res.msg, {
- shadeClose: true
- , area: ['400px']
- , btn: ['搴撳瓨璋冩嫧', '鍙栨秷']
- }, function() {
- // 搴撳瓨璋冩嫧
- stockTransfer(data.number);
- layer.closeAll();
- }, function() {
- // printPakouts(data.number);
- layer.closeAll();
- }
- )
+ // layer.confirm(res.msg, {
+ // shadeClose: true
+ // , area: ['400px']
+ // , btn: ['搴撳瓨璋冩嫧', '鍙栨秷']
+ // }, function() {
+ // // 搴撳瓨璋冩嫧
+ // stockTransfer(data.number);
+ // layer.closeAll();
+ // }, function() {
+ // // printPakouts(data.number);
+ // layer.closeAll();
+ // }
+ // )
+ layer.msg(res.msg, {icon: 2})
} else if (res.code === 403){
top.location.href = baseUrl+"/";
} else {
- layer.msg(res.msg, {icon: 1})
+ layer.msg(res.msg, {icon: 2})
}
}
})
@@ -320,7 +324,7 @@
} else if (res.code === 403){
top.location.href = baseUrl+"/";
} else {
- layer.msg(res.msg)
+ layer.msg(res.msg, {icon: 2})
}
$(".layui-laypage-btn")[0].click();
}
--
Gitblit v1.9.1