首頁 探索 說明
登入
hexiugang
/
iamberry-common-parent
關註 3
讚好 3
複刻 1
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

wangxiaoming 7 年之前
父節點
e1e97de4cc 516ce19672
當前提交
c37d3c93d4
共有 2 個文件被更改，包括 13 次插入 和 1 次删除
統一視圖 顯示文件統計
  1. 5 0
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/add_signclosed.ftl
  2. 8 1
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/signclosed_list.ftl

+ 5 - 0
watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/add_signclosed.ftl
查看文件 

@@ -398,6 +398,11 @@
 
                 return;
 
                 return;
 
             }
 
             }
 
         }
 
         }
 
+        var signclosedLogistics = $("#signclosedLogistics").val();
 
+        if( signclosedLogistics == null || signclosedLogistics == "" ){
 
+            layer.msg('请选择物流公司',{icon: 5,time:1000});
 
+            return;
 
+        }
 
         var signclosedLogisticsNumber = $("#signclosedLogisticsNumber").val();
 
         var signclosedLogisticsNumber = $("#signclosedLogisticsNumber").val();
 
         if( signclosedLogisticsNumber == null || signclosedLogisticsNumber == "" ){
 
         if( signclosedLogisticsNumber == null || signclosedLogisticsNumber == "" ){
 
             layer.msg('物流单号不能为空',{icon: 5,time:1000});
 
             layer.msg('物流单号不能为空',{icon: 5,time:1000});

+ 8 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/signclosed_list.ftl
查看文件 

@@ -22,6 +22,13 @@
 
             white-space: nowrap;
 
             white-space: nowrap;
 
             text-overflow: ellipsis;
 
             text-overflow: ellipsis;
 
         }
 
         }
 
+        .txt2{
 
+             width:60px;
 
+             overflow: hidden;
 
+             white-space: nowrap;
 
+             text-overflow: ellipsis;
 
+         }
 
+
 
     </style>
 
     </style>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
@@ -176,7 +183,7 @@
 
                             不缺少
 
                             不缺少
 
                         </#if>
 
                         </#if>
 
                     </td>
 
                     </td>
 
-                    <td class="text-c" width="100">${signclosed.customerIdDescribe!}<br><#if signclosed.customerIdDescribe??><#if signclosed.customerIdDescribe != ""><a href="#" onclick="getDescribeInfo(${signclosed.signclosedCustomerId!});"style="color : #4149FF;">查看详情</a></#if></#if></td>
 
+                    <td class="text-c" width="100"><span class="label txt2" title="${signclosed.customerIdDescribe!}" >${signclosed.customerIdDescribe!}</span><br><#if signclosed.customerIdDescribe??><#if signclosed.customerIdDescribe != ""><a href="#" onclick="getDescribeInfo(${signclosed.signclosedCustomerId!});"style="color : #4149FF;">查看详情</a></#if></#if></td>
 
                     <td class="text-c" width="100">${signclosed.signclosedCustomerDesc!}</td>
 
                     <td class="text-c" width="100">${signclosed.signclosedCustomerDesc!}</td>
 
                     <td class="text-c" width="100">${(signclosed.signclosedDate?string("yyyy-MM-dd"))!''}</td>
 
                     <td class="text-c" width="100">${(signclosed.signclosedDate?string("yyyy-MM-dd"))!''}</td>
 
                     <td class="text-c" width="100">
 
                     <td class="text-c" width="100">