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-01 15:01:12 +08:00
2 parents 4880e625c9 c7d5f372a6
commit dce8d8963e
7 files changed
+100 -75
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/views/biz/app/appuser/i18n/zh-cn.ts
+5
View File
@@ -22,4 +22,9 @@ export default {
inputNickNameTip: '请输入昵称', inputNickNameTip: '请输入昵称',
importUserTip: '导入用户', importUserTip: '导入用户',
}, },
supermarket: {
index: '#',
importSupplierTip: '导入货商',
importErpSpuTip: '导入库存商品',
}
}; };
src/views/supermarketerp/smErpCgBack/index.vue
+3 -3
View File
@@ -18,11 +18,11 @@
<el-form-item label="经办人" prop="handlerUserId"> <el-form-item label="经办人" prop="handlerUserId">
<SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" /> <SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
</el-form-item> </el-form-item>
<el-form-item label="审批状态" prop="checkStatus"> <!-- <el-form-item label="审批状态" prop="checkStatus">
<el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态"> <el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态">
<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" /> <el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />
</el-select> </el-select>
</el-form-item> </el-form-item>-->
<el-form-item> <el-form-item>
<el-button icon="search" type="primary" @click="getDataList">查询</el-button> <el-button icon="search" type="primary" @click="getDataList">查询</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -75,7 +75,7 @@
<el-table-column prop="inventoryCode" label="单据编号" show-overflow-tooltip /> <el-table-column prop="inventoryCode" label="单据编号" show-overflow-tooltip />
<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip /> <el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
<el-table-column prop="inventoryDate" label="入库商品" show-overflow-tooltip /> <el-table-column prop="inventoryDate" label="入库商品" show-overflow-tooltip />
<el-table-column prop="handlerUserId" label="经办人" show-overflow-tooltip /> <el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
<!-- <el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>--> <!-- <el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>-->
<!-- <template #default="scope">--> <!-- <template #default="scope">-->
<!-- <dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>--> <!-- <dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>-->
src/views/supermarketerp/smErpRetailBack/index.vue
+11 -11
View File
@@ -18,11 +18,11 @@
<el-form-item label="经办人" prop="handlerUserId"> <el-form-item label="经办人" prop="handlerUserId">
<SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" /> <SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
</el-form-item> </el-form-item>
<el-form-item label="审批状态" prop="checkStatus"> <!-- <el-form-item label="审批状态" prop="checkStatus">-->
<el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态"> <!-- <el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态">-->
<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" /> <!-- <el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item> <el-form-item>
<el-button icon="search" type="primary" @click="getDataList">查询</el-button> <el-button icon="search" type="primary" @click="getDataList">查询</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -75,12 +75,12 @@
<el-table-column prop="inventoryCode" label="单据编号" show-overflow-tooltip /> <el-table-column prop="inventoryCode" label="单据编号" show-overflow-tooltip />
<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip /> <el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
<el-table-column prop="inventoryDate" label="入库商品" show-overflow-tooltip /> <el-table-column prop="inventoryDate" label="入库商品" show-overflow-tooltip />
<el-table-column prop="handlerUserId" label="经办人" show-overflow-tooltip /> <el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip> <!-- <el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>-->
<template #default="scope"> <!-- <template #default="scope">-->
<dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag> <!-- <dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column prop="supplierId" label="货商" show-overflow-tooltip /> <el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" show-overflow-tooltip /> <el-table-column prop="remark" label="备注" show-overflow-tooltip />
<el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip /> <el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip />
src/views/supermarketerp/smErpRetailDelivery/index.vue
+11 -11
View File
@@ -18,11 +18,11 @@
<el-form-item label="经办人" prop="handlerUserId"> <el-form-item label="经办人" prop="handlerUserId">
<SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" /> <SelectHandlerUser v-model.trim="state.queryForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
</el-form-item> </el-form-item>
<el-form-item label="审批状态" prop="checkStatus"> <!-- <el-form-item label="审批状态" prop="checkStatus">-->
<el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态"> <!-- <el-select v-model="state.queryForm.checkStatus" placeholder="请选择审批状态">-->
<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" /> <!-- <el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item> <el-form-item>
<el-button icon="search" type="primary" @click="getDataList">查询</el-button> <el-button icon="search" type="primary" @click="getDataList">查询</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button> <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -75,12 +75,12 @@
<el-table-column prop="inventoryCode" label="单据编号" show-overflow-tooltip /> <el-table-column prop="inventoryCode" label="单据编号" show-overflow-tooltip />
<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip /> <el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
<el-table-column prop="inventoryDate" label="入库商品" show-overflow-tooltip /> <el-table-column prop="inventoryDate" label="入库商品" show-overflow-tooltip />
<el-table-column prop="handlerUserId" label="经办人" show-overflow-tooltip /> <el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip> <!-- <el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>-->
<template #default="scope"> <!-- <template #default="scope">-->
<dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag> <!-- <dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column prop="supplierId" label="货商" show-overflow-tooltip /> <el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" show-overflow-tooltip /> <el-table-column prop="remark" label="备注" show-overflow-tooltip />
<el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip /> <el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip />
src/views/supermarketerp/smErpSupplier/index.vue
+11 -1
View File
@@ -41,6 +41,9 @@
style="float: right" style="float: right"
@queryTable="getDataList" @queryTable="getDataList"
></right-toolbar> ></right-toolbar>
<el-button plain v-auth="'sys_user_add'" class="ml10" icon="upload-filled" type="primary" @click="excelUploadRef.show()">
{{ $t("common.importBtn") }}
</el-button>
</div> </div>
</el-row> </el-row>
<el-table <el-table
@@ -96,6 +99,13 @@
<!-- 编辑、新增 --> <!-- 编辑、新增 -->
<form-dialog ref="formDialogRef" @refresh="getDataList(false)" /> <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
<!-- temp-url="/admin/sys-file/local/file/user.xlsx"-->
<upload-excel
ref="excelUploadRef"
:title="$t('supermarket.importSupplierTip')"
url="/supermarket/smErpSupplier/import"
@refreshDataList="getDataList"
/>
</div> </div>
</template> </template>
@@ -118,7 +128,7 @@ const showSearch = ref(true);
const selectObjs = ref([]) as any; const selectObjs = ref([]) as any;
const multiple = ref(true); const multiple = ref(true);
const supplierType = ref<any>([]); // 货商类别 const supplierType = ref<any>([]); // 货商类别
const excelUploadRef = ref()
const state: BasicTableProps = reactive<BasicTableProps>({ const state: BasicTableProps = reactive<BasicTableProps>({
queryForm: {}, queryForm: {},
pageList: fetchList, pageList: fetchList,
src/views/supermarketerp/supermarketSpu/form.vue
+47 -47
View File
@@ -14,11 +14,11 @@
<el-input v-model.trim="form.productCode" placeholder="请输入货号" /> <el-input v-model.trim="form.productCode" placeholder="请输入货号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="mb20"> <!-- <el-col :span="12" class="mb20">-->
<el-form-item label="自编码/条码" prop="barcode"> <!-- <el-form-item label="自编码/条码" prop="barcode">-->
<el-input v-model.trim="form.barcode" placeholder="请输入自编码/条码" /> <!-- <el-input v-model.trim="form.barcode" placeholder="请输入自编码/条码" />-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="12" class="mb20"> <el-col :span="12" class="mb20">
<el-form-item label="商品名称" prop="productName"> <el-form-item label="商品名称" prop="productName">
<el-input v-model.trim="form.productName" placeholder="请输入商品名称" /> <el-input v-model.trim="form.productName" placeholder="请输入商品名称" />
@@ -58,43 +58,43 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="mb20"> <!-- <el-col :span="12" class="mb20">-->
<el-form-item label="单位" prop="unit"> <!-- <el-form-item label="单位" prop="unit">-->
<!-- <el-alert type="warning" show-icon>--> <!-- &lt;!&ndash; <el-alert type="warning" show-icon>&ndash;&gt;-->
<!-- <p>最小售卖的基本单位</p>--> <!-- &lt;!&ndash; <p>最小售卖的基本单位</p>&ndash;&gt;-->
<!-- </el-alert>--> <!-- &lt;!&ndash; </el-alert>&ndash;&gt;-->
<el-input placeholder="请输入单位" v-model.trim="form.unit" /> <!-- <el-input placeholder="请输入单位" v-model.trim="form.unit" />-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="14" class="mb20"> <!-- <el-col :span="14" class="mb20">-->
<el-form-item label="内装数" prop="packageNum"> <!-- <el-form-item label="内装数" prop="packageNum">-->
<!-- <el-alert type="warning" show-icon >--> <!-- &lt;!&ndash; <el-alert type="warning" show-icon >&ndash;&gt;-->
<!-- <p>注：内装数据必须为该商品的基本单位的内装数,否则无法完成库存数量转换。--> <!-- &lt;!&ndash; <p>注：内装数据必须为该商品的基本单位的内装数,否则无法完成库存数量转换。&ndash;&gt;-->
<!-- 例如：零售一瓶矿泉水内装数为1，按一箱售卖矿泉水内装填'24'</p>--> <!-- &lt;!&ndash; 例如：零售一瓶矿泉水内装数为1，按一箱售卖矿泉水内装填'24'</p>&ndash;&gt;-->
<!-- </el-alert>--> <!-- &lt;!&ndash; </el-alert>&ndash;&gt;-->
<el-input-number v-model="form.packageNum" :min="0" :precision="0" /> <!-- <el-input-number v-model="form.packageNum" :min="0" :precision="0" />-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="12" class="mb20"> <!-- <el-col :span="12" class="mb20">-->
<el-form-item label="零售价" prop="retailPrice"> <!-- <el-form-item label="零售价" prop="retailPrice">-->
<el-input-number v-model="form.retailPrice" :min="0" :precision="2" /> <!-- <el-input-number v-model="form.retailPrice" :min="0" :precision="2" />-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="12" class="mb20"> <!-- <el-col :span="12" class="mb20">-->
<el-form-item label="进价" prop="purchasePrice"> <!-- <el-form-item label="进价" prop="purchasePrice">-->
<el-input-number v-model="form.purchasePrice" :min="0" :precision="2" /> <!-- <el-input-number v-model="form.purchasePrice" :min="0" :precision="2" />-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="12" class="mb20"> <!-- <el-col :span="12" class="mb20">-->
<el-form-item label="促销价" prop="promotionPrice"> <!-- <el-form-item label="促销价" prop="promotionPrice">-->
<el-input-number v-model="form.promotionPrice" :min="0" :precision="2" /> <!-- <el-input-number v-model="form.promotionPrice" :min="0" :precision="2" />-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="12" class="mb20"> <!-- <el-col :span="12" class="mb20">-->
<el-form-item label="成本价" prop="costPrice"> <!-- <el-form-item label="成本价" prop="costPrice">-->
<el-input-number v-model="form.costPrice" :min="0" :precision="2" /> <!-- <el-input-number v-model="form.costPrice" :min="0" :precision="2" />-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="24" class="mb20"> <el-col :span="24" class="mb20">
<el-form-item label="商品状态" prop="status"> <el-form-item label="商品状态" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
@@ -102,11 +102,11 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="mb20"> <!-- <el-col :span="12" class="mb20">-->
<el-form-item label="规格" prop="spec"> <!-- <el-form-item label="规格" prop="spec">-->
<el-input placeholder="请输入规格" v-model.trim="form.spec" /> <!-- <el-input placeholder="请输入规格" v-model.trim="form.spec" />-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="12" class="mb20"> <el-col :span="12" class="mb20">
<el-form-item label="产地" prop="origin"> <el-form-item label="产地" prop="origin">
<el-input v-model.trim="form.origin" placeholder="请输入产地" /> <el-input v-model.trim="form.origin" placeholder="请输入产地" />
src/views/supermarketerp/supermarketSpu/index.vue
+12 -2
View File
@@ -39,6 +39,7 @@
> >
删 除 删 除
</el-button> </el-button>
<right-toolbar <right-toolbar
v-model:showSearch="showSearch" v-model:showSearch="showSearch"
:export="'supermarket_supermarketSpu_export'" :export="'supermarket_supermarketSpu_export'"
@@ -47,6 +48,9 @@
style="float: right" style="float: right"
@queryTable="getDataList" @queryTable="getDataList"
/> />
<el-button plain v-auth="'supermarket_supermarketSpu_export'" class="ml10" icon="upload-filled" type="primary" @click="excelUploadRef.show()">
{{ $t("common.importBtn") }}
</el-button>
</div> </div>
</el-row> </el-row>
<el-table <el-table
@@ -61,7 +65,7 @@
<el-table-column type="selection" width="40" fixed="left" /> <el-table-column type="selection" width="40" fixed="left" />
<el-table-column type="index" label="#" width="50" fixed="left" /> <el-table-column type="index" label="#" width="50" fixed="left" />
<el-table-column prop="productCode" label="货号" show-overflow-tooltip /> <el-table-column prop="productCode" label="货号" show-overflow-tooltip />
<el-table-column prop="barcode" label="自编码/条码" show-overflow-tooltip width="100" /> <!-- <el-table-column prop="barcode" label="自编码/条码" show-overflow-tooltip width="100" />-->
<el-table-column prop="productName" label="商品名称" show-overflow-tooltip width="100" /> <el-table-column prop="productName" label="商品名称" show-overflow-tooltip width="100" />
<el-table-column prop="unit" label="单位" show-overflow-tooltip /> <el-table-column prop="unit" label="单位" show-overflow-tooltip />
<el-table-column prop="categoryId" label="商品分类" show-overflow-tooltip width="100"> <el-table-column prop="categoryId" label="商品分类" show-overflow-tooltip width="100">
@@ -124,6 +128,12 @@
<!-- 编辑、新增 --> <!-- 编辑、新增 -->
<form-dialog ref="formDialogRef" @refresh="getDataList(false)" /> <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
<upload-excel
ref="excelUploadRef"
:title="$t('supermarket.importErpSpuTip')"
url="/supermarket/supermarketSpu/import"
@refreshDataList="getDataList"
/>
</div> </div>
</template> </template>
@@ -135,7 +145,7 @@ import { useDict } from "/@/hooks/dict"
// 引入组件 // 引入组件
const FormDialog = defineAsyncComponent(() => import("./form.vue")) const FormDialog = defineAsyncComponent(() => import("./form.vue"))
const excelUploadRef = ref()
const { supermarket_nature, status } = useDict("supermarket_nature", "status") const { supermarket_nature, status } = useDict("supermarket_nature", "status")
const formDialogRef = ref() // 对话框ref引用 const formDialogRef = ref() // 对话框ref引用
const queryRef = ref() // 搜索表单ref引用 const queryRef = ref() // 搜索表单ref引用