Skip to content

黄成意 / yunxin

Go to a project
Commit aa27b923 by PRY5YKGJ82EZEPX\Administrator
Options

1.0

parent fb7eb926
Inline Side-by-side
Showing with 22 additions and 16 deletions
app/Jobs/JopExportOrderList.php
...@@ -40,7 +40,7 @@ class JopExportOrderList extends Job implements ShouldQueue ...@@ -40,7 +40,7 @@ class JopExportOrderList extends Job implements ShouldQueue
$filename=date('Y-m-d-H-i-s') . '-' . uniqid() . '.csv'; $filename=date('Y-m-d-H-i-s') . '-' . uniqid() . '.csv';
$filePath = storage_path().DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'uploads'.DIRECTORY_SEPARATOR.$filename; $filePath = storage_path().DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'uploads'.DIRECTORY_SEPARATOR.$filename;
$x=fopen($filePath,'a'); //不存在则创建 $x=fopen($filePath,'a'); //不存在则创建
$Arr = ["订单号","创建时间","订单金额","结算币种","结算方式","付款状态"]; // 表头 $Arr = ["订单号","创建时间","订单金额","结算币种","结算方式","状态"]; // 表头
foreach ($Arr as $k=>$v){ foreach ($Arr as $k=>$v){
$Arr[$k]=iconv('utf-8','gbk//IGNORE',$v); $Arr[$k]=iconv('utf-8','gbk//IGNORE',$v);
} }
......
public/pc/js/controller/OrderDetail.js
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
"<td><span class=\"t1\">"+s.mpq+"</span></td>" + "<td><span class=\"t1\">"+s.mpq+"</span></td>" +
"<td><span class=\"t1\">"+s.packing_id+"</span></td>" + "<td><span class=\"t1\">"+s.packing_id+"</span></td>" +
"<td><span class=\"t1\">"+s.putaway_number+"</span></td>" + "<td><span class=\"t1\">"+s.putaway_number+"</span></td>" +
"<td><span class=\"t1\">"+s.initial_price+"</span></td>" + "<td><span class=\"t1\">"+s.picking_price+"</span></td>" +
"</tr>" "</tr>"
} }
$("#shopListContent").html(html) $("#shopListContent").html(html)
......
resources/views/pc/AbnormalList.blade.php
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<input type="text" name="create_time2" class="inp w120 order-time-2" lay-key="2" placeholder="结束时间"> <input type="text" name="create_time2" class="inp w120 order-time-2" lay-key="2" placeholder="结束时间">
</div> </div>
<div class="lineBlock input-inline va-m" id="search"> <div class="lineBlock input-inline va-m" id="search">
<a href="javascript:;" class="search-btn"> <a href="javascript:;" class="export-btn">
<i class="iconfont icon-chaxun-"></i> <i class="iconfont icon-chaxun-"></i>
<span>查询</span> <span>查询</span>
</a> </a>
...@@ -42,6 +42,12 @@ ...@@ -42,6 +42,12 @@
<span>导出</span> <span>导出</span>
</a> </a>
</div> </div>
<div class="lineBlock input-inline va-m" id="reset">
<a href="javascript:;" class="export-btn">
<i class="iconfont icon-shangpinguanli-"></i>
<span>重置</span>
</a>
</div>
</div> </div>
</form> </form>
...@@ -50,7 +56,7 @@ ...@@ -50,7 +56,7 @@
</div> </div>
<script type="text/html" id="cahe"> <script type="text/html" id="cahe">
<a class="btn btn-xs btn-outline btn-danger pointer" href="/web/AbnormalDetail?id=@{{ d.abnormal_id }}" >明细</a> <a class="btn btn-xs btn-outline btn-danger pointer" style="color: #1080d0;border: 1px solid #1080d0;" href="/web/AbnormalDetail?id=@{{ d.abnormal_id }}" >&nbsp;明细&nbsp;</a>
</script> </script>
</div> </div>
......
resources/views/pc/GoodsList.blade.php
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</div> </div>
<div style="margin-top: 10px"> <div style="margin-top: 10px">
<div class="lineBlock input-inline va-m" id="search"> <div class="lineBlock input-inline va-m" id="search">
<a href="javascript:;" class="search-btn"> <a href="javascript:;" class="export-btn">
<i class="iconfont icon-chaxun-"></i> <i class="iconfont icon-chaxun-"></i>
<span>查询</span> <span>查询</span>
</a> </a>
...@@ -42,14 +42,14 @@ ...@@ -42,14 +42,14 @@
{{--</a>--}} {{--</a>--}}
{{--</div>--}} {{--</div>--}}
<div class="lineBlock input-inline va-m" id="export"> <div class="lineBlock input-inline va-m" id="export">
<a href="javascript:;" class="search-btn"> <a href="javascript:;" class="export-btn">
<i class="iconfont icon-chaxun-"></i> <i class="iconfont icon-daochu-"></i>
<span>导出</span> <span>导出</span>
</a> </a>
</div> </div>
<div class="lineBlock input-inline va-m" id="reset"> <div class="lineBlock input-inline va-m" id="reset">
<a href="javascript:;" class="search-btn"> <a href="javascript:;" class="export-btn">
<i class="iconfont icon-chaxun-"></i> <i class="iconfont icon-shangpinguanli-"></i>
<span>重置</span> <span>重置</span>
</a> </a>
</div> </div>
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
</div> </div>
<script type="text/html" id="cahe"> <script type="text/html" id="cahe">
<button class="btn btn-xs btn-outline btn-danger pointer" onclick="purePrice(@{{ d.goods_id }})">价格明细</button> <button class="btn btn-xs btn-outline btn-success pointer" style="color: #1080d0;border: 1px solid #1080d0;" onclick="purePrice(@{{ d.goods_id }})">&nbsp;价格明细&nbsp;</button>
</script> </script>
</div> </div>
......
resources/views/pc/OrderList.blade.php
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<input type="text" name="create_time2" class="inp w120 order-time-2" lay-key="2" placeholder="结束时间"> <input type="text" name="create_time2" class="inp w120 order-time-2" lay-key="2" placeholder="结束时间">
</div> </div>
<div class="lineBlock input-inline va-m" id="search"> <div class="lineBlock input-inline va-m" id="search">
<a href="javascript:;" class="search-btn"> <a href="javascript:;" class="export-btn">
<i class="iconfont icon-chaxun-"></i> <i class="iconfont icon-chaxun-"></i>
<span>查询</span> <span>查询</span>
</a> </a>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</div> </div>
<div class="lineBlock input-inline va-m" id="reset"> <div class="lineBlock input-inline va-m" id="reset">
<a href="javascript:;" class="export-btn"> <a href="javascript:;" class="export-btn">
<i class="iconfont icon-daochu-"></i> <i class="iconfont icon-shangpinguanli-"></i>
<span>重置</span> <span>重置</span>
</a> </a>
</div> </div>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</div> </div>
<script type="text/html" id="cahe"> <script type="text/html" id="cahe">
<a class="btn btn-xs btn-outline btn-danger pointer" href="/web/OrderDetail?id=@{{ d.order_id }}" >明细</a> <a class="btn btn-xs btn-outline btn-danger pointer" style="color: #1080d0;border: 1px solid #1080d0;" href="/web/OrderDetail?id=@{{ d.order_id }}" >&nbsp;明细&nbsp;</a>
</script> </script>
</div> </div>
......
resources/views/pc/PutawayList.blade.php
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<input type="text" name="create_time2" class="inp w120 order-time-2" lay-key="2" placeholder="结束时间"> <input type="text" name="create_time2" class="inp w120 order-time-2" lay-key="2" placeholder="结束时间">
</div> </div>
<div class="lineBlock input-inline va-m" id="search"> <div class="lineBlock input-inline va-m" id="search">
<a href="javascript:;" class="search-btn"> <a href="javascript:;" class="export-btn">
<i class="iconfont icon-chaxun-"></i> <i class="iconfont icon-chaxun-"></i>
<span>查询</span> <span>查询</span>
</a> </a>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</div> </div>
<div class="lineBlock input-inline va-m" id="reset"> <div class="lineBlock input-inline va-m" id="reset">
<a href="javascript:;" class="export-btn"> <a href="javascript:;" class="export-btn">
<i class="iconfont icon-daochu-"></i> <i class="iconfont icon-shangpinguanli-"></i>
<span>重置</span> <span>重置</span>
</a> </a>
</div> </div>
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</div> </div>
<script type="text/html" id="cahe"> <script type="text/html" id="cahe">
<a class="btn btn-xs btn-outline btn-danger pointer" href="/web/PutawayDetail?id=@{{ d.putaway_id }}" >明细</a> <a class="btn btn-xs btn-outline btn-danger pointer" style="color: #1080d0;border: 1px solid #1080d0;" href="/web/PutawayDetail?id=@{{ d.putaway_id }}" >&nbsp;明细&nbsp;</a>
</script> </script>
</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