提交测试

core/CoreApp/controllers/Returns.php

@@ -56,6 +56,9 @@ class Returns extends Start_Controller {
 			$this->_scanWaybill();
 		}elseif($arg == 'saveJiaji'){
 			$this->_saveJiaji();
+		}elseif($arg == 'save_jiajiremark'){
+			$this->_saveJiajiRemark();
+		}elseif($arg == 'saveJiajiRemark2'){
 		}elseif($arg == 'jiajiover'){
 			$this->_jiajiover();
 		}
@@ -256,6 +259,14 @@ class Returns extends Start_Controller {
 				}
 				if($value['is_jiaji'] == 1){
 					$extra = json_decode($value['extra_cont'],true);
+					$jiaji_remark = "";
+					$jiaji_huizhi = "";
+					if(!empty($extra['dy_jiaji'])){
+						$jiaji_remark = ''.$extra['dy_jiaji']['jiaji_remark'];
+					}
+					if(!empty($extra['mc_jiaji'])){
+						$jiaji_huizhi = ''.$extra['mc_jiaji']['jiaji_huizhi'];
+					}
 					$str = "";
 					if(!empty($extra['dy_jiaji'])){
 						$str .= '店员备注：'.$extra['dy_jiaji']['jiaji_remark']."<br/>";
@@ -265,9 +276,9 @@ class Returns extends Start_Controller {
 					}
 					$str = trim($str,"<br/>");
 					if($value['jiaji_status'] == 1){
-						$info_list[$key]['number'] = '<div style="position: relative;padding-top:10px;color:#95f;"><i class="method_self fa fa-list-ul" data-t="'.$str.'" style="position: absolute;top: 0;right: 0;"></i> '.$value['number']."</div>";
+						$info_list[$key]['number'] = '<div style="position: relative;padding-top:10px;color:#95f;"><i onclick="editJiaji(this)" class="fa fa-list-ul" data-id="'.$value['id'].'" data-jiaji_remark="'.$jiaji_remark.'" data-jiaji_huizhi="'.$jiaji_huizhi.'" style="position: absolute;top: 0;right: 0px;"></i>'.$value['number']."</div>";
 					}else{
-						$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>";;
+						$info_list[$key]['number'] = '<div style="position: relative;padding-top:10px;color:red;"><i  onclick="editJiaji(this)"  class=" fa fa-list-ul" data-id="'.$value['id'].'" data-jiaji_remark="'.$jiaji_remark.'" data-jiaji_huizhi="'.$jiaji_huizhi.'"  style="position: absolute;top: 0;right: 0px;"></i> '.$value['number']."</div>";;
 					}
 					
 				}
@@ -1090,4 +1101,34 @@ class Returns extends Start_Controller {
 			echo json_encode(['code'=>-1,'msg'=>'请求方式错误']);exit;
 		}
 	}
+
+	private function _saveJiajiRemark(){
+		if($this->input->method() === 'post'){
+			$id = $this->input->post('id',true);
+			$jiaji_remark = $this->input->post('jiaji_remark',true);
+			$jiaji_huizhi = $this->input->post('jiaji_huizhi',true);
+			$info = $this->returns->read($id);
+			if(empty($info)){
+				echo json_encode(['code'=>-1,'msg'=>'数据不存在']);exit;
+			}
+			$extra_cont  = json_decode($info['extra_cont'],true);
+			if(!empty($jiaji_remark)){
+				$extra_cont["dy_jiaji"] = [
+					"jiaji_remark"=>$jiaji_remark,
+				];
+			}
+			if(!empty($jiaji_huizhi)){
+				$extra_cont["mc_jiaji"] = [
+					"jiaji_huizhi"=>$jiaji_huizhi,
+				];
+			}
+			$update_arr = [
+				'extra_cont'=>json_encode($extra_cont,JSON_UNESCAPED_UNICODE),
+			];
+			$this->returns->save($update_arr,$id);
+			echo json_encode(['code'=>1,'msg'=>'操作成功','data'=>$extra_cont]);exit;
+		}else{
+			echo json_encode(['code'=>-1,'msg'=>'请求方式错误']);exit;
+		}
+	}
 }

template/erp/returns.html

@@ -398,6 +398,62 @@ function escDo(){
     $(".boundtj p").html("");
     $(".boundtj").hide();
 }
+
+function  editJiaji(that){
+    let id = $(that).data("id");
+    let jiaji_remark = $(that).data("jiaji_remark");
+    let jiaji_huizhi = $(that).data("jiaji_huizhi");
+    let str = '';
+   
+    if(jiaji_remark){
+        str += '<label>店员备注：<input style="width:250px" type="text" name="jiaji_remark" value="'+jiaji_remark+'" /></label>';
+    }
+    if(jiaji_huizhi){
+        str += '<label>仓库备注：<input style="width:250px"  type="text" name="jiaji_huizhi" value="'+jiaji_huizhi+'" /></label>';
+    }
+    $(".boundtj div p:eq(0)").html(str + '<input type="hidden" name="id" value="'+id+'" />');
+    $(".boundtj div p:eq(1)").html("<font class='obaddgo' onclick='doRemark()'>保 存</font><font class='esc' onclick='escDo()'>取 消</font>");
+    $(".boundtj").show();
+}
+function doRemark(){
+     let obj = {}
+     obj.id = $(".boundtj input[name='id']").val();
+     let jiaji_remark = $(".boundtj input[name='jiaji_remark']").val();
+     let jiaji_huizhi = $(".boundtj input[name='jiaji_huizhi']").val();
+     if(jiaji_remark){
+        obj.jiaji_remark = jiaji_remark;
+    }
+    if(jiaji_huizhi){
+        obj.jiaji_huizhi = jiaji_huizhi;
+    }
+     escDo();
+     $.post("/returns/save_jiajiremark", 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")
+}
 </script>
 <script type="text/javascript" src="{$theme}js/laydate.js"></script>
 <script type="text/javascript" src="{$theme}js/excel/xlxs.js" ></script>