计量变更部分修改

app/public/js/change_set.js

@@ -13,7 +13,6 @@ $(document).ready(() => {
     gclGatherModel.loadLedgerData(ledger);
     gclGatherModel.loadPosData(pos);
     const gclGatherData = gclGatherModel.gatherGclData();
-    console.log(gclGatherData);
     // 先加载台账数据
     let listHtml = '';
     let list_index = 1;
@@ -260,13 +259,10 @@ $(document).ready(() => {
         const isCheck = $(this).hasClass('table-success') ? true : false;
         const data_detail = $(this).attr('data-detail').split('$#$');
         const isDeal = $(this).data('gcl') !== undefined ? true : false;
-        let codeHtml = '<tr quantity="0"><td colspan="4">自行编辑变更详情</td><td><input type="checkbox"></td></tr>';
+        let codeHtml = '<tr quantity="0"><td colspan="4"></td><td><input type="checkbox"></td></tr>';
         if (isDeal) {
             const gcl = gclGatherData[$(this).data('gcl')];
-            codeHtml = '<tr quantity="0"><td colspan="4">自行编辑变更详情</td><td><input type="checkbox" ';
-            // 判断自行编辑变更详情是否已选中
-            codeHtml += data_detail.indexOf('0;0') !== -1 && isCheck ? 'checked' : '';
-            codeHtml += '></td></tr>';
+            codeHtml = '';
             for (const leaf of gcl.leafXmjs) {
                 const quantity = leaf.quantity !== undefined ? leaf.quantity : 0;
                 const bwmx = leaf.bwmx !== undefined ? leaf.bwmx : '';
@@ -279,7 +275,7 @@ $(document).ready(() => {
                     '></td></tr>';
             }
         } else if (!isDeal && isCheck) {
-            codeHtml = '<tr quantity="0"><td colspan="4">自行编辑变更详情</td><td><input type="checkbox" checked></td></tr>';
+            codeHtml = '<tr quantity="0"><td colspan="4"></td><td><input type="checkbox" checked></td></tr>';
         }
         $('#code-list').attr('data-index', $(this).children('td').eq(0).text());
         $('#code-list').html(codeHtml);
@@ -339,6 +335,11 @@ $(document).ready(() => {
         $('#addlist').modal('hide');
     });
 
+    // 添加空白清单
+    $('#add-white-btn').on('click', function () {
+        maketablelist('addwhite');
+    });
+
     // 选中input所有值
     $('body').on('focus', ".clist input", function() {
         $(this).select();

app/view/change/index.ejs

@@ -28,9 +28,9 @@
             <table class="table">
                 <thead>
                 <tr>
-                    <th width="20%">变更令号</th><th width="30%">工程名称</th>
-                    <th width="10%">变更类别</th><th width="10%">变更金额</th>
-                    <th width="10%">审批状态</th><th>审批进度</th><th></th>
+                    <th width="32%">申请编号/变更令号</th><th width="30%">工程名称</th>
+                    <th width="90">变更类别</th><th width="90">变更金额</th>
+                    <th width="100">审批状态</th><th>审批进度</th><th width="80"></th>
                 </tr>
                 </thead>
                 <tbody id="changeList">
@@ -41,7 +41,7 @@
                 <% } %>
                 <% for (const c of changes) { %>
                 <tr>
-                    <td><a href="/tender/<%- tender.id %>/change/<%- c.cid %>/info"><%- c.code %></a></td>
+                    <td><a href="/tender/<%- tender.id %>/change/<%- c.cid %>/info"><% if (c.status !== auditConst.status.checked) { %><%- c.code %><% } else { %><%- c.p_code %><% } %></a></td>
                     <td><%- c.name %></td>
                     <td><%- classArray[c.class] %><% c.class %></td>
                     <td><%- c.total_price %></td>

app/view/change/info.ejs

@@ -118,7 +118,10 @@
                 <div>
                     <% if (auditStatus === 1 || auditStatus === 2) { %>
                     <div class="d-inline-block">
-                        <a href="#addlist" data-toggle="modal" class="btn btn-sm" id="open-list-modal" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="添加清单"><i class="fa fa-plus" aria-hidden="true"></i> 添加清单</a>
+                        <a href="#addlist" data-toggle="modal" class="btn btn-sm btn-light text-primary" id="open-list-modal" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="添加清单"><i class="fa fa-plus" aria-hidden="true"></i> 添加台帐清单</a>
+                    </div>
+                    <div class="d-inline-block">
+                        <a href="javascript:void(0);" class="btn btn-sm btn-light text-primary" id="add-white-btn" data-original-title="添加清单"><i class="fa fa-plus" aria-hidden="true"></i> 添加空白清单</a>
                     </div>
                     <% } else { %>
                     <div class="d-inline-block">
@@ -282,7 +285,7 @@
                         </div>
                         <% if (auditStatus === 4) { %>
                         <div class="form-group">
-                            <label>批复编号</label>
+                            <label>变更令号（批复编号）</label>
                             <input class="form-control" value="<%- change.p_code %>" type="text" readonly>
                         </div>
                         <% } %>

app/view/change/info_modal.ejs

@@ -128,7 +128,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="add-list-btn btn btn-outline-primary">添加空白清单</button>
+                <!--<button type="button" class="add-list-btn btn btn-outline-primary">添加空白清单</button>-->
                 <button type="button" class="btn btn-secondary" data-dismiss="modal" id="cancel-list-btn">取消</button>
                 <button type="button" class="add-list-btn btn btn-primary">添加</button>
             </div>
@@ -371,7 +371,7 @@
                                         <% if (a.usort !== 0 && index+1 === auditList.length) { %>
                                         <!--终审填写批复编号-->
                                         <div class="form-group mt-3">
-                                            <label><b class="text-danger">*&nbsp;</b>批复编号</label>
+                                            <label><b class="text-danger">*&nbsp;</b>变更令号（批复编号）</label>
                                             <input class="form-control" value="<%= change.code %>" name="p_code" type="text">
                                         </div>
                                         <% } else { %>