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

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -328,7 +328,6 @@ public class AdminCustomerController {
             pagedResult.setTotal(totalNum);
         }
         ProductType productType = new ProductType();
-        productType.setTypeStatus(1);
         //查询产品类型集合
         List<ProductType> typeList = productService.listProductType(productType);
         //查询客诉类型集合

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_visit.ftl

@@ -39,7 +39,7 @@
                 <strong>回访日期</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <input type="text" id="visitDate" name="visitDate" class="input-text" placeholder="" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen' })" value="" readonly="readonly"/>
+                <input type="text" id="visitDate" name="visitDate" class="input-text" placeholder="" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen',minDate:'%y-%M-%d' })" value="" readonly="readonly"/>
             </div>
         </div>
         <div class="row cl">
@@ -132,6 +132,27 @@
         msg = '';
         var visitTimeSelect = $('input[name="visitTimeSelect"]:checked').val();
         var visitAdminId = $("#visitAdminId option:selected").val();
+
+        var visit_date = $('#visitDate').val();
+        var myDate = new Date();
+        var date = myDate.getFullYear()+"-"+(myDate.getMonth()+1)+"-"+myDate.getDate();
+        var hours = myDate.getHours();
+        //如果两个时间相等，则判断可选的回访时间
+        if(Date.parse(visit_date) == Date.parse(date)){
+            if (hours > 12 && visitTimeSelect == 1) {
+                msg = '该时间已超过当前时间，请重新选择回访时间!';
+                flag = false;
+                return;
+            } else if (hours > 14 && visitTimeSelect == 2) {
+                msg = '该时间已超过当前时间，请重新选择回访时间!';
+                flag = false;
+                return;
+            } else if (hours > 16 && visitTimeSelect == 3) {
+                msg = '该时间已超过当前时间，请重新选择回访时间!';
+                flag = false;
+                return;
+            }
+        }
         if (!uname.test($('#visitName').val().trim())) {
             msg = '回访人姓名格式不正确，请重新填写!';
             flag = false;
@@ -157,6 +178,8 @@
             flag = false;
             return;
         }
