From 5b446c229afcaa79b1fa3b2cb4f3563a6facefba Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期二, 21 六月 2022 16:31:37 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
---
src/main/webapp/views/wrkMast/wrkMast.html | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index 6bdc381..77b804b 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -113,10 +113,10 @@
</div>
<script type="text/html" id="operate">
- {{#if (d.preHave === 'Y') { }}
+ {{#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') { }}
+ {{#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>
--
Gitblit v1.9.1