Merge branch 'fix-提现区分' into dev

src/views/business/businessList/components/EditModal.vue

@@ -158,6 +158,16 @@
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
+                <el-form-item label="兑换商品是否需要核销" prop="exchangeIsNeedVerification">
+                  <el-radio-group v-model="formData.exchangeIsNeedVerification">
+                    <el-radio :label="1">
+                      是
+                    </el-radio>
+                    <el-radio :label="0">
+                      否
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
 
                 <el-form-item class="b-shop-rate" prop="score" label="评分">
                   <el-rate v-model="formData.score"></el-rate>
@@ -268,6 +278,7 @@ export default {
         contractState: 1, // 合同状态 1-有效 0-无效
         auditLive: 1,
         auditLiveProduct: 1,
+        exchangeIsNeedVerification: 0,
         shopPhone: '', // 账号
         shopPassword: '', // 密码
         perCapita: '', // 人均
@@ -301,6 +312,7 @@ export default {
         isVoucher: [ { required: true, message: '请选择是否允许使用代金卷', trigger: 'change' } ],
         auditLive: [ { required: true, message: '请选择状态', trigger: 'change' } ],
         auditLiveProduct: [ { required: true, message: '请选择状态', trigger: 'change' } ],
+        exchangeIsNeedVerification: [ { required: true, message: '请选择状态', trigger: 'change' } ],
         score: [ { required: true, message: '请选择商家评分', trigger: 'change' } ],
         monthlySales: [ { required: true, message: '请输入商家月售额', trigger: 'blur' } ],
         // advertisement: [ { required: true, message: '请上传广告图', trigger: 'trigger' } ],

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>

src/views/order/pending/index.vue

@@ -134,7 +134,7 @@
               详情
             </el-button>
             <el-button
-              v-if="row.state === 1" type="danger" size="mini"
+              v-if="row.state === 1 || row.state === 8" type="danger" size="mini"
               @click="$refs.PaymentStatusUpdate && $refs.PaymentStatusUpdate.handleOpen(row)"
             >
               同步支付状态