Selaa lähdekoodia

台账修订,工程量清单模式,显示计量单元,编辑等

MaiXinRong 5 kuukautta sitten
vanhempi
commit
25991b7e73
2 muutettua tiedostoa jossa 5 lisäystä ja 14 poistoa
  1. 5 11
      app/public/js/revise.js
  2. 0 3
      app/view/revise/info.ejs

+ 5 - 11
app/public/js/revise.js

@@ -166,9 +166,6 @@ $(document).ready(() => {
         markExpandKey: 'revise-bills-expand',
         markExpandSubKey: window.location.pathname.split('/')[2],
     };
-    if (!isTz) {
-        treeSetting.calcFields.push('deal_tp');
-    }
     treeSetting.calcFun = function (node) {
         node.dgn_price = ZhCalc.round(ZhCalc.div(node.total_price, node.dgn_qty1), 2);
     };
@@ -542,7 +539,7 @@ $(document).ready(() => {
                     return;
                 }
                 // 台账模式,检查计量单元相关
-                if (isTz) {
+                // if (isTz) {
                     if (col.field === 'sgfh_qty' || col.field === 'sgfh_tp' ||
                         col.field === 'sjcl_qty' || col.field === 'sjcl_tp' ||
                         col.field === 'qtcl_qty' || col.field === 'qtcl_tp') {
@@ -563,7 +560,7 @@ $(document).ready(() => {
                             return;
                         }
                     }
-                }
+                // }
                 if (col.field === 'node_type' && newValue && newValue !== '0' && newValue !== '19') {
                     const sameNodeType = sortData.find(x => { return x.node_type == newValue; });
                     if (sameNodeType) {
@@ -691,10 +688,10 @@ $(document).ready(() => {
                         if (colSetting.field === 'sgfh_qty' || colSetting.field === 'sgfh_tp' ||
                             colSetting.field === 'sjcl_qty' || colSetting.field === 'sjcl_tp' ||
                             colSetting.field === 'qtcl_qty' || colSetting.field === 'qtcl_tp') {
-                            if (isTz) {
+                            // if (isTz) {
                                 toastMessageUniq(hint.posQty);
                                 continue;
-                            }
+                            // }
                         }
                         if (value !== '' && invalidFields.posXmj.indexOf(colSetting.field) >= 0) {
                             toastMessageUniq(hint.posXmj);
@@ -2035,7 +2032,7 @@ $(document).ready(() => {
         }
     };
     posSpread.bind(spreadNS.Events.SelectionChanged, posSpreadObj.selectionChanged);
-    if (!readOnly && isTz) {
+    if (!readOnly) {
         $('a[name="pos-opr"]').click(function () {
             posSpreadObj.baseOpr(posSheet, this.getAttribute('type'));
         });
@@ -2135,9 +2132,6 @@ $(document).ready(() => {
                     },
                     callback: function (key, opt) {
                         mergePeg.show();
-                    },
-                    visible: function (key, opt) {
-                        return isTz;
                     }
                 }
             }

+ 0 - 3
app/view/revise/info.ejs

@@ -75,10 +75,8 @@
         <div class="row w-100 sub-content">
             <!--左栏-->
             <div class="c-body" id="left-view" style="width: 100%">
-                <!--0号台账模式-->
                 <div class="sjs-height-1" style="overflow: hidden" id="bills-spread">
                 </div>
-                <% if (ctx.tender.data.measure_type === measureType.tz.value) { %>
                 <div class="bcontent-wrap">
                     <div id="revise-resize" class="resize-y" id="top-spr" r-Type="height" div1=".sjs-height-1" div2=".bcontent-wrap" title="调整大小"><!--调整上下高度条--></div>
                     <div class="bc-bar mb-1">
@@ -109,7 +107,6 @@
                     <div class="sp-wrap" id="pos-spread">
                     </div>
                 </div>
-                <% } %>
             </div>
             <!--右栏-->
             <div class="c-body" id="right-view" style="display: none; width: 33%;">