Browse Source

1.出价记录内容缺失
2.出价添加提交后修改
3.标的列表号牌选择

ytf 3 years ago
parent
commit
e9e85abc44

+ 1 - 1
krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/pm/PayRecordController.java

@@ -45,7 +45,7 @@ public class PayRecordController extends ProjBaseAction {
45
 			String persion_id = map.get("user_id").toString();
45
 			String persion_id = map.get("user_id").toString();
46
 			Persion persion = persionApi.get(persion_id);
46
 			Persion persion = persionApi.get(persion_id);
47
 			map.put("user_name", persion.getName());
47
 			map.put("user_name", persion.getName());
48
-			map.put("mobile", persion.getName());
48
+			map.put("mobile", persion.getMobile());
49
 		}
49
 		}
50
 		pagePackage.getPage().setList(list);
50
 		pagePackage.getPage().setList(list);
51
 
51
 

+ 3 - 3
krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/pay_record/list.html

@@ -196,8 +196,8 @@ Ext.onReady(function() {
196
 				dataIndex : 'money',
196
 				dataIndex : 'money',
197
 				flex : 1
197
 				flex : 1
198
 			},{
198
 			},{
199
-				text : '联系方式',
200
-				tooltip : '联系方式',
199
+				text : '用户联系电话',
200
+				tooltip : '用户联系电话',
201
 				align : 'center',
201
 				align : 'center',
202
 				dataIndex : 'mobile',
202
 				dataIndex : 'mobile',
203
 				flex : 1
203
 				flex : 1
@@ -218,7 +218,7 @@ Ext.onReady(function() {
218
 			enableTextSelection:true
218
 			enableTextSelection:true
219
 		}
219
 		}
220
 	}); 
220
 	}); 
221
-		initSearch();
221
+		// initSearch();
222
 		searchFormPanel.render(Ext.getBody());
222
 		searchFormPanel.render(Ext.getBody());
223
 		listGridPanel.render(Ext.getBody());
223
 		listGridPanel.render(Ext.getBody());
224
 });
224
 });

+ 2 - 2
krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/un_line_item/list.html

@@ -205,10 +205,10 @@
205
                         },{
205
                         },{
206
                             xtype : 'button',
206
                             xtype : 'button',
207
                             tooltip : '出价记录入口',
207
                             tooltip : '出价记录入口',
208
-                            icon : jcapp.getIcon("bullet_go.png"),
208
+                            icon : jcapp.getIcon("user_magnify.png"),
209
                             handler : function(grid, rowIndex, colIndex) {
209
                             handler : function(grid, rowIndex, colIndex) {
210
                                 var rec = grid.getStore().getAt(rowIndex);
210
                                 var rec = grid.getStore().getAt(rowIndex);
211
-                                window.open(getServer() +"/web-cp-all/view_cp_pm/pm/un_line_item/pm_info.html?kid="+rec.get('kid'));
211
+                                window.location.href = "pm_info.html?kid="+rec.get('kid')+"&name="+rec.get('item_name')+"&r="+new Date();
212
                             }
212
                             }
213
                         }
213
                         }
214
                     ]
214
                     ]

+ 27 - 17
krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/un_line_item/pm_info.html

@@ -1,24 +1,20 @@
1
 <!DOCTYPE html>
1
 <!DOCTYPE html>
2
 <html>
2
 <html>
3
 <head>
3
 <head>
4
-    <title>线下拍卖商品管理</title>
5
     <meta charset="UTF-8">
4
     <meta charset="UTF-8">
