From 3a9c83b48d29be92a17a83ec55c368d933a3c05d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 14 五月 2022 00:57:51 +0800
Subject: [PATCH] #
---
src/main/webapp/views/wrkMast/wrkMast.html | 6 ++++++
src/main/webapp/static/js/wrkMast/wrkMast.js | 48 ++++++++----------------------------------------
2 files changed, 14 insertions(+), 40 deletions(-)
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index d394432..36c02f5 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -66,7 +66,7 @@
// return html;
// }}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:230}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:250}
]],
request: {
pageName: 'curr',
@@ -271,7 +271,7 @@
// 鐩戝惉琛屽伐鍏蜂簨浠�
table.on('tool(wrkMast)', function(obj){
- var data = obj.data;
+ let data = obj.data;
switch (obj.event) {
// 鏄庣粏灞曠ず todo
case 'detlShow':
@@ -332,46 +332,14 @@
layer.closeAll();
});
break;
- // 璇︽儏
- case 'detail':
- layer.open({
- type: 2,
- title: '璇︽儏',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: 'wrkMast_detail.html',
- success: function(layero, index){
- setFormVal(layer.getChildFrame('#detail', index), data, true);
- top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
- layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- layer.getChildFrame('##dealDownLine', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- }
+ // 鍏堝叆鍝�
+ case 'preHave':
+ layer.confirm('浠诲姟鍙戦�佸厛鍏ュ搧寮傚父锛佹槸鍚︺�傘�傘�傘�傘�傘�傘�傘�傦紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
});
break;
- // 缂栬緫
- case 'edit':
- layer.open({
- type: 2,
- title: '淇敼',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: 'wrkMast_detail.html',
- success: function(layero, index){
- layer.getChildFrame('#crnStrTime\\$,#crnEndTime\\$,#refIotime\\$,#ioTime\\$', index).parent().parent().hide();
- 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('#wrkNo', index), true);
- layero.find('iframe')[0].contentWindow.layui.form.render('select');
- layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
- layer.getChildFrame('##dealDownLine', index).hide();
- layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
- }
+ // 绌烘搷浣�
+ case 'takeNone':
+ layer.confirm('浠诲姟鍙戦�佺┖鎿嶄綔寮傚父锛佹槸鍚︺�傘�傘�傘�傘�傘�傘�傘�傦紵', {title: '宸ヤ綔鍙凤細'+data.wrkNo, shadeClose: true}, function(){
});
break;
}
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index b2c439f..6bdc381 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -113,6 +113,12 @@
</div>
<script type="text/html" id="operate">
+ {{#if (d.preHave === 'Y') { }}
+ <a class="layui-btn layui-btn-primary layui-border-red layui-btn-xs btn-error" lay-event="preHave">鍏堝叆鍝�</a>
+ {{# } }}
+ {{#if (d.takeNone === 'Y') { }}
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-error" lay-event="takeNone">绌烘搷浣�</a>
+ {{# } }}
<a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">鏄庣粏</a>
<a class="layui-btn layui-btn-danger layui-btn-xs btn-complete" lay-event="complete">瀹屾垚</a>
<a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">鍙栨秷</a>
--
Gitblit v1.9.1