goods_logs_1111_3

This commit is contained in:
dengbw
2021-11-11 16:54:40 +08:00
parent 780f470ff2
commit 4cdc6eba1b
5 changed files with 21 additions and 41 deletions
+14 -6
View File
@@ -507,19 +507,27 @@ class Goods extends HD_Controller
$info['in_time'] = $re['in_time'] != '0000-00-00 00:00:00' ? $re['in_time'] : '';
$info['out_time'] = $re['out_time'] != '0000-00-00 00:00:00' ? $re['out_time'] : '';
$info['bill_time'] = $re['bill_time'] != '0000-00-00 00:00:00' ? $re['bill_time'] : '';
if ($info['addr_id']) {
$address = '';
if ($info['biz_id'] > 0) {
$re_biz = $this->mdBiz->get(array('id' => $info['biz_id']));
$re_biz && $address = $re_biz['biz_name'];
if ($re_biz['county_id']) {
$re_area = $this->mdArea->get(array('county_id' => $re_biz['county_id']));
$re_area && $address = "{$re_area['city_name']} {$re_area['county_name']} {$address}";
} else if ($re_biz['city_id']) {
$re_area = $this->mdArea->get(array('city_id' => $re_biz['city_id']));
$re_area && $address = "{$re_area['city_name']} {$address}";
}
} else if ($info['biz_id'] == -1 && $info['addr_id']) {
$row_addr = $this->addr_model->get(array('id' => $info['addr_id']));
$info['address'] = $row_addr['city_name'] . $row_addr['county_name'] . $row_addr['title'];
} else {
$info['address'] = '';
$row_addr && $address = "{$row_addr['city_name']} {$row_addr['county_name']} 其它 {$row_addr['title']}";
}
$info['address'] = $address;
//获取精品加装
$where = array('item_id' => $id, 'type' => 1, 'status' => 1);
$rows_fine = $this->items_relate_model->select($where, '', 0, 0, 'type_id');
$fine_ids = $rows_fine ? array_column($rows_fine, 'type_id') : array();
$info['fine_ids'] = $fine_ids;
$this->data['info'] = $info;
return $this->show_view('/items/goods/get_info');
}
+2 -2
View File
@@ -222,7 +222,7 @@ class Logs extends HD_Controller
$data['autoList'] = $autoList;
$data['statusAry'] = $statusAry;
$data['soldAry'] = $soldAry;
$data['_title'] = '门店调拨记录';
$data['_title'] = '调拨记录';
return $data;
}
@@ -415,7 +415,7 @@ class Logs extends HD_Controller
$params['size'] = 10000;
$data = $indexs = array();
$res = $this->dataSelect($params);
$fileName = '门店调拨记录';
$fileName = $res['_title'];
foreach ($res['lists'] as $key => $value) {
$temp['address'] = $value['address'];
$temp['title'] = $value['title'];
+1 -1
View File
@@ -34,7 +34,7 @@
<td class="table-td">
<div class="input-group">
<div class="input-group-addon">车型</div>
<select style="width: 200px;" v-model="info.v_id" @change="set_attr">
<select style="width: 100%;" v-model="info.v_id" @change="set_attr">
<option value="0">选择车型</option>
<template v-for="(v,i) in showInfo['autoList'][3]">
<option :value="v.id">{{v.name}}</option>
+2 -30
View File
@@ -50,45 +50,17 @@
合格证号:<?= $info['stdard_num'] ?>
</td>
</tr>
<tr>
<td class="table-td">
发动机号:<?= $info['engine_num'] ?>
</td>
<td class="table-td">
</td>
</tr>
</table>
<table width="100%" style="margin:10px 10px 10px 10px;">
<tr>
<td class="table-td">
入库日期:<?= $info['in_time'] ?>
</td>
</tr>
<tr>
<td class="table-td">
平台价:<?= $info['ori_price'] ?>
</td>
<td class="table-td">
折扣%<?= $info['discount'] ?>
</td>
<td class="table-td">
折扣金额:<?= $info['dis_price'] ?>
</td>
</tr>
<tr>
<td class="table-td">
开票日期:<?= $info['bill_time'] ?>
</td>
<td class="table-td">
发票号<?= $info['bill_num'] ?>
</td>
<td class="table-td">
发票金额:<?= $info['bill_price'] ?>
</td>
</tr>
<tr>
<td class="table-td" colspan="3">
采购成本:<?= $info['buy_price'] ?>
指导价<?= $info['ori_price'] ?>
</td>
</tr>
</table>
@@ -98,7 +70,7 @@
</div>
<style type="text/css">
.table-td {
width: 20%;
width: 33.3%;
padding-top: 15px;
line-height: 37px;
font-size: 1.6rem;
+2 -2
View File
@@ -267,7 +267,7 @@
</a>
</span>
</th>
<th width="18%">
<th width="19%">
<span :class="'order'+('addr_id'==params.order?' order-on':' order-none')">
<a href="javascript:void(0)" @click="set_order('addr_id')">
<span>存放地</span>
@@ -285,7 +285,7 @@
</a>
</span>
</th>
<th width="16%">
<th width="15%">
<span :class="'order'+('fine_num'==params.order?' order-on':' order-none')">
<a href="javascript:void(0)" @click="set_order('fine_num')">
<span>精品加装</span>