Sākums Izpētīt Palīdzība
Reģistrēties Pierakstīties
ytf
/
krock
Vērot 1
Pievienot zvaigznīti 0
Atdalīts 0
Files Problēmas 0 Izmaiņu pieprasījumi 0 Vikivietne
Pārlūkot izejas kodu

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

ytf 3 gadi atpakaļ
vecāks
dc9200b7e0
revīzija
e9e85abc44
11 mainītis faili ar 80 papildinājumiem un 45 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. 1 1
      krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/pm/PayRecordController.java
  2. 3 3
      krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/pay_record/list.html
  3. 2 2
      krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/un_line_item/list.html
  4. 27 17
      krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/un_line_item/pm_info.html
  5. 8 8
      krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/un_line_user/choice.js
  6. 3 1
      krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxPmController.java
  7. 21 7
      krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/daoImpl/PmItemDaoImpl.java
  8. 1 1
      krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/daoImpl/WxPmDaoImpl.java
  9. 1 1
      krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/daoImpl/WxSubmitDaoImpl.java
  10. 12 4
      krock-pm/krock-web-pm/src/main/resources/static/pm/auctioSystemPC/index.html
  11. 1 0
      krock-pm/krock-web-pm/src/main/resources/static/pm/auctioSystemPC/js/index.js

+ 1 - 1
krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/pm/PayRecordController.java
Parādīt failu 

@@ -45,7 +45,7 @@ public class PayRecordController extends ProjBaseAction {
45 45 
 			String persion_id = map.get("user_id").toString();
46 46 
 			Persion persion = persionApi.get(persion_id);
47 47 
 			map.put("user_name", persion.getName());
48 
-			map.put("mobile", persion.getName());
48 
+			map.put("mobile", persion.getMobile());
49 49 
 		}
50 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
Parādīt failu 

