jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #2209: (feature/7141 -> develop)

Browse Source 
Merge Request: 增加kanban悬停tip

Created By: @谷耀东
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @谷耀东
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2209
This commit is contained in:
谷耀东
2025-06-18 15:41:44 +08:00
committed by Coding
parent 749f44d6df 8b66fda899
commit c7b50d9706
3 changed files with 280 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
sf_warehouse/models/model.py
View File

@@ -459,7 +459,41 @@ class ShelfLocation(models.Model):
product_sn_ids = fields.One2many('sf.shelf.location.lot', 'shelf_location_id', string='产品批次号') product_sn_ids = fields.One2many('sf.shelf.location.lot', 'shelf_location_id', string='产品批次号')
# 产品数量 # 产品数量
product_num = fields.Integer('总数量', compute='_compute_number', store=True) product_num = fields.Integer('总数量', compute='_compute_number', store=True)
tool_rfid = fields.Char('Rfid', compute='_compute_tool', store=True)
tool_name_id = fields.Many2one('sf.functional.cutting.tool.entity', string='功能刀具名称', compute='_compute_tool', store=True)
display_rfid = fields.Char('RFID', compute='_compute_display_rfid', store=True)
@api.depends('product_sn_id')
def _compute_display_rfid(self):
"""计算显示 RFID"""
for record in self:
try:
record.display_rfid = record.product_sn_id.rfid if record.product_sn_id else ''
except Exception as e:
record.display_rfid = ''
_logger.error(f"计算 display_rfid 时出错: {e}")
@api.depends('product_id')
def _compute_tool(self):
"""计算工具 RFID"""
for record in self:
try:
if record.product_id:
if record.product_id.categ_id.name == '功能刀具':
# 搜索关联的功能刀具实体
tool_id = self.env['sf.functional.cutting.tool.entity'].search(
[('barcode_id', '=', record.product_sn_id.id)], limit=1
)
if tool_id:
record.tool_rfid = tool_id.rfid
record.tool_name_id = tool_id.id
continue
# 默认值
record.tool_rfid = ''
record.tool_name_id = False
except Exception as e:
record.tool_rfid = ''
record.tool_name_id = False
_logger.error(f"计算 tool_rfid 时出错: {e}")
@api.depends('product_num') @api.depends('product_num')
def _compute_product_num(self): def _compute_product_num(self):
for record in self: for record in self:
@@ -563,6 +597,7 @@ class ShelfLocation(models.Model):
else: else:
_layer_capacity = _layer_capacity _layer_capacity = _layer_capacity
_layer = _layer+1 _layer = _layer+1
_layer_capacity = f"{_layer_capacity:02d}"
record.kanban_show_layer_info=f"{_layer}-{_layer_capacity}" record.kanban_show_layer_info=f"{_layer}-{_layer_capacity}"
record.kanban_show_center_control_code=f"{_cc_code}" record.kanban_show_center_control_code=f"{_cc_code}"

282
sf_warehouse/static/src/css/kanban_location_custom.scss
View File

