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

ljm 会议二维码

Browse Source
This commit is contained in:
李鹏宇
2024-08-19 16:25:09 +08:00
parent 826ce9b33d
commit 1be44202de
22 changed files with 154 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
room/models/room_booking.py
+4 -4
View File
@@ -63,7 +63,7 @@ class RoomBooking(models.Model):
# odoo发通知
def meeting_sign_in(self):
# todo 需要写一个页面填写信息之后返回给地址
code_url = "" # 制作填写表单的地址
code_url = "https://pengyuthon.com/contactus" # 制作填写表单的地址
qrcode_url = qrcode.make(code_url)
buffer = BytesIO()
qrcode_url.save(buffer, format='PNG')
@@ -134,7 +134,7 @@ class RoomBooking(models.Model):
kwargs={
"location": record.room_id.name,
"invitees": {
"userid": record.room_users_ids.oauth_uid
"userid": [r.oauth_uid for r in record.room_users_ids]
},
}
)
@@ -148,10 +148,10 @@ class RoomBooking(models.Model):
kwargs={
"title": title,
"meeting_start": meeting_start,
"meeting_duration" :meeting_duration,
"meeting_duration":meeting_duration,
"location": record.room_id.name,
"invitees": {
"userid": record.room_users_ids.oauth_uid
"userid": [r.oauth_uid for r in record.room_users_ids]
},
}
)
room/wizard/room_booking_sign_wizard.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<field name="arch" type="xml">
<form>
<group>
<field name="qrcode_image" widget="image"/>
<field name="qrcode_image" widget="image" readonly="1"/>
</group>
</form>
</field>
yuthon_issue/__manifest__.py
+1
View File
@@ -20,6 +20,7 @@
'views/issue_approval_class_views.xml',
'views/issue_approval_boss_views.xml',
'views/inherit_room_booking_views.xml',
'views/menus.xml',
],
'installable': True,
'application': True,
yuthon_issue/models/issue_library.py
+6
View File
@@ -15,8 +15,14 @@ class IssueLibrary(models.Model):
statu = fields.Selection([('draft', '草稿'), ('approval', '审批中'), ('done', '已通过'), ('stop', '已拒绝'),
('will', '待上会'), ('on_meet', '已上会'), ('cancel', '已取消')], default='draft', string="议题状态")
is_party = fields.Boolean(string="党之委会")
is_party_pass = fields.Boolean(string="通过")
is_party_note = fields.Text(string="不通过意见")
is_class = fields.Boolean(string="班子会")
is_class_pass = fields.Boolean(string="通过")
is_class_note = fields.Text(string="不通过意见")
is_boss = fields.Boolean(string="董事会")
is_boss_pass = fields.Boolean(string="通过")
is_boss_note = fields.Text(string="不通过意见")
is_note = fields.Boolean(string="备案、核准")
creart_datetime = fields.Datetime(string="创建时间", default=fields.Datetime.now)
notice_documents_ids = fields.Many2many('documents.document', string="议题管理文件")
yuthon_issue/security/ir.model.access.csv
+3
View File
@@ -1,3 +1,6 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_issue_library,issue_library,model_issue_library,base.group_user,1,1,1,1
access_issue_approval_boss,issue_approval_boss,model_issue_approval_boss,base.group_user,1,1,1,1
access_issue_approval_class,issue_approval_class,model_issue_approval_class,base.group_user,1,1,1,1
access_issue_approval_party,issue_approval_party,model_issue_approval_party,base.group_user,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_issue_library issue_library model_issue_library base.group_user 1 1 1 1
3 access_issue_approval_boss issue_approval_boss model_issue_approval_boss base.group_user 1 1 1 1
4 access_issue_approval_class issue_approval_class model_issue_approval_class base.group_user 1 1 1 1
5 access_issue_approval_party issue_approval_party model_issue_approval_party base.group_user 1 1 1 1
6
yuthon_issue/views/issue_approval_boss_views.xml
+1 -7
View File
@@ -63,13 +63,7 @@
<field name="name">董事会议题审批</field>
<field name="res_model">issue.approval.boss</field>
<field name="view_mode">tree,form</field>
<!-- <field name="search_view_id" ref="view_issue_approval_filter"/>-->
</record>
<menuitem
id="issue_approval_boss_menu"
parent="issue_approval_menu"
name="董事会议题审批"
action="issue_approval_boss_action"
sequence="30"/>
</odoo>
yuthon_issue/views/issue_approval_class_views.xml
+1 -7
View File
@@ -63,13 +63,7 @@
<field name="name">领导班子议题审批</field>
<field name="res_model">issue.approval.class</field>
<field name="view_mode">tree,form</field>
<!-- <field name="search_view_id" ref="view_issue_approval_filter"/>-->
</record>
<menuitem
id="issue_approval_class_menu"
parent="issue_approval_menu"
name="领导班子议题审批"
action="issue_approval_class_action"
sequence="20"/>
</odoo>
yuthon_issue/views/issue_approval_party_views.xml
+1 -6
View File
@@ -66,10 +66,5 @@
<!-- <field name="search_view_id" ref="view_issue_approval_filter"/>-->
</record>
<menuitem
id="issue_approval_party_menu"
parent="issue_approval_menu"
name="党总支议题审批"
action="issue_approval_party_action"
sequence="10"/>
</odoo>
yuthon_issue/views/issue_library_views.xml
+38 -97
View File
@@ -11,8 +11,11 @@
<field name="name"/>
<field name="code"/>
<field name="is_party"/>
<field name="is_party_pass"/>
<field name="is_class"/>
<field name="is_class_pass"/>
<field name="is_boss"/>
<field name="is_boss_pass"/>
<field name="is_note"/>
<field name="creart_datetime"/>
<field name="statu"/>
@@ -40,11 +43,17 @@
<group>
<field name="code"/>
<field name="is_party"/>
<field name="is_party_pass"/>
<field name="is_party_note" invisible="is_party_pass == True"/>
<field name="is_class"/>
<field name="is_class_pass"/>
<field name="is_class_note" invisible="is_class_pass == True"/>
<field name="creart_datetime"/>
</group>
<group>
<field name="is_boss"/>
<field name="is_boss_pass"/>
<field name="is_boss_note" invisible="is_boss_pass == True"/>
<field name="is_note"/>
<field name="room_booking_id"/>
<field name="notice_documents_ids">
@@ -75,21 +84,32 @@
<group expand="0">
<filter name="group_manager" string="会议状态" domain="[]" context="{'group_by': 'statu'}"/>
</group>
<!-- <searchpanel>-->
<!-- <field name="issue_type_id" string="议题类别" enable_counters="1"/>-->
<!-- </searchpanel>-->
</search>
</field>
</record>
<record id="issue_library_action" model="ir.actions.act_window">
<field name="name">待上会</field>
<field name="res_model">issue.library</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_issue_library_filter"/>
<field name="name">议题库</field>
<field name="res_model">issue.library</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_issue_library_filter"/>
</record>
<record id="issue_library_action_will" model="ir.actions.act_window">
<field name="name">待上会</field>
<field name="res_model">issue.library</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('statu','=','will')]</field>
</record>
<record id="issue_library_action_done" model="ir.actions.act_window">
<field name="name">已上会</field>
<field name="res_model">issue.library</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('statu','=','on_meet')]</field>
</record>
<!-- 其他部门的议题库 无董事长 -->
<record id="view_issue_library_tree2" model="ir.ui.view">
<field name="name">issue.library.tree</field>
<field name="model">issue.library</field>
@@ -152,45 +172,34 @@
</field>
</record>
<record id="view_issue_library_filter2" model="ir.ui.view">
<field name="name">issue.library.search</field>
<field name="model">issue.library</field>
<field name="arch" type="xml">
<search string="议题">
<filter string="待上会" name="statu" domain="[('statu', '=', 'will')]"/>
<filter string="已上会" name="statu" domain="[('statu', '=', 'on_meet')]"/>
<group expand="0">
<filter name="group_manager" string="会议状态" domain="[]" context="{'group_by': 'statu'}"/>
</group>
<!-- <searchpanel>-->
<!-- <field name="issue_type_id" string="议题类别" enable_counters="1"/>-->
<!-- </searchpanel>-->
</search>
</field>
</record>
<record id="issue_library_action2" model="ir.actions.act_window">
<field name="name">已上会</field>
<field name="name">议题库</field>
<field name="res_model">issue.library</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_issue_library_filter"/>
<field name="view_ids" eval="[(5, 0, 0),
(0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree2')}),
(0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form2')})]"/>
<field name="context">{'search_default_group_by_statu': 'on_meet'}</field>
</record>
<record id="issue_library_action2" model="ir.actions.act_window">
<record id="issue_library_action_will2" model="ir.actions.act_window">
<field name="name">待上会</field>
<field name="res_model">issue.library</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('statu','=','will')]</field>
<field name="view_ids" eval="[(5, 0, 0),
(0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree2')}),
(0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form2')})]"/>
</record>
<record id="issue_library_action3" model="ir.actions.act_window">
<record id="issue_library_action_done2" model="ir.actions.act_window">
<field name="name">已上会</field>
<field name="res_model">issue.library</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('statu','=','on_meet')]</field>
<field name="view_ids" eval="[(5, 0, 0),
(0, 0, {'view_mode': 'tree', 'view_id': ref('yuthon_issue.view_issue_library_tree2')}),
(0, 0, {'view_mode': 'form', 'view_id': ref('yuthon_issue.view_issue_library_form2')})]"/>
</record>
<record id="all_meting_issue" model="ir.actions.server">
@@ -200,72 +209,4 @@
<field name="state">code</field>
<field name="code">action = model.all_meeting_issue()</field>
</record>
<menuitem
id="tianhe_issue_library_menu_root"
name="议题管理"
web_icon="yuthon_issue,static/description/icon.png"
sequence="1"/>
<menuitem
id="tianhe_issue_library_menu"
parent="tianhe_issue_library_menu_root"
name="议题库"
sequence="5"/>
<menuitem
id="tianhe_other_issue_library_menu"
parent="tianhe_issue_library_menu_root"
name="子部门议题库"
action="issue_library_action"
sequence="20"/>
<menuitem
id="yuthon_issue_other_will"
parent="tianhe_other_issue_library_menu"
name="待上会"
action="issue_library_action"
sequence="2"/>
<menuitem
id="yuthon_issue_other_on_meet"
parent="tianhe_other_issue_library_menu"
name="已上会"
action="issue_library_action2"
sequence="3"/>
<!-- <menuitem-->
<!-- id="tianhe_party_issue_library_menu"-->
<!-- parent="tianhe_issue_library_menu_root"-->
<!-- name="党总支议题库"-->
<!-- action="issue_library_action"-->
<!-- sequence="30"/>-->
<!-- <menuitem-->
<!-- id="tianhe_class_issue_library_menu"-->
<!-- parent="tianhe_issue_library_menu_root"-->
<!-- name="班子会议题库"-->
<!-- action="issue_library_action"-->
<!-- sequence="40"/>-->
<!-- <menuitem-->
<!-- id="tianhe_boss_issue_library_menu"-->
<!-- parent="tianhe_issue_library_menu_root"-->
<!-- name="董事长议题库"-->
<!-- action="issue_library_action"-->
<!-- sequence="50"/>-->
<menuitem
id="tianhe_issue_library_menu_will"
parent="tianhe_issue_library_menu"
name="待上会"
action="issue_library_action2"
sequence="8"/>
<menuitem
id="tianhe_issue_library_menu_on_meet"
parent="tianhe_issue_library_menu"
name="已上会"
action="issue_library_action3"
sequence="10"/>
<menuitem
id="issue_approval_menu"
parent="tianhe_issue_library_menu_root"
name="议题审批"
action="issue_library_action"
sequence="9"/>
</odoo>
yuthon_issue/views/issue_type_views.xml
+6 -6
View File
@@ -17,10 +17,10 @@
<field name="view_mode">tree</field>
</record>
<menuitem
id="tianhe_issue_type_menu"
parent="tianhe_issue_library_menu_root"
name="议题类别管理"
action="issue_type_action"
sequence="5"/>
<!-- <menuitem-->
<!-- id="tianhe_issue_type_menu"-->
<!-- parent="tianhe_issue_library_menu_root"-->
<!-- name="议题类别管理"-->
<!-- action="issue_type_action"-->
<!-- sequence="5"/>-->
</odoo>
yuthon_issue/views/menus.xml
+87
View File
@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<menuitem
id="tianhe_issue_library_menu_root"
name="议题管理"
web_icon="yuthon_issue,static/description/icon.png"
sequence="1"/>
<!-- 天河投资议题库管理 -->
<menuitem
id="tianhe_issue_library_menu"
parent="tianhe_issue_library_menu_root"
name="议题库"
sequence="5"/>
<menuitem
id="tianhe_issue_library_all"
parent="tianhe_issue_library_menu"
name="全部"
action="issue_library_action"
sequence="1"/>
<menuitem
id="tianhe_issue_library_menu_will"
parent="tianhe_issue_library_menu"
name="待上会"
action="issue_library_action_will"
sequence="5"/>
<menuitem
id="tianhe_issue_library_menu_on_meet"
parent="tianhe_issue_library_menu"
name="已上会"
action="issue_library_action_done"
sequence="10"/>
<!-- 物管，粮储 议题库管理 -->
<menuitem
id="tianhe_other_issue_library_menu"
parent="tianhe_issue_library_menu_root"
name="子部门议题库"
sequence="8"/>
<menuitem
id="tianhe_issue_library_all2"
parent="tianhe_other_issue_library_menu"
name="全部"
action="issue_library_action2"
sequence="1"/>
<menuitem
id="other_issue_library_menu_will"
parent="tianhe_other_issue_library_menu"
name="待上会"
action="issue_library_action_will2"
sequence="5"/>
<menuitem
id="other_issue_library_menu_on_meet"
parent="tianhe_other_issue_library_menu"
name="已上会"
action="issue_library_action_done2"
sequence="10"/>
<menuitem
id="issue_approval_menu"
parent="tianhe_issue_library_menu_root"
name="议题审批"
action="issue_library_action"
sequence="9"/>
<menuitem
id="issue_approval_party_menu"
parent="issue_approval_menu"
name="党总支议题审批"
action="issue_approval_party_action"
sequence="10"/>
<menuitem
id="issue_approval_class_menu"
parent="issue_approval_menu"
name="领导班子议题审批"
action="issue_approval_class_action"
sequence="20"/>
<menuitem
id="issue_approval_boss_menu"
parent="issue_approval_menu"
name="董事会议题审批"
action="issue_approval_boss_action"
sequence="30"/>
</odoo>
yuthon_res_partner/__init__.py
-3
View File
@@ -1,3 +0,0 @@
# -*- coding: utf-8 -*-
from . import models
yuthon_res_partner/__manifest__.py
-22
View File
@@ -1,22 +0,0 @@
# -*- coding: utf-8 -*-
{
'name': "Yuthon Res Partner",
'summary': "联系人承租方",
'description': """
""",
'author': 'pengyuthon',
'website': 'https://www.pengyuthon.com',
'category': 'Human Resources/Attendances',
'version': '0.1',
'license': 'LGPL-3',
'depends': ['base', 'account', 'contacts'],
'data': [
'security/ir.model.access.csv',
'views/yuthon_res_partner_views.xml',
'views/contacts_inherit_menu_views.xml',
],
'installable': True,
'application': True,
}
yuthon_res_partner/models/__init__.py
-3
View File
@@ -1,3 +0,0 @@
# -*- coding: utf-8 -*-
from . import yuthon_res_partner
yuthon_res_partner/security/ir.model.access.csv
-4
View File
@@ -1,4 +0,0 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
yuthon_res_partner/static/description/icon.svg
-1
View File
@@ -1 +0,0 @@
<svg width="50" height="50" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg"><path d="M28 16c0 5.523-4.477 10-10 10S8 21.523 8 16 12.477 6 18 6s10 4.477 10 10Z" fill="#1AD3BB"/><path d="M43 24a5 5 0 1 1-10 0 5 5 0 0 1 10 0Zm-27 7h26a4 4 0 0 1 4 4v5a4 4 0 0 1-4 4H16V31Z" fill="#005E7A"/><path d="M4 31h16c7.18 0 13 5.82 13 13H17C9.82 44 4 38.18 4 31Z" fill="#1AD3BB"/><path d="M23.549 12.128 22.425 11l-5.532 5.556-3.319-3.335-1.123 1.129a1.552 1.552 0 0 0 0 2.188L16.892 21l6.657-6.685a1.55 1.55 0 0 0 0-2.187Z" fill="#fff"/></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 539 B

yuthon_sale_renting/__manifest__.py
+3 -1
View File
@@ -10,10 +10,12 @@
'category': 'Human Resources/Attendances',
'version': '0.1',
'license': 'LGPL-3',
'depends': ['sale_renting', 'mail', 'documents', 'soong_workflow'],
'depends': ['sale_renting', 'mail', 'documents', 'soong_workflow', 'contacts'],
'data': [
'data/sale_renting_code_data.xml',
'security/ir.model.access.csv',
'views/contacts_inherit_menu_views.xml',
'views/yuthon_res_partner_views.xml',
'views/property_assess_views.xml',
'views/property_confirm_views.xml',
'views/property_move_views.xml',
yuthon_sale_renting/models/__init__.py
+1
View File
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
from . import yuthon_res_partner
from . import yuthon_product_template
from . import property_assess
from . import property_confirm
yuthon_res_partner/models/yuthon_res_partner.py → yuthon_sale_renting/models/yuthon_res_partner.py
View File
yuthon_res_partner/views/contacts_inherit_menu_views.xml → yuthon_sale_renting/views/contacts_inherit_menu_views.xml
View File
yuthon_res_partner/views/yuthon_res_partner_views.xml → yuthon_sale_renting/views/yuthon_res_partner_views.xml
View File
序列号生成器/序列号.py
+1 -1
View File
@@ -39,7 +39,7 @@ def rsaDecrypt(str1):
return con
str1 = rsaEncrypt("base#2099-04-18 23:59:59")
str1 = rsaEncrypt("base#2030-04-18 23:59:59")
print("加密后密文：\n%s" % str1)
# content = rsaDecrypt('16E01254F15E539CF5B734A9A6FB3649640709796F06F5167CB5BFE542210596CE920CBFDB5E22E863983682DC326C421EF896A9D8E2CAC6B9226E89F502FDD7')
# print("解密后明文：\n%s" % content)