From 168d852672f8f671a01d6f0f053349d0d321ec7c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 03 一月 2024 11:43:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth.html |  346 +++++++++++++++++++--------------------------------------
 1 files changed, 115 insertions(+), 231 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth.html
index a3b2079..10faf49 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/operator/OperatorUser_proportionAuth.html
@@ -51,7 +51,6 @@
                 <span>管理员姓名:</span><span>${user.name}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                 <span>管理员电话:</span><span>${user.phone}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             </div>
-
             <h2>商户号信息</h2>
             </br>
             </br>
@@ -60,196 +59,142 @@
                 <div class="col-lg-6" style="">
                     <div class="form-group">
                         <label class="col-sm-4 control-label" >
-                            主体类型:<input checked type="radio" name="bodyType" value="ENTERPRISE" onclick="updateHalf(2)">企业
-                            <input  type="radio" name="bodyType" value="IND_BIZ" onclick="updateHalf(1)">个人
-
+                            商户类型:<input checked type="radio" name="bodyType" value="01" onclick="updateHalf(2)">企业
+                            <input  type="radio" name="bodyType" value="07" onclick="updateHalf(1)">个人
                         </label>
                     </div>
                     <div class="form-group" >
+                        <label class="col-sm-3 control-label">*商户名称(一般与证件名称相同):</label>
+                        <div class="col-sm-9">
+                            <input style="width: 300px" class="form-control" value="" id="businessName"  placeholder="请输入商户名称" type="text">
+                        </div>
+                    </div>
+                    <div class="form-group" >
+                        <label class="col-sm-3 control-label">*商户别名(支付宝账单显示的商户名称):</label>
+                        <div class="col-sm-9">
+                            <input style="width: 300px" class="form-control" value="" id="aliasName"  placeholder="请输入商户别名" type="text">
+                        </div>
+                    </div>
+
+                    <div class="form-group" >
                         <label class="col-sm-3 control-label">*联系人姓名:</label>
                         <div class="col-sm-9">
-                            <input style="width: 300px" class="form-control" value="${item.name}" id="name"  placeholder="请输入" type="text">
+                            <input style="width: 300px" class="form-control" value="" id="name"  placeholder="请输入" type="text">
                         </div>
                     </div>
                     <div class="form-group" >
                         <label class="col-sm-3 control-label">*联系人电话:</label>
                         <div class="col-sm-9">
-                            <input style="width: 300px" class="form-control" value="${item.phone}" id="phone"  placeholder="请输入" type="text">
+                            <input style="width: 300px" class="form-control" value="" id="phone"  placeholder="请输入" type="text">
                         </div>
                     </div>
-                    <div class="form-group" >
-                        <label class="col-sm-3 control-label">*联系人身份证号:</label>
-                        <div class="col-sm-9">
-                            <input style="width: 300px" class="form-control" value="${item.number}" id="number"  placeholder="请输入" type="text">
+                        <div class="form-group" >
+                            <label class="col-sm-3 control-label">*法人姓名:</label>
+                            <div class="col-sm-9" >
+                                <input style="width: 300px" class="form-control" id="legalPerson" value=""  placeholder="请输入" type="text">
+                            </div>
                         </div>
-                    </div>
-                    <div class="form-group" >
-                        <label class="col-sm-3 control-label">*法定代表人姓名:</label>
-                        <div class="col-sm-9">
-                            <input style="width: 300px" class="form-control" id="lrName" value="${item.legalPerson}"  placeholder="请输入" type="text">
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">*法人身份证号:</label>
+                            <div class="col-sm-9">
+                                <input style="width: 300px" class="form-control" value="" id="leagleNumber"  placeholder="请输入" type="text">
+                            </div>
                         </div>
-                    </div>
-                </div>
-                <div class="col-lg-6" style="">
-                    <div class="form-group" >
-                        <label class="col-sm-3 control-label">*营业执照商户名称:</label>
-                        <div class="col-sm-9">
-                            <input style="width: 300px" class="form-control" value="${item.businessName}"  id="merchantName"  placeholder="请输入" type="text">
+                        <div class="form-group">
+                            <#avatar id="IDCardImg" name="*法人身份证正面照" avatarImg="" />
                         </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">*营业证照生效时间:</label>
