pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!10601 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang

Browse Source 
Merge pull request !10601 from 李鹏宇/dev_wang
This commit is contained in:
李鹏宇
2026-04-07 08:18:14 +00:00
committed by Gitee
parent 874e0c46a6 d2479c81e4
commit 1fdca5614a
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soong_workflow/views/soong_workflow_record.xml
+4 -4
View File
@@ -303,11 +303,11 @@
<field name="is_manager" column_invisible="1"/>
<field name="is_unlink" column_invisible="1"/>
<field name="is_log2" column_invisible="1"/>
<button name="delete_record" type="object" string="删除" class="btn-primary"
<button name="delete_record" type="object" string="删除" class="btn btn-blue"
confirm="你确定要删除吗?"
invisible="not is_unlink"/>
<button name="greater_record" type="object" string="更多" class="btn-primary" invisible="not is_log2"/>
<button name="reminders_record" type="object" string="催办" class="btn-primary"
<button name="greater_record" type="object" string="更多" class="btn btn-blue" invisible="not is_log2"/>
<button name="reminders_record" type="object" string="催办" class="btn btn-blue"
invisible="approve_state == 'end'"/>
<button name="revoke_record" type="object" string="撤销" class="btn btn-blue"
groups="soong_workflow.group_soong_workflow_manager"/>
@@ -332,7 +332,7 @@
<field name="soong_state" column_invisible="True"/>
<field name="is_manager" column_invisible="1"/>
<field name="is_log2" column_invisible="1"/>
<button name="greater_record" type="object" string="更多" class="btn-primary"
<button name="greater_record" type="object" string="更多" class="btn btn-blue"
invisible="not is_log2"/>
</tree>
</field>
yuthon_catering/views/yuthon_catering.xml
+1 -1
View File
@@ -22,7 +22,7 @@
<field name="dept_id"/>
<field name="menu_day_id" column_invisible="True"/>
<field name="note"/>
<button name="action_confirm" class="btn btn-primary" type="object" string="确认" invisible="state != 'modifying'"/>
<button name="action_confirm" class="btn btn-blue" type="object" string="确认" invisible="state != 'modifying'"/>
</tree>
</field>
</record>
yuthon_issue/views/issue_library_views.xml
+3 -3
View File
@@ -793,15 +793,15 @@
<field name="issue_approval_id" column_invisible="1"/>
<button name="single_meeting_issue" string="上会" type="object" class="btn btn-blue"
invisible="issue_state_boss != 'will' or is_boss_passed == 'pass' or issue_state_boss == False"/>
<button name="meeting_record" string="会议详情" type="object" class="oe_highlight"
<button name="meeting_record" string="会议详情" type="object" class="btn btn-blue"
invisible="issue_state_boss == 'will'"/>
<button name="approval_details" string="审批详情" type="object" class="btn btn-blue"
invisible="not issue_approval_id"/>
<button name="correction" string="修正提醒" type="object" class="btn btn-blue" invisible="is_confirm"/>
<button name="correction_confirm" string="确认" type="object" class="btn btn-blue" invisible="not is_confirm"/>
<button name="refunded" string="退回" type="object" class="btn btn-blue" invisible="boss_char"/>
<button name="issue_cancel" string="取消" type="object" class="oe_highlight"/>
<button name="unlink" string="删除" type="object" class="oe_highlight"/>
<button name="issue_cancel" string="取消" type="object" class="btn btn-blue"/>
<button name="unlink" string="删除" type="object" class="btn btn-blue"/>
</tree>
</field>
</record>
yuthon_maintain/views/property_device_repair_views.xml
+3 -3
View File
@@ -10,9 +10,9 @@
<field name="software_processing_id"/>
<field name="report_state"/>
<field name="create_time"/>
<button name="pull_order" string="提交" type="object" class="btn-primary" invisible="report_state != 'to_submitted'"/>
<button name="device_delete" string="删除" type="object" class="btn-primary" invisible="report_state != 'to_submitted'"/>
<button name="open_record" string="详情" type="object" class="btn-primary" invisible="report_state == 'to_submitted'"/>
<button name="pull_order" string="提交" type="object" class="btn btn-blue" invisible="report_state != 'to_submitted'"/>
<button name="device_delete" string="删除" type="object" class="btn btn-blue" invisible="report_state != 'to_submitted'"/>
<button name="open_record" string="详情" type="object" class="btn btn-blue" invisible="report_state == 'to_submitted'"/>
</tree>
</field>
</record>
yuthon_salary/views/yuthon_salary_active_views.xml
+2 -2
View File
@@ -98,8 +98,8 @@
<field name="model">yuthon.salary.active</field>
<field name="arch" type="xml">
<tree string="我的薪资" create="false" delete="false" edit="false">
<button name="salary_confirm" string="确认" type="object" class="oe_highlight" invisible="confirm_status == 'confirm'"/>
<button name="open_archive_record" string="详情" type="object" class="oe_highlight"/>
<button name="salary_confirm" string="确认" type="object" class="btn btn-blue" invisible="confirm_status == 'confirm'"/>
<button name="open_archive_record" string="详情" type="object" class="btn btn-blue"/>
<field name="select_year"/>
<field name="select_time"/>
<field name="actual_paid_salary" string="实发工资" decoration-danger="1" decoration-bf="1"/>