From 62fc9aeb10edb2295ec221d4a814f3fb9feaf5ae Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 18 十二月 2024 09:38:07 +0800
Subject: [PATCH] 1.报表等修改 2.商品分类下拉查询

---
 pages/report/supplier.vue       |  112 ++++++++-----
 pages/report/finance/_date.vue  |   51 ++---
 pages/goods/list/index.vue      |   42 ++++-
 pages/report/finance/index.vue  |  217 ++++++++++++++++++++++----
 pages/wallet/withdraw-audit.vue |   13 +
 pages/report/partner/index.vue  |   35 ++++
 6 files changed, 348 insertions(+), 122 deletions(-)

diff --git a/pages/goods/list/index.vue b/pages/goods/list/index.vue
index e0b3187..f126596 100644
--- a/pages/goods/list/index.vue
+++ b/pages/goods/list/index.vue
@@ -1,9 +1,9 @@
 <template>
-  <el-bus-crud ref="crud" v-bind="tableConfig" />
+  <el-bus-crud ref="crud" v-bind="tableConfig" ></el-bus-crud>
 </template>
 
 <script>
-import { getSortConfig } from '@/utils/form-item-config'
+import { getSortConfig,getGoodsCategoryListConfig} from '@/utils/form-item-config'
 export default {
   data() {
     return {
@@ -161,25 +161,47 @@
                 span: 24,
                 searchImmediately: true,
               },
+              // {
+              //   label: '商品分类:',
+              //   id: 'category',
+              //   component: 'cascader-filter',
+              //   el: {
+              //     otherInterfaceUri: 'flower/api/flower/category/tree',
+              //     props: {
+              //       label: 'name',
+              //       value: 'id',
+              //       checkStrictly: true,
+              //     },
+              //     emitPath: false,
+              //     style: 'width:100%',
+              //     clearable: true,
+              //     hasAll: true,
+              //     childType: 'el-radio-button',
+              //   },
+              //   span: 24,
+              //   searchImmediately: true,
+              // },
               {
-                label: '商品分类:',
+                label: '商品分类',
                 id: 'category',
-                component: 'cascader-filter',
+                type: 'bus-cascader',
                 el: {
                   otherInterfaceUri: 'flower/api/flower/category/tree',
                   props: {
                     label: 'name',
                     value: 'id',
+                    emitPath: false,
+                    checkStrictly: true,
                   },
-                  emitPath: false,
-                  style: 'width:100%',
                   clearable: true,
-                  hasAll: true,
-                  childType: 'el-radio-button',
+                  filterable: true,
+                  style: 'width:100%',
                 },
-                span: 24,
-                searchImmediately: true,
               },
+              // {
+              //   ...getGoodsCategoryListConfig(),
+              //   id: 'category',
+              // },
               { label: '商品名称:', id: 'name', type: 'input' },
               { label: '供应商:', id: 'supplierName', type: 'input' },
             ],
diff --git a/pages/report/finance/_date.vue b/pages/report/finance/_date.vue
index 540c591..eb1869a 100644
--- a/pages/report/finance/_date.vue
+++ b/pages/report/finance/_date.vue
@@ -60,38 +60,25 @@
             prop: 'partnerSectionFeeAmount',
             minWidth: '120px',
           },
-          {
-            label: '会员折扣',
-            prop: 'orderPriceDiscountAmount',
-            minWidth: '100px',
-          },
-          {
-            label: '优惠券',
-            prop: 'orderCouponAmountTotal',
-            minWidth: '100px',
-          },
+
+          { label: '优惠合计', prop: 'orderDiscountTotalFee', minWidth: 120,},
+          { label: '会员折扣', prop: 'orderPriceDiscountAmount', minWidth: 120,},
+          { label: '优惠券', prop: 'orderCouponAmountTotal',minWidth: '100px',},
+
+          { label: '质检总扣款', prop: 'orderCheckTotalFee', minWidth: 120 },
           { label: '质检降级扣款', prop: 'orderCheckFee', minWidth: '100px' },
-          {
-            label: '质检缺货扣款',
-            prop: 'orderLackFeeSupplier',
-            minWidth: '100px',
-          },
+          { label: '质检缺货扣款', prop: 'orderLackFeeSupplier', minWidth: '100px',},
           { label: '质检补货扣款', prop: 'orderReplaceFee', minWidth: '100px' },