-                        <div class="col-sm-9" style="display: flex">
-                            <input style="width: 300px" class="form-control" id="tradeTime" value="${item.businessTerm}" name="tradeTime" type="date">
+                        <div class="form-group">
+                            <#avatar id="IDCardImg1" name="*法人身份证背面照" avatarImg="" />
                         </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">*营业证照过期时间:</label>
-                        <div class="col-sm-9" style="display: flex">
-                            <input style="width: 300px" class="form-control" id="endTime" value="${item.businessEnd}" name="endTime" type="date">
-                            <input type="checkbox" style="margin-left: 10px" id="tradeE" value="0" onchange="TSite.tradeYse(this)">长期</input>
-                        </div>
-                    </div>
-                    <div class="form-group" >
-                        <label class="col-sm-3 control-label">*营业执照注册号:</label>
-                        <div class="col-sm-9" >
-                            <input style="width: 300px" class="form-control" id="licenseRegistration" value="${item.businessNumber}"  placeholder="请输入" type="text">
-                        </div>
-                    </div>
-                    <div class="form-group" >
-                        <label class="col-sm-3 control-label">*注册地址:</label>
-                        <div class="col-sm-9" >
-                            <input style="width: 300px" class="form-control" id="registerAddress" value="${item.registerAddress}"  placeholder="请输入" type="text">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <#avatar id="license" name="*营业执照" avatarImg="${item.businessPicture}" />
-                    </div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-lg-6" style="">
-                    <div class="form-group" >
-                        <label class="col-sm-3 control-label">*法人姓名:</label>
-                        <div class="col-sm-9" >
-                            <input style="width: 300px" class="form-control" id="legalPerson" value="${item.legalPerson}"  placeholder="请输入" type="text">
-                        </div>
-                    </div>
-                    <div class="form-group" >
-                        <label class="col-sm-3 control-label">*法人手机号:</label>
-                        <div class="col-sm-9">
-                            <input style="width: 300px" class="form-control" id="legalPhone" value="${item.legalPhone}"  placeholder="请输入" type="text">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">*法人身份证开始时间:</label>
-                        <div class="col-sm-9" style="display: flex">
-                            <input style="width: 300px" class="form-control" id="IDCardTime" value="${item.legalTerm}" name="IDCardTime" type="date">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">*法人身份证结束时间:</label>
-                        <div class="col-sm-9" style="display: flex">
-                            <input style="width: 300px" class="form-control" value="${item.legalEnd}" id="IDCardEnd" name="IDCardTime" type="date">
-                            <input type="checkbox" style="margin-left: 10px" id="IDCardE" value="0" onchange="TSite.tradeYse(this)">长期</input>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <#avatar id="IDCardImg" name="*法人身份证正面照" avatarImg="${item.legalFront}" />
-                    </div>
-                </div>
-                <div class="col-lg-6" style="">
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">*法人身份证号:</label>
-                        <div class="col-sm-9">
-                            <input style="width: 300px" class="form-control" value="${item.leagleNumber}" id="lIDNumber"  placeholder="请输入" type="text">
-                        </div>
-                    </div>
-                    <div class="form-group" >
-                        <label class="col-sm-3 control-label">*法人邮箱:</label>
-                        <div class="col-sm-9">
-                            <input style="width: 300px" class="form-control" value="${item.legalEmail}" id="lEmail"  placeholder="请输入" type="text">
-                        </div>
-                    </div>
-                    <div class="form-group" >
-                        <label class="col-sm-3 control-label">*法人身份证地址:</label>
-                        <div class="col-sm-9">
-                            <input style="width: 300px" class="form-control" value="${item.legalAddress}" id="lIDAddress"  placeholder="请输入" type="text">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <#avatar id="IDCardImg1" name="*法人身份证背面照" avatarImg="${item.legalBack}" />
-                    </div>
-                </div>
-            </div>
 
-            <div class="row" id="benefit">
+                    <div class="form-group" >
+                        <label class="col-sm-3 control-label">*签约支付宝账号:</label>
+                        <div class="col-sm-9" >
+                            <input style="width: 300px" class="form-control" id="zfbAccount" value="${item.zfbAccount}"  placeholder="请输入" type="text">
+                        </div>
+                    </div>
+                </div>
                 <div class="col-lg-6" style="">
