Commit 74754b18 by 孙龙

up

parent 8de6803d
...@@ -71,6 +71,7 @@ Class AjaxController extends Controller ...@@ -71,6 +71,7 @@ Class AjaxController extends Controller
$arr[$k]["template_name"] = $item->template ? $item->template->template_name : ''; $arr[$k]["template_name"] = $item->template ? $item->template->template_name : '';
$arr[$k]["sale_order_sn"] = $item->saleOrder ? $item->saleOrder->sale_order_sn : ''; $arr[$k]["sale_order_sn"] = $item->saleOrder ? $item->saleOrder->sale_order_sn : '';
$arr[$k]["goods_type"] = $item->saleOrder ? $item->saleOrder->goods_type : ''; $arr[$k]["goods_type"] = $item->saleOrder ? $item->saleOrder->goods_type : '';
$arr[$k]["createUser"] = $item->saleOrder ? $item->saleOrder->createUser : '';
$arr[$k]["print_nums"] = $item->print_nums; $arr[$k]["print_nums"] = $item->print_nums;
$arr[$k]["create_time"] = date("Y-m-d h:i:s",$item->create_time); $arr[$k]["create_time"] = date("Y-m-d h:i:s",$item->create_time);
$arr[$k]["print_time"] = date("Y-m-d h:i:s",$item->print_time); $arr[$k]["print_time"] = date("Y-m-d h:i:s",$item->print_time);
......
...@@ -29,7 +29,7 @@ layui.use(['form', 'table', 'laydate'], function(){ ...@@ -29,7 +29,7 @@ layui.use(['form', 'table', 'laydate'], function(){
,{field: 'sale_order_sn', title: '销售单号'} ,{field: 'sale_order_sn', title: '销售单号'}
,{field: 'goods_type', title: '型号'} ,{field: 'goods_type', title: '型号'}
,{field: 'print_nums', title: '打印次数', sort: true} ,{field: 'print_nums', title: '打印次数', sort: true}
,{field: '', title: '销售员', sort: true} ,{field: 'createUser', title: '销售员', sort: true}
,{field: 'create_time', title: '使用时间', sort: true} ,{field: 'create_time', title: '使用时间', sort: true}
,{field: 'print_time', title: '打印时间', sort: true} ,{field: 'print_time', title: '打印时间', sort: true}
,{ title: '操作',width: 250, fixed: 'right', toolbar: '#action'} ,{ title: '操作',width: 250, fixed: 'right', toolbar: '#action'}
...@@ -117,7 +117,11 @@ layui.use(['form', 'table', 'laydate'], function(){ ...@@ -117,7 +117,11 @@ layui.use(['form', 'table', 'laydate'], function(){
switch(obj.event){ switch(obj.event){
case 'getCheckData': case 'getCheckData':
var data = checkStatus.data; var data = checkStatus.data;
layer.alert(JSON.stringify(data)); if(data.length <= 0){
layer.msg("至少得选中一个打印标签", { time:2000}); // 阻止重复提交
return;
}
//layer.alert(JSON.stringify(data));
break; break;
case 'getCheckLength': case 'getCheckLength':
var data = checkStatus.data; var data = checkStatus.data;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment