From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/resources/templates/views/super/sysCompany-form.html | 209 ++++++++++++++++++++++++++--------------------------
1 files changed, 105 insertions(+), 104 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/super/sysCompany-form.html b/zq-erp/src/main/resources/templates/views/super/sysCompany-form.html
index bf5bf7e..ea1c420 100644
--- a/zq-erp/src/main/resources/templates/views/super/sysCompany-form.html
+++ b/zq-erp/src/main/resources/templates/views/super/sysCompany-form.html
@@ -21,11 +21,11 @@
<script type="text/javascript"
th:src="@{/plugin/zTree/jquery.ztree.excheck.min.js}"></script>
<style>
- #treeDemo{
- height: 500px;
- overflow: scroll;
- width: 300px;
- }
+ #treeDemo{
+ height: 500px;
+ overflow: scroll;
+ width: 300px;
+ }
</style>
</head>
@@ -70,10 +70,11 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-2 control-label">网站地址</label>
+ <label class="col-sm-2 control-label">网站地址<span
+ class="text-danger">*</span></label>
<div class="col-sm-4">
- <input type="text" class="form-control"
- th:value="${obj.comWebUrl }" name="comWebUrl"
+ <input type="text" class="form-control"
+ ignore="ignore" dataType="*1-100" th:value="${obj.comWebUrl }" name="comWebUrl"
nullmsg="网站不能为空">
<div class="Validform_checktip"></div>
</div>
@@ -86,16 +87,16 @@
</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" dataType="*1-100" class="form-control"
- name="comCode" th:value="${obj.comCode }"
- nullmsg="公司编码不能为空">
- <div class="Validform_checktip"></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" dataType="*1-100" class="form-control"
+ name="comCode" th:value="${obj.comCode }"
+ nullmsg="公司编码不能为空">
+ <div class="Validform_checktip"></div>
</div>
+ </div>
<div class="form-group">
<label class="col-sm-2 control-label">企业功能</label>
<div class=" ztree col-sm-9" id="treeDemo"></div>
@@ -112,99 +113,99 @@
</div>
<script type="text/javascript" th:src="@{/js/systools/MJsBase.js}"></script>
<script th:inline="javascript">
- var invokeUrl = basePath+"/admin/sysCompany/addCompany";
- /*<![CDATA[*/
- var obj=/*[[${obj}]]*/
- /*]]>*/
- if(obj.comId!=null){
- invokeUrl = basePath+"/admin/sysCompany/modifyCompany";
- }
+ var invokeUrl = basePath+"/admin/sysCompany/addCompany";
+ /*<![CDATA[*/
+ var obj=/*[[${obj}]]*/
+ /*]]>*/
+ if(obj.comId!=null){
+ invokeUrl = basePath+"/admin/sysCompany/modifyCompany";
+ }
- var myForm = null;
- var tree = null;
- $(function() {
- MTools.autoFullSelect();
- $(".select2").select2({
- 'width' : '100%'
- });
- myForm = MForm.initForm({
- invokeUrl : invokeUrl,
- beforeSubmit : function() {
- var items = tree.getCheckedNodes();
- var keys = "";
- for (var i = 0; i < items.length; i++) {
- keys += items[i]["id"] + ",";
- }
- myForm.initParam.extendParam = {
- "comFunctions" : keys
- };
- },
- afterSubmit : function() {
- parent.myGrid.serchData();
- },
- });
- initFunctionList();
- });
+ var myForm = null;
+ var tree = null;
+ $(function() {
+ MTools.autoFullSelect();
+ $(".select2").select2({
+ 'width' : '100%'
+ });
+ myForm = MForm.initForm({
+ invokeUrl : invokeUrl,
+ beforeSubmit : function() {
+ var items = tree.getCheckedNodes();
+ var keys = "";
+ for (var i = 0; i < items.length; i++) {
+ keys += items[i]["id"] + ",";
+ }
+ myForm.initParam.extendParam = {
+ "comFunctions" : keys
+ };
+ },
+ afterSubmit : function() {
+ parent.myGrid.serchData();
+ },
+ });
+ initFunctionList();
+ });
- function initFunctionList() {
- var zNodes = new Array();
- $.AjaxProxy().invoke(
- basePath+"/admin/sysFunction/all",
- function(loj) {
- for (var i = 0; i < loj.getRowCount(); i++) {
- zNodes[i] = createNode(loj.getString(i, "fnId"),
- loj.getString(i, "fnParentId"), loj
- .getString(i, "fnName"));
- }
- initTree(zNodes);
- });
- }
+ function initFunctionList() {
+ var zNodes = new Array();
+ $.AjaxProxy().invoke(
+ basePath+"/admin/sysFunction/all",
+ function(loj) {
+ for (var i = 0; i < loj.getRowCount(); i++) {
+ zNodes[i] = createNode(loj.getString(i, "fnId"),
+ loj.getString(i, "fnParentId"), loj
+ .getString(i, "fnName"));
+ }
+ initTree(zNodes);
+ });
+ }
- function initTree(zNodes) {
- var setting = {
- check : {
- enable : true,
- chkStyle : "checkbox",
- radioType : "level",
- chkboxType : {
- "Y" : "ps",
- "N" : "ps"
- }
- },
- view : {
- dblClickExpand : false,
- showLine : true,
- },
- data : {
- simpleData : {
- enable : true,
- idKey : "id",
- pIdKey : "pId",
- rootPId : ""
- }
- },
+ function initTree(zNodes) {
+ var setting = {
+ check : {
+ enable : true,
+ chkStyle : "checkbox",
+ radioType : "level",
+ chkboxType : {
+ "Y" : "ps",
+ "N" : "ps"
+ }
+ },
+ view : {
+ dblClickExpand : false,
+ showLine : true,
+ },
+ data : {
+ simpleData : {
+ enable : true,
+ idKey : "id",
+ pIdKey : "pId",
+ rootPId : ""
+ }
+ },
- };
- tree = $.fn.zTree.init($("#treeDemo"), setting, zNodes);
- }
+ };
+ tree = $.fn.zTree.init($("#treeDemo"), setting, zNodes);
+ }
- function createNode(id, parentId, name) {
- var o = new Object();
- o.id = id;
- o.pId = parentId;
- o.name = name;
- o.open = true;
- //如果是编辑则设置节点选中
- if(obj.comId!=null){
- //var fns = "${obj.comFunctions}";
- var fns = obj.comFunctions;
- if (fns.indexOf(id) != -1) {
- o.checked = true;
- }
- }
+ function createNode(id, parentId, name) {
+ var o = new Object();
+ o.id = id;
+ o.pId = parentId;
+ o.name = name;
+ o.open = true;
+ //如果是编辑则设置节点选中
+ if(obj.comId!=null){
+ //var fns = "${obj.comFunctions}";
+ var fns = obj.comFunctions;
+ if (fns.indexOf(id) != -1) {
+ o.checked = true;
+ }
+ }
- return o;
- }
+ return o;
+ }
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1