Przeglądaj źródła

fix: 当选择到别人分享给我的定额库时,鼠标悬停在分享按钮上,也会有悬浮窗提示,并显示“我的补充定额库”分享给谁。当选择到别人分享给我的定额库时,鼠标悬停在分享按钮上,不应该有悬浮窗显示

vian 4 lat temu
rodzic
commit
2252a04f83

+ 1 - 1
modules/complementary_ration_lib/models/compleRationModel.js

@@ -527,7 +527,7 @@ class CompleRatoinDao {
 
     async prepareInitData (sessionUserID, userId, compilationId, gljLibId) {
         const receiveLibs = await pmFacade.getReceiveLibList(sessionUserID, compilationId, ShareLibType.RATION_LIB);
-        const shareLibs = await pmFacade.getLibShareList(sessionUserID, compilationId, ShareLibType.RATION_LIB);
+        const shareLibs = sessionUserID === userId ? await pmFacade.getLibShareList(sessionUserID, compilationId, ShareLibType.RATION_LIB) : [];
         const rationsCodes = await this.getCodes(userId, compilationId);
         const gljDistTypeCache = stdgljutil.getStdGljTypeCacheObj().toArray();
         const installationData = await installFacade.getInstallation(userId, compilationId);

+ 6 - 4
web/building_saas/complementary_ration_lib/js/init.js

@@ -19,7 +19,7 @@ const initialization = (() => {
         </select>`;
         // 设置分享按钮
         const shareHtml = `
-        <span id="share-tip" class="ml-2" data-toggle="tooltip" data-placement="bottom" data-original-title="sddsd">
+        <span id="share-tip" class="ml-2" data-toggle="tooltip" data-placement="bottom" data-original-title="">
             <a id="init-share" href="javascript:;" class="btn btn-xs btn-primary"><i class="fa fa-share-alt"></i> 分享</a>
         </span>`;
         const html = `
@@ -41,9 +41,11 @@ const initialization = (() => {
 
         // 定额库下拉
         function initShareTip(shareList) {
-            const owners = shareList.map(owner => owner.real_name);
-            const tips = `已分享给 ${owners.join(' ')}`;
-            $('#share-tip').attr('data-original-title', tips);
+            if (shareList.length) {
+                const owners = shareList.map(owner => owner.real_name);
+                const tips = `已分享给 ${owners.join(' ')}`;
+                $('#share-tip').attr('data-original-title', tips);
+            }
         }
 
         // 定额库下拉

+ 1 - 1
web/building_saas/css/custom.css

@@ -515,7 +515,7 @@ margin-right: 100px !important;
   height:270px
 }
 
-.limit-price {
+.limit-price-input {
   display: inline-block;
   width: 80px;
 }

+ 2 - 2
web/building_saas/main/html/main.html

@@ -1118,11 +1118,11 @@
                     <fieldset class="form-group">
                       <h5>清单限价</h5>
                       <div class="mt-1">
-                        最高限价<input id="max-price-rate" data-limit="max" class="form-control form-control-sm limit-price-input" value="0" type="text" style="display: inline-block; width: 90px;"> %
+                        最高限价<input id="max-price-rate" data-limit="max" class="form-control form-control-sm limit-price-input" value="0" type="text"> %
                       </div>
                       <% if (compilationName !== '重庆定额(2018)') { %>
                         <div class="mt-1">
-                          最低限价<input id="min-price-rate" data-limit="min" class="form-control form-control-sm limit-price-input" value="0" type="text" style="display: inline-block; width: 90px;"> %
+                          最低限价<input id="min-price-rate" data-limit="min" class="form-control form-control-sm limit-price-input" value="0" type="text"> %
                         </div>
                       <% } %>
                     </fieldset>