天津项目改造工程-客户管理改造

src/main/resources/static/app/business/contract/controller/contractChangeSaveCtrl.js

@@ -272,7 +272,7 @@ angular.module('app.business').controller("contractChangeSaveCtrl",
                     $scope.contract.mobile = result.enterprisePhone;
                 }
 		        // 开户行名称.
-		        $scope.contract.bankName = result.bankName;
+		        $scope.contract.bankName = $rootScope.dicData[result.bankName];
 		        // 银行账户名称.
 		        $scope.contract.accountName = result.accountName;
 		        // 开户账号

src/main/resources/static/app/business/contract/controller/contractSaveCtrl.js

@@ -493,7 +493,7 @@ angular.module('app.business').controller("contractSaveCtrl",
                         $scope.contract.identification = result.socialCreditCode;
                     }
                     // 开户行名称.
-                    $scope.contract.bankName = result.bankName;
+                    $scope.contract.bankName = $rootScope.dicData[result.bankName];
                     // 银行账户名称.
                     $scope.contract.accountName = result.accountName;
                     // 开户账号

src/main/resources/static/app/business/contract/controller/grainReservesContractChangeSaveCtrl.js

@@ -191,7 +191,7 @@ angular.module('app.business').controller("grainReservesContractChangeSaveCtrl",
                     $scope.contract.mobile = result.enterprisePhone;
                 }
 		        // 开户行名称.
-		        $scope.contract.bankName = result.bankName;
+		        $scope.contract.bankName = $rootScope.dicData[result.bankName];
 		        // 银行账户名称.
 		        $scope.contract.accountName = result.accountName;
 		        // 开户账号

src/main/resources/static/app/business/contract/controller/grainReservescontractSaveCtrl.js

@@ -280,7 +280,7 @@ angular.module('app.business').controller("grainReservescontractSaveCtrl",
                         $scope.contract.identification = result.socialCreditCode;
                     }
                     // 开户行名称.
-                    $scope.contract.bankName = result.bankName;
+                    $scope.contract.bankName = $rootScope.dicData[result.bankName];
                     // 银行账户名称.
                     $scope.contract.accountName = result.accountName;
                     // 开户账号

src/main/resources/static/app/business/contract/views/contract-edit.html

@@ -386,7 +386,7 @@
 											</th>
 											<th>
 												<section>
-		                                            <label class="input"> 
+		                                            <label class="input">
 		                                                <input class="form-control" type="text" ng-model="contract.bankName" name="bankName" ng-readonly="true" 
                                                         placeholder="选择客户，由客户带出">
 		                                            </label>

src/main/resources/static/app/business/customer/views/customer-edit.html

@@ -90,96 +90,138 @@
                                     </div>
                                     <div class="row">
                                         <section class="col col-4">
-                                            <label class="label">联系地址<span style="color: red;">*</span></label>
-                                            <label class="input"> 
+                                            <label class="label">通讯地址(省/直辖市)<span style="color: red;">*</span></label>
+                                            <label class="select">
+                                                <select id="province" ng-model="customer.province" name="province" 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="city" ng-model="customer.city" name="city" ng-options='enum.enumid as enum.enumname for enum in dicDataList[customer.province]' 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="county" ng-model="customer.county" name="county" ng-options='enum.enumid as enum.enumname for enum in dicDataList[customer.city]' 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="input">
                                                 <input class="form-control" type="text" ng-model="customer.address" ng-readonly="isNotEdit" name="address"
                                                 required>
                                             </label>
                                         </section>
+                                        <section class="col col-4">
+                                            <label class="label">联系人姓名<span style="color: red;">*</span></label>
+                                            <label class="input">
+                                                <input class="form-control" type="text" ng-model="customer.linkman" ng-readonly="isNotEdit" name="linkman"
+                                                       required>
+                                            </label>
+                                        </section>
+                                        <section class="col col-4">
+                                            <label class="label">联系人身份证号</label>
+                                            <label class="input">
+                                                <input class="form-control" type="text" ng-model="customer.lxrsfzh" ng-readonly="isNotEdit" name="lxrsfzh" validEmail=true />
+                                            </label>
+                                        </section>
                                     </div>
