Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/view/ledger/explode_modal.ejs

@@ -239,9 +239,9 @@
                 </div>
             </div>
             <form class="modal-footer" action="/tender/<%- tender.id %>/ledger/audit/start" method="post" onsubmit="return checkAuditorFrom()">
-                <button type="submit" class="btn btn-primary">确认上报</button>
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>">
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="submit" class="btn btn-primary">确认上报</button>
             </form>
         </div>
     </div>

app/view/stage/audit_modal.ejs

@@ -757,8 +757,8 @@
                 </div>
                 <form class="modal-footer" method="post" action="<%- preUrl %>/audit/start" onsubmit="return checkAuditorFrom()">
                     <input type="hidden" name="_csrf" value="<%= ctx.csrf %>">
-                    <button class="btn btn-primary" type="submit">确认上报</button>
                     <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                    <button class="btn btn-primary" type="submit">确认上报</button>
                 </form>
             </div>
         </div>

app/view/tender/manage_modal.ejs

@@ -10,16 +10,16 @@
                     <label>标段名称<b class="text-danger">*</b></label>
                     <input class="form-control"  placeholder="输入标段名称" type="text" name="name">
                 </div>
-            </div>
-            <div class="form-group">
-                <label ><b class="text-danger">*</b>计价规范</label>
-                <div>
-                    <% for (const v of valuations) { %>
-                        <div class="form-check form-check-inline mt-2">
-                            <input class="form-check-input" name="valuation" type="radio" id="valuation<%- v.id %>" value="<%- v.id %>" checked="">
-                            <label class="form-check-label" for="valuation<%- v.id %>"><%- v.name %></label>
-                        </div>
-                    <% } %>
+                <div class="form-group">
+                    <label ><b class="text-danger">*</b>计价规范</label>
+                    <div>
+                        <% for (const v of valuations) { %>
+                            <div class="form-check form-check-inline mt-2">
+                                <input class="form-check-input" name="valuation" type="radio" id="valuation<%- v.id %>" value="<%- v.id %>" checked="">
+                                <label class="form-check-label" for="valuation<%- v.id %>"><%- v.name %></label>
+                            </div>
+                        <% } %>
+                    </div>
                 </div>
             </div>
             <div class="modal-footer">