Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel

Pu Zhibing

2024-12-13 73b750200f25df08aa64124da49e7461f9de6653

 ManagementNTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCharteredService/tCharteredService_edit.html

@@ -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>
                                <div class="initialLevel col-sm-9 control-label form-group"  >
                                    <textarea type="text/plain" name="priceRule" id="priceRule" style="width:100%;height:150px;">${item.priceRule}</textarea>
<!--                                <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;">${item.priceRule}</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;">${item.priceRule}</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=" " avatarImg="${item.priceRulePicture}"/>-->
<!--                                </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=" " avatarImg="${item.priceRulePicture}"/>
<!--                                <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;">${item.cancelRule}</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;">${item.cancelRule}</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;">${item.cancelRule}</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=" " avatarImg="${item.cancelRulePicture}"/>
                                </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=" " avatarImg="${item.cancelRulePicture}"/>-->
<!--                                </div>-->
<!--                            </div>-->
<!--                        </div>-->

                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-6 control-label form-group"  >