From c253b555c7905c5136d47cd615ef545fa50cc6ad Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 20 Feb 2022 21:24:16 +0800
Subject: [PATCH] Merge branch 'api_score_meger'

---
 zq-erp/src/main/resources/templates/views/admin/hive/vip/tc-form.html |   33 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/vip/tc-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/vip/tc-form.html
index c0e8b27..a59a80f 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/vip/tc-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/vip/tc-form.html
@@ -25,7 +25,15 @@
             <label class="col-sm-2 control-label">套餐余额<span class="text-danger">*</span></label>
             <div class="col-sm-4">
                 <input type="text"  class="form-control" name="balance"
-                       th:value="${obj.balance}" datatype="*1-20" nullmsg="项目余次不能为空">
+                       th:value="${obj.balance}" datatype="*1-20" nullmsg="套餐余额不能为空">
+                <div class="Validform_checktip"></div>
+            </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 type="text"  class="form-control" name="surplusCount"
+                       th:value="${obj.surplusCount}" datatype="*1-20" nullmsg="套餐余次不能为空">
                 <div class="Validform_checktip"></div>
             </div>
         </div>
@@ -50,7 +58,7 @@
         </div>
 
         <div class="form-group">
-            <div class="col-sm-8 col-md-offset-2" id="projBox">
+            <div class="col-sm-4 col-md-offset-2" id="projBox">
                 <table class="table table-striped table-hover table-bordered"
                        id="mgrid">
                     <thead>
@@ -90,9 +98,16 @@
         </div>
 
         <div class="form-group">
-            <label class="col-sm-2 control-label">备注</label>
-            <div class="col-sm-10">
-                <textarea   class="form-control" name="remark" rows="4" >[[${obj.remark}]]</textarea>
+            <label class="col-sm-2 control-label">套餐备注</label>
+            <div class="col-sm-4">
+                <textarea    class="form-control" name="remark" rows="4" th:text="${obj?.remark}" ></textarea>
+                <div class="Validform_checktip"></div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-2 control-label">修改备注<span class="text-danger">*</span></label>
+            <div class="col-sm-4">
+                <textarea   datatype="*1-200" class="form-control" name="updateRemark" rows="4"  ></textarea>
                 <div class="Validform_checktip"></div>
             </div>
         </div>
@@ -121,7 +136,13 @@
         myForm = MForm.initForm({
             invokeUrl : basePath+"/admin/taoCanUser/addOrModify",
             afterSubmit : function() {
-                parent.myGrid.serchData();
+                if(parent.myGrid) {
+                    parent.myGrid.serchData();
+                }
+
+                if (parent.app) {
+                    parent.app.refreshTable();
+                }
             },
         });
     });

--
Gitblit v1.9.1