From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel

---
 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCharteredService/tCharteredService_add.html |   63 ++++++++++++++++++-------------
 1 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCharteredService/tCharteredService_add.html b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCharteredService/tCharteredService_add.html
index 7b904e0..36d84d7 100644
--- a/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCharteredService/tCharteredService_add.html
+++ b/ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCharteredService/tCharteredService_add.html
@@ -67,7 +67,7 @@
                                 <div class="initialLevel col-sm-2 control-label form-group"  >
                                     <label class="control-label" >价格:</label>
                                 </div>
-                                <div class="initialLevel col-sm-4 control-label form-group"  >
+                                <div class="initialLevel col-sm-5 control-label form-group"  >
                                     <input id="serviceMoney" name="serviceMoney" type="text" maxlength="20" style="height: 30px;width: 300px" placeholder="请输入价格" required="required">
                                 </div>
                                 <div class="initialLevel col-sm-2 control-label form-group"  >
@@ -78,40 +78,51 @@
 
                         <div class="initialLevel col-sm-12 control-label form-group"  >
                             <div class="initialLevel col-sm-6 control-label form-group"  >
-                                <div class="initialLevel col-sm-2 control-label form-group"  >
-                                    <label class="control-label" >计价规则:</label>
+<!--                                <div class="initialLevel col-sm-2 control-label form-group"  >-->
+<!--                                    <label class="control-label" >计价规则:</label>-->
+<!--                                </div>-->
+<!--                                <div class="initialLevel col-sm-9 control-label form-group"  >-->
+<!--                                    <textarea type="text/plain" name="priceRule" id="priceRule" style="width:100%;height:150px;"></textarea>-->
+<!--                                </div>-->
+
+                                <label class="col-sm-3 control-label">计价规则:</label>
+                                <div class="col-sm-9">
+                                    <textarea type="text/plain" id="editor" style="width:100%;height:350px;"></textarea>
                                 </div>
-                                <div class="initialLevel col-sm-9 control-label form-group"  >
-                                    <textarea type="text/plain" name="priceRule" id="priceRule" style="width:100%;height:150px;"></textarea>
-                                </div>
+
                             </div>
                         </div>
+<!--                        <div class="initialLevel col-sm-12 control-label form-group"  >-->
+<!--                            <div class="initialLevel col-sm-6 control-label form-group"  >-->
+<!--                                <div class="initialLevel col-sm-6 control-label form-group"  >-->
+<!--                                    <#avatar id="priceRulePicture" name=" "/>-->
+<!--                                </div>-->
+<!--                            </div>-->
+<!--                        </div>-->
+
                         <div class="initialLevel col-sm-12 control-label form-group"  >
                             <div class="initialLevel col-sm-6 control-label form-group"  >
-                                <div class="initialLevel col-sm-6 control-label form-group"  >
-                                    <#avatar id="priceRulePicture" name=" "/>
+<!--                                <div class="initialLevel col-sm-2 control-label form-group"  >-->
+<!--                                    <label class="control-label" >取消规则:</label>-->
+<!--                                </div>-->
+<!--                                <div class="initialLevel col-sm-9 control-label form-group"  >-->
+<!--                                    <textarea type="text/plain" name="cancelRule" id="cancelRule" style="width:100%;height:150px;"></textarea>-->
+<!--                                </div>-->
+
+                                <label class="col-sm-3 control-label">取消规则:</label>
+                                <div class="col-sm-9">
+                                    <textarea type="text/plain" id="editor1" style="width:100%;height:350px;"></textarea>
                                 </div>
                             </div>
                         </div>
 
-                        <div class="initialLevel col-sm-12 control-label form-group"  >
-                            <div class="initialLevel col-sm-6 control-label form-group"  >
-                                <div class="initialLevel col-sm-2 control-label form-group"  >
-                                    <label class="control-label" >取消规则:</label>
-                                </div>
-                                <div class="initialLevel col-sm-9 control-label form-group"  >
-                                    <textarea type="text/plain" name="cancelRule" id="cancelRule" style="width:100%;height:150px;"></textarea>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="initialLevel col-sm-12 control-label form-group"  >
-                            <div class="initialLevel col-sm-6 control-label form-group"  >
-                                <div class="initialLevel col-sm-6 control-label form-group"  >
-                                    <#avatar id="cancelRulePicture" name=" "/>
-                                </div>
-                            </div>
-                        </div>
+<!--                        <div class="initialLevel col-sm-12 control-label form-group"  >-->
+<!--                            <div class="initialLevel col-sm-6 control-label form-group"  >-->
+<!--                                <div class="initialLevel col-sm-6 control-label form-group"  >-->
+<!--                                    <#avatar id="cancelRulePicture" name=" "/>-->
+<!--                                </div>-->
+<!--                            </div>-->
+<!--                        </div>-->
 
                         <div class="initialLevel col-sm-12 control-label form-group"  >
                             <div class="initialLevel col-sm-6 control-label form-group"  >

--
Gitblit v1.7.1