Skip to content

孙龙 / note-library

Go to a project
Commit 2b6ff513 by 孙龙
Options

Merge branch 'feature/sl/20230217' into 'master' 

Feature/sl/20230217

See merge request !2
parents bcad0a52 c979647e
Inline Side-by-side
Showing with 26 additions and 0 deletions
app/Services/LabelService.php
...@@ -103,6 +103,8 @@ class LabelService { ...@@ -103,6 +103,8 @@ class LabelService {
$info["ichunt2020"]["data_code"] = isset($item["data_code"]) ? $item["data_code"] : ""; $info["ichunt2020"]["data_code"] = isset($item["data_code"]) ? $item["data_code"] : "";
$info["ichunt2020"]["customer_type"] = isset($item["customer_type"]) ? $item["customer_type"] : ""; $info["ichunt2020"]["customer_type"] = isset($item["customer_type"]) ? $item["customer_type"] : "";
$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"]["delivery_date"] = isset($item["delivery_date"]) ? $item["delivery_date"] : "";
return $this->getHtml($_html,$info); return $this->getHtml($_html,$info);
} }
......
app/Services/OfflineLabelService.php
...@@ -14,6 +14,8 @@ class OfflineLabelService{ ...@@ -14,6 +14,8 @@ class OfflineLabelService{
"customer_code", "customer_code",
"customer_type", "customer_type",
"data_code", "data_code",
"customer_order_sn",
"delivery_date",
]; ];
public function getOfflineUploadData($data){ public function getOfflineUploadData($data){
......
public/js/web/offline.js
...@@ -75,6 +75,8 @@ layui.use(['form', 'table', 'laydate','upload'], function() { ...@@ -75,6 +75,8 @@ layui.use(['form', 'table', 'laydate','upload'], function() {
,{field: 'customer_code', title: '客户编码'} ,{field: 'customer_code', title: '客户编码'}
,{field: 'customer_type', title: '客户型号'} ,{field: 'customer_type', title: '客户型号'}
,{field: 'data_code', title: '批次'} ,{field: 'data_code', title: '批次'}
,{field: 'customer_order_sn', title: '客户订单号'}
,{field: 'delivery_date', title: '发货日期'}
]] ]]
,data:data_123456 ,data:data_123456
}) })
......
resources/views/web/design.blade.php
...@@ -181,6 +181,8 @@ ...@@ -181,6 +181,8 @@
<option value="customer_code">客户编码</option> <option value="customer_code">客户编码</option>
<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="delivery_date">送货日期</option>
</select> </select>
<input type="text" class="sjgl zdynr" placeholder="输入自定义内容" /> <input type="text" class="sjgl zdynr" placeholder="输入自定义内容" />
</div> </div>
...@@ -251,6 +253,8 @@ ...@@ -251,6 +253,8 @@
<option value="customer_code">客户编码</option> <option value="customer_code">客户编码</option>
<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="delivery_date">送货日期</option>
</select> </select>
<input type="text" class="sjgl zdynr" placeholder="输入自定义内容" /> <input type="text" class="sjgl zdynr" placeholder="输入自定义内容" />
</div> </div>
...@@ -282,6 +286,8 @@ ...@@ -282,6 +286,8 @@
<option value="customer_code">客户编码</option> <option value="customer_code">客户编码</option>
<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="delivery_date">送货日期</option>
</select> </select>
<input type="text" class="sjgl zdynr" placeholder="输入自定义内容" /> <input type="text" class="sjgl zdynr" placeholder="输入自定义内容" />
</div> </div>
...@@ -313,6 +319,8 @@ ...@@ -313,6 +319,8 @@
<option value="customer_code">客户编码</option> <option value="customer_code">客户编码</option>
<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="delivery_date">送货日期</option>
</select> </select>
<input type="text" class="sjgl zdynr" placeholder="输入自定义内容" /> <input type="text" class="sjgl zdynr" placeholder="输入自定义内容" />
</div> </div>
...@@ -344,6 +352,8 @@ ...@@ -344,6 +352,8 @@
<option value="customer_code">客户编码</option> <option value="customer_code">客户编码</option>
<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="delivery_date">送货日期</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
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
<option value="customer_code">客户编码</option> <option value="customer_code">客户编码</option>
<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="delivery_date">送货日期</option>
</select> </select>
<input type="text" class="sjgl zdynr" placeholder="输入自定义内容" /> <input type="text" class="sjgl zdynr" placeholder="输入自定义内容" />
</div> </div>
...@@ -48,6 +50,8 @@ ...@@ -48,6 +50,8 @@
<option value="customer_code">客户编码</option> <option value="customer_code">客户编码</option>
<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="delivery_date">送货日期</option>
</select> </select>
<input type="text" class="sjgl zdynr" placeholder="输入自定义内容" /> <input type="text" class="sjgl zdynr" placeholder="输入自定义内容" />
</div> </div>
...@@ -79,6 +83,8 @@ ...@@ -79,6 +83,8 @@
<option value="customer_code">客户编码</option> <option value="customer_code">客户编码</option>
<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="delivery_date">送货日期</option>
</select> </select>
<input type="text" class="sjgl zdynr" placeholder="输入自定义内容" /> <input type="text" class="sjgl zdynr" placeholder="输入自定义内容" />
</div> </div>
...@@ -110,6 +116,8 @@ ...@@ -110,6 +116,8 @@
<option value="customer_code">客户编码</option> <option value="customer_code">客户编码</option>
<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="delivery_date">送货日期</option>
</select> </select>
<input type="text" class="sjgl zdynr" placeholder="输入自定义内容" /> <input type="text" class="sjgl zdynr" placeholder="输入自定义内容" />
</div> </div>
...@@ -141,6 +149,8 @@ ...@@ -141,6 +149,8 @@
<option value="customer_code">客户编码</option> <option value="customer_code">客户编码</option>
<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="delivery_date">送货日期</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