Prechádzať zdrojové kódy

方案及申请清单bug修复

laiguoran 3 rokov pred
rodič
commit
1401b6aa7a

+ 1 - 1
app/public/js/change_apply_information.js

@@ -461,7 +461,7 @@ $(document).ready(() => {
             if (index > -1) {
                 const dataSource = listRule.source === 1 ? gclGatherData : dealBillList;
                 const source = _.find(dataSource, function (item) {
-                    if (item.b_code === select.code && item.name === select.name) {
+                    if (((item.b_code && item.b_code === select.code) || (item.code && item.code === select.code)) && item.name === select.name) {
                         if (listRule.rule.length > 0) {
                             for(const r of listRule.rule) {
                                 if (item[r] !== select[r]) {

+ 1 - 1
app/public/js/change_plan_information.js

@@ -522,7 +522,7 @@ $(document).ready(() => {
             if (index > -1) {
                 const dataSource = listRule.source === 1 ? gclGatherData : dealBillList;
                 const source = _.find(dataSource, function (item) {
-                    if (item.b_code === select.code && item.name === select.name) {
+                    if (((item.b_code && item.b_code === select.code) || (item.code && item.code === select.code)) && item.name === select.name) {
                         if (listRule.rule.length > 0) {
                             for(const r of listRule.rule) {
                                 if (item[r] !== select[r]) {

+ 1 - 1
app/view/change/apply_information.ejs

@@ -122,7 +122,7 @@
                             </tr>
                         </table>
                         <h5 id="qingdan">变更清单</h5>
-                        <div style="height: <%= 21*(changeList.length+3) + 100 %>px;min-height: 300px" id="apply-spread"></div>
+                        <div style="height: 300px;" id="apply-spread"></div>
                         <h5 id="fujian">附件</h5>
                         <table class="table table-bordered">
                             <thead>

+ 1 - 1
app/view/change/plan_information.ejs

@@ -117,7 +117,7 @@
                             </div>
                         </div>
                         <% } %>
-                        <div style="height: <%= 21*(changeList.length+3) + 100 %>px;min-height: 300px" id="plan-spread"></div>
+                        <div style="height: 300px;" id="plan-spread"></div>
                         <h5 id="fujian">附件</h5>
                         <table class="table table-bordered">
                             <thead>