Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud

src/api/hard/hard-total.ts

@@ -0,0 +1,17 @@
+import request from "/@/utils/request"
+
+export function pageListSb(query?: Object) {
+	return request({
+		url: "/hard/hard-total/page-list-sb",
+		method: "get",
+		params: query,
+	})
+}
+
+export function pageListCs(query?: Object) {
+	return request({
+		url: "/hard/hard-total/page-list-cs",
+		method: "get",
+		params: query,
+	})
+}

src/views/admin/system/user/face-manage.vue

@@ -62,6 +62,7 @@
 import { BasicTableProps, useTable } from "/@/hooks/table"
 import * as userFaceApi from "/@/api/admin/userFace"
 import { useMessage } from "/@/hooks/message"
+import { auth } from "/@/utils/authFunction"
 
 // 定义刷新表格emit
 const emit = defineEmits(["refresh"])
@@ -83,8 +84,15 @@ const formData = ref<any>({
 })
 const detailId = ref<any>(null)
 
+onMounted(() => {
+	if (auth("userFace_sysUserFace_view")) {
+		getDataList()
+	}
+})
+
 // 定义表格查询、后台调用的API
 const state: BasicTableProps = reactive<BasicTableProps>({
+	createdIsNeed: false,
 	queryForm: {
 		deptId: "",
 		username: "",

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

@@ -0,0 +1,138 @@
+<template>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+				<el-row :gutter="24">
+					<el-col :span="5">
+						<el-form-item class="w100" label="创建时间" prop="payTimeList">
+							<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD" type="daterange" />
+						</el-form-item>
+					</el-col>
+					<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>
+					</el-form-item>
+				</el-row>
+			</el-form>
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<right-toolbar
+						:search="false"
+						v-model:showSearch="showSearch"
+						:export="'hard_hardTotal_export_sb'"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					></right-toolbar>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
+				:summary-method="getSummaries"
+				show-summary
+				@selection-change="selectionChangHandle"
+				@sort-change="sortChangeHandle"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="50" />
+				<el-table-column label="设备" align="center">
+					<template #default="{ row }">
+						<div class="flex flex-row items-center justify-center">
+							<div class="mr-2">{{ row.hardName }}</div>
+							<dict-tag :options="hard_type" :value="row.hardType" />
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column label="商户" align="center" prop="merchantName" />
+				<el-table-column label="总消费金额" align="center" prop="totalPayPrice">
+					<template #default="{ row }">
+						<span class="color-success">
+							{{ displayPrice(row.totalPayPrice) }}
+						</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="总消费次数" align="center" prop="totalPayCount">
+					<template #default="{ row }">
+						<span class="color-primary">
+							{{ row.totalPayCount }}
+						</span>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts" name="hard-sb">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import * as hardTotalApi from "/@/api/hard/hard-total"
+import { displayPrice } from "/@/utils/formatMoney"
+import { useDict } from "/@/hooks/dict"
+
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+// 定义查询字典
+const { hard_type } = useDict("hard_type")
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+	queryForm: {},
+	pageList: hardTotalApi.pageListSb,
+})
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
+	useTable(state)
+
+// 导出excel
+const exportExcel = () => {
+	downBlobFile("/hard/hard-total/export-sb", Object.assign(state.queryForm), "设备交易记录.xlsx")
+}
+
+const getSummaries = (param: any) => {
+	const { columns, data } = param
+	const totalColumns = ["totalPayPrice", "totalPayCount"]
+	const totalRow = Array.from({ length: columns.length })
+	totalRow[2] = "合计"
+	columns.forEach((i: any, index: number) => {
+		if (totalColumns.includes(i.property)) {
+			const total = data
+				.filter((v: any) => v[i.property] != null)
+				.map((v: any) => v[i.property])
+				.reduce((pren: number, next: number) => pren + next, 0)
+			if (i.property.includes("Price")) {
+				totalRow[index] = displayPrice(total)
+			} else {
+				totalRow[index] = total
+			}
+		}
+	})
+	return totalRow
+}
+
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
+</script>

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

@@ -0,0 +1,126 @@
+<template>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+				<el-row :gutter="24">
+					<el-col :span="5">
+						<el-form-item class="w100" label="创建时间" prop="payTimeList">
+							<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD" type="daterange" />
+						</el-form-item>
+					</el-col>
+					<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>
+					</el-form-item>
+				</el-row>
+			</el-form>
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<right-toolbar
+						:search="false"
+						v-model:showSearch="showSearch"
+						:export="'wallet_walletTransaction_export'"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					></right-toolbar>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:summary-method="getSummaries"
+				show-summary
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
+				@selection-change="selectionChangHandle"
+				@sort-change="sortChangeHandle"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="50" />
+				<el-table-column label="商户" align="center" prop="merchantName" />
+				<el-table-column label="总消费金额" align="center" prop="totalPayPrice">
+					<template #default="{ row }">
+						<span class="color-success">
+							{{ displayPrice(row.totalPayPrice) }}
+						</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="总消费次数" align="center" prop="totalPayCount">
+					<template #default="{ row }">
+						<span class="color-primary">
+							{{ row.totalPayCount }}
+						</span>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts" name="hard-sb">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { displayPrice } from "/@/utils/formatMoney"
+import * as hardTotalApi from "/@/api/hard/hard-total"
+
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+	queryForm: {},
+	pageList: hardTotalApi.pageListCs,
+})
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
+	useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+	downBlobFile("/hard/hard-total/export-cs", Object.assign(state.queryForm), "商户交易记录.xlsx")
+}
+
+const getSummaries = (param: any) => {
+	const { columns, data } = param
+	const totalColumns = ["totalPayPrice", "totalPayCount"]
+	const totalRow = Array.from({ length: columns.length })
+	totalRow[2] = "合计"
+	columns.forEach((i: any, index: number) => {
+		if (totalColumns.includes(i.property)) {
+			const total = data
+				.filter((v: any) => v[i.property] != null)
+				.map((v: any) => v[i.property])
+				.reduce((pren: number, next: number) => pren + next, 0)
+			if (i.property.includes("Price")) {
+				totalRow[index] = displayPrice(total)
+			} else {
+				totalRow[index] = total
+			}
+		}
+	})
+	return totalRow
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
+</script>

src/views/supermarketerp/supermarketSpu/form.vue

@@ -194,11 +194,11 @@
 					</el-row>
 				</el-tab-pane>
 				<el-tab-pane label="包装单位" name="包装单位" style="overflow-y: auto; height: 60vh">
-					<supermarketUnit v-model:supermarketUnitEntityList="form.supermarketUnitEntityList" />
+					<supermarketUnit v-model:supermarketUnitEntityList="form.smErpUnitEntityList" />
 				</el-tab-pane>
 				<el-tab-pane label="辅助条码" name="辅助条码" style="overflow-y: auto; height: 60vh">
 					<supermarketAuxiliaryCode
-						v-model:supermarketAuxiliaryCodeEntityList="form.supermarketAuxiliaryCodeEntityList"
+						v-model:supermarketAuxiliaryCodeEntityList="form.smErpAuxiliaryCodeEntityList"
 					/>
 				</el-tab-pane>
 			</el-tabs>
@@ -273,8 +273,8 @@ const form = reactive({
 	inventoryUpperLimit: 0,
 	inventoryLowerLimit: 0,
 	grossMargin: 0,
-	supermarketUnitEntityList: [],
-	supermarketAuxiliaryCodeEntityList: [],
+  smErpUnitEntityList: [],
+  smErpAuxiliaryCodeEntityList: [],
 })
 // 定义校验规则
 const dataRules = {
@@ -289,8 +289,8 @@ const dataRules = {
 	picUrl: [{ required: true, message: "商品封面图不能为空", trigger: "blur" }],
 	status: [{ required: true, message: "请选择商品状态", trigger: "blur" }],
 	supplierId: [{ required: true, message: "请选择货商", trigger: "blur" }],
-	supermarketUnitEntityList: [{ required: true, message: "请添加包装单位", trigger: "change" }],
-	supermarketAuxiliaryCodeEntityList: [{ required: true, message: "请添加辅助条码", trigger: "change" }],
+  smErpUnitEntityList: [{ required: true, message: "请添加包装单位", trigger: "change" }],
+  smErpAuxiliaryCodeEntityList: [{ required: true, message: "请添加辅助条码", trigger: "change" }],
 }
 const { supermarket_nature, status } = useDict("supermarket_nature", "status")
 const categoryOptions = ref<any>([]) // 商品分类的下拉选项
@@ -302,7 +302,7 @@ const getsupermarketSpuData = async (id: string) => {
 	// 获取数据
 	loading.value = true
 	const res = await getObj(id).finally(() => (loading.value = false))
-	res.data.supermarketUnitEntityList.map((item: any) => {
+	res.data.smErpUnitEntityList.map((item: any) => {
 		item.costPrice = displayPrice(item.costPrice, "")
 		item.promotionPrice = displayPrice(item.promotionPrice, "")
 		item.purchasePrice = displayPrice(item.purchasePrice, "")
@@ -369,16 +369,16 @@ const onSubmit = async () => {
 
 	const valid = await dataFormRef.value.validate().catch(() => {})
 	if (!valid) useMessage().warning("基础信息必填项未填写完整")
-	if (!form.supermarketUnitEntityList || form.supermarketUnitEntityList.length <= 0)
+	if (!form.smErpUnitEntityList || form.smErpUnitEntityList.length <= 0)
 		useMessage().warning("请添加包装单位")
-	if (!form.supermarketAuxiliaryCodeEntityList || form.supermarketAuxiliaryCodeEntityList.length <= 0)
+	if (!form.smErpAuxiliaryCodeEntityList || form.smErpAuxiliaryCodeEntityList.length <= 0)
 		useMessage().warning("请添加辅助条码")
 	if (!valid) return false
 
 	try {
 		loading.value = true
 		if (form.id) {
-			form.supermarketUnitEntityList.map((item: any) => {
+			form.smErpUnitEntityList.map((item: any) => {
 				item.costPrice = storePrice(item.costPrice)
 				item.promotionPrice = storePrice(item.promotionPrice)
 				item.purchasePrice = storePrice(item.purchasePrice)
@@ -388,7 +388,7 @@ const onSubmit = async () => {
 					delete item.isNew
 				}
 			})
-			form.supermarketAuxiliaryCodeEntityList.map((item: any) => {
+			form.smErpAuxiliaryCodeEntityList.map((item: any) => {
 				if (item.isNew) {
 					item.id = ""
 					delete item.isNew
@@ -396,14 +396,14 @@ const onSubmit = async () => {
 			})
 			await putObj(form)
 		} else {
-			form.supermarketUnitEntityList.map((item: any) => {
+			form.smErpUnitEntityList.map((item: any) => {
 				item.id = ""
 				item.costPrice = storePrice(item.costPrice)
 				item.promotionPrice = storePrice(item.promotionPrice)
 				item.purchasePrice = storePrice(item.purchasePrice)
 				item.retailPrice = storePrice(item.retailPrice)
 			})
-			form.supermarketAuxiliaryCodeEntityList.map((item: any) => {
+			form.smErpAuxiliaryCodeEntityList.map((item: any) => {
 				item.id = ""
 			})
 			await addObj(form)