[fix] 修改收入支出表接口

roke_product_income_expense/controller/main.py

@@ -50,7 +50,7 @@ class ProductIncomeExpenseIframe(http.Controller):
             domain.append(("business_date", "<=", end_date))
             domain.append(("business_date", "<=", end_date))
         data_list = _self.env["roke.product.income.expense"].sudo().search(domain, limit=limit,
         data_list = _self.env["roke.product.income.expense"].sudo().search(domain, limit=limit,
                                                                            offset=(page - 1) * limit,
                                                                            offset=(page - 1) * limit,
-                                                                           order="create_date desc")
+                                                                           order="business_date desc, create_date desc")
         count = _self.env["roke.product.income.expense"].sudo().search_count(domain)
         count = _self.env["roke.product.income.expense"].sudo().search_count(domain)
         data = []
         data = []
         for v in data_list:
         for v in data_list:

roke_product_income_expense/models/product_income_expense.py

@@ -17,12 +17,16 @@ class ProductIncomeExpense(models.Model):
 
 
     @api.depends("income", "expenditure")
     @api.depends("income", "expenditure")
     def _compute_balance(self):
     def _compute_balance(self):
-        data = self.search([("id", "in", self.ids)], order="create_date asc")
+        data = self.search([("id", "in", self.ids)], order="business_date asc, create_date asc")
         for v in data:
         for v in data:
             last_data = self.search([
             last_data = self.search([
+                "|",
+                "&",
+                ("business_date", "=", v.business_date),
                 ("create_date", "<", v.create_date),
                 ("create_date", "<", v.create_date),
+                ("business_date", "<", v.business_date),
                 ("id", "!=", v.id)
                 ("id", "!=", v.id)
-            ], limit=1, order="create_date desc")
+            ], limit=1, order="business_date desc, create_date desc")
             if not last_data:
             if not last_data:
                 v.balance = 0 + v.income - v.expenditure
                 v.balance = 0 + v.income - v.expenditure
             else:
             else:

roke_product_income_expense/static/src/js/index.html

@@ -44,13 +44,13 @@
                         <el-input v-model="scope.row.expenditure" type="number" placeholder="请输入"></el-input>
                         <el-input v-model="scope.row.expenditure" type="number" placeholder="请输入"></el-input>
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>
-                <el-table-column label="创建人" align="center" width="110">
-                    <template slot-scope="scope">
-                        <div>
-                            [[ scope.row.user_name ]]
-                        </div>
-                    </template>
-                </el-table-column>
+<!--                <el-table-column label="创建人" align="center" width="110">-->
+<!--                    <template slot-scope="scope">-->
+<!--                        <div>-->
+<!--                            [[ scope.row.user_name ]]-->
+<!--                        </div>-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
                 <el-table-column label="操作" align="center" width="95">
                 <el-table-column label="操作" align="center" width="95">
                     <template slot-scope="scope">
                     <template slot-scope="scope">
                         <el-button type="primary" @click="saveListData">保存</el-button>
                         <el-button type="primary" @click="saveListData">保存</el-button>