清单汇总，附属工程量排序调整

app/public/js/gcl_gather.js

@@ -704,6 +704,7 @@ const gclGatherModel = (function () {
     function _gatherAncillaryGcl(gcl, fields = ['jldy']) {
         fields.push('is_aux', 'name', 'unit');
         gcl.gatherAncGcl = [];
+        const pinyin = new PinYinOrder();
         for (const lx of gcl.ancGcl) {
             const condition = {};
             for (const f of fields) {
@@ -719,7 +720,7 @@ const gclGatherModel = (function () {
         }
         gcl.gatherAncGcl.sort((a, b) => {
             if (a.is_aux === b.is_aux) {
-                return a.name < b.name ? -1 : 1;
+                return pinyin.compareWord(a.name, b.name);
             } else {
                 return a.is_aux - b.is_aux;
             }

app/view/ledger/gather.ejs

@@ -159,4 +159,5 @@
     const isTz = <%- ctx.tender.data.measure_type === measureType.tz.value %>;
     const chapter = JSON.parse('<%- JSON.stringify(ctx.tender.info.chapter) %>');
     const thousandth = <%- ctx.tender.info.display.thousandth %>;
-</script>
+</script>
+<script src="/public/js/PinYinOrder.bundle.js"></script>

app/view/sp_setting/fun.ejs

@@ -357,7 +357,7 @@
                         </div>
                         <div class="card mb-3">
                             <div class="card-header d-flex justify-content-between">
-                                <div>动态决算</div>
+                                <div>项目进度</div>
                             </div>
                             <div class="card-body">
                                 <div class="form-group mb-4">
@@ -397,7 +397,7 @@
     let changeState = JSON.parse(unescape('<%- escape(JSON.stringify(funSet.change_state)) %>'));
     const changeSettingTab = function(tab) {
         const type = tab.getAttribute('type');
-        if (type === 'start') {
+        if (type === 'start') {·
             $('#switch-stage-start').show();
             $('#switch-stage-audit').hide();
             $('#stage-start-tab').addClass('active').addClass('show');