Merge remote-tracking branch 'origin/master'

src/views/hard/hard-order/index.vue

@@ -295,7 +295,7 @@ const resetQuery = () => {
 	selectObjs.value = []
 	state.queryForm.deptId = ""
 	state.queryForm.deptIds = []
-	draggableDepTreeRef.value.resetData()
+	// draggableDepTreeRef.value.resetData()
 	getDataList()
 }
 

src/views/supermarketerp/supermarketSpu/components/supermarketAuxiliaryCode.vue

@@ -31,9 +31,22 @@
 		>
 			<vxe-column type="checkbox" width="40" fixed="left" />
 			<vxe-column type="seq" width="50" fixed="left" />
-			<vxe-column field="barCode" title="条码" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
+			<vxe-column field="unit" title="单位" :edit-render="{}">
 				<template #edit="{ row }">
-					<el-input v-model.trim="row.barCode" />
+					<el-select v-model="row.unit">
+						<div v-for="item in smErpUnitEntityList">
+							<el-option v-if="item.unit !== ''" :label="item.unit" :value="item.unit" />
+						</div>
+					</el-select>
+				</template>
+				<template #default="{ row }">
+					<span v-if="row.unit">{{ row.unit }}</span>
+					<span v-else style="color: #c0c4cf">请选择</span>
+				</template>
+			</vxe-column>
+			<vxe-column field="barCode" title="条码">
+				<template #default="{ row }">
+					{{ smErpUnitEntityList?.find((item: any) => item.unit == row.unit)?.barCode }}
 				</template>
 			</vxe-column>
 		</vxe-table>
@@ -47,20 +60,27 @@ const supermarketAuxiliaryCodeEntityList = defineModel("supermarketAuxiliaryCode
 	default: [
 		{
 			id: nanoid(5),
+			unit: "",
 			barCode: "",
 		},
 	],
 })
 
