Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

src/views/wallet/mch-manage/form.vue

@@ -7,13 +7,11 @@
 						<el-input v-model.trim="form.name" placeholder="请输入商户名" />
 					</el-form-item>
 				</el-col>
-
 				<el-col :span="24" class="mb20">
 					<el-form-item label="部门" prop="deptId">
 						<select-dept v-model="form.deptId" placeholder="请选择部门" />
 					</el-form-item>
 				</el-col>
-
 				<el-col :span="24" class="mb20">
 					<el-form-item label="商户类型" prop="merchantType">
 						<el-radio-group v-model="form.merchantType">
@@ -72,13 +70,11 @@
 						<upload-img v-model:imageUrl="form.logoPic" />
 					</el-form-item>
 				</el-col>
-
 				<el-col :span="24" class="mb20">
 					<el-form-item label="轮播图" prop="swiperPic">
 						<upload-imgs v-model="form.swiperPic" />
 					</el-form-item>
 				</el-col>
-
 				<el-col :span="12" class="mb20">
 					<el-form-item prop="sort">
 						<template #label>
@@ -88,13 +84,11 @@
 						<el-input-number v-model="form.sort" placeholder="" />
 					</el-form-item>
 				</el-col>
-
 				<el-col :span="24" class="mb20">
 					<el-form-item label="联系电话" prop="phone">
 						<el-input v-model.trim="form.phone" placeholder="请输入联系电话" />
 					</el-form-item>
 				</el-col>
-
 				<el-col :span="24" class="mb20">
 					<el-form-item label="营业时间：" class="my-0" />
 					<el-form-item class="ml-2" label="早上" prop="jobTime">
@@ -134,7 +128,6 @@
 						/>
 					</el-form-item>
 				</el-col>
-
 				<el-col :span="24" class="mb20">
 					<el-form-item label="店铺地址" prop="addressDes">
 						<el-input type="textarea" v-model.trim="form.addressDes" placeholder="请输入店铺地址" />
@@ -253,9 +246,6 @@ watch(
 
 // 提交
 const onSubmit = async () => {
-	console.log(form)
-	return
-
 	const valid = await dataFormRef.value.validate().catch(() => {})
 	if (!valid) return false
 	const _pa = {

src/views/wallet/mch-manage/index.vue

@@ -92,13 +92,18 @@
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column prop="deptName" label="部门" show-overflow-tooltip min-width="300" />
+				<el-table-column prop="deptName" label="部门" show-overflow-tooltip min-width="100" />
 				<el-table-column prop="phone" label="联系电话" :min-width="120" />
 				<el-table-column prop="sort" label="排序" :min-width="100">
 					<template #default="{ row }">
 						<span class="color-success">{{ row.sort }}</span>
 					</template>
 				</el-table-column>
+				<el-table-column prop="mchCount" label="分店数量" :min-width="100">
+					<template #default="{ row }">
+						<span class="color-primary">{{ row.mchCount || 0 }}</span>
+					</template>
+				</el-table-column>
 				<el-table-column prop="businessTime" label="营业时间" :min-width="160">
 					<template #default="{ row }">
 						<div>{{ row.jobTime?.split(",")[0] ? "早上：" + row.jobTime?.split(",")[0] : "" }}</div>

src/views/wallet/wallet-recharge-apply/index.vue

@@ -9,6 +9,15 @@
 					<el-form-item style="width: 200px" label="饭卡类型" prop="walletTypeId">
 						<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
 					</el-form-item>
+					<el-form-item style="width: 200px" label="充值类型" prop="bizType">
+						<dict-select v-model="state.queryForm.bizType" dict-code="wallet_biz_recharge" placeholder="充值类型" />
+					</el-form-item>
+					<el-form-item style="width: 450px" label="创建时间" prop="createTimeList">
+						<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
+					</el-form-item>
+					<el-form-item style="width: 450px" label="审核时间" prop="processTimeList">
+						<el-date-picker v-model="state.queryForm.processTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
+					</el-form-item>
 					<el-form-item>
 						<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn") }}</el-button>
 						<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
@@ -85,7 +94,18 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="remark" width="300" label="备注" />
-				<el-table-column prop="createTime" width="200" label="创建时间" />
+				<el-table-column width="250" label="时间">
+					<template #default="{ row }">
+						<div class="status">
+							<span>创建时间</span>
+							<span>{{ row.createTime }} </span>
+						</div>
+						<div class="status">
+							<span>审批时间</span>
+							<span>{{ row.processTime ?? "未审核" }} </span>
+						</div>
+					</template>
+				</el-table-column>
 				<el-table-column label="操作" width="300" fixed="right">
 					<template #default="{ row }">
 						<el-button
@@ -281,3 +301,29 @@ const taskSubmitEvent = () => {
 	getDataList()
 }
 </script>
+
+<style scoped lang="scss">
+.status {
+	display: flex;
+	align-items: center;
+	margin-bottom: 2px;
+
+	span {
+		display: inline-block;
+	}
+
+	span:nth-child(1) {
+		min-width: 60px;
+		max-width: 100px;
+		text-align: left;
+	}
+
+	span:nth-child(2) {
+		flex: 1;
+		min-width: 50px;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+}
+</style>