Merge remote-tracking branch 'origin/hive2.0' into hive2.0

jyy

2021-01-25 4d4805096b898a6e99f31794facb81794bd1fcf7

 zq-erp/src/main/resources/templates/views/admin/hive/vip/tc-form.html

@@ -50,7 +50,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 +90,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 +128,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();
                }
            },
        });
    });