代码更新

src/main/java/com/agent/action/audit/AuditDetailController.java

@@ -150,6 +150,11 @@ public class AuditDetailController extends AbstractController{
     @Value("${wjj.api.domain}")
 	private String apiDomain;
 
+    //精品机配置
+	@Value("${jpjgh}")
+	private String jpjgh;
+
+
 
 	/**
 	 * 载入置换审核详情
@@ -1476,6 +1481,11 @@ public class AuditDetailController extends AbstractController{
             // app端只有代理商登陆，直接从session中获取agentId
 //            String agentId = user.getAgentId();
 			final String agentId = request.getParameter("agentId");
+			if(jpjgh.equals(agentId)){
+				displaceAuditBean.setIs_good("2");
+			}else{
+				displaceAuditBean.setIs_good("1");
+			}
 			AgentBean agentBean = agentBeanService.getAgentBeanByAgentId(agentId);
         	if(agentBean == null) {
         		resultBean = new PageResultBean(PageResultBean.FAIL_CODE, "未查询到代理商信息！");

src/main/resources/config.properties

@@ -82,7 +82,8 @@ menu.is_admin_user=1010
 #�̼�
 menu.is_agent_user=1011
 
-
+#精品机工号
+jpjgh=ZHXTCS
 
 wgcId=WGC000
 
@@ -92,3 +93,6 @@ agent.menu.except=1008
 agent.column.except=6001,6002,6003,6004,6005
 
 wjj.api.domain=https://www.weigongcheng.net/wjj-api/
+
+
+

src/main/webapp/WEB-INF/views/audit/adminAuditList.jsp

@@ -137,21 +137,24 @@
                     <input class="inputnone" type="hidden" name="id" id="id" value=""/>
                     <div class="tc3_search1" style="margin-left:10px;">
                         <%--上架形式--%>
-                        <span style="width:120px;">上架形式1：</span>
-                        <div id="agent_rule_type">
+                        <span style="width:120px;">上架形式：</span>
+                        <%--<input type="text" name="upType" id="upType" value="<c:if test="${auditBean.upType==1}"> 置换报价 </c:if> <c:if test="${auditBean.upType==2}"> 网络竞销</c:if>" />--%>
 
-                        </div>
+                        <input style="margin:-2px 4px 1px 0;vertical-align:middle;width:20px;" type="radio" id="upType1"
+                               name="upType" checked="checked" value='1'/>置换报价
+                        <input style="margin:-2px 4px 1px 0;vertical-align:middle;width:20px;" type="radio" id="upType2"
+                               name="upType" value='2'/>网络竞销
                         <span style="width:120px;">单台保证金（万元）：</span><input type="text" name="bail" id="bail"
                                                                            maxlength="8" value=""/>
                     </div>
-                    <div class="tc3_search1" style="margin-left:10px;" id="hide1">
-                        <span style="width:120px;letter-spacing:3px;">最低价（万元）：</span><input type="text" name="minPrice" id="minPrice" maxlength="8" value="${auditBean.minPrice}" style="width: 40px;" />
-                        <span style="width:120px;letter-spacing:3px;">最高价（万元）：</span><input type="text" name="maxPrice" id="maxPrice" maxlength="8" value="${auditBean.maxPrice}" style="width: 40px;"/>
-                        <span style="width:120px;letter-spacing:3px;">保留价（万元）：</span><input type="text" name="persistPrice" id="persistPrice" maxlength="8" value="${auditBean.persistPrice}" style="width: 40px;"/>
-                    </div>
-                    <div class="tc3_search1" style="margin-left:10px;" id="hide2">
-                        <span style="width:120px;letter-spacing:3px;">起拍价（万元）：</span><input type="text" name="minMoney" id="minMoney" value="${auditBean.minMoney}" />
-                        <span style="width:120px;letter-spacing:3px;">报价幅度（万元）：</span><input type="text" name="moneyRange" id="moneyRange" value="${auditBean.moneyRange}" />
+                    <div class="tc3_search1" style="margin-left:10px;">
+                        <span style="width:120px;letter-spacing:3px;">起拍价（万元）：</span><input type="text" name="minMoney"
+                                                                                            id="minMoney" maxlength="8"
+                                                                                            value=""/>
+                        <span style="width:120px;letter-spacing:3px;">报价幅度（万元）：</span><input type="text"
+                                                                                             name="moneyRange"
+                                                                                             id="moneyRange"
+                                                                                             maxlength="8" value=""/>
                     </div>
                     <div class="tc3_search1" style="margin-left:10px;">
                         <span style="width:120px;letter-spacing:3px;">开始时间：</span><input readonly="readonly"
@@ -196,16 +199,6 @@
                                 </ul>
                             </div>
                         </div>
-
-                        <div class="tc3_search1" style="margin-left:10px;">
-                            <span style="width:120px;letter-spacing:5px;">是否精品机：</span>
-                            <input style="margin:-2px 4px 1px 0;vertical-align:middle;width:20px;" type="radio" id="is_good"
-                                   name="is_good"  value='2'/>是
-                            <input style="margin:-2px 4px 1px 0;vertical-align:middle;width:20px;" type="radio" id="not_good"
-                                   name="is_good" checked="checked" value='1'/>否
-                        </div>
-
-
                         <div class="tc3_search1" style="margin-left:10px;">
                             <span style="width:120px;letter-spacing:1px;margin-bottom:10px;">车商推送模板：</span>
                             <textarea name="sms" id="sms" maxlength="100" style="width:400px;height:80px;"></textarea>

src/main/webapp/WEB-INF/views/audit/platAuditList.jsp

@@ -144,23 +144,14 @@
                         <span style="width:120px;">单台保证金（万元）：</span><input type="text" name="bail" id="bail"
                                                                            maxlength="8" value=""/>
                     </div>
-                    <%--<div class="tc3_search1" style="margin-left:10px;">--%>
-                        <%--<span style="width:120px;letter-spacing:3px;">起拍价（万元）：</span><input type="text" name="minMoney"--%>
-                                                                                            <%--id="minMoney" maxlength="8"--%>
-                                                                                            <%--value=""/>--%>
-                        <%--<span style="width:120px;letter-spacing:3px;">报价幅度（万元）：</span><input type="text"--%>
-                                                                                             <%--name="moneyRange"--%>
-                                                                                             <%--id="moneyRange"--%>
-                                                                                             <%--maxlength="8" value=""/>--%>
-                    <%--</div>--%>
-                    <div class="tc3_search1" style="margin-left:10px;" id="hide1">
-                        <span style="width:120px;letter-spacing:3px;">最低价（万元）：</span><input type="text" name="minPrice" id="minPrice" maxlength="8" value="${auditBean.minPrice}" style="width: 40px;" />
-                        <span style="width:120px;letter-spacing:3px;">最高价（万元）：</span><input type="text" name="maxPrice" id="maxPrice" maxlength="8" value="${auditBean.maxPrice}" style="width: 40px;"/>
-                        <span style="width:120px;letter-spacing:3px;">保留价（万元）：</span><input type="text" name="persistPrice" id="persistPrice" maxlength="8" value="${auditBean.persistPrice}" style="width: 40px;"/>
-                    </div>
-                    <div class="tc3_search1" style="margin-left:10px;" id="hide2">
-                        <span style="width:120px;letter-spacing:3px;">起拍价（万元）：</span><input type="text" name="minMoney" id="minMoney" value="${auditBean.minMoney}" />
-                        <span style="width:120px;letter-spacing:3px;">报价幅度（万元）：</span><input type="text" name="moneyRange" id="moneyRange" value="${auditBean.moneyRange}" />
+                    <div class="tc3_search1" style="margin-left:10px;">
+                        <span style="width:120px;letter-spacing:3px;">起拍价（万元）：</span><input type="text" name="minMoney"
+                                                                                            id="minMoney" maxlength="8"
+                                                                                            value=""/>
+                        <span style="width:120px;letter-spacing:3px;">报价幅度（万元）：</span><input type="text"
+                                                                                             name="moneyRange"
+                                                                                             id="moneyRange"
+                                                                                             maxlength="8" value=""/>
                     </div>
                     <div class="tc3_search1" style="margin-left:10px;">
                         <span style="width:120px;letter-spacing:3px;">开始时间：</span><input readonly="readonly"
@@ -207,13 +198,6 @@
                         </div>
                     </div>
                     <div class="tc3_search1" style="margin-left:10px;">
-                        <span style="width:120px;letter-spacing:5px;">是否精品机：</span>
-                        <input style="margin:-2px 4px 1px 0;vertical-align:middle;width:20px;" type="radio" id="is_good"
-                               name="is_good"  value='2'/>是
-                        <input style="margin:-2px 4px 1px 0;vertical-align:middle;width:20px;" type="radio" id="not_good"
-                               name="is_good" checked="checked" value='1'/>否
-                    </div>
-                    <div class="tc3_search1" style="margin-left:10px;">
                         <span style="width:120px;letter-spacing:1px;margin-bottom:10px;">车商推送模板：</span>
                         <textarea name="sms" id="sms" maxlength="100" style="width:400px;height:80px;"></textarea>
                         <div style="float:right;width:180px;margin-top:30px;">

src/main/webapp/WEB-INF/views/audit/superAdminAuditList.jsp

@@ -147,18 +147,16 @@
 					<div class="tc3_search1" style="margin-left:10px;">
 						<%--上架形式--%>
 						<span style="width:120px;">上架形式：</span>
-						<div id="agent_rule_type">
-						</div>
+						<%--<input type="text" name="upType" id="upType" value="<c:if test="${auditBean.upType==1}"> 置换报价 </c:if> <c:if test="${auditBean.upType==2}"> 网络竞销</c:if>" />--%>
+
+						<input style="margin:-2px 4px 1px 0;vertical-align:middle;width:20px;" type="radio" id="upType1" name="upType" checked="checked" value='1'  />置换报价
+						<input style="margin:-2px 4px 1px 0;vertical-align:middle;width:20px;" type="radio" id="upType2" name="upType" value='2'  />网络竞销
+
 						<span style="width:120px;">单台保证金（万元）：</span><input  type="text" name="bail" id="bail" maxlength="8" value="" />
 					</div>
-					<div class="tc3_search1" style="margin-left:10px;" id="hide1">
-						<span style="width:120px;letter-spacing:3px;">最低价（万元）：</span><input type="text" name="minPrice" id="minPrice" maxlength="8" value="${auditBean.minPrice}" style="width: 40px;" />
-						<span style="width:120px;letter-spacing:3px;">最高价（万元）：</span><input type="text" name="maxPrice" id="maxPrice" maxlength="8" value="${auditBean.maxPrice}" style="width: 40px;"/>
-						<span style="width:120px;letter-spacing:3px;">保留价（万元）：</span><input type="text" name="persistPrice" id="persistPrice" maxlength="8" value="${auditBean.persistPrice}" style="width: 40px;"/>
-					</div>
-					<div class="tc3_search1" style="margin-left:10px;" id="hide2">
-						<span style="width:120px;letter-spacing:3px;">起拍价（万元）：</span><input type="text" name="minMoney" id="minMoney" value="${auditBean.minMoney}" />
-						<span style="width:120px;letter-spacing:3px;">报价幅度（万元）：</span><input type="text" name="moneyRange" id="moneyRange" value="${auditBean.moneyRange}" />
+					<div class="tc3_search1" style="margin-left:10px;">
+						<span style="width:120px;letter-spacing:3px;">起拍价（万元）：</span><input type="text" name="minMoney" id="minMoney" maxlength="8" value="" />
+						<span style="width:120px;letter-spacing:3px;">报价幅度（万元）：</span><input type="text" name="moneyRange" id="moneyRange" maxlength="8" value="" />
 					</div>
 					<div class="tc3_search1" style="margin-left:10px;">
 						<span style="width:120px;letter-spacing:3px;">开始时间：</span><input readonly="readonly" autocomplete="off" name="startTimeStr" type="datetime" value="" class="laydate-icon dxinput4" id="query_startTime"
@@ -187,13 +185,6 @@
 					</div>
 					</div>
 					<div class="tc3_search1" style="margin-left:10px;">
-						<span style="width:120px;letter-spacing:5px;">是否精品机：</span>
-						<input style="margin:-2px 4px 1px 0;vertical-align:middle;width:20px;" type="radio" id="is_good"
-							   name="is_good"  value='2'/>是
-						<input style="margin:-2px 4px 1px 0;vertical-align:middle;width:20px;" type="radio" id="not_good"
-							   name="is_good" checked="checked" value='1'/>否
-					</div>
-					<div class="tc3_search1" style="margin-left:10px;">
 						<span style="width:120px;letter-spacing:1px;margin-bottom:10px;">车商推送模板：</span>
 						<textarea name="sms" id="sms" maxlength="100" style="width:400px;height:80px;"></textarea>
 						<div style="float:right;width:180px;margin-top:30px;">