提交数据进行测试

core/CoreApp/controllers/Returns.php

@@ -54,6 +54,10 @@ class Returns extends Start_Controller {
 		}
 		else if($arg == 'scan_waybill'){
 			$this->_scanWaybill();
+		}elseif($arg == 'saveJiaji'){
+			$this->_saveJiaji();
+		}elseif($arg == 'jiajiover'){
+			$this->_jiajiover();
 		}
 		else
 		{
@@ -189,7 +193,7 @@ class Returns extends Start_Controller {
                 $where  .= " and ".$xztime." > '$timetk' and ".$xztime." < '$timetj'";
             }
 			//数据排序
-            $order_str = $xztime." desc";
+            $order_str = " is_jiaji desc, ".$xztime." desc";
             if(empty($page))
 		    {
                 $start = 0;
@@ -199,7 +203,7 @@ class Returns extends Start_Controller {
 		    {
                 $start = ($page - 1)*$perpage;
             }
-			$info_list = $this->returns->find_all($where,'id,region,number,name,express,torderinfo,shop,,time,edittime,qr',$order_str,$start,$perpage);
+			$info_list = $this->returns->find_all($where,'id,region,number,name,express,torderinfo,shop,,time,edittime,qr,is_jiaji,jiaji_status,extra_cont',$order_str,$start,$perpage);
 			foreach ($info_list as $key=>$value) 
 		    {
 				$info_list[$key]['time'] = date('Y-m-d H:i:s',$value['time']);
@@ -231,13 +235,40 @@ class Returns extends Start_Controller {
 				}
 				if($value['qr'] == '0')
 				{
-					$info_list[$key]['qr'] = '<span class="thqr" data-id="'.$value['id'].'">未处理</span>';
+					$str = '<span class="thqr" data-id="'.$value['id'].'">未处理</span>';
+					if($value['is_jiaji'] == 0){
+						if($value['jiaji_status'] == 0){
+							$str .= '<span  style="background-color:#f33" data-id="'.$value['id'].'" onclick="addJiaji(this)">加急</span>';
+						}
+						
+					}else{
+						if($value['jiaji_status'] == 0){
+							$str .= '<br/><span  style="background-color:#f33" data-id="'.$value['id'].'" onclick="huizhiJiaji(this)">加急回执</span>';
+						}elseif($value['jiaji_status'] == 1){
+							$str .= '<br/><span  style="background-color:#f33" onclick="jiajiover('.$value['id'].')">加急完成</span>';
+						}
+					}
+					$info_list[$key]['qr'] = $str;
 				}
 				else
 				{
 				    $info_list[$key]['qr'] = '<span class="thqr" style="background-color:#ccc" data-id="'.$value['id'].'">已处理</span>';
 				}
-				 
+				if($value['is_jiaji'] == 1){
+					$extra = json_decode($value['extra_cont'],true);
+					$str = "";
+					if(!empty($extra['dy_jiaji'])){
+						$str .= '店员备注：'.$extra['dy_jiaji']['jiaji_remark']."<br/>";
+					}
+					if(!empty($extra['mc_jiaji'])){
+						$str .= '仓库回执：'.$extra['mc_jiaji']['jiaji_huizhi']."<br/>";
+					}
+					$str = trim($str,"<br/>");
+					$info_list[$key]['number'] = '<div style="position: relative;padding-top:10px;color:red;"><i class="method_self fa fa-list-ul" data-t="'.$str.'" style="position: absolute;top: 0;right: 0;"></i> '.$value['number']."</div>";;
+				}
+				unset($info_list[$key]['is_jiaji']);
+				unset($info_list[$key]['extra_cont']);
+				unset($info_list[$key]['jiaji_status']); 
 			}
 			$total = $this->returns->find_count($where);
 		    $pagenum = ceil($total/$perpage);
@@ -983,4 +1014,69 @@ class Returns extends Start_Controller {
 			$this->_Template('returns_scanwaybill',$this->data);
 		}
 	}
+
+
+	private function _saveJiaji(){
+		if($this->input->method() === 'post'){
+			$id = $this->input->post('id',true);
+			$val = $this->input->post('val',true);
+			$column = $this->input->post('column',true);
+			$info = $this->returns->read($id);
+			$extra_cont  = json_decode($info['extra_cont'],true);
+			if($column == 'jiaji_remark'){
+				$dy_jiaji = [
+					'jiaji_remark'=>$val,
+					'time'=>date('Y-m-d H:i:s'),
+				];
+				$extra_cont['dy_jiaji'] = $dy_jiaji;
+				$update_arr = [
+					'is_jiaji'=>1,
+					'extra_cont'=>json_encode($extra_cont,JSON_UNESCAPED_UNICODE),
+				];
+			}elseif($column == 'jiaji_huizhi'){
+				$mc_jiaji = [
+					'jiaji_huizhi'=>$val,
+					'time'=>date('Y-m-d H:i:s'),
+				];
+				$extra_cont['mc_jiaji'] = $mc_jiaji;
+				$update_arr = [
+					'jiaji_status'=>1,
+					'extra_cont'=>json_encode($extra_cont,JSON_UNESCAPED_UNICODE),
+				];
+			}else{
+				echo json_encode(['code'=>-1,'msg'=>'数据类型异常']);exit;
+			}
+			$r = $this->returns->save($update_arr,$id);
+			if($r){
+				echo json_encode(['code'=>1,'msg'=>'操作成功']);exit;
+			}else{
+				echo json_encode(['code'=>-1,'msg'=>'操作失败']);exit;
+			}
+		}else{
+			echo json_encode(['code'=>-1,'msg'=>'请求方式错误']);exit;
+		}
+	}
+
+	private function _jiajiover(){
+		if($this->input->method() === 'post'){
+			$id = $this->input->post('id',true);
+			$info = $this->returns->read($id);
+			if($info['jiaji_status'] == 1 && $info['is_jiaji'] == 1){
+				$update_arr = [
+					'jiaji_status'=>2,
+					'is_jiaji'=>0,
+				];
+				$r = $this->returns->save($update_arr,$id);
+				if($r){
+					echo json_encode(['code'=>1,'msg'=>'操作成功']);exit;
+				}else{
+					echo json_encode(['code'=>-1,'msg'=>'操作失败']);exit;
+				}
+			}else{
+				echo json_encode(['code'=>-1,'msg'=>'当前状态不允许进行操作']);exit;
+			}
+		}else{
+			echo json_encode(['code'=>-1,'msg'=>'请求方式错误']);exit;
+		}
+	}
 }

template/erp/returns.html

@@ -71,6 +71,7 @@
 至&nbsp;&nbsp;&nbsp;&nbsp; <input id="timetj" value="{date('Y-m-d',time()+24*3600)} 0:00" name="timetj" type="text" onClick="laydate({istime: true,format:'YYYY-MM-DD hh:mm'})"   style="width:110px !important;"></li>
 <li><span>确 定</span></li>
 </ul>
+
 <div class="control">
 <a href="javascript:void(0);" class="window" data-h="/returns/add/" data-t="退货 - 添加">添 加</a>
 {if $power == '1'}<a href="javascript:void(0);" class="check">删 除</a> {/if}
@@ -101,6 +102,12 @@
 </table>
 <div class="bomf"></div>
 </div>
+<div class="boundtj">
+<div>
+<p style="padding:10px 0px"></p>
+<p style="padding:10px 0px"><font class="button">确 定</font><font class="esc">取 消</font></p>
+</div>
+</div>
 <script>
 var dataurl = "/returns";
 var excel = "/returns/";
@@ -165,6 +172,17 @@ $(function(){
 
             reader.readAsArrayBuffer(file); // 以 ArrayBuffer 形式读取
         });
+    
+    $(".datatext").on('mouseover mouseout',".method_self",function(event) {
+   
+        if (event.type === "mouseover") {
+        $(this).parent().parent().css("overflow","visible")
+        $(this).parent().append('<font style="position: absolute; top: 0; left: 11vw; z-index: 99999;border-radius:3px;border: 1px solid #39F;padding:0 10px;background-color: #FFF;box-shadow: rgba(0, 0, 0, 0.3) 1px 1px 24px;min-width:300px;word-wrap: break-word;text-align: left;">'+$(this).data("t")+'</font>');
+        }else if(event.type == "mouseout"){
+        $(this).parent().parent().css("overflow","hidden")
+        $(this).siblings("font").remove();
+        }
+    });
 })
 // 重置文件输入框的函数
 function resetFileInput() {
@@ -290,6 +308,96 @@ $(".datatext").on('click',".thqr",function() {
         }
     });
 });