-          {
-            label: '售后扣合伙人款',
-            prop: 'orderFeePartner',
-            minWidth: '120px',
-          },
-          {
-            label: '售后扣花农款',
-            prop: 'orderFeeSupplier',
-            minWidth: '100px',
-          },
-          {
-            label: '售后扣平台款',
-            prop: 'orderFeePlatform',
-            minWidth: '100px',
-          },
+
+          { label: '售后总扣款', prop: 'orderTotalFee', minWidth: 150 },
+          { label: '售后供应商扣款', prop: 'orderFeeSupplier', minWidth: 150 },
+          { label: '售后平台扣款', prop: 'orderFeePlatform', minWidth: 150 },
+          { label: '售后合伙人扣款', prop: 'orderFeePartner', minWidth: 150 },
+          { label: '售后打包扣款', prop: 'orderFeePlatformPack', minWidth: 150 },
+          { label: '售后质检扣款', prop: 'orderFeePlatformCheck', minWidth: 150 },
+          { label: '售后物流扣款', prop: 'orderFeePlatformTransport', minWidth: 150 },
+          { label: '售后打包运费扣款', prop: 'orderFeePackingTransport', minWidth: 150 },
+
           {
             label: '总包干费',
             prop: 'partnerTotalFeeAmount',
@@ -99,6 +86,10 @@
           },
           { label: '总销售扎数', prop: 'orderNum', minWidth: '100px' },
           { label: '实际销售扎数', prop: 'realSaleNum', minWidth: '100px' },
