Merge branch '2.1.2' into 铂沅

VbdsmUI_V2.1.1/src/pc/manage/setting-custom-add.html

@@ -3,7 +3,9 @@
 	$(".district1Span").css("display", "none")
 	$(".industry2Span").css("display", "none")
 	$(".industry3Span").css("display", "none")
-
+	$("#powerUserFrm input[name=auth_aid]").val(getParam("auth_aid"))
+	$("#powerUserFrm input[name=auth_mid]").val(getParam("auth_mid"))
+	$("#powerUserFrm input[name=auth_cid]").val(getParam("auth_cid"))
 	//服务公司
 	ajax({
 		url: "/web/proxy/getComboxData.json?1=1",
@@ -265,16 +267,19 @@
 <div class="easyui-layout" data-options="fit:true" style="border: 0px">
 	<div data-options="region:'center'">
 		<form id="powerUserFrm" method="post" enctype="multipart/form-data">
+			<input type="hidden" name="auth_aid" />
+			<input type="hidden" name="auth_mid" />
+			<input type="hidden" name="auth_cid" />
 			<input type="hidden" name="id" />
 			<input type="hidden" name="orgId" />
 			<table>
-				<tr style="padding: ">
+				<tr>
 					<td style="width: 100px; text-align: right">企业名称<font color="red">*</font>：</td>
 					<td style="width: 360px"><input type="text" id="_name" name="name" style="width: 90%" /></td>
 				</tr>
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">所属区域<font color="red">*</font>：</td>
-					<td>
+					<td style="width: 360px">
 						<span class="province1Span">
 							<select id="province1" name="province"></select>
 						</span>
@@ -306,7 +311,7 @@
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">级别：</td>
 					<td>
-						<select id="rank" name="rank" style="width: 200px">
+						<select id="rank" name="rank" style="width: 90%">
 							<option value="0">普通</option>
 							<option value="1">省级</option>
 							<option value="2">市级</option>
@@ -331,7 +336,7 @@
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">供电电源：</td>
 					<td>
-						<select id="powerSupply" name="powerSupply" style="width: 200px">
+						<select id="powerSupply" name="powerSupply" style="width: 90%">
 							<option value="1">网供</option>
 							<option value="2">电厂</option>
 							<option value="3">混合</option>
@@ -341,7 +346,7 @@
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">企业类型：</td>
 					<td>
-						<select id="style" name="style" style="width: 200px">
+						<select id="style" name="style" style="width: 90%">
 							<option value="1">工况企业</option>
 							<option value="2">办公楼宇</option>
 							<option value="3">自备电厂</option>
@@ -351,26 +356,26 @@
 						</select>
 					</td>
 				</tr>
-				<tr style="padding: ">
+				<tr>
 					<td style="width: 100px; text-align: right">企业标识：</td>
 					<td><input type="text" id="cno" name="cno" class="easyui-validatebox input" style="width: 90%" /></td>
 				</tr>
-				<tr style="padding: ">
+				<tr>
 					<td style="width: 100px; text-align: right">主变数量：</td>
 					<td><input type="text" id="zbsl" name="zbsl" class="easyui-validatebox input" style="width: 90%" /></td>
 				</tr>
-				<tr style="padding: ">
+				<tr>
 					<td style="width: 100px; text-align: right">报装容量(KVA)：</td>
 					<td><input type="text" id="applyLoad" name="applyLoad" class="easyui-validatebox input" style="width: 90%" /></td>
 				</tr>
-				<tr style="padding: ">
+				<tr>
 					<td style="width: 100px; text-align: right">监测容量(KVA)：</td>
 					<td><input type="text" id="jcrl" name="jcrl" class="easyui-validatebox input" style="width: 90%" /></td>
 				</tr>
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">计费方式：</td>
 					<td>
-						<select id="jffs" name="jffs" style="width: 200px">
+						<select id="jffs" name="jffs" style="width: 90%">
 							<option value="1">容量</option>
 							<option value="2">需量</option>
 							<option value="3">单一电价</option>
@@ -380,7 +385,7 @@
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">是否启用自定义用电时段：</td>
 					<td>
-						<select id="isFgp" name="fgpFlag" style="width: 200px">
+						<select id="isFgp" name="fgpFlag" style="width: 90%">
 							<option value="0">否</option>
 							<option value="1">是</option>
 						</select>
@@ -389,20 +394,20 @@
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">电压等级：</td>
 					<td>
-						<select id="voltageClass" name="voltageClass" style="width: 200px"></select>
+						<select id="voltageClass" name="voltageClass" style="width: 90%"></select>
 					</td>
 				</tr>
-				<tr style="padding: ">
+				<tr>
 					<td style="width: 100px; text-align: right">基本电价(元)<font color="red">*</font>：</td>
-					<td><input type="text" id="jbdj" name="jbdj" class="easyui-validatebox input" style="width: 200px" /></td>
+					<td><input type="text" id="jbdj" name="jbdj" class="easyui-validatebox input" style="width: 90%" /></td>
 				</tr>
-				<tr style="padding: ">
+				<tr>
 					<td style="width: 100px; text-align: right">容量电价(元)<font color="red">*</font>：</td>
-					<td><input type="text" id="rldj" name="rldj" class="easyui-validatebox input" style="width: 200px" /></td>
+					<td><input type="text" id="rldj" name="rldj" class="easyui-validatebox input" style="width: 90%" /></td>
 				</tr>
-				<tr style="padding: ">
+				<tr>
 					<td style="width: 100px; text-align: right">需量电价(元)<font color="red">*</font>：</td>
-					<td><input type="text" id="xldj" name="xldj" class="easyui-validatebox input" style="width: 200px" /></td>
+					<td><input type="text" id="xldj" name="xldj" class="easyui-validatebox input" style="width: 90%" /></td>
 				</tr>
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">所属服务商<font color="red">*</font>：</td>
@@ -416,12 +421,12 @@
 				</tr>
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">过期时间<font color="red">*</font>：</td>
-					<td><input id="expiredDate" name="expiredDate" style="width: 200px" ata-options="editable:false" class="easyui-datebox" /></td>
+					<td><input id="expiredDate" name="expiredDate" style="width: 90%" ata-options="editable:false" class="easyui-datebox" /></td>
 				</tr>
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">启用自定企业状态：</td>
 					<td>
-						<select id="customState" name="customState" style="width: 200px">
+						<select id="customState" name="customState" style="width: 90%">
 							<option value="0">不启用</option>
 							<option value="1">启用</option>
 						</select>
@@ -430,7 +435,7 @@
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">企业状态：</td>
 					<td>
-						<select id="state" name="state" style="width: 200px">
+						<select id="state" name="state" style="width: 90%">
 							<option value="0">正常</option>
 							<option value="1">停产</option>
 							<option value="2">半停产</option>
@@ -445,13 +450,13 @@
 						停&nbsp;&nbsp;&nbsp;产：<input id="stopLoad" name="stopLoad" style="width: 123px" />
 					</td>
 				</tr>
-				<tr>
+				<!-- <tr>
 					<td style="width: 100px; text-align: right">APP授权：</td>
 					<td><span id="appNoSpan"></span></td>
-				</tr>
+				</tr> -->
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">备注：</td>
-					<td><textarea id="remark" name="remark" style="width: 360px, font-size:12px; height: 80px;"></textarea></td>
+					<td style="width: 360px"><textarea id="remark" name="remark" style="width: 90%; font-size: 12px; height: 80px"></textarea></td>
 				</tr>
 			</table>
 		</form>

VbdsmUI_V2.1.1/src/pc/manage/setting-custom-update.html

@@ -306,6 +306,15 @@
 			type: "post",
 			data: { id: rows[0].id },
 			success: function (data) {
+				data.data = $.extend(
+					true,
+					{
+						auth_aid: getParam("auth_aid"),
+						auth_mid: getParam("auth_mid"),
+						auth_cid: getParam("auth_cid"),
+					},
+					data.data
+				)
 				$("#powerUserFrm").form("load", data.data)
 				init_city1(data.data.province, data.data.city)
 				init_district1(data.data.city, data.data.district)
@@ -320,10 +329,13 @@
 <div class="easyui-layout" data-options="fit:true" style="border: 0px">
 	<div data-options="region:'center'">
 		<form id="powerUserFrm" method="post" enctype="multipart/form-data">
+			<input type="hidden" name="auth_aid" />
+			<input type="hidden" name="auth_mid" />
+			<input type="hidden" name="auth_cid" />
 			<input type="hidden" name="id" />
 			<input type="hidden" name="orgId" />
 			<table>
-				<tr style="padding: ">
+				<tr>
 					<td style="width: 100px; text-align: right">企业名称<font color="red">*</font>：</td>
 					<td style="width: 360px"><input type="text" id="_name" name="name" style="width: 90%" /></td>
 				</tr>
@@ -361,7 +373,7 @@
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">级别：</td>
 					<td>
-						<select id="rank" name="rank" style="width: 200px">
+						<select id="rank" name="rank" style="width: 90%">
 							<option value="0">普通</option>
 							<option value="1">省级</option>
 							<option value="2">市级</option>
@@ -386,7 +398,7 @@
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">供电电源：</td>
 					<td>
-						<select id="powerSupply" name="powerSupply" style="width: 200px">
+						<select id="powerSupply" name="powerSupply" style="width: 90%">
 							<option value="1">网供</option>
 							<option value="2">电厂</option>
 							<option value="3">混合</option>
@@ -396,7 +408,7 @@
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">企业类型：</td>
 					<td>
-						<select id="style" name="style" style="width: 200px">
+						<select id="style" name="style" style="width: 90%">
 							<option value="1">工况企业</option>
 							<option value="2">办公楼宇</option>
 							<option value="3">自备电厂</option>
@@ -406,26 +418,26 @@
 						</select>
 					</td>
 				</tr>
-				<tr style="padding: ">
+				<tr>
 					<td style="width: 100px; text-align: right">企业标识：</td>
 					<td><input type="text" id="cno" name="cno" class="easyui-validatebox input" style="width: 90%" /></td>
 				</tr>
-				<tr style="padding: ">
+				<tr>
 					<td style="width: 100px; text-align: right">主变数量：</td>
 					<td><input type="text" id="zbsl" name="zbsl" class="easyui-validatebox input" style="width: 90%" /></td>
 				</tr>
-				<tr style="padding: ">
+				<tr>
 					<td style="width: 100px; text-align: right">报装容量(KVA)：</td>
 					<td><input type="text" id="applyLoad" name="applyLoad" class="easyui-validatebox input" style="width: 90%" /></td>
 				</tr>
-				<tr style="padding: ">
+				<tr>
 					<td style="width: 100px; text-align: right">监测容量(KVA)：</td>
 					<td><input type="text" id="jcrl" name="jcrl" class="easyui-validatebox input" style="width: 90%" /></td>
 				</tr>
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">计费方式：</td>
 					<td>
-						<select id="jffs" name="jffs" style="width: 200px">
+						<select id="jffs" name="jffs" style="width: 90%">
 							<option value="1">容量</option>
 							<option value="2">需量</option>
 							<option value="3">单一电价</option>
@@ -435,7 +447,7 @@
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">是否启用自定义用电时段：</td>
 					<td>
-						<select id="isFgp" name="fgpFlag" style="width: 200px">
+						<select id="isFgp" name="fgpFlag" style="width: 90%">
 							<option value="0">否</option>
 							<option value="1">是</option>
 						</select>
@@ -444,20 +456,20 @@
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">电压等级：</td>
 					<td>
-						<select id="voltageClass" name="voltageClass" style="width: 200px"></select>
+						<select id="voltageClass" name="voltageClass" style="width: 90%"></select>
 					</td>
 				</tr>
-				<tr style="padding: ">
+				<tr>
 					<td style="width: 100px; text-align: right">基本电价(元)<font color="red">*</font>：</td>
-					<td><input type="text" id="jbdj" name="jbdj" class="easyui-validatebox input" style="width: 200px" /></td>
+					<td><input type="text" id="jbdj" name="jbdj" class="easyui-validatebox input" style="width: 90%" /></td>
 				</tr>
-				<tr style="padding: ">
+				<tr>
 					<td style="width: 100px; text-align: right">容量电价(元)<font color="red">*</font>：</td>
-					<td><input type="text" id="rldj" name="rldj" class="easyui-validatebox input" style="width: 200px" /></td>
+					<td><input type="text" id="rldj" name="rldj" class="easyui-validatebox input" style="width: 90%" /></td>
 				</tr>
-				<tr style="padding: ">
+				<tr>
 					<td style="width: 100px; text-align: right">需量电价(元)<font color="red">*</font>：</td>
-					<td><input type="text" id="xldj" name="xldj" class="easyui-validatebox input" style="width: 200px" /></td>
+					<td><input type="text" id="xldj" name="xldj" class="easyui-validatebox input" style="width: 90%" /></td>
 				</tr>
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">所属服务商<font color="red">*</font>：</td>
@@ -471,12 +483,12 @@
 				</tr>
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">过期时间<font color="red">*</font>：</td>
-					<td><input id="expiredDate" name="expiredDate" style="width: 200px" ata-options="editable:false" class="easyui-datebox" /></td>
+					<td><input id="expiredDate" name="expiredDate" style="width: 90%" ata-options="editable:false" class="easyui-datebox" /></td>
 				</tr>
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">启用自定企业状态：</td>
 					<td>
-						<select id="customState" name="customState" style="width: 200px">
+						<select id="customState" name="customState" style="width: 90%">
 							<option value="0">不启用</option>
 							<option value="1">启用</option>
 						</select>
@@ -485,7 +497,7 @@
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">企业状态：</td>
 					<td>
-						<select id="state" name="state" style="width: 200px">
+						<select id="state" name="state" style="width: 90%">
 							<option value="0">正常</option>
 							<option value="1">停产</option>
 							<option value="2">半停产</option>
@@ -500,13 +512,13 @@
 						停&nbsp;&nbsp;&nbsp;产：<input id="stopLoad" name="stopLoad" style="width: 123px" />
 					</td>
 				</tr>
-				<tr>
+				<!-- <tr>
 					<td style="width: 100px; text-align: right">APP授权：</td>
 					<td><span id="appNoSpan"></span></td>
-				</tr>
+				</tr> -->
 				<tr>
 					<td style="width: 100px; text-align: right; vertical-align: top">备注：</td>
-					<td><textarea id="remark" name="remark" style="width: 360px, font-size:12px; height: 80px;"></textarea></td>
+					<td><textarea id="remark" name="remark" style="width: 90%; font-size: 12px; height: 80px"></textarea></td>
 				</tr>
 			</table>
 		</form>