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

app/public/css/main.css

@@ -35,6 +35,10 @@ font-size: .875rem;
   height: calc(1.5em + .5rem + 2px);
 font-size: .875rem;
 }
+.table th {
+  background: #e9ecef;
+  font-weight: normal;
+}
 /*自定义css*/
 .in-1{padding-left:5px!important}
 .in-2{padding-left:21px!important}
@@ -295,7 +299,7 @@ font-size: .875rem;
   }
 }
 .modal-xl {
-  max-width: 1000px
+  max-width: 1200px
 }
 /*滚动*/
 .scrollbar-auto {

app/public/js/change_set.js

@@ -64,8 +64,8 @@ $(document).ready(() => {
         const unit = gcl.unit !== undefined && gcl.unit !== null ? gcl.unit : '';
         const quantity = gcl.quantity !== null && gcl.quantity !== undefined ? (unit !== '' ? roundnum(gcl.quantity, findDecimal(gcl.unit)) : gcl.quantity) : 0;
         const unit_price = gcl.unit_price !== null && gcl.unit_price !== undefined ? gcl.unit_price : 0;
-        let gclhtml = gcl.leafXmjs !== undefined ? ' data-gcl="' + gcl_index + '"': '';
-        gcl_index = gclhtml !== '' ? gcl_index++ : gcl_index;
+        let gclhtml = gcl.leafXmjs !== undefined && gcl.leafXmjs !== null ? ' data-gcl="' + gcl_index + '"': '';
+        gcl_index = gclhtml !== '' ? ++gcl_index : gcl_index;
         listHtml += '<tr data-lid="' + list_index + '"'+ gclhtml +' data-index="' + list_index + '" data-bwmx="">' +
             '<td>' + list_index + '</td>' +
             '<td>' + gcl.code + '</td>' +

app/view/change/info_modal.ejs

@@ -107,8 +107,8 @@
                 <div class="row">
                     <div class="col-7">
                         <div style="height:400px;overflow-y:auto">
-                            <table class="table table-striped table-bordered table-condensed">
-                                <thead><tr><th>序号</th><th>清单编号</th><th>名称</th><th>单位</th><th>单价</th><th>数量</th></tr></thead>
+                            <table class="table table-striped table-bordered table-hover table-sm">
+                                <thead><tr><th width="40">序号</th><th>清单编号</th><th>名称</th><th width="50">单位</th><th width="60">单价</th><th width="60">数量</th></tr></thead>
                                 <tbody id="table-list-select">
                                 </tbody>
                             </table>
@@ -116,9 +116,9 @@
                     </div>
                     <div class="col-5">
                         <div style="height:400px;overflow-y:auto">
-                            <table class="table table-sm table-bordered">
+                            <table class="table table-striped table-sm table-bordered table-hover">
                                 <thead>
-                                <tr><th>项目节编号</th><th>名称</th><th>部位明细</th><th>部位数量</th><th>选择</th></tr>
+                                <tr><th width="100">项目节编号</th><th>名称</th><th>部位明细</th><th width="70">部位数量</th><th width="40">选择</th></tr>
                                 </thead>
                                 <tbody id="code-list" data-index="">
                                 </tbody>