From 6ede6b27b7c8d4ea5cbf4ec93b17b5f2358debf1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 13 三月 2021 09:46:59 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/custOrder/custOrder.js | 112 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 77 insertions(+), 35 deletions(-)
diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index e153007..72f8a7d 100644
--- a/src/main/webapp/static/js/custOrder/custOrder.js
+++ b/src/main/webapp/static/js/custOrder/custOrder.js
@@ -1,10 +1,31 @@
var pageCurr;
-layui.use(['table','laydate', 'form'], function(){
+function right(){
+ top.popupRight = top.layui.admin.popupRight({
+ id: 'LAY_adminPopupLayerTest'
+ , area: '750px'
+ , type: 2
+ , content:'custOrder/matQuery.html'
+ , success: function(){
+ // $('#'+ this.id).html('<div style="padding: 20px;">鏀惧叆鍐呭</div>');
+ //admin.view(this.id).render('system/xxx')
+ }
+ , end: function () {
+ $(".layui-laypage-btn")[0].click();
+ }
+ });
+}
+
+layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+}).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+}).use(['table', 'laydate', 'form'], function(){
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
+ var admin = layui.admin;
// 鏁版嵁娓叉煋
tableIns = table.render({
@@ -21,19 +42,20 @@
{type: 'checkbox'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
,{field: 'number', align: 'center',title: '閿�鍞崟鍙�'}
- ,{field: 'billDate', align: 'center',title: '鍗曟嵁鏃ユ湡'}
- ,{field: 'bTypeId', align: 'center',title: '瀹㈡埛缂栧彿'}
- ,{field: 'eTypeId', align: 'center',title: '缁忔墜浜虹紪鍙�'}
+
+ ,{field: 'btypeId', align: 'center',title: '瀹㈡埛缂栧彿'}
+ ,{field: 'etypeId', align: 'center',title: '缁忔墜浜虹紪鍙�', hide: true}
,{field: 'userCode', align: 'center',title: '鍟嗗搧缂栧彿'}
,{field: 'qty', align: 'center',title: '鍟嗗搧鏁伴噺'}
- ,{field: 'price', align: 'center',title: '鍟嗗搧鍗曚环'}
- ,{field: 'comment', align: 'center',title: '鍟嗗搧澶囨敞'}
- ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ ,{field: 'price', align: 'center',title: '鍟嗗搧鍗曚环', hide: true}
+ ,{field: 'comment', align: 'center',title: '鍟嗗搧澶囨敞', hide: true}
+ ,{field: 'status$', align: 'center',title: '鐘舵��', templet: '#statusTpl', width: 100}
+ ,{field: 'billDate', align: 'center',title: '鍗曟嵁鏃ユ湡'}
// ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
// ,{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',
@@ -123,7 +145,7 @@
success: function (res) {
if (res.code === 200){
layer.closeAll();
- tableReload(false);
+ $(".layui-laypage-btn")[0].click();
} else if (res.code === 403){
top.location.href = baseUrl+"/";
} else {
@@ -181,7 +203,7 @@
switch (obj.event) {
// 鎷ｈ揣
case 'stockOut':
- layer.confirm(data.number + ' 璁㈠崟寮�濮嬫崱璐э紵', {shadeClose: true}, function(){
+ layer.confirm(data.number + ' 璁㈠崟寮�濮嬫嫞璐э紵', {shadeClose: true}, function(){
layer.closeAll();
$.ajax({
url: baseUrl+"/work/stock/out",
@@ -196,7 +218,7 @@
if (res.code === 200){
layer.confirm(res.msg, {
shadeClose: true
- , btn: ['鎵撳嵃鎹¤揣鍗�']
+ , btn: ['鎵撳嵃鎷ｈ揣鍗�']
}, function() {
layer.closeAll();
printPakouts(data.number);
@@ -206,12 +228,12 @@
} else if (res.code === 20001) {
layer.confirm(res.msg, {
shadeClose: true
- , btn: ['搴撳瓨璋冩嫧', '鎵撳嵃']
+ , btn: ['搴撳瓨璋冩嫧', '鍙栨秷']
}, function() {
// todo 搴撳瓨璋冩嫧
layer.closeAll();
}, function() {
- printPakouts(data.number);
+ // printPakouts(data.number);
layer.closeAll();
}
)
@@ -220,6 +242,7 @@
} else {
layer.msg(res.msg)
}
+ $(".layui-laypage-btn")[0].click();
}
})
});
@@ -243,30 +266,18 @@
}
});
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;
}
});
- // 鎵撳嵃鎹¤揣鍗�
+ // 鎵撳嵃鎷ｈ揣鍗�
function printPakouts(docNumber) {
$.ajax({
url: baseUrl+"/work/stock/out/print",
@@ -277,9 +288,40 @@
contentType:'application/json;charset=UTF-8',
method: 'POST',
success: function (res) {
- console.log(res)
if (res.code === 200){
- alert(JSON.stringify(res.data));
+ res.data["barcodeUrl"]=baseUrl+"/custOrder/code/auth?type=1¶m="+res.data.docNum;
+ var tpl = $('#pakoutPrintTpl').html();
+ var template = Handlebars.compile(tpl);
+ var html = template(res);
+ var box = $("#pakoutPrintBox");
+ box.html(html);box.show();
+ box.print({
+ mediaPrint:true,
+ deferred: $.Deferred().done(function () {
+ layer.confirm('[閲嶈] 鎵撳嵃鏄惁鎴愬姛锛�', {btn: ['Yes', 'No']}, function(){
+ $.ajax({
+ url: baseUrl+"/pakout/print/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ docNumber: docNumber
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(res.msg, {icon: 1})
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ });
+ })
+ });
+ box.hide();
} else if (res.code === 403){
top.location.href = baseUrl+"/";
} else {
--
Gitblit v1.9.1