cp代码补漏

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

@@ -50,4 +50,11 @@ public class UnLineController extends ProjBaseAction {
 	public void pass(String kid) {
 		submitApi.verify_apply(kid);
 	}
+
+
+	@RequestMapping({"/reject"})
+	public void reject(String kid) {
+		this.submitApi.reject(kid);
+	}
+
 }

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

@@ -42,7 +42,8 @@
                 fields: ['abbr', 'name'],
                 data : [
                     {"abbr":"1", "name":"已支付"},
-                    {"abbr":"0", "name":"未支付"}
+                    {"abbr":"0", "name":"未支付"},
+                    {"abbr":"2", "name":"已驳回"}
                 ]
             }); //#comboxStore
 
@@ -171,6 +172,19 @@
                         dataIndex : 'item_name',
                         flex : 1
                     },{
+                        text : '支付凭证',
+                        topTip : '支付凭证',
+                        align : 'center',
+                        dataIndex : 'file_id',
+                        flex : 1,
+                        renderer : function(val){
+                            if(val == undefined || val == ''){
+                                return '没有相关图片信息!';
+                            }else{
+                                return '<img style="width:100%;height:100%;"  onclick="enlarge(\''+val+'\')" src="https://www.eqbidding.com/web-cp-all/img_pm/img/'+val+'" />';
+                            }
+                        }
+                    },{
                         text : '支付状态',
                         topTip : '支付状态',
                         align : 'center',
@@ -179,8 +193,10 @@
                         renderer : function(val){
                             if(val=='1'){
                                 return "已支付";
-                            }else if(val = '0'){
+                            }else if(val == '0'){
                                 return "未支付";
+                            }else if(val == '2'){
+                                return "已驳回";
                             }
                         }
                     },{
@@ -202,6 +218,24 @@
                                 handler : function(grid, rowIndex, colIndex) {
                                     var rec = grid.getStore().getAt(rowIndex);
                                     myPass(rec.get('kid'));
+                                    /*if(rec.get('is_pay') == '2'){
+                                        Ext.Msg.alert("提示", "已驳回不能确认支付!");
+                                    }else{
+                                        myPass(rec.get('kid'));
+                                    }*/
+
+                                }
+                            },{
+                                xtype : 'button',
+                                tooltip : '驳回',
+                                icon : jcapp.getIcon("user_cross.png"),
+                                handler : function(grid, rowIndex, colIndex) {
+                                    var rec = grid.getStore().getAt(rowIndex);
+                                    if(rec.get('is_pay') == '1'){
+                                        Ext.Msg.alert("提示", "已支付不能驳回!");
+                                    }else{
+                                        myReject(rec.get('kid'));
+                                    }
                                 }
                             }
                         ]
@@ -232,7 +266,58 @@
                 }
             });
         }
-
+        function myReject(kid){
+            Ext.Msg.confirm("提示:", "是否确认驳回?", function(e) {
+                if (e == "yes") {
+                    Ext.Ajax.request({
+                        url : "/web-cp-all/cp/pm/un_line/reject?kid=" + kid ,
+                        success : function(response) {
+                            Ext.Msg.alert("操作","确认成功");
+                            dataStore.load();
+                        },
+                        failure : function(response) {
+                            Ext.Msg.alert("提示", "操作失败!");
+                        }
+                    });
+                }
+            });
+        }
+        function enlarge(file_id){
+            var html = '<div style="width:100%;height:100%;"><img id="videoSource" style="width:100%;height:100%;"  src="https://www.eqbidding.com/web-cp-all/img_pm/img/'+file_id+'" /><div>';
+            songPlayer.show();
+            Ext.getCmp("playerPanel").body.update(html);
+        }
+        var playerForm=new Ext.Panel({
+            xtype : 'panel',
+            id : 'playerPanel',
+            width:600,
+            height:600,
+            html:""
+        })
+        var songPlayer = new Ext.Window({
+            layout : 'fit',
+            width:600,
+            height:600,
+            modal : true,
+            frame: true,
+            closable : false,
+            items : [playerForm]  ,
+            buttons: [{
+                id : 'ensure2',
+                text: '确定',
+                handler: function() {
+                    songPlayer.hide();
+                    Ext.getCmp("playerPanel").body.update("");
+                }
+            },{
+                text: '关闭',
+                handler: function() {
+                    Ext.getCmp('playerPanel').html ="";
+                    Ext.getCmp("playerPanel").body.update("");
+                    songPlayer.hide();
+                }
+            }]
+        });
     </script>
 </head>
 <body>

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

