lvhao 1 dag sedan
förälder
incheckning
1a53fda78f
2 ändrade filer med 12 tillägg och 4 borttagningar
  1. 8 1
      core/CoreApp/controllers/Amazonbarcode.php
  2. 4 3
      template/erp/amazonbarcode_see.html

+ 8 - 1
core/CoreApp/controllers/Amazonbarcode.php

@@ -266,12 +266,19 @@ class Amazonbarcode extends Start_Controller {
 			$va = explode(',',rtrim($v,','));
 			$n = $this->input->post('n');
 			$sl = $this->input->post('sl');
+			$bfb = $this->input->post('bfb');
+			if(empty($bfb)){
+				$bfb = '58mm';
+			}else{
+				$bfb = (int)$bfb;
+				$bfb = $bfb.'%';
+			}
 			$text = array();$text['data'] = array();$time = time();
 			$data = $this->amazonbarcode->read($va[$n]);
 // 			if(strlen($data['number']) > 25){
 // 				echo json_encode(array('msg'=>'打印条码超过25位,系统不支持!','success'=>false));exit;
 // 			}
-			$rows = array('number'=>$data['number'],'label'=>$data['label'],'label2'=>$data['label2'],'num'=>$sl,'data'=>$v,'n'=>$n-1);
+			$rows = array('number'=>$data['number'],'label'=>$data['label'],'label2'=>$data['label2'],'num'=>$sl,'data'=>$v,'n'=>$n-1,'bfb'=>$bfb);
 			if($this->amazonbarcode->save(array('print'=>1,'time'=>$time),$data['id']))
         	{
          		echo json_encode(array('rows'=>($rows),'success'=>true));exit;

+ 4 - 3
template/erp/amazonbarcode_see.html

@@ -146,7 +146,7 @@ $(".datatext").on('click', ".amazonbarprint", function() {
         } else {
 			var id = $(this).data("id");
 			var num = $(this).data("num");
-            $(".wigprintk div p:eq(0)").html('选择打印数量:<input value="'+num+'" name="sl" type="text" style="width:50px;height: 26px;color: #333;border: 1px #ccc solid;font-size: 13px;text-align: center;border-radius: 5px;">');
+            $(".wigprintk div p:eq(0)").html('选择打印数量:<input value="'+num+'" name="sl" type="text" style="width:50px;height: 26px;color: #333;border: 1px #ccc solid;font-size: 13px;text-align: center;border-radius: 5px;"><br/>条码缩放比例:<input value="" name="bfb" type="text" style="width:50px;height: 26px;color: #333;border: 1px #ccc solid;font-size: 13px;text-align: center;border-radius: 5px;">');
             $(".wigprintk div p:eq(1)").html("<p><font id='amazonbarprinton' data-id='"+id+"'>确 定</font><font class='esc'>取 消</font></p>");
             $(".wigprintk").show();
         }
@@ -154,7 +154,8 @@ $(".datatext").on('click', ".amazonbarprint", function() {
 });
 
 $(".wigprintk").on('click', "#amazonbarprinton", function() {
-	var sl = $(".wigprintk div p:eq(0) input").val();
+	var sl = $(".wigprintk div p:eq(0) input[name='sl']").val();
+    let bfb = $(".wigprintk div p:eq(0) input[name='bfb']").val();
     $(".wigprintk").hide();
     $(".wigprintk div p:eq(0)").html("<i class='fa fa-2x fa-cog fa-spin'></i> &nbsp; 正在处理打印信息,请稍后...");
     $(".wigprintk div p:eq(1)").html("");
@@ -164,7 +165,7 @@ $(".wigprintk").on('click', "#amazonbarprinton", function() {
 	var list = $(this).data("id");
     $.ajax({
         url: printurl,
-        data: "s=" + list + "&n=" + 0 + "&sl=" + sl,
+        data: "s=" + list + "&n=" + 0 + "&sl=" + sl + "&bfb=" + bfb,
         type: "POST",
         dataType: "json",
         timeout: 60001,