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

liche update for admin goods export micro change

Browse Source
This commit is contained in:
xxb
2021-09-07 11:55:52 +08:00
parent 2cde142fa1
commit 3c3b727b60
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/controllers/items/goods/Goods.php
+3 -5
View File
@@ -674,8 +674,7 @@ class Goods extends HD_Controller
'bill_num' =>'开票号',
'auto_fine' =>'精品加装',
'status' =>'状态',
'pro_time' =>'生产时间',
'in_time' =>'分配时间',
'in_time' =>'入库时间',
'out_time' =>'出库时间',
'bill_time' =>'开票时间',
);
@@ -685,11 +684,11 @@ class Goods extends HD_Controller
if ($count) {
if(1 == $search_type){
//精品筛选
$fileds = 'id,brand_id,s_id,vin,v_id,cor_id,incor_id,in_time,addr_id,count(type_id) as fine_num';
$fileds = '*,count(type_id) as fine_num';
$orderby = "{$order} {$sort}";
$rows = $this->mdItems->select_fine($where_fine, $orderby, 0, 0, $fileds);
} else {
$fileds = 'id,brand_id,s_id,vin,v_id,cor_id,incor_id,in_time,addr_id';
$fileds = '*';
$orderby = "{$order} {$sort}";
$rows = $this->mdItems->select($where, $orderby, 0, 0, $fileds);
}
@@ -791,7 +790,6 @@ class Goods extends HD_Controller
'bill_num' => $v['bill_num'],
'auto_fine' => $auto_fine,
'status' => $this->statusAry[$v['status']],
'pro_time' => '0000-00-00 00:00:00' == $v['pro_time'] ? '' : $v['pro_time'],
'in_time' => '0000-00-00 00:00:00' == $v['in_time'] ? '' : $v['in_time'],
'out_time' => '0000-00-00 00:00:00' == $v['out_time'] ? '' : $v['out_time'],
'bill_time' => '0000-00-00 00:00:00' == $v['bill_time'] ? '' : $v['bill_time'],
admin/views/items/goods/edit.php
+2 -2
View File
@@ -204,8 +204,8 @@
<tr>
<td class="table-td">
<div class="input-group">
<div class="input-group-addon">平台价</div>
<input type="text" v-model="info.ori_price" placeholder="请输入平台价">
<div class="input-group-addon">指导价</div>
<input type="text" v-model="info.ori_price" placeholder="请输入指导价">
</div>
</td>
<td class="table-td">