zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
weiwei committed 2025-03-06 17:49:22 +08:00
2 parents fa749334d7 67072d6c6b
commit b6b8808097
5 files changed
+82 -30
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/views/hard/hard-sb/index.vue
+33 -5
View File
@@ -61,22 +61,49 @@
</template>
</el-table-column>
<el-table-column label="商户" align="center" prop="merchantName" />
<el-table-column label="总消费金额" align="center" prop="totalPayPrice">
<el-table-column label="消费金额" align="center" prop="totalPayPrice">
<template #default="{ row }">
<span class="color-success">
<span class="color-primary">
{{ displayPrice(row.totalPayPrice) }}
</span>
</template>
</el-table-column>
<el-table-column label="总消费次数" align="center" prop="totalPayCount">
<el-table-column label="消费次数" align="center" prop="totalPayCount">
<template #default="{ row }">
<span class="color-primary">
{{ row.totalPayCount }}
</span>
</template>
</el-table-column>
<el-table-column label="退款金额" align="center" prop="totalRefundPrice">
<template #default="{ row }">
<span class="color-danger">
{{ displayPrice(row.totalRefundPrice) }}
</span>
</template>
</el-table-column>
<el-table-column label="退款次数" align="center" prop="totalRefundCount">
<template #default="{ row }">
<span class="color-danger">
{{ row.totalRefundCount }}
</span>
</template>
</el-table-column>
<el-table-column label="盈利金额" align="center" prop="totalProfitPrice">
<template #default="{ row }">
<span class="color-success">
{{ displayPrice(row.totalProfitPrice) }}
</span>
</template>
</el-table-column>
<el-table-column label="盈利次数" align="center" prop="totalProfitCount">
<template #default="{ row }">
<span class="color-success">
{{ row.totalProfitCount }}
</span>
</template>
</el-table-column>
</el-table>
<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
</template>
</DraggableDepTree>
</div>
@@ -102,6 +129,7 @@ const draggableDepTreeRef = ref() // 树组件ref引用
const { hard_type } = useDict("hard_type")
const state: BasicTableProps = reactive<BasicTableProps>({
isPage: false,
queryForm: {},
pageList: hardTotalApi.pageListSb,
})
@@ -116,7 +144,7 @@ const exportExcel = () => {
const getSummaries = (param: any) => {
const { columns, data } = param
const totalColumns = ["totalPayPrice", "totalPayCount"]
const totalColumns = ["totalPayPrice", "totalPayCount", "totalRefundPrice", "totalRefundCount", "totalProfitPrice", "totalProfitCount"]
const totalRow = Array.from({ length: columns.length })
totalRow[0] = "合计"
columns.forEach((i: any, index: number) => {
src/views/hard/hard-sh/index.vue
+33 -5
View File
@@ -53,22 +53,49 @@
<el-table-column type="selection" width="80" 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">
<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">
<el-table-column label="消费次数" align="center" prop="totalPayCount">
<template #default="{ row }">
<span class="color-primary">
{{ row.totalPayCount }}
{{ row.totalPayCount || 0 }}
</span>
</template>
</el-table-column>
<el-table-column label="退款金额" align="center" prop="totalRefundPrice">
<template #default="{ row }">
<span class="color-danger">
{{ displayPrice(row.totalRefundPrice) }}
</span>
</template>
</el-table-column>
<el-table-column label="退款次数" align="center" prop="totalRefundCount">
<template #default="{ row }">
<span class="color-danger">
{{ row.totalRefundCount || 0 }}
</span>
</template>
</el-table-column>
<el-table-column label="盈利金额" align="center" prop="totalProfitPrice">
<template #default="{ row }">
<span class="color-success">
{{ displayPrice(row.totalProfitPrice) }}
</span>
</template>
</el-table-column>
<el-table-column label="盈利次数" align="center" prop="totalProfitCount">
<template #default="{ row }">
<span class="color-success">
{{ row.totalProfitCount || 0 }}
</span>
</template>
</el-table-column>
</el-table>
<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
</template>
</DraggableDepTree>
</div>
@@ -90,6 +117,7 @@ const multiple = ref(true)
const draggableDepTreeRef = ref() // 树组件ref引用
const state: BasicTableProps = reactive<BasicTableProps>({
isPage: false,
queryForm: {},
pageList: hardTotalApi.pageListCs,
})
@@ -116,7 +144,7 @@ const exportExcel = () => {
const getSummaries = (param: any) => {
const { columns, data } = param
const totalColumns = ["totalPayPrice", "totalPayCount"]
const totalColumns = ["totalPayPrice", "totalPayCount", "totalRefundPrice", "totalRefundCount", "totalProfitPrice", "totalProfitCount"]
const totalRow = Array.from({ length: columns.length })
totalRow[0] = "合计"
columns.forEach((i: any, index: number) => {
src/views/supermarketerp/components/erpSpuSelectDialog.vue
+7 -7
View File
@@ -42,20 +42,20 @@
<preview-image @click.stop :src="scope.row.picUrl" />
</template>
</el-table-column>
<el-table-column prop="barcode" label="自编码/条码" min-width="150px" align="center" show-overflow-tooltip />
<!-- <el-table-column prop="barcode" label="自编码/条码" min-width="150px" align="center" show-overflow-tooltip />-->
<el-table-column prop="stock" label="库存" min-width="80px" align="center" show-overflow-tooltip />
<el-table-column prop="productCode" label="货号" min-width="100px" align="center" show-overflow-tooltip />
<el-table-column prop="brandId" label="品牌" min-width="100px" align="center" show-overflow-tooltip>
<template #default="scope">
{{ supermarketBrand?.find((item: any) => item.id === scope.row.brandId)?.name }}
</template>
</el-table-column>
<!-- <el-table-column prop="brandId" label="品牌" min-width="100px" align="center" show-overflow-tooltip>-->
<!-- <template #default="scope">-->
<!-- {{ supermarketBrand?.find((item: any) => item.id === scope.row.brandId)?.name }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="categoryId" label="分类" min-width="100px" align="center" show-overflow-tooltip>
<template #default="scope">
{{ supermarketCategory?.find((item: any) => item.id === scope.row.categoryId)?.name }}
</template>
</el-table-column>
<el-table-column prop="deptId" label="商户" min-width="100px" align="center" show-overflow-tooltip />
<!-- <el-table-column prop="deptId" label="商户" min-width="100px" align="center" show-overflow-tooltip />-->
<el-table-column prop="supplierId" label="货商" min-width="100px" align="center" show-overflow-tooltip />
<el-table-column prop="status" label="状态" min-width="100px" align="center" show-overflow-tooltip>
<template #default="scope">
src/views/supermarketerp/components/linkCodeDialog.vue
+9 -8
View File
@@ -12,15 +12,16 @@
@radio-change="radioChangeEvent"
>
<vxe-column type="radio" width="60" align="center"></vxe-column>
<vxe-column field="id" title="id" align="center" width="200"></vxe-column>
<!-- <vxe-column field="id" title="id" align="center" width="200"></vxe-column>-->
<vxe-column field="planCode" title="编号" align="center" width="200"></vxe-column>
<vxe-column field="planDate" title="单据日期" align="center" width="200"></vxe-column>
<vxe-column field="handlerUserId" title="经办人" align="center" width="100"></vxe-column>
<vxe-column field="checkStatus" title="审批状态" align="center" width="100">
<template #default="{ row }">
<dict-tag :options="check_status" :value="row.checkStatus" />
</template>
</vxe-column>
<vxe-column field="productName" title="商品名称" align="center" width="200"></vxe-column>
<vxe-column field="handlerUserName" title="经办人" align="center" width="100"></vxe-column>
<!-- <vxe-column field="checkStatus" title="审批状态" align="center" width="100">-->
<!-- <template #default="{ row }">-->
<!-- <dict-tag :options="check_status" :value="row.checkStatus" />-->
<!-- </template>-->
<!-- </vxe-column>-->
<vxe-column field="remark" title="备注" show-overflow align="center" min-width="100"></vxe-column>
</vxe-table>
<!-- <pagination
@@ -39,7 +40,7 @@
:data="currRadioRowItems"
>
<vxe-column type="checkbox" width="60" align="center"></vxe-column>
<vxe-column field="erpSpuId" title="erpSpuId" align="center" width="200"></vxe-column>
<!-- <vxe-column field="erpSpuId" title="erpSpuId" align="center" width="200"></vxe-column>-->
<vxe-column field="unit" title="包装单位" align="center" width="200"></vxe-column>
<vxe-column field="quantity" title="数量" align="center" width="100"></vxe-column>
<vxe-column field="purchasePrice" title="进价" align="center" width="100"></vxe-column>
src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue
-5
View File
@@ -22,11 +22,6 @@
style="width: 200px"
/>
</el-form-item>
<el-form-item label="审批状态" prop="checkStatus">
<el-select v-model="baseDataForm.checkStatus" placeholder="请选择审批状态" style="width: 200px">
<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />
</el-select>
</el-form-item>
<el-form-item label="货商" prop="supplierId">
<select-supplier v-model="baseDataForm.supplierId" style="width: 200px" />
</el-form-item>