From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/resources/templates/views/admin/hive/operate/label-form.html | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/operate/label-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/operate/label-form.html
index 07c7835..6614330 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/operate/label-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/operate/label-form.html
@@ -21,7 +21,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">标签<span class="text-danger">*</span></label>
<div class="col-sm-4">
- <input autocomplete="off" dataType="*" class="form-control" name="label" ></input>
+ <input autocomplete="off" dataType="*" class="form-control" th:value="${obj?.label}" name="label" ></input>
<div class="Validform_checktip"></div>
</div>
</div>
@@ -44,9 +44,9 @@
var obj=/*[[${obj}]]*/
/*]]>*/
- var invokeUrl=basePath+"/admin/operate/add";
- if(obj.id!=null){
- invokeUrl = basePath+"/admin/operate/modify";
+ var invokeUrl=basePath+"/admin/label/add";
+ if(obj!=null&& obj.id!=null){
+ invokeUrl = basePath+"/admin/label/modify";
}
var myForm=MForm.initForm({
invokeUrl:invokeUrl,
--
Gitblit v1.9.1