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

feat:用户部门

Browse Source
This commit is contained in:
dzc committed 2025-08-14 10:31:52 +08:00
1 parent 3026bc8eee
commit dd0d6a21cf
3 files changed
+73 -83
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/views/hard/hard-order/index.vue
+1 -1
View File
@@ -66,7 +66,7 @@
class="flex flex-col ml-2 items-start cursor-pointer hover:underline hover:text-blue-500">
<span> {{ row.username }}</span>
<span> {{ row.userMobile }}</span>
<span> {{ row.deptName }}</span>
<span> {{ row.userDeptName }}</span>
</div>
</div>
<div v-else>
src/views/supermarketerp/supermarketSpu/index.vue
+60 -82
View File
@@ -8,12 +8,14 @@
</el-form-item>
<el-form-item label="商品分类" prop="categoryId">
<el-select v-model="state.queryForm.categoryId" placeholder="请选择商品分类">
<el-option v-for="item in supermarketCategory" :key="item?.id" :label="item?.name" :value="item?.id" />
<el-option v-for="item in supermarketCategory" :key="item?.id" :label="item?.name"
:value="item?.id" />
</el-select>
</el-form-item>
<el-form-item label="商品性质" prop="productNature">
<el-select v-model="state.queryForm.productNature" placeholder="请选择商品性质">
<el-option v-for="item in supermarket_nature" :key="item?.id" :label="item?.label" :value="item?.value" />
<el-option v-for="item in supermarket_nature" :key="item?.id" :label="item?.label"
:value="item?.value" />
</el-select>
</el-form-item>
<el-form-item label="货号" prop="productCode">
@@ -30,79 +32,44 @@
</el-row>
<el-row>
<div class="mb8" style="width: 100%">
<el-button
icon="folder-add"
type="primary"
class="ml10"
@click="formDialogRef.openDialog()"
v-auth="'supermarket_supermarketSpu_add'"
>
<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
v-auth="'supermarket_supermarketSpu_add'">
新 增
</el-button>
<el-button
plain
:disabled="multiple"
icon="Delete"
type="primary"
v-auth="'supermarket_supermarketSpu_del'"
@click="handleDelete(selectObjs)"
>
<el-button plain :disabled="multiple" icon="Delete" type="primary"
v-auth="'supermarket_supermarketSpu_del'" @click="handleDelete(selectObjs)">
删 除
</el-button>
<right-toolbar
v-model:showSearch="showSearch"
:export="'supermarket_supermarketSpu_export'"
@exportExcel="exportExcel"
class="ml10 mr20"
style="float: right"
@queryTable="getDataList"
/>
<el-button
plain
v-auth="'supermarket_supermarketSpu_import'"
class="ml10"
icon="upload-filled"
type="primary"
@click="excelUploadRef.show()"
>
<right-toolbar v-model:showSearch="showSearch" :export="'supermarket_supermarketSpu_export'"
@exportExcel="exportExcel" class="ml10 mr20" style="float: right" @queryTable="getDataList" />
<el-button plain v-auth="'supermarket_supermarketSpu_import'" class="ml10" icon="upload-filled"
type="primary" @click="excelUploadRef.show()">
导入
</el-button>
<el-tooltip effect="dark" content="覆盖导入会覆盖已经存在的商品数据" placement="top">
<el-button
plain
v-auth="'supermarket_supermarketSpu_import'"
class="ml10"
icon="upload-filled"
type="primary"
@click="excelUploadUpdateRef.show()"
>
<el-button plain v-auth="'supermarket_supermarketSpu_import'" class="ml10" icon="upload-filled"
type="primary" @click="excelUploadUpdateRef.show()">
覆盖导入
</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="导入盘点数据" placement="top">
<el-button
plain
v-auth="'supermarket_supermarketSpu_import'"
class="ml10"
icon="upload-filled"
type="primary"
@click="excelUploadPd.show()"
>
<el-button plain v-auth="'supermarket_supermarketSpu_import'" class="ml10" icon="upload-filled"
type="primary" @click="excelUploadPd.show()">
盘点导入
</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="导入盘点数据" placement="top">
<el-button plain v-auth="'supermarket_supermarketSpu_sync'" class="ml10" icon="Refresh"
type="primary" @click="syncSupermarket">
商品分类同步至消费机
</el-button>
</el-tooltip>
</div>
</el-row>
<el-table
:data="state.dataList"
v-loading="state.loading"
border
:cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle"
@selection-change="selectionChangHandle"
@sort-change="sortChangeHandle"
>
<el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
@sort-change="sortChangeHandle">
<el-table-column type="selection" width="40" fixed="left" />
<el-table-column type="index" label="#" width="50" fixed="left" />
<el-table-column prop="productCode" label="货号" show-overflow-tooltip min-width="160" />
@@ -111,7 +78,8 @@
<el-table-column prop="unit" label="单位" show-overflow-tooltip />
<el-table-column prop="categoryId" label="商品分类" show-overflow-tooltip width="100">
<template #default="scope">
<el-tag>{{ supermarketCategory?.find((item: any) => item.id === scope.row.categoryId)?.name }}</el-tag>
<el-tag>{{supermarketCategory?.find((item: any) => item.id === scope.row.categoryId)?.name
}}</el-tag>
</template>
</el-table-column>
<el-table-column prop="productNature" label="商品性质" show-overflow-tooltip width="150">
@@ -126,7 +94,8 @@
</el-table-column>
<el-table-column prop="supplierId" label="货商" show-overflow-tooltip>
<template #default="scope">
{{ supermarketSupplier?.find((item: any) => item.supplierId == scope.row.supplierId)?.supplierName }}
{{supermarketSupplier?.find((item: any) => item.supplierId ==
scope.row.supplierId)?.supplierName}}
</template>
</el-table-column>
<!-- <el-table-column prop="brandId" label="品牌" show-overflow-tooltip>
@@ -162,46 +131,37 @@
<!-- <el-table-column prop="origin" label="产地" show-overflow-tooltip /> -->
<el-table-column label="操作" width="150" fixed="right">
<template #default="scope">
<el-button
icon="edit-pen"
text
type="primary"
v-auth="'supermarket_supermarketSpu_edit'"
@click="formDialogRef.openDialog(scope.row.id)"
>
<el-button icon="edit-pen" text type="primary" v-auth="'supermarket_supermarketSpu_edit'"
@click="formDialogRef.openDialog(scope.row.id)">
编辑
</el-button>
<el-button icon="delete" text type="primary" v-auth="'supermarket_supermarketSpu_del'" @click="handleDelete([scope.row.id])">
<el-button icon="delete" text type="primary" v-auth="'supermarket_supermarketSpu_del'"
@click="handleDelete([scope.row.id])">
删除
</el-button>
</template>
</el-table-column>
</el-table>
<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
v-bind="state.pagination" />
</div>
<!-- 编辑、新增 -->
<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
<upload-excel
ref="excelUploadRef"
title="导入库存商品"
url="/supermarket/supermarketSpu/importNew"
@refreshDataList="refreshDataList"
/>
<upload-excel ref="excelUploadRef" title="导入库存商品" url="/supermarket/supermarketSpu/importNew"
@refreshDataList="refreshDataList" />
<upload-excel-update
ref="excelUploadUpdateRef"
title="覆盖导入库存商品"
url="/supermarket/supermarketSpu/importNewUpdate"
@refreshDataList="refreshDataList"
/>
<upload-excel-update ref="excelUploadUpdateRef" title="覆盖导入库存商品"
url="/supermarket/supermarketSpu/importNewUpdate" @refreshDataList="refreshDataList" />
<upload-excel ref="excelUploadPd" title="导入库存盘点" url="/supermarket/supermarketSpu/importPD" @refreshDataList="refreshDataList" />
<upload-excel ref="excelUploadPd" title="导入库存盘点" url="/supermarket/supermarketSpu/importPD"
@refreshDataList="refreshDataList" />
</div>
</template>
<script setup lang="ts" name="systemSupermarketSpu">
import { ElLoading } from 'element-plus'
import { BasicTableProps, useTable } from "/@/hooks/table"
import { fetchList, delObjs, getSupermarketCategory, getSupermarketBrand } from "/@/api/supermarketerp/supermarketSpu"
import { useMessage, useMessageBox } from "/@/hooks/message"
@@ -210,6 +170,7 @@ import UploadExcel from "./components/upload-excel.vue"
import UploadExcelUpdate from "./components/upload-excel-update.vue"
import { displayPrice } from "/@/utils/formatMoney"
import { getSupplierSimpleAll } from "/@/api/supermarketerp/smErpSupplier"
import * as HardMqApi from "/@/api/hard/hard-mq"
// 引入组件
const FormDialog = defineAsyncComponent(() => import("./form.vue"))
@@ -253,6 +214,23 @@ const refreshDataList = () => {
getSupplierAll()
}
// 商品分类同步至消费机
const syncSupermarket = async () => {
const loading = ElLoading.service({
lock: true,
text: '同步中...',
background: 'rgba(0, 0, 0, 0.7)',
})
try {
const res = await HardMqApi.syncSupermarket({})
console.log("商品分类同步至消费机:", res);
loading.close()
} catch (error: any) {
console.error("商品分类同步至消费机:", error);
loading.close()
}
}
// 多选事件
const selectionChangHandle = (objs: { id: string }[]) => {
selectObjs.value = objs.map(({ id }) => id)