6
-    <link rel="stylesheet" href="https://yun.eqbidding.com/extjs/extjs6.0/classic/theme-crisp/resources/theme-crisp-all.css"></link>
7
-    <script src="https://yun.eqbidding.com/extjs/extjs6.0/ext-all.js"></script>
8
-    <script src="https://yun.eqbidding.com/extjs/extjs6.0/classic/locale/locale-zh_CN.js"></script>
5
+    <title>线下拍卖商品管理</title>
6
+    <link rel="stylesheet" href="http://res.eqbidding.com/extjs6.0/classic/theme-crisp/resources/theme-crisp-all.css"></link>
7
+    <script src="http://res.eqbidding.com/extjs6.0/ext-all.js"></script>
8
+    <script src="http://res.eqbidding.com/extjs6.0/classic/locale/locale-zh_CN.js"></script>
9
     <script type="text/javascript" src="/web-cp-all/resource/js/app.js"></script>
9
     <script type="text/javascript" src="/web-cp-all/resource/js/app.js"></script>
10
     <script type="text/javascript" src="/web-cp-all/resource/js/jquery.js"></script>
10
     <script type="text/javascript" src="/web-cp-all/resource/js/jquery.js"></script>
11
-
11
+    <script type="text/javascript" src="ueditor.js"></script>
12
+    <script type="text/javascript" charset="utf-8" src="/web-cp-all/ueditor/ueditor.config.js"></script>
13
+    <script type="text/javascript" src="http://res.eqbidding.com/ueditor/ueditor.all.min.js"></script>
14
+    <script type="text/javascript" src="http://res.eqbidding.com/ueditor/lang/zh-cn/zh-cn.js"></script>
12
     <script type="text/javascript">
15
     <script type="text/javascript">
13
-        function getUrlParam(name) {
14
-            var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); // 构造一个含有目标参数的正则表达式对象
15
-            var r = window.location.search.substr(1).match(reg); // 匹配目标参数
16
-            if (r != null) {
17
-                return decodeURIComponent(r[2]);
18
-            }
19
-            return null; //返回参数值
20
-        }
21
         var kid = getUrlParam('kid');
16
         var kid = getUrlParam('kid');
17
+        var kid_name = getUrlParam('name');
22
         Ext.onReady(function() {
18
         Ext.onReady(function() {
23
             //初始化列表数据
19
             //初始化列表数据
24
             var dataStore = Ext.create('Ext.data.Store', {
20
             var dataStore = Ext.create('Ext.data.Store', {
@@ -57,6 +53,14 @@
57
                 } ],
53
                 } ],
58
                 store : dataStore,
54
                 store : dataStore,
59
                 columns : [ {
55
                 columns : [ {
56
+                    text : '标的物名称',
57
+                    align : 'center',
58
+                    dataIndex : '标的物名称',
59
+                    flex : 1,
60
+                    renderer : function(){
61
+                        return kid_name;
62
+                    }
63
+                },{
60
                     text : '公司名称',
64
                     text : '公司名称',
61
                     align : 'center',
65
                     align : 'center',
62
                     dataIndex : 'company_name',
66
                     dataIndex : 'company_name',
@@ -99,15 +103,21 @@
99
                 }],
103
                 }],
100
                 viewConfig:{
104
                 viewConfig:{
101
                     enableTextSelection:true
105
                     enableTextSelection:true
102
-                }
106
+                },
107
+                buttons : [
108
+                    {
109
+                        text : "返回列表",
110
+                        formBind : false,
111
+                        handler : function() {
112
+                            window.history.go(-1);
113
+                        }
114
+                    }
115
+                ]
103
             }); //#listGridPanel
116
             }); //#listGridPanel
104
 
117
 
105
             listGridPanel.render(Ext.getBody());
118
             listGridPanel.render(Ext.getBody());
106
         });
119
         });
107
-
108
     </script>
120
     </script>
109
-    <script type="text/javascript" src="edit.js"></script>
110
-    <script type="text/javascript" src="setitem.js"></script>
111
 </head>
121
 </head>
112
 <body>
122
 <body>
113
 </body>
123
 </body>

+ 8 - 8
krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/un_line_user/choice.js

