From 7e5e4b43f4bcd7248325e1e1a5f10c61d64e93d3 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期六, 03 十二月 2022 13:12:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/webapp/views/wrkMast/wrkMast.html | 6 ------
src/main/webapp/static/js/wrkMast/wrkMast.js | 2 +-
2 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 471b0f9..a1992a6 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -67,7 +67,7 @@
// return html;
// }}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:350}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:300}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index c94b27a..cdb0882 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -114,12 +114,6 @@
</div>
<script type="text/html" id="operate">
- {{#if (d.preHave === 'Y' && d.wrkSts === 3) { }}
- <a class="layui-btn layui-btn-primary layui-border-red layui-btn-xs btn-error" lay-event="preHave">鍏堝叆鍝�</a>
- {{# } }}
- {{#if (d.takeNone === 'Y' && d.wrkSts === 12) { }}
- <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