Merge remote-tracking branch 'origin/master'

pull/781/head
苑坤 2025-05-25 17:48:02 +08:00
commit 23a14735ef
2 changed files with 375 additions and 375 deletions

View File

@ -10,7 +10,7 @@
<el-form-item label="类型" prop="type"> <el-form-item label="类型" prop="type">
<el-select v-model="formData.type" placeholder="请选择类型"> <el-select v-model="formData.type" placeholder="请选择类型">
<el-option <el-option
v-for="dict in getIntDictOptions(DICT_TYPE.CRM_SERVICE_FEE_COLLECTION_METHOD_TYPE)" v-for="dict in getIntDictOptions(DICT_TYPE.CRM_SERVICE_FEE_COLLECTION_METHOD)"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"

View File

@ -82,7 +82,7 @@
<el-table-column label="主键" align="center" prop="id" /> <el-table-column label="主键" align="center" prop="id" />
<el-table-column label="类型" align="center" prop="type"> <el-table-column label="类型" align="center" prop="type">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.CRM_SERVICE_FEE_COLLECTION_METHOD_TYPE" :value="scope.row.type" /> <dict-tag :type="DICT_TYPE.CRM_SERVICE_FEE_COLLECTION_METHOD" :value="scope.row.type" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="产品明细" align="center" prop="productDetail" /> <el-table-column label="产品明细" align="center" prop="productDetail" />