Skip to content

孙龙 / note-library

Go to a project
Commit 305782b0 by 孙龙
Options

标签

parent 54d29311
Inline Side-by-side
Showing with 45 additions and 12 deletions
app/Services/LabelService.php
...@@ -105,6 +105,8 @@ class LabelService { ...@@ -105,6 +105,8 @@ class LabelService {
$info["ichunt2020"]["customer_com"] = isset($item["customer_com"]) ? $item["customer_com"] : ""; $info["ichunt2020"]["customer_com"] = isset($item["customer_com"]) ? $item["customer_com"] : "";
$info["ichunt2020"]["customer_order_sn"] = isset($item["customer_order_sn"]) ? $item["customer_order_sn"] : ""; $info["ichunt2020"]["customer_order_sn"] = isset($item["customer_order_sn"]) ? $item["customer_order_sn"] : "";
$info["ichunt2020"]["delivery_date"] = isset($item["delivery_date"]) ? $item["delivery_date"] : ""; $info["ichunt2020"]["delivery_date"] = isset($item["delivery_date"]) ? $item["delivery_date"] : "";
$info["ichunt2020"]["coo"] = isset($item["coo"]) ? $item["coo"] : "";
$info["ichunt2020"]["customer_material_number"] = isset($item["customer_material_number"]) ? $item["customer_material_number"] : "";
return $this->getHtml($_html,$info); return $this->getHtml($_html,$info);
} }
...@@ -112,7 +114,8 @@ class LabelService { ...@@ -112,7 +114,8 @@ class LabelService {
protected function getHtml($_html,$info){ protected function getHtml($_html,$info){
try{ try{
$matches = []; $matches = [];
$a = preg_match_all('/<<<(.*?)>>>/i',$_html,$matches); preg_match_all('/<<<(.*?)>>>/i',$_html,$matches);
$arr = [];
foreach($matches[1] as $k=>$field){ foreach($matches[1] as $k=>$field){
$arr[$k] = isset($info["ichunt2020"][$field])?$info["ichunt2020"][$field] : ''; $arr[$k] = isset($info["ichunt2020"][$field])?$info["ichunt2020"][$field] : '';
} }
...@@ -122,6 +125,8 @@ class LabelService { ...@@ -122,6 +125,8 @@ class LabelService {
$html = $_html; $html = $_html;
} }
$html = str_replace("箜"," ",$html);
$dom = HtmlDomParser::str_get_html( $html ); $dom = HtmlDomParser::str_get_html( $html );
//处理文本 //处理文本
...@@ -144,6 +149,7 @@ class LabelService { ...@@ -144,6 +149,7 @@ class LabelService {
foreach($yiweimaits as $k=>$yiweimait){ foreach($yiweimaits as $k=>$yiweimait){
try{ try{
$a = $yiweimait->style; $a = $yiweimait->style;
$yiweimait->datatypes = str_replace(["#","%","&"],"",$yiweimait->datatypes);
if(empty($yiweimait->datatypes)){ if(empty($yiweimait->datatypes)){
$yiweimait->datatypes = "暂无数据"; $yiweimait->datatypes = "暂无数据";
} }
......
app/Services/OfflineLabelService.php
...@@ -16,6 +16,8 @@ class OfflineLabelService{ ...@@ -16,6 +16,8 @@ class OfflineLabelService{
"data_code", "data_code",
"customer_order_sn", "customer_order_sn",
"delivery_date", "delivery_date",
"coo",
"customer_material_number",
]; ];
public function getOfflineUploadData($data){ public function getOfflineUploadData($data){
......
public/js/web/offline.js
...@@ -74,9 +74,11 @@ layui.use(['form', 'table', 'laydate','upload'], function() { ...@@ -74,9 +74,11 @@ layui.use(['form', 'table', 'laydate','upload'], function() {
,{field: 'goods_number', title: '数量',width:80} ,{field: 'goods_number', title: '数量',width:80}
,{field: 'customer_code', title: '客户编码'} ,{field: 'customer_code', title: '客户编码'}
,{field: 'customer_type', title: '客户型号'} ,{field: 'customer_type', title: '客户型号'}
,{field: 'data_code', title: '批次'} ,{field: 'data_code', title: '批次D/C'}
,{field: 'customer_order_sn', title: '客户订单号'} ,{field: 'customer_order_sn', title: '客户订单号'}
,{field: 'delivery_date', title: '发货日期'} ,{field: 'delivery_date', title: '发货日期'}
,{field: 'coo', title: '产地'}
,{field: 'customer_material_number', title: '客户物料编码'}
]] ]]
,data:data_123456 ,data:data_123456
}) })
......
resources/views/web/design.blade.php
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
<div class="sjglbox fl"> <div class="sjglbox fl">
<select class="sjgl sjgl1 fl"> <select class="sjgl sjgl1 fl">
<option value="">自定义</option> <option value="">自定义</option>
<option value="data_code">批次号</option> <option value="data_code">批次号(D/C)</option>
<option value="sku_code">SKU编码</option> <option value="sku_code">SKU编码</option>
<option value="goods_type">型号名称</option> <option value="goods_type">型号名称</option>
<option value="goods_brand">型号品牌</option> <option value="goods_brand">型号品牌</option>
...@@ -183,6 +183,8 @@ ...@@ -183,6 +183,8 @@
<option value="customer_com">客户公司</option> <option value="customer_com">客户公司</option>
<option value="customer_order_sn">客户订单号</option> <option value="customer_order_sn">客户订单号</option>
<option value="delivery_date">送货日期</option> <option value="delivery_date">送货日期</option>
<option value="coo">产地</option>
<option value="customer_material_number">客户物料编码</option>
</select> </select>
<input type="text" class="sjgl zdynr" placeholder="输入自定义内容" /> <input type="text" class="sjgl zdynr" placeholder="输入自定义内容" />
</div> </div>
...@@ -244,7 +246,7 @@ ...@@ -244,7 +246,7 @@
<div class="sjglbox fl"> <div class="sjglbox fl">
<select class="sjgl sjgl1 fl"> <select class="sjgl sjgl1 fl">
<option value="">自定义</option> <option value="">自定义</option>
<option value="data_code">批次号</option> <option value="data_code">批次号(D/C)</option>
<option value="sku_code">SKU编码</option> <option value="sku_code">SKU编码</option>
<option value="goods_type">型号名称</option> <option value="goods_type">型号名称</option>
<option value="goods_brand">型号品牌</option> <option value="goods_brand">型号品牌</option>
...@@ -255,6 +257,8 @@ ...@@ -255,6 +257,8 @@
<option value="customer_com">客户公司</option> <option value="customer_com">客户公司</option>
<option value="customer_order_sn">客户订单号</option> <option value="customer_order_sn">客户订单号</option>
<option value="delivery_date">送货日期</option> <option value="delivery_date">送货日期</option>
<option value="coo">产地</option>
<option value="customer_material_number">客户物料编码</option>
</select> </select>
<input type="text" class="sjgl zdynr" placeholder="输入自定义内容" /> <input type="text" class="sjgl zdynr" placeholder="输入自定义内容" />
</div> </div>
...@@ -272,6 +276,7 @@ ...@@ -272,6 +276,7 @@
<option value="#">#</option> <option value="#">#</option>
<option value="；">；</option> <option value="；">；</option>
<option value="：">：</option> <option value="：">：</option>
<option value="箜">空格</option>
</select> </select>
</span> </span>
<div class="sjglbox fl"> <div class="sjglbox fl">
...@@ -305,12 +310,13 @@ ...@@ -305,12 +310,13 @@
<option value="#">#</option> <option value="#">#</option>
<option value="；">；</option> <option value="；">；</option>
<option value="：">：</option> <option value="：">：</option>
<option value="箜">空格</option>
</select> </select>
</span> </span>
<div class="sjglbox fl"> <div class="sjglbox fl">
<select class="sjgl sjgl3 fl"> <select class="sjgl sjgl3 fl">
<option value="">自定义</option> <option value="">自定义</option>
<option value="data_code">批次号</option> <option value="data_code">批次号(D/C)</option>
<option value="sku_code">SKU编码</option> <option value="sku_code">SKU编码</option>
<option value="goods_type">型号名称</option> <option value="goods_type">型号名称</option>
<option value="goods_brand">型号品牌</option> <option value="goods_brand">型号品牌</option>
...@@ -321,6 +327,8 @@ ...@@ -321,6 +327,8 @@
<option value="customer_com">客户公司</option> <option value="customer_com">客户公司</option>
<option value="customer_order_sn">客户订单号</option> <option value="customer_order_sn">客户订单号</option>
<option value="delivery_date">送货日期</option> <option value="delivery_date">送货日期</option>
<option value="coo">产地</option>
<option value="customer_material_number">客户物料编码</opt
</select> </select>
<input type="text" class="sjgl zdynr" placeholder="输入自定义内容" /> <input type="text" class="sjgl zdynr" placeholder="输入自定义内容" />
</div> </div>
...@@ -338,12 +346,13 @@ ...@@ -338,12 +346,13 @@
<option value="#">#</option> <option value="#">#</option>
<option value="；">；</option> <option value="；">；</option>
<option value="：">：</option> <option value="：">：</option>
<option value="箜">空格</option>
</select> </select>
</span> </span>
<div class="sjglbox fl"> <div class="sjglbox fl">
<select class="sjgl sjgl4 fl"> <select class="sjgl sjgl4 fl">
<option value="">自定义</option> <option value="">自定义</option>
<option value="data_code">批次号</option> <option value="data_code">批次号(D/C)</option>
<option value="sku_code">SKU编码</option> <option value="sku_code">SKU编码</option>
<option value="goods_type">型号名称</option> <option value="goods_type">型号名称</option>
<option value="goods_brand">型号品牌</option> <option value="goods_brand">型号品牌</option>
...@@ -354,6 +363,8 @@ ...@@ -354,6 +363,8 @@
<option value="customer_com">客户公司</option> <option value="customer_com">客户公司</option>
<option value="customer_order_sn">客户订单号</option> <option value="customer_order_sn">客户订单号</option>
<option value="delivery_date">送货日期</option> <option value="delivery_date">送货日期</option>
<option value="coo">产地</option>
<option value="customer_material_number">客户物料编码</option>
</select> </select>
<input type="text" class="sjgl zdynr" placeholder="输入自定义内容" /> <input type="text" class="sjgl zdynr" placeholder="输入自定义内容" />
</div> </div>
......
resources/views/web/offline_design.blade.php
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<div class="sjglbox fl"> <div class="sjglbox fl">
<select class="sjgl sjgl1 fl"> <select class="sjgl sjgl1 fl">
<option value="">自定义</option> <option value="">自定义</option>
<option value="data_code">批次号</option> <option value="data_code">批次号(D/C)</option>
<option value="sku_code">SKU编码</option> <option value="sku_code">SKU编码</option>
<option value="goods_type">型号名称</option> <option value="goods_type">型号名称</option>
<option value="goods_brand">型号品牌</option> <option value="goods_brand">型号品牌</option>
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
<option value="customer_com">客户公司</option> <option value="customer_com">客户公司</option>
<option value="customer_order_sn">客户订单号</option> <option value="customer_order_sn">客户订单号</option>
<option value="delivery_date">送货日期</option> <option value="delivery_date">送货日期</option>
<option value="coo">产地</option>
<option value="customer_material_number">客户物料编码</option>
</select> </select>
<input type="text" class="sjgl zdynr" placeholder="输入自定义内容" /> <input type="text" class="sjgl zdynr" placeholder="输入自定义内容" />
</div> </div>
...@@ -41,7 +43,7 @@ ...@@ -41,7 +43,7 @@
<div class="sjglbox fl"> <div class="sjglbox fl">
<select class="sjgl sjgl1 fl"> <select class="sjgl sjgl1 fl">
<option value="">自定义</option> <option value="">自定义</option>
<option value="data_code">批次号</option> <option value="data_code">批次号(D/C)</option>
<option value="sku_code">SKU编码</option> <option value="sku_code">SKU编码</option>
<option value="goods_type">型号名称</option> <option value="goods_type">型号名称</option>
<option value="goods_brand">型号品牌</option> <option value="goods_brand">型号品牌</option>
...@@ -52,6 +54,8 @@ ...@@ -52,6 +54,8 @@
<option value="customer_com">客户公司</option> <option value="customer_com">客户公司</option>
<option value="customer_order_sn">客户订单号</option> <option value="customer_order_sn">客户订单号</option>
<option value="delivery_date">送货日期</option> <option value="delivery_date">送货日期</option>
<option value="coo">产地</option>
<option value="customer_material_number">客户物料编码</option>
</select> </select>
<input type="text" class="sjgl zdynr" placeholder="输入自定义内容" /> <input type="text" class="sjgl zdynr" placeholder="输入自定义内容" />
</div> </div>
...@@ -69,12 +73,13 @@ ...@@ -69,12 +73,13 @@
<option value="#">#</option> <option value="#">#</option>
<option value="；">；</option> <option value="；">；</option>
<option value="：">：</option> <option value="：">：</option>
<option value="箜">空格</option>
</select> </select>
</span> </span>
<div class="sjglbox fl"> <div class="sjglbox fl">
<select class="sjgl sjgl2 fl"> <select class="sjgl sjgl2 fl">
<option value="">自定义</option> <option value="">自定义</option>
<option value="data_code">批次号</option> <option value="data_code">批次号(D/C)</option>
<option value="sku_code">SKU编码</option> <option value="sku_code">SKU编码</option>
<option value="goods_type">型号名称</option> <option value="goods_type">型号名称</option>
<option value="goods_brand">型号品牌</option> <option value="goods_brand">型号品牌</option>
...@@ -85,6 +90,8 @@ ...@@ -85,6 +90,8 @@
<option value="customer_com">客户公司</option> <option value="customer_com">客户公司</option>
<option value="customer_order_sn">客户订单号</option> <option value="customer_order_sn">客户订单号</option>
<option value="delivery_date">送货日期</option> <option value="delivery_date">送货日期</option>
<option value="coo">产地</option>
<option value="customer_material_number">客户物料编码</option>
</select> </select>
<input type="text" class="sjgl zdynr" placeholder="输入自定义内容" /> <input type="text" class="sjgl zdynr" placeholder="输入自定义内容" />
</div> </div>
...@@ -102,12 +109,13 @@ ...@@ -102,12 +109,13 @@
<option value="#">#</option> <option value="#">#</option>
<option value="；">；</option> <option value="；">；</option>
<option value="：">：</option> <option value="：">：</option>
<option value="箜">空格</option>
</select> </select>
</span> </span>
<div class="sjglbox fl"> <div class="sjglbox fl">
<select class="sjgl sjgl3 fl"> <select class="sjgl sjgl3 fl">
<option value="">自定义</option> <option value="">自定义</option>
<option value="data_code">批次号</option> <option value="data_code">批次号(D/C)</option>
<option value="sku_code">SKU编码</option> <option value="sku_code">SKU编码</option>
<option value="goods_type">型号名称</option> <option value="goods_type">型号名称</option>
<option value="goods_brand">型号品牌</option> <option value="goods_brand">型号品牌</option>
...@@ -118,6 +126,8 @@ ...@@ -118,6 +126,8 @@
<option value="customer_com">客户公司</option> <option value="customer_com">客户公司</option>
<option value="customer_order_sn">客户订单号</option> <option value="customer_order_sn">客户订单号</option>
<option value="delivery_date">送货日期</option> <option value="delivery_date">送货日期</option>
<option value="coo">产地</option>
<option value="customer_material_number">客户物料编码</option>
</select> </select>
<input type="text" class="sjgl zdynr" placeholder="输入自定义内容" /> <input type="text" class="sjgl zdynr" placeholder="输入自定义内容" />
</div> </div>
...@@ -135,12 +145,13 @@ ...@@ -135,12 +145,13 @@
<option value="#">#</option> <option value="#">#</option>
<option value="；">；</option> <option value="；">；</option>
<option value="：">：</option> <option value="：">：</option>
<option value="箜">空格</option>
</select> </select>
</span> </span>
<div class="sjglbox fl"> <div class="sjglbox fl">
<select class="sjgl sjgl4 fl"> <select class="sjgl sjgl4 fl">
<option value="">自定义</option> <option value="">自定义</option>
<option value="data_code">批次号</option> <option value="delivery_date">送货日期</option><option value="data_code">批次号(D/C)</option>
<option value="sku_code">SKU编码</option> <option value="sku_code">SKU编码</option>
<option value="goods_type">型号名称</option> <option value="goods_type">型号名称</option>
<option value="goods_brand">型号品牌</option> <option value="goods_brand">型号品牌</option>
...@@ -150,7 +161,8 @@ ...@@ -150,7 +161,8 @@
<option value="customer_type">客户型号</option> <option value="customer_type">客户型号</option>
<option value="customer_com">客户公司</option> <option value="customer_com">客户公司</option>
<option value="customer_order_sn">客户订单号</option> <option value="customer_order_sn">客户订单号</option>
<option value="delivery_date">送货日期</option> <option value="coo">产地</option>
<option value="customer_material_number">客户物料编码</option>
</select> </select>
<input type="text" class="sjgl zdynr" placeholder="输入自定义内容" /> <input type="text" class="sjgl zdynr" placeholder="输入自定义内容" />
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment