From 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 26 八月 2021 08:50:57 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs
---
src/main/webapp/static/js/matCode/matCode.js | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index f36bf68..a5871d6 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -7,7 +7,7 @@
cols.push.apply(cols, matCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120})
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:110})
return cols;
}
layui.use(['table','laydate', 'form','upload'], function(){
@@ -236,6 +236,27 @@
table.on('tool(matCode)', function(obj){
var data = obj.data;
switch (obj.event) {
+ // 缂栬緫
+ case 'edit':
+ layer.open({
+ type: 2,
+ title: '缂栬緫',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: 'matCode_detail.html',
+ success: function(layero, index){
+ setFormVal(layer.getChildFrame('#detail', index), data, true);
+ // top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ top.convertDisabled(layer.getChildFrame('#matNo', index), true);
+ // layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+ layer.getChildFrame('#data-detail-submit-save,#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');
+ }
+ });
+ break;
// 璇︽儏
case 'detail':
layer.open({
@@ -334,12 +355,18 @@
function method(name){
var index = layer.load(1, {
- shade: [0.5,'#000']
+ shade: [0.5,'#000000']
});
var data = {
matNo: $('#matNo').val(),
barcode: $('#barcode').val(),
matName: $('#matName').val(),
+ specs: $('#specs').val(),
+ unit: $('#unit').val(),
+ size: $('#size').val(),
+ color: $('#color').val(),
+ weight: $('#weight').val(),
+
str1: $('#str1').val(),
str2: $('#str2').val(),
str3: $('#str3').val(),
@@ -350,25 +377,11 @@
str8: $('#str8').val(),
str9: $('#str9').val(),
str10: $('#str10').val(),
- str11: $('#str11').val(),
- str12: $('#str12').val(),
- str13: $('#str13').val(),
- str14: $('#str14').val(),
- str15: $('#str15').val(),
- str16: $('#str16').val(),
- str17: $('#str17').val(),
- str18: $('#str18').val(),
- str19: $('#str19').val(),
- str20: $('#str20').val(),
- str21: $('#str21').val(),
- str22: $('#str22').val(),
- str23: $('#str23').val(),
num1: $('#num1').val(),
num2: $('#num2').val(),
num3: $('#num3').val(),
num4: $('#num4').val(),
num5: $('#num5').val(),
- num6: $('#num6').val(),
date1: top.strToDate($('#date1\\$').val()),
appeUser: $('#appeUser').val(),
appeTime: top.strToDate($('#appeTime\\$').val()),
@@ -432,7 +445,7 @@
type: 'datetime'
});
layDate.render({
- elem: '#modiTime\\$',
+ elem: 'modiTime#\\$',
type: 'datetime'
});
layDate.render({
--
Gitblit v1.9.1