|
|
@@ -14,10 +14,10 @@
|
|
|
</div>
|
|
|
<div class="modal-body container row" style="text-align:center">
|
|
|
<div class="col-2 mt-2" v-for="owner in owners">
|
|
|
- <div style="border: 1px solid #aac7ea;height: 80px;text-align: center;line-height: 80px;border-radius: 4px;cursor: pointer"
|
|
|
+ <div class="tooltipTarget" style="border: 1px solid #aac7ea;height: 80px;text-align: center;line-height: 80px;border-radius: 4px;cursor: pointer;overflow: hidden"
|
|
|
:style="[{'background': loggingOwners.includes(Number(owner.name)) ? '#00FF00' : ''},
|
|
|
{'box-shadow' : seekOwners.includes(owner.name) ? '0px 0px 10px 5px rgba(0,0,0,0.9)' : ''}]"
|
|
|
- @click="addLoggingOwner( owner.name,owner.value )">@{{ owner.value }}</div>
|
|
|
+ @click="addLoggingOwner( owner.name,owner.value )" :title="owner.value">@{{ owner.value }}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -71,6 +71,7 @@
|
|
|
<td>@{{ inventoryDailyLog.commodity_height }}</td>
|
|
|
<td>@{{ inventoryDailyLog.commodity_volumn }}</td>
|
|
|
<td>@{{ inventoryDailyLog.volumn_occupied }}</td>
|
|
|
+ <td>@{{ inventoryDailyLog.gross_weight }}</td>
|
|
|
</tr>
|
|
|
</table>
|
|
|
{{$inventoryDailyLogs->appends($param)->links()}}
|
|
|
@@ -100,7 +101,8 @@
|
|
|
commodity_width:'{{$inventoryDailyLog->commodity ? $inventoryDailyLog->commodity->width : ''}}',
|
|
|
commodity_height:'{{$inventoryDailyLog->commodity ? $inventoryDailyLog->commodity->height : ''}}',
|
|
|
commodity_volumn:'{{$inventoryDailyLog->commodity ? $inventoryDailyLog->commodity->volumn : ''}}',
|
|
|
- volumn_occupied:'{{$inventoryDailyLog->volumn_occupied}}'},
|
|
|
+ volumn_occupied:'{{$inventoryDailyLog->volumn_occupied}}',
|
|
|
+ gross_weight:'{{$inventoryDailyLog->gross_weight}}'},
|
|
|
@endforeach
|
|
|
],
|
|
|
owners : [
|
|
|
@@ -163,6 +165,7 @@
|
|
|
{name: 'commodity_height', value: '高', neglect: true},
|
|
|
{name: 'commodity_volumn', value: '体积', neglect: true},
|
|
|
{name: 'volumn_occupied', value: '总占用体积', neglect: true},
|
|
|
+ {name: 'gross_weight', value: '总毛重', neglect: true},
|
|
|
];
|
|
|
let _this = this;
|
|
|
setTimeout(function () {
|