+          { label: '缺货扎数', prop: 'orderLackNum', minWidth: 120 },
+          { label: '降级扎数', prop: 'orderReduceNum', minWidth: 120 },
+          { label: '补货扎数', prop: 'orderReplaceNum', minWidth: 120 },
+
           {
             label: '利润',
             prop: 'profitFeeAmount',
diff --git a/pages/report/finance/index.vue b/pages/report/finance/index.vue
index a6cdb12..e3c4fd4 100644
--- a/pages/report/finance/index.vue
+++ b/pages/report/finance/index.vue
@@ -1,20 +1,21 @@
 <template>
   <div>
     <div v-loading="statisticLoading">
+
       <el-row :gutter="20">
-        <el-col :span="4" class="mb-10">
+        <el-col :span="3" class="mb-2">
           <el-card>
             <div class="statistic-title">销售合计(原订单)</div>
             <div class="statistic-num">{{ statistic.orderTotal || 0 }}</div>
           </el-card>
         </el-col>
-        <el-col :span="4" class="mb-10">
+        <el-col :span="3" class="mb-2">
           <el-card>
             <div class="statistic-title">销售合计(实付)</div>
             <div class="statistic-num">{{ statistic.totalAmount || 0 }}</div>
           </el-card>
         </el-col>
-        <el-col :span="4" class="mb-10">
+        <el-col :span="3" class="mb-2">
           <el-card>
             <div class="statistic-title">底价合计</div>
             <div class="statistic-num">
@@ -22,7 +23,7 @@
             </div>
           </el-card>
         </el-col>
-        <el-col :span="4" class="mb-10">
+        <el-col :span="3" class="mb-2">
           <el-card>
             <div class="statistic-title">区间加价</div>
             <div class="statistic-num">
@@ -30,7 +31,7 @@
             </div>
           </el-card>
         </el-col>
-        <el-col :span="4" class="mb-10">
+        <el-col :span="3" class="mb-2">
           <el-card>
             <div class="statistic-title">平台加价</div>
             <div class="statistic-num">
@@ -38,7 +39,7 @@
             </div>
           </el-card>
         </el-col>
-        <el-col :span="4" class="mb-10">
+        <el-col :span="3" class="mb-2">
           <el-card>
             <div class="statistic-title">合伙人加价</div>
             <div class="statistic-num">
@@ -46,27 +47,7 @@
             </div>
           </el-card>
         </el-col>
-        <el-col :span="4" class="mb-10">
-          <el-card>
-            <div class="statistic-title">质检扣款</div>
-            <div class="statistic-num">{{ statistic.checkTotalFee || 0 }}</div>
-          </el-card>
-        </el-col>
-        <el-col :span="4" class="mb-10">
-          <el-card>
-            <div class="statistic-title">售后扣款</div>
-            <div class="statistic-num">{{ statistic.saleTotalFee || 0 }}</div>
-          </el-card>
-        </el-col>
-        <el-col :span="4" class="mb-10">
-          <el-card>
-            <div class="statistic-title">优惠合计</div>
-            <div class="statistic-num">
-              {{ statistic.discountTotalFee || 0 }}
-            </div>
-          </el-card>
-        </el-col>
-        <el-col :span="4" class="mb-10">
+        <el-col :span="3" class="mb-2">
           <el-card>
             <div class="statistic-title">包干费合计</div>
             <div class="statistic-num">
@@ -74,10 +55,148 @@
             </div>
           </el-card>
         </el-col>
-        <el-col :span="4" class="mb-10">
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="3" class="mb-2">
           <el-card>
-            <div class="statistic-title">销售扎数</div>
+            <div class="statistic-title">质检总扣款</div>
+            <div class="statistic-num">
+              <!-- {{ statistic.checkTotalFee || 0 }} -->
+              {{ statistic.orderCheckTotalFee || 0 }}
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="3" class="mb-2">
+        <el-card>
+            <div class="statistic-title">缺货扣款</div>
+            <div class="statistic-num">{{ statistic.orderLackFeeSupplier || 0 }}</div>
+          </el-card>
+        </el-col>
+        <el-col :span="3" class="mb-2">
+        <el-card>
+            <div class="statistic-title">补货扣款</div>
+            <div class="statistic-num">{{ statistic.orderReplaceFee || 0 }}</div>
+          </el-card>
+        </el-col>
+        <el-col :span="3" class="mb-2">
+        <el-card>
+            <div class="statistic-title">降级扣款</div>
+            <div class="statistic-num">{{ statistic.orderCheckFee || 0 }}</div>
+          </el-card>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <!-- <el-col :span="3" class="mb-2">
+          <el-card>
+            <div class="statistic-title">售后总扣款</div>
+            <div class="statistic-num">{{ statistic.saleTotalFee || 0 }}</div>
+          </el-card>
+        </el-col> -->
+        <el-col :span="3" class="mb-2">
+          <el-card>
+            <div class="statistic-title">售后总扣款</div>
+            <div class="statistic-num">{{ statistic.orderTotalFee || 0 }}</div>
+          </el-card>
+        </el-col>
+        <el-col :span="3" class="mb-2">
+          <el-card>
+            <div class="statistic-title">售后供应商扣款</div>
+            <div class="statistic-num">{{ statistic.orderFeeSupplier || 0 }}</div>
+          </el-card>
+        </el-col>
+        <el-col :span="3" class="mb-2">
+          <el-card>
+            <div class="statistic-title">售后平台扣款</div>
+            <div class="statistic-num">{{ statistic.orderFeePlatform || 0 }}</div>
+          </el-card>
+        </el-col>
+        <el-col :span="3" class="mb-2">
+          <el-card>
+            <div class="statistic-title">售后合伙人扣款</div>
+            <div class="statistic-num">{{ statistic.orderFeePartner || 0 }}</div>
+          </el-card>
+        </el-col>
+        <el-col :span="3" class="mb-2">
+          <el-card>
+            <div class="statistic-title">售后打包扣款</div>
+            <div class="statistic-num">{{ statistic.orderFeePlatformPack || 0 }}</div>
+          </el-card>
+        </el-col>
+        <el-col :span="3" class="mb-2">
+          <el-card>
+            <div class="statistic-title">售后质检扣款</div>
+            <div class="statistic-num">{{ statistic.orderFeePlatformCheck || 0 }}</div>
+          </el-card>
+        </el-col>
+        <el-col :span="3" class="mb-2">
+          <el-card>
+            <div class="statistic-title">售后物流扣款</div>
+            <div class="statistic-num">{{ statistic.orderFeePlatformTransport || 0 }}</div>
+          </el-card>
+        </el-col>
+        <el-col :span="3" class="mb-2">
+          <el-card>
+            <div class="statistic-title">售后打包运费扣款</div>
+            <div class="statistic-num">{{ statistic.orderFeePackingTransport || 0 }}</div>
+          </el-card>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="3" class="mb-2">
+          <el-card>
+            <div class="statistic-title">优惠合计</div>
+            <div class="statistic-num">
+              <!-- {{ statistic.discountTotalFee || 0 }} -->
+              {{ statistic.orderDiscountTotalFee || 0 }}
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="3" class="mb-2">
+          <el-card>
+            <div class="statistic-title">会员折扣</div>
+            <div class="statistic-num">
+              {{ statistic.orderPriceDiscountAmount || 0 }}
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="3" class="mb-2">
+          <el-card>
+            <div class="statistic-title">优惠券</div>
+            <div class="statistic-num">
+              {{ statistic.orderCouponAmountTotal || 0 }}
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="3" class="mb-2">
+          <el-card>
+            <div class="statistic-title">总销售扎数</div>
+            <div class="statistic-num">{{ statistic.orderNum || 0 }}</div>
+          </el-card>
+        </el-col>
+        <el-col :span="3" class="mb-2">
+          <el-card>
+            <div class="statistic-title">实际销售扎数</div>
             <div class="statistic-num">{{ statistic.realSaleNum || 0 }}</div>
+          </el-card>
+        </el-col>
+        <el-col :span="3" class="mb-2">
+          <el-card>
+            <div class="statistic-title">缺货扎数</div>
+            <div class="statistic-num">{{ statistic.orderLackNum || 0 }}</div>
+          </el-card>
+        </el-col>
+        <el-col :span="3" class="mb-2">
+          <el-card>
+            <div class="statistic-title">降级扎数</div>
+            <div class="statistic-num">{{ statistic.orderReduceNum || 0 }}</div>
+          </el-card>
+        </el-col>
+        <el-col :span="3" class="mb-2">
+          <el-card>
+            <div class="statistic-title">补货扎数</div>
+            <div class="statistic-num">{{ statistic.orderReplaceNum || 0 }}</div>
           </el-card>
         </el-col>
       </el-row>
@@ -178,21 +297,31 @@
             prop: 'orderMarkupPartnerAmount',
             minWidth: 120,
           },
