Merge branch 'feat/v20241023-商家代金券提现' into dev

src/views/business/voucherApply/Examine.vue

@@ -8,7 +8,7 @@
         </el-radio-group>
       </el-form-item>
 
-      <el-form-item v-if="form.auditStatus === 2" label="提现比例" prop="ratio" :rules="[{ validator: validateRatio, trigger: 'blur' }]">
+      <el-form-item v-if="form.auditStatus === 2" label="提现比例, 范围：0 ~ 40" prop="ratio" :rules="[{ validator: validateRatio, trigger: 'blur' }]">
         <el-input placeholder="请输入提现比例" v-model="form.ratio">
           <template slot="append">%</template>
         </el-input>

src/views/finance/withdrawal/components/DetailModal.vue

@@ -120,14 +120,18 @@
 
       <el-tab-pane v-if="[3, 4].includes(formData.withdrawalType)" label="入账列表" name="entry">
         <el-table :data="formData.withdrawalType === 3 ? formData.shopVoucherEntryRecordList : formData.shopVoucherExchangeEntryRecordList" border stripe>
+          <el-table-column type="index" width="50"></el-table-column>
           <el-table-column align="center" prop="orderFormId" label="来源订单号"></el-table-column>
           <el-table-column align="center" prop="number" label="代金券数量"></el-table-column>
+          <el-table-column align="center" prop="createTime" label="入账时间"></el-table-column>
         </el-table>
       </el-tab-pane>
       <el-tab-pane v-if="[3, 4].includes(formData.withdrawalType)" label="出账列表" name="disbursement">
         <el-table :data="formData.withdrawalType === 3 ? formData.shopVoucherOutgoinRecordList : formData.shopVoucherExchangeOutgoinRecordList" border stripe>
+          <el-table-column type="index" width="50"></el-table-column>
           <el-table-column align="center" prop="orderFormId" label="来源订单号"></el-table-column>
           <el-table-column align="center" prop="number" label="代金券数量"></el-table-column>
+          <el-table-column align="center" prop="createTime" label="出账时间"></el-table-column>
         </el-table>
       </el-tab-pane>
     </el-tabs>