From 85eab076207efee683efb6fd04b2ca48b24d797a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 22 二月 2023 17:15:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html | 276 +++++++------------------------------------------------
1 files changed, 36 insertions(+), 240 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
index 84b7d6f..615e008 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
@@ -1,257 +1,53 @@
@layout("/common/_container.html"){
<div class="ibox float-e-margins">
<div class="ibox-content">
- <div class="form-horizontal" id="yesDriverInfoForm">
- <input type="hidden" id="roleType" name="roleType" value="${roleType}">
+ <div class="form-horizontal">
+
<div class="row">
- <div class="col-sm-10">
- <#input id="name" name="司机姓名" />
-
- <div class="form-group">
- <label class="col-sm-3 control-label">所属机构：</label>
- <div class="col-sm-9" style="display: flex;align-items: center;">
- @if(roleType == 1){
- <div class="radio radio-info radio-inline">
- <input type="radio" id="companyType1" value="1" name="companyType" checked="" onclick="YesDriverInfoDlg.companyTypeClick(1)">
- <label for="companyType1"> 平台司机 </label>
- </div>
- <div class="radio radio-success radio-inline">
- <input type="radio" id="companyTyp2" value="2" name="companyType" onclick="YesDriverInfoDlg.companyTypeClick(2)">
- <label for="companyTyp2"> 加盟司机 </label>
- </div>
- <select class="form-control companyDiv" id="oneId" onchange="YesDriverInfoDlg.oneChange(this)" style="width: 200px;display: none;" >
- <option value="">选择所属分公司</option>
- @for(obj in companyList!){
- <option value="${obj.id}">${obj.name}</option>
- @}
- </select>
- <select class="form-control companyDiv" id="twoId" style="width: 200px;margin-left: 30px;display: none;">
- <option value="">选择所属加盟商</option>
- </select>
- @}else if(roleType == 2){
- <span class="control-label">${objectName!}</span>
- <select class="form-control" id="franchiseeId" style="width: 200px;margin-left: 30px;">
- <option value="">选择所属加盟商</option>
- @for(obj in franchiseeList!){
- <option value="${obj.id}">${obj.name}</option>
- @}
- </select>
- @}else if(roleType == 3){
- <span class="control-label">${objectName!}</span>
- @}
- </div>
- </div>
-
- <#avatar id="headImgUrl" name="头像：" />
- <#avatar id="faceImgUrl" name="人脸识别照片：" />
- <!--<#input id="phone" name="手机号" />-->
- <div class="form-group">
- <label class="col-sm-3 control-label">性别：</label>
- <div class="col-sm-9" style="display: flex;align-items: center;">
- <div class="radio radio-info radio-inline">
- <input type="radio" id="sex1" value="1" name="sex" checked="" >
- <label for="sex1"> 男 </label>
- </div>
- <div class="radio radio-success radio-inline">
- <input type="radio" id="sex2" value="2" name="sex" >
- <label for="sex2"> 女 </label>
- </div>
- </div>
- </div>
- <#input id="driveCard" name="驾驶证号码"/>
- <#avatar id="driveCardImgUrl" name="驾驶证照片：" />
- <#input id="driverAge" name="驾龄" />
- <#input id="idCard" name="身份证号" />
- <#input id="driverAddress" name="居住地址" />
- <#input id="taxiAptitudeCard" name="出租车资格证号" />
- <#avatar id="networkCarlssueImg" name="网约车资格证照片：" />
- <#input id="jobNumber" name="工号(选填)" />
- <div class="form-group">
- <fieldset>
- <label class="col-sm-3 control-label">经营业务：</label>
- <div class="col-sm-9">
- <div class="checkbox checkbox-success checkbox-inline">
- <input type="checkbox" name="serverBox" id="serverBox1" value="1">
- <label for="serverBox1"> 专车 </label>
- </div>
- <div class="checkbox checkbox-success checkbox-inline">
- <input type="checkbox" name="serverBox" id="serverBox2" value="2">
- <label for="serverBox2"> 出租车 </label>
- </div>
- <div class="checkbox checkbox-success checkbox-inline">
- <input type="checkbox" name="serverBox" id="serverBox3" value="3" onclick="YesDriverInfoDlg.checkBox()" >
- <label for="serverBox3"> 跨城出行 </label>
- </div>
- <div class="checkbox checkbox-success checkbox-inline">
- <input type="checkbox" name="serverBox" id="serverBox4" value="4">
- <label for="serverBox4"> 小件物流-同城 </label>
- </div>
- <div class="checkbox checkbox-success checkbox-inline">
- <input type="checkbox" name="serverBox" id="serverBox5" value="5">
- <label for="serverBox5"> 小件物流-跨城 </label>
- </div>
- <div class="checkbox checkbox-success checkbox-inline">
- <input type="checkbox" name="serverBox" id="serverBox6" value="6">
- <label for="serverBox6"> 包车 </label>
- </div>
- </div>
- </fieldset>
- </div>
- <div id="lineDiv" style="display: none;">
- <div class="form-group">
- <label class="col-sm-3 control-label">关联线路：</label>
- <div class="col-sm-3">
- <select class="form-control" id="selectLineId">
- <option value="">选择关联线路</option>
- @for(obj in lineList){
- <option value="${obj.id}">${obj.name}</option>
- @}
- </select>
- </div>
- <div class="col-sm-2">
- <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="YesDriverInfoDlg.addLine()"/>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">已添加线路</label>
- <div class="col-sm-9">
- <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
- <table class="table table-striped table-bordered table-hover table-condensed">
- <thead>
- <tr>
- <th style="width: 300px;text-align: center;">关联时间</th>
- <th style="width: 300px;text-align: center;">线路名称</th>
- <th style="width: 100px;text-align: center;">操作</th>
- </tr>
- </thead>
- <tbody id="line">
-
- </tbody>
- </table>
- </div>
- </div>
- </div>
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键" underline="true"/>
+ <#input id="code" name="编号" underline="true"/>
+ <#input id="name" name="姓名" underline="true"/>
+ <#input id="avatar" name="头像" underline="true"/>
+ <#input id="phone" name="手机号" underline="true"/>
+ <#input id="password" name="密码" underline="true"/>
+ <#input id="sex" name="性别（1=男，2=女）" underline="true"/>
+ <#input id="source" name="来源（1=）" underline="true"/>
+ <#input id="emergencyContact" name="紧急联系人" underline="true"/>
+ <#input id="emergencyPhone" name="紧急联系电话" underline="true"/>
+ <#input id="driverLicenseNumber" name="驾驶证号码" underline="true"/>
+ <#input id="driverLicense" name="驾驶证照片" underline="true"/>
+ <#input id="idcard" name="身份证号码" underline="true"/>
+ <#input id="idcardFront" name="身份证正面照"/>
</div>
-
- <#input id="phone" name="登录账号【手机号】" />
- <#input id="password" name="密码" type="password"/>
- <#input id="rePassword" name="确认密码" type="password"/>
-
- <#input id="driverNationality" name="国籍"/>
- <#input id="driverNation" name="民族"/>
- <div class="form-group">
- <label class="col-sm-3 control-label">婚姻状况：</label>
- <div class="col-sm-3">
- <select class="form-control" id="driverMaritalStatus">
- <option value="1">已婚</option>
- <option value="2">未婚</option>
- <option value="3">离异</option>
- </select>
- </div>
- </div>
- <#input id="driverLanguageLevel" name="外语能力"/>
- <#input id="driverEducation" name="学历"/>
- <#input id="driverCensus" name="户口登记机关名称"/>
- <#input id="driverAddress" name="户口地址"/>
- <#input id="driverContactAddress" name="通信地址"/>
- <#input id="getDriverLicenseDate" name="初次领取驾驶证日期"/>
- <#input id="driverLicenseOn" name="驾驶证有效期限起"/>
- <#input id="driverLicenseOff" name="驾驶证有效期限止"/>
- <div class="form-group">
- <label class="col-sm-3 control-label">是否巡游出租车驾驶员：</label>
- <div class="col-sm-3">
- <select class="form-control" id="taxiDriver">
- <option value="0">否</option>
- <option value="1">是</option>
- </select>
- </div>
- </div>
- <#input id="networkCarlssueOrganization" name="网络预约出租车驾驶员证发证机构"/>
- <#input id="networkCarlssueDate" name="资格证发证日期"/>
- <#input id="getNetworkCarProofDate" name="初次认领资格证日期"/>
- <#input id="networkCarProofOn" name="资格证有效起始日期"/>
- <#input id="networkCarProofOff" name="资格证有效截至日期"/>
- <#input id="registerDate" name="报备日期"/>
- <div class="form-group">
- <label class="col-sm-3 control-label">是否是专职驾驶员：</label>
- <div class="col-sm-3">
- <select class="form-control" id="fullTimeDriver">
- <option value="0">否</option>
- <option value="1">是</option>
- </select>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">是否在驾驶员黑名单内：</label>
- <div class="col-sm-3">
- <select class="form-control" id="inDriverBlacklist">
- <option value="0">否</option>
- <option value="1">是</option>
- </select>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">服务类型：</label>
- <div class="col-sm-3">
- <select class="form-control" id="commercialType">
- <option value="1">网络预约出租汽车</option>
- <option value="2">巡游出租汽车</option>
- <option value="3">私人小客车合乘</option>
- </select>
- </div>
- </div>
- <#input id="contractCompany" name="驾驶员合同签署公司"/>
- <#input id="contractOn" name="合同有效期起"/>
- <#input id="contractOff" name="合同有效期止"/>
- <#input id="emergencyContact" name="紧急联系人"/>
- <#input id="emergencyContactPhone" name="紧急联系电话"/>
- <#input id="emergencyContactAddress" name="紧急联系地址"/>
+ <div class="col-sm-6">
+ <#input id="idcardBack" name="身份证背面照" underline="true"/>
+ <#input id="inviterType" name="邀约人类型（1=用户，2=司机）" underline="true"/>
+ <#input id="inviterId" name="邀约人id" underline="true"/>
+ <#input id="agentId" name="代理商id" underline="true"/>
+ <#input id="branchOfficeId" name="分公司id" underline="true"/>
+ <#input id="balance" name="账户余额" underline="true"/>
+ <#input id="approvalStatus" name="审核状态（1=待审核，2=已同意，3=已拒绝）" underline="true"/>
+ <#input id="approvalNotes" name="审核注释" underline="true"/>
+ <#input id="approvalUserId" name="审核用户id" underline="true"/>
+ <#input id="approvalTime" name="审核时间" underline="true"/>
+ <#input id="serverStatus" name="服务状态（1=空闲，2=服务中）" underline="true"/>
+ <#input id="integral" name="剩余积分" underline="true"/>
+ <#input id="status" name="状态（1=正常，2=冻结，3=删除）" underline="true"/>
+ <#input id="createTime" name="添加时间" underline="true"/>
</div>
</div>
<div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-5">
- <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="YesDriverInfoDlg.addSubmit()"/>
- <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="YesDriverInfoDlg.close()"/>
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TDriverInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TDriverInfoDlg.close()"/>
</div>
</div>
</div>
</div>
</div>
-<script src="${ctxPath}/static/modular/system/tDriver/yesDriver_info.js"></script>
-
-<script>
- laydate.render({
- elem: '#getDriverLicenseDate'
- });
- laydate.render({
- elem: '#driverLicenseOn'
- });
- laydate.render({
- elem: '#driverLicenseOff'
- });
- laydate.render({
- elem: '#networkCarlssueDate'
- });
- laydate.render({
- elem: '#getNetworkCarProofDate'
- });
- laydate.render({
- elem: '#networkCarProofOn'
- });
- laydate.render({
- elem: '#networkCarProofOff'
- });
- laydate.render({
- elem: '#contractOn'
- });
- laydate.render({
- elem: '#contractOff'
- });
- laydate.render({
- elem: '#registerDate'
- });
-</script>
+<script src="${ctxPath}/static/modular/system/tDriver/tDriver_info.js"></script>
@}
--
Gitblit v1.7.1