+
+
     }
 
     /**
@@ -190,7 +213,7 @@
                 }
             });
         } else {
-            layer.msg(msg, {icon: 5, time: 1000});
+            layer.msg(msg, {icon: 5, time: 500});
         }
     }
 

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_detail.ftl

@@ -148,10 +148,11 @@
             </div>
             <div class="row cl" id="divCloseProdcue">
                 <label class="form-label col-1 col-sm-1">寄回产品：</label>
-                <div class="formControls col-5 col-sm-5">
-                    <label id="closeprodcue"></label>
+                <div class="formControls col-7 col-sm-7">
+                    <div class="update-parts" id="closeprodcue"></div><br/>
                     <!--TDS收集-->
                     <label id="customerTDS"></label>
+                    <div style="border-bottom:#ddd 1px solid; overflow:hidden"></div>
                 </div>
 
             </div>
@@ -164,21 +165,20 @@
             </div>
             <div class="row cl" id="divSendProdcue">
                 <label class="form-label col-1 col-sm-1">寄送产品：</label>
-                <div class="formControls col-10 col-sm-10">
-                    <label id="sendprodcue"></label>
+                <div class="formControls col-7 col-sm-7">
+                    <div class="update-parts" id="sendprodcue"></div>
                 </div>
             </div>
         </div>
 
         <div class="row cl">
             <label class="form-label col-1 col-sm-1">处理描述：</label>
-            <div class="formControls col-5 col-sm-5">
-                <textarea id="describeHandleDesc" cols="" rows="2" class="textarea" placeholder="说点什么..."></textarea>
+            <div class="formControls col-7 col-sm-7" id="describeHandleDesc" style="border: 1px solid #ddd;">
             </div>
         </div>
         <div class="row cl">
             <label class="form-label col-1 col-sm-1">回访信息：</label>
-            <div class="formControls col-5 col-sm-5">
+            <div class="formControls col-7 col-sm-7">
                 <label id="txtVisit"></label>
             </div>
         </div>
@@ -289,26 +289,26 @@
                     $('#salesItem').html(salesItem);
                     $('#salesPayTime').html(salesOrder.salesPayTime);
                     $('#relationSendMergeAddress').html(customerCommon.relationSendMergeAddress+"-"+customerCommon.relationSendAddress);
-                    $('#describeHandleDesc').val(customer.describeHandleDesc);
+                    $('#describeHandleDesc').html(customer.describeHandleDesc);
 
                     if (customerCommon.sendProdcues != null && customerCommon.sendProdcues.length > 0) {
                         $.each(customerCommon.sendProdcues,function(index,item){
-                            sendprodcue += this.sendProduceName + '*' + this.sendProdcueNumber
+                            sendprodcue += '<span style="margin-bottom: 10px;display: inline-block;float: left;">' + this.sendProduceName + '*' + this.sendProdcueNumber + '</span>';
                         })
                     }
                     if (customerCommon.sendFittings != null && customerCommon.sendFittings.length > 0) {
                         $.each(customerCommon.sendFittings,function(index,item){
-                            sendprodcue += this.sendProductName + '*' + this.sendFittingNumber
+                            sendprodcue += '<span style="margin-bottom: 10px;display: inline-block;float: left;">' + this.sendProductName + '*' + this.sendFittingNumber + '</span>';
                         })
                     }
                     if (customerCommon.closedProdcues != null && customerCommon.closedProdcues.length > 0) {
                         $.each(customerCommon.closedProdcues,function(index,item){
-                            closeprodcue += this.closedProductName + '*' + this.closedProdcueNumber
+                            closeprodcue += '<span style="margin-bottom: 10px;display: inline-block;float: left;">' + this.closedProductName + '*' + this.closedProdcueNumber + '</span>';
                         })
                     }
                     if (customerCommon.closedFittings != null && customerCommon.closedFittings.length > 0) {
                         $.each(customerCommon.closedFittings,function(index,item){
-                            closeprodcue += this.fittingName + '*' + this.closedFittingNumber
+                            closeprodcue += '<span style="margin-bottom: 10px;display: inline-block;float: left;">' + this.fittingName + '*' + this.closedFittingNumber + '</span>';
                         })
                     }
                     $('#sendprodcue').html(sendprodcue+"<br/>");
@@ -323,7 +323,7 @@
                     } else {
                         $('#divCloseProdcue').hide();
                     }
-                    $('#customerTDS').html("TDS收集:"+customerCommon.relationSendMergeAddress+",进水"+
+                    $('#customerTDS').html("<strong>TDS收集:</strong>"+customerCommon.relationSendMergeAddress+",进水"+
                             (customer.customerInTDS==undefined?0:customer.customerInTDS)+"ppm"+",出水"+(customer.customerOutTDS==undefined?0:customer.customerOutTDS)+"ppm");
 
                     if (customer.customerIsVisit == '2') {
@@ -333,9 +333,12 @@
                             case 2:visitTime = '12:00-14:00';break;
                             case 3:visitTime = '14:00-18:00';break;
                         }
-                        $('#txtVisit').html("("+customer.visitName+")&nbsp;&nbsp;"+"在&nbsp;&nbsp;"+customer.visitDate+
-                                "&nbsp;&nbsp;"+visitTime+"对&nbsp;&nbsp;"+customer.visitCompleteName+"&nbsp;&nbsp;"+
-                                customer.visitCompleteTel+"&nbsp;&nbsp;完成回访");
+                        var visitText = '(<span class="txt-red">'+convertUndefinedToEmpty(customer.visitName)+'</span>)&nbsp;&nbsp;'+
+                                        '在&nbsp;&nbsp;<span class="txt-red">'+convertUndefinedToEmpty(customer.visitDate)+
+                                        '&nbsp;&nbsp;'+convertUndefinedToEmpty(visitTime)+'</span>对&nbsp;&nbsp;<span class="txt-red">'+
+                                        convertUndefinedToEmpty(customer.visitCompleteName)+'&nbsp;&nbsp;'+
+                                        convertUndefinedToEmpty(customer.visitCompleteTel)+'</span>&nbsp;&nbsp;完成回访';
+                        $('#txtVisit').html(visitText);
                     }
                 }
             },

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/visit_finish.ftl

@@ -24,7 +24,7 @@
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>回访日期</strong>
             </div>
-            <div class="formControls col-10 col-sm-10">
+            <div class="formControls col-9 col-sm-9">
                 <input type="hidden" id="finish_customerId" name="finish_customerId" value="${customerId!''}" />
                 <input type="text" name="visitCompleteDate" id="visitCompleteDate" class="input-text" placeholder="" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen' })" value="" readonly="readonly" />
             </div>
@@ -33,7 +33,7 @@
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>客户性别</strong>
             </div>
-            <div class="formControls col-10 col-sm-10 skin-minimal">
+            <div class="formControls col-9 col-sm-9 skin-minimal">
                 <div class="radio-box">
                     <input type="radio" name="visitCompleteSex" value="1" checked="checked">
                     <label for="tel-3">男</label>
@@ -48,7 +48,7 @@
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>回访客户</strong>
             </div>
-            <div class="formControls col-10 col-sm-10">
+            <div class="formControls col-9 col-sm-9">
                 <input type="text" id="visitCompleteName" name="visitCompleteName" class="input-text" placeholder="" value=""/>
             </div>
         </div>
@@ -56,7 +56,7 @@
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>客户电话</strong>
             </div>
-            <div class="formControls col-10 col-sm-10">
+            <div class="formControls col-9 col-sm-9">
                 <input type="text" id="visitCompleteTel" name="visitCompleteTel" class="input-text" placeholder="" value=""/>
             </div>
         </div>
@@ -64,7 +64,7 @@
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>回访备注</strong>
             </div>
-            <div class="formControls col-10 col-sm-10">
+            <div class="formControls col-9 col-sm-9">
                 <textarea name="visitCompleteRemark" id="visitCompleteRemark" cols="" rows="2" class="textarea" placeholder="说点什么..."></textarea>
             </div>
         </div>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/add_detect.ftl

@@ -48,7 +48,7 @@
                         <tr>
 
                         <td>
-                            <input type="radio" id="radio-${product.productId!''}" name="productId" value="${product.productId!''}" <#if product_index == 0>checked</#if>/>${product.productName!''}
+                            <input type="radio" onclick="emptyingNumber();" id="radio-${product.productId!''}" name="productId" value="${product.productId!''}" <#if product_index == 0>checked</#if>/>${product.productName!''}
                         </td>
                         <td>
                             <select name="colorId${product.productId!''}" id="colorId${product.productId!''}" style="width:90%" class="my-select">
@@ -162,7 +162,11 @@
 </article>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript">
-
+    function emptyingNumber() {
+        $("input[name='productId']").each(function () {
+            $("#maintenanceEquipmentNumber"+$(this).val()).val("");
+        });
+    }
 
     function  add() {
         $("input[name='checkbox']:checkbox:checked").each(function () {

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/view_progress.ftl

@@ -43,14 +43,14 @@
         <div class="input-box">
             <span>签收产品：</span>
 
-            <div class="update-parts">
+            <div style="margin-left: 13%;margin-top: -4%;">
             <#if signclosedProductInfo??>
                 <#if (signclosedProductInfo?size > 0)>
                     <#list signclosedProductInfo as info>
                         <#if info.signclosedProductType == 1 >
-                            <span>${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台</span><br>
+                            <span class="label label-success radius">${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台</span><br>
                         <#else >
-                            <span>${info.productName!''} x ${info.productNum!''}件</span><br>
+                            <span class="label label-success radius">${info.productName!''} x ${info.productNum!''}件</span><br>
                         </#if>
                     </#list>
                 <#else >

watero-rst-web/src/main/webapp/WEB-INF/views/cm/maintenance/add_maintenance.ftl

@@ -47,7 +47,7 @@
                         <#list productList as product>
                         <tr>
                             <td>
-                                <input type="radio" id="radio-${product.productId!''}" name="productId" value="${product.productId!''}" <#if product_index == 0>checked</#if>/>${product.productName!''}
+                                <input type="radio" onclick="emptyingNumber();" id="radio-${product.productId!''}" name="productId" value="${product.productId!''}" <#if product_index == 0>checked</#if>/>${product.productName!''}
                             </td>
                             <td>
                                 <select name="colorId${product.productId!''}" id="colorId${product.productId!''}" style="width:90%" class="my-select">
@@ -112,10 +112,10 @@
 
         <div class="input-box">
             <span class="input-dic" style="margin-top: 0">维修结果</span>
-            <label for="radio-3">
+            <label for="radio-3" style="margin-left: 2.3%;">
                 <input type="radio" id="radio-3" name="maintenanceState" value="1" checked/>正在维修
             </label>
-            <label for="radio-4" style="margin-left: 50px;">
+            <label for="radio-4" style="margin-left: 9%;">
                 <input type="radio" id="radio-4" name="maintenanceState" value="2"/>已完成
 
             </label>
@@ -126,7 +126,7 @@
             <label for="radio-5">
                 <input type="radio" id="radio-5" name="maintenanceIsRepair" value="1" checked/>不可返修
             </label>
-            <label for="radio-6" style="margin-left: 50px;">
+            <label for="radio-6" style="margin-left: 9.3%;">
                 <input type="radio" id="radio-6" name="maintenanceIsRepair" value="2"/>可返修
             </label>
         </div>
@@ -135,7 +135,7 @@
             <label for="radio-7">
                 <input type="radio" id="radio-7" name="maintenanceIsWarehousing" value="2" checked/>已入库
             </label>
-            <label for="radio-8" style="margin-left: 50px;">
+            <label for="radio-8" style="margin-left: 11.6%;">
                 <input type="radio" id="radio-8" name="maintenanceIsWarehousing" value="1"/>未入库
             </label>
             <label for="radio-9" style="margin-left: 50px;">
@@ -154,7 +154,11 @@
 </article>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript">
-
+    function emptyingNumber() {
+        $("input[name='productId']").each(function () {
+            $("#maintenanceEquipmentNumber"+$(this).val()).val("");
+        });
+    }
 
     function  add() {
         var maintenanceContentDate = $("#maintenanceContentDate").val();

watero-rst-web/src/main/webapp/WEB-INF/views/cm/maintenance/complete_reorder.ftl

@@ -37,10 +37,10 @@
         </div>
         <div class="input-box">
             <span class="input-dic" style="margin-top: 0">维修结果</span>
-            <label for="radio-3">
+            <label for="radio-3" style="margin-left: 2.3%;">
                 <input type="radio" id="radio-3" name="maintenanceState" value="1"  <#if maintenanceInfo.maintenanceState == 1>checked</#if>/>正在维修
             </label>
-            <label for="radio-4" style="margin-left: 50px;">
+            <label for="radio-4" style="margin-left: 9%;">
                 <input type="radio" id="radio-4" name="maintenanceState" value="2"  <#if maintenanceInfo.maintenanceState == 2>checked</#if>/>已完成
 
             </label>
@@ -51,7 +51,7 @@
             <label for="radio-5">
                 <input type="radio" id="radio-5" name="maintenanceIsRepair" value="1" <#if maintenanceInfo.maintenanceIsRepair == 1>checked</#if>/>不可返修
             </label>
-            <label for="radio-6" style="margin-left: 50px;">
+            <label for="radio-6" style="margin-left: 9%;">
                 <input type="radio" id="radio-6" name="maintenanceIsRepair" value="2" <#if maintenanceInfo.maintenanceIsRepair == 2>checked</#if> />可返修
             </label>
         </div>
@@ -60,7 +60,7 @@
             <label for="radio-7">
                 <input type="radio" id="radio-7" name="maintenanceIsWarehousing" value="2" <#if maintenanceInfo.maintenanceIsWarehousing == 2>checked</#if>/>已入库
             </label>
-            <label for="radio-8" style="margin-left: 50px;">
+            <label for="radio-8" style="margin-left: 11.6%;">
                 <input type="radio" id="radio-8" name="maintenanceIsWarehousing" value="1" <#if maintenanceInfo.maintenanceIsWarehousing == 1>checked</#if> />未入库
             </label>
             <label for="radio-9" style="margin-left: 50px;">

watero-rst-web/src/main/webapp/WEB-INF/views/cm/maintenance/perfecting_machine.ftl

@@ -19,7 +19,7 @@
         .add-list>li{margin: 10px 0;}
         .my-textarea{padding: 5px 10px;width: 80%;border:1px solid rgba(0,0,0,.1);}
         .my-btn-reset{padding: 10px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
-        .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
+        .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
         input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}

watero-rst-web/src/main/webapp/WEB-INF/views/cm/maintenance/update_maintenance.ftl

@@ -48,17 +48,17 @@
                         <#list productList as product>
                         <tr>
                             <td>
-                                <input type="radio" id="radio-${product.productId!''}" name="productId" value="${product.productId!''}" <#if product.productId == maintenanceInfo.productId>checked</#if>/>${product.productName!''}
+                                <input type="radio" onclick="emptyingNumber();" id="radio-${product.productId!''}" name="productId" value="${product.productId!''}" <#if product.productId == maintenanceInfo.productId>checked</#if>/>${product.productName!''}
                             </td>
                             <td>
                                 <select name="colorId${product.productId!''}" id="colorId${product.productId!''}" style="width:90%;" class="my-select">
                                     <#if (product.colorList?size > 0)>
-                                        <#list product.colorList as colorList>
-                                            <option value ="${colorList.colorId!''}">${colorList.colorName!''}</option>
-                                        </#list>
-                                    <#else>
-                                        <option value ="">暂无颜色</option>
-                                    </#if>
+                                    <#list product.colorList as colorList>
+                                        <option value ="${colorList.colorId!''}">${colorList.colorName!''}</option>
+                                    </#list>
+                                <#else>
+                                    <option value ="">暂无颜色</option>
+                                </#if>
                                 </select>
                             </td>
                             <td>
@@ -111,10 +111,10 @@
 
         <div class="input-box">
             <span class="input-dic" style="margin-top: 0">维修结果</span>
-            <label for="radio-3">
+            <label for="radio-3" style="margin-left: 2.3%;">
                 <input type="radio" id="radio-3" name="maintenanceState" value="1"  <#if maintenanceInfo.maintenanceState == 1>checked</#if>/>正在维修
             </label>
-            <label for="radio-4" style="margin-left: 50px;">
+            <label for="radio-4" style="margin-left: 9%;">
                 <input type="radio" id="radio-4" name="maintenanceState" value="2"  <#if maintenanceInfo.maintenanceState == 2>checked</#if>/>已完成
 
             </label>
@@ -125,7 +125,7 @@
             <label for="radio-5">
                 <input type="radio" id="radio-5" name="maintenanceIsRepair" value="1" <#if maintenanceInfo.maintenanceIsRepair == 1>checked</#if>/>不可返修
             </label>
-            <label for="radio-6" style="margin-left: 50px;">
+            <label for="radio-6" style="margin-left: 9.3%;">
                 <input type="radio" id="radio-6" name="maintenanceIsRepair" value="2" <#if maintenanceInfo.maintenanceIsRepair == 2>checked</#if> />可返修
             </label>
         </div>
@@ -134,7 +134,7 @@
             <label for="radio-7">
                 <input type="radio" id="radio-7" name="maintenanceIsWarehousing" value="2" <#if maintenanceInfo.maintenanceIsWarehousing == 2>checked</#if>/>已入库
             </label>
-            <label for="radio-8" style="margin-left: 50px;">
+            <label for="radio-8" style="margin-left: 11.6%;">
                 <input type="radio" id="radio-8" name="maintenanceIsWarehousing" value="1" <#if maintenanceInfo.maintenanceIsWarehousing == 1>checked</#if> />未入库
             </label>
             <label for="radio-9" style="margin-left: 50px;">
@@ -154,6 +154,11 @@
 </article>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript">
+    function emptyingNumber() {
+        $("input[name='productId']").each(function () {
+            $("#maintenanceEquipmentNumber"+$(this).val()).val("");
+        });
+    }
 
 
     function  add() {

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/signclosed_list.ftl

@@ -15,6 +15,13 @@
         input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #44C861;border: 1px solid #44C861;border-radius: 5px;color: #E5EAEA;font-weight:bold;}
+        .txt{
+            width:60px;
+            border:1px solid #ddd;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
     </style>
 </head>
 <body>
@@ -124,14 +131,14 @@
                     <td class="text-c" width="100">${signclosed.signclosedSendName!}</td>
                     <td class="text-c" width="100">${signclosed.signclosedSendTel!}</td>
                     <td class="text-c" width="100">
-                        <div class="update-parts">
+                        <div>
                         <#if signclosed.awaitingSignclosedProductInfoList??>
                             <#if (signclosed.awaitingSignclosedProductInfoList?size > 0)>
                                 <#list signclosed.awaitingSignclosedProductInfoList as info>
                                     <#if info.signclosedProductType == 1 >
-                                        <span>${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台</span><br>
+                                        <span class="label label-success radius txt" title="${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台">${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台</span><br>
                                     <#else >
-                                        <span>${info.productName!''} x ${info.productNum!''}件</span><br>
+                                        <span class="label label-success radius txt" title="${info.productName!''} x ${info.productNum!''}件">${info.productName!''} x ${info.productNum!''}件</span><br>
                                     </#if>
                                 </#list>
                             <#else >
@@ -143,14 +150,14 @@
                         </div>
                     </td>
                     <td class="text-c" width="100">
-                        <div class="update-parts">
+                        <div>
                         <#if signclosed.signclosedProductInfoList??>
                             <#if (signclosed.signclosedProductInfoList?size > 0)>
                                 <#list signclosed.signclosedProductInfoList as info>
                                     <#if info.signclosedProductType == 1 >
-                                        <span>${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台</span><br>
+                                        <span class="label label-success radius txt" title="${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台">${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台</span><br>
                                     <#else >
-                                        <span>${info.productName!''} x ${info.productNum!''}件</span><br>
+                                        <span class="label label-success radius txt" title="${info.productName!''} x ${info.productNum!''}件">${info.productName!''} x ${info.productNum!''}件>${info.productName!''} x ${info.productNum!''}件</span><br>
                                     </#if>
                                 </#list>
                             <#else >