-                                    
+
                                     <div class="row">
                                         <section class="col col-4">
-                                            <label class="label">开票信息(发票抬头)</label> 
-                                            <label class="input"> 
+                                            <label class="label">开票信息(发票抬头)</label>
+                                            <label class="input">
                                                 <input class="form-control" type="text" ng-model="customer.invoiceTitle" ng-readonly="isNotEdit" name="invoiceTitle">
                                             </label>
                                         </section>
                                         <section class="col col-4">
-                                            <label class="label">开户行名称</label> 
-                                            <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="customer.bankName" ng-readonly="isNotEdit" name="bankName">
+                                            <label class="label">开户行名称</label>
+                                            <label class="select">
+                                                <select class="form-control" ng-model="customer.bankName" name="bankName"
+                                                        ng-options="enum.enumid as enum.enumname for enum in dicDataList[7167]" >
+                                                    <option value="" disabled>--请选择--</option>
+                                                </select><i></i>
                                             </label>
                                         </section>
                                         <section class="col col-4">
-                                            <label class="label">银行账户名称</label> 
-                                            <label class="input"> 
+                                            <label class="label">银行账户名称</label>
+                                            <label class="input">
                                                 <input class="form-control" type="text" ng-model="customer.accountName" ng-readonly="isNotEdit" name="accountName">
                                             </label>
                                         </section>
                                     </div>
-                                    
+
                                     <div class="row">
                                         <section class="col col-4">
-                                            <label class="label">开户账号<span style="color: red;">*</span></label> 
-                                            <label class="input"> 
-                                                <input id="verificationInputKhzh" class="form-control" type="text" ng-model="customer.accountNumber" ng-readonly="isNotEdit" name="accountNumber" 
+                                            <label class="label">开户账号<span style="color: red;">*</span></label>
+                                            <label class="input">
+                                                <input id="verificationInputKhzh" class="form-control" type="text" ng-model="customer.accountNumber" ng-readonly="isNotEdit" name="accountNumber"
                                                 required style="display:inline-blok;border:1px soild #A90329" khzhBlurs=true maxlength="30">
                                             </label>
                                             <div style="color:#D56161;display:none;font-size:11px" id="verificationContainerKhzh">不能填写“无”、“暂无”、“空”</div>
                                         </section>
                                         <section class="col col-4">
-                                            <label class="label">客户所属地区名称</label> 
-                                            <label class="input"> 
+                                            <label class="label">客户所属地区名称</label>
+                                            <label class="input">
                                                 <input class="form-control" type="text" ng-model="customer.district" ng-readonly="isNotEdit" name="district">
                                             </label>
                                         </section>
-                                        
+
                                         <section class="col col-4">
-                                            <label class="label">种植面积(亩)</label> 
-                                            <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="customer.plantAcreage" ng-readonly="isNotEdit" name="plantAcreage" 
+                                            <label class="label">种植面积(亩)</label>
+                                            <label class="input">
+                                                <input class="form-control" type="text" ng-model="customer.plantAcreage" ng-readonly="isNotEdit" name="plantAcreage"
                                                 validNumber="true">
                                             </label>
                                         </section>
                                     </div>
-                                    
+
                                     <div class="row">
                                         <section class="col col-4">
-                                            <label class="label">每亩的价外补贴数量(公斤)</label> 
-                                            <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="customer.subsidy" ng-readonly="isNotEdit" name="subsidy" 
+                                            <label class="label">每亩的价外补贴数量(公斤)</label>
+                                            <label class="input">
+                                                <input class="form-control" type="text" ng-model="customer.subsidy" ng-readonly="isNotEdit" name="subsidy"
                                                 validNumber="true">
                                             </label>
                                         </section>
                                         <section class="col col-4">
-                                            <label class="label">计划客户<span style="color: red;">*</span></label> 
-                                            <label class="input"> 
+                                            <label class="label">计划客户<span style="color: red;">*</span></label>
+                                            <label class="input">
                                                 <input class="form-control" type="text" ng-model="customer.businessRegistNum" ng-readonly="isNotEdit" name="businessRegistNum" required>
-                                                
+
                                             </label>
                                         </section>
                                         <section class="col col-4">
