Sfoglia il codice sorgente

变更空白清单功能开关

ellisran 1 anno fa
parent
commit
3403ba803e

+ 1 - 0
app/const/page_show.js

@@ -45,6 +45,7 @@ const defaultSetting = {
     openChangeProject: 0,
     openChangeProject: 0,
     openChangeApply: 0,
     openChangeApply: 0,
     openChangePlan: 0,
     openChangePlan: 0,
+    openChangeWhiteList: 0,
     isPreset: 0,
     isPreset: 0,
     isOnlyChecked: 1,
     isOnlyChecked: 1,
     openStageStart: 0,
     openStageStart: 0,

+ 6 - 0
app/controller/change_controller.js

@@ -836,9 +836,15 @@ module.exports = app => {
                 };
                 };
                 switch (data.type) {
                 switch (data.type) {
                     case 'add':
                     case 'add':
+                        if (!ctx.session.sessionProject.page_show.openChangeWhiteList) {
+                            throw '空白清单添加功能未开启。';
+                        }
                         responseData.data = await ctx.service.changeAuditList.add(data.postData);
                         responseData.data = await ctx.service.changeAuditList.add(data.postData);
                         break;
                         break;
                     case 'batchadd':
                     case 'batchadd':
+                        if (!ctx.session.sessionProject.page_show.openChangeWhiteList) {
+                            throw '空白清单添加功能未开启。';
+                        }
                         responseData.data = await ctx.service.changeAuditList.batchAdd(data);
                         responseData.data = await ctx.service.changeAuditList.batchAdd(data);
                         break;
                         break;
                     case 'del':
                     case 'del':

+ 1 - 0
app/controller/setting_controller.js

@@ -970,6 +970,7 @@ module.exports = app => {
                 this.ctx.session.sessionProject.page_show.openChangeProject = data.openChangeProject ? 1 : 0;
                 this.ctx.session.sessionProject.page_show.openChangeProject = data.openChangeProject ? 1 : 0;
                 this.ctx.session.sessionProject.page_show.openChangeApply = data.openChangeApply ? 1 : 0;
                 this.ctx.session.sessionProject.page_show.openChangeApply = data.openChangeApply ? 1 : 0;
                 this.ctx.session.sessionProject.page_show.openChangePlan = data.openChangePlan ? 1 : 0;
                 this.ctx.session.sessionProject.page_show.openChangePlan = data.openChangePlan ? 1 : 0;
+                this.ctx.session.sessionProject.page_show.openChangeWhiteList = data.openChangeWhiteList ? 1 : 0;
                 this.ctx.session.sessionProject.page_show.openMaterialTax = data.openMaterialTax ? 1 : 0;
                 this.ctx.session.sessionProject.page_show.openMaterialTax = data.openMaterialTax ? 1 : 0;
                 this.ctx.session.sessionProject.page_show.openMaterialChecklist = data.openMaterialChecklist ? 1 : 0;
                 this.ctx.session.sessionProject.page_show.openMaterialChecklist = data.openMaterialChecklist ? 1 : 0;
                 this.ctx.session.sessionProject.page_show.openMaterialSelf = data.openMaterialSelf ? 1 : 0;
                 this.ctx.session.sessionProject.page_show.openMaterialSelf = data.openMaterialSelf ? 1 : 0;

+ 4 - 4
app/public/js/change_information_set.js

@@ -1065,7 +1065,7 @@ $(document).ready(() => {
                     name: '添加空白清单',
                     name: '添加空白清单',
                     icon: 'fa-sign-in',
                     icon: 'fa-sign-in',
                     visible: function () {
                     visible: function () {
-                        return changeOrder === 0;
+                        return changeOrder === 0 && openChangeWhiteList;
                     },
                     },
                     callback: function (key, opt) {
                     callback: function (key, opt) {
                         changeSpreadObj.add(changeSpreadSheet);
                         changeSpreadObj.add(changeSpreadSheet);
@@ -1077,7 +1077,7 @@ $(document).ready(() => {
                     value: '2',
                     value: '2',
                     icon: 'fa-sign-in',
                     icon: 'fa-sign-in',
                     visible: function () {
                     visible: function () {
-                        return changeOrder === 0;
+                        return changeOrder === 0 && openChangeWhiteList;
                     },
                     },
                     batchInsert: function (obj, root) {
                     batchInsert: function (obj, root) {
                         if (_.toNumber(obj.value) > _.toNumber(obj.max)) {
                         if (_.toNumber(obj.value) > _.toNumber(obj.max)) {
@@ -1118,7 +1118,7 @@ $(document).ready(() => {
                     name: '插入空白清单',
                     name: '插入空白清单',
                     icon: 'fa-sign-in',
                     icon: 'fa-sign-in',
                     visible: function () {
                     visible: function () {
-                        return changeOrder === 1;
+                        return changeOrder === 1 && openChangeWhiteList;
                     },
                     },
                     // disabled: function (key, opt) {
                     // disabled: function (key, opt) {
                     //     const select = SpreadJsObj.getSelectObject(changeSpreadSheet);
                     //     const select = SpreadJsObj.getSelectObject(changeSpreadSheet);
@@ -1141,7 +1141,7 @@ $(document).ready(() => {
                     value: '2',
                     value: '2',
                     icon: 'fa-sign-in',
                     icon: 'fa-sign-in',
                     visible: function () {
                     visible: function () {
-                        return changeOrder === 1;
+                        return changeOrder === 1 && openChangeWhiteList;
                     },
                     },
                     // disabled: function (key, opt) {
                     // disabled: function (key, opt) {
                     //     const select = SpreadJsObj.getSelectObject(changeSpreadSheet);
                     //     const select = SpreadJsObj.getSelectObject(changeSpreadSheet);

+ 4 - 1
app/view/change/information.ejs

@@ -29,9 +29,11 @@
                     <div class="d-inline-block ml-3">
                     <div class="d-inline-block ml-3">
                         <a href="#addlist" data-toggle="modal" class="btn btn-sm btn-light text-primary" id="open-list-modal" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="添加清单"><i class="fa fa-plus" aria-hidden="true"></i> <span class="order_text"><% if (change.order_by === 0) { %>添加<% } else { %>插入<% } %></span>台账清单</a>
                         <a href="#addlist" data-toggle="modal" class="btn btn-sm btn-light text-primary" id="open-list-modal" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="添加清单"><i class="fa fa-plus" aria-hidden="true"></i> <span class="order_text"><% if (change.order_by === 0) { %>添加<% } else { %>插入<% } %></span>台账清单</a>
                     </div>
                     </div>
+                    <% if (ctx.session.sessionProject.page_show.openChangeWhiteList) { %>
                     <div class="d-inline-block mr-1">
                     <div class="d-inline-block mr-1">
                         <a href="javascript:void(0);" class="btn btn-sm btn-light text-primary" id="add-white-btn" data-original-title="添加清单"><i class="fa fa-plus" aria-hidden="true"></i> <span class="order_text"><% if (change.order_by === 0) { %>添加<% } else { %>插入<% } %></span>空白清单</a>
                         <a href="javascript:void(0);" class="btn btn-sm btn-light text-primary" id="add-white-btn" data-original-title="添加清单"><i class="fa fa-plus" aria-hidden="true"></i> <span class="order_text"><% if (change.order_by === 0) { %>添加<% } else { %>插入<% } %></span>空白清单</a>
                     </div>
                     </div>
+                    <% } %>
                     <div class="d-inline-block mr-3">
                     <div class="d-inline-block mr-3">
                         <button type="button" class="btn btn-sm btn-light text-primary dropdown-toggle" data-toggle="dropdown" id="bpaixu">清单排序:<% if (change.order_by === 0) { %>清单编号<% } else { %>添加顺序<% } %></button>
                         <button type="button" class="btn btn-sm btn-light text-primary dropdown-toggle" data-toggle="dropdown" id="bpaixu">清单排序:<% if (change.order_by === 0) { %>清单编号<% } else { %>添加顺序<% } %></button>
                         <div class="dropdown-menu" aria-labelledby="bpaixu">
                         <div class="dropdown-menu" aria-labelledby="bpaixu">
@@ -509,10 +511,11 @@
     let changeInfo = Object.assign({}, back_changeInfo);
     let changeInfo = Object.assign({}, back_changeInfo);
     let changeUsedData = JSON.parse(unescape('<%- escape(JSON.stringify(changeUsedData)) %>'));
     let changeUsedData = JSON.parse(unescape('<%- escape(JSON.stringify(changeUsedData)) %>'));
     let changeOrder = parseInt('<%- change.order_by %>');
     let changeOrder = parseInt('<%- change.order_by %>');
+    const openChangeWhiteList = <%- ctx.session.sessionProject.page_show.openChangeWhiteList %>;
     console.log(changeInfo);
     console.log(changeInfo);
     console.log(changeUsedData);
     console.log(changeUsedData);
 </script>
 </script>
-<script src="/public/js/change_information_set.js?202206211"></script>
+<script src="/public/js/change_information_set.js"></script>
 <script src="/public/js/change_audit.js"></script>
 <script src="/public/js/change_audit.js"></script>
 <% } else if (auditStatus === 3 || auditStatus === 4 || auditStatus === 5 || auditStatus === 7 || auditStatus === 8) { %>
 <% } else if (auditStatus === 3 || auditStatus === 4 || auditStatus === 5 || auditStatus === 7 || auditStatus === 8) { %>
 <script>
 <script>

+ 21 - 3
app/view/setting/fun.ejs

@@ -171,9 +171,26 @@
                                         <div class="alert alert-dark py-1 px-2 mb-2" role="alert">
                                         <div class="alert alert-dark py-1 px-2 mb-2" role="alert">
                                             功能设置
                                             功能设置
                                         </div>
                                         </div>
-                                        <div class="my-2">
-                                            自定义变更类别
-                                            <a class="pull-right mr-3" href="#bgclass" data-toggle="modal" data-target="#bgclass">设置</a>
+                                        <div class="mb-1">
+                                            <div class="form-check form-check-inline">
+                                                <input class="form-check-input" type="checkbox" id="inlineCheckbox11" checked disabled>
+                                                <label class="form-check-label" for="inlineCheckbox11">开启自定义变更类别</label>
+                                            </div>
+                                            <a class="pull-right mr-3"  href="#bgclass" data-toggle="modal" data-target="#bgclass">设置</a>
+                                        </div>
+<!--                                        <div class="mb-1">-->
+<!--                                            <div class="form-check form-check-inline">-->
+<!--                                                <input class="form-check-input" type="checkbox" id="inlineCheckbox12" value="option1">-->
+<!--                                                <label class="form-check-label" for="inlineCheckbox12">开启变更令状态功能 </label>-->
+<!--                                                <a href=""  data-toggle="tooltip" data-placement="bottom" title="" data-original-title="变更令提供临时、立项、批复状态,可设置计量上限"><i class="fa fa-question-circle "></i></a>-->
+<!--                                            </div>-->
+<!--                                            <a class="pull-right mr-3"  href="#bgstatus" data-toggle="modal" data-target="#bgstatus">设置(未勾选,灰选不可用)</a>-->
+<!--                                        </div>-->
+                                        <div class="mb-1">
+                                            <div class="form-check form-check-inline">
+                                                <input class="form-check-input" type="checkbox" id="openChangeWhiteList" <% if (ctx.session.sessionProject.page_show.openChangeWhiteList) { %>checked<% } %> onchange="updateSetting();">
+                                                <label class="form-check-label" for="openChangeWhiteList">开启“添加空白清单”功能</label>
+                                            </div>
                                         </div>
                                         </div>
                                     </div>
                                     </div>
                                 </div>
                                 </div>
@@ -395,6 +412,7 @@
             openChangeProject: $('#openChangeProject')[0].checked,
             openChangeProject: $('#openChangeProject')[0].checked,
             openChangeApply: $('#openChangeApply')[0].checked,
             openChangeApply: $('#openChangeApply')[0].checked,
             openChangePlan: $('#openChangePlan')[0].checked,
             openChangePlan: $('#openChangePlan')[0].checked,
+            openChangeWhiteList: $('#openChangeWhiteList')[0].checked,
             openMaterialTax: $('#openMaterialTax')[0].checked,
             openMaterialTax: $('#openMaterialTax')[0].checked,
             openMaterialChecklist: $('#openMaterialChecklist')[0].checked,
             openMaterialChecklist: $('#openMaterialChecklist')[0].checked,
             openMaterialSelf: $('#openMaterialSelf')[0].checked,
             openMaterialSelf: $('#openMaterialSelf')[0].checked,