@@ -1,128 +1,198 @@
// 定义一个 mixin 来处理重复的样式 // 定义看板公共样式的Mixin
@mixin kanban-common-styles($record-count-each-row, @mixin kanban-common-styles($record-count-each-row, $record-gap: 16px) {
$record-gap: 16px,
$color-guide-width: 70px) {
$record-gap-total-width: $record-gap * ($record-count-each-row - 1); $record-gap-total-width: $record-gap * ($record-count-each-row - 1);
display: flex !important; display: flex !important;
flex-wrap: wrap !important; flex-wrap: wrap !important;
overflow-x: hidden !important; overflow-x: hidden !important;
overflow-y: auto !important; overflow-y: auto !important;
padding: 0px !important; padding: 0 !important;
gap: $record-gap !important; gap: $record-gap !important;
width: 100% !important; width: 100% !important;
height: 100% !important; height: 100% !important;
// 设置卡片样式 // === 卡片基础样式（完全保留）===
.o_kanban_record { .o_kanban_record {
flex: 0 0 calc((100% - #{$record-gap-total-width}) / #{$record-count-each-row}) !important; flex: 0 0 calc((100% - #{$record-gap-total-width}) / #{$record-count-each-row}) !important;
height: calc((100% - #{$record-gap * 6}) / 6) !important; // 平均分配高度 height: calc((100% - #{$record-gap * 6}) / 6) !important;
margin: 0 !important; margin: 0 !important;
padding: 0px !important; padding: 0 !important;
background-color: white !important; background-color: white !important;
border: 1px solid #dee2e6 !important; border: 1px solid #dee2e6 !important;
border-radius: 4px !important; border-radius: 4px !important;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) !important; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) !important;
min-width: calc((100% - #{$record-gap-total-width}) / #{$record-count-each-row}) !important; min-width: calc((100% - #{$record-gap-total-width}) / #{$record-count-each-row}) !important;
max-width: calc((100% - #{$record-gap-total-width}) / #{$record-count-each-row}) !important; max-width: calc((100% - #{$record-gap-total-width}) / #{$record-count-each-row}) !important;
position: relative;
transition: all 0.25s ease !important;
overflow: visible !important; // 允许悬停条溢出卡片边界
// === 状态标签（保留原设计）===
.status-label {
position: absolute;
top: 8px;
right: 8px;
padding: 3px 8px;
background: rgba(255, 255, 255, 0.9);
border: 1px solid #e0e0e0;
border-radius: 3px;
font-size: 11px;
color: #424242;
z-index: 2;
}
// === 优化：悬停信息条（核心改动）===
.status-hover-bar {
position: absolute;
bottom: calc(100% + 8px); // 默认显示在卡片上方
left: 0;
z-index: 1000;
min-width: max-content; // 宽度自适应内容
max-width: 300px; // 防止过宽
padding: 10px 12px;
background: rgba(255, 255, 255, 0.95);
border: 1px solid #e0e0e0;
border-radius: 4px;
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
font-size: 12px;
color: #424242;
white-space: nowrap; // 强制单行显示
opacity: 0;
pointer-events: none; // 避免阻挡卡片交互
transition: opacity 0.2s ease, transform 0.2s ease;
transform: translateY(10px);
// 三角形指示器
&::after {
content: '';
position: absolute;
top: 100%;
left: 15px;
border: 6px solid transparent;
border-top-color: rgba(0, 0, 0, 0.85);
}
div {
margin-bottom: 4px;
line-height: 1.4;
}
}
// === 悬停触发逻辑 ===
&:hover {
transform: translateY(-4px) !important;
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08) !important;
z-index: 10;
.status-hover-bar {
background: rgba(50, 50, 50, 0.9);
color: #fff !important;
font-size: 12px;
opacity: 0.9;
transform: translateY(0);
pointer-events: auto; // 悬停时允许交互
}
}
// === 边界保护（智能定位）===
// 左侧卡片：左对齐
&:nth-child(#{$record-count-each-row}n+1) .status-hover-bar {
left: 0;
right: auto;
&::after { left: 15px; }
}
// 右侧卡片：右对齐
&:nth-child(#{$record-count-each-row}n) .status-hover-bar {
left: auto;
right: 0;
&::after {
left: auto;
right: 15px;
}
}
&:nth-child(#{$record-count-each-row}n + #{$record-count-each-row - 1}) .status-hover-bar {
left: auto;
right: 0;
&::after {
left: auto;
right: 15px;
}
}
// 顶部卡片：悬停条显示在下方
&:nth-child(-n+#{$record-count-each-row}) .status-hover-bar {
bottom: auto;
top: calc(100% + 8px);
&::after {
top: auto;
bottom: 100%;
border-top-color: transparent;
border-bottom-color: rgba(255, 255, 255, 0.95);
}
}
// === 禁用状态样式（保留原效果）===
&.kanban_color_3 {
opacity: 0.6;
&:hover { &:hover {
transform: translateY(-1px) !important; opacity: 0.85;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15) !important; .status-hover-bar {
} background:rgba(0, 0, 0, 0.85);
color: white !important;
.o_kanban_record_bottom { border: 1px solid rgba(255, 255, 255, 0.15) !important;
margin: 0; }
}
.oe_kanban_card.kanban_color_3,
.oe_kanban_card.kanban_color_1,
.oe_kanban_card.kanban_color_2 {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
width: 100%;
height: 100%;
.sf_kanban_custom_location_info_style {
display: flex !important;
justify-content: center !important;
align-items: center !important;
width: 100%;
font-size: 14px;
color: #000000;
}
.sf_kanban_no {
display: flex !important;
justify-content: center !important;
align-items: center !important;
font-size: 18px;
color: #000000;
}
} }
}
} }
} }
// 使用 mixin 为不同的列数生成样式 // === 看板视图样式（完全保留）===
.o_kanban_view { .o_kanban_view {
.sf_kanban_location_style { // 卡片内部结构（不修改）
// 设置卡片样式 .o_kanban_record {
.o_kanban_record { .o_kanban_record_bottom {
margin: 0;
&:hover { }
transform: translateY(-1px) !important; .oe_kanban_card.kanban_color_3,
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15) !important; .oe_kanban_card.kanban_color_1,
} .oe_kanban_card.kanban_color_2 {
display: flex;
.o_kanban_record_bottom { flex-direction: column;
margin: 0; justify-content: center;
} align-items: center;
width: 100%;
.oe_kanban_card.kanban_color_3, height: 100%;
.oe_kanban_card.kanban_color_1, .sf_kanban_custom_location_info_style {
.oe_kanban_card.kanban_color_2 { display: flex !important;
display: flex; justify-content: center !important;
flex-direction: column; align-items: center !important;
justify-content: center; width: 100%;
align-items: center; font-size: 15px;
width: 100%; color: #000000;
height: 100%; padding:0px;
.sf_kanban_custom_location_info_style {
display: flex !important;
justify-content: center !important;
align-items: center !important;
width: 100%;
font-size: 14px;
color: #000000;
}
.sf_kanban_no {
display: flex !important;
justify-content: center !important;
align-items: center !important;
font-size: 18px;
color: #000000;
}
}
} }
.sf_kanban_no {
display: flex !important;
justify-content: center !important;
align-items: center !important;
font-size: 18px;
color: #000000;
}
}
} }
// 不同列数的看板样式
.sf_kanban_location_style12 { .sf_kanban_location_style12 {
@include kanban-common-styles(12); @include kanban-common-styles(12);
} }
.sf_kanban_location_style19 { .sf_kanban_location_style19 {
@include kanban-common-styles(19); @include kanban-common-styles(19);
} }
.sf_kanban_location_style4 { .sf_kanban_location_style4 {
@include kanban-common-styles(4); @include kanban-common-styles(4);
} }
.sf_kanban_location_style3 { .sf_kanban_location_style3 {
@include kanban-common-styles(3); @include kanban-common-styles(3);
} }
} }

111
sf_warehouse/views/shelf_location.xml
View File

@@ -193,53 +193,78 @@
</field> </field>
</record> </record>
<record id="shelf_location_kanban_view" model="ir.ui.view"> <record id="shelf_location_kanban_view" model="ir.ui.view">
<field name="name">shelf.location.kanban</field> <field name="name">shelf.location.kanban</field>
<field name="model">sf.shelf.location</field> <field name="model">sf.shelf.location</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<kanban class="sf_kanban_location_style" js_class="custom_kanban" create="0"> <kanban class="sf_kanban_location_style" js_class="custom_kanban" create="0">
<templates> <templates>
<t t-name="kanban-box"> <t t-name="kanban-box">
<t t-set='isBaseStyle' t-value="user_context.isBaseStyle"/> <t t-set='isBaseStyle' t-value="user_context.isBaseStyle"/>
<div t-attf-class="oe_kanban_card oe_kanban_global_click <div t-attf-class="oe_kanban_card oe_kanban_global_click
#{record.location_status.raw_value == '空闲' ? 'kanban_color_1' : ''} #{record.location_status.raw_value == '空闲' ? 'kanban_color_1' : ''}
#{record.location_status.raw_value == '占用' ? 'kanban_color_2' : ''} #{record.location_status.raw_value == '占用' ? 'kanban_color_2' : ''}
#{record.location_status.raw_value == '禁用' ? 'kanban_color_3' : ''}"> #{record.location_status.raw_value == '禁用' ? 'kanban_color_3' : ''}">
<!-- 所有情况都需要的数据 (隐藏) -->
<div style="display:none">
<field name="location_status"/>
<field name="tool_name_id"/>
</div>
<!-- 所有情况都需要的数据 (隐藏) --> <t t-if="isBaseStyle">
<div style="display:none"> <div class="o_kanban_card_header">
<field name="location_status"/> <div class="o_kanban_card_header_title">
<field name="name"/>
</div> </div>
</div>
<div class="o_kanban_record_bottom">
<t t-if="isBaseStyle"> <field name="product_sn_id"/>
<div class="o_kanban_card_header"> <field name="product_id"/>
<div class="o_kanban_card_header_title">
<field name="name"/>
</div>
</div>
<div class="o_kanban_record_bottom">
<field name="product_sn_id"/>
<span>|</span>
<field name="product_id"/>
</div>
</t>
<t t-else="">
<div class="o_kanban_record_bottom sf_kanban_custom_location_info_style">
<field name="kanban_show_layer_info"/>
</div>
<div class="o_kanban_record_bottom sf_kanban_no">
<field name="kanban_show_center_control_code"/>
</div>
</t>
</div> </div>
</t> </t>
</templates>
</kanban> <t t-else="">
</field> <div class="o_kanban_record_bottom sf_kanban_custom_location_info_style">
</record> <field name="kanban_show_layer_info"/>
</div>
<!-- 添加RFID字段 -->
<t t-if="record.data and record.data.display_rfid">
<div class="o_kanban_record_bottom">
<field name="display_rfid"/>
</div>
</t>
<t t-if="record.data and record.data.tool_rfid">
<div class="o_kanban_record_bottom">
<field name="tool_rfid"/>
</div>
</t>
<!-- 悬停时显示的详细信息 -->
<div class="status-hover-bar">
<t t-if="record.product_id.value">
<div>产品: <t t-esc="record.product_id.value"/></div>
</t>
<t t-if="record.product_sn_id.value">
<div>标签ID: <t t-esc="record.product_sn_id.value"/></div>
</t>
<!-- <t t-if="record.display_rfid.value">
<div>rfid: <t t-esc="record.display_rfid.value"/></div>
</t>
<t t-if="record.tool_rfid.value">
<div>rfid: <t t-esc="record.tool_rfid.value"/></div>
</t> -->
<t t-if="record.tool_name_id and record.tool_name_id.value">
<div>功能刀具名称: <t t-esc="record.tool_name_id.value"/></div>
</t>
<div>状态: <t t-esc="record.location_status.value"/></div>
</div>
</t>
</div>
</t>
</templates>
</kanban>
</field>
</record>
<!-- 搜索视图 --> <!-- 搜索视图 -->
<record id="shelf_location_search_view" model="ir.ui.view"> <record id="shelf_location_search_view" model="ir.ui.view">
<field name="name">shelf.location.search</field> <field name="name">shelf.location.search</field>