打印机页面修改

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

@@ -35,8 +35,48 @@
             <label class="form-label col-2 col-sm-2 huanhang">检测产品：</label>
             <div class="formControls col-9 col-sm-9 text-c huanhang">
 
-            <#if (productList?size > 0)>
+                <table class="table table-border table-bg table-bordered" style="width: 520px;">
+                    <thead>
+                    <tr class="text-c">
+                        <th style="text-align: center;" width="80">产品名称</th>
+                        <th style="text-align: center;" width="130">产品颜色</th>
+                        <th style="text-align: center;" width="100">产品编号</th>
+                    </tr>
+                    </thead>
+                    <tbody id="addProduct">
+                    <#if (productList?size > 0)>
+                        <#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!''}
+                        </td>
+                        <td>
+                            <select name="colorId${product.productId!''}" id="colorId${product.productId!''}" style="width:100%" 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>
+                            </select>
+                        </td>
+                        <td>
+                            <input class="input-text" type="text" id="maintenanceEquipmentNumber${product.productId!''}" name="maintenanceEquipmentNumber${product.productId!''}" style="width: 100%;" placeholder="机器编号" /><br>
+                        </td>
+
+                        </tr>
+                        </#list>
+                    </#if>
+                    </tbody>
+                </table>
+
+            <#--<#if (productList?size > 0)>
                 <#list productList as product>
+
+
+
                     <input type="radio" id="radio-${product.productId!''}" name="productId" value="${product.productId!''}" <#if product_index == 0>checked</#if>/>${product.productName!''}
                     <select name="colorId${product.productId!''}" id="colorId${product.productId!''}" style="width:60px" class="select">
                         <#if (product.colorList?size > 0)>
@@ -49,7 +89,7 @@
                     </select>
                     <input class="input-text" type="text" id="maintenanceEquipmentNumber${product.productId!''}" name="maintenanceEquipmentNumber${product.productId!''}" style="width: 20%;" placeholder="机器编号" /><br>
                 </#list>
-            </#if>
+            </#if>-->
 
             </div>
         </div>

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

@@ -35,7 +35,45 @@
             <label class="form-label col-3 col-sm-3 huanhang">维修产品：</label>
             <div class="formControls col-9 col-sm-9 text-c huanhang">
 
-            <#if (productList?size > 0)>
+                <table class="table table-border table-bg table-bordered" style="width: 520px;">
+                    <thead>
+                    <tr class="text-c">
+                        <th style="text-align: center;" width="80">产品名称</th>
+                        <th style="text-align: center;" width="130">产品颜色</th>
+                        <th style="text-align: center;" width="100">产品编号</th>
+                    </tr>
+                    </thead>
+                    <tbody id="addProduct">
+                    <#if (productList?size > 0)>
+                        <#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!''}
+                            </td>
+                            <td>
+                                <select name="colorId${product.productId!''}" id="colorId${product.productId!''}" style="width:100%" 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>
+                                </select>
+                            </td>
+                            <td>
+                                <input class="input-text" type="text" id="maintenanceEquipmentNumber${product.productId!''}" name="maintenanceEquipmentNumber${product.productId!''}" style="width: 100%;" placeholder="机器编号" /><br>
+                            </td>
+
+                        </tr>
+                        </#list>
+                    </#if>
+                    </tbody>
+                </table>
+
+
+
+            <#--<#if (productList?size > 0)>
                 <#list productList as product>
                     <input type="radio" id="radio-${product.productId!''}" name="productId" value="${product.productId!''}" <#if product_index == 0>checked</#if>/>${product.productName!''}
                     <select name="colorId${product.productId!''}" id="colorId${product.productId!''}" style="width:60px" class="select">
@@ -49,7 +87,7 @@
                     </select>
                     <input class="input-text" type="text" id="maintenanceEquipmentNumber${product.productId!''}" name="maintenanceEquipmentNumber${product.productId!''}" style="width: 20%;" placeholder="机器编号" /><br>
                 </#list>
-            </#if>
+            </#if>-->
 
             </div>
         </div>

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

@@ -35,7 +35,43 @@
             <label class="form-label col-2 col-sm-2 huanhang">维修产品：</label>
             <div class="formControls col-10 col-sm-10 text-c huanhang">
 
-            <#if (productList?size > 0)>
+                <table class="table table-border table-bg table-bordered" style="width: 520px;">
+                    <thead>
+                    <tr class="text-c">
+                        <th style="text-align: center;" width="80">产品名称</th>
+                        <th style="text-align: center;" width="130">产品颜色</th>
+                        <th style="text-align: center;" width="100">产品编号</th>
+                    </tr>
+                    </thead>
+                    <tbody id="addProduct">
+                    <#if (productList?size > 0)>
+                        <#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!''}
+                            </td>
+                            <td>
+                                <select name="colorId${product.productId!''}" id="colorId${product.productId!''}" style="width:60px" class="select">
+                                    <#if (product.colorList?size > 0)>
+                                        <#list product.colorList as colorList>
+                                            <option value ="${colorList.colorId!''}">${colorList.colorName!''}</option>
+                                        </#list>
+                                    <#else>
+                                        <option value ="">暂无颜色</option>
+                                    </#if>
+                                </select>
+                            </td>
+                            <td>
+                                <input class="input-text" type="text" id="maintenanceEquipmentNumber${product.productId!''}" name="maintenanceEquipmentNumber${product.productId!''}" style="width: 20%;" placeholder="机器编号" /><br>
+                            </td>
+
+                        </tr>
+                        </#list>
+                    </#if>
+                    </tbody>
+                </table>
+
+            <#--<#if (productList?size > 0)>
                 <#list productList as product>
                     <input type="radio" id="radio-${product.productId!''}" name="productId" value="${product.productId!''}" <#if product.productId == maintenanceInfo.productId>checked</#if>/>${product.productName!''}
                     <select name="colorId${product.productId!''}" id="colorId${product.productId!''}" style="width:60px" class="select">
@@ -50,7 +86,7 @@
                     <input class="input-text" type="text" id="maintenanceEquipmentNumber${product.productId!''}" name="maintenanceEquipmentNumber${product.productId!''}" style="width: 20%;" placeholder="机器编号" /><br>
                 </#list>
             </#if>
-
+-->
             </div>
         </div>
 

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

@@ -54,6 +54,7 @@
             <label class="form-label col-3 col-sm-3 huanhang">物流公司：</label>
             <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
                     <span>
+                        <#if complaintSignclosedInfo.signclosedLogistics??>
                         <#if complaintSignclosedInfo.signclosedLogistics == "sto">申通快递</#if>
                         <#if complaintSignclosedInfo.signclosedLogistics == "yto">圆通快递</#if>
                         <#if complaintSignclosedInfo.signclosedLogistics == "sf">顺丰快递</#if>
@@ -66,8 +67,10 @@
                         <#if complaintSignclosedInfo.signclosedLogistics == "ttkdex">天天快递</#if>
                         <#if complaintSignclosedInfo.signclosedLogistics == "jd">京东快递</#if>
                         <#if complaintSignclosedInfo.signclosedLogistics == "01">其他</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "02">上门送货</#if>,
+                        <#if complaintSignclosedInfo.signclosedLogistics == "02">上门送货</#if>
+                       ,
                         ${complaintSignclosedInfo.signclosedLogisticsNumber!''}
+                        </#if>
                     </span>
             </div>
         </div>