+                    <div class="form-group" >
+                        <label class="col-sm-3 control-label">*营业执照编号:</label>
+                        <div class="col-sm-9" >
+                            <input style="width: 300px" class="form-control" id="businessNumber" value=""  placeholder="请输入" type="text">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <#avatar id="license" name="*营业执照" avatarImg="${item.certImage}" />
+                    </div>
                     <div class="form-group">
                         <label class="col-sm-4 control-label" >
-                            法人是否为受益人:<input type="radio" checked name="type" value="true">是
-                            <input checked type="radio" name="type" value="false">否
+                            结算账户类型:<input checked type="radio" name="accountType" value="bankCard" onclick="updateHalf(3)">银行卡
+                            <input  type="radio" name="accountType" value="alipayAccount" onclick="updateHalf(4)">支付宝账号
                         </label>
                     </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">*受益人姓名:</label>
-                        <div class="col-sm-9">
-                            <input style="width: 300px" class="form-control" value="${item.beneficiary}" id="bName" name="bName" type="text">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">*受益人身份证地址:</label>
-                        <div class="col-sm-9">
-                            <input style="width: 300px" class="form-control" id="bAddress" value="${item.beneficiaryAddress}"  placeholder="请输入" type="text">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">*受益人身份证有效期:</label>
-                        <div class="col-sm-9">
-                            <input style="width: 300px" class="form-control" value="${item.beneficiaryTerm}" id="bTime" name="bTime" type="date">
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">*受益人身份证结束时间:</label>
-                        <div class="col-sm-9" style="display: flex">
-                            <input style="width: 300px" class="form-control" id="bEnd" value="${item.beneficiaryEnd}" name="IDCardTime" type="date">
-                            <input type="checkbox" style="margin-left: 10px" id="bIDCardT" value="0" onchange="TSite.tradeYse(this)">长期</input>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <#avatar id="bImg1" avatarImg="${item.beneficiaryFront}" name="*受益人身份证正面照" />
-                    </div>
-                </div>
-                <div class="col-lg-6" >
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">*受益人身份证号:</label>
+                    <div class="form-group" hidden id="aliNumber">
+                        <label class="col-sm-3 control-label">*支付宝账号:</label>
                         <div class="col-sm-9" >
-                            <input style="width: 300px" class="form-control" id="bIDNumber" value="${item.beneficiaryNumber}"  placeholder="请输入" type="text">
+                            <input style="width: 300px" class="form-control" id="alipayAccount" value=""  placeholder="请输入" type="text">
                         </div>
                     </div>
-                    <div class="form-group">
-                        <#avatar id="bImg2" avatarImg="${item.beneficiaryBack}" name="*受益人身份证背面照" />
-                    </div>
-                </div>
-            </div>
-            @if(reasons != null){
-            <div class="row" id="reasons">
-                <div class="col-lg-6" >
-                    <div class="form-group">
-                        <label class="col-sm-3 control-label">*拒绝理由:</label>
-                        <div class="col-sm-9">
-                            <h3 style="color: red">${item.refuseReason}</h3>
+                    <div id="banks">
+                        <div class="form-group" >
+                            <label class="col-sm-3 control-label">*银行卡号:</label>
+                            <div class="col-sm-9" >
+                                <input style="width: 300px" class="form-control" id="bankCard" value=""  placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label" >
+                                账号使用类型:<input checked type="radio" name="useType" value="01" >对公
+                                <input  type="radio" name="useType" value="02" >对私
+                            </label>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label" >
+                                银行卡类型:<input checked type="radio" name="cardType" value="DC" onclick="updateHalf(2)">借记卡
+                                <input  type="radio" name="cardType" value="CC" onclick="updateHalf(1)">信用卡
+                            </label>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">*开户银行:</label>
+                            <div class="col-sm-9">
+                                <input style="width: 300px" class="form-control" id="bankName" value=""  placeholder="请输入(例:中国农业银行)" type="text">
+                            </div>
+                        </div>
+                        <div class="form-group" >
+                            <label class="col-sm-3 control-label">*开户支行名称:</label>
+                            <div class="col-sm-9" >
+                                <input style="width: 300px" class="form-control" id="bankName1" value=""  placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                        <div class="form-group" >
+                            <label class="col-sm-3 control-label">*开户名称:</label>
+                            <div class="col-sm-9" >
+                                <input style="width: 300px" class="form-control" id="bankUserName" value=""  placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                        <div class="form-group" id="provinceCode">
+                            <label class="col-sm-3 control-label">*开户行所在省:</label>
+                            <div class="col-sm-9">
+                                <select style="width: 300px" class="form-control" id="pCode" name="pCode" onchange="TSite.oneChange2(this)">
+                                    <option value="">请选择省</option>
+                                    @for(obj in list){
+                                    <option style="width: 300px" value="${obj.code}">${obj.name}</option>
+                                    @}
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form-group" id="cityCode">
+                            <label class="col-sm-3 control-label">*开户行所在市:</label>
+                            <div class="col-sm-9">
+                                <select style="width: 300px" class="form-control" id="cCode" name="cCode" >
+                                    <option value="">请选择市</option>
+                                </select>
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
-            @}
-            @if(code != null){
-            @if(type==1){
-            <label class="col-sm-3 control-label">请使用手机支付宝扫描下方二维码完成进一步认证</label>
-            <img src="${code}">
-            @}
-            @}
             <div class="form-group">
                 <div class="row btn-group-m-t">
                     <div class="col-sm-10 col-sm-offset-5" >
