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/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>