Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
@@ -28,4 +28,6 @@
|
||||
/* 收回按钮 - 暖橙色 提醒【轻度逆向】 */
|
||||
.btn-recall { background: #f59e0b !important; color: #fff !important; }
|
||||
/* 退回按钮 - 警示红 醒目【高危逆向】 */
|
||||
.btn-return { background: #ef4444 !important; color: #fff !important; }
|
||||
.btn-return { background: #ef4444 !important; color: #fff !important; }
|
||||
/* 归档按钮 - 灰紫色 中性沉稳【归档操作】 */
|
||||
.btn-archive { background: #6b7280 !important; color: #fff !important; }
|
||||
@@ -4,7 +4,7 @@
|
||||
<notebook>
|
||||
<page string="审批详情">
|
||||
<field name="log_ids" style="width:100%; margin-top: 10px;" mode="kanban,tree" context="{'kanban_view_ref':'soong_workflow.soong_workflow_log_kanban'}">
|
||||
<tree editable="bottom">
|
||||
<tree editable="bottom" create="1" edit="1" delete="1">
|
||||
<field name="sequence" string="" widget="handle" groups="soong_workflow.group_soong_workflow_manager"/>
|
||||
<field name="name" string="" readonly="0"/>
|
||||
<field name="comment" string=""/>
|
||||
@@ -20,7 +20,7 @@
|
||||
</page>
|
||||
<page string="抄送/传阅记录" invisible="not log_ids2" mode="kanban,tree" context="{'kanban_view_ref':'soong_workflow.soong_workflow_log2_kanban'}">
|
||||
<field name="log_ids2" style="width:100%; margin-top: 10px;">
|
||||
<tree editable="bottom" >
|
||||
<tree editable="bottom" create="1" edit="1" delete="1">
|
||||
<field name="done_by" string=""/>
|
||||
<field name="commit" string=""/>
|
||||
<field name="lase_click_date" string=""/>
|
||||
@@ -32,7 +32,7 @@
|
||||
</page>
|
||||
<page string="关联流程">
|
||||
<field name="soong_record_ids" style="width:100%; margin-top: 10px;">
|
||||
<tree edit="true" delete="False" editable="bottom" type="object">
|
||||
<tree create="1" edit="1" delete="1" editable="bottom" type="object">
|
||||
<field name="workflow_record_id" domain="[('users_ids', 'in', uid)]"
|
||||
options="{'no_open': True}"/>
|
||||
<field name="code" column_invisible="1"/>
|
||||
|
||||
Reference in New Issue
Block a user