拖动

web/building_saas/complementary_ration_lib/js/global.js

@@ -32,6 +32,12 @@ function autoFlashHeight(){
 $(window).resize(autoFlashHeight);
 /*全局自适应高度结束*/
 $(function(){
+    //拖动头部
+    $('body').on("show.bs.modal", ".modal", function(){
+        if (typeof  $(this).find('.modal-content').draggable === 'function') {
+            $(this).find('.modal-content').draggable({handle: '.modal-header', cancel: 'a, button'});
+        }
+    });
     /*侧滑*/
     $(".open-sidebar").click(function(){
         $(".slide-sidebar").animate({width:"800"}).addClass("open");

web/building_saas/js/global.js

@@ -40,6 +40,12 @@ function autoFlashHeight(){
 
 /*全局自适应高度结束*/
 $(function () {
+    //拖动头部
+    $('body').on("show.bs.modal", ".modal", function(){
+        if (typeof  $(this).find('.modal-content').draggable === 'function') {
+            $(this).find('.modal-content').draggable({handle: '.modal-header', cancel: 'a, button'});
+        }
+    });
     $(window).resize(autoFlashHeight);
     /*侧滑*/
   /*  $(".open-sidebar").click(function () {

web/building_saas/main/html/main.html

@@ -1096,17 +1096,14 @@
     <div class="modal fade" id="calcBaseFeeRate" data-backdrop="static">
         <div class="modal-dialog" role="document">
             <div class="modal-content">
-                <div class="modal-header">
+                <div id="normalHeader" class="modal-header">
                     <h5 class="modal-title">计算基数选择</h5>
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                         <span aria-hidden="true">&times;</span>
                     </button>
                 </div>
-                <div class="modal-body">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true">×</span>
-                    </button>
-                    <ul class="nav nav-tabs mb-3" role="tablist">
+                <div id="mixedHeader" class="modal-header">
+                    <ul class="nav nav-tabs mb-0" role="tablist" style="border-bottom: none; height: 10px">
                         <li class="nav-item">
                             <a class="nav-link active px-3" data-toggle="tab" href="#m-js" id="tabCalcBase" role="tab">计算基数</a>
                         </li>
@@ -1114,6 +1111,11 @@
                             <a class="nav-link px-3" data-toggle="tab" href="#m-fl" id="tabFeeRate" role="tab">费率(%)</a>
                         </li>
                     </ul>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
                     <div class="tab-content">
                         <div class="tab-pane active" id="m-js" role="tabpanel">
                             <div class="form-group" id="expArea">

web/building_saas/main/js/views/project_view.js

@@ -3190,10 +3190,12 @@ function disableSpread(spread){
 //根据触发改变计算基数、费率弹出框
 function changeCalcBaseFeeRate(toggle) {
     if(toggle === 'calcBase'){
-        $('#calcBaseFeeRate').find('.modal-header').show();
+        $('#mixedHeader').hide();
+        $('#normalHeader').show();
+        //$('#calcBaseFeeRate').find('.modal-header').show();
         $('#calcBaseFeeRate').find('.modal-title').text('计算基数选择').show();
         $('#calcBaseFeeRate').find('.modal-body').find('button:first').hide();
-        $('#calcBaseFeeRate').find('.modal-body').find('ul:first').hide();
+        //$('#calcBaseFeeRate').find('.modal-body').find('ul:first').hide();
         $('#calcBaseExp').remove();
         /*let $input = $('<input>').attr('id', 'calcBaseExp').addClass('form-control');
         $('#expArea').prepend($input);*/
@@ -3201,13 +3203,17 @@ function changeCalcBaseFeeRate(toggle) {
         $('#expArea').prepend($textarea);
     }
     else if(toggle === 'feeRate'){
-        $('#calcBaseFeeRate').find('.modal-header').show();
+        $('#mixedHeader').hide();
+        $('#normalHeader').show();
+       // $('#calcBaseFeeRate').find('.modal-header').show();
         $('#calcBaseFeeRate').find('.modal-title').text('费率选择').show();
         $('#calcBaseFeeRate').find('.modal-body').find('button:first').hide();
         $('#calcBaseFeeRate').find('.modal-body').find('ul:first').hide();
     }
     else if(toggle === 'commonTotalFee') {
-        $('#calcBaseFeeRate').find('.modal-header').hide();
+        $('#normalHeader').hide();
+        $('#mixedHeader').show();
+        //$('#calcBaseFeeRate').find('.modal-header').hide();
         $('#calcBaseFeeRate').find('.modal-body').find('button:first').show();
         $('#calcBaseFeeRate').find('.modal-body').find('ul:first').show();
         $('#calcBaseExp').remove();

web/building_saas/pm/js/pm_newMain.js

@@ -3510,6 +3510,7 @@ function setShareToModal(selected){
         for(let userInfo of rstData){
             for(let user of selected.data.shareInfo){
                 if(user.userID === userInfo._id){
+                    user.exist = true;
                     user.name = userInfo.real_name;
                     user.company = userInfo.company;
                     user.mobile = userInfo.mobile;
@@ -3530,6 +3531,9 @@ function setShareToModal(selected){
                                </tr>`;
         infoArr.push(theadHtml);
         for(let user of selected.data.shareInfo){
+            if (!user.exist) {
+                continue;
+            }
             let infoHtml = `<tr>
                                           <td style="width: 112px;">${user.name}</td>
                                           <td style="width: 165px;">${user.company}</td>