Merge branch 'jzjx_project' of https://git.rokedata.com/dws/dwsproject into jzjx_project

# Conflicts:
#	roke_product_income_expense/static/src/js/index.html

roke_product_income_expense/controller/main.py

@@ -39,8 +39,15 @@ class ProductIncomeExpenseIframe(http.Controller):
                 "expenditure": v.get("expenditure", False),
                 "customer": v.get("customer", False)
             }
-            _self.env(user=v.get("user_id"))["roke.product.income.expense"].create(data)
-        return {"code": 0, "message": "创建成功！"}
+            # 看是否有id，如果有的话就说明是更新，没有的话就说明是创建
+            if v.get("id", False):
+                expense_obj = _self.env["roke.product.income.expense"].sudo().search([("id", "=", v.get("id"))])
+                if not expense_obj:
+                    return {"code": 1, "message": "更新失败，没找到对应数据。"}
+                expense_obj.write(data)
+            else:
+                _self.env(user=v.get("user_id"))["roke.product.income.expense"].create(data)
+        return {"code": 0, "message": "操作成功！"}
 
     @http.route("/roke/product/product_income_expense/get", type="json", auth='none', cors='*', csrf=False)
     def product_income_expense_get_list(self):