admin/liche
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

transfer_10111

Browse Source
This commit is contained in:
dengbw
2022-10-11 17:21:53 +08:00
parent e25a08dbc1
commit 74dd2d10df
3 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/controllers/items/Transfer.php
+6 -1
View File
@@ -44,7 +44,7 @@ class Transfer extends HD_Controller
$autoList[2] = $this->mdAutoSeries->select(array('status' => 1, 'brand_id' => $params['brand_id']), 'id desc', 0, 0, 'id,name');
}
if ($params['s_id']) {
$autoList[3] = $this->mdAutoAttr->select(array('status' => 1,'type' => 1, 's_id' => $params['s_id']), 'id desc', 0, 0, 'id,title as name');
$autoList[3] = $this->mdAutoAttr->select(array('status' => 1, 'type' => 1, 's_id' => $params['s_id']), 'id desc', 0, 0, 'id,title as name');
}
$total = $re['total'];
$this->data['params'] = $re['params'];
@@ -151,6 +151,11 @@ class Transfer extends HD_Controller
$in_time[0] && $where["in_time >="] = $in_time[0] . ' 00:00:00';
$in_time[1] && $where["in_time <="] = $in_time[1] . ' 23:59:59';
}
if ($params['c_time']) {
$c_time = explode(' ~ ', $params['c_time']);
$c_time[0] && $where["c_time >="] = strtotime($c_time[0] . ' 00:00:00');
$c_time[1] && $where["c_time <="] = strtotime($c_time[1] . ' 23:59:59');
}
$total = $this->mdTransfer->count($where);
$lists = array();
if ($total) {
admin/views/items/transfer/lists.php
+13 -24
View File
@@ -68,7 +68,7 @@
</div>
</div>
<div class="am-form-group fl">
<div class="am-para-inline w220">
<div class="am-para-inline w260">
<select id="v_id" name="v_id">
<option value="0">选择车型</option>
<?php if ($autoList[3]) {
@@ -80,6 +80,13 @@
</select>
</div>
</div>
<div class="am-form-group fl">
<label class="am-para-label w70">调拨人：</label>
<div class="am-para-inline w200">
<input id="admin_name" name="admin_name" type="text" placeholder="输入调拨人"
value="<?= $params['admin_name'] ?>"/>
</div>
</div>
<div class="am-form-group" style="margin-bottom: 0px;"></div>
<div class="am-form-group fl">
<label class="am-para-label w70">提车时间：</label>
@@ -96,10 +103,10 @@
</div>
</div>
<div class="am-form-group fl">
<label class="am-para-label w70">调拨人：</label>
<label class="am-para-label w90">调拨时间：</label>
<div class="am-para-inline w200">
<input id="admin_name" name="admin_name" type="text" placeholder="输入调拨人"
value="<?= $params['admin_name'] ?>"/>
<input id="c_time" name="c_time" type="text" value="<?= $params['c_time'] ?>"
placeholder="调拨时间范围" autocomplete="off"/>
</div>
</div>
<div class="am-form-group" style="margin-bottom: 0px;"></div>
@@ -656,26 +663,8 @@
laydate.render({
elem: '#in_time', range: '~'
});
$('.id-day-btn').click(function () {
var type = $(this).data('date'), date = '', d_obj = new Date();
var source_id = $(this).data('source') || 'out_time';
switch (type) {
case 'today':
date = d_obj.Format('yyyy-MM-dd');
date = date + ' ~ ' + date;
break;
case 'yesterday':
date = (new Date(d_obj.getTime() - 86400000)).Format('yyyy-MM-dd');
date = date + ' ~ ' + date;
break;
case '7day':
date = (new Date(d_obj.getTime() - 86400000 * 7)).Format('yyyy-MM-dd') + ' ~ ' + d_obj.Format('yyyy-MM-dd');
break;
case '30day':
date = (new Date(d_obj.getTime() - 86400000 * 30)).Format('yyyy-MM-dd') + ' ~ ' + d_obj.Format('yyyy-MM-dd');
break;
}
$('#' + source_id).val(date);
laydate.render({
elem: '#c_time', range: '~'
});
});
});
market/controllers/api/sylive/Activity.php
+6 -2
View File
@@ -284,8 +284,12 @@ class Activity extends BaseController
$this->return_json('活动不存在');
}
$jsondata = $re['jsondata'] ? json_decode($re['jsondata'], true) : [];
$item = ['title' => $title, 'price' => $price, 'timeStart' => $dateRange[0], 'timeEnd' => $dateRange[1]
, 'useTimeStart' => $dateUseRange[0], 'useTimeEnd' => $dateUseRange[1], 'introduction' => $introduction];
$timeStart = $dateRange[0] ? $dateRange[0] : '';
$timeEnd = $dateRange[1] ? $dateRange[1] : '';
$useTimeStart = $dateUseRange[0] ? $dateUseRange[0] : '';
$useTimeEnd = $dateUseRange[1] ? $dateUseRange[1] : '';
$item = ['title' => $title, 'price' => $price, 'timeStart' => $timeStart, 'timeEnd' => $timeEnd
, 'useTimeStart' => $useTimeStart, 'useTimeEnd' => $useTimeEnd, 'introduction' => $introduction];
if ($itemImg) {
$setItemImg = [];
foreach ($itemImg as $v) {