+defineProps<{
+	smErpUnitEntityList: any[]
+}>()
+
 const editableTableRef = ref()
 const validRules = {
-	barCode: [{ required: true, message: "条码不能为空", trigger: "blur" }],
+	unit: [{ required: true, message: "包装单位不能为空", trigger: "blur" }],
+	// barCode: [{ required: true, message: "条码不能为空", trigger: "blur" }],
 }
 
 // 底部表格行新增
 const pushEvent = () => {
 	const newRow: any = {
 		id: nanoid(5),
+		unit: "",
 		barCode: "",
 		isNew: true,
 	}

src/views/supermarketerp/supermarketSpu/components/supermarketUnit.vue

@@ -59,7 +59,7 @@
 					<el-input v-model.trim="row.unit" />
 				</template>
 			</vxe-column>
-			<vxe-column field="status" title="状态" :edit-render="{ autoFocus: 'input', placeholder: '请选择' }">
+			<vxe-column field="status" title="状态" :edit-render="{}">
 				<template #edit="{ row }">
 					<el-select v-model="row.status">
 						<el-option label="正常" :value="0" />

src/views/supermarketerp/supermarketSpu/form.vue

@@ -138,6 +138,7 @@
 				<el-tab-pane label="辅助条码" name="辅助条码" style="overflow-y: auto; height: 60vh">
 					<supermarket-auxiliaryCode
 						ref="supermarketAuxiliaryCodeEntityList"
+						:smErpUnitEntityList="form.smErpUnitEntityList"
 						v-model:supermarketAuxiliaryCodeEntityList="form.smErpAuxiliaryCodeEntityList"
 					/>
 				</el-tab-pane>
@@ -330,6 +331,8 @@ const useHandleUnit = () => {
 // 整理辅助条码列表
 const useHandleAuxiliaryCode = () => {
 	return form.smErpAuxiliaryCodeEntityList.map((item: any) => {
+		const barCode = form.smErpUnitEntityList.find((item2: any) => item2.unit === item.unit).barCode
+		item.barCode = barCode
 		if (item.isNew) {
 			item.id = ""
 			delete item.isNew
@@ -340,8 +343,6 @@ const useHandleAuxiliaryCode = () => {
 
 // 提交
 const onSubmit = async () => {
-	console.log("提交的数据", form)
-
 	const valid = await dataFormRef.value.validate().catch(() => {})
 	if (!valid) return useMessage().warning("基础信息必填项未填写完整")
 	if (!form.smErpUnitEntityList || form.smErpUnitEntityList.length <= 0) return useMessage().warning("请添加包装单位")
@@ -353,6 +354,8 @@ const onSubmit = async () => {
 
 	const handleUnit = useHandleUnit()
 	const handleAuxiliaryCode = useHandleAuxiliaryCode()
+	console.log("提交的数据", { ...form, smErpUnitEntityList: handleUnit, smErpAuxiliaryCodeEntityList: handleAuxiliaryCode })
+
 	try {
 		loading.value = true
 		const _pa = { ...form, smErpUnitEntityList: handleUnit, smErpAuxiliaryCodeEntityList: handleAuxiliaryCode }

src/views/wallet/wallet-qb/index.vue

@@ -17,8 +17,8 @@
 							<el-form-item style="width: 300px" label="用户" prop="userId">
 								<select-user v-model="state.queryForm.userId" />
 							</el-form-item>
-							<el-form-item style="width: 200px" label="饭卡卡号" prop="cardNumber">
-								<el-input v-model="state.queryForm.cardNumber" placeholder="饭卡卡号" clearable />
+							<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="walletRecordMonth">
 								<el-date-picker
@@ -29,9 +29,6 @@
 									placeholder="选择月份"
 								/>
 							</el-form-item>
-							<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>
 								<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn") }}</el-button>
 								<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
@@ -52,7 +49,7 @@
 							</el-button>
 							<right-toolbar
 								v-model:showSearch="showSearch"
-								:export="'wallet_walletManage_export'"
+								:export="'wallet_walletRecord_export'"
 								@exportExcel="exportExcel"
 								class="ml10 mr20"
 								style="float: right"
@@ -97,23 +94,18 @@
 								<div class="color-primary">{{ displayPrice(row.balance) }}</div>
 							</template>
 						</el-table-column>
-						<el-table-column prop="totalExpense" align="center" width="100" label="累计支出">
-							<template #default="{ row }">
-								<div class="color-danger">{{ displayPrice(row.totalExpense) }}</div>
-							</template>
-						</el-table-column>
-						<el-table-column prop="totalRecharge" align="center" width="100" label="累计充值">
-							<template #default="{ row }">
-								<div class="color-success">{{ displayPrice(row.totalRecharge) }}</div>
-							</template>
-						</el-table-column>
 						<el-table-column prop="isFreeze" width="120" label="是否冻结饭卡">
 							<template #default="{ row }">
 								<dict-tag :options="yes_no_type" :value="row.isFreeze" />
 							</template>
 						</el-table-column>
 						<el-table-column v-if="false" prop="activeBindStatus" width="120" label="饭卡绑定状态" />
-						<el-table-column prop="createTime" width="200" label="创建时间" />
+						<el-table-column prop="lastTopUpTime" width="200" label="最后充值时间">
+							<template #default="{ row }">
+								<span v-if="row.lastTopUpTime">{{ row.lastTopUpTime }}</span>
+								<span v-else class="color-danger">本月未充值</span>
+							</template>
+						</el-table-column>
 					</el-table>
 					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 				</template>
@@ -165,15 +157,15 @@ const resetQuery = () => {
 // 导出excel
 const exportExcel = () => {
 	postDownBlobFile(
-		"/wallet/wallet-manage/export",
+		"/wallet/wallet-manage/export-qb",
 		Object.assign(state.queryForm, { current: state.pagination?.current, size: state.pagination?.size }),
-		"walletManage.xlsx",
+		"wallet_walletRecord.xlsx",
 	)
 }
 
 const getSummaries = (param: any) => {
 	const { columns, data } = param
-	const totalColumns = ["balance", "totalExpense", "totalRecharge"]
+	const totalColumns = ["balance"]
 	const totalRow = Array.from({ length: columns.length })
 	columns.forEach((i: any, index: number) => {
 		if (totalColumns.includes(i.property)) {
@@ -218,39 +210,3 @@ const handleDelete = async (ids: string[]) => {
 	}
 }
 </script>
-
-<!-- <style scoped>
-.cell {
-	height: 30px;
-	padding: 3px 0;
-	box-sizing: border-box;
-}
-
-.cell .text {
-	width: 24px;
-	height: 24px;
-	display: block;
-	margin: 0 auto;
-	line-height: 24px;
-	position: absolute;
-	left: 50%;
-	transform: translateX(-50%);
-	border-radius: 50%;
-}
-
-.cell.current .text {
-	background: #626aef;
-	color: #fff;
-}
-
-.cell .holiday {
-	position: absolute;
-	width: 6px;
-	height: 6px;
-	background: var(--el-color-danger);
-	border-radius: 50%;
-	bottom: 0px;
-	left: 50%;
-	transform: translateX(-50%);
-}
-</style> -->

src/views/wallet/wallet-xf/index.vue

@@ -17,6 +17,9 @@
 							<el-form-item style="width: 300px" label="用户" prop="userId">
 								<select-user v-model="state.queryForm.userId" />
 							</el-form-item>
+							<el-form-item style="width: 200px" label="充值方式" prop="bizType">
+								<dict-select v-model="state.queryForm.bizType" dict-code="wallet_biz" />
+							</el-form-item>
 							<el-form-item style="width: 300px" label="消费时间" prop="createTimeList">
 								<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
 							</el-form-item>