Browse Source

订单统计增加字段&申请补贴修复 bug

ylong 7 months ago
parent
commit
d9776fcc30

+ 1 - 0
src/views/finance/subsidyReview/index.vue

@@ -38,6 +38,7 @@
                     <el-radio-button label="待审核" value="1" />
                     <el-radio-button label="已审核" value="2" />
                     <el-radio-button label="未提交" value="3" />
+                    <el-radio-button label="用户放弃" value="4" />
                 </el-radio-group>
             </template>
 

+ 0 - 8
src/views/finance/subsidyReview/page-search.vue

@@ -32,14 +32,6 @@
 
     const formItems = reactive([
         { type: 'input', label: '输入用户UID', prop: 'userId' },
-        {
-            type: 'dictSelect',
-            label: '请选择状态',
-            prop: 'status',
-            props: {
-                code: 'order_compensation_status'
-            }
-        },
         {
             type: 'dictSelect',
             label: '请选择类型',

+ 8 - 2
src/views/statistic/recycleOrder/index.vue

@@ -42,7 +42,10 @@
     { label: '回收本数', prop: 'bookNum', align: 'center' },
     { label: '回收平均价格', prop: 'recycleAveragePrice', align: 'center' },
     { label: '审核订单数', prop: 'auditNum', align: 'center' },
-    { label: '审核金额', prop: 'auditMoney', align: 'center' }
+    { label: '审核本数', prop: 'auditGoodNum', align: 'center' },
+    { label: '审核金额', prop: 'auditMoney', align: 'center' },
+    { label: '回收总预估价', prop: 'recycleTotalMoney', align: 'center' },
+    { label: '审核平均单本价', prop: 'auditAverageMoney', align: 'center' }
   ]);
 
   /** 页面组件实例 */
@@ -76,6 +79,7 @@
       }
 
       switch (column.property) {
+        case 'auditAverageMoney':
         case 'recycleAveragePrice': {
           // 只计算有值的数据的平均值
           const validValues = values.filter((value) => value && !isNaN(value));
@@ -87,6 +91,7 @@
           }
           break;
         }
+        case 'auditGoodNum':
         case 'orderNum':
         case 'bookNum':
         case 'auditNum': {
@@ -102,7 +107,8 @@
           sums[index] = sum;
           break;
         }
-        case 'auditMoney': {
+        case 'auditMoney':
+        case 'recycleTotalMoney': {
           // 求和,保留两位小数
           const sum = values.reduce((prev, curr) => {
             const value = Number(curr);