bug修改
This commit is contained in:
parent
c90d2496c4
commit
db5bebde14
@ -39,6 +39,7 @@ export interface TenantForm {
|
||||
id: number | string | undefined;
|
||||
tenantId: number | string | undefined;
|
||||
username: string;
|
||||
bearFeeFlag: number | string | undefined;
|
||||
joinTime: string;
|
||||
type: number;
|
||||
mchtcode: string;
|
||||
|
@ -34,6 +34,7 @@
|
||||
v-model:limit="queryParams.size"
|
||||
@pagination="getListList"
|
||||
/>
|
||||
|
||||
</div>
|
||||
</el-card>
|
||||
</div>
|
||||
|
@ -117,7 +117,8 @@
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination v-show="total > 0" v-model:current="queryParams.current" v-model:size="queryParams.size" :total="total" @pagination="getList" />
|
||||
<!-- <pagination v-show="total > 0" v-model:current="queryParams.current" v-model:size="queryParams.size" :total="total" @pagination="getList" /> -->
|
||||
<pagination v-if="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.size" @pagination="getList" />
|
||||
</el-card>
|
||||
<!-- 添加或修改租户对话框 -->
|
||||
<el-dialog v-model="dialog.visible" :title="dialog.title" width="1200px" append-to-body>
|
||||
@ -165,7 +166,6 @@
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="出生年月:" prop="birthday">
|
||||
|
||||
<el-date-picker v-model="form.birthday" type="date" clearable value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择出生年月" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
@ -91,8 +91,7 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination v-show="total > 0" v-model:current="queryParams.current" v-model:size="queryParams.size" :total="total" @pagination="getList" />
|
||||
<pagination v-if="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.size" @pagination="getList" />
|
||||
</el-card>
|
||||
<!-- 添加或修改租户对话框 -->
|
||||
<el-dialog v-model="dialog.visible" :title="dialog.title" width="1200px" append-to-body>
|
||||
|
@ -27,7 +27,7 @@
|
||||
</transition>
|
||||
|
||||
<el-card shadow="hover">
|
||||
<el-table border :data="tenantList">
|
||||
<el-table border :data="tenantList">
|
||||
<!-- <el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column v-if="false" label="id" align="center" prop="id" /> -->
|
||||
<el-table-column label="团长姓名" align="center" prop="spreadUserName" />
|
||||
@ -36,8 +36,7 @@
|
||||
<el-table-column label="订单金额" align="center" prop="totalAmount" />
|
||||
<el-table-column label="订单时间" align="center" prop="startTime" />
|
||||
</el-table>
|
||||
|
||||
<pagination v-show="total > 0" v-model:current="queryParams.current" v-model:size="queryParams.size" :total="total" @pagination="getList" />
|
||||
<pagination v-if="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.size" @pagination="getList" />
|
||||
</el-card>
|
||||
</div>
|
||||
</template>
|
||||
|
@ -41,7 +41,7 @@
|
||||
<el-table-column label="绑定日期" align="center" prop="spreadTime" />
|
||||
</el-table>
|
||||
|
||||
<pagination v-show="total > 0" v-model:current="queryParams.current" v-model:size="queryParams.size" :total="total" @pagination="getList" />
|
||||
<pagination v-if="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.size" @pagination="getList" />
|
||||
</el-card>
|
||||
</div>
|
||||
</template>
|
||||
|
@ -96,8 +96,8 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination v-show="total > 0" v-model:current="queryParams.current" v-model:size="queryParams.size" :total="total" @pagination="getList" />
|
||||
<pagination v-if="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.size" @pagination="getList" />
|
||||
<!-- <pagination v-show="total > 0" v-model:current="queryParams.current" v-model:size="queryParams.size" :total="total" @pagination="getList" /> -->
|
||||
</el-card>
|
||||
<!-- 添加或修改租户对话框 -->
|
||||
<el-dialog v-model="dialog.visible" :title="dialog.title" width="1200px" append-to-body>
|
||||
|
@ -61,7 +61,8 @@
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination v-show="total > 0" v-model:current="queryParams.current" v-model:size="queryParams.size" :total="total" @pagination="getList" />
|
||||
<!-- <pagination v-show="total > 0" v-model:current="queryParams.current" v-model:size="queryParams.size" :total="total" @pagination="getList" /> -->
|
||||
<pagination v-if="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.size" @pagination="getList" />
|
||||
</el-card>
|
||||
<!-- 添加/修改模板 -->
|
||||
<el-dialog v-model="dialog.visible" :title="dialog.title" width="800px" append-to-body>
|
||||
@ -362,7 +363,6 @@ const data = reactive<PageData<TenantForm, TenantQuery>>({
|
||||
|
||||
const { queryParams, form, rules } = toRefs(data);
|
||||
|
||||
|
||||
/** 查询租户列表 */
|
||||
const getList = async () => {
|
||||
loading.value = true;
|
||||
|
@ -132,9 +132,8 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination v-show="total > 0" v-model:current="queryParams.current" v-model:size="queryParams.size" :total="total" @pagination="getList" />
|
||||
</el-card>
|
||||
<pagination v-show="total > 0" v-model:page="queryParams.current" v-model:limit="queryParams.size" :total="total" @pagination="getList" />
|
||||
</el-card>
|
||||
<!--租户封禁记录-->
|
||||
<el-dialog title="店铺封禁信息" v-model="tenantBannedInfoModalVisible" width="900px" append-to-body>
|
||||
<el-table v-loading="tenantBannedInfoTableLoading" :data="tenantBannedInfo.data" border empty-text="暂无数据">
|
||||
@ -404,6 +403,14 @@
|
||||
<oss-image-upload v-model="form.contractAttachment" :limit="1"> </oss-image-upload>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="是否承担手续费" prop="contractAttachment" align="left">
|
||||
<el-radio-group v-model="form.bearFeeFlag">
|
||||
<el-radio :value="false" size="large">否</el-radio>
|
||||
<el-radio :value="true" size="large">是</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</el-form>
|
||||
@ -620,6 +627,9 @@
|
||||
{{ signfun(tenantForm.signStatus) }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-form-item label="是否承担手续费" prop="contractAttachment" align="left">
|
||||
{{ tenantForm.bearFeeFlag==1?'是':'否' }}
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
</div>
|
||||
</el-form>
|
||||
@ -841,6 +851,7 @@ const initFormData: TenantForm = {
|
||||
status: '0', //是否启用状态
|
||||
businessLicense: '', //营业执照号
|
||||
idCard: '', //负责人证件信息/身份证号
|
||||
bearFeeFlag: '', //是否承担手续费
|
||||
bankCard: '', //开户卡账号
|
||||
bankType: '', //开户行类型
|
||||
bankName: '', //开户行名称
|
||||
@ -869,8 +880,6 @@ const initFormData: TenantForm = {
|
||||
const data = reactive<PageData<TenantForm, TenantQuery>>({
|
||||
form: { ...initFormData },
|
||||
queryParams: {
|
||||
pageSize: 10,
|
||||
pageNum: 1,
|
||||
current: 1,
|
||||
size: 10,
|
||||
type: 2,
|
||||
|
@ -73,8 +73,8 @@
|
||||
<pagination
|
||||
v-if="userChargedrawInfo.total"
|
||||
:total="userChargedrawInfo.total"
|
||||
v-model:page="chargeDataParams.current"
|
||||
v-model:limit="chargeDataParams.size"
|
||||
v-model:page="queryParams.current"
|
||||
v-model:limit="queryParams.size"
|
||||
@pagination="
|
||||
() => {
|
||||
getList(userChargedrawInfo.record);
|
||||
|
@ -95,8 +95,8 @@
|
||||
<pagination
|
||||
v-if="userWithdrawInfo.total"
|
||||
:total="userWithdrawInfo.total"
|
||||
v-model:page="withdrawDataParams.current"
|
||||
v-model:limit="withdrawDataParams.size"
|
||||
v-model:page="queryParams.current"
|
||||
v-model:limit="queryParams.size"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</el-card>
|
||||
|
@ -340,8 +340,8 @@
|
||||
<pagination
|
||||
v-if="userBankCardInfo.total"
|
||||
:total="userBankCardInfo.total"
|
||||
v-model:page="bankCardDataParams.current"
|
||||
v-model:limit="bankCardDataParams.size"
|
||||
v-model:page="queryParams.current"
|
||||
v-model:limit="queryParams.size"
|
||||
@pagination="
|
||||
() => {
|
||||
showUserBankCardInfoModal(userBannedInfo.record);
|
||||
|
Loading…
x
Reference in New Issue
Block a user