组织机构管理改造项目

src/main/resources/static/app/system/views/org-edit.html

@@ -133,17 +133,17 @@
 											</label>
 										</section>
 										<section class="col col-4">
-											<label class="label">行政区划(地市)</label> 
+											<label class="label">行政区划(地市)<span style="color: red;">*</span></label>
 											<label class="select"> 
-												<select id="city" ng-model="city" ng-options='enum.enumid as enum.enumname for enum in dicDataList[province]'>
+												<select id="city" ng-model="city" name="city" ng-options='enum.enumid as enum.enumname for enum in dicDataList[province]' required>
 													<option value="">请选择</option>
 												</select><i></i>
 											</label>
 										</section>
 										<section class="col col-4">
-											<label class="label">行政区划(县区)</label> 
+											<label class="label">行政区划(县区)<span style="color: red;">*</span></label>
 											<label class="select"> 
-												<select id="county" ng-model="county" ng-options='enum.enumid as enum.enumname for enum in dicDataList[city]'>
+												<select id="county" ng-model="county" name="county" ng-options='enum.enumid as enum.enumname for enum in dicDataList[city]' required>
 													<option value="">请选择</option>
 												</select><i></i>
 											</label>
@@ -151,7 +151,7 @@
 									</div>
 									<div class="row">
 										<section class="col col-4">
-											<label class="label">地址<span style="color: red;">*</span></label> 
+											<label class="label">行政区划-地址<span style="color: red;">*</span></label>
 											<label class="input"> 
 												<i class="icon-prepend fa fa-map-marker"></i> 
 												<input type="text" name="address" ng-model="orgInfo.address" maxlength="50" required>
@@ -183,10 +183,56 @@
 											</label>
 										</section>
 										<section class="col col-4">
-											<label class="label">注册地址</label> 
+											<label class="label">仓房数<span style="color: red;">*</span></label>
+											<label class="input">
+												<input type="text" name="houseNumber" ng-model="orgInfo.houseNumber" maxlength="11" validHouseAndWare=true required>
+											</label>
+										</section>
+										<section class="col col-4">
+											<label class="label">油罐数<span style="color: red;">*</span></label>
+											<label class="input">
+												<input type="text" name="tankNumber" ng-model="orgInfo.tankNumber" maxlength="11" validHouseAndWare=true required>
+											</label>
+										</section>
+									</div>
+									<div class="row">
+										<section class="col col-4">
+											<label class="label">库区数<span style="color: red;">*</span></label>
+											<label class="input">
+												<input type="text" name="kqNumber" ng-model="orgInfo.kqNumber" maxlength="2" required>
+											</label>
+										</section>
+										<section class="col col-4">
+											<label class="label">注册地址(省/直辖市)<span style="color: red;">*</span></label>
+											<label class="select">
+												<select id="zc_province" ng-model="orgInfo.zcProvince" name="zcProvince" ng-options='enum.enumid as enum.enumname for enum in dicDataList[1010]' required>
+													<option value="">请选择</option>
+												</select><i></i>
+											</label>
+										</section>
+										<section class="col col-4">
+											<label class="label">注册地址(地市)<span style="color: red;">*</span></label>
+											<label class="select">
+												<select id="zc_city" ng-model="orgInfo.zcCity" name="zcCity" ng-options='enum.enumid as enum.enumname for enum in dicDataList[orgInfo.zcProvince]' required>
+													<option value="">请选择</option>
+												</select><i></i>
+											</label>
+										</section>
+									</div>
+									<div class="row">
+										<section class="col col-4">
+											<label class="label">注册地址(县区)<span style="color: red;">*</span></label>
+											<label class="select">
+												<select id="zc_county" ng-model="orgInfo.zcCounty" name="zcCounty" ng-options='enum.enumid as enum.enumname for enum in dicDataList[orgInfo.zcCity]' required>
+													<option value="">请选择</option>
+												</select><i></i>
+											</label>
+										</section>
+										<section class="col col-4">
+											<label class="label">注册地址(街道和门牌号)<span style="color: red;">*</span></label>
 											<label class="input"> 
 												<i class="icon-prepend fa fa-map-marker"></i>
