From 3e764a41adfd59ea1b94b80363847440e577bdc6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 05 三月 2021 14:46:25 +0800
Subject: [PATCH] #
---
src/main/webapp/views/custOrder/custOrder.html | 5 ++++-
src/main/webapp/static/js/custOrder/custOrder.js | 26 +++++++-------------------
2 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index e153007..603ed8e 100644
--- a/src/main/webapp/static/js/custOrder/custOrder.js
+++ b/src/main/webapp/static/js/custOrder/custOrder.js
@@ -33,7 +33,7 @@
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
// ,{field: 'memo', align: 'center',title: '澶囨敞'}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 120}
]],
request: {
pageName: 'curr',
@@ -243,24 +243,12 @@
}
});
break;
- // 缂栬緫
- case 'edit':
- layer.open({
- type: 2,
- title: '淇敼',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- content: 'custOrder_detail.html',
- success: function(layero, index){
- layer.getChildFrame('#data-detail-submit-save', index).hide();
- setFormVal(layer.getChildFrame('#detail', index), data, false);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
- top.convertDisabled(layer.getChildFrame('', index), true);
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- }
- });
+ // 鎵撳嵃
+ case 'print':
+ layer.confirm('寮�濮嬫墦鍗�' +data.number + ' 鎹¤揣鍗曪紵', {shadeClose: true}, function(){
+ layer.closeAll();
+ printPakouts(data.number);
+ })
break;
}
diff --git a/src/main/webapp/views/custOrder/custOrder.html b/src/main/webapp/views/custOrder/custOrder.html
index ca9c06d..3536bd0 100644
--- a/src/main/webapp/views/custOrder/custOrder.html
+++ b/src/main/webapp/views/custOrder/custOrder.html
@@ -41,7 +41,10 @@
<script type="text/html" id="operate">
{{#if (d.status == 1){ }}
- <a class="layui-btn layui-btn-sm" lay-event="stockOut" style="font-size: 16px">鎹¤揣</a>
+ <a class="layui-btn layui-btn-sm layui-btn-danger" lay-event="stockOut" style="font-size: 16px">鎹¤揣</a>
+ {{# } }}
+ {{#if (d.status == 2){ }}
+ <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="print" style="font-size: 16px">鎵撳嵃</a>
{{# } }}
</script>
--
Gitblit v1.9.1