-                                            <label class="label">收款人<span style="color: red;">*</span></label> 
-                                            <label class="input"> 
+                                            <label class="label">收款人<span style="color: red;">*</span></label>
+                                            <label class="input">
                                                 <input class="form-control" type="text" ng-model="customer.administrativeDivision" ng-readonly="isNotEdit" name="administrativeDivision" required>
                                             </label>
                                         </section>
                                         <!-- <section class="col col-4">
-                                            <label class="label">通讯地址</label> 
-                                            <label class="input"> 
+                                            <label class="label">通讯地址</label>
+                                            <label class="input">
                                                 <input class="form-control" type="text" ng-model="customer.txdz" ng-readonly="isNotEdit" name="txdz">
                                             </label>
                                         </section>-->
                                         <section class="col col-4">
-                                            <label class="label">邮政编码</label> 
-                                            <label class="input"> 
+                                            <label class="label">邮政编码</label>
+                                            <label class="input">
                                                 <input class="form-control" type="text" ng-model="customer.yzbm" ng-readonly="isNotEdit" name="yzbm">
-                                                
+
                                             </label>
-                                        </section> 
+                                        </section>
                                     </div>
-                                    
+
                                     <div class="row">
                                         <fieldset>
                                             <section>
@@ -191,10 +233,10 @@
                                         </fieldset>
                                     </div>
                                 </fieldset>
-                                
-                                
-                                
-                                
+
+
+
+
                                 <!-- 企业客户 -->
                                 <header ng-show="customer.classify == 3153">
                                     <h6>
@@ -204,152 +246,186 @@
                                 <fieldset ng-show="customer.classify == 3153">
                                     <div class="row">
                                         <section class="col col-4">
-                                            <label class="label">企业性质</label> 
-                                            <label class="select"> 
-                                                <select ng-model="customer.generalProperty" name="generalProperty" ng-disabled="isNotEdit" 
+                                            <label class="label">企业性质</label>
+                                            <label class="select">
+                                                <select ng-model="customer.generalProperty" name="generalProperty" ng-disabled="isNotEdit"
                                                 ng-options="enum.enumid as enum.enumname for enum in dicDataList[1014]">
                                                     <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"> 
+                                            <label class="label">统一社会信用代码<span style="color: red;">*</span></label>
+                                            <label class="input">
                                                 <input class="form-control" type="text" ng-model="customer.socialCreditCode" ng-readonly="isNotEdit" name="socialCreditCode"
                                                 qyLength=true required maxlength="18">
                                             </label>
                                         </section>
                                         <section class="col col-4">
-                                            <label class="label">注册资本(万元)<span style="color: red;">*</span></label> 
-                                            <label class="input"> 
+                                            <label class="label">注册资本(万元)<span style="color: red;">*</span></label>
+                                            <label class="input">
                                                 <input class="form-control" type="number" ng-model="customer.registeredCapital" ng-readonly="isNotEdit" name="registeredCapital"
                                                 required onkeyup="this.value=this.value.match(/\d+(\.\d{0,5})?/) ? this.value.match(/\d+(\.\d{0,5})?/)[0] : '' ">
                                             </label>
                                         </section>
                                     </div>
-                                    
+
                                     <div class="row">
                                         <section class="col col-4">
-                                            <label class="label">法人<span style="color: red;">*</span></label> 
-                                            <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="customer.legalPerson" ng-readonly="isNotEdit" name="legalPerson" 
+                                            <label class="label">法人<span style="color: red;">*</span></label>
+                                            <label class="input">
+                                                <input class="form-control" type="text" ng-model="customer.legalPerson" ng-readonly="isNotEdit" name="legalPerson"
                                                 required>
                                             </label>
                                         </section>
                                         <section class="col col-4">
-                                            <label class="label">联系人<span style="color: red;">*</span></label> 
-                                            <label class="input"> 
+                                            <label class="label">联系人<span style="color: red;">*</span></label>
+                                            <label class="input">
                                                 <input class="form-control" type="text" ng-model="customer.linkman" ng-readonly="isNotEdit" name="linkman"
                                                 required>
                                             </label>
                                         </section>
                                         <section class="col col-4">