+
+function addJiaji(that){
+    let id = $(that).data('id')
+    $(".boundtj div p:eq(0)").html('<label> <textarea name="val" placeholder="请输入加急的原因" style="width:300px;height:80px"></textarea></label> <input type="hidden" name="id" value="'+id+'" /><input type="hidden" name="column" value="jiaji_remark" />');
+    $(".boundtj div p:eq(1)").html("<font class='obaddgo' onclick='doAddYcrk()'>确 定</font><font class='esc' onclick='escDo()'>取 消</font>");
+    $(".boundtj").show();
+}
+function huizhiJiaji(that){
+    let id = $(that).data('id');
+    $(".boundtj div p:eq(0)").html('<label> <textarea name="val" placeholder="请输入加急操作后的备注" style="width:300px;height:80px"></textarea></label> <input type="hidden" name="id" value="'+id+'" /><input type="hidden" name="column" value="jiaji_huizhi" />');
+    $(".boundtj div p:eq(1)").html("<font class='obaddgo' onclick='doAddYcrk()'>确 定</font><font class='esc' onclick='escDo()'>取 消</font>");
+    $(".boundtj").show();
+}
+
+function jiajiover(do_id){
+    layx.confirm('提示',"确定加急要完结吗？",null,{
+        buttons:[
+            {
+                label:'确定',
+                callback:function(id, button, event){
+                    dojiajiover(do_id);
+                    layx.destroy(id);
+                }
+            },
+            {
+                label:'取消',
+                callback:function(id, button, event){
+                    layx.destroy(id);
+                }
+            }
+        ]
+    });
+}
+function dojiajiover(do_id){
+    $.post("/returns/jiajiover",{id:do_id},function(a){
+        if(a.code == 1){
+            layx.alert('提示', a.msg, function(id) {
+                $(".search span").click();
+            });
+           
+        }else{
+            layx.alert('提示', a.msg, function(id) {
+                
+            });
+        }
+    }, "json")
+}
+function doAddYcrk(){
+     let obj = {}
+     obj.id = $(".boundtj input[name='id']").val();
+     let val = "";
+     if($(".boundtj input[name='val']").val()){
+        val= $(".boundtj input[name='val']").val();
+     }else{
+        val = $(".boundtj textarea[name='val']").val();
+     }
+     obj.val = val;
+     obj.column = $(".boundtj input[name='column']").val();
+     escDo();
+     $.post("/returns/saveJiaji", obj, function(a){
+        if(a.code == 1){
+            layx.confirm('提示',a.msg,null,{
+				buttons:[
+					{
+						label:'确定',
+						callback:function(id, button, event){
+							layx.destroy(id);
+                            $(".search span").click();
+						}
+					}
+				],dialogIcon:'success',shadable:0.6
+			})
+        }else{
+           layx.confirm('提示',a.msg,null,{
+				buttons:[
+					{
+						label:'确定',
+						callback:function(id, button, event){
+							layx.destroy(id);
+						}
+					}
+				],dialogIcon:'error',shadable:0.6
+			})
+        }
+     }, "json")
+}
+function escDo(){
+    $(".boundtj p").html("");
+    $(".boundtj").hide();
+}
 </script>
 <script type="text/javascript" src="{$theme}js/laydate.js"></script>
 <script type="text/javascript" src="{$theme}js/excel/xlxs.js" ></script>