二手拆分

src/main/java/com/caimei/modules/order/entity/NewOrder.java

@@ -153,12 +153,23 @@ public class NewOrder extends DataEntity<NewOrder> {
     private Double reductionTouchPrice; //分享减免条件
     private Integer onlinfePayFlag;  //线上支付标记
 
+    private Integer productCategory;//商品订单状态 1.普通订单 2.二手订单
+
+
     /**
      * 呵呵商城优惠券
      */
     private Integer receiveCouponId;
     private CmHeheCouponOrderRecord heheCouponRecord;   //优惠券信息
 
+    public Integer getProductCategory() {
+        return productCategory;
+    }
+
+    public void setProductCategory(Integer productCategory) {
+        this.productCategory = productCategory;
+    }
+
     public Double getSettleAmount() {
         return settleAmount;
     }

src/main/java/com/caimei/modules/order/web/NewOrderController.java

@@ -197,7 +197,55 @@ public class NewOrderController extends BaseController {
         return "modules/order/newOrderList";
     }
 
-    @RequiresPermissions("order:order:edit")
+    @RequiresPermissions("order:order:secondhandOrder")
+    @RequestMapping("secondhandOrderList")
+    public String secondhandOrderList(NewOrder order, HttpServletRequest request, HttpServletResponse response, Model model) {
+        if (null != order.getStartTime() && !"".equals(order.getStartTime()) && !order.getStartTime().endsWith("00:00:00")) {
+            model.addAttribute("startTime", order.getStartTime());
+            order.setStartTime(order.getStartTime().trim() + " 00:00:00");
+        }
+        if (null != order.getEndTime() && !"".equals(order.getEndTime()) && !order.getEndTime().endsWith("23:59:59")) {
+            model.addAttribute("endTime", order.getEndTime());
+            order.setEndTime(order.getEndTime().trim() + " 23:59:59");
+        }
+        if (null != order.getStartConfirmTime() && !"".equals(order.getStartConfirmTime()) && !order.getStartConfirmTime().endsWith("00:00:00")) {
+            model.addAttribute("startConfirmTime", order.getStartConfirmTime());
+            order.setStartConfirmTime(order.getStartConfirmTime().trim() + " 00:00:00");
+        }
+        if (null != order.getEndConfirmTime() && !"".equals(order.getEndConfirmTime()) && !order.getEndConfirmTime().endsWith("23:59:59")) {
+            model.addAttribute("endConfirmTime", order.getEndConfirmTime());
+            order.setEndConfirmTime(order.getEndConfirmTime().trim() + " 23:59:59");
+        }
+        if (null != order.getStartRefundTime() && !"".equals(order.getStartRefundTime()) && !order.getStartRefundTime().endsWith("00:00:00")) {
+            model.addAttribute("startRefundTime", order.getStartRefundTime());
+            order.setStartRefundTime(order.getStartRefundTime().trim() + " 00:00:00");
+        }
+        if (null != order.getEndRefundTime() && !"".equals(order.getEndRefundTime()) && !order.getEndRefundTime().endsWith("23:59:59")) {
+            model.addAttribute("endRefundTime", order.getEndRefundTime());
+            order.setEndRefundTime(order.getEndRefundTime().trim() + " 23:59:59");
+        }
+        model.addAttribute("orderRefundType", order.getOrderRefundType());
+        if (null != order.getBuyer()) {
+            order.setBuyer(order.getBuyer().trim());
+        }
+        if (null != order.getReceiver()) {
+            order.setReceiver(order.getReceiver().trim());
+        }
+        order.setProductCategory(2);
+        //查询内部处理了已收,未付统计（包含运费）
+        Page<NewOrder> page = newOrderService.findPage(new Page<>(request, response, 20), order);
+        //获取组织列表
+        List<CmUserOrganize> cmUserOrganizeList = cmUserOrganizeService.findOrganize();
+        model.addAttribute("cmUserOrganizeList", cmUserOrganizeList);
+        //获取上线协销人员，排除采美默认协销经理
+        List<NewCmSp> serviceProviderList = newOrderService.findServiceProviderList();
+        model.addAttribute("serviceProviderList", serviceProviderList);
+        model.addAttribute("page", page);
+        return "modules/order/secondhandOrderList";
+    }
+
+
+    @RequiresPermissions("order:order:form")
     @RequestMapping(value = "form")
     public String form(NewOrder newOrder, Model model, HttpServletRequest request) {
         BpClause bpClause = new BpClause();
@@ -286,7 +334,7 @@ public class NewOrderController extends BaseController {
         return "modules/order/orderForm";
     }
 
-    @RequiresPermissions("order:order:edit")
+    @RequiresPermissions("order:order:secondeProductOrderForm")
     @RequestMapping(value = "secondeProductOrderForm")
     public String secondeProductOrderForm(NewOrder newOrder, Model model, HttpServletRequest request) {
         BpClause bpClause = new BpClause();
@@ -2006,7 +2054,7 @@ public class NewOrderController extends BaseController {
     /**
      * @return
      */
-    @RequiresPermissions("order:order:edit")
+    @RequiresPermissions("order:order:postageOrderForm")
     @RequestMapping(value = "postageOrderForm")
     public String postageOrderForm(NewOrder newOrder, Model model) {
         newOrder.setFreight(10D);

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -279,6 +279,9 @@
             <if test="productName != null and productName != ''">
                 and p.name like CONCAT('%',#{productName},'%')
             </if>
+            <if test="productCategory == 2">
+                and p.productCategory=2
+            </if>
             AND co.delFlag = 0
         </where>
         <choose>

src/main/webapp/WEB-INF/views/modules/order/newOrderList.jsp

@@ -49,10 +49,19 @@
 <body>
 <textarea cols="20" rows="10" id="biao1"></textarea>
 <ul class="nav nav-tabs">
-    <li class="active"><a href="${ctx}/order/orderList">订单列表</a></li>
-    <shiro:hasPermission name="order:order:edit">
+    <shiro:hasPermission name="order:order:view">
+        <li class="active"><a href="${ctx}/order/orderList">订单列表</a></li>
+    </shiro:hasPermission>
+    <shiro:hasPermission name="order:order:secondhandOrder">
+        <li><a href="${ctx}/order/secondhandOrderList">二手订单列表</a></li>
+    </shiro:hasPermission>
+    <shiro:hasPermission name="order:order:form">
         <li><a href="${ctx}/order/form">添加订单</a></li>
+    </shiro:hasPermission>
+    <shiro:hasPermission name="order:order:postageOrderForm">
         <li><a href="${ctx}/order/postageOrderForm">添加运费订单</a></li>
+    </shiro:hasPermission>
+    <shiro:hasPermission name="order:order:secondeProductOrderForm">
         <li><a href="${ctx}/order/secondeProductOrderForm">添加二手订单</a></li>
     </shiro:hasPermission>
 </ul>
@@ -165,14 +174,14 @@
                     <form:option value="0" label="否"/>
                 </form:select>
             </div>
-            <div class="item">
-                <label>二手订单：</label>
-                <form:select path="secondHandOrderFlag" class="select-ele input-medium required">
-                    <form:option value="" label="请选择"/>
-                    <form:option value="0" label="否"/>
-                    <form:option value="1" label="是"/>
-                </form:select>
-            </div>
+<%--            <div class="item">--%>
+<%--                <label>二手订单：</label>--%>
+<%--                <form:select path="secondHandOrderFlag" class="select-ele input-medium required">--%>
+<%--                    <form:option value="" label="请选择"/>--%>
+<%--                    <form:option value="0" label="否"/>--%>
+<%--                    <form:option value="1" label="是"/>--%>
+<%--                </form:select>--%>
+<%--            </div>--%>
             <div class="item">
                 <label>组织：</label>
                 <form:select path="organizeID" class="select-ele input-medium required">
@@ -215,7 +224,7 @@
         <li>订单编号</li>
         <li>订单类型</li>
         <li>返佣订单</li>
-        <li>二手订单</li>
+<%--        <li>二手订单</li>--%>
         <li>机构</li>
         <li>收货人</li>
         <li>订单来源</li>
@@ -255,14 +264,14 @@
                     是
                 </c:if>
             </li>
-            <li>
-                <c:if test="${order.secondHandOrderFlag == '1'}">
-                    是
-                </c:if>
-                <c:if test="${order.secondHandOrderFlag ne '1'}">
-                    否
-                </c:if>
-            </li>
+<%--            <li>--%>
+<%--                <c:if test="${order.secondHandOrderFlag == '1'}">--%>
+<%--                    是--%>
+<%--                </c:if>--%>
+<%--                <c:if test="${order.secondHandOrderFlag ne '1'}">--%>
+<%--                    否--%>
+<%--                </c:if>--%>
+<%--            </li>--%>
             <li>
 
                 <c:if test="${order.organizeID == 1}">

src/main/webapp/WEB-INF/views/modules/order/secondhandOrderList.jsp

@@ -0,0 +1,366 @@
+<%@ page import="java.util.Date" %>
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
+<html>
+<head>
+    <title>二手订单列表</title>
+    <meta name="decorator" content="default"/>
+    <style type="text/css">
+        .table th{text-align:center}
+        .table td{text-align:center}
+        .data-title{width:100%;display:table}
+        .data-title ul li{word-break:break-all;display:table-cell;width:100px;border:1px solid #000;text-align:center;height:35px;vertical-align:middle;border-right:0;border-bottom:0}
+        .data-title ul{margin-bottom:0 !important;display:table-row}
+        .data-title ul li:last-of-type{width:120px;border-right:1px solid #000000}
+        .data-title ul:last-of-type li{border-bottom:1px solid #000000}
+        .data-title ul li:nth-child(6){width:80px}
+        .spileOrder li:nth-of-type(1){position:relative}
+        .san{width:10px;height:10px;border-top:2px solid #000;border-right:2px solid #000;transform:rotate(45deg);position:absolute;right:-2px;top:50%;margin-top:-5px;cursor:pointer}
+        .red-waring{margin:0 !important;background-color:#f3f3f3 !important}
+        .red-waring li{border-color:red !important}
+        #biao1{position:absolute;left:-9999px;top:-9999px;z-index:-99;width:1px;height:1px}
+        #searchForm{line-height:40px}
+        #searchForm .ul-form{overflow:visible}
+        #searchForm{white-space:nowrap}
+        #searchForm label{margin-top:15px}
+        .ul-form{white-space:nowrap;margin-left:-10px !important}
+        .ul-form label{width:90px;text-align:right}
+        #btnSubmit{width:128px;margin-left:152px}
+        .select-ele{width:177px}
+    </style>
+    <script type="text/javascript">
+        function page(n, s) {
+            $("#pageNo").val(n);
+            $("#pageSize").val(s);
+            $("#searchForm").submit();
+            return false;
+        }
+        function checkfun() {
+            var orderID = $('#orderID').val();
+            var reg = /^[0-9]*$/;
+            if (!reg.test(orderID) && orderID.trim() != "") {
+                    alertx("请输入正确的订单ID!");
+                    return false;
+                }
+            return true;
+        }
+    </script>
+</head>
+<body>
+<textarea cols="20" rows="10" id="biao1"></textarea>
+<ul class="nav nav-tabs">
+<shiro:hasPermission name="order:order:view">
+    <li><a href="${ctx}/order/orderList">订单列表</a></li>
+</shiro:hasPermission>
+<shiro:hasPermission name="order:order:secondhandOrder">
+    <li class="active"><a href="${ctx}/order/secondhandOrderList">二手订单列表</a></li>
+</shiro:hasPermission>
+    <shiro:hasPermission name="order:order:form">
+        <li><a href="${ctx}/order/form">添加订单</a></li>
+    </shiro:hasPermission>
+<shiro:hasPermission name="order:order:postageOrderForm">
+        <li><a href="${ctx}/order/postageOrderForm">添加运费订单</a></li>
+</shiro:hasPermission>
+<shiro:hasPermission name="order:order:secondeProductOrderForm">
+        <li><a href="${ctx}/order/secondeProductOrderForm">添加二手订单</a></li>
+</shiro:hasPermission>
+
+</ul>
+<sys:message content="${message}"/>
+<form:form id="searchForm" modelAttribute="newOrder" onsubmit="return checkfun()" action="${ctx}/order/secondhandOrderList"
+           method="post" class="breadcrumb form-search">
+    <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+    <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+    <div class="ul-form">
+        <div class="flex-wrap">
+            <div class="item">
+                <label>订单ID：</label>
+                <form:input path="orderID" id="orderID" htmlEscape="false" maxlength="30" class="input-medium"/>
+            </div>
+            <div class="item">
+                <label>订单号：</label>
+                <form:input path="orderNo" htmlEscape="false" maxlength="30" class="input-medium"/>
+            </div>
+            <div class="item">
+                <label>机构：</label>
+                <form:input path="buyer" maxlength="20" class="input-medium"/>
+            </div>
+            <div class="item">
+                <label>收货人：</label>
+                <form:input path="receiver" maxlength="20" class="input-medium"/>
+            </div>
+            <div class="item">
+                <label>商品名称：</label>
+                <form:input path="productName" class="input-large"/>
+            </div>
+            <div class="item">
+                <label>订单状态：</label>
+                <form:select path="status" class="select-ele input-medium required">
+                    <form:option value="" label="所有"/>
+                    <form:options items="${fns:getDictList('order_status')}" itemLabel="label" itemValue="value"
+                                  htmlEscape="false"/>
+                </form:select>
+            </div>
+            <div class="item">
+                <label>收款状态：</label>
+                <form:select path="receiptStatus" class="select-ele input-medium required">
+                    <form:option value="" label="所有"/>
+                    <form:options items="${fns:getDictList('receiptStatus')}" itemLabel="label" itemValue="value"
+                                  htmlEscape="false"/>
+                </form:select>
+            </div>
+            <div class="item">
+                <label>发货状态：</label>
+                <form:select path="sendOutStatus" class="select-ele input-medium required">
+                    <form:option value="" label="所有"/>
+                    <form:options items="${fns:getDictList('sendOutStatus')}" itemLabel="label" itemValue="value"
+                                  htmlEscape="false"/>
+                </form:select>
+            </div>
+            <div class="item">
+                <label>付款状态：</label>
+                <form:select path="payStatus" class="select-ele input-medium required">
+                    <form:option value="" label="所有"/>
+                    <form:options items="${fns:getDictList('payStatus')}" itemLabel="label" itemValue="value"
+                                  htmlEscape="false"/>
+                </form:select>
+            </div>
+
+            <div class="item">
+                <label>退款状态：</label>
+                <form:select path="refundType" class="select-ele input-medium required">
+                    <form:option value="" label="所有"/>
+                    <form:option value="0" label="无退款"/>
+                    <form:option value="1" label="部分退款"/>
+                    <form:option value="2" label="已退款"/>
+                </form:select>
+            </div>
+            <div class="item">
+                <label>待审核退款：</label>
+                <form:select path="returnedPurchaseStatus" class="select-ele input-medium required">
+                    <form:option value="" label="所有"/>
+                    <form:option value="1" label="有"/>
+                    <form:option value="0" label="无"/>
+                </form:select>
+            </div>
+
+            <div class="item">
+                <label>协销人员：</label>
+                <form:select path="serviceProviderId" class="select-ele input-medium required">
+                    <form:option value="" label="所有"/>
+                    <form:options items="${serviceProviderList}" itemLabel="linkMan" itemValue="serviceProviderID"
+                                  htmlEscape="false"/>
+                </form:select>
+            </div>
+
+            <div class="item">
+                <label class="control-label">下单时间：</label>
+                <form:input path="startTime" type="text" maxlength="10" class="input-medium Wdate" value="${startTime}"
+                            onclick="WdatePicker({dateFmt:'yyyy-MM-dd ',isShowClear:false});"/>
+                至
+                <form:input path="endTime" type="text" maxlength="10" class="input-medium Wdate" value="${endTime}"
+                            onclick="WdatePicker({dateFmt:'yyyy-MM-dd ',isShowClear:false});"/>
+            </div>
+            <div class="item">
+                <label class="control-label">确认时间：</label>
+                <form:input path="startConfirmTime" type="text" maxlength="10" class="input-medium Wdate"
+                            value="${startConfirmTime}"
+                            onclick="WdatePicker({dateFmt:'yyyy-MM-dd ',isShowClear:false});"/>
+                至
+                <form:input path="endConfirmTime" type="text" maxlength="10" class="input-medium Wdate"
+                            value="${endConfirmTime}"
+                            onclick="WdatePicker({dateFmt:'yyyy-MM-dd ',isShowClear:false});"/>
+            </div>
+            <div class="item">
+                <input id="btnSubmit" class="btn btn-primary" type="submit" value="查询" style="margin-left: 20px;"/>
+            </div>
+        </div>
+    </div>
+</form:form>
+
+<fmt:formatDate value="<%=new Date()%>" var="currDate" pattern="yyyy-MM-dd"/>
+<fmt:formatDate value="<%=new Date()%>" var="monthFirst" pattern="yyyy-MM-01"/>
+<div class="data-title">
+    <ul>
+        <li>订单ID</li>
+        <li>订单编号</li>
+        <li>订单类型</li>
+<%--        <li>返佣订单</li>--%>
+<%--        <li>二手订单</li>--%>
+        <li>机构</li>
+        <li>收货人</li>
+        <li>订单来源</li>
+        <li>订单状态</li>
+        <li>收款状态</li>
+        <li>付款状态</li>
+        <li>发货状态</li>
+        <li>退款状态</li>
+        <li>待审核退款</li>
+        <li>订单金额</li>
+        <li>下单时间</li>
+        <li>确认时间</li>
+        <li>操作</li>
+    </ul>
+    <c:forEach items="${page.list}" var="order">
+        <%--颜色区分分期不分期订单以及终止订单--%>
+        <ul class="spileOrder" data-id="${order.orderNo}">
+            <li>${order.orderID}</li>
+            <li style="position: relative">${order.orderNo}
+            </li>
+            <li>
+                <c:if test="${order.orderType == 1}">
+                    自主订单
+                </c:if>
+                <c:if test="${order.orderType == 0}">
+                    协销订单
+                    <c:if test="${not empty order.spName}">
+                        <br>${fns:appendLast1('(',order.spName,')')}
+                    </c:if>
+                </c:if>
+            </li>
+<%--            <li>--%>
+<%--                <c:if test="${order.rebateOrder == '0'}">--%>
+<%--                    否--%>
+<%--                </c:if>--%>
+<%--                <c:if test="${order.rebateOrder ne '0'}">--%>
+<%--                    是--%>
+<%--                </c:if>--%>
+<%--            </li>--%>
+<%--            <li>--%>
+<%--                <c:if test="${order.secondHandOrderFlag == '1'}">--%>
+<%--                    是--%>
+<%--                </c:if>--%>
+<%--                <c:if test="${order.secondHandOrderFlag ne '1'}">--%>
+<%--                    否--%>
+<%--                </c:if>--%>
+<%--            </li>--%>
+            <li>
+
+                <c:if test="${order.organizeID == 1}">
+                    <span class="org-note">星范</span>
+                </c:if>
+
+                    ${order.buyer}
+            </li>
+            <li>${order.receiver}</li>
+            <li>${fns:getDictLabel(order.orderSource,"bp_orderSource","" )}</li>
+            <li class="sd-li">
+                <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||
+				order.status eq 23 || order.status eq 31 ||order.status eq 32 ||order.status eq 33}">
+                    交易中<br>(${fns:getDictLabel(order.status,"order_detail_status","" )})
+                </c:if>
+                <c:if test="${order.status eq 0 || order.status eq 4 || order.status eq 5 || order.status eq 6 || order.status eq 7}">${fns:getDictLabel(order.status,"order_detail_status","" )}</c:if>
+            </li>
+            <li>
+                <c:if test="${order.receiptStatus == 1}">
+                    <font color="red">待收款</font>
+                </c:if>
+                <c:if test="${order.receiptStatus == 2}">
+                    <font color="#ff8c00">部分收款</font>
+                </c:if>
+                <c:if test="${order.receiptStatus == 3}">
+                    <font color="green">已收款</font>
+                </c:if>
+                <br>
+                    <%--抹平明细--%>
+                <c:if test="${order.confirmType eq 1}">
+                    <c:if test="${order.receiptOrderFlag}">
+                        一款多单:少收抹平金额未知
+                    </c:if>
+                    <c:if test="${!order.receiptOrderFlag}">
+                        <font>少收抹平:<br>
+                            ￥<fmt:formatNumber
+                                    value="${order.payableAmount - (empty order.orderReceivedAmount ? 0 : order.orderReceivedAmount)}"
+                                    pattern="#0.00"/>
+                        </font>
+                    </c:if>
+                </c:if>
+                <c:if test="${order.confirmType eq 2}">
+                    <c:if test="${order.receiptOrderFlag}">
+                        一款多单:多收抹平金额未知
+                    </c:if>
+                    <c:if test="${!order.receiptOrderFlag}">
+                        <font>多收抹平:<br>
+                            ￥<fmt:formatNumber
+                                    value="${(empty order.orderReceivedAmount ? 0 : order.orderReceivedAmount) - order.payableAmount}"
+                                    pattern="#0.00"/>
+                        </font>
+                    </c:if>
+                </c:if>
+                <c:if test="${order.confirmType eq 3}">
+                    <c:if test="${order.receiptOrderFlag}">
+                        一款多单:多收退余额
+                    </c:if>
+                    <c:if test="${!order.receiptOrderFlag}">
+                        <font>多收退余额&nbsp;&nbsp;${order.associationType eq 2 ? "(自动)" : ""}:<br>
+                            ￥<fmt:formatNumber
+                                    value="${(empty order.returnBalanceAmount ? 0 : order.returnBalanceAmount)}"
+                                    pattern="#0.00"/>
+                        </font>
+                    </c:if>
+                </c:if>
+            </li>
+            <li>
+                <c:if test="${order.payStatus == 1}">
+                     <font color="red">待付款</font>
+                </c:if>
+                <c:if test="${order.payStatus == 2}">
+                     <font color="#ff8c00">部分付款</font>
+                </c:if>
+                <c:if test="${order.payStatus == 3}">
+                    <font color="green">已付款</font>
+                </c:if>
+            </li>
+            <li>
+                <c:if test="${order.sendOutStatus == 1}">
+                      <font color="red">待发货</font>
+                </c:if>
+                <c:if test="${order.sendOutStatus == 2}">
+                       <font color="#ff8c00">部分发货</font>
+                </c:if>
+                <c:if test="${order.sendOutStatus == 3}">
+                     <font color="green">已发货</font>
+                </c:if>
+            </li>
+            <li>
+                <c:if test="${order.refundType == 1}">
+                      <font>部分退款</font>
+                </c:if>
+                <c:if test="${order.refundType == 2}">
+                      <font>已退款</font>
+                </c:if>
+                <c:if test="${order.refundType ne 1 and order.refundType ne 2 }">
+                     <font>无退款</font>
+                </c:if>
+            </li>
+            <li>
+                <c:if test="${order.returnedPurchaseStatus == 1}">
+                    <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecordByOrderID.rpc?orderID=${order.orderID}">
+                        有
+                    </a>
+                </c:if>
+                <c:if test="${order.returnedPurchaseStatus == 0}">
+                    无
+                </c:if>
+            </li>
+            <li><fmt:formatNumber value="${order.payTotalFee}" type="currency"/></li>
+                <%-- 订单金额 --%>
+            <li>${order.orderTime}</li>
+            <li>
+                <c:if test="${empty order.confirmTime}">
+                    ---
+                </c:if>
+                <c:if test="${not empty order.confirmTime}">
+                    ${order.confirmTime}
+                </c:if>
+            </li>
+            <li class="operation-wrap">
+                <a href="${ctx}/order/detail?id=${order.orderID}">查看详情</a>
+            </li>
+        </ul>
+    </c:forEach>
+</div>
+
+<div class="pagination">${page}</div>
+</body>
+</html>

src/main/webapp/WEB-INF/views/modules/product-new/productEdit.jsp

@@ -523,32 +523,31 @@
                               maxWidth="100" maxHeight="100"/>
             </td>
         </tr>
-        <c:if test="${product.productType ==2}">
+<c:if test="${product.productType ==2}">
         <tr class="machineType">
             <th><span class="red">*</span>证书编号：</th>
             <td colspan="1">
                 <form:input path="qualificationNo" maxlength="50" class="input-small required"/>
             </td>
         </tr>
-        </c:if>
-        <c:if test="${product.productType ==2}">
+
         <tr class="machineType">
             <th><span class="red">*</span>产品名称：</th>
             <td colspan="2">
                 <form:input path="productName" maxlength="80" class="input-small required"/>
             </td>
         </tr>
-        </c:if>
-        <c:if test="${product.productType ==2}">
+
         <tr class="machineType">
             <th><span class="red">*</span>证书有效期：</th>
             <td colspan="3">
-                <form:input path="qualificationTime" type="text" maxlength="20" class="input-medium Wdate" value="${product.qualificationTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
-<%--    <fmt:formatDate value="${product.qualificationTime}" pattern="yyyy-MM-dd"/>--%>
+<%--                <form:input path="qualificationTime" type="text" maxlength="20" class="input-medium Wdate" value="${product.qualificationTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>--%>
+                <form:input path="qualificationTime" type="text" maxlength="10" class="input-medium Wdate"
+                            value="${startConfirmTime}"
+                            onclick="WdatePicker({dateFmt:'yyyy-MM-dd ',isShowClear:false});"/>
             </td>
         </tr>
-        </c:if>
-        <c:if test="${product.productType ==2}">
+
         <tr class="machineType">
             <th><span class="red">*</span>证书基本信息链接：</th>
             <td colspan="4">
@@ -556,6 +555,39 @@
                             class="input-small required"/>
             </td>
         </tr>
+</c:if>
+        <c:if test="${product.productType !=2}">
+            <tr class="machineType">
+                <th><span class="red">*</span>证书编号：</th>
+                <td colspan="1">
+                    <form:input path="qualificationNo" maxlength="50" class="input-small"/>
+                </td>
+            </tr>
+
+            <tr class="machineType">
+                <th><span class="red">*</span>产品名称：</th>
+                <td colspan="2">
+                    <form:input path="productName" maxlength="80" class="input-small"/>
+                </td>
+            </tr>
+
+            <tr class="machineType">
+                <th><span class="red">*</span>证书有效期：</th>
+                <td colspan="3">
+                        <%--                <form:input path="qualificationTime" type="text" maxlength="20" class="input-medium Wdate" value="${product.qualificationTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>--%>
+                    <form:input path="qualificationTime" type="text" maxlength="10" class="input-medium Wdate"
+                                value="${startConfirmTime}"
+                                onclick="WdatePicker({dateFmt:'yyyy-MM-dd ',isShowClear:false});"/>
+                </td>
+            </tr>
+
+            <tr class="machineType">
+                <th><span class="red">*</span>证书基本信息链接：</th>
+                <td colspan="4">
+                    <form:input path="qualificationLink" maxlength="100"
+                                class="input-small"/>
+                </td>
+            </tr>
         </c:if>
 
         <tr>
@@ -1777,7 +1809,7 @@
             //隐藏械字号
             $(".machineType").hide();
         } else if (val == 2) {
-            // 显示械字号
+           // 显示械字号
             $(".machineType").show();
         }
     }