-                                            <label class="label">电子邮件</label>
-                                            <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="customer.email" ng-readonly="isNotEdit" name="email" validEmail=true>
+                                            <label class="label">联系人身份证号</label>
+                                            <label class="input">
+                                                <input class="form-control" type="text" ng-model="customer.lxrsfzh" ng-readonly="isNotEdit" name="lxrsfzh" validEmail=true />
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-4">
+                                            <label class="label">通讯地址(省/直辖市)<span style="color: red;">*</span></label>
+                                            <label class="select">
+                                                <select ng-model="customer.province" name="province" 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 ng-model="customer.city" name="city" ng-options='enum.enumid as enum.enumname for enum in dicDataList[customer.province]' 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 ng-model="customer.county" name="county" ng-options='enum.enumid as enum.enumname for enum in dicDataList[customer.city]' 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="input"> 
+                                            <label class="input">
                                                 <input class="form-control" type="text" ng-model="customer.address" ng-readonly="isNotEdit" name="address"
                                                 required>
                                             </label>
                                         </section>
                                         <section class="col col-4">
                                             <label class="label">企业电话<span style="color: red;">*</span></label>
-                                            <label class="input"> 
+                                            <label class="input">
                                                 <input class="form-control" type="text" ng-model="customer.enterprisePhone" ng-readonly="isNotEdit" name="enterprisePhone"
                                                 validqydh=true required>
                                             </label>
                                         </section>
+                                        <section class="col col-4">
+                                            <label class="label">电子邮件</label>
+                                            <label class="input">
+                                                <input class="form-control" type="text" ng-model="customer.email" ng-readonly="isNotEdit" name="email" validEmail=true>
+                                            </label>
+                                        </section>
                                     </div>
-                                    
+
                                     <div class="row">
                                         <section class="col col-4">
-                                            <label class="label">开票信息(发票抬头)<span style="color: red;">*</span></label> 
-                                            <label class="input"> 
+                                            <label class="label">开票信息(发票抬头)<span style="color: red;">*</span></label>
+                                            <label class="input">
                                                 <input class="form-control" type="text" ng-model="customer.invoiceTitle" ng-readonly="isNotEdit" name="invoiceTitle"
                                                 required>
                                             </label>
                                         </section>
                                         <section class="col col-4">
-                                            <label class="label">开户行名称<span style="color: red;">*</span></label> 
-                                            <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="customer.bankName" ng-readonly="isNotEdit" name="bankName" required>
+                                            <label class="label">开户行名称<span style="color: red;">*</span></label>
+                                            <label class="select">
+                                                <select class="form-control" ng-model="customer.bankName" name="bankName"
+                                                        ng-options="enum.enumid as enum.enumname for enum in dicDataList[7167]" required>
+                                                    <option value="" disabled>--请选择--</option>
+                                                </select><i></i>
                                             </label>
                                         </section>
                                         <section class="col col-4">
-                                            <label class="label">银行账户名称<span style="color: red;">*</span></label> 
-                                            <label class="input"> 
+                                            <label class="label">银行账户名称<span style="color: red;">*</span></label>
+                                            <label class="input">
                                                 <input class="form-control" type="text" ng-model="customer.accountName" ng-readonly="isNotEdit" name="accountName"
                                                 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 id="verificationInput" class="form-control" type="text" ng-model="customer.accountNumber" ng-readonly="isNotEdit" name="accountNumber" 
+                                            <label class="label">开户账号<span style="color: red;">*</span></label>
+                                            <label class="input">
+                                                <input id="verificationInput" class="form-control" type="text" ng-model="customer.accountNumber" ng-readonly="isNotEdit" name="accountNumber"
                                                 required style="display:inline-blok;border:1px soild #A90329" khzhBlur=true maxlength="30">
                                             </label>
                                             <div style="color:#D56161;display:none;font-size:11px" id="verificationContainer">不能填写“无”、“暂无”、“空”</div>
                                         </section>
                                         <section class="col col-4">
-                                            <label class="label">客户所属地区名称<span style="color: red;">*</span></label> 
-                                            <label class="input"> 
+                                            <label class="label">客户所属地区名称<span style="color: red;">*</span></label>
+                                            <label class="input">
                                                 <input class="form-control" type="text" ng-model="customer.district" ng-readonly="isNotEdit" name="district"
                                                 required>
                                             </label>
                                         </section>
