Merge remote-tracking branch 'origin/dev' into dev

yuthon_will_task/controllers/main.py

@@ -154,3 +154,116 @@ class YuthonWillTask(http.Controller):
             'code': 200,
             'message': '数据创建成功'
         })
+
+    @http.route('/phone/employee/self', type='http', auth="none", csrf=False, cors='*')
+    def phone_employee_self(self, **kw):
+        """
+            relation: 'ilike'
+        """
+        value = kw.get('value', False)
+        domain = []
+        if value:
+            domain.append(('name', 'ilike', value))
+        # users_id = int(kw.get('users_id'))
+        # user = request.env['res.users'].sudo().browse(int(users_id))
+        # employee_id = user.with_company(user.company_id.id).employee_id.id
+        records = request.env['hr.employee'].sudo().search(domain, limit=15)
+        data = records.read([])
+        return json.dumps({'data': data, 'code': 200, 'message': ''})
+
+    @http.route('/phone/employee/driver', type='http', auth="none", csrf=False, cors='*')
+    def phone_employee_driver(self, **kw):
+        """
+            relation: 'ilike'， '='， '!='
+        """
+        feild = kw.get('feild', False)
+        relation = kw.get('relation', False)
+        value = kw.get('value', False)
+        domain = []
+        if feild and value and relation:
+            domain.append((feild, relation, value))
+        # users_id = int(kw.get('users_id'))
+        # user = request.env['res.users'].sudo().browse(int(users_id))
+        # employee_id = user.with_company(user.company_id.id).employee_id.id
+        records = request.env['hr.employee'].sudo().search(domain, limit=15)
+        data = records.read([])
+        return json.dumps({'data': data, 'code': 200, 'message': ''})
+
+    @http.route('/phone/task/time', type='http', auth="none", csrf=False, cors='*')
+    def phone_task_time(self, **kw):
+        """
+            relation: 'ilike'
+        """
+        value = kw.get('value', False)
+        domain = []
+        if value:
+            domain.append(('name', 'ilike', value))
+        # users_id = int(kw.get('users_id'))
+        # user = request.env['res.users'].sudo().browse(int(users_id))
+        # employee_id = user.with_company(user.company_id.id).employee_id.id
+        records = request.env['yuthon.task.time'].sudo().search(domain, limit=15)
+        data = records.read([])
+        return json.dumps({'data': data, 'code': 200, 'message': ''})
+
+    @http.route('/phone/task/create', type='http', auth="none", csrf=False, cors='*')
+    def phone_task_create(self, **kw):
+        """
+            record_id ： 记录id（根据这个判断是否创建还是更新，创建的时候不传，更新的时候传）
+            request_hour_from：开始时间
+            request_hour_to： 结束时间
+            priority： 优先级
+            name： 任务内容
+            remarks： 备注
+            employee_ids： 关联员工
+            employee_ids2： 关联司机
+            task_time_ids： 提醒
+            address： 地址
+            start_date： 任务日期
+        """
+        employee_ids = kw.get('employee_ids', [])
+        employee_ids2 = kw.get('employee_ids2', [])
+        task_time_ids = kw.get('task_time_ids', [])
+        if not isinstance(task_time_ids, list):
+            return json.dumps({'data': '', 'code': 201, 'message': '提醒参数错误'})
+        if not isinstance(employee_ids2, list):
+            return json.dumps({'data': '', 'code': 201, 'message': '司机参数错误'})
+        if not isinstance(employee_ids, list):
+            return json.dumps({'data': '', 'code': 201, 'message': '关联员工参数错误'})
+        data = {
+            'request_hour_from': kw.get('request_hour_from', False),
+            'request_hour_to': kw.get('request_hour_to', False),
+            'priority': kw.get('priority', False),
+            'name': kw.get('name', False),
+            'remarks': kw.get('remarks', False),
+            'employee_ids': [(6, 0, employee_ids)],
+            'employee_ids2': [(6, 0, employee_ids2)],
+            'task_time_ids': [(6, 0, task_time_ids)],
+            'address': kw.get('address', False),
+            'start_date': kw.get('start_date', False)
+        }
+        record_id = kw.get('record_id', False)
+        if record_id:
+            # 获取要更新的日程
+            record = request.env['yuthon.task.time'].sudo().browse(int(record_id))
+            record.sudo().write(data)
+        else:
+            #创建日程
+            users_id = int(kw.get('users_id'))
+            user = request.env['res.users'].sudo().browse(int(users_id))
+            request.env.user = user
+            record = request.env['yuthon.task.time'].sudo().create(data)
+        # users_id = int(kw.get('users_id'))
+        # user = request.env['res.users'].sudo().browse(int(users_id))
+        # employee_id = user.with_company(user.company_id.id).employee_id.id
+        return json.dumps({'data': record.id, 'code': 200, 'message': ''})
+
+    @http.route('/phone/task/unlink', type='http', auth="none", csrf=False, cors='*')
+    def phone_task_unlink(self, **kw):
+        record_id = kw.get('record_id', False)
+        if record_id:
+            # 获取要更新的日程
+            record = request.env['yuthon.task.time'].sudo().browse(int(record_id))
+            record.sudo().unlink()
+        else:
+            return json.dumps({'data': '', 'code': 201, 'message': '记录不存在'})
+        return json.dumps({'data': 'success', 'code': 200, 'message': ''})

yuthon_will_task/views/yuthon_will_task_views.xml

@@ -133,7 +133,7 @@
 <!--                <field name='user_role_ids' widget="many2many_tags" column_invisible="1"/>-->
 <!--                <field name="employee_id" optional="hide"/>-->
 <!--                 <field name='creation_time' optional="hide"/>-->
-                <button name="button_add_comment" string="提醒" type="object" class="oe_highlight" invisible="task_state == 'cancel'"/>
+                <button name="button_add_comment" string="提醒" type="object" class="oe_highlight" invisible="task_state in ['done', 'cancel']"/>
                 <button name="button_add_comment_cancel" string="取消" type="object" class="oe_highlight" invisible="task_state == 'cancel'"/>
             </tree>
         </field>