diff --git a/login_bg_img_knk/views/res_company.xml b/login_bg_img_knk/views/res_company.xml
index 3fefbd28..fcfea5c7 100644
--- a/login_bg_img_knk/views/res_company.xml
+++ b/login_bg_img_knk/views/res_company.xml
@@ -16,4 +16,14 @@
#{"background: transparent url('/dashboard') no-repeat scroll center center / cover;" if response_template == 'web.login' or 'auth_signup.signup' else ''}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sf_base/models/base.py b/sf_base/models/base.py
index a6e1d4cc..a6baa813 100644
--- a/sf_base/models/base.py
+++ b/sf_base/models/base.py
@@ -86,7 +86,7 @@ class MachineTool(models.Model):
brand_id = fields.Many2one('sf.machine.brand', string='品牌')
state = fields.Selection(
[("正常", "正常"), ("故障", "故障"), ("不可用", "不可用")],
- default='正常', string="状态")
+ default='正常', string="机床状态")
# 一个机床对应一個加工工厂,一个加工工厂对应多个机床
factory_id = fields.Many2one('res.partner', string='所属工厂',
@@ -95,7 +95,7 @@ class MachineTool(models.Model):
supplier_id = fields.Many2one('res.partner', string='制造商',
domain="[('is_vendor', '=', True)]")
registration_date = fields.Date('注册日期')
-
+ state_zc = fields.Selection([("已注册", "已注册"), ("未注册", "未注册")], string="注册状态", default='未注册')
active = fields.Boolean('有效', default=True)
@api.constrains('rotate_speed')
@@ -198,6 +198,7 @@ class MachineTool(models.Model):
r = requests.post(strurl, json={}, data={'kw': kw, 'token': token}, headers=headers)
ret = r.json()
self.code = ret['message']
+ self.state_zc = "已注册"
if r == 200:
return "机床注册成功"
else:
diff --git a/sf_base/views/base_view.xml b/sf_base/views/base_view.xml
index 7d4854d3..6dffe5e0 100644
--- a/sf_base/views/base_view.xml
+++ b/sf_base/views/base_view.xml
@@ -347,8 +347,7 @@
-
-
+
@@ -365,6 +364,7 @@
+