变更令一些需求与bug改动

app/controller/change_controller.js

@@ -169,7 +169,7 @@ module.exports = app => {
                     throw '当前未打开标段';
                 }
                 const tenderData = await ctx.service.tender.getDataById(tenderId);
-                const cCodeRule = JSON.parse(tenderData.c_rule);
+                const cCodeRule = tenderData.c_rule !== null ? JSON.parse(tenderData.c_rule) : [];
 
                 const code = [];
                 for (const rule of cCodeRule) {

app/controller/tender_controller.js

@@ -408,6 +408,36 @@ module.exports = app => {
                 };
                 updateData[codeRuleConst.ruleField[data.rule]] = data.data;
                 updateData.c_connector = data.connector;
+                updateData.c_rule_first = 0;
+
+                const result = await ctx.service.tender.db.update(ctx.service.tender.tableName, updateData);
+                if (result.affectedRows !== 1) {
+                    throw '更新规则失败';
+                }
+            } catch (err) {
+                this.log(err);
+                responseData.err = 1;
+                responseData.msg = err.toString();
+            }
+
+            ctx.body = responseData;
+        }
+
+        async ruleFirst(ctx) {
+            const responseData = {
+                err: 0,
+                msg: '',
+                data: {},
+            };
+            try {
+                const tenderId = ctx.session.sessionUser.tenderId;
+                if (!tenderId) {
+                    throw '当前未打开标段';
+                }
+                const updateData = {
+                    id: tenderId,
+                };
+                updateData.c_rule_first = 0;
 
                 const result = await ctx.service.tender.db.update(ctx.service.tender.tableName, updateData);
                 if (result.affectedRows !== 1) {

app/public/js/change.js

@@ -135,7 +135,7 @@ class codeRuleSet {
 
 $(document).ready(() => {
     // 首次进入设置
-    if (!codeRule || codeRule.length === 0) {
+    if (cRuleFirst) {
         codeRule = [];
         const firstSet = new codeRuleSet($('div.modal-body', '#first'));
         // 确认规则上传服务器
@@ -207,5 +207,10 @@ $(document).ready(() => {
        }
        window.location.href = url;
     });
+    // 不再显示首次使用
+    $('#changeFirst').click(function () {
+        postData('/tender/'+ $('#tenderId').val() +'/rule/first', '', function () {
+        });
+    })
 
 });

app/router.js

@@ -76,6 +76,7 @@ module.exports = app => {
     app.get('/tender/:id/type', sessionAuth, 'tenderController.tenderType');
     app.post('/tender/:id/save', sessionAuth, tenderCheck, 'tenderController.saveTenderInfo');
     app.post('/tender/rule', sessionAuth, 'tenderController.rule');
+    app.post('/tender/:id/rule/first', sessionAuth, tenderCheck, 'tenderController.ruleFirst');
     // 标段协作办公
     app.get('/tender/:id/cooperation', sessionAuth, tenderCheck, 'tenderController.tenderCooperation');
 
@@ -158,6 +159,7 @@ module.exports = app => {
     app.post('/tender/:id/change/newCode', sessionAuth, tenderCheck, 'changeController.newCode');
     app.post('/tender/:id/change/add', sessionAuth, tenderCheck, 'changeController.add');
     app.get('/tender/:id/change/:cid/info', sessionAuth, tenderCheck, 'changeController.info');
+    app.get('/tender/:id/change/:cid/info', sessionAuth, tenderCheck, 'changeController.info');
     app.post('/change/upload/file', sessionAuth, 'changeController.uploadFile');
     app.get('/change/download/file/:id', sessionAuth, 'changeController.downloadFile');
     app.post('/change/delete/file', sessionAuth, 'changeController.deleteFile');

app/view/change/info.ejs

@@ -179,7 +179,7 @@
                     <div class="col-md-4">
                         <div class="form-group">
                             <label><b class="text-danger">*&nbsp;</b>申请编号</label>
-                            <a href="javascript:void(0);" class="pull-right reduction-code" data-toggle="tooltip" data-placement="bottom" title="" data-code="<%- change.code %>" data-original-title="自动编号"><i class="fa fa-repeat"></i></a>
+                            <% if (tender.c_rule !== null && JSON.parse(tender.c_rule).length !== 0) { %><a href="javascript:void(0);" class="pull-right reduction-code" data-toggle="tooltip" data-placement="bottom" title="" data-code="<%- change.code %>" data-original-title="自动编号"><i class="fa fa-repeat"></i></a><% } %>
                             <input class="form-control" name="code" value="<%- change.code %>" type="text">
                         </div>
                         <div class="form-group">

app/view/change/modal.ejs

@@ -1,4 +1,6 @@
 <% if (tender.user_id === uid) { %>
+
+    <% if (tender.c_rule_first) { %>
 <!--首次使用-->
 <div class="modal" id="first">
     <div class="modal-dialog" role="document" >
@@ -60,12 +62,13 @@
                 <button class="btn btn-outline-primary" id="addRule">添加组件</button>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">暂时不需要</button>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal" id="changeFirst">暂时不需要</button>
                 <button class="btn btn-primary" id="setRule">确定</button>
             </div>
         </div>
     </div>
 </div>
+    <% } %>
 <!--弹出添加变更令-->
 <div class="modal fade" id="add-bj" data-backdrop="static">
     <div class="modal-dialog" role="document">
@@ -178,6 +181,7 @@
     const ruleConst = JSON.parse('<%- JSON.stringify(ruleConst) %>');
     let codeRule = JSON.parse('<%- JSON.stringify(codeRule) %>');
     let connectorRule = '<%- tender.c_connector %>';
+    let cRuleFirst = '<%- tender.c_rule_first %>';
 </script>
 <script src="/public/js/moment/moment.min.js"></script>