@@ -1,225 +1,225 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>线下拍卖商品管理</title>
-<meta charset="UTF-8">
-<link rel="stylesheet" href="https://yun.eqbidding.com/extjs/extjs6.0/classic/theme-crisp/resources/theme-crisp-all.css"></link>
-<script src="https://yun.eqbidding.com/extjs/extjs6.0/ext-all.js"></script>
-<script src="https://yun.eqbidding.com/extjs/extjs6.0/classic/locale/locale-zh_CN.js"></script>
-<script type="text/javascript" src="/web-cp-all/resource/js/app.js"></script>
-<script type="text/javascript" src="/web-cp-all/resource/js/jquery.js"></script>
+    <title>线下拍卖商品管理</title>
+    <meta charset="UTF-8">
+    <link rel="stylesheet" href="https://yun.eqbidding.com/extjs/extjs6.0/classic/theme-crisp/resources/theme-crisp-all.css"></link>
+    <script src="https://yun.eqbidding.com/extjs/extjs6.0/ext-all.js"></script>
+    <script src="https://yun.eqbidding.com/extjs/extjs6.0/classic/locale/locale-zh_CN.js"></script>
+    <script type="text/javascript" src="/web-cp-all/resource/js/app.js"></script>
+    <script type="text/javascript" src="/web-cp-all/resource/js/jquery.js"></script>
 