@@ -268,77 +213,16 @@
 <link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
 <script>
     function updateHalf(e) {
-        if(e==1){
-            console.log("隐藏")
-            $("#benefit").hide()
-        }else {
+        if(e==3){
             console.log("展示")
-            $("#benefit").show()
+            $("#banks").show()
+            $("#aliNumber").hide()
+        }else if (e==4){
+            // 结算到支付宝账号
+            console.log("隐藏")
+            $("#banks").hide()
+            $("#aliNumber").show()
         }
-    }
-    window.onload = function(){
-        if ("${item.orderStatus}"=="AUDIT_PASS"){
-            $("#reasons").hide()
-        }else{
-            $("#reasons").show()
-        }
-        if ("${item.orderStatus}"==null){
-            $("#reasons").hide()
-        }
-        console.log("${bodyType}")
-        var OBJradio=document.getElementsByName("bodyType")
-        var type=document.getElementsByName("type")
-        console.log("回显")
-        if ("${bodyType}" != 0){
-            console.log("进入")
-            if("${bodyType}"=="ENTERPRISE"){
-                OBJradio[0].checked=true
-                $("#benefit").show()
-                // 受益人身份证有效期
-                var IDCardE = document.getElementById("IDCardE");
-                var IDCardEnd = document.getElementById('IDCardEnd');
-                if ("${item.legalEnd}" == "forever"){
-                    IDCardE.checked=true;
-                    IDCardEnd.disabled = true;
-                    IDCardEnd.value="";
-                }
-                if ("${item.isBeneficiary}" == "true"){
-                    type[0].checked=true
-                }else{
-                    type[1].checked=true
-                }
-            }else {
-                OBJradio[1].checked=true
-                $("#benefit").hide()
-            }
-        }
-
-        // 营业执照有效结束期
-        var bunessTime = document.getElementById("tradeE");
-        var endTime = document.getElementById('endTime');
-        if ("${item.businessEnd}" == "forever"){
-            bunessTime.checked=true;
-            endTime.disabled = true;
-            endTime.value="";
-        }
-        // 法人身份证有效期
-        var IDCardE = document.getElementById("IDCardE");
-        var IDCardEnd = document.getElementById('IDCardEnd');
-        if ("${item.legalEnd}" == "forever"){
-            IDCardE.checked=true;
-            IDCardEnd.disabled = true;
-            IDCardEnd.value="";
-        }
-        // 受益人身份证有效期
-        var bEnd = document.getElementById("bEnd");
-        var bIDCardT = document.getElementById('bIDCardT');
-        if ("${item.beneficiaryEnd}" == "forever"){
-            bIDCardT.checked=true;
-            bEnd.disabled = true;
-            bEnd.value="";
-        }
-
-
     }
 </script>
 @}

--
Gitblit v1.7.1