Pu Zhibing
2025-08-22 3bc0aed4a46aa3f04c8a2724bb0ff1179dd79f44
修改bug
4个文件已修改
151 ■■■■■ 已修改文件
management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice_add.html 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice_edit.html 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tSystemConfigExtractionRules.html 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigExtractionRules.html 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice_add.html
@@ -247,27 +247,6 @@
                                    <span class="control-label" >元</span>
                                </div>
                            </div>
                            <hr/>
                            <div class="initialLevel col-sm-12 control-label form-group">
                                <div style="background-color: gray;height: 35px;line-height: 35px">
                                    <label style="color: #0C0C0C">车检费用配置</label>
                                </div>
                            </div>
                            <hr/>
                            <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left">
                                <div class="initialLevel col-sm-12 control-label form-group">
                                    <span class="control-label">车检费用</span>
                                    <span class="control-label" for="oilCarFee">油车/混动车</span>
                                    <input class="control-label" id="oilCarFee" name="oilCarFee" type="text" min="0" style="height: 30px;width: 80px" placeholder="0.00">
                                    <span class="control-label">元,</span>
                                    <span class="control-label" for="electricCarFee">纯电车</span>
                                    <input class="control-label" id="electricCarFee" name="electricCarFee" type="text" min="0" style="height: 30px;width: 80px" placeholder="0.00">
                                    <span class="control-label">元,</span>
                                    <span class="control-label" for="serviceFee">车检服务费</span>
                                    <input class="control-label" id="serviceFee" name="serviceFee" type="text" min="0" style="height: 30px;width: 80px" placeholder="0.00">
                                    <span class="control-label">元</span>
                                </div>
                            </div>
                        </div>
                    </div>
                </div>
management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice_edit.html
@@ -299,27 +299,6 @@
                        <span class="control-label" >元</span>
                    </div>
                </div>
                <hr/>
                <div class="initialLevel col-sm-12 control-label form-group">
                    <div style="background-color: gray;height: 35px;line-height: 35px">
                        <label style="color: #0C0C0C">车检费用配置</label>
                    </div>
                </div>
                <hr/>
                <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left">
                    <div class="initialLevel col-sm-12 control-label form-group">
                        <span class="control-label">车检费用</span>
                        <span class="control-label" for="oilCarFee">油车/混动车</span>
                        <input class="control-label" id="oilCarFee" name="num22" value="${ExtraCost != null ? ExtraCost.num11 : ''}" type="text" min="0" style="height: 30px;width: 80px" placeholder="0.00">
                        <span class="control-label">元,</span>
                        <span class="control-label" for="electricCarFee">纯电车</span>
                        <input class="control-label" id="electricCarFee" name="num23" value="${ExtraCost != null ? ExtraCost.num12 : ''}" type="text" min="0" style="height: 30px;width: 80px" placeholder="0.00">
                        <span class="control-label">元,</span>
                        <span class="control-label" for="serviceFee">车检服务费</span>
                        <input class="control-label" id="serviceFee" name="num24" value="${ExtraCost != null ? ExtraCost.num13 : ''}" type="text" min="0" style="height: 30px;width: 80px" placeholder="0.00">
                        <span class="control-label">元</span>
                    </div>
                </div>
                <div class="row btn-group-m-t">
                    <div class="col-sm-10" style="text-align: center">
                        <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TBranchOfficeInfoDlg.close()"/>
