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

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ClosedFitting.java

@@ -16,7 +16,9 @@ public class ClosedFitting  implements Serializable {
 
     private Integer closedFittingType;  //售后类型  3：换新;4：维修;5：补发;6：退货;7：无理由退货
 
-    private String fittingName;     //配件名称
+    private String closedFittingsName;     //配件名称
+
+    private String closedFittingsBar;     //配件sku
 
     public Integer getClosedFittingType() {
         return closedFittingType;
@@ -26,12 +28,20 @@ public class ClosedFitting  implements Serializable {
         this.closedFittingType = closedFittingType;
     }
 
-    public String getFittingName() {
-        return fittingName;
+    public String getClosedFittingsName() {
+        return closedFittingsName;
+    }
+
+    public void setClosedFittingsName(String closedFittingsName) {
+        this.closedFittingsName = closedFittingsName;
+    }
+
+    public String getClosedFittingsBar() {
+        return closedFittingsBar;
     }
 
-    public void setFittingName(String fittingName) {
-        this.fittingName = fittingName;
+    public void setClosedFittingsBar(String closedFittingsBar) {
+        this.closedFittingsBar = closedFittingsBar;
     }
 
     public Integer getClosedFittingId() {

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SendFitting.java

@@ -16,14 +16,24 @@ public class SendFitting  implements Serializable {
 
     private Integer sendFittingType;    //售后类型  3：换新;4：维修;5：补发;6：退货;7：无理由退货
 
-    private String sendProductName; //产品名称
+    private String sendFittingsName; //配件名称
 
-    public String getSendProductName() {
-        return sendProductName;
+    private String sendFittingsBar; //配件sku
+
+    public String getSendFittingsName() {
+        return sendFittingsName;
+    }
+
+    public void setSendFittingsName(String sendFittingsName) {
+        this.sendFittingsName = sendFittingsName;
+    }
+
+    public String getSendFittingsBar() {
+        return sendFittingsBar;
     }
 
-    public void setSendProductName(String sendProductName) {
-        this.sendProductName = sendProductName;
+    public void setSendFittingsBar(String sendFittingsBar) {
+        this.sendFittingsBar = sendFittingsBar;
     }
 
     public Integer getSendFittingType() {

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/CustomerServiceImpl.java

@@ -286,6 +286,8 @@ public class CustomerServiceImpl implements CustomerService {
         for (int i=0;i<cc.getSendFittings().size();i++) {
             FittingsInfo fittingsInfo = fittingsInfoMapper.getFittingsById( cc.getSendFittings().get(i).getFittingsId());
             cc.getSendFittings().get(i).setFittingsId(fittingsInfo.getFittingsId());
+            cc.getSendFittings().get(i).setSendFittingsName(fittingsInfo.getFittingsName());
+            cc.getSendFittings().get(i).setSendFittingsBar(fittingsInfo.getFittingsName());
         }
         for (int i=0;i<cc.getClosedProdcues().size();i++) {
             Product product = productMapper.getProduce(cc.getClosedProdcues().get(i).getProductId());
@@ -298,6 +300,8 @@ public class CustomerServiceImpl implements CustomerService {
         for (int i=0;i<cc.getClosedFittings().size();i++) {
             FittingsInfo fittingsInfo = fittingsInfoMapper.getFittingsById(cc.getClosedFittings().get(i).getFittingsId());
             cc.getClosedFittings().get(i).setFittingsId(fittingsInfo.getFittingsId());
+            cc.getClosedFittings().get(i).setClosedFittingsName(fittingsInfo.getFittingsName());
+            cc.getClosedFittings().get(i).setClosedFittingsBar(fittingsInfo.getFittingsName());
         }
     }
 
@@ -381,7 +385,7 @@ public class CustomerServiceImpl implements CustomerService {
                 awaitingSignclosedProductInfo.setProductNum(1);
                 awaitingSignclosedProductInfo.setSignclosedProductId(closedFitting.getFittingsId());         //配件id
                 awaitingSignclosedProductInfo.setSignclosedProductColor(null);
-                awaitingSignclosedProductInfo.setProductName(closedFitting.getFittingName());       //配件名称
+                awaitingSignclosedProductInfo.setProductName(closedFitting.getClosedFittingsName());       //配件名称
                 awaitingSignclosedProductInfoArrayList.add(awaitingSignclosedProductInfo);
             }
         }

watero-rst-service/src/main/java/com/iamberry/rst/service/sys/mapper/sysMapper.xml

@@ -61,6 +61,7 @@
 		WHERE p.pocess_admin_id = #{adminId}
 		AND menu.menu_status = 1
 		AND sub.sub_status = 1
+		ORDER BY sub.sub_sort
 	</select>
 	<resultMap id="MenuMap" type="Menu">
 		<id column="pocess_menu_id" property="menuId"/>

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

@@ -671,7 +671,7 @@ public class AdminCustomerController {
             String result = smsService.sendOtherCMS(phone, text);
 
             if (!"SUCCESS".equals(result)) {
-                return new ResponseJson(500, "添加客诉发送短信失败，失败原因：" + result, 500);
+                return new ResponseJson(505, "添加客诉发送短信失败，失败原因：" + result + "<br>客诉信息发送失败并不影响客诉添加。", 505);
             }
         }
         return new ResponseJson(200, "添加客诉成功!", 200);

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -40,6 +40,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -681,6 +682,51 @@ public class AdminOrderController {
         return mv;
     }
 
+    /**
+     * 保存交易号
+     * @param filePath
+     * @param request
+     * @return
+     * @throws IOException
+     */
+    @RequestMapping("/download_order_txt")
+    public void downloadExcel(@RequestParam("file") String filePath, HttpServletRequest request,HttpServletResponse response) throws Exception {
+        String webPath = request.getSession().getServletContext().getRealPath("/");
+        webPath += filePath;
+        File file = new File(webPath);
+
+        logger.info("下载交易号，交易号地址：" + file.getPath());
+
+        // 设置返回内容
+        response.setContentType("application/octet-stream");
+        response.setHeader("Content-Disposition", "attachment;filename="+new String(("Efast订单号").getBytes("UTF-8"), "ISO-8859-1") + ".txt");
+        response.setContentLength((int) file.length());
+
+        byte[] buffer = new byte[4096];// 缓冲区
+        BufferedOutputStream output = null;
+        BufferedInputStream input = null;
+        try {
+            output = new BufferedOutputStream(response.getOutputStream());
+            input = new BufferedInputStream(new FileInputStream(file));
+            int n = -1;
+            //遍历，开始下载
+            while ((n = input.read(buffer, 0, 4096)) > -1) {
+                output.write(buffer, 0, n);
+            }
+            output.flush();   //不可少
+            response.flushBuffer();//不可少
+        } catch (Exception e) {
+            logger.info("保存交易号失败：失败原因：" + e.getMessage());
+            //异常自己捕捉
+        } finally {
+            //关闭流，不可少
+            if (input != null)
+                input.close();
+            if (output != null)
+                output.close();
+        }
+    }
+
     /**物流名称替换**/
     public static String replace(String code) {
         String name = "";

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java

@@ -502,7 +502,7 @@ public class AdminMachineController {
                     num = String.valueOf(machineNumber);
                     break;
             }
-            String json = String.format(NameUtils.QR_LIMIT_STR_SCENE, ResultInfo.barCodePrefix + berQrcode);
+            String json = String.format(NameUtils.QR_LIMIT_STR_SCENE, ResultInfo.barCodePrefix + berQrcode + num);
             QRCJson qrc = WeixinUtil.createQrcodeByWechatMp(json,wechatMp.getWechatMpAppid(),wechatMp.getWechatMpAppsecret(),wechatMp.getWechatMpPubno());
             PtsMachine ptsMachine = new PtsMachine();
             ptsMachine.setMachineQrcode(qrc.getUrl());//二维码
@@ -657,7 +657,7 @@ public class AdminMachineController {
                     num = String.valueOf(machineNumber);
                     break;
             }
-            String json = String.format(NameUtils.QR_LIMIT_STR_SCENE, ResultInfo.barCodePrefix + berQrcode);
+            String json = String.format(NameUtils.QR_LIMIT_STR_SCENE, ResultInfo.barCodePrefix + berQrcode + num);
             QRCJson qrc = WeixinUtil.createQrcodeByWechatMp(json,wechatMp.getWechatMpAppid(),wechatMp.getWechatMpAppsecret(),wechatMp.getWechatMpPubno());
             PtsMachine ptsMachine = new PtsMachine();
             ptsMachine.setMachineQrcode(qrc.getUrl());//二维码

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminSoftwareVersionController.java

@@ -0,0 +1,176 @@
+package com.iamberry.rst.controllers.pts;
+
+import com.iamberry.rst.core.pts.Produce;
+import com.iamberry.rst.core.pts.ProduceProcess;
+import com.iamberry.rst.core.pts.PtsMachineVersion;
+import com.iamberry.rst.faces.pts.MachineVersionService;
+import com.iamberry.rst.faces.pts.ProduceService;
+import com.iamberry.wechat.tools.ResponseJson;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by LJK on 2017/8/29.
+ */
+@Controller
+@RequestMapping("/admin/softwareVersion")
+public class AdminSoftwareVersionController {
+    @Autowired
+    private MachineVersionService machineVersionService;
+
+    @Autowired
+    private ProduceService produceService;
+
+    /**
+     * 查询生产产品列表
+     *
+     * @param request
+     * @return
+     */
+    @RequiresPermissions("softwareVersion:select:list")
+    @RequestMapping("/_software_version_list")
+    public ModelAndView selectProduceList(HttpServletRequest request) {
+        ModelAndView mv = new ModelAndView("pts/softwareVersion/software_version_list");
+        List<Produce> list = produceService.getProduceList();
+
+        //获取每个产品的所有工序
+        for (Produce produce : list){
+            ProduceProcess produceProcess = new ProduceProcess();
+            produceProcess.setProduceId(produce.getProduceId());
+            List<ProduceProcess> produceProcessesList = produceService.listProduceProcess(produceProcess);
+            produce.setProcess(produceProcessesList);
+        }
+        mv.addObject("resultList", list);
+        return mv;
+    }
+
+
+    /**
+     * 进入添加机器版本页面
+     * **/
+    @RequiresPermissions("machineVersion:add:machineVersion")
+    @RequestMapping("/_to_add_machineVersion")
+    public ModelAndView toAddMachineVersion(Integer produceId){
+        ModelAndView mv = new ModelAndView("pts/machineVersion/version_add");
+        List<Produce> list = produceService.getProduceList();
+        mv.addObject("produceList", list);
+        mv.addObject("produceId", produceId);
+        return mv;
+    }
+
+    /**
+     * 添加机器版本
+     * **/
+    @ResponseBody
+    @RequiresPermissions("machineVersion:add:machineVersion")
+    @RequestMapping("/add_machineVersion")
+    public ResponseJson addMachineVersion(HttpServletRequest request,PtsMachineVersion ptsMachineVersion){
+        ResponseJson responseJson = new ResponseJson();
+        if(ptsMachineVersion == null){
+            responseJson.setReturnCode(500);
+            return responseJson;
+        }
+        PtsMachineVersion version = new PtsMachineVersion();
+        version.setMachineVersionNo(ptsMachineVersion.getMachineVersionNo());
+        version = machineVersionService.getMachineVersion(version);
+        if(version != null){
+            responseJson.setReturnCode(500);
+            return responseJson;
+        }
+        ptsMachineVersion.setMachineVersionCreateTime(new Date());
+        ptsMachineVersion.setMachineVersionType(1);//软件版本默认为1
+        Integer msg =  machineVersionService.addMachineVersion(ptsMachineVersion);
+        if(msg > 0){
+            responseJson.setReturnCode(200);
+        }else{
+            responseJson.setReturnCode(500);
+        }
+        return responseJson;
+    }
+
+    /**
+     * 获取机器版本列表
+     *
+     * @param request
+     * @return
+     */
+    @RequiresPermissions("version:select:list")
+    @RequestMapping("/_version_list")
+    public ModelAndView listPtsVersion(HttpServletRequest request,PtsMachineVersion ptsMachineVersion) {
+        ModelAndView mv = new ModelAndView("pts/machineVersion/version_list");
+
+        List<PtsMachineVersion> pagedResult = machineVersionService.listMachineVersion(ptsMachineVersion);
+        //获取产品集合，用于页面选择产品
+        List<Produce> list = produceService.getProduceList();
+
+        Produce produce = new Produce();
+        produce.setProduceId(ptsMachineVersion.getProduceId());
+        produce = produceService.getProduce(produce);
+
+        mv.addObject("produceList",list);
+        mv.addObject("versionList",pagedResult);
+        mv.addObject("produceName",produce.getProduceName());
+        mv.addObject("produceId",ptsMachineVersion.getProduceId());
+        return mv;
+    }
+
+    /**
+     * 进入修改机器版本页面
+     * **/
+    @RequiresPermissions("machineVersion:update:machineVersion")
+    @RequestMapping("/_to_update_machineVersion")
+    public ModelAndView toupdateMachineVersion(HttpServletRequest request){
+        ModelAndView mv = new ModelAndView("pts/machineVersion/version_update");
+        String machineVersionId = request.getParameter("machineVersionId");
+        PtsMachineVersion ptsMachineVersion = new PtsMachineVersion();
+        ptsMachineVersion.setMachineVersionId(Integer.valueOf(machineVersionId));
+        ptsMachineVersion = machineVersionService.getMachineVersion(ptsMachineVersion);
+        mv.addObject("ptsMachineVersion", ptsMachineVersion);
+        List<Produce> list = produceService.getProduceList();
+        mv.addObject("produceList", list);
+        return mv;
+    }
+
+    /**
+     * 修改机器版本
+     * **/
+    @ResponseBody
+    @RequiresPermissions("machineVersion:update:machineVersion")
+    @RequestMapping("/update_machineVersion")
+    public ResponseJson updateMachineVersion(HttpServletRequest request,PtsMachineVersion ptsMachineVersion){
+        ResponseJson responseJson = new ResponseJson();
+        if(ptsMachineVersion == null){
+            responseJson.setReturnCode(500);
+            return responseJson;
+        }
+        PtsMachineVersion version = new PtsMachineVersion();
+        version.setMachineVersionId(ptsMachineVersion.getMachineVersionId());
+        version = machineVersionService.getMachineVersion(version);
+        if(!version.getMachineVersionNo().equals(ptsMachineVersion.getMachineVersionNo())){
+            PtsMachineVersion version2 = new PtsMachineVersion();
+            version2.setMachineVersionNo(ptsMachineVersion.getMachineVersionNo());
+            version2 = machineVersionService.getMachineVersion(version2);
+            if(version2 != null){
+                responseJson.setReturnCode(500);
+                return responseJson;
+            }
+        }
+
+        ptsMachineVersion.setMachineVersionUpdateTime(new Date());
+        Integer msg =  machineVersionService.updateVersion(ptsMachineVersion);
+        if(msg > 0){
+            responseJson.setReturnCode(200);
+        }else{
+            responseJson.setReturnCode(500);
+        }
+        return responseJson;
+    }
+}

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/MachineController.java

@@ -1,15 +1,19 @@
 package com.iamberry.rst.controllers.pts;
 
+import com.iamberry.rst.controllers.sys.SysController;
 import com.iamberry.rst.core.pts.*;
 import com.iamberry.rst.core.tools.QRCJson;
 import com.iamberry.rst.core.tools.WeixinUtil;
 import com.iamberry.rst.faces.pts.*;
 import com.iamberry.wechat.tools.NameUtils;
+import com.iamberry.wechat.tools.RespJsonBean;
 import com.iamberry.wechat.tools.ResponseJson;
 import com.iamberry.wechat.tools.ResultInfo;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,6 +30,8 @@ import java.util.*;
 @Controller
 @RequestMapping("/mcahine")
 public class MachineController {
+    private static Logger logger = LoggerFactory.getLogger(MachineController.class);
+
     @Autowired
     private ProduceService produceService;
 
@@ -44,11 +50,15 @@ public class MachineController {
     @Autowired
     private PtsBatchService ptsBatchService;
 
+
+
     @ResponseBody
     @RequestMapping("/uploadProcessOptions")
     public ResponseJson uploadProcessOptions(HttpServletRequest request) {
         ResponseJson rj = new ResponseJson();
         String nodeList = request.getParameter("nodeList"); //获取员工id
+        logger.info("--------------生成机器------------");
+        logger.info("获取数据：nodeList" + nodeList);
         if (nodeList == null || nodeList.equals("")) {
             rj.setResultCode(500);
             rj.setResultMsg("200");
@@ -338,20 +348,20 @@ public class MachineController {
      */
     @ResponseBody
     @RequestMapping("/getMachineInfo")
-    public JSONObject getMachineInfo(HttpServletRequest request) {
+    public RespJsonBean getMachineInfo(HttpServletRequest request) {
+        RespJsonBean rsj = new RespJsonBean();
         String barCode = request.getParameter("barCode");
         if (barCode == null || barCode.equals("")) {
             return null;
         }
-        JSONObject json = new JSONObject();
         PtsMachine ptsMachine = machineService.getMachineByBarCode(barCode);
         if(ptsMachine != null){
-            json.put("isBeing",1);
-            json.put("productType",ptsMachine.getMachineProduceType() == 1?"净水机":"冲奶机");
-            json.put("productType",ptsMachine.getMachineProduceType() == 1?"净水机":"冲奶机");
+            rsj.addResponseKeyValue("isBeing",1);
+            rsj.addResponseKeyValue("productType",ptsMachine.getMachineProduceType() == 1?"净水机":"冲奶机");
+            rsj.addResponseKeyValue("producedTime",ptsMachine.getMachineProducedTime() == null?null:ptsMachine.getMachineProducedTime().getTime());
         }else{
-            json.put("producedTime",ptsMachine.getMachineProducedTime() == null?null:ptsMachine.getMachineProducedTime().getTime());
+            rsj.addResponseKeyValue("isBeing",2);
         }
-        return json;
+        return rsj;
     }
 }

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

@@ -1993,10 +1993,23 @@
                     var index = layer.alert(data.resultMsg, function () {
                         if (data.resultCode == 200) {
                             location.href = "${path}/admin/customer/select_customer_list";
-                        } else {
+                        } else if(data.resultCode == 505){
+
+                        }else {
                             layer.close(index);
                         }
                     });
+
+//                    layer.confirm(data.resultMsg, {
+//                        btn: ['重要','奇葩'] //按钮
+//                    }, function(){
+//                        layer.msg('的确很重要', {icon: 1});
+//                    }, function(){
+//                        layer.msg('也可以这样', {
+//                            time: 20000, //20s后自动关闭
+//                            btn: ['明白了', '知道了']
+//                        });
+//                    });
                 }
             }
         });
@@ -2004,6 +2017,12 @@
 
     /* 添加客诉的准备 */
     function addCustomerReady(){
+        /* 录入电话号码和姓名到客诉基本信息里面  */
+        var name = $("#sendName").val();
+        var sendTel = $("#sendTel").val();
+        $("#customerName").val(name);
+        $("#customerTel").val(sendTel);
+
 
         /*验证来源入口*/
         var customerSourceType = $("input:radio[name='customerSourceType']:checked").val();

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

@@ -108,7 +108,7 @@
                         </span>
                     </div>
                     <div class="formControls col-2 col-sm-2"  style="padding: 0px 10px 0px 0px; width: 110px;">
-                        <input type="text" class="input-text" value="" placeholder="订单编号" id="salesId" name="">
+                        <input type="text" class="input-text" value="" placeholder="Efast订单号" id="salesOrderId" name="">
                     </div>
 
                      <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 110px;" >
@@ -137,7 +137,7 @@
                 <tr class="text-c">
                     <th width="50">销售公司</th>
                     <th width="50">店铺名称</th>
-                    <th width="50">订单编号</th>
+                    <th width="50">Efast订单号</th>
                     <th width="100">交易号</th>
                     <th width="60">收货人姓名</th>
                     <th width="80">收货人电话</th>
@@ -319,6 +319,7 @@
         var salesId = convertUndefinedToEmpty($("#salesId").val());
         var salesAddressName =convertUndefinedToEmpty($("#salesAddressName").val());
         var salesAddressTel = convertUndefinedToEmpty($("#salesAddressTel").val());
+        var salesOrderId = convertUndefinedToEmpty($("#salesOrderId").val());
         $.ajax({
             type: "POST",
             data: {
@@ -326,6 +327,7 @@
                 salesStoreId : salesStoreId,
                 salesOrderStatus : salesOrderStatus,
                 salesId : salesId,
+                salesOrderId : salesOrderId,
                 salesAddressName : salesAddressName,
                 salesAddressTel : salesAddressTel
             },
@@ -340,14 +342,14 @@
                         var productsHtml = '';
                         var salesOrderItem = salesOrder.salesOrderItemList
                         for(var j=0;j<salesOrderItem.length;j++){
-                            var item = salesOrderItem[j].itemProductName + "*" + salesOrderItem[j].itemNum;
-                                productsHtml += '<span class="label label-success radius">' + item + '</span>';
+                            var item = interceptToString(salesOrderItem[j].itemProductName) + "*" + salesOrderItem[j].itemNum;
+                                productsHtml += '<span class="label label-success radius" title="'+ salesOrderItem[j].itemProductName +'*'+ salesOrderItem[j].itemNum +'">' + item + '</span>';
                         }
                         var time = formatDate(new Date(salesOrder.salesCreateTime),"yyyy-MM-dd");
                         html += '<tr class="text-c">' +
                                 ' <td>'+ convertUndefinedToEmpty(salesOrder.companyName) +'</td>' +
                                 ' <td>'+ convertUndefinedToEmpty(salesOrder.storeName) +'</td>' +
-                                ' <td>'+ salesOrder.salesId +'</td>' +
+                                ' <td>'+ salesOrder.salesOrderId +'</td>' +
                                 ' <td>'+ salesOrder.salesDealCode +'</td>' +
                                 ' <td>'+ salesOrder.salesAddressName +'</td>' +
                                 ' <td>'+ salesOrder.salesAddressTel +'</td>' +

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

@@ -49,7 +49,8 @@
 
                         <td>
                             <div class="formControls col-xs-12 col-sm-12 skin-minimal">
-                            <input type="radio"  id="radio-${product.productId!''}" name="productId" value="${product.productId!''}" <#if product_index == 0>checked</#if>/>&nbsp;&nbsp;${product.productName!''}
+                                <input type="radio"  id="radio-1${product.productId!''}" name="productId" value="${product.productId!''}" <#if product_index == 0>checked</#if>/>
+                                <label for="radio-1${product.productId!''}">&nbsp;&nbsp;${product.productName!''}</label>
                             </div>
                         </td>
                         <td>
@@ -86,11 +87,11 @@
             <div class="formControls col-xs-7 col-sm-7 skin-minimal huanhang" style="margin: 10px 0px;">
                 <div class="radio-box">
                     <input type="radio" id="radio-3" name="detectState" value="3" checked/>
-                    <label for="tel-3">检测通过</label>
+                    <label for="radio-3">检测通过</label>
                 </div>
                 <div class="radio-box">
                     <input type="radio" id="radio-4" name="detectState" value="4"/>
-                    <label for="tel-4">检测未通过</label>
+                    <label for="radio-4">检测未通过</label>
                 </div>
             </div>
         </div>
@@ -118,11 +119,11 @@
             <div class="formControls col-xs-7 col-sm-7 skin-minimal">
                 <div class="radio-box">
                     <input type="radio" id="radio-5" name="detectIsMaintenance" value="1" checked/>
-                    <label for="tel-5">需要维修</label>
+                    <label for="radio-5">需要维修</label>
                 </div>
                 <div class="radio-box">
                     <input type="radio" id="radio-6" name="detectIsMaintenance" value="2"/>
-                    <label for="tel-6">不需要维修</label>
+                    <label for="radio-6">不需要维修</label>
                 </div>
             </div>
         </div>
@@ -131,11 +132,11 @@
             <div class="formControls col-xs-7 col-sm-7 skin-minimal" style="margin: 10px 0px;">
                 <div class="radio-box">
                     <input type="radio" id="radio-7" name="detectRevolutionProduced" value="2" checked/>
-                    <label for="tel-7">已转入维修</label>
+                    <label for="radio-7">已转入维修</label>
                 </div>
                  <div class="radio-box" style="margin-left: -4.1%;">
                     <input type="radio" id="radio-8" name="detectRevolutionProduced" value="1"/>
-                     <label for="tel-8">未转入维修</label>
+                     <label for="radio-8">未转入维修</label>
                 </div>
             </div>
         </div>
@@ -157,17 +158,18 @@
 <script type="text/javascript">
     /*初始化单选框样式*/
         $(function(){
+            $('.skin-minimal input').iCheck({
+                checkboxClass: 'icheckbox-blue',
+                radioClass: 'iradio-blue',
+                increaseArea: '20%'
+            });
             $('input[name="productId"]').on('ifChecked', function(event){
                 $("input[name='productId']").each(function () {
                     $("#maintenanceEquipmentNumber"+$(this).val()).val("");
                 });
             });
 
-            $('.skin-minimal input').iCheck({
-                checkboxClass: 'icheckbox-blue',
-                radioClass: 'iradio-blue',
-                increaseArea: '20%'
-            });
+
         });
 
 

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

@@ -7,14 +7,14 @@
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
     <meta http-equiv="Cache-Control" content="no-siteapp" />
 <#include "/base/add_base.ftl">
-    <title>修改备注 - H-ui.filter v2.4</title>
+    <title>修改转入信息</title>
     <style>
         .my-title{font-weight: 500;padding-left: 15px;position: relative;}
         .my-title:after{content: '';position: absolute;left: 0;top:12%;width: 3px;height: 80%;background: #32a3d8;}
         .my-input{padding: 8px 5px;width: 80%;border:1px solid rgba(0,0,0,.1);}
         .my-input-date{padding: 8px 10px;border:1px solid rgba(0,0,0,.1);width: 80%;background: url(http://s.iamberry.com/images/rili-1.png) 98.5% center no-repeat; background-size:auto 50%;}
         .input-box{margin: 18px 0;}
-        .input-dic{float: left;margin:5px 10px 0 0;font-size: 12px;}
+        .input-dic{float: left;margin:5px 10px 0 0;font-size: 14px;}
         .add-list{list-style-type: none;padding: 10px;background-color: #f5f5f5;width: 60%;float: left;margin: 0;}
         .add-list>li{margin: 10px 0;}
         .my-textarea{padding: 5px 10px;width: 80%;border:1px solid rgba(0,0,0,.1);}
@@ -23,6 +23,7 @@
         .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;}
+        .huanhang{ float:left}
     </style>
     <meta name="keywords" content="${path}">
     <meta name="description" content="H-ui.admin v3.0，是一款由国人开发的轻量级扁平化网站后台模板，完全免费开源的网站后台管理系统模版，适合中小型CMS后台系统。">
@@ -32,18 +33,22 @@
     <form class="form form-horizontal" id="form-admin-add">
 
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">当前状态为：</span>
-            <label for="radio-7">
-                <#if detectInfo.detectIsMaintenance == 1>
-                    需要转入生产部门
-                </#if>
-                <#if detectInfo.detectIsMaintenance == 2>
-                    不需要转入生产部门
-                </#if>
-            </label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">当前状态为：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal" style="margin: 10px 0px;margin-left: -30px;">
+                <div class="radio-box">
+                    <label for="tel-1">
+                        <#if detectInfo.detectIsMaintenance == 1>
+                            需要转入生产部门
+                        </#if>
+                        <#if detectInfo.detectIsMaintenance == 2>
+                            不需要转入生产部门
+                        </#if>
+                    </label>
+                </div>
+            </div>
         </div>
 
-        <div class="input-box">
+        <#--<div class="input-box">
             <span class="input-dic" style="margin-top: 0">转入生产部门</span>
             <label for="radio-7">
                 <input type="radio" id="radio-1" name="detectIsMaintenance" onclick="show();" value="1" checked/>需要转入生产部门
@@ -52,29 +57,52 @@
                 <input type="radio" id="radio-2" name="detectIsMaintenance" onclick="hide();" value="2"/>不需要转入生产部门
             </label>
         </div>
-        <div class="input-box" id="revolutionProducedId">
-            <span class="input-dic" style="margin-top: 0">已转入生产部门</span>
-            <label for="radio-7">
-                <input type="radio" id="radio-3" name="detectRevolutionProduced" value="2"
-                <#if state == '2'>
-                       checked
-                </#if>/>已转入生产部门
-            </label>
-            <label for="radio-8" style="margin-left: 50px;">
-                <input type="radio" id="radio-4" name="detectRevolutionProduced" value="1"
-                <#if state == '1'>
-                       checked
-                </#if>/>未转入生产部门
-            </label>
+-->
+        <div class="input-box">
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">转入生产部门：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal huanhang" style="margin: 10px 0px;">
+                <div class="radio-box">
+                    <input type="radio" id="radio-1" name="detectIsMaintenance" onclick="show();" value="1" checked/>
+                    <label for="tel-1">需要转入生产</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-2" name="detectIsMaintenance" onclick="hide();" value="2"/>
+                    <label for="tel-4">不需要转入生产</label>
+                </div>
+            </div>
         </div>
 
-        <div class="input-box"   style="text-align:center;">
-            <span class="input-dic spanhidth">备注</span>
-            <textarea rows="5" cols="20" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！">${detectInfo.detectDesc!''}</textarea>
-
+        <div class="input-box" id="revolutionProducedId">
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">已转入生产：</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal huanhang" style="margin: 10px 0px;">
+                <div class="radio-box">
+                    <input type="radio" id="radio-3" name="detectRevolutionProduced" value="2"
+                    <#if state == '2'>
+                           checked
+                    </#if>/>已转入生产
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-4" name="detectRevolutionProduced" value="1"
+                    <#if state == '1'>
+                           checked
+                    </#if>/>未转入生产
+                </div>
+            </div>
+        </div>
+        <div class="input-box" >
+            <label class="form-label col-3 col-sm-3 huanhang"  style="text-align: right;">备注：</label>
+            <div class="formControls col-xs-9 col-sm-9 huanhang">
+                <div class="radio-box">
+                    <textarea rows="3" style="width: 180%;margin-left: -15%;margin-top: 5%;" cols="20" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！"></textarea>
+                </div>
+            </div>
         </div>
         <div style="text-align:center;">
-            <span>如果转入生产，则生产部门同事可查看！</span>
+            <div class="formControls col-xs-9 col-sm-9">
+                <div class="radio-box">
+                    <span>如果转入生产，则生产部门同事可查看！</span>
+                </div>
+            </div>
         </div>
         <div style="text-align:center;">
 
@@ -86,6 +114,21 @@
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript">
 
+    /*初始化单选框样式*/
+    $(function(){
+        $('input[name="productId"]').on('ifChecked', function(event){
+            $("input[name='productId']").each(function () {
+                $("#maintenanceEquipmentNumber"+$(this).val()).val("");
+            });
+        });
+
+        $('.skin-minimal input').iCheck({
+            checkboxClass: 'icheckbox-blue',
+            radioClass: 'iradio-blue',
+            increaseArea: '20%'
+        });
+    });
+
     function hide() {
         $("#revolutionProducedId").hide();
     }

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

@@ -17,10 +17,9 @@
         .input-dic{float: left;margin:5px 10px 0 0;font-size: 12px;}
         .add-list{list-style-type: none;padding: 10px;background-color: #f5f5f5;width: 60%;float: left;margin: 0;}
         .add-list>li{margin: 10px 0;}
-        .my-textarea{padding: 5px 10px;width: 80%;border:1px solid rgba(0,0,0,.1);}
+        .my-textarea{padding: 5px 10px;width: 65%;border:1px solid rgba(0,0,0,.1);margin-left: 12.5%;}
         .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-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(${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;}
         .huanhang{ float:left}
@@ -32,8 +31,9 @@
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add">
         <div class="input-box">
-            <label class="form-label col-2 col-sm-2 huanhang">维修产品：</label>
-            <div class="formControls col-9 col-sm-9 text-c huanhang" style="margin-bottom: 15px;">
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">维修产品：</label>
+            <div class="col-9 col-sm-9 text-c">
+                <div class="radio-box"  style="margin-right: -40%;">
                 <table class="table table-border table-bg table-bordered" style="width: 420px;">
                     <thead>
                     <tr class="text-c">
@@ -47,7 +47,10 @@
                         <#list productList as product>
                         <tr>
                             <td>
-                                <input type="radio" onclick="emptyingNumber();" id="radio-1${product.productId!''}" name="productId" value="${product.productId!''}" <#if product_index == 0>checked</#if>/>${product.productName!''}
+                                <div class="col-xs-12 col-sm-12 skin-minimal">
+                                    <input type="radio" id="radio-X${product.productId!''}" name="productId" value="${product.productId!''}" <#if product_index == 0>checked</#if>/>
+                                    <label for="radio-X${product.productId!''}">&nbsp;&nbsp;${product.productName!''}</label>
+                                </div>
                             </td>
                             <td>
                                 <select name="colorId${product.productId!''}" id="colorId${product.productId!''}" style="width:90%" class="my-select">
@@ -69,101 +72,97 @@
                     </#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)>
-                            <#list product.colorList as colorList>
-                                <option value ="${colorList.colorId!''}">${colorList.colorName!''}</option>
-                            </#list>
-                        <#else>
-                            <option value ="">暂无颜色</option>
-                        </#if>
-                    </select>
-                    <input class="input-text" type="text" id="maintenanceEquipmentNumber${product.productId!''}" name="maintenanceEquipmentNumber${product.productId!''}" style="width: 20%;" placeholder="机器编号" /><br>
-                </#list>
-            </#if>-->
-
+                </div>
             </div>
         </div>
-
-    <#--<div class="input-box">
-        <span class="input-dic" style="margin-top: 0">&nbsp;</span>
-
-        <label for="radio-2" style="margin-left: 50px;">
-            <input type="radio" id="radio-2" name="detectProductType" value="2"/>配件
-            <select name="productId2" class="select" style="width:100px">
-            <#if (listFittings ?size > 0)>
-                <#list listFittings as list>
-                    <option value ="${list.fittingsId}">${list.fittingsName}</option>
-                </#list>
-            <#else >
-                <option value ="">暂无配件，请先添加配件</option>
-            </#if>
-            </select>
-        </label>
-    </div>-->
-
-        <div class="input-box"><span class="input-dic spanhidth">维修日期</span><input class="my-input-date" type="text" style="width: 76%;"  name="maintenanceContent_Date" id="maintenanceContentDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择检测日期" readonly="readonly"/> </div>
-
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">维修结果</span>
-            <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: 9%;">
-                <input type="radio" id="radio-4" name="maintenanceState" value="2"/>已完成
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">维修日期：</label>
+            <div class="formControls col-7 col-sm-7 text-c huanhang" style="margin-left: -4.5%;">
+                <input class="my-input-date" type="text"  name="maintenanceContent_Date" id="maintenanceContentDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择维修日期" readonly="readonly"/>
+            </div>
+        </div>
 
-            </label>
+        <div class="input-box">
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">维修结果：</label>
+            <div class="col-8 col-sm-8 text-c skin-minimal" >
+                <div class="radio-box">
+                    <input type="radio" id="radio-3" name="maintenanceState" value="1" checked/>
+                    <label for="radio-3">正在维修</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-4" name="maintenanceState" value="2"/>
+                    <label for="radio-4">已完成</label>
+                </div>
+            </div>
         </div>
 
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">是否可返修</span>
-            <label for="radio-5">
-                <input type="radio" id="radio-5" name="maintenanceIsRepair" value="1" checked/>不可返修
-            </label>
-            <label for="radio-6" style="margin-left: 9.3%;">
-                <input type="radio" id="radio-6" name="maintenanceIsRepair" value="2"/>可返修
-            </label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">是否可返修：</label>
+            <div class=" col-8 col-sm-8 text-c skin-minimal">
+                <div class="radio-box">
+                    <input type="radio" id="radio-5" name="maintenanceIsRepair" value="1" checked/>
+                    <label for="radio-5">不可返修</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-6" name="maintenanceIsRepair" value="2"/>
+                    <label for="radio-6">可返修</label>
+                </div>
+            </div>
         </div>
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">是否可入库</span>
-            <label for="radio-7">
-                <input type="radio" id="radio-7" name="maintenanceIsWarehousing" value="2" checked/>已入库
-            </label>
-            <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;">
-                <input type="radio" id="radio-9" name="maintenanceIsWarehousing" value="3"/>无法入库
-            </label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">是否可入库：</label>
+            <div class="formControls col-10 col-sm-10 text-c skin-minimal">
+                <div class="radio-box">
+                    <input type="radio" id="radio-7" name="maintenanceIsWarehousing" value="2" checked/>
+                    <label for="radio-7">已入库</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-8" name="maintenanceIsWarehousing" value="1"/>
+                    <label for="radio-8">未入库</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-9" name="maintenanceIsWarehousing" value="3"/>
+                    <label for="radio-9">无法入库</label>
+                </div>
+            </div>
         </div>
 
         <div class="input-box">
-            <span class="input-dic spanhidth">备注</span>
-            <textarea rows="3" cols="20" name="maintenanceDesc" id="maintenanceDesc" class="my-textarea" placeholder="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！"></textarea>
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">备注：</label>
+            <div class="formControls col-xs-9 col-sm-9">
+                <div class="radio-box">
+                    <textarea rows="3" style="width: 200%;margin-left: -15%;margin-top: 5%;" cols="20" name="maintenanceDesc" id="maintenanceDesc" class="my-textarea" placeholder="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！"></textarea>
+                </div>
+            </div>
         </div>
-        <div>
+        <div style="margin-left: 35%;">
             <button type="button" class="my-btn-submit" onclick="add();">确认提交</button>
         </div>
     </form>
 </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(){
+        $('input[name="productId"]').on('ifChecked', function(event){
+            $("input[name='productId']").each(function () {
+                $("#maintenanceEquipmentNumber"+$(this).val()).val("");
+            });
         });
-    }
+
+        $('.skin-minimal input').iCheck({
+            checkboxClass: 'icheckbox-blue',
+            radioClass: 'iradio-blue',
+            increaseArea: '20%'
+        });
+    });
+
 
     function  add() {
         var maintenanceContentDate = $("#maintenanceContentDate").val();
         if( maintenanceContentDate == null || maintenanceContentDate == "" ){
-            layer.msg('请选择检测日期',{icon: 5,time:1000});
+            layer.msg('请选择维修日期',{icon: 5,time:1000});
             return;
         }
 

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

@@ -32,54 +32,81 @@
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add">
         <div class="input-box"   style="text-align:center;">
-            <span class="input-dic spanhidth" style=" margin-top: 10px;">机器编码</span>
-            <input class="my-input" style="width: 80%;" value="${maintenanceInfo.maintenanceEquipmentNumber!''}" type="text" id="maintenanceEquipmentNumber" name="maintenanceEquipmentNumber" placeholder="请输入机器编码"/>
-        </div>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">机器编码：</label>
+            <div class="col-9 col-sm-9 text-c skin-minimal" >
+                <input class="my-input" style="width: 60%;" value="${maintenanceInfo.maintenanceEquipmentNumber!''}" type="text" id="maintenanceEquipmentNumber" name="maintenanceEquipmentNumber" placeholder="请输入机器编码"/>
+            </div>
+            </div>
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">维修结果</span>
-            <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: 9%;">
-                <input type="radio" id="radio-4" name="maintenanceState" value="2"  <#if maintenanceInfo.maintenanceState == 2>checked</#if>/>已完成
-
-            </label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">维修结果：</label>
+                <div class="col-8 col-sm-8 text-c skin-minimal" >
+                    <div class="radio-box">
+                        <input type="radio" id="radio-3" name="maintenanceState" value="1"  <#if maintenanceInfo.maintenanceState == 1>checked</#if>/>
+                        <label for="radio-3">正在维修</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" id="radio-4" name="maintenanceState" value="2"  <#if maintenanceInfo.maintenanceState == 2>checked</#if>/>
+                        <label for="radio-4">已完成</label>
+                    </div>
+                </div>
         </div>
 
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">是否可返修</span>
-            <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: 9%;">
-                <input type="radio" id="radio-6" name="maintenanceIsRepair" value="2" <#if maintenanceInfo.maintenanceIsRepair == 2>checked</#if> />可返修
-            </label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">是否可返修：</label>
+            <div class="col-8 col-sm-8 text-c skin-minimal" >
+                <div class="radio-box">
+                    <input type="radio" id="radio-5" name="maintenanceIsRepair" value="1" <#if maintenanceInfo.maintenanceIsRepair == 1>checked</#if>/>
+                    <label for="radio-5">不可返修</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-6" name="maintenanceIsRepair" value="2" <#if maintenanceInfo.maintenanceIsRepair == 2>checked</#if> />
+                    <label for="radio-6">可返修</label>
+                </div>
+            </div>
         </div>
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">是否可入库</span>
-            <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: 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;">
-                <input type="radio" id="radio-9" name="maintenanceIsWarehousing" value="3" <#if maintenanceInfo.maintenanceIsWarehousing == 3>checked</#if> />无法入库
-            </label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">是否可入库：</label>
+            <div class="col-10 col-sm-10 text-c skin-minimal" >
+                <div class="radio-box">
+                    <input type="radio" id="radio-7" name="maintenanceIsWarehousing" value="2" <#if maintenanceInfo.maintenanceIsWarehousing == 2>checked</#if>/>
+                    <label for="radio-7">已入库</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-8" name="maintenanceIsWarehousing" value="1" <#if maintenanceInfo.maintenanceIsWarehousing == 1>checked</#if> />
+                    <label for="radio-8">未入库</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-9" name="maintenanceIsWarehousing" value="3" <#if maintenanceInfo.maintenanceIsWarehousing == 3>checked</#if> />
+                    <label for="radio-9">无法入库</label>
+                </div>
+            </div>
         </div>
 
         <div class="input-box">
             <textarea rows="3" cols="20" name="maintenanceAnalysis" id="maintenanceAnalysis" class="my-textarea" placeholder="请详细描述维修记录">${maintenanceInfo.maintenanceAnalysis!''}</textarea>
         </div>
         <div  style="text-align:center; width:100%;height:100%;margin:0px; " >
-            <input type="hidden" value="${maintenanceInfo.maintenanceId!''}" name="maintenanceId" id="maintenanceId">
-            <button type="button" class="my-btn-submit" onclick="add();">提交</button>
+            <div class="col-10 col-sm-10 text-c skin-minimal" >
+                <input type="hidden" value="${maintenanceInfo.maintenanceId!''}" name="maintenanceId" id="maintenanceId">
+                <button type="button" class="my-btn-submit" onclick="add();">提交</button>
+            </div>
         </div>
     </form>
 </article>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript">
 
+
+    /*初始化单选框样式*/
+    $(function(){
+
+        $('.skin-minimal input').iCheck({
+            checkboxClass: 'icheckbox-blue',
+            radioClass: 'iradio-blue',
+            increaseArea: '20%'
+        });
+    });
+
     function  add() {
         var maintenanceEquipmentNumber = $("#maintenanceEquipmentNumber").val();
         if( maintenanceEquipmentNumber != null){

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

@@ -59,8 +59,8 @@
                 <th width="160">物流</th>
                 <th width="90">寄件人姓名</th>
                 <th width="100">寄件人电话</th>
-                <th width="400">退换产品</th>
-                <th width="400">签收产品</th>
+                <th width="200">退换产品</th>
+                <th width="200">签收产品</th>
                 <th width="130">退货地区</th>
                 <th width="100">是否少配件</th>
                 <th width="150">售后原因</th>

watero-rst-web/src/main/webapp/WEB-INF/views/order/excel_to_order.ftl

@@ -96,6 +96,7 @@
                             <option value="23">简二家</option>
                             <option value="24">科学育儿</option>
                             <option value="25">美康辰</option>
+                            <option value="26">北京悦祺</option>
                         </select>
                     </label>
                 </td>
@@ -133,7 +134,7 @@
                         <p>共<span id="order_total"></span>个订单，失败<span style="color: red;" id="order_fault_num"></span>个</p>
                         <p>总数不对?
                             &nbsp;&nbsp;<button class="btn btn-primary radius" onclick="check_fault()">查看校验失败内容</button>
-                            &nbsp;&nbsp;<a href="" style="background: #5A98DE;color: #fff;width: 85px;border-radius: 3px;text-align: center;padding: 6px;text-decoration: none;" id="downloadOrderIdTxt" download="Efast交易号">保存交易号</a>
+                            &nbsp;&nbsp;<button class="btn btn-primary radius" onclick="download_order_id()">保存交易号</button>
                         </p>
                     </b>
                     <table class="table table-border table-bordered table-bg" style="margin-top: 10px;">
@@ -167,6 +168,14 @@
 <script type="text/javascript" src="${path}/common/lib/jquery.ui/jquery-ui.js"></script>
 <script type="text/javascript">
 
+    var download_order_id_path = "";
+    /*保存交易号*/
+    function download_order_id(){
+        if(download_order_id_path != null && download_order_id_path != ""){
+            window.location.href=root_path + '/admin/order/download_order_txt?file='+download_order_id_path;
+        }
+    }
+
     // 初始化排序
     $(function() {
         $( ".sortable" ).sortable({
@@ -284,7 +293,7 @@
                 modaldemo();
 
                 var fileName = result.returnMsg.fileName;
-                $("#downloadOrderIdTxt").attr("href",root_path + "/" +fileName);
+                download_order_id_path = fileName;
             }
         });
     }

watero-rst-web/src/main/webapp/WEB-INF/views/order/list.ftl

@@ -303,8 +303,6 @@
             layer.msg('已启用!', {icon: 6,time:1000});
         });
     }
-
-
 </script>
 </body>
 </html>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machineVersion/version_add.ftl

@@ -11,12 +11,12 @@
 <link rel="Shortcut Icon" href="/favicon.ico" />
 <#include "/base/add_base.ftl">
     <link href="${path }/common/kingedit/themes/default/default.css" rel="stylesheet" type="text/css" />
-<title>添加机器版本</title>
+<title>添加软件版本</title>
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 版本管理
-    <span class="c-gray en">&gt;</span> 添加版本
+    <span class="c-gray en">&gt;</span> 软件版本管理
+    <span class="c-gray en">&gt;</span> 添加软件版本
     <a class="btn radius r"
        style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machineVersion/version_list.ftl

@@ -2,7 +2,7 @@
 <html>
 	<head>
 		<meta charset="UTF-8">
-		<title>机器版本</title>
+		<title>产品软件版本</title>
 	<#include "/base/list_base.ftl">
 <style>
 			article, section, time, aside {
@@ -183,7 +183,7 @@
 						</#list>
 					</article>
 						<div class="text-c" style="text-align: center;">
-							<button type="button" class="my-btn-edit">添加版本</button>
+							<button type="button" class="my-btn-edit">添加软件版本</button>
 						</div>
 						<br />
 						<br />

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machineVersion/version_update.ftl

@@ -11,12 +11,12 @@
 <link rel="Shortcut Icon" href="/favicon.ico" />
 <#include "/base/add_base.ftl">
     <link href="${path }/common/kingedit/themes/default/default.css" rel="stylesheet" type="text/css" />
-<title>修改机器版本</title>
+<title>修改软件版本</title>
 </head>
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <span class="c-gray en">&gt;</span> 版本管理
-    <span class="c-gray en">&gt;</span> 修改版本
+    <span class="c-gray en">&gt;</span> 软件版本管理
+    <span class="c-gray en">&gt;</span> 修改软件版本
     <a class="btn radius r"
        style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/softwareVersion/software_version_list.ftl

@@ -0,0 +1,102 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+    <link rel="Bookmark" href="/favicon.ico" >
+    <link rel="Shortcut Icon" href="/favicon.ico" />
+    <#include "/base/list_base.ftl">
+    <title>软件版本列表</title>
+    <style>
+        .chanpin-list{margin: 0;padding: 10px;list-style-type: none;}
+        .chanpin-list>li{display: table-cell;width: 230px;border-left: 1px solid rgba(0,0,0,.1);border-bottom: 1px solid rgba(0,0,0,.1);background-color: #fff;position: relative;border-right: 30px solid transparent;padding-bottom: 30px;}
+        .chanpin-list>li:after{content: '';position: absolute;right: 0;width: 1px;height: 100%;background-color: #ccc;-webkit-transform:scaleX(.5);  top:0;}
+        .chanpin-list>li .title{background-color: #32a3d8;text-align: center;color: #fff;padding: 12px 0;}
+        .chanpin-list>li .title>span{padding:3px 3px 3px 28px;background: url(${path}/common/images/pts/jiqi-1.png) left center no-repeat;background-size:auto 80%;}
+        .items-list{margin: 0;padding: 20px 25px;list-style: none;}
+        .items-list>li{margin: 12px 0;font-size: 13px;position: relative;padding-left: 13px;color: #666;}
+        .items-list>li:after{content: '';position: absolute;left: 0;top: 5px;width: 5px;height: 5px;border-radius: 50%;border: 1px solid #32a3d8;}
+        .my-btn-edit{padding: 6px 20px;background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;display: block;
+            width: 100px;
+            left: 50%;
+            position: absolute;bottom: 10px;margin-left: 5px;}
+        .my-btn-select{padding: 6px 20px;background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;display: block;
+            width: 60%;
+            position: absolute;bottom: 10px;    margin-left: 20%;text-align: center;}
+        .chanpin-list>.li-add{width: 230px;height: 280px;text-align: center;display: table;padding-top: 55px;position: relative;cursor:pointer;}
+        .chanpin-list>.li-add:before{content: '';width: 5px;height: 80px; position: absolute;left: 50%;top: 90px;background-color: #32a3d8;border-radius: 50px;}
+        .chanpin-list>.li-add:after{content: '';height: 5px;width: 80px;position: absolute;left: 75px;top: 128px;background-color: #32a3d8;border-radius: 50px;-webkit-transform:scaleX(1);}
+        .chanpin-list>.li-add>div{display: table-cell;vertical-align: middle;height: 100%;width: 100%;text-align: center;color: #32a3d8;}
+        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;}
+    </style>
+</head>
+<body>
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+    <span class="c-gray en">&gt;</span> 软件版本管理
+    <span class="c-gray en">&gt;</span> 软件版本列表
+    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+<div class="page-container">
+
+        <ul class="chanpin-list">
+
+        <#list resultList as produce>
+            <li>
+                <div class="title" <#if produce.produceStatus == 0>style="background-color: #ccc;"</#if>>
+                    <span>${produce.produceName!}</span>
+                </div>
+                <ul class="items-list">
+                    <#list produce.process as process>
+                        <li>${process.processName!}</li>
+                    </#list>
+                </ul>
+                <#--<button type="button" onclick="updateProduce(${produce.produceId!})" class="my-btn-edit">编辑流程</button>-->
+                <div>
+                    <button type="button" onclick="selectVersion('${produce.produceId!}','${produce.produceName!}')" class="my-btn-select">软件版本</button>
+                </div>
+            </li>
+        </#list>
+           <#-- <div class="li-add">
+                <div>添加产品</div>
+            </div>-->
+        </ul>
+    <div>
+
+    </div>
+
+</div>
+<#--<#include "/base/page_util.ftl">-->
+<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.config.js"></script>
+<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.all.min.js"> </script>
+<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/lang/zh-cn/zh-cn.js"></script>
+<script type="text/javascript">
+    $(function(){
+       $(".li-add").click(function () {
+           window.location.href= "${path}/admin/produce/to_save_produce";
+       })
+    })
+
+    /**
+     * 跳转到修改页面
+     * @param produceId
+     */
+    function updateProduce(produceId){
+        window.location.href= "${path}/admin/produce/to_update_produce?produceId="+ produceId;
+    }
+
+    /**
+     * 查询版本列表
+     * @param produceId
+     */
+    function selectVersion(produceId,produceName){
+        window.location.href= "${path}/admin/machineVersion/_version_list?produceId="+ produceId+"&produceName="+encodeURI(produceName);
+    }
+
+</script>
+
+</body>
+</html>

watero-rst-web/src/main/webapp/WEB-INF/views/wap/pts/machine_delivery.ftl

@@ -394,10 +394,6 @@
                         alert_msg = "请输入条形码";
                         validate_flag = false;
                         return false;
-                    }else if(this.value.length != 13){
-                        alert_msg = "条形码格式不正确";
-                        validate_flag = false;
-                        return false;
                     }else if(!(en_name.test(this.value))){
                         alert_msg = "条形码格式不正确";
                         validate_flag = false;

watero-rst-web/src/main/webapp/common/js/common/common.js

@@ -48,6 +48,23 @@ function convertUndefinedToEmpty(val) {
 }
 
 /**
+ * 截取字符串显示
+ * @param val
+ * @param length  长度
+ * @returns {*}
+ */
+function interceptToString(val,length) {
+    var value = convertUndefinedToEmpty(val);
+    if(length == null || length == "" || typeof(val)=="undefined" || parseInt(length) < 1){
+        length = 10;
+    }
+    if( value.length > length){
+        value = value.substring(0,length) + "…";
+    }
+    return value;
+}
+
+/**
  * 去除空格
  * @param str
  * @constructor