From 2d28053beec1de1e98b442b6af3734cea7fd0949 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 12 三月 2021 17:02:46 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/custOrder/custOrder.js | 54 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/src/main/webapp/static/js/custOrder/custOrder.js b/src/main/webapp/static/js/custOrder/custOrder.js
index 212a5a5..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,16 +42,17 @@
{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: 120}
@@ -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();
}
)
@@ -246,7 +268,7 @@
break;
// 鎵撳嵃
case 'print':
- layer.confirm('寮�濮嬫墦鍗�' +data.number + ' 鎹¤揣鍗曪紵', {shadeClose: true}, function(){
+ layer.confirm('寮�濮嬫墦鍗�' +data.number + ' 鎷ｈ揣鍗曪紵', {shadeClose: true}, function(){
layer.closeAll();
printPakouts(data.number);
})
@@ -255,7 +277,7 @@
}
});
- // 鎵撳嵃鎹¤揣鍗�
+ // 鎵撳嵃鎷ｈ揣鍗�
function printPakouts(docNumber) {
$.ajax({
url: baseUrl+"/work/stock/out/print",
@@ -281,7 +303,7 @@
url: baseUrl+"/pakout/print/auth",
headers: {'token': localStorage.getItem('token')},
data: {
- docNume: docNumber
+ docNumber: docNumber
},
method: 'POST',
success: function (res) {
--
Gitblit v1.9.1