@@ -10,13 +10,13 @@ function choice(kid){
10
 				allowBlank : false,
10
 				allowBlank : false,
11
 				readOnly : true,
11
 				readOnly : true,
12
 				listeners : {
12
 				listeners : {
13
-			        render : function() {//渲染后添加click事件
14
-			          Ext.fly(this.el).on('click',
15
-			            function(e, t) {
16
-			             // do stuff
17
-			            	choice_item();
18
-			            });
19
-			        }
13
+					render : function() {//渲染后添加click事件
14
+						Ext.fly(this.el).on('click',
15
+						function(e, t) {
16
+						// do stuff
17
+							choice_item();
18
+						});
19
+					}
20
 				}
20
 				}
21
 			},{
21
 			},{
22
 				fieldLabel : "item_id",
22
 				fieldLabel : "item_id",
@@ -50,7 +50,7 @@ function choice(kid){
50
 								console.log(typeof(json.res));
50
 								console.log(typeof(json.res));
51
 								if(json.res == true){
51
 								if(json.res == true){
52
 									form.submit({
52
 									form.submit({
53
-										url : getServerHttp() +"/cp/pm/un_line_user/add_code.htm",
53
+										url : getServerHttp() +"/cp/pm/un_line_user/add_code",
54
 										params : {
54
 										params : {
55
 											item_id : item_id,
55
 											item_id : item_id,
56
 											kid : kid
56
 											kid : kid

+ 3 - 1
krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxPmController.java

@@ -732,7 +732,9 @@ public class WxPmController extends ProjBaseAction {
732
 		}
732
 		}
733
 		t_pm_item pm_item = pmItemService.get(kid);
733
 		t_pm_item pm_item = pmItemService.get(kid);
734
 		String bid_file_id = pm_item.getBid_file_id();
734
 		String bid_file_id = pm_item.getBid_file_id();
735
-		bid_file_id = bid_file_id.substring(0, bid_file_id.indexOf(","));
735
+		if ( bid_file_id.contains(",") ){
736
+			bid_file_id = bid_file_id.substring(0, bid_file_id.indexOf(","));
737
+		}
736
 		pm_item.setBid_file_id(bid_file_id);
738
 		pm_item.setBid_file_id(bid_file_id);
737
 		String shop_id = pm_item.getShop_id();
739
 		String shop_id = pm_item.getShop_id();
738
 		t_shop shop = shopService.get(shop_id);
740
 		t_shop shop = shopService.get(shop_id);

+ 21 - 7
krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/daoImpl/PmItemDaoImpl.java

@@ -10,6 +10,7 @@ import java.util.LinkedList;
10
 import java.util.List;
10
 import java.util.List;
11
 import java.util.Map;
11
 import java.util.Map;
12
 
12
 
13
+import org.apache.commons.lang3.StringUtils;
13
 import org.apache.http.client.ClientProtocolException;
14
 import org.apache.http.client.ClientProtocolException;
14
 import org.springframework.beans.factory.annotation.Autowired;
15
 import org.springframework.beans.factory.annotation.Autowired;
15
 import org.springframework.jdbc.core.JdbcTemplate;
16
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -99,9 +100,9 @@ public class PmItemDaoImpl extends BaseDaoImpl<t_pm_item> implements PmItemDao {
99
 		Page page = pagePackage.getPage();
100
 		Page page = pagePackage.getPage();
100
 		String sql ="select t1.company_name,t1.receive_name,t1.receive_mobile,t1.id_card,t2.kid pm_item_submit_id,t.created,t.price_bidder,t2.code  "+
101
 		String sql ="select t1.company_name,t1.receive_name,t1.receive_mobile,t1.id_card,t2.kid pm_item_submit_id,t.created,t.price_bidder,t2.code  "+
101
 				"from t_pm_item_submit_offer t  "+
102
 				"from t_pm_item_submit_offer t  "+
102
-				"left join t_pm_offline_apply t1 on t1.pm_item_id = t.pm_item_id and t1.pm_user_id = t.pm_user_id  "+
103
+				"left join t_pm_offline_apply t1 on (t1.pm_item_id = t.pm_item_id and t1.pm_user_id = t.pm_user_id) or t1.kid = t.pm_user_id   "+
103
 				"left join t_pm_item_submit t2 on t2.pm_item_id=t.pm_item_id and t2.pm_user_id = t.pm_user_id "+
104
 				"left join t_pm_item_submit t2 on t2.pm_item_id=t.pm_item_id and t2.pm_user_id = t.pm_user_id "+
104
-				"where t.pm_item_id = '"+srh.getString("pm_item_id")+"' ORDER BY t.created desc  ";;
105
+				"where t.pm_item_id = '"+srh.getString("pm_item_id")+"' ORDER BY t.created desc  ";
105
 		NeParamList params = NeParamList.makeParams();
106
 		NeParamList params = NeParamList.makeParams();
106
 		List<Map<String, Object>> list = bs.findList(sql, params, sort_param, page);
107
 		List<Map<String, Object>> list = bs.findList(sql, params, sort_param, page);
107
 		pagePackage.setData(list);
108
 		pagePackage.setData(list);
@@ -767,22 +768,35 @@ public class PmItemDaoImpl extends BaseDaoImpl<t_pm_item> implements PmItemDao {
767
 		Page page = pagePackage.getPage();
768
 		Page page = pagePackage.getPage();
768
 		String sql = "select t.kid,t.created,t.status_pay,t.business_type,t.money,t.user_id,t1.item_name from t_pay_no t "
769
 		String sql = "select t.kid,t.created,t.status_pay,t.business_type,t.money,t.user_id,t1.item_name from t_pay_no t "
769
 				+ " LEFT JOIN t_pm_item t1 on t.table_id=t1.kid "
770
 				+ " LEFT JOIN t_pm_item t1 on t.table_id=t1.kid "
770
-				+ " where t.status_pay=? and t.business_type=? and (t.created>=? and t.created<=?)";
771
+				+ " where t.status_pay=? and t.business_type=? ";
771
 		NeParamList params = NeParamList.makeParams();
772
 		NeParamList params = NeParamList.makeParams();
772
 		String created1 = srh.getString("created1");
773
 		String created1 = srh.getString("created1");
773
 		String created2 = srh.getString("created2");
774
 		String created2 = srh.getString("created2");
774
 		long creat1 = 0;
775
 		long creat1 = 0;
775
 		long creat2 = 0;
776
 		long creat2 = 0;
776
 		try {
777
 		try {
777
-			creat1 = DateTools.getstrDate3(created1);
778
-			creat2 = DateTools.getstrDate3(created2);
778
+			if (StringUtils.isNotBlank(created1)){
779
+				creat1 = DateTools.getstrDate3(created1);
780
+			}
781
+			if (StringUtils.isNotBlank(created2)){
782
+				creat2 = DateTools.getstrDate3(created2);
783
+			}
779
 		} catch (ParseException e) {
784
 		} catch (ParseException e) {
780
 			e.printStackTrace();
785
 			e.printStackTrace();
781
 		}
786
 		}
782
 		params.add(srh.getString("status_pay"));
787
 		params.add(srh.getString("status_pay"));
783
 		params.add(srh.getString("business_type"));
788
 		params.add(srh.getString("business_type"));
784
-		params.add(creat1);
785
-		params.add(creat2);
789
+		if (creat1>0 && creat2>0){
790
+			sql+=" and (t.created>=? and t.created<=?) ";
791
+			params.add(creat1);
792
+			params.add(creat2);
793
+		}else if (creat1>0){
794
+			sql+=" and t.created>=? ";
795
+			params.add(creat1);
796
+		}else if (creat2>0){
797
+			sql+=" and  t.created<=? ";
798
+			params.add(creat2);
799
+		}
786
 		List<Map<String, Object>> list = bs.findList(sql, params, sort_param, page);
800
 		List<Map<String, Object>> list = bs.findList(sql, params, sort_param, page);
787
 		pagePackage.setData(list);
801
 		pagePackage.setData(list);
788
 		return pagePackage;
802
 		return pagePackage;

+ 1 - 1
krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/daoImpl/WxPmDaoImpl.java

@@ -250,7 +250,7 @@ public class WxPmDaoImpl implements WxPmDao {
250
 	public List<Map<String, Object>> pm_record_info(String kid) {
250
 	public List<Map<String, Object>> pm_record_info(String kid) {
251
 		String sql ="select t1.company_name,t1.receive_name,t1.receive_mobile,t1.id_card,t2.kid pm_item_submit_id,t2.code,t.created,t.price_bidder  "+
251
 		String sql ="select t1.company_name,t1.receive_name,t1.receive_mobile,t1.id_card,t2.kid pm_item_submit_id,t2.code,t.created,t.price_bidder  "+
252
 						"from t_pm_item_submit_offer t  "+
252
 						"from t_pm_item_submit_offer t  "+
253
-						"left join t_pm_offline_apply t1 on t1.pm_item_id = t.pm_item_id and t1.pm_user_id = t.pm_user_id  "+
253
+						"left join t_pm_offline_apply t1 on (t1.pm_item_id = t.pm_item_id and t1.pm_user_id = t.pm_user_id) or t1.kid = t.pm_user_id   "+
254
 						"left join t_pm_item_submit t2 on t2.pm_item_id=t.pm_item_id and t2.pm_user_id = t.pm_user_id "+
254
 						"left join t_pm_item_submit t2 on t2.pm_item_id=t.pm_item_id and t2.pm_user_id = t.pm_user_id "+
255
 						"where t.pm_item_id = '"+kid+"' ORDER BY t.created desc  ";;
255
 						"where t.pm_item_id = '"+kid+"' ORDER BY t.created desc  ";;
256
 		List<Map<String, Object>> list = bs.findList(sql);
256
 		List<Map<String, Object>> list = bs.findList(sql);

+ 1 - 1
krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/daoImpl/WxSubmitDaoImpl.java

@@ -248,7 +248,7 @@ public class WxSubmitDaoImpl extends BaseDaoImpl<t_pm_offline_apply> implements
248
 	@Override
248
 	@Override
249
 	public PagePackage list_submit_by_item_id_offline(@RequestBody PagePackage pagePackage, String pm_item_id) {
249
 	public PagePackage list_submit_by_item_id_offline(@RequestBody PagePackage pagePackage, String pm_item_id) {
250
 		String sql = " select t.*,t1.kid user_id,t1.receive_name,t1.receive_mobile,t1.id_card,t1.company_name from t_pm_item_submit t left join t_pm_offline_apply t1 on t.offline_apply_id=t1.kid and t1.status=0 "
250
 		String sql = " select t.*,t1.kid user_id,t1.receive_name,t1.receive_mobile,t1.id_card,t1.company_name from t_pm_item_submit t left join t_pm_offline_apply t1 on t.offline_apply_id=t1.kid and t1.status=0 "
251
-				+ " where (t.pm_item_id=?)  and t.offline_apply_id is not null and t.status=0 ";
251
+				+ " where (t.pm_item_id=?)  and t.offline_apply_id is not null and t.status=0 and t1.pm_item_id is null ";
252
 		Map<String, String> sort_param = pagePackage.getSort_param();
252
 		Map<String, String> sort_param = pagePackage.getSort_param();
253
 		Page page = pagePackage.getPage();
253
 		Page page = pagePackage.getPage();
254
 		NeParamList params = NeParamList.makeParams();
254
 		NeParamList params = NeParamList.makeParams();

+ 12 - 4
krock-pm/krock-web-pm/src/main/resources/static/pm/auctioSystemPC/index.html

@@ -12,7 +12,15 @@
12
     <script src="./js/layuiadmin/layui/layui.all.js"></script>
12
     <script src="./js/layuiadmin/layui/layui.all.js"></script>
13
     <title>拍卖师操作系统</title>
13
     <title>拍卖师操作系统</title>
14
 </head>
14
 </head>
15
-
15
+<style>
16
+    h1 {
17
+        font-size: 60px;
18
+    }
19
+    .goods-price strong {
20
+        font-size: 80px;
21
+        color    : #FF3333;
22
+    }
23
+</style>
16
 <body ms-controller="auction">
24
 <body ms-controller="auction">
17
     <div class="title">
25
     <div class="title">
18
         <div class="title-content">
26
         <div class="title-content">
@@ -34,19 +42,19 @@
34
             </div>
42
             </div>
35
             <div class="state">
43
             <div class="state">
36
                 <div class="goods-name">
44
                 <div class="goods-name">
37
-                    <h2>{{@auctionData.item_name}}</h2>
45
+                    <h1>{{@auctionData.item_name}}</h1>
38
                 </div>
46
                 </div>
39
                 <div class="goods-price">
47
                 <div class="goods-price">
40
                     <span ms-if="@auctionData.bid_opening==='未开拍'">起拍价:</span>
48
                     <span ms-if="@auctionData.bid_opening==='未开拍'">起拍价:</span>
41
                     <span ms-if="@auctionData.bid_opening==='已开拍'">当前出价(人民币元):</span>
49
                     <span ms-if="@auctionData.bid_opening==='已开拍'">当前出价(人民币元):</span>
42
                     <span ms-if="@auctionData.bid_opening==='已结束'">成交价:</span>
50
                     <span ms-if="@auctionData.bid_opening==='已结束'">成交价:</span>
43
-                    <strong ms-if="@auctionData.bid_opening==='未开拍'">保密</strong>
51
+                    <strong ms-if="@auctionData.bid_opening==='未开拍'" >保密</strong>
44
                     <strong ms-if="@auctionData.bid_opening==='已开拍'" >{{@auctionData.price_bidder === 0 ? '¥' + @toMoney(@auctionData.price_start) : '¥' + @toMoney(@auctionData.price_bidder)}}</strong>
52
                     <strong ms-if="@auctionData.bid_opening==='已开拍'" >{{@auctionData.price_bidder === 0 ? '¥' + @toMoney(@auctionData.price_start) : '¥' + @toMoney(@auctionData.price_bidder)}}</strong>
45
                     <strong ms-if="@auctionData.bid_opening==='已结束'" >{{@auctionData.is_abortive === '否' ? '¥' + @toMoney(@auctionData.price_bidder) : '流拍'}}</strong>
53
                     <strong ms-if="@auctionData.bid_opening==='已结束'" >{{@auctionData.is_abortive === '否' ? '¥' + @toMoney(@auctionData.price_bidder) : '流拍'}}</strong>
46
                 </div>
54
                 </div>
47
                 <div class="bidder-id">
55
                 <div class="bidder-id">
48
                     <span>出价人号牌:</span>
56
                     <span>出价人号牌:</span>
49
-                    <strong>{{ @record.length > 0 ? @record[0].code : '暂无出价'}}</strong>
57
+                    <strong style="font-size:80px">{{ @record.length > 0 ? @record[0].code : '暂无出价'}}</strong>
50
                 </div>
58
                 </div>
51
                 <div class="time">
59
                 <div class="time">
52
                     <span>北京时间:</span>
60
                     <span>北京时间:</span>

+ 1 - 0
krock-pm/krock-web-pm/src/main/resources/static/pm/auctioSystemPC/js/index.js

@@ -61,6 +61,7 @@ $(function () {
61
             vm.auctionData = data.data[0];
61
             vm.auctionData = data.data[0];
62
             vm.nowtime = data.nowtime;
62
             vm.nowtime = data.nowtime;
63
             vm.record = data.record;
63
             vm.record = data.record;
64
+            console.log(vm)
64
             setTable(); //刷新表格
65
             setTable(); //刷新表格
65
             setInterval(function () {
66
             setInterval(function () {
66
                 checkDateTime(); // 北京时间
67
                 checkDateTime(); // 北京时间