management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tSystemConfigExtractionRules.html
@@ -36,39 +36,6 @@
                                <button class="switch-btn active" value="2" onclick="switchTab(this, '按单')">按单</button>
                            @}
                        </div>
                        @if(type == 1){
                            <div id="month" class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
                                <div class="initialLevel col-sm-3 control-label form-group"  >
                                    <span class="control-label" >抽成,每月平台抽取分公司</span>
                                    <input class="control-label" id="num2" name="num2" value="${num2}" type="number" min="0" style="height: 30px;width: 80px">
                                    <span class="control-label" >元</span>
                                </div>
                            </div>
                        @}
                        @if(type == 2){
                            <div id="monad" class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
                                <div class="initialLevel col-sm-3 control-label form-group"  >
                                    <span class="control-label" >抽成,每单平台抽取分公司</span>
                                    <input class="control-label" id="num3" name="num3" value="${num3}" type="number" min="0" style="height: 30px;width: 80px">
                                    <span class="control-label" >元</span>
                                </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>-->
<!--                            </div>-->
<!--                        </div>-->
                        @if(roleType == 1){
                        <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <span class="control-label" >每单抽取分公司</span>
                                <input class="control-label" id="num5" name="num5" value="${num5!}" type="number" min="0" style="height: 30px;width: 80px">
                                <span class="control-label" >元</span>
                            </div>
                        </div>
                        @}
                        <div class="row btn-group-m-t">
                            <div class="col-sm-10" style="text-align: center">
                                <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSystemConfig.extractionRulesSubmit()"/>
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigExtractionRules.html
@@ -32,82 +32,6 @@
                            <button class="switch-btn" value="2" onclick="switchTab(this, '按单')">按单</button>
                        </div>
                        @if(roleType == 1){
                            <div id="month" class="initialLevel col-sm-12 control-label form-group month" style="text-align: left" >
                                <div class="initialLevel col-sm-3 control-label form-group"  >
                                    <span class="control-label" >抽成,每月平台抽取分公司</span>
                                    <input class="control-label" id="num2" name="num2" value="${num2}" type="number" min="0" style="height: 30px;width: 80px">
                                    <span class="control-label" >元</span>
                                </div>
                            </div>
                            <div id="monad" hidden="hidden" class="initialLevel col-sm-12 control-label form-group monad" style="text-align: left" >
                                <div class="initialLevel col-sm-3 control-label form-group"  >
                                    <span class="control-label" >抽成,每单平台抽取分公司</span>
                                    <input class="control-label" id="num3" name="num3" value="${num3}" type="number" min="0" style="height: 30px;width: 80px">
                                    <span class="control-label" >元</span>
                                </div>
                            </div>
                        @}
                        @if(roleType == 2){
                            <div id="month" class="initialLevel col-sm-12 control-label form-group month" style="text-align: left" >
                                <div class="initialLevel col-sm-3 control-label form-group"  >
                                    <span class="control-label" >抽成,每月分公司抽取司机</span>
                                    <input class="control-label" id="num2" name="num2" value="${num2}" type="number" min="0" style="height: 30px;width: 80px">
                                    <span class="control-label" >元</span>
                                </div>
                            </div>
                            <div id="monad" hidden="hidden" class="initialLevel col-sm-12 control-label form-group monad" style="text-align: left" >
                                <div class="initialLevel col-sm-3 control-label form-group"  >
                                    <span class="control-label" >抽成,每单分公司抽取司机</span>
                                    <input class="control-label" id="num3" name="num3" value="${num3}" type="number" min="0" style="height: 30px;width: 80px">
                                    <span class="control-label" >元</span>
                                </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>-->
<!--                            </div>-->
<!--                        </div>-->
                        @if(roleType == 1){
                        <div id="monad" class="initialLevel col-sm-12 control-label form-group month" style="text-align: left" >
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <span class="control-label" >每单平台抽取分公司</span>
                                <input class="control-label" id="num5" name="num5" value="${num5}" type="number" min="0" style="height: 30px;width: 80px">
                                <span class="control-label" >元</span>
                            </div>
                        </div>
                        @}
                        @if(roleType == 2){
                            <div id="monad" class="initialLevel col-sm-12 control-label form-group monad" style="text-align: left" >
                                <div class="initialLevel col-sm-3 control-label form-group"  >
                                    <span class="control-label" >每单分公司抽取司机</span>
                                    <input class="control-label" id="num5" name="num5" value="${num5!}" type="number" min="0" style="height: 30px;width: 80px">
                                    <span class="control-label" >元</span>
                                </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>-->
<!--                            </div>-->
<!--                        </div>-->
<!--                        <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >-->
<!--                            <div class="initialLevel col-sm-12 control-label form-group"  >-->
<!--                                <span class="control-label" >抽成,每笔订单满</span>-->
<!--                                <input class="control-label" id="num2" name="num2" value="${num2}" type="number" min="0" style="height: 30px;width: 80px">-->
<!--                                <span class="control-label" >元/单,抽取</span>-->
<!--                                <input class="control-label" id="num3" name="num3" value="${num3}" type="number" min="0" style="height: 30px;width: 80px">-->
<!--                                <span class="control-label" >元,平台收取</span>-->
<!--                                <input class="control-label" id="num4" name="num4" value="${num4}" type="number" min="0" style="height: 30px;width: 80px">-->
<!--                                <span class="control-label" >元</span>-->
<!--                            </div>-->
<!--                        </div>-->
                        <div class="row btn-group-m-t">
                            <div class="col-sm-10" style="text-align: center">
                                <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSystemConfig.extractionRulesSubmit()"/>