From c743f4413a00fc063bbbd9d851b6d0c3fff10581 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 31 七月 2023 10:04:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity_edit.html | 359 ++++-------------------------------------------------------
1 files changed, 28 insertions(+), 331 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity_edit.html
index cd9d62f..1d8f66c 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tCity/TCity_edit.html
@@ -1,350 +1,47 @@
@layout("/common/_container.html"){
<div class="ibox float-e-margins">
<div class="ibox-content">
+
<div class="form-horizontal" id="carInfoForm">
- <input type="hidden" id="id" name="id" value="${item.id}">
-
- <input type="hidden" id="roleType" name="roleType" value="${roleType}">
- @if(language==1){
- <div class="row">
- <div class="col-sm-11">
- <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" ${1 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(1)">
- <label for="companyType1"> 平台车辆 </label>
- </div>
- <div class="radio radio-success radio-inline">
- <input type="radio" id="companyTyp2" value="2" name="companyType" ${2 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(2)">
- <label for="companyTyp2"> 加盟车辆 </label>
- </div>
- <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px">
- <option value="">选择所属分公司</option>
- @for(obj in companyList!){
- <option value="${obj.id}" ${obj.id == item.companyId ? 'selected=selected' : ''}>${obj.name}</option>
- @}
- </select>
- <select class="form-control companyDiv" id="twoId" style="width: 200px;margin-left: 30px;">
- <option value="">选择所属加盟商</option>
- @for(obj in franchiseeList!){
- <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</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.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
- @}
- </select>
- @}else if(roleType == 3){
- <span class="control-label">${objectName!}</span>
- @}
- </div>
- </div>
- <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" ${2 == one ? 'checked=checked' : ''} onclick="TCarInfoDlg.zcServerClick()">
- <label for="serverBox1"> 摩托车 </label>
- </div>
- <div class="checkbox checkbox-success checkbox-inline">
- <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}>
- <label for="serverBox4"> 同城快送 </label>
- </div>
- </div>
- </fieldset>
- </div>
- <div class="form-group" id="zcModelDiv">
- <label class="col-sm-3 control-label">摩托车车型：</label>
- <div class="col-sm-9">
- <select class="form-control" id="zcModel" name="zcModel">
- <option value="">选择车型</option>
- @for(obj in zcModelList){
- <option value="${obj.id}" ${obj.id == zcModel ? 'selected=selected' : ''}>${obj.name}</option>
- @}
- </select>
- </div>
- </div>
- <#select id="carBrandId" name="车辆品牌：" onchange="TCarInfoDlg.brandChange(this)">
- <option value="">选择车辆品牌</option>
- @for(obj in brandList){
- <option value="${obj.id}" ${obj.id == item.carBrandId ? 'selected=selected' : ''}>${obj.name}</option>
- @}
- </#select>
- <#select id="carModelId" name="车辆类型：">
- <option value="">选择车辆类型</option>
- @for(obj in modelList){
- <option value="${obj.id}" ${obj.id == item.carModelId ? 'selected=selected' : ''}>${obj.name}</option>
- @}
- </#select>
- <#select id="carColor" name="车辆颜色：">
- <option value="">选择车辆颜色</option>
- <option value="1" ${'1' == item.carColor ? 'selected=selected' : ''}>黑色</option>
- <option value="2" ${'2' == item.carColor ? 'selected=selected' : ''}>银色</option>
- <option value="3" ${'3' == item.carColor ? 'selected=selected' : ''}>白色</option>
- <option value="4" ${'4' == item.carColor ? 'selected=selected' : ''}>红色</option>
- <option value="5" ${'5' == item.carColor ? 'selected=selected' : ''}>黄色</option>
- <option value="6" ${'6' == item.carColor ? 'selected=selected' : ''}>橙色</option>
- <option value="7" ${'7' == item.carColor ? 'selected=selected' : ''}>蓝色</option>
- </#select>
- <#input id="carLicensePlate" name="车牌号" value="${item.carLicensePlate}"/>
- <#avatar id="carPhoto" name="车辆照片：" avatarImg="${item.carPhoto}"/>
- <#input id="drivingLicenseNumber" name="行驶证编号" value="${item.drivingLicenseNumber}"/>
- <#avatar id="drivingLicensePhoto" name="行驶证照片：" avatarImg="${item.drivingLicensePhoto}"/>
- <#input id="annualInspectionTime" name="年检到期时间" type="text" value="${item.annualInspectionTime}"/>
- <#input id="commercialInsuranceTime" name="商业保险到期时间" type="text" value="${item.commercialInsuranceTime}"/>
- </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="TCarInfoDlg.editSubmit()"/>
- <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
- </div>
-</div>
- @}
- @if(language==2){
-<div class="row">
- <div class="col-sm-11">
- <div class="form-group">
- <label class="col-sm-3 control-label">Affiliated organization：</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" ${1 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(1)">
- <label for="companyType1"> Platform vehicle </label>
- </div>
- <div class="radio radio-success radio-inline">
- <input type="radio" id="companyTyp2" value="2" name="companyType" ${2 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(2)">
- <label for="companyTyp2"> Franchised vehicles </label>
- </div>
- <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px">
- <option value="">Select Branch</option>
- @for(obj in companyList!){
- <option value="${obj.id}" ${obj.id == item.companyId ? 'selected=selected' : ''}>${obj.name}</option>
- @}
- </select>
- <select class="form-control companyDiv" id="twoId" style="width: 200px;margin-left: 30px;">
- <option value="">Select the franchisee</option>
- @for(obj in franchiseeList!){
- <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</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="">Select the franchisee</option>
- @for(obj in franchiseeList!){
- <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
- @}
- </select>
- @}else if(roleType == 3){
- <span class="control-label">${objectName!}</span>
- @}
- </div>
- </div>
- <div class="form-group">
- <fieldset>
- <label class="col-sm-3 control-label">Service mode：</label>
+ <input hidden id="id" value="${item.id}">
+ <div class="form-group" id="provinceCode">
+ <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" ${2 == one ? 'checked=checked' : ''} onclick="TCarInfoDlg.zcServerClick()">
- <label for="serverBox1"> motorcycle </label>
- </div>
- <div class="checkbox checkbox-success checkbox-inline">
- <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}>
- <label for="serverBox4"> Intra-city express delivery </label>
- </div>
+ <select class="form-control" id="pCode" name="pCode" onchange="TCarInfoDlg.oneChange(this)">
+ <option value="">选择省</option>
+ @for(obj in list){
+ <option value="${obj.code}" ${obj.code == item.provinceCode ? 'selected=selected' : ''}>${obj.name}</option>
+ <option value="${obj.code}">${obj.name}</option>
+ @}
+ </select>
</div>
- </fieldset>
- </div>
- <div class="form-group" id="zcModelDiv">
- <label class="col-sm-3 control-label">Motorcycle model setting：</label>
- <div class="col-sm-9">
- <select class="form-control" id="zcModel" name="zcModel">
- <option value="">Select vehicle type</option>
- @for(obj in zcModelList){
- <option value="${obj.id}" ${obj.id == zcModel ? 'selected=selected' : ''}>${obj.name}</option>
- @}
- </select>
</div>
- </div>
- <div class="form-group" id="kcModelDiv">
- <label class="col-sm-3 control-label">Cross city travel model：</label>
- <div class="col-sm-9">
- <select class="form-control" id="kcModel" name="kcModel">
- <option value="">Select vehicle type</option>
- @for(obj in kcModelList){
- <option value="${obj.id}" ${obj.id == kcModel ? 'selected=selected' : ''}>${obj.name}</option>
- @}
- </select>
- </div>
- </div>
- <#select id="carBrandId" name="Vehicle brand：" onchange="TCarInfoDlg.brandChange(this)">
- <option value="">Select vehicle brand</option>
- @for(obj in brandList){
- <option value="${obj.id}" ${obj.id == item.carBrandId ? 'selected=selected' : ''}>${obj.name}</option>
- @}
- </#select>
- <#select id="carModelId" name="Vehicle type：">
- <option value="">Select vehicle type</option>
- @for(obj in modelList){
- <option value="${obj.id}" ${obj.id == item.carModelId ? 'selected=selected' : ''}>${obj.name}</option>
- @}
-</#select>
-<#select id="carColor" name="Vehicle color：">
-<option value="">Select vehicle color</option>
-<option value="1" ${'1' == item.carColor ? 'selected=selected' : ''}>black</option>
-<option value="2" ${'2' == item.carColor ? 'selected=selected' : ''}>silvery</option>
-<option value="3" ${'3' == item.carColor ? 'selected=selected' : ''}>white</option>
-<option value="4" ${'4' == item.carColor ? 'selected=selected' : ''}>red</option>
-<option value="5" ${'5' == item.carColor ? 'selected=selected' : ''}>yellow</option>
-<option value="6" ${'6' == item.carColor ? 'selected=selected' : ''}>orange</option>
-<option value="7" ${'7' == item.carColor ? 'selected=selected' : ''}>blue</option>
-</#select>
-<#input id="carLicensePlate" name="License plate number" value="${item.carLicensePlate}"/>
-<#avatar id="carPhoto" name="Vehicle photos：" avatarImg="${item.carPhoto}"/>
-<#input id="drivingLicenseNumber" name="Driving license number" value="${item.drivingLicenseNumber}"/>
-<#avatar id="drivingLicensePhoto" name="Photo of driving license：" avatarImg="${item.drivingLicensePhoto}"/>
-<#input id="annualInspectionTime" name="Annual inspection expiration time" type="text" value="${item.annualInspectionTime}"/>
-<#input id="commercialInsuranceTime" name="Expiration time of commercial insurance" type="text" value="${item.commercialInsuranceTime}"/>
-</div>
-</div>
-
-<div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-5">
- <#button btnCss="info" name="Submit" id="ensure" icon="fa-check" clickFun="TCarInfoDlg.editSubmit()"/>
- <#button btnCss="danger" name="Cancel" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
- </div>
-</div>
- @}
- @if(language==3){
-<div class="row">
- <div class="col-sm-11">
- <div class="form-group">
- <label class="col-sm-3 control-label">Organisasi Afiliasi：</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" ${1 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(1)">
- <label for="companyType1"> Kendaraan platform </label>
- </div>
- <div class="radio radio-success radio-inline">
- <input type="radio" id="companyTyp2" value="2" name="companyType" ${2 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(2)">
- <label for="companyTyp2"> Kendaraan waralaba </label>
- </div>
- <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px">
- <option value="">Pilih Branch</option>
- @for(obj in companyList!){
- <option value="${obj.id}" ${obj.id == item.companyId ? 'selected=selected' : ''}>${obj.name}</option>
- @}
- </select>
- <select class="form-control companyDiv" id="twoId" style="width: 200px;margin-left: 30px;">
- <option value="">Pilih pemilik franchise</option>
- @for(obj in franchiseeList!){
- <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</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="">Pilih pemilik franchise</option>
- @for(obj in franchiseeList!){
- <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
- @}
- </select>
- @}else if(roleType == 3){
- <span class="control-label">${objectName!}</span>
- @}
- </div>
- </div>
- <div class="form-group">
- <fieldset>
- <label class="col-sm-3 control-label">Mode Layanan：</label>
+ <div class="form-group" id="cityCode">
+ <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" ${2 == one ? 'checked=checked' : ''} onclick="TCarInfoDlg.zcServerClick()">
- <label for="serverBox1"> sepeda motor </label>
- </div>
- <div class="checkbox checkbox-success checkbox-inline">
- <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}>
- <label for="serverBox4"> Pengiriman Ekspres Dalam Kota </label>
- </div>
+ <select class="form-control" id="cCode" name="cCode">
+ <option value="">选择市</option>
+ @for(obj in list1){
+ <option value="${obj.code}" ${obj.code == item.cityCode ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
</div>
- </fieldset>
- </div>
- <div class="form-group" id="zcModelDiv">
- <label class="col-sm-3 control-label">Pengaturan model sepeda motor：</label>
- <div class="col-sm-9">
- <select class="form-control" id="zcModel" name="zcModel">
- <option value="">Pilih Jenis Kendaraan</option>
- @for(obj in zcModelList){
- <option value="${obj.id}" ${obj.id == zcModel ? 'selected=selected' : ''}>${obj.name}</option>
- @}
- </select>
</div>
+ <#input id="name" name="管理员姓名" type="text" value="${item.name}"/>
+ <#input id="phone" name="管理员手机号" type="text" value="${item.phone}"/>
+
+
</div>
- <div class="form-group" id="kcModelDiv">
- <label class="col-sm-3 control-label">Model perjalanan melintasi kota：</label>
- <div class="col-sm-9">
- <select class="form-control" id="kcModel" name="kcModel">
- <option value="">Pilih Jenis Kendaraan</option>
- @for(obj in kcModelList){
- <option value="${obj.id}" ${obj.id == kcModel ? 'selected=selected' : ''}>${obj.name}</option>
- @}
- </select>
+ <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="TCarInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
</div>
- </div>
- <#select id="carBrandId" name="Merek kendaraan：" onchange="TCarInfoDlg.brandChange(this)">
- <option value="">Pilih Merek Kendaraan</option>
- @for(obj in brandList){
- <option value="${obj.id}" ${obj.id == item.carBrandId ? 'selected=selected' : ''}>${obj.name}</option>
- @}
- </#select>
- <#select id="carModelId" name="Jenis Kendaraan：">
- <option value="">Pilih Jenis Kendaraan</option>
- @for(obj in modelList){
- <option value="${obj.id}" ${obj.id == item.carModelId ? 'selected=selected' : ''}>${obj.name}</option>
- @}
-</#select>
-<#select id="carColor" name="车辆颜色：">
-<option value="">选择车辆颜色</option>
-<option value="1" ${'1' == item.carColor ? 'selected=selected' : ''}>hitam</option>
-<option value="2" ${'2' == item.carColor ? 'selected=selected' : ''}>perak</option>
-<option value="3" ${'3' == item.carColor ? 'selected=selected' : ''}>putih</option>
-<option value="4" ${'4' == item.carColor ? 'selected=selected' : ''}>merah</option>
-<option value="5" ${'5' == item.carColor ? 'selected=selected' : ''}>kuning</option>
-<option value="6" ${'6' == item.carColor ? 'selected=selected' : ''}>oranye</option>
-<option value="7" ${'7' == item.carColor ? 'selected=selected' : ''}>biru</option>
-</#select>
-<#input id="carLicensePlate" name="Nomor plat nomor" value="${item.carLicensePlate}"/>
-<#avatar id="carPhoto" name="Foto kendaraan：" avatarImg="${item.carPhoto}"/>
-<#input id="drivingLicenseNumber" name="Nomor SIM Mengemudi" value="${item.drivingLicenseNumber}"/>
-<#avatar id="drivingLicensePhoto" name="Foto SIM：" avatarImg="${item.drivingLicensePhoto}"/>
-<#input id="annualInspectionTime" name="Waktu Kedaluwarsa Inspeksi Tahunan" type="text" value="${item.annualInspectionTime}"/>
-<#input id="commercialInsuranceTime" name="Waktu kedaluwarsa asuransi komersial" type="text" value="${item.commercialInsuranceTime}"/>
-</div>
-</div>
-
-<div class="row btn-group-m-t">
- <div class="col-sm-10 col-sm-offset-5">
- <#button btnCss="info" name="Kirim" id="ensure" icon="fa-check" clickFun="TCarInfoDlg.editSubmit()"/>
- <#button btnCss="danger" name="Batal" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
- </div>
-</div>
- @}
-
</div>
</div>
</div>
-<script src="${ctxPath}/modular/system/tCar/tCar_info.js"></script>
+<script src="${ctxPath}/modular/system/tCity/tCity_info.js"></script>
<script>
laydate.render({
elem: '#annualInspectionTime'
--
Gitblit v1.7.1