-                                        
+
                                         <section class="col col-4">
-                                            <label class="label">种植面积(亩)</label> 
-                                            <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="customer.plantAcreage" ng-readonly="isNotEdit" name="plantAcreage" 
+                                            <label class="label">种植面积(亩)</label>
+                                            <label class="input">
+                                                <input class="form-control" type="text" ng-model="customer.plantAcreage" ng-readonly="isNotEdit" name="plantAcreage"
                                                 validNumber="true">
                                             </label>
                                         </section>
                                     </div>
-                                    
+
                                     <div class="row">
                                         <section class="col col-4">
-                                            <label class="label">每亩的价外补贴数量(公斤)</label> 
-                                            <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="customer.subsidy" ng-readonly="isNotEdit" name="subsidy" 
+                                            <label class="label">每亩的价外补贴数量(公斤)</label>
+                                            <label class="input">
+                                                <input class="form-control" type="text" ng-model="customer.subsidy" ng-readonly="isNotEdit" name="subsidy"
                                                 validNumber="true">
                                             </label>
                                         </section>
                                         <section class="col col-4">
-                                            <label class="label">计划客户<span style="color: red;">*</span></label> 
-                                            <label class="input"> 
+                                            <label class="label">计划客户<span style="color: red;">*</span></label>
+                                            <label class="input">
                                                 <input class="form-control" type="text" ng-model="customer.businessRegistNum" ng-readonly="isNotEdit" name="businessRegistNum" required>
-                                                
+
                                             </label>
                                         </section>
                                         <section class="col col-4">
-                                            <label class="label">收款人<span style="color: red;">*</span></label> 
-                                            <label class="input"> 
+                                            <label class="label">收款人<span style="color: red;">*</span></label>
+                                            <label class="input">
                                                 <input class="form-control" type="text" ng-model="customer.administrativeDivision" ng-readonly="isNotEdit" name="administrativeDivision" required>
                                             </label>
                                         </section>
                                        <!--  <section class="col col-4">
-                                            <label class="label">通讯地址</label> 
-                                            <label class="input"> 
+                                            <label class="label">通讯地址</label>
+                                            <label class="input">
                                                 <input class="form-control" type="text" ng-model="customer.txdz" ng-readonly="isNotEdit" name="txdz">
                                             </label>
                                         </section>-->
                                         <section class="col col-4">
-                                            <label class="label">邮政编码</label> 
-                                            <label class="input"> 
+                                            <label class="label">邮政编码</label>
+                                            <label class="input">
                                                 <input class="form-control" type="text" ng-model="customer.yzbm" ng-readonly="isNotEdit" name="yzbm">
                                             </label>
-                                        </section> 
+                                        </section>
                                     </div>
                                     <div class="row">
                                         <fieldset>
@@ -362,7 +438,7 @@
                                         </fieldset>
                                     </div>
                                 </fieldset>
-                                
+
                                 <div>
                                     <footer class="text-align-center">
                                         <button type="button" class="btn btn-default" ng-click="retList()">取消</button>

src/main/resources/static/app/business/transferContract/controller/transferContractChangeSaveCtrl.js

@@ -322,7 +322,7 @@ angular.module('app.business').controller("transferContractChangeSaveCtrl",
                     $scope.contract.mobile = result.enterprisePhone;
                 }
 		        // 开户行名称.
-		        $scope.contract.bankName = result.bankName;
+		        $scope.contract.bankName = $rootScope.dicData[result.bankName];
 		        // 银行账户名称.
 		        $scope.contract.accountName = result.accountName;
 		        // 开户账号

src/main/resources/static/app/business/transferContract/controller/transferContractSaveCtrl.js

@@ -348,7 +348,7 @@ angular.module('app.business').controller("transferContractSaveCtrl",
 		            $scope.contract.identification = result.socialCreditCode;
                 }
 		        // 开户行名称.
-		        $scope.contract.bankName = result.bankName;
+		        $scope.contract.bankName = $rootScope.dicData[result.bankName];
 		        // 银行账户名称.
 		        $scope.contract.accountName = result.accountName;
 		        // 开户账号