修复bug

app/controller/material_controller.js

@@ -778,7 +778,7 @@ module.exports = app => {
                         break;
                     case 'del':
                         // 判断是否已不存在该月份
-                        if (ctx.app._.indexOf(material_month, data.updateData.yearmonth) === -1) {
+                        if (ctx.app._.intersection(data.updateData.del_yearmonth, material_month).length !== data.updateData.del_yearmonth.length) {
                             throw '调差期已删除本月的信息价,请刷新页面重新获取';
                         }
                         const tp2 = await ctx.service.materialMonth.del(data.updateData.del_yearmonth, monthList, mbList);

app/public/js/material.js

@@ -401,7 +401,7 @@ $(document).ready(() => {
                         return;
                     }
                     let num = parseFloat(validText);
-                    const reg = new RegExp("^\\d+(\\.\\d{1,"+ materialDecimal.up +"})?$");
+                    const reg = materialDecimal.up ? new RegExp("^\\d+(\\.\\d{1,"+ materialDecimal.up +"})?$") : new RegExp("^\\d+?$");
                     if (validText !== null && (num < 0 || !reg.test(num))) {
                         toastr.warning('已保留'+ materialDecimal.up +'位小数');
                         validText = ZhCalc.round(num, materialDecimal.up);
@@ -414,7 +414,7 @@ $(document).ready(() => {
                         return;
                     }
                     const num = parseFloat(validText);
-                    const reg = new RegExp("^\\d+(\\.\\d{1,"+ materialDecimal.up +"})?$");
+                    const reg = materialDecimal.up ? new RegExp("^\\d+(\\.\\d{1,"+ materialDecimal.up +"})?$") : new RegExp("^\\d+?$");
                     if (validText !== null && (num < 0 || !reg.test(num))) {
                         toastr.warning('已保留'+ materialDecimal.up +'位小数');
                         validText = ZhCalc.round(num, materialDecimal.up);
@@ -577,7 +577,7 @@ $(document).ready(() => {
                         }
                         const num = parseFloat(validText);
                         if (colSetting.field === 'basic_price' || colSetting.field === 'msg_tp') {
-                            const reg = new RegExp("^\\d+(\\.\\d{1,"+ materialDecimal.up +"})?$");
+                            const reg = materialDecimal.up ? new RegExp("^\\d+(\\.\\d{1,"+ materialDecimal.up +"})?$") : new RegExp("^\\d+?$");
                             if (validText !== null && (num < 0 || !reg.test(num))) {
                                 toastMessageUniq(getPasteHint(hint.numberCan, hintRow));
                                 validText = ZhCalc.round(num, materialDecimal.up);
@@ -807,7 +807,7 @@ $(document).ready(() => {
                         return;
                     }
                     const num = parseFloat(validText);
-                    const reg = new RegExp("^\\d+(\\.\\d{1,"+ materialDecimal.up +"})?$");
+                    const reg = materialDecimal.up ? new RegExp("^\\d+(\\.\\d{1,"+ materialDecimal.up +"})?$") : new RegExp("^\\d+?$");
                     if (validText !== null && (num < 0 || !reg.test(num))) {
                         toastr.warning('已保留'+ materialDecimal.up +'位小数');
                         validText = ZhCalc.round(num, materialDecimal.up);
@@ -915,7 +915,7 @@ $(document).ready(() => {
                             bPaste = false;
                             continue;
                         }
-                        const reg = new RegExp("^\\d+(\\.\\d{1,"+ materialDecimal.up +"})?$");
+                        const reg = materialDecimal.up ? new RegExp("^\\d+(\\.\\d{1,"+ materialDecimal.up +"})?$") : new RegExp("^\\d+?$");
                         if (validText !== null && (num < 0 || !reg.test(num))) {
                             toastMessageUniq(getPasteHint(hint.numberCan, hintRow));
                             validText = ZhCalc.round(num, materialDecimal.up);

app/view/material/audit_modal.ejs

@@ -776,6 +776,10 @@
             $('.modal-title').text('重新上报')
         }
     });
+    $('#cc-digits').on('shown.bs.modal', function () {
+        $('#decimal_up').val(<%- material.decimal.up %>);
+        $('#decimal_tp').val(<%- material.decimal.tp %>);
+    });
     // 小数位设置
     function checkSetDecimal() {
         const up = parseInt($('#decimal_up').val());

app/view/material/checklist.ejs

@@ -4,9 +4,11 @@
         <div class="title-main d-flex justify-content-between">
             <% include ./material_sub_mini_menu.ejs %>
             <div>
+                <% if (material.checklistPermission) { %>
                 <div class="d-inline-block ml-1">
                     <a href="javascript:void(0);" id="open_addtclist" class="btn btn-sm btn-light text-primary" data-original-title="添加调差清单"><i class="fa fa-plus" aria-hidden="true"></i> 选择调差清单</a>
                 </div>
+                <% } %>
                 <div class="d-inline-block">
                     <a class="btn btn-sm btn-light">
                         <div class="custom-control custom-checkbox">