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

app/public/js/shenpi.js

@@ -291,7 +291,6 @@ $(document).ready(function () {
         };
         const _self = $(this);
         postData('/tender/' + cur_tenderid + '/shenpi/save', prop, function (data) {
-            $('#stage_cooperation').hide();
             if (this_status === sp_status.sqspr) {
                 _self.parents('.form-group').siblings('.lc-show').html('');
             } else if (this_status === sp_status.gdspl) {
@@ -306,7 +305,7 @@ $(document).ready(function () {
                 }
                 addhtml += '</ul>\n';
                 _self.parents('.form-group').siblings('.lc-show').html(addhtml);
-                $('#stage_cooperation').show();
+
             } else if (this_status === sp_status.gdzs) {
                 let addhtml = '<ul class="list-unstyled">\n' +
                     '                                        <li class="d-flex justify-content-start mb-3">\n' +
@@ -319,6 +318,14 @@ $(document).ready(function () {
                 addhtml += '</ul>\n';
                 _self.parents('.form-group').siblings('.lc-show').html(addhtml);
             }
+
+            if(this_code === 'stage') {
+                if(this_status === sp_status.gdspl) {
+                    $('#stage_cooperation').show();
+                } else {
+                    $('#stage_cooperation').hide();
+                }
+            }
         });
     });
 
@@ -917,7 +924,7 @@ $(document).ready(function () {
 
 function setRightData(datas, coolist) {
     const newdatas = [];
-    const reg = /(^GD([a-zA-Z0-9\-]+))|(\d+)/;
+    const reg = /(^GD([a-zA-Z0-9\-]+))|(^([0-9\-]+)$)/;
     for (const l of datas) {
         if (reg.test(l.code) && l.level <= 4) {
             if(l.level === 4 && l.is_leaf === false) {

app/view/tender/shenpi.ejs

@@ -54,9 +54,9 @@
                                                     <button class="btn btn-outline-primary btn-sm dropdown-toggle" type="button" id="<%- sp.code %>_dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                                         选择审批人
                                                     </button>
-                                                    <div class="dropdown-menu dropdown-menu-right" aria-labelledby="<%- sp.code %>_dropdownMenuButton" style="width:220px">
+                                                    <div class="dropdown-menu dropdown-menu-right" id="<%- sp.code %>_dropdownMenu" aria-labelledby="<%- sp.code %>_dropdownMenuButton" style="width:220px">
                                                         <div class="mb-2 p-2"><input class="form-control form-control-sm gr-search"
-                                                                                     placeholder="姓名/手机 检索" autocomplete="off"></div>
+                                                                                     placeholder="姓名/手机 检索" autocomplete="off" data-code="<%- sp.code %>"></div>
                                                         <dl class="list-unstyled book-list">
                                                             <% accountGroup.forEach((group, idx) => { %>
                                                                 <dt><a href="javascript: void(0);" class="acc-btn" data-groupid="<%- idx %>" data-type="hide"><i class="fa fa-plus-square"></i></a> <%- group.groupName %></dt>

app/view/tender/shenpi_modal.ejs

@@ -119,7 +119,7 @@
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">关闭</button>
-                <button type="button" class="btn btn-sm btn-primary">确认</button>
+                <!--<button type="button" class="btn btn-sm btn-primary">确认</button>-->
             </div>
         </div>
     </div>