@@ -196,8 +196,8 @@ Ext.onReady(function() {
196 196 
 				dataIndex : 'money',
197 197 
 				flex : 1
198 198 
 			},{
199 
-				text : '联系方式',
200 
-				tooltip : '联系方式',
199 
+				text : '用户联系电话',
200 
+				tooltip : '用户联系电话',
201 201 
 				align : 'center',
202 202 
 				dataIndex : 'mobile',
203 203 
 				flex : 1
 
@@ -218,7 +218,7 @@ Ext.onReady(function() {
218 218 
 			enableTextSelection:true
219 219 
 		}
220 220 
 	});
221 
-		initSearch();
221 
+		// initSearch();
222 222 
 		searchFormPanel.render(Ext.getBody());
223 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
Parādīt failu 

@@ -205,10 +205,10 @@
205 205 
                         },{
206 206 
                             xtype : 'button',
207 207 
                             tooltip : '出价记录入口',
208 
-                            icon : jcapp.getIcon("bullet_go.png"),
208 
+                            icon : jcapp.getIcon("user_magnify.png"),
209 209 
                             handler : function(grid, rowIndex, colIndex) {
210 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
Parādīt failu 

@@ -1,24 +1,20 @@
1 1 
 <!DOCTYPE html>
2 2 
 <html>
3 3 
 <head>
4 
-    <title>线下拍卖商品管理</title>
5 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 9 
     <script type="text/javascript" src="/web-cp-all/resource/js/app.js"></script>
10 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 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 16 
         var kid = getUrlParam('kid');
17 
+        var kid_name = getUrlParam('name');
22 18 
         Ext.onReady(function() {
23 19 
             //初始化列表数据
24 20 
             var dataStore = Ext.create('Ext.data.Store', {
 
@@ -57,6 +53,14 @@
57 53 
                 } ],
58 54 
                 store : dataStore,
59 55 
                 columns : [ {
56 
+                    text : '标的物名称',
57 
+                    align : 'center',
58 
+                    dataIndex : '标的物名称',
59 
+                    flex : 1,
60 
+                    renderer : function(){
61 
+                        return kid_name;
62 
+                    }
63 
+                },{
60 64 
                     text : '公司名称',
61 65 
                     align : 'center',
62 66 
                     dataIndex : 'company_name',
 
@@ -99,15 +103,21 @@
99 103 
                 }],
100 104 
                 viewConfig:{
101 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 116 
             }); //#listGridPanel
104 117
105 118 
             listGridPanel.render(Ext.getBody());
106 119 
         });
107 
-
108 120 
     </script>
109 
-    <script type="text/javascript" src="edit.js"></script>
110 
-    <script type="text/javascript" src="setitem.js"></script>
111 121 
 </head>
112 122 
 <body>
113 123 
 </body>

+ 8 - 8
krock-jcebid-cp/krock-web-cp-all/src/main/resources/static/view_cp_pm/pm/un_line_user/choice.js
Parādīt failu 

@@ -10,13 +10,13 @@ function choice(kid){
10 10 
 				allowBlank : false,
11 11 
 				readOnly : true,
12 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 22 
 				fieldLabel : "item_id",
 
@@ -50,7 +50,7 @@ function choice(kid){
50 50 
 								console.log(typeof(json.res));
51 51 
 								if(json.res == true){
52 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 54 
 										params : {
55 55 
 											item_id : item_id,
56 56 
 											kid : kid

+ 3 - 1
krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxPmController.java
Parādīt failu 

@@ -732,7 +732,9 @@ public class WxPmController extends ProjBaseAction {
732 732 
 		}
733 733 
 		t_pm_item pm_item = pmItemService.get(kid);
734 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 738 
 		pm_item.setBid_file_id(bid_file_id);
737 739 
 		String shop_id = pm_item.getShop_id();
738 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
Parādīt failu 

@@ -10,6 +10,7 @@ import java.util.LinkedList;
10 10 
 import java.util.List;
11 11 
 import java.util.Map;
12 12
13 
+import org.apache.commons.lang3.StringUtils;
13 14 
 import org.apache.http.client.ClientProtocolException;
14 15 
 import org.springframework.beans.factory.annotation.Autowired;
15 16 
 import org.springframework.jdbc.core.JdbcTemplate;
 
@@ -99,9 +100,9 @@ public class PmItemDaoImpl extends BaseDaoImpl<t_pm_item> implements PmItemDao {
99 100 
 		Page page = pagePackage.getPage();
100 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 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 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 106 
 		NeParamList params = NeParamList.makeParams();
106 107 
 		List<Map<String, Object>> list = bs.findList(sql, params, sort_param, page);
107 108 
 		pagePackage.setData(list);
 
@@ -767,22 +768,35 @@ public class PmItemDaoImpl extends BaseDaoImpl<t_pm_item> implements PmItemDao {
767 768 
 		Page page = pagePackage.getPage();
768 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 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 772 
 		NeParamList params = NeParamList.makeParams();
772 773 
 		String created1 = srh.getString("created1");
773 774 
 		String created2 = srh.getString("created2");
774 775 
 		long creat1 = 0;
775 776 
 		long creat2 = 0;
776 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 784 
 		} catch (ParseException e) {
780 785 
 			e.printStackTrace();
781 786 
 		}
782 787 
 		params.add(srh.getString("status_pay"));
783 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 800 
 		List<Map<String, Object>> list = bs.findList(sql, params, sort_param, page);
787 801 
 		pagePackage.setData(list);
788 802 
 		return pagePackage;

+ 1 - 1
krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/daoImpl/WxPmDaoImpl.java
Parādīt failu 

@@ -250,7 +250,7 @@ public class WxPmDaoImpl implements WxPmDao {
250 250 
 	public List<Map<String, Object>> pm_record_info(String kid) {
251 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 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 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 255 
 						"where t.pm_item_id = '"+kid+"' ORDER BY t.created desc  ";;
256 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
Parādīt failu 

@@ -248,7 +248,7 @@ public class WxSubmitDaoImpl extends BaseDaoImpl<t_pm_offline_apply> implements
248 248 
 	@Override
249 249 
 	public PagePackage list_submit_by_item_id_offline(@RequestBody PagePackage pagePackage, String pm_item_id) {
250 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 252 
 		Map<String, String> sort_param = pagePackage.getSort_param();
253 253 
 		Page page = pagePackage.getPage();
254 254 
 		NeParamList params = NeParamList.makeParams();

+ 12 - 4
krock-pm/krock-web-pm/src/main/resources/static/pm/auctioSystemPC/index.html
Parādīt failu 

@@ -12,7 +12,15 @@
12 12 
     <script src="./js/layuiadmin/layui/layui.all.js"></script>
13 13 
     <title>拍卖师操作系统</title>
14 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 24 
 <body ms-controller="auction">
17 25 
     <div class="title">
18 26 
         <div class="title-content">
 
@@ -34,19 +42,19 @@
34 42 
             </div>
35 43 
             <div class="state">
36 44 
                 <div class="goods-name">
37 
-                    <h2>{{@auctionData.item_name}}</h2>
45 
+                    <h1>{{@auctionData.item_name}}</h1>
38 46 
                 </div>
39 47 
                 <div class="goods-price">
40 48 
                     <span ms-if="@auctionData.bid_opening==='未开拍'">起拍价：</span>
41 49 
                     <span ms-if="@auctionData.bid_opening==='已开拍'">当前出价（人民币元）：</span>
42 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 52 
                     <strong ms-if="@auctionData.bid_opening==='已开拍'" >{{@auctionData.price_bidder === 0 ? '￥' + @toMoney(@auctionData.price_start) : '￥' + @toMoney(@auctionData.price_bidder)}}</strong>
45 53 
                     <strong ms-if="@auctionData.bid_opening==='已结束'" >{{@auctionData.is_abortive === '否' ? '￥' + @toMoney(@auctionData.price_bidder) : '流拍'}}</strong>
46 54 
                 </div>
47 55 
                 <div class="bidder-id">
48 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 58 
                 </div>
51 59 
                 <div class="time">
52 60 
                     <span>北京时间：</span>

+ 1 - 0
krock-pm/krock-web-pm/src/main/resources/static/pm/auctioSystemPC/js/index.js
Parādīt failu 

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