Skip to content

黄成意 / yunxin

Go to a project
Commit a050f11b by PRY5YKGJ82EZEPX\Administrator
Options

1.0

parent c5196e67
Inline Side-by-side
Showing with 159 additions and 7 deletions
app/Http/Controllers/WebController.php
......@@ -140,7 +140,16 @@ class WebController extends Controller
$data['db'] = $db == "" ? "yunxin":$db;
return view('pure', $data);
}
//财务对账列表
private function PutawayList($request,$data,$id){
$data['title']='对账列表';
return view('pc',$data);
}
//财务对账列表-明细
private function PutawayDetail($request,$data,$id){
$data['title']='对账详情';
return view('pc',$data);
}
}
app/Model/SupplierAccountModel.php
......@@ -101,7 +101,7 @@ class SupplierAccountModel extends Model
$new_password = $request->input('new_password');
$code= Request::input('code');//验证码
if ($this->CheckCode && (empty($code) || @$_SESSION['yunxin_captcha'] != $code)) {
if ($this->CheckCode && (empty($code) || Session::get('yunxin_captcha',true) != $code)) {
return [1001,'验证码不正确'];
}
$account = $this->where("id",$request->account_id)->first();
......
public/pc/js/controller/PutawayList.js 0 → 100644
;!function () {
var ids = []; //选择的ids
var table_data = [];
window.app = {
init: function () {
app.tableList();
//刷新列表
$("#search").click(function () {
app.tableList()
})
//重置表单
$("#reset").click(function () {
$('#form1')[0].reset()
})
//导出
$("#export").click(function () {
app.export()
})
//下单时间选择
layui.laydate.render({
elem: '.order-time-1',
theme: '#1080d0'
});
layui.laydate.render({
elem: '.order-time-2',
theme: '#1080d0'
});
},
tableList:function () {
layui.table.render({
elem: '#list'
,url:'/api/ApiPutawayList'
,method:'post'
,cellMinWidth: 100 //全局定义常规单元格的最小宽度
,request: {
pageName: 'p' //页码的参数名称，默认：page
,limitName: 'limit' //每页数据量的参数名，默认：limit
}
,where: formJson('form1')
,loading:true
,first: true //不显示首页
,last: false //不显示尾页
,cols: [[
{field:'order_sn', title: '订单号',align:'center'}
,{field:'create_time', title: '创建时间',align:'center'}
,{field:'picking_amount', title: '订单金额',align:'center'}
,{field:'currency', title: '结算币种',align:'center'}
,{field:'pay_type', title: '结算方式',align:'center'}
,{field:'status', title: '付款状态',align:'center'}
,{field:'cahe', title: '操作',templet:'#cahe',width:80,align:'center', fixed: 'right'}
]]
,id:'Abnormal'
,page:{
}
,done: function(res, curr, count) {
table_data=res.data;
}
});
},
export:function (){ //商品列表导出
common_export('/api/ApiOrderListExport',formJson('form1'))
}
}, $(function () {
app.init();
})
}();
resources/views/pc.blade.php
......@@ -125,17 +125,18 @@
<i class="line"></i>
<a href="/web/AbnormalList">退货列表(寄售)</a>
</dd>
<!--
{{--<dd class=" <?php if( in_array($id,['OrderList','OrderDetail']) !== false ) echo "curr" ?>">--}}
{{--<i class="line"></i>--}}
{{--<a href="/web/OrderList">订单列表</a>--}}
{{--</dd>--}}
<dd class=" <?php if( in_array($id,['PutawayList','PutawayDetail']) !== false ) echo "curr" ?>">
<i class="line"></i>
<a href="/web/OrderList">入库列表(寄售)</a>
</dd>
<!--
{{--<dd class=" <?php if( in_array($id,['AbnormalList','AbnormalDetail']) !== false ) echo "curr" ?>">--}}
{{--<i class="line"></i>--}}
{{--<a href="/web/AbnormalList">退货列表</a>--}}
{{--</dd>--}} -->
</dl>
</li>
<!--
{{--<li >--}}
{{--<a href="javascript:;" class="bx">--}}
......
resources/views/pc/PutawayList.blade.php 0 → 100644
<div class="lx-content-r fr">
<div class="tit-bar">
<a href="">订单管理</a>
<span>&gt;</span>
<a class="text" href="">{{ $title }}</a>
</div>
<div class="con-section shop-list">
<p class="text">{{ $title }}</p>
<form action="" id="form1">
<div class="search-bar">
<div class="lineBlock input-inline va-m">
<label class="tag">订单号：</label>
<input type="text" class="inp w180" name="order_sn" placeholder="输入订单号">
</div>
<div class="lineBlock input-inline va-m">
<label class="tag">型号：</label>
<input type="text" class="inp w180" name="goods_name" placeholder="输入型号">
</div>
<div class="lineBlock input-inline va-m">
<label class="tag">状态：</label>
<select class="sel w180" name="status">
<option value=""></option>
<option value="-10">已取消</option>
<option value="-2">处理中</option>
<option value="6">部分收货</option>
<option value="10">完全收货</option>
</select>
</div>
<div class="lineBlock input-inline va-m">
<label class="tag">下单时间：</label>
<input type="text" name="create_time1" class="inp w120 order-time-1" lay-key="1" placeholder="开始时间">
<span class="lineBlock va-m line">~</span>
<input type="text" name="create_time2" class="inp w120 order-time-2" lay-key="2" placeholder="结束时间">
</div>
<div class="lineBlock input-inline va-m" id="search">
<a href="javascript:;" class="search-btn">
<i class="iconfont icon-chaxun-"></i>
<span>查询</span>
</a>
</div>
<div class="lineBlock input-inline va-m" id="export">
<a href="javascript:;" class="export-btn">
<i class="iconfont icon-daochu-"></i>
<span>导出</span>
</a>
</div>
<div class="lineBlock input-inline va-m" id="reset">
<a href="javascript:;" class="export-btn">
<i class="iconfont icon-daochu-"></i>
<span>重置</span>
</a>
</div>
</div>
</form>
<div class="table-list" id="shopList">
<table class="layui-table" lay-filter="test" id="list"></table>
</div>
<script type="text/html" id="cahe">
<a class="btn btn-xs btn-outline btn-danger pointer" href="/web/OrderDetail?id=@{{ d.order_id }}" >明细</a>
</script>
</div>
</div>
<style>
.lx-content .lx-content-wrap .lx-content-r .con-section .table-list table tr th{
border-top: none !important;
}
</style>
\ No newline at end of file
resources/views/pc/ResetPassword.blade.php
......@@ -27,6 +27,9 @@
<a href="javascript:;" class="va-m code">换一张</a>
</div>
</div>
<div class="text-wrap clr">
<div class="error" style="display: none"> 帐号或密码错误，请重新输入！</div>
</div>
<div class="bnt-wrap mt1">
<a href="javascript:;" class="ok btn lineBlock" onclick="ResetPassword()">确定</a>
</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