From ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Wed, 09 Jun 2021 20:44:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/resources/templates/views/admin/hive/operate/label-form.html | 34 +++++-----------------------------
1 files changed, 5 insertions(+), 29 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 6347b95..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
@@ -18,34 +18,10 @@
<div class="ibox-content">
<form class="form-horizontal" id="dataform" onsubmit="javascript:return false;">
<input autocomplete="off" type="hidden" name="id" th:value="${obj?.id}">
-
<div class="form-group">
- <label class="col-sm-2 control-label">选择店铺<span class="text-danger">*</span></label>
+ <label class="col-sm-2 control-label">标签<span class="text-danger">*</span></label>
<div class="col-sm-4">
- <select class="form-control autoFull select2" dataType="*"
- nullmsg="店铺不能为空" id="shopSelect"
- th:data-url="@{/admin/shopInfo/findShops}" data-value="id"
- data-filed="shopName" name="shopId">
- </select>
-
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-2 control-label">分配类型<span class="text-danger">*</span></label>
- <div class="col-sm-4">
- <label class="radio-inline">
- <input type="radio" name="type" id="optionsRadios1" value="1" checked>加
- </label>
-
- <label class="radio-inline">
- <input type="radio" name="type" id="optionsRadios2" value="2">减
- </label>
- </div>
- </div>
- <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="n" class="form-control" name="remainingCnt" ></input>
+ <input autocomplete="off" dataType="*" class="form-control" th:value="${obj?.label}" name="label" ></input>
<div class="Validform_checktip"></div>
</div>
</div>
@@ -68,9 +44,9 @@
var obj=/*[[${obj}]]*/
/*]]>*/
- var invokeUrl=basePath+"/admin/smsShop/addSmsShop";
- if(obj.id!=null){
- invokeUrl = basePath+"/admin/smsShop/modifySmsShop";
+ 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