Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/controller/material_controller.js

@@ -677,7 +677,7 @@ module.exports = app => {
                     }
                     renderData.ex_calc = ex_calc;
                 }
-
+                renderData.materialBillsData = await this._getMaterialBillsData(ctx);
                 renderData.materialExponentData = await this._getMaterialExponentData(ctx);
                 // 取对应期的截取上期的调差金额和应耗数量
                 if (ctx.material.highOrder !== ctx.material.order) {
@@ -712,6 +712,7 @@ module.exports = app => {
             try {
                 await this._getMaterialAuditViewData(ctx);
                 const renderData = await this._getDefaultRenderData(ctx);
+                renderData.materialBillsData = await this._getMaterialBillsData(ctx);
                 const whiteList = this.ctx.app.config.multipart.whitelist;
                 // 获取当前标段所有附件
                 // const searchsql = { tid: ctx.tender.id };

app/public/js/material_audit.js

@@ -224,6 +224,15 @@ function checkAuditorFrom () {
         }
         return false;
     }
+    // 判断是否存在工料编号不能为空的情况
+    const nullList = _.filter(materialBillsData, function (item) {
+        return item.code === '' || item.code === null;
+    });
+    if (nullList.length > 0) {
+        toastr.error('信息价调差存在编号为空的工料，请添加编号后再上报');
+        return false;
+    }
+    return false;
     $('#hide-all').show();
 }
 // texterea换行

app/public/js/material_exponent.js

@@ -652,4 +652,22 @@ $(document).ready(() => {
     function getObjHeight(select) {
         return select.length > 0 ? select.height() : 0;
     }
+
+    $.subMenu({
+        menu: '#sub-menu', miniMenu: '#sub-mini-menu', miniMenuList: '#mini-menu-list',
+        toMenu: '#to-menu', toMiniMenu: '#to-mini-menu',
+        key: 'menu.1.0.0',
+        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1',
+        callback: function (info) {
+            if (info.mini) {
+                $('.panel-title').addClass('fluid');
+                $('#sub-menu').removeClass('panel-sidebar');
+            } else {
+                $('.panel-title').removeClass('fluid');
+                $('#sub-menu').addClass('panel-sidebar');
+            }
+            autoFlashHeight();
+            materialExponentSpread.refresh();
+        }
+    });
 });

app/public/js/material_list.js

@@ -599,7 +599,7 @@ $(document).ready(() => {
             // 是否本期添加的工料
             // return data.order === stage_order && !openMaterialChecklist;
             let flag = true;
-            if (type === 'del' || !editListPermission) {
+            if (type === 'del') {
                 flag = data.order === stage_order;
             }
             return flag;

app/public/js/stage_gather.js

@@ -135,7 +135,7 @@ $(document).ready(function () {
         gclGatherData = gclGatherModel.gatherGclData();
         gclGatherModel.checkDiffer(gclGatherData);
         checkOverRange(gclGatherData);
-        // 加载清单数据        
+        // 加载清单数据
         SpreadJsObj.loadSheetData(gclSpread.getActiveSheet(), SpreadJsObj.DataType.Data, gclGatherData);
         loadLeafXmjData(0);
         // 章节合计
@@ -295,7 +295,7 @@ $(document).ready(function () {
                         end_gather_qty: xmj.end_gather_qty, end_gather_percent: xmj.end_gather_percent,
                         dwgc: xmj.dwgc, fbgc: xmj.fbgc, fxgc: xmj.fxgc,
                         jldy: xmj.jldy, bwmx: xmj.bwmx, drawing_code: xmj.drawing_code,
-                        end_final_1_percent:: xmj.end_final_1_percent,
+                        end_final_1_percent: xmj.end_final_1_percent,
                     });
                 }
             }
@@ -303,4 +303,4 @@ $(document).ready(function () {
 
         SpreadExcelObj.exportSimpleXlsxSheet(setting, data, $('.sidebar-title').attr('data-original-title') + "-清单汇总.xlsx");
     });
-});
+});

app/view/material/audit_modal.ejs

@@ -849,6 +849,7 @@
     $('#cc-digits').on('shown.bs.modal', function () {
         $('#decimal_up').val(<%- material.decimal.up %>);
         $('#decimal_tp').val(<%- material.decimal.tp %>);
+        $('#decimal_qty').val(<%- material.decimal.qty %>);
     });
     // 小数位设置
     function checkSetDecimal() {

app/view/material/exponent.ejs

@@ -22,7 +22,7 @@
             </div>
             <div class="ml-auto">
                 <% if (ctx.session.sessionProject.page_show.openMaterialChecklist && material.order === material.highOrder) { %>
-                    <a href="/tender/<%- ctx.tender.id %>/measure/material/<%- material.highOrder %>/checklist" class="btn btn-sm btn-outline-primary">清单设置</a>
+                    <a href="/tender/<%- ctx.tender.id %>/measure/material/<%- material.highOrder %>/checklist" class="btn btn-sm btn-outline-primary">批量设置调差清单</a>
                 <% } %>
             </div>
         </div>
@@ -175,4 +175,5 @@
     let ex_expr = '<%- material.ex_expr %>';
     let materialRate = parseInt('<%- material.exponent_rate %>');
     let materialExponentData = JSON.parse(unescape('<%- escape(JSON.stringify(materialExponentData)) %>'));
+    const materialBillsData = JSON.parse(unescape('<%- escape(JSON.stringify(materialBillsData)) %>'));
 </script>

app/view/material/file.ejs

@@ -134,4 +134,5 @@
   const tender = JSON.parse(unescape('<%- escape(JSON.stringify(tender)) %>'));
   const whiteList = JSON.parse('<%- JSON.stringify(whiteList) %>');
   let currPageFileData = [];
+  const materialBillsData = JSON.parse(unescape('<%- escape(JSON.stringify(materialBillsData)) %>'));
 </script>

app/view/material/material_sub_menu.ejs

@@ -40,9 +40,9 @@
         </div>
         <% include ./audit_btn.ejs %>
         <!--<div class="side-fold"><a href="javascript: void(0)" data-toggle="tooltip" data-placement="top" data-original-title="折叠侧栏" id="to-mini-menu"><i class="fa fa-sign-out fa-flip-horizontal"></i></a></div>-->
-        <div class="side-show"></div>
-        <div class="side-fold" data-toggle="tooltip" data-placement="top" data-original-title="折叠侧栏" id="to-mini-menu">
-            <i class="fa fa-angle-left"></i>
-        </div>
+    </div>
+    <div class="side-show"></div>
+    <div class="side-fold" data-toggle="tooltip" data-placement="top" data-original-title="折叠侧栏" id="to-mini-menu">
+        <i class="fa fa-angle-left"></i>
     </div>
 </div>

app/view/stage/manager.ejs

@@ -85,4 +85,22 @@
 </div>
 <script type="text/javascript">
     autoFlashHeight();
+    $(function () {
+        $.subMenu({
+            menu: '#sub-menu', miniMenu: '#sub-mini-menu', miniMenuList: '#mini-menu-list',
+            toMenu: '#to-menu', toMiniMenu: '#to-mini-menu',
+            key: 'menu.1.0.0',
+            miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1',
+            callback: function (info) {
+                if (info.mini) {
+                    $('.panel-title').addClass('fluid');
+                    $('#sub-menu').removeClass('panel-sidebar');
+                } else {
+                    $('.panel-title').removeClass('fluid');
+                    $('#sub-menu').addClass('panel-sidebar');
+                }
+                autoFlashHeight();
+            }
+        });
+    })
 </script>