From 822b96ee741e429d80779cd17bb7c2c00dca44f2 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 11 Jan 2022 23:25:06 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

---
 zq-erp/src/main/resources/templates/views/super/sysCompany-form.html |  336 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 174 insertions(+), 162 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 0c82ad2..ab047f8 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
@@ -1,25 +1,25 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-<meta charset="utf-8">
-<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
-<meta name="renderer" content="webkit|ie-comp|ie-stand">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<meta name="viewport"
-	content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-<!-- 本框架基本脚本和样式 -->
-<script type="text/javascript"
-	th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
-<script type="text/javascript" th:src="@{/js/systools/MBase.js}"></script>
+	<meta charset="utf-8">
+	<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
+	<meta name="renderer" content="webkit|ie-comp|ie-stand">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+	<meta name="viewport"
+		  content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+	<meta http-equiv="Cache-Control" content="no-siteapp" />
+	<!-- 本框架基本脚本和样式 -->
+	<script type="text/javascript"
+			th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
+	<script type="text/javascript" th:src="@{/js/systools/MBase.js}"></script>
 
-<!-- 界面单独引入的其他样式和脚本 -->
-<link rel="stylesheet"
-	th:href="@{/plugin/zTree/zTreeStyle/zTreeStyle.css}" type="text/css">
-<script type="text/javascript"
-	th:src="@{/plugin/zTree/jquery.ztree.core-3.5.min.js}"></script>
-<script type="text/javascript"
-	th:src="@{/plugin/zTree/jquery.ztree.excheck.min.js}"></script>
+	<!-- 界面单独引入的其他样式和脚本 -->
+	<link rel="stylesheet"
+		  th:href="@{/plugin/zTree/zTreeStyle/zTreeStyle.css}" type="text/css">
+	<script type="text/javascript"
+			th:src="@{/plugin/zTree/jquery.ztree.core-3.5.min.js}"></script>
+	<script type="text/javascript"
+			th:src="@{/plugin/zTree/jquery.ztree.excheck.min.js}"></script>
 	<style>
 		#treeDemo{
 			height: 500px;
@@ -30,160 +30,172 @@
 	</style>
 </head>
 <body>
-	<div class="ibox-content">
-		<form class="form-horizontal" id="dataform"
-			onsubmit="javascripr:return false;">
-			<input   type="hidden" name="tokenUrl" th:value="${tokenUrl}"> <input
-				type="hidden" name="token" th:value="${token}"> <input
-				type="hidden" name="comId" th:value="${obj.comId }">
-			<div class="form-group">
-				<label class="col-sm-2 control-label">公司名称<span
+<div class="ibox-content">
+	<form class="form-horizontal" id="dataform"
+		  onsubmit="javascripr:return false;">
+		<input   type="hidden" name="tokenUrl" th:value="${tokenUrl}"> <input
+			type="hidden" name="token" th:value="${token}"> <input
+			type="hidden" name="comId" th:value="${obj.comId }">
+		<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="comName" th:value="${obj.comName }" 
-						nullmsg="公司名称不能为空">
-					<div class="Validform_checktip"></div>
-				</div>
-				<label class="col-sm-2 control-label">联系人<span
-					class="text-danger">*</span></label>
-				<div class="col-sm-4">
-					<input   type="text" dataType="*1-50" class="form-control"
-						th:value="${obj.comBoss }" name="comBoss" nullmsg="联系人不能为空">
-					<div class="Validform_checktip"></div>
-				</div>
+			<div class="col-sm-4">
+				<input   type="text" dataType="*1-100" class="form-control"
+						 name="comName" th:value="${obj.comName }"
+						 nullmsg="公司名称不能为空">
+				<div class="Validform_checktip"></div>
 			</div>
-			<div class="form-group">
-				<label class="col-sm-2 control-label">联系电话</label>
-				<div class="col-sm-4">
-					<input   type="text" dataType="*11-11" class="form-control"
-						name="comBossTel" ignore="ignore" th:value="${obj.comBossTel }"
+			<label class="col-sm-2 control-label">联系人<span
+					class="text-danger">*</span></label>
+			<div class="col-sm-4">
+				<input   type="text" dataType="*1-50" class="form-control"
+						 th:value="${obj.comBoss }" name="comBoss" nullmsg="联系人不能为空">
+				<div class="Validform_checktip"></div>
+			</div>
+		</div>
+		<div class="form-group">
+			<label class="col-sm-2 control-label">联系电话</label>
+			<div class="col-sm-4">
+				<input   type="text" dataType="*11-11" class="form-control"
+						 name="comBossTel" ignore="ignore" th:value="${obj.comBossTel }"
 						 nullmsg="联系电话不能为空">