-          {
-            label: '会员折扣',
-            prop: 'orderPriceDiscountAmount',
-            minWidth: 120,
-          },
+          { label: '优惠合计', prop: 'orderDiscountTotalFee',  minWidth: 120,},
+          { label: '会员折扣', prop: 'orderPriceDiscountAmount',minWidth: 120,},
           { label: '优惠券', prop: 'orderCouponAmountTotal', minWidth: 120 },
+
+          { label: '质检总扣款', prop: 'orderCheckTotalFee', minWidth: 120 },
           { label: '降级扣款', prop: 'orderCheckFee', minWidth: 120 },
           { label: '缺货扣款', prop: 'orderLackFeeSupplier', minWidth: 120 },
           { label: '补货扣款', prop: 'orderReplaceFee', minWidth: 120 },
-          { label: '售后扣合伙人款', prop: 'orderFeePartner', minWidth: 150 },
-          { label: '售后扣花农款', prop: 'orderFeeSupplier', minWidth: 150 },
-          { label: '售后扣平台款', prop: 'orderFeePlatform', minWidth: 150 },
+
+          { label: '售后总扣款', prop: 'orderTotalFee', minWidth: 150 },
+          { label: '售后供应商扣款', prop: 'orderFeeSupplier', minWidth: 150 },
+          { label: '售后平台扣款', prop: 'orderFeePlatform', minWidth: 150 },
+          { label: '售后合伙人扣款', prop: 'orderFeePartner', minWidth: 150 },
+          { label: '售后打包扣款', prop: 'orderFeePlatformPack', minWidth: 150 },
+          { label: '售后质检扣款', prop: 'orderFeePlatformCheck', minWidth: 150 },
+          { label: '售后物流扣款', prop: 'orderFeePlatformTransport', minWidth: 150 },
+          { label: '售后打包运费扣款', prop: 'orderFeePackingTransport', minWidth: 150 },
+
           { label: '总包干费', prop: 'partnerTotalFeeAmount', minWidth: 120 },
           { label: '总售扎数', prop: 'orderNum', minWidth: 120 },
           { label: '实际销售扎数', prop: 'realSaleNum', minWidth: 120 },
