From 503bc89c55d675a27b689419aa906a070ca5cb03 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 24 五月 2024 09:33:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html
index 71442af..715e344 100644
--- a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html
+++ b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html
@@ -73,6 +73,10 @@
                                     <input type="checkbox" name="serverBox" id="serverBox6" value="6">
                                     <label for="serverBox6"> 包车 </label>
                                 </div>
+                                <div class="checkbox checkbox-success  checkbox-inline">
+                                    <input type="checkbox" name="serverBox" id="serverBox7" value="7" onclick="TCarInfoDlg.jsjServerClick()">
+                                    <label for="serverBox7"> 接送机 </label>
+                                </div>
                             </div>
                         </fieldset>
                     </div>
@@ -98,6 +102,17 @@
                             </select>
                         </div>
                     </div>
+                    <div class="form-group" style="display: none;" id="jsjModelDiv">
+                        <label class="col-sm-3 control-label">接送机车型:</label>
+                        <div class="col-sm-9">
+                            <select class="form-control" id="jsjModel" name="jsjModel">
+                                <option value="">选择车型</option>
+                                @for(obj in jsjModelList){
+                                <option value="${obj.id}">${obj.name}</option>
+                                @}
+                            </select>
+                        </div>
+                    </div>
 
                     <#select id="carBrandId" name="车辆品牌:" onchange="TCarInfoDlg.brandChange(this)">
                         <option value="">选择车辆品牌</option>

--
Gitblit v1.7.1