-												<input type="text" name="registeredAddress" ng-model="orgInfo.registeredAddress" maxlength="512">
+												<input type="text" name="registeredAddress" ng-model="orgInfo.registeredAddress" maxlength="512" required>
 											</label>
 										</section>
 										<section class="col col-4">
@@ -206,7 +252,7 @@
 											</label>
 										</section>
 										<section class="col col-4">
-											<label class="label">注册日期<span style="color: red;">*</span></label> 
+											<label class="label">注册日期<span style="color: red;">*</span></label>
 											<label class="input">
 												<input type="text" ng-model="orgInfo.registDate" class="form-control" onClick="WdatePicker({lang:'zh-cn'})"
 												name="registDate" required>
@@ -340,7 +386,7 @@
 											<label class="label">法人<span style="color: red;">*</span></label> 
 											<label class="input"> 
 												<i class="icon-prepend fa fa-user"></i>
-												<input type="text" name="legalPerson" ng-model="orgInfo.legalPerson" maxlength="30" required>
+												<input type="text" name="legalPerson" ng-model="orgInfo.legalPerson" maxlength="30" required />
 											</label>
 										</section>
 										<section class="col col-4">
@@ -361,9 +407,9 @@
 											</label>
 										</section>
 										<section class="col col-4">
-											<label class="label">法人身份证号</label> 
+											<label class="label">法人身份证号<span style="color: red;">*</span></label>
 											<label class="input"> 
-												<input type="text" name="corporateCapacity" ng-model="orgInfo.corporateCapacity" validCard=true>
+												<input type="text" name="corporateCapacity" ng-model="orgInfo.corporateCapacity" validCard=true maxlength="18" required />
 											</label>
 										</section>
 										<section class="col col-4">
@@ -388,6 +434,8 @@
 												<select ng-model="orgInfo.depotProperty" class="form-control" ng-init="orgInfo.depotProperty='1'">
 													<option value="1">自有</option>
 													<option value="2">租赁</option>
+													<option value="3">共有</option>
+													<option value="4">混合</option>
 													<option value="9">其他</option>
 												</select><i></i>
 											</label>
@@ -429,27 +477,13 @@
 											</label>
 										</section>
 										<section class="col col-4">
-											<label class="label">仓房数<span style="color: red;">*</span></label> 
-											<label class="input"> 
-												<input type="text" name="houseNumber" ng-model="orgInfo.houseNumber" maxlength="11" validHouseAndWare=true required>
-											</label>
-										</section>
-										<section class="col col-4">
-											<label class="label">油罐数<span style="color: red;">*</span></label> 
-											<label class="input"> 
-												<input type="text" name="tankNumber" ng-model="orgInfo.tankNumber" maxlength="11" validHouseAndWare=true required>
-											</label>
-										</section>
-									</div>
-									<div class="row">
-										<section class="col col-4">
 											<label class="label">首页库区图</label>
 											<div class="input input-file">
 									            <span class="button">
 									            	<input type="file" nv-file-select="" uploader="uploader" accept="image/*">
 									                	浏览
 									            </span><input type="text" name="birdsEye" ng-model="orgInfo.birdsEye" placeholder="" readonly="">
-									        </div>
+											</div>
 										</section>
 										<section class="col col-4">
 											<label class="label">粮库决策/智能仓房库区图</label>
@@ -460,6 +494,9 @@
 									            </span><input type="text" name="birdsRemote" ng-model="orgInfo.birdsRemote" placeholder="" readonly="">
 											</div>
 										</section>
+									</div>
+									<div class="row">
+
 										<section class="col col-4">
 											<label class="label">是否主库<span style="color: red;">*</span></label>
 											<label class="select"> 
@@ -470,6 +507,8 @@
 												</select><i></i>
 											</label>
 										</section>
+										<section class="col col-4"></section>
+										<section class="col col-4"></section>
 									</div>
 								</fieldset>