+          { label: '缺货扎数', prop: 'orderLackNum', minWidth: 120 },
+          { label: '降级扎数', prop: 'orderReduceNum', minWidth: 120 },
+          { label: '补货扎数', prop: 'orderReplaceNum', minWidth: 120 },
+
           {
             label: '利润',
             prop: 'profitFeeAmount',
@@ -254,4 +383,18 @@
 
 <style lang="scss" scoped>
 @import '@/assets/statistic/index.scss';
+
+.statistic-title {
+  text-align: center;
+  font-size: 16px;
+  color: $main-title-color;
+  font-weight: bold;
+  margin-bottom: 6px;
+}
+.statistic-num {
+  text-align: center;
+  font-size: 16px;
+  color: $primary-color;
+}
+
 </style>
diff --git a/pages/report/partner/index.vue b/pages/report/partner/index.vue
index 2ecfba4..06b0e71 100644
--- a/pages/report/partner/index.vue
+++ b/pages/report/partner/index.vue
@@ -26,10 +26,36 @@
         </el-col>
         <el-col :span="4" class="mb-10">
           <el-card>
-            <div class="statistic-title">销售扎数</div>
+            <div class="statistic-title">总销售扎数</div>
+            <div class="statistic-num">
+              {{ statistic.orderNum || 0 }}
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="4" class="mb-10">
+          <el-card>
+            <div class="statistic-title">实际销售扎数</div>
             <div class="statistic-num">
               {{ statistic.realSaleNum || 0 }}
             </div>
+          </el-card>
+        </el-col>
+        <el-col :span="4" class="mb-10">
+          <el-card>
+            <div class="statistic-title">缺货扎数</div>
+            <div class="statistic-num">{{ statistic.orderLackNum || 0 }}</div>
+          </el-card>
+        </el-col>
+        <el-col :span="4" class="mb-10">
+          <el-card>
+            <div class="statistic-title">降级扎数</div>
+            <div class="statistic-num">{{ statistic.orderReduceNum || 0 }}</div>
+          </el-card>
+        </el-col>
+        <el-col :span="4" class="mb-10">
+          <el-card>
+            <div class="statistic-title">补货扎数</div>
+            <div class="statistic-num">{{ statistic.orderReplaceNum || 0 }}</div>
           </el-card>
         </el-col>
         <el-col :span="4" class="mb-10">
@@ -157,7 +183,14 @@
           { label: '售后扣合伙人款', prop: 'orderFeePartner', minWidth: 120 },
 
           { label: '总包干费', prop: 'partnerTotalFeeAmount', minWidth: 120 },
+
+          { label: '总售扎数', prop: 'orderNum', minWidth: 120 },
           { label: '实际销售扎数', prop: 'realSaleNum', minWidth: 120 },
+          { label: '缺货扎数', prop: 'orderLackNum', minWidth: 120 },
+          { label: '降级扎数', prop: 'orderReduceNum', minWidth: 120 },
+          { label: '补货扎数', prop: 'orderReplaceNum', minWidth: 120 },
+
+          // { label: '实际销售扎数', prop: 'realSaleNum', minWidth: 120 },
         ],
         searchForm: [
           {
diff --git a/pages/report/supplier.vue b/pages/report/supplier.vue
index aad9201..72616af 100644
--- a/pages/report/supplier.vue
+++ b/pages/report/supplier.vue
@@ -1,57 +1,75 @@
 <template>
   <div>
     <div v-loading="statisticLoading">
-      <el-row :gutter="20" type="flex" justify="center">
-        <el-col :span="6" class="mb-10">
-          <el-card class="is-total">
+      <el-row :gutter="20">
+        <el-col :span="4" class="mb-10">
+          <el-card>
             <div class="statistic-title">底价合计</div>
+            <div class="statistic-num">{{ statistic.orderSupplierPriceAmount || 0 }}</div>
+          </el-card>
+        </el-col>
+        <el-col :span="4" class="mb-10">
+          <el-card>
+            <div class="statistic-title">降级扣款</div>
             <div class="statistic-num">
-              {{ statistic.orderSupplierPriceAmount || 0 }}
+              {{ statistic.orderCheckFee || 0 }}
             </div>
           </el-card>
         </el-col>
-        <el-col :span="12" class="mb-10">
-          <el-row :gutter="20">
-            <el-col :span="12" class="mb-10">
-              <el-card>
-                <div class="statistic-title">降级扣款</div>
-                <div class="statistic-num">
-                  {{ statistic.orderCheckFee || 0 }}
-                </div>
-              </el-card>
-            </el-col>
-            <el-col :span="12" class="mb-10">
-              <el-card>
-                <div class="statistic-title">缺货扣款</div>
-                <div class="statistic-num">
-                  {{ statistic.orderLackFeeSupplier || 0 }}
-                </div>
-              </el-card>
-            </el-col>
-            <el-col :span="12">
-              <el-card>
-                <div class="statistic-title">售后扣款</div>
-                <div class="statistic-num">
-                  {{ statistic.salesFeeSupplier || 0 }}
-                </div>
-              </el-card>
-            </el-col>
-            <el-col :span="12">
-              <el-card>
-                <div class="statistic-title">实际销售扎数</div>
-                <div class="statistic-num">
-                  {{ statistic.realSaleNum || 0 }}
-                </div>
-              </el-card>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="6" class="mb-10">
-          <el-card class="is-total">
-            <div class="statistic-title">结算合计</div>
+        <el-col :span="4" class="mb-10">
+          <el-card>
+            <div class="statistic-title">缺货扣款</div>
             <div class="statistic-num">
-              {{ statistic.profitFeeAmount || 0 }}
+              {{ statistic.orderLackFeeSupplier || 0 }}
             </div>
+          </el-card>
+        </el-col>
+        <el-col :span="4" class="mb-10">
+          <el-card>
+            <div class="statistic-title">售后扣款</div>
+            <div class="statistic-num">
+              {{ statistic.salesFeeSupplier || 0 }}
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="4" class="mb-10">
+          <el-card>
+            <div class="statistic-title">总销售扎数</div>
+            <div class="statistic-num">
+              {{ statistic.orderNum || 0 }}
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="4" class="mb-10">
+          <el-card>
+            <div class="statistic-title">实际销售扎数</div>
+            <div class="statistic-num">{{ statistic.realSaleNum || 0 }}</div>
+          </el-card>
+        </el-col>
+        <el-col :span="4" class="mb-10">
+          <el-card>
+            <div class="statistic-title">缺货扎数</div>
+            <div class="statistic-num">{{ statistic.orderLackNum || 0 }}</div>
+          </el-card>
+        </el-col>
+        <el-col :span="4" class="mb-10">
+          <el-card>
+            <div class="statistic-title">降级扎数</div>
+            <div class="statistic-num">{{ statistic.orderReduceNum || 0 }}</div>
+          </el-card>
+        </el-col>
+        <el-col :span="4" class="mb-10">
+          <el-card>
+            <div class="statistic-title">补货扎数</div>
+            <div class="statistic-num">
+              {{ statistic.orderReplaceNum || 0 }}
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="4" class="mb-10">
+          <el-card>
+            <div class="statistic-title">结算合计</div>
+            <div class="statistic-num">{{ statistic.profitFeeAmount || 0 }}</div>
           </el-card>
         </el-col>
       </el-row>
@@ -113,7 +131,13 @@
             minWidth: 150,
           },
           { label: '售后扣花农款', prop: 'salesFeeSupplier', minWidth: 120 },
+
+          { label: '总售扎数', prop: 'orderNum', minWidth: 120 },
           { label: '实际销售扎数', prop: 'realSaleNum', minWidth: 120 },
+          { label: '缺货扎数', prop: 'orderLackNum', minWidth: 120 },
+          { label: '降级扎数', prop: 'orderReduceNum', minWidth: 120 },
+          { label: '补货扎数', prop: 'orderReplaceNum', minWidth: 120 },
+
           {
             label: '结算费用',
             prop: 'profitFeeAmount',
diff --git a/pages/wallet/withdraw-audit.vue b/pages/wallet/withdraw-audit.vue
index 76ec926..24417a8 100644
--- a/pages/wallet/withdraw-audit.vue
+++ b/pages/wallet/withdraw-audit.vue
@@ -49,6 +49,19 @@
                 span: 24,
                 searchImmediately: true,
               },
+              {
+                label: '提现状态:',
+                id: 'withdrawState',
+                type: 'bus-radio',
+                el: {
+                  hasAll: true,
+                  childType: 'el-radio-button',
+                  code: 'BILL_WITHDRAW_TYPE',
+                },
+                default: '',
+                span: 24,
+                searchImmediately: true,
+              },
               {label: '供应商ID:', id: 'supplierId', type: 'input'},
               {label: '供应商名称:', id: 'supplierName', type: 'input'},
               {

--
Gitblit v1.9.3