-<script type="text/javascript">
-Ext.onReady(function() {
-	//初始化列表数据
-	var dataStore = Ext.create('Ext.data.Store', {
-		remoteSort : true,
-		autoLoad : true,
-		pageSize : 20,
-		sorters : {
-			property : 'created',
-			direction : 'DESC'
-		},
-		proxy : {
-			type : "ajax",
-			url : "/web-cp-all/cp/pm/item_unLine/list_data",
-			reader : {
-				type : 'json',
-				root : 'page.list',
-				totalProperty : 'page.totalRow'
-			}
-		},
-		listeners : {
-			'beforeload' : function(store, op, options) {
-				var params = searchFormPanel.getForm().getValues();
-				Ext.apply(dataStore.proxy.extraParams, params);
-			}
-		}
-	}); //#dataStore 
-	
-	var comboxStore = Ext.create('Ext.data.Store', {
-		fields: ['abbr', 'name'],
-		data : [ 
-		{"abbr":"已开拍", "name":"已开拍"},
-		{"abbr":"未开拍", "name":"未开拍"},
-		{"abbr":"已中止", "name":"已中止"},
-		{"abbr":"已结束", "name":"已结束"}
-		]
-	});
-	
-	var searchFormPanel = Ext.create('Ext.form.Panel', {
-		frame : true,
-		title : "搜索条件",
-		style : {
-			marginBottom : '5px'
-		},
-		bodyStyle : {
-			padding : '10px'
-		},
-		buttonAlign : "center",
-		collapsible : true,
-		defaultType : "textfield",
-		items : [ 
-			{
-				xtype : "container",
-				layout : "hbox",
-				items : [ 
-					{
-						xtype : "textfield",
-						fieldLabel : "开拍标的物名称",
-						name : "srh.item_name",
-                        labelAlign : 'right'
-					},{
-						fieldLabel : "分类",
-						name : "srh.bid_opening",
-						xtype : "combo",
-						editable : false,
-						store : comboxStore, 
-						displayField : 'name',
-						valueField : 'abbr',
-                        labelAlign : 'right'
-						//value ： "未开拍"
-					},{
-                        xtype : "textfield",
-                        fieldLabel : "公司名称",
-                        name : "srh.name",
-                        labelAlign : 'right'
+    <script type="text/javascript">
+        Ext.onReady(function() {
+            //初始化列表数据
+            var dataStore = Ext.create('Ext.data.Store', {
+                remoteSort : true,
+                autoLoad : true,
+                pageSize : 20,
+                sorters : {
+                    property : 'created',
+                    direction : 'DESC'
+                },
+                proxy : {
+                    type : "ajax",
+                    url : "/web-cp-all/cp/pm/item_unLine/list_data",
+                    reader : {
+                        type : 'json',
+                        root : 'page.list',
+                        totalProperty : 'page.totalRow'
                     }
-				]
-			} 
-		],
-		buttons : [ {
-			text : "搜索",
-			icon : jcapp.getIcon("magnifier.png"),
-			handler : function() {
-				dataStore.load({
-				//params:params()
-				});
-				dataStore.sync();
-			}
-		}, {
-			text : "重置",
-			icon : jcapp.getIcon("arrow_refresh.png"),
-			handler : function() {
-				this.up('form').getForm().reset();
-				dataStore.load({});
-				dataStore.sync();
-			}
-		} ]
-	}); //#searchFormPanel
-	
-	var listGridPanel = Ext.create('Ext.grid.Panel', {
-		title : '线下拍卖商品管理列表',
-		dockedItems : [ {
-			xtype : 'pagingtoolbar',
-			store : dataStore, 
-			dock : 'bottom',
-			displayInfo : true
-		} ],
-		store : dataStore,
-		columns : [ {
-			text : 'kid',
-			name : 'kid',
-			hidden : true
-		},{
-            text : '公司名称',
-            align : 'center',
-            dataIndex : 'name',
-            flex : 1
-        },{
-			text : '标的物名称',
-			align : 'center',
-			dataIndex : 'item_name',
-			flex : 2
-		},{
-			text : '是否开拍',
-			align : 'center',
-			dataIndex : 'bid_opening',
-			flex : 1
-		},{
-			text : '开拍时间',
-			align : 'center',
-			dataIndex : 'time_opening',
-			flex : 1,
-			renderer : function(val){
-				if(val != ''){
-					return Ext.Date.format(new Date(val), "Y-m-d H:i:s");
-				}
-			}
-		},{
-			text : '结束时间',
-			dataIndex : 'time_end',
-			flex : 1,
-			renderer : function(val){
-				if(val != ''){
-					return Ext.Date.format(new Date(val), "Y-m-d H:i:s");
-				}
-			}
-		},{
-			xtype : "actioncolumn",
-			align : "center",
-			text : '操作',
-			flex : 1,
-			items : [ 
-				{
-					xtype : 'button',
-					tooltip : '设置明细',
-					icon : jcapp.getIcon("bullet_key.png"),
-					handler : function(grid, rowIndex, colIndex) {
-						var rec = grid.getStore().getAt(rowIndex);
-						if(rec.get('bid_opening')=='已中止'){
-							return ;
-						}
-						if(rec.get('bid_opening')=='已结束'){
-							return ;
-						}
-						set_item(rec.get('kid'));
-					}
-				},{
-					xtype : ""
-				},
-				{
-					xtype : 'button',
-					tooltip : '设置价格',
-					icon : jcapp.getIcon("bullet_key.png"),
-					handler : function(grid, rowIndex, colIndex) {
-						var rec = grid.getStore().getAt(rowIndex);
-						if(rec.get('bid_opening')=='已开拍'){
-							return ;
-						}
-						if(rec.get('bid_opening')=='已中止'){
-							return ;
-						}
-						if(rec.get('bid_opening')=='已结束'){
-							return ;
-						}
-						set_price(rec.get('kid'));
-					}
-				},{
-					xtype : ""
-				},{
-					xtype : 'button',
-					tooltip : '进入',
-					icon : jcapp.getIcon("bullet_go.png"),
-					handler : function(grid, rowIndex, colIndex) {
-						var rec = grid.getStore().getAt(rowIndex);
-						window.open(getServer() +"/web-pm/pm/auctioSystemPC/index.html?kid="+rec.get('kid'));
-					}
-				}
-			]
-		} ],
-		viewConfig:{
-			enableTextSelection:true
-		}
-	}); //#listGridPanel
-		
-	 	searchFormPanel.render(Ext.getBody());
-		listGridPanel.render(Ext.getBody()); 
-	});
-	
-</script>
-<script type="text/javascript" src="edit.js"></script>
-<script type="text/javascript" src="setitem.js"></script>
+                },
+                listeners : {
+                    'beforeload' : function(store, op, options) {
+                        var params = searchFormPanel.getForm().getValues();
+                        Ext.apply(dataStore.proxy.extraParams, params);
+                    }
+                }
+            }); //#dataStore
+
+            var comboxStore = Ext.create('Ext.data.Store', {
+                fields: ['abbr', 'name'],
+                data : [
+                    {"abbr":"已开拍", "name":"已开拍"},
+                    {"abbr":"未开拍", "name":"未开拍"},
+                    {"abbr":"已中止", "name":"已中止"},
+                    {"abbr":"已结束", "name":"已结束"}
+                ]
+            });
+
+            var searchFormPanel = Ext.create('Ext.form.Panel', {
+                frame : true,
+                title : "搜索条件",
+                style : {
+                    marginBottom : '5px'
+                },
+                bodyStyle : {
+                    padding : '10px'
+                },
+                buttonAlign : "center",
+                collapsible : true,
+                defaultType : "textfield",
+                items : [
+                    {
+                        xtype : "container",
+                        layout : "hbox",
+                        items : [
+                            {
+                                xtype : "textfield",
+                                fieldLabel : "开拍标的物名称",
+                                name : "srh.item_name",
+                                labelAlign : 'right'
+                            },{
+                                fieldLabel : "分类",
+                                name : "srh.bid_opening",
+                                xtype : "combo",
+                                editable : false,
+                                store : comboxStore,
+                                displayField : 'name',
+                                valueField : 'abbr',
+                                labelAlign : 'right'
+                                //value ： "未开拍"
+                            },{
+                                xtype : "textfield",
+                                fieldLabel : "公司名称",
+                                name : "srh.name",
+                                labelAlign : 'right'
+                            }
+                        ]
+                    }
+                ],
+                buttons : [ {
+                    text : "搜索",
+                    icon : jcapp.getIcon("magnifier.png"),
+                    handler : function() {
+                        dataStore.load({
+                            //params:params()
+                        });
+                        dataStore.sync();
+                    }
+                }, {
+                    text : "重置",
+                    icon : jcapp.getIcon("arrow_refresh.png"),
+                    handler : function() {
+                        this.up('form').getForm().reset();
+                        dataStore.load({});
+                        dataStore.sync();
+                    }
+                } ]
+            }); //#searchFormPanel
+
+            var listGridPanel = Ext.create('Ext.grid.Panel', {
+                title : '线下拍卖商品管理列表',
+                dockedItems : [ {
+                    xtype : 'pagingtoolbar',
+                    store : dataStore,
+                    dock : 'bottom',
+                    displayInfo : true
+                } ],
+                store : dataStore,
+                columns : [ {
+                    text : 'kid',
+                    name : 'kid',
+                    hidden : true
+                },{
+                    text : '公司名称',
+                    align : 'center',
+                    dataIndex : 'name',
+                    flex : 1
+                },{
+                    text : '标的物名称',
+                    align : 'center',
+                    dataIndex : 'item_name',
+                    flex : 2
+                },{
+                    text : '是否开拍',
+                    align : 'center',
+                    dataIndex : 'bid_opening',
+                    flex : 1
+                },{
+                    text : '开拍时间',
+                    align : 'center',
+                    dataIndex : 'time_opening',
+                    flex : 1,
+                    renderer : function(val){
+                        if(val != ''){
+                            return Ext.Date.format(new Date(val), "Y-m-d H:i:s");
+                        }
+                    }
+                },{
+                    text : '结束时间',
+                    dataIndex : 'time_end',
+                    flex : 1,
+                    renderer : function(val){
+                        if(val != ''){
+                            return Ext.Date.format(new Date(val), "Y-m-d H:i:s");
+                        }
+                    }
+                },{
+                    xtype : "actioncolumn",
+                    align : "center",
+                    text : '操作',
+                    flex : 1,
+                    items : [
+                        {
+                            xtype : 'button',
+                            tooltip : '设置明细',
+                            icon : jcapp.getIcon("bullet_key.png"),
+                            handler : function(grid, rowIndex, colIndex) {
+                                var rec = grid.getStore().getAt(rowIndex);
+                                if(rec.get('bid_opening')=='已中止'){
+                                    return ;
+                                }
+                                if(rec.get('bid_opening')=='已结束'){
+                                    return ;
+                                }
+                                set_item(rec.get('kid'));
+                            }
+                        },{
+                            xtype : ""
+                        },
+                        {
+                            xtype : 'button',
+                            tooltip : '设置价格',
+                            icon : jcapp.getIcon("bullet_key.png"),
+                            handler : function(grid, rowIndex, colIndex) {
+                                var rec = grid.getStore().getAt(rowIndex);
+                                if(rec.get('bid_opening')=='已开拍'){
+                                    return ;
+                                }
+                                if(rec.get('bid_opening')=='已中止'){
+                                    return ;
+                                }
+                                if(rec.get('bid_opening')=='已结束'){
+                                    return ;
+                                }
+                                set_price(rec.get('kid'));
+                            }
+                        },{
+                            xtype : ""
+                        },{
+                            xtype : 'button',
+                            tooltip : '进入',
+                            icon : jcapp.getIcon("bullet_go.png"),
+                            handler : function(grid, rowIndex, colIndex) {
+                                var rec = grid.getStore().getAt(rowIndex);
+                                window.open(getServer() +"/web-pm/pm/auctioSystemPC/index.html?kid="+rec.get('kid'));
+                            }
+                        }
+                    ]
+                } ],
+                viewConfig:{
+                    enableTextSelection:true
+                }
+            }); //#listGridPanel
+
+            searchFormPanel.render(Ext.getBody());
+            listGridPanel.render(Ext.getBody());
+        });
+
+    </script>
+    <script type="text/javascript" src="edit.js"></script>
+    <script type="text/javascript" src="setitem.js"></script>
 </head>
 <body>
 </body>

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

@@ -117,9 +117,9 @@ public class WxSubmitDaoImpl extends BaseDaoImpl<t_pm_offline_apply> implements
 	@Override
 	public void reject(String offline_apply_id) {
 		t_pm_offline_apply pm_offline_apply = bs.findById(offline_apply_id, t_pm_offline_apply.class);
-		if(pm_offline_apply.getIs_pay() == 1){
-			return;
-		}
+//		if(pm_offline_apply.getIs_pay() == 1){
+//			return;
+//		}
 		pm_offline_apply.setIs_pay(2);
 		bs.updateObjT(pm_offline_apply);
 		/*String sql = "select t.* from t_pm_item_submit t where t.status=0 " +