Prechádzať zdrojové kódy

调整修改材料数量开关位置

ellisran 2 mesiacov pred
rodič
commit
cc5ceb305f

+ 1 - 1
app/const/account_permission.js

@@ -54,7 +54,7 @@ const permission = {
             { title: '批量设置材差清单', value: 1, hint: '开启该选项,当前账号可设置允许调差的清单', hintIcon: 'fa-question-circle' },
             { title: '修改调差工料消耗量', value: 2, hint: '开启该选项,可在新材差期修改工料的消耗量', hintIcon: 'fa-question-circle' },
             // { title: '修改材料税税率', value: 3, hint: '开启该选项,可在新材差期修改材料税税率', hintIcon: 'fa-question-circle' },
-            { title: '修改调差数量', value: 4, hint: '开启该选项,可在调差清单页修改本期调差数量', hintIcon: 'fa-question-circle' },
+            // { title: '修改调差数量', value: 4, hint: '开启该选项,可在调差清单页修改本期调差数量', hintIcon: 'fa-question-circle' },
         ],
     },
     other: {

+ 1 - 0
app/const/sp_page_show.js

@@ -97,6 +97,7 @@ const defaultSetting = {
     openPayment: 1,
     openConstruction: 1,
     openMaterialStageRepeat: 0,
+    openMaterialListQty: 0,
     openContract: 1,
     openFinancial: 1,
     openTenderContract: 1,

+ 3 - 2
app/controller/material_controller.js

@@ -1740,8 +1740,9 @@ module.exports = app => {
         }
 
         async _setEditQtyPermission(ctx) {
-            const permission = ctx.session.sessionUser.permission;
-            ctx.material.editQtyPermission = permission && permission.material !== undefined && permission.material.indexOf('4') !== -1;
+            // const permission = ctx.session.sessionUser.permission;
+            // ctx.material.editQtyPermission = permission && permission.material !== undefined && permission.material.indexOf('4') !== -1;
+            ctx.material.editQtyPermission = !!ctx.subProject.page_show.openMaterialListQty;
         }
 
         async _setChecklistPermission(ctx) {

+ 1 - 0
app/controller/sub_proj_setting_controller.js

@@ -398,6 +398,7 @@ module.exports = app => {
                 this.ctx.subProject.page_show.openMaterialEditForAudit = data.openMaterialEditForAudit ? 1 : 0;
                 this.ctx.subProject.page_show.openStageStart = data.openStageStart ? 1 : 0;
                 this.ctx.subProject.page_show.openMaterialStageRepeat = data.openMaterialStageRepeat ? 1 : 0;
+                this.ctx.subProject.page_show.openMaterialListQty = data.openMaterialListQty ? 1 : 0;
                 this.ctx.subProject.page_show.openContractExpr = data.openContractExpr ? 1 : 0;
                 this.ctx.subProject.page_show.correctCalcContractTp = data.correctCalcContractTp ? 1 : 0;
                 this.ctx.subProject.page_show.close1stStageCheckDealParam = data.close1stStageCheckDealParam ? 1 : 0;

+ 8 - 0
app/view/sp_setting/fun.ejs

@@ -344,6 +344,13 @@
                                                 <label class="form-check-label" for="openMaterialStageRepeat">开启「材料调差重复使用计量期」</label>
                                             </div>
                                         </div>
+                                        <div class="form-group mb-1">
+                                            <div class="form-check form-check-inline">
+                                                <input class="form-check-input" type="checkbox" id="openMaterialListQty" <% if(ctx.subProject.page_show.openMaterialListQty) { %>checked<% } %> onchange="updateSetting();">
+                                                <label class="form-check-label" for="openMaterialListQty">开启「修改调差数量」功能
+                                                    <a href="javascript:void(0);"  data-toggle="tooltip" data-placement="bottom" title="" data-original-title="开启该选项,可在调差清单页修改本期调差数量"><i class="fa fa-question-circle "></i></a></label>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -645,6 +652,7 @@
             openMaterialSelf: $('#openMaterialSelf')[0].checked,
             openMaterialEditForAudit: $('#openMaterialEditForAudit')[0].checked,
             openMaterialStageRepeat: $('#openMaterialStageRepeat')[0].checked,
+            openMaterialListQty: $('#openMaterialListQty')[0].checked,
             openStageStart: $('#openStageStart')[0].checked,
             openContractExpr: $('#openContractExpr')[0].checked,
             correctCalcContractTp: $('#correctCalcContractTp')[0].checked,