From 5cb1979f05446792cc33a8cb6b7aaae906da5a70 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:32:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html | 141 ++++++++++------------------------------------
1 files changed, 31 insertions(+), 110 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
index 71fa608..0546b77 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
@@ -3,12 +3,12 @@
<div class="col-sm-12">
<div class="ibox float-e-margins">
<div class="ibox-title">
- <h5>添加</h5>
+ <h5>编辑</h5>
</div>
<div class="ibox-content" id="driverInfoForm">
<div class="row row-lg">
<div class="col-sm-12">
- <input hidden id="id" value="${item.id}"/>
+ <input hidden id="id" value="${item.id}">
<input hidden id="areaId" value="${item.areaId}">
<hr/>
<div class="initialLevel col-sm-12 control-label form-group" >
@@ -22,12 +22,12 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label" >姓名:</label>
- <input id="name" name="name" value="${item.name}" type="text" maxlength="20" style="height: 30px" required>
+ <input id="name" name="name" type="text" value="${driver.name}" style="height: 30px" maxlength="20" placeholder="请输入" required="required">
</div>
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label" >手机号:</label>
- <input id="phone" name="phone" value="${item.phone}" type="number" maxlength="11" style="height: 30px" required>
+ <input id="phone" name="phone" type="number" value="${driver.phone}" style="height: 30px" maxlength="11" placeholder="请输入" required="required">
</div>
</div>
@@ -35,23 +35,23 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label" >紧急联系人姓名:</label>
- <input id="emergencyContact" name="emergencyContact" value="${item.emergencyContact}" type="text" maxlength="20" style="height: 30px" required disabled>
+ <input id="emergencyContact" name="emergencyContact" value="${driver.emergencyContact}" type="text" maxlength="20" placeholder="请输入" style="height: 30px" required>
</div>
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label" >紧急联系人电话:</label>
- <input id="emergencyPhone" name="emergencyPhone" value="${item.emergencyPhone}" type="number" maxlength="11" style="height: 30px" required disabled>
+ <input id="emergencyPhone" name="emergencyPhone" value="${driver.emergencyPhone}" type="number" maxlength="11" placeholder="请输入" style="height: 30px" required>
</div>
</div>
<div class="initialLevel col-sm-12 control-label form-group" >
<div class="initialLevel col-sm-3 control-label form-group" >
<label class="control-label" >邀约人姓名:</label>
- <input id="inviterName" value="${item.inviterName}" type="text" maxlength="20" style="height: 30px" disabled>
+ <input id="inviterName" type="text" value="${driver.inviterName}" maxlength="20" placeholder="请输入" style="height: 30px">
</div>
<div class="initialLevel col-sm-3 control-label form-group" >
<label class="control-label" >邀约人电话:</label>
- <input id="inviterPhone" value="${item.inviterPhone}" type="number" maxlength="11" style="height: 30px" disabled>
+ <input id="inviterPhone" type="number" value="${driver.inviterPhone}" maxlength="11" placeholder="请输入" style="height: 30px">
</div>
</div>
@@ -59,7 +59,7 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label" >服务区域:</label>
- <input id="area" value="${item.area}" onclick="TDriver.areaUpdate()" name="area" placeholder="请选择" style="height: 30px" readonly required>
+ <input id="area" onclick="TDriver.areaAdd()" name="area" value="${item.area}" placeholder="请选择" style="height: 30px" readonly required>
</div>
</div>
</div>
@@ -77,64 +77,34 @@
<div class="initialLevel col-sm-3 control-label form-group" >
<span style="color:red">*</span>
<label class="control-label" >身份证号码:</label>
- <input id="idcard" name="idcard" value="${item.idcard}" type="text" maxlength="20" style="height: 30px" required disabled>
+ <input id="idcard" name="idcard" type="text" value="${driver.idcard}" maxlength="20" placeholder="请输入" style="height: 30px" required>
</div>
</div>
<div class="initialLevel col-sm-12 control-label form-group" >
-<!-- <div class="initialLevel col-sm-3 control-label form-group" >-->
-<!-- <span style="color:red">*</span>-->
-<!-- <label class="control-label" >身份证正面照:</label>-->
-<!-- <#uploadImg id="idcardFront" fileImg="${item.idcardFront}"/>-->
-<!-- </div>-->
<div class="initialLevel col-sm-3 control-label form-group">
- <span style="color:red">*</span>
- <label class="control-label">身份证正面照:</label>
- <div class="form-group">
- <div class="col-sm-4">
- <div id="idcardFrontPreId">
- <div><img width="100px" height="100px" src="${item.idcardFront}">
- </div>
- </div>
- </div>
- </div>
+ <label class="control-label" >身份证正面照:</label>
+ <#uploadImg id="idcardFront" fileImg="${driver.idcardFront}"/>
</div>
-<!-- <div class="initialLevel col-sm-3 control-label form-group" >-->
-<!-- <span style="color:red">*</span>-->
-<!-- <label class="control-label" >身份证背面照:</label>-->
-<!-- <#uploadImg id="idcardBack" fileImg="${item.idcardBack}"/>-->
-<!-- </div>-->
<div class="initialLevel col-sm-3 control-label form-group">
<span style="color:red">*</span>
- <label class="control-label">身份证背面照:</label>
- <div class="form-group">
- <div class="col-sm-4">
- <div id="idcardBackPreId">
- <div><img width="100px" height="100px" src="${item.idcardBack}">
- </div>
- </div>
- </div>
- </div>
+ <label class="control-label" >身份证背面照:</label>
+ <#uploadImg id="idcardBack" fileImg="${driver.idcardBack}"/>
</div>
</div>
<div class="initialLevel col-sm-12 control-label form-group" >
-<!-- <div class="initialLevel col-sm-3 control-label form-group" >-->
-<!-- <span style="color:red">*</span>-->
-<!-- <label class="control-label" >驾驶证:</label>-->
-<!-- <#uploadImg id="driverLicense" fileImg="${item.driverLicense}"/>-->
-<!-- </div>-->
+ <div class="initialLevel col-sm-3 control-label form-group" >
+ <label class="control-label" >驾驶证初次领证时间:</label>
+ <input id="firstCertificateTime" name="firstCertificateTime" value="${item.firstCertificateTimeStr}" type="text" placeholder="请选择时间" style="height: 30px">
+ </div>
+ </div>
+
+ <div class="initialLevel col-sm-12 control-label form-group" >
<div class="initialLevel col-sm-3 control-label form-group">
<span style="color:red">*</span>
- <label class="control-label">驾驶证:</label>
- <div class="form-group">
- <div class="col-sm-4">
- <div id="driverLicensePreId">
- <div><img width="100px" height="100px" src="${item.driverLicense}">
- </div>
- </div>
- </div>
- </div>
+ <label class="control-label" >驾驶证:</label>
+ <#uploadImg id="driverLicense" fileImg="${driver.driverLicense}"/>
</div>
</div>
</div>
@@ -151,67 +121,18 @@
</div>
</div>
</div>
-<!--<div class="ibox float-e-margins">
- <div class="ibox-content">
- <div class="form-horizontal">
-
- <div class="row">
- <div class="col-sm-6 b-r">
- <#input id="id" name="主键" value="${item.id}" underline="true"/>
- <#input id="code" name="编号" value="${item.code}" underline="true"/>
- <#input id="name" name="姓名" value="${item.name}" underline="true"/>
- <#input id="avatar" name="头像" value="${item.avatar}" underline="true"/>
- <#input id="phone" name="手机号" value="${item.phone}" underline="true"/>
- <#input id="password" name="密码" value="${item.password}" underline="true"/>
- <#input id="sex" name="性别（1=男，2=女）" value="${item.sex}" underline="true"/>
- <#input id="source" name="来源（1=）" value="${item.source}" underline="true"/>
- <#input id="emergencyContact" name="紧急联系人" value="${item.emergencyContact}" underline="true"/>
- <#input id="emergencyPhone" name="紧急联系电话" value="${item.emergencyPhone}" underline="true"/>
- <#input id="driverLicenseNumber" name="驾驶证号码" value="${item.driverLicenseNumber}" underline="true"/>
- <#input id="driverLicense" name="驾驶证照片" value="${item.driverLicense}" underline="true"/>
- <#input id="idcard" name="身份证号码" value="${item.idcard}" underline="true"/>
- <#input id="idcardFront" name="身份证正面照" value="${item.idcardFront}" />
- </div>
-
- <div class="col-sm-6">
- <#input id="idcardBack" name="身份证背面照" value="${item.idcardBack}" underline="true"/>
- <#input id="inviterType" name="邀约人类型（1=用户，2=司机）" value="${item.inviterType}" underline="true"/>
- <#input id="inviterId" name="邀约人id" value="${item.inviterId}" underline="true"/>
- <#input id="agentId" name="代理商id" value="${item.agentId}" underline="true"/>
- <#input id="branchOfficeId" name="分公司id" value="${item.branchOfficeId}" underline="true"/>
- <#input id="balance" name="账户余额" value="${item.balance}" underline="true"/>
- <#input id="approvalStatus" name="审核状态（1=待审核，2=已同意，3=已拒绝）" value="${item.approvalStatus}" underline="true"/>
- <#input id="approvalNotes" name="审核注释" value="${item.approvalNotes}" underline="true"/>
- <#input id="approvalUserId" name="审核用户id" value="${item.approvalUserId}" underline="true"/>
- <#input id="approvalTime" name="审核时间" value="${item.approvalTime}" underline="true"/>
- <#input id="serverStatus" name="服务状态（1=空闲，2=服务中）" value="${item.serverStatus}" underline="true"/>
- <#input id="integral" name="剩余积分" value="${item.integral}" underline="true"/>
- <#input id="status" name="状态（1=正常，2=冻结，3=删除）" value="${item.status}" underline="true"/>
- <#input id="createTime" name="添加时间" value="${item.createTime}" />
- </div>
- </div>
-
- <div class="row btn-group-m-t">
- <div class="col-sm-10">
- <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TDriverInfoDlg.editSubmit()"/>
- <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TDriverInfoDlg.close()"/>
- </div>
- </div>
- </div>
-
- </div>
-</div>-->
<script src="${ctxPath}/static/modular/system/tDriver/tDriver_info.js"></script>
<script src="${ctxPath}/static/modular/system/tDriver/tDriver.js"></script>
<script type="text/javascript">
- $(function () {
- if('' == $("#inviterName").val()){
- $("#inviterName").val('')
- }
- if('' == $("#inviterPhone").val()){
- $("#inviterPhone").val('')
- }
+ laydate.render({
+ elem: '#firstCertificateTime',
+ type: 'date',
+ range: false,
+ max: Date.now()
+ });
+
+ $(function () {
var idCardPositive = new $WebUpload("idcardFront");
idCardPositive.setUploadBarId("progressBar");
idCardPositive.init();
--
Gitblit v1.7.1