From 88f8af7633457c8fc850f1d286c224c53d2c8c1e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 六月 2020 11:02:01 +0800
Subject: [PATCH] #
---
src/main/webapp/views/matCode/matCode.html | 3 +
src/main/webapp/static/js/matCode/matCode.js | 78 +-------------------------------------
2 files changed, 5 insertions(+), 76 deletions(-)
diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index 711f5a2..b5032e6 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -199,6 +199,7 @@
layer.open({
type: 1,
title: '鎵归噺鎵撳嵃',
+ area: ['500px'],
shadeClose: true,
content: $('#printDataDiv'),
success: function(layero, index){
@@ -296,85 +297,13 @@
}
});
break;
- case 'appeUser':
- var param = top.reObject(data).appeUser;
- if (param === undefined) {
- layer.msg("鏃犳暟鎹�");
- } else {
- layer.open({
- type: 2,
- title: '鍒涘缓鑰呰鎯�',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: '../user/user_detail.html',
- success: function(layero, index){
- $.ajax({
- url: "baseUrl+/user/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- 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');
- } else if (res.code === 403){
- parent.location.href = baseUrl;
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
- }
- break;
- case 'modiUser':
- var param = top.reObject(data).modiUser;
- if (param === undefined) {
- layer.msg("鏃犳暟鎹�");
- } else {
- layer.open({
- type: 2,
- title: '淇敼浜哄憳璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: '../user/user_detail.html',
- success: function(layero, index){
- $.ajax({
- url: "baseUrl+/user/"+ param +"/auth",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- if (res.code === 200){
- setFormVal(layer.getChildFrame('#detail', index), res.data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- 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');
- } else if (res.code === 403){
- parent.location.href = baseUrl;
- }else {
- layer.msg(res.msg)
- }
- }
- })
- }
- });
- }
- break;
// 鎵撳嵃
case "btnPrint":
console.log(data);
layer.open({
type: 1,
title: '鎵撳嵃',
- // area: ['500px', top.detailHeight],
+ area: ['500px'],
shadeClose: true,
content: $('#printDataDiv'),
success: function(layero, index){
@@ -430,10 +359,9 @@
function method(name){
var index = layer.load(1, {
- shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
+ shade: [0.5,'#000']
});
var data = {
-// id: $('#id').val(),
matNo: $('#matNo').val(),
barcode: $('#barcode').val(),
matName: $('#matName').val(),
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 5fe2f6e..6713871 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -129,13 +129,14 @@
<!-- 鎵撳嵃鎿嶄綔寮圭獥 -->
<div id="printDataDiv" style="display: none;padding: 20px">
<div class="layui-form" style="text-align: center">
+ <hr>
<!--鍗曢�夋-->
<div class="layui-form-item" style="display: inline-block; margin-bottom: 10px">
<input type="radio" name="sex" value="鐢�" title="妯℃澘涓�" checked="">
<input type="radio" name="sex" value="濂�" title="妯℃澘浜�">
<input type="radio" name="sex" value="绂�" title="妯℃澘涓�">
</div>
- <fieldset class="layui-elem-field site-demo-button" style="margin-top: 30px;text-align: left">
+ <fieldset class="layui-elem-field site-demo-button" style="margin-top: 30px;text-align: left;">
<legend>鎵撳嵃棰勮</legend>
<div id="template-container" style="margin: 20px;text-align: center">
<!-- 棰勮鍥� 1 -->
--
Gitblit v1.9.1