-					<div class="Validform_checktip"></div>
-				</div>
-				<label class="col-sm-2 control-label">地址</label>
-				<div class="col-sm-4">
-					<input   type="text" dataType="*1-510" class="form-control"
-						ignore="ignore" th:value="${obj.comAddress }" name="comAddress"
-						nullmsg="地址不能为空">
-					<div class="Validform_checktip"></div>
-				</div>
+				<div class="Validform_checktip"></div>
 			</div>
-			<div class="form-group">
-				<label class="col-sm-2 control-label">网站地址</label>
-				<div class="col-sm-4">
-					<input   type="text" dataType="url" class="form-control"
-						ignore="ignore" th:value="${obj.comWebUrl }" name="comWebUrl"
-						nullmsg="网站不能为空">
-					<div class="Validform_checktip"></div>
-				</div>
-				<label class="col-sm-2 control-label">企业可以用店铺数</label>
-				<div class="col-sm-4">
-					<input   type="text" dataType="n" class="form-control"
-						ignore="ignore" th:value="${obj.comAge}" name="comAge"
-						nullmsg="企业可以用店铺数不能为空">
-					<div class="Validform_checktip"></div>
-				</div>
+			<label class="col-sm-2 control-label">地址</label>
+			<div class="col-sm-4">
+				<input   type="text" dataType="*1-510" class="form-control"
+						 ignore="ignore" th:value="${obj.comAddress }" name="comAddress"
+						 nullmsg="地址不能为空">
+				<div class="Validform_checktip"></div>
 			</div>
-			<div class="form-group">
-				<label class="col-sm-2 control-label">企业功能</label>
-				<div class=" ztree col-sm-9" id="treeDemo"></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"
+						 ignore="ignore" dataType="*1-100" th:value="${obj.comWebUrl }" name="comWebUrl"
+						 nullmsg="网站不能为空">
+				<div class="Validform_checktip"></div>
 			</div>
-			<div class="form-group ">
-				<div class="col-sm-12 text-center">
-					<a href="javascript:;" onclick="myForm.submit()"
-						class="btn btn-success radius"><i class="fa fa-check"></i> 保存</a>&nbsp;&nbsp;&nbsp;&nbsp;
-					<a class="btn btn-danger radius" href="javascript:;"
-						onclick="MTools.closeForm()"><i class="fa fa-close"></i> 关闭</a>
-				</div>
+			<label class="col-sm-2 control-label">企业可以用店铺数</label>
+			<div class="col-sm-4">
+				<input   type="text" dataType="n" class="form-control"
+						 ignore="ignore" th:value="${obj.comAge}" name="comAge"
+						 nullmsg="企业可以用店铺数不能为空">
+				<div class="Validform_checktip"></div>
 			</div>
-		</form>
-	</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";
-        }
+		</div>
 
-		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();
+		<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>
+		</div>
+		<div class="form-group ">
+			<div class="col-sm-12 text-center">
+				<a href="javascript:;" onclick="myForm.submit()"
+				   class="btn btn-success radius"><i class="fa fa-check"></i> 保存</a>&nbsp;&nbsp;&nbsp;&nbsp;
+				<a class="btn btn-danger radius" href="javascript:;"
+				   onclick="MTools.closeForm()"><i class="fa fa-close"></i> 关闭</a>
+			</div>
+		</div>
+	</form>
+</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 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 : {
+	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,
-					chkStyle : "checkbox",
-					radioType : "level",
-					chkboxType : {
-						"Y" : "ps",
-						"N" : "ps"
-					}
-				},
-				view : {
-					dblClickExpand : false,
-					showLine : true,
-				},
-				data : {
-					simpleData : {
-						enable : true,
-						idKey : "id",
-						pIdKey : "pId",
-						rootPId : ""
-					}
-				},
+					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;
-			//如果是编辑则设置节点选中
+	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;
@@ -191,9 +203,9 @@
 				o.checked = true;
 			}
 		}
-			
-			return o;
-		}
-	</script>
+
+		return o;
+	}
+</script>
 </body>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1