From de589b98ff007afdcec9d6cef5d1a2b168031b98 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Sat, 16 Jan 2021 16:12:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api

---
 zq-erp/src/main/resources/templates/views/admin/hive/vip/projUse-form.html |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/vip/projUse-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/vip/projUse-form.html
index 9ef758e..e7360e3 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/vip/projUse-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/vip/projUse-form.html
@@ -58,9 +58,16 @@
             </div>
         </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" th:text="${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>
@@ -90,7 +97,13 @@
     var myForm=MForm.initForm({
         invokeUrl:basePath +"/admin/projUser/addOrModify",
         afterSubmit:function(){
-            parent.myGrid.serchData();
+            if(parent.myGrid) {
+                parent.myGrid.serchData();
+            }
+
+            if (parent.app) {
+                parent.app.refreshTable();
+            }
         },
     });
 </script>

--
Gitblit v1.9.1