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

修改

Browse Source
This commit is contained in:
zjf committed 2024-12-24 14:43:25 +08:00
1 parent 7e3ec6bd5c
commit 271664dfa5
4 files changed
+91 -121
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.env
+1
View File
@@ -15,6 +15,7 @@ VITE_API_URL = /api
# ADMIN 服务地址
VITE_ADMIN_PROXY_PATH = http://localhost:9999
#VITE_ADMIN_PROXY_PATH = http://192.168.110.156:9999
# 前端加密密钥
VITE_PWD_ENC_KEY='pigxpigxpigxpigx'
.env.development
+2 -1
View File
@@ -9,6 +9,7 @@ ENV = 'development'
# ADMIN 服务地址
VITE_ADMIN_PROXY_PATH = http://localhost:9999
#VITE_ADMIN_PROXY_PATH = http://192.168.110.156:9999
# 代码生成服务地址
VITE_GEN_PROXY_PATH = http://localhost:5003
VITE_GEN_PROXY_PATH = http://192.168.110.156:5003
src/views/supermarket/supermarketSpu/form.vue
+71 -84
View File
@@ -27,36 +27,29 @@
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="商品简介" prop="introduction">
<el-input type="textarea" v-model="form.introduction" placeholder="请输入商品简介"/>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="商品详情" prop="description">
<editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="商品分类编号" prop="categoryId">
<el-select v-model="form.categoryId" placeholder="请选择商品分类编号">
<el-form-item label="商品分类" prop="categoryId">
<el-select v-model="form.categoryId" placeholder="请选择商品分类">
<el-option label="请选择">0</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-col :span="12" class="mb20">
<el-form-item label="品牌" prop="brandId">
<el-select v-model="form.brandId" placeholder="请选择品牌">
<el-option label="请选择">0</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="商品封面图" prop="picUrl">
<upload-file v-model:imageUrl="form.picUrl"></upload-file>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="商品轮播图地址
数组，以逗号分隔
最多上传15张" prop="sliderPicUrls">
<el-col :span="24" class="mb20">
<el-form-item label="商品轮播图" prop="sliderPicUrls">
<upload-file v-model:imageUrl="form.sliderPicUrls"></upload-file>
</el-form-item>
</el-col>
@@ -68,7 +61,7 @@
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="商品状态: 1 上架（开启） 0 下架（禁用） -1 回收" prop="status">
<el-form-item label="商品状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio :label="item.value" v-for="(item, index) in status" border :key="index">{{ item.label }}
</el-radio>
@@ -77,8 +70,8 @@
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="成本单价，单位： 分" prop="costPrice">
<el-input-number :min="1" :max="1000" v-model="form.costPrice" placeholder="请输入成本单价，单位： 分"></el-input-number>
<el-form-item label="成本单价" prop="costPrice">
<el-input-number v-model="form.costPrice" placeholder="请输入成本单价，单位： 分"></el-input-number>
</el-form-item>
</el-col>
@@ -102,14 +95,6 @@
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="部门id" prop="deptId">
<el-select v-model="form.deptId" placeholder="请选择部门id">
<el-option label="请选择">0</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="规格" prop="specification">
<el-input v-model="form.specification" placeholder="请输入规格"/>
@@ -124,21 +109,29 @@
<el-col :span="12" class="mb20">
<el-form-item label="装数" prop="packingQuantity">
<el-input-number :min="1" :max="1000" v-model="form.packingQuantity" placeholder="请输入装数"></el-input-number>
<el-input-number :min="1" v-model="form.packingQuantity" placeholder="请输入装数"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="零售价" prop="retailPrice">
<el-input-number v-model="form.retailPrice" placeholder="请输入零售价"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="进价" prop="purchasePrice">
<el-input-number v-model="form.purchasePrice" placeholder="请输入进价"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="零售价" prop="retailPrice">
<el-input-number v-model="form.retailPrice" placeholder="请输入零售价"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="货商" prop="supplierId">
<el-select v-model="form.supplierId" placeholder="请选择货商">
<el-option label="请选择">0</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="会员价1" prop="memberPrice1">
@@ -154,7 +147,7 @@
<el-col :span="12" class="mb20">
<el-form-item label="会员价3" prop="memberPrice3">
<el-input-number v-model="form.memberPrice3" placeholder="请输入会员价3"></el-input-number>
<el-input v-model="form.memberPrice3" placeholder="请输入会员价3"></el-input>
</el-form-item>
</el-col>
@@ -183,78 +176,72 @@
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="商品性质(字典)" prop="productNature">
<el-select v-model="form.productNature" placeholder="请选择商品性质(字典)">
<el-form-item label="商品性质" prop="productNature">
<el-select v-model="form.productNature" placeholder="请选择商品性质">
<el-option :value="item.value" :label="item.label" v-for="(item, index) in supermarket_nature" :key="index"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="商品简介" prop="introduction">
<el-input type="textarea" v-model="form.introduction" placeholder="请输入商品简介"/>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="签名上锁" prop="archiverSignature">
<el-radio-group v-model="form.archiverSignature">
<el-radio label="签名上锁" border>签名上锁</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="商品详情" prop="description">
<editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>
</el-form-item>
</el-col>
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="签名上锁" prop="archiverSignature">-->
<!-- <el-radio-group v-model="form.archiverSignature">-->
<!-- <el-radio label="签名上锁" border>签名上锁</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12" class="mb20">
<el-form-item label="区管理库存" prop="inventoryArea">
<el-radio-group v-model="form.inventoryArea">
<el-radio label="区管理库存" border>区管理库存</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="区管理库存" prop="inventoryArea">-->
<!-- <el-radio-group v-model="form.inventoryArea">-->
<!-- <el-radio label="区管理库存" border>区管理库存</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12" class="mb20">
<el-form-item label="比例提成" prop="commissionRate">
<el-select v-model="form.commissionRate" placeholder="请选择比例提成">
<el-option label="请选择">0</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="比例提成" prop="commissionRate">-->
<!-- <el-select v-model="form.commissionRate" placeholder="请选择比例提成">-->
<!-- <el-option label="请选择">0</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12" class="mb20">
<el-form-item label="联营扣率" prop="jointDeductionRate">
<el-input v-model="form.jointDeductionRate" placeholder="请输入联营扣率"/>
</el-form-item>
</el-col>
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="联营扣率" prop="jointDeductionRate">-->
<!-- <el-input v-model="form.jointDeductionRate" placeholder="请输入联营扣率"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12" class="mb20">
<el-form-item label="库存上限" prop="inventoryUpperLimit">
<el-input-number :min="1" :max="1000" v-model="form.inventoryUpperLimit" placeholder="请输入库存上限"></el-input-number>
<el-input-number v-model="form.inventoryUpperLimit" placeholder="请输入库存上限"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="库存下限" prop="inventoryLowerLimit">
<el-input-number :min="1" :max="1000" v-model="form.inventoryLowerLimit" placeholder="请输入库存下限"></el-input-number>
<el-input-number v-model="form.inventoryLowerLimit" placeholder="请输入库存下限"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="毛利率" prop="grossMargin">
<el-input-number :min="1" :max="1000" v-model="form.grossMargin" placeholder="请输入毛利率"></el-input-number>
<el-input-number v-model="form.grossMargin" placeholder="请输入毛利率"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="品牌id" prop="brandId">
<el-select v-model="form.brandId" placeholder="请选择品牌id">
<el-option label="请选择">0</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="货商id" prop="supplierId">
<el-select v-model="form.supplierId" placeholder="请选择货商id">
<el-option label="请选择">0</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
src/views/supermarket/supermarketSpu/index.vue
+17 -36
View File
@@ -35,7 +35,7 @@
@queryTable="getDataList"></right-toolbar>
</div>
</el-row>
<el-table :data="state.dataList" v-loading="state.loading" border
<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">
@@ -45,51 +45,32 @@
<el-table-column prop="barcode" label="自编码/条码" show-overflow-tooltip/>
<el-table-column prop="productName" label="商品名称" show-overflow-tooltip/>
<el-table-column prop="unit" label="单位" show-overflow-tooltip/>
<el-table-column prop="introduction" label="商品简介" show-overflow-tooltip/>
<el-table-column prop="description" label="商品详情" show-overflow-tooltip/>
<el-table-column prop="categoryId" label="商品分类编号" show-overflow-tooltip/>
<el-table-column prop="picUrl" label="商品封面图" show-overflow-tooltip/>
<el-table-column prop="sliderPicUrls" label="商品轮播图地址
数组，以逗号分隔
最多上传15张" show-overflow-tooltip/>
<el-table-column prop="sort" label="排序字段" show-overflow-tooltip/>
<el-table-column prop="status" label="商品状态: 1 上架（开启） 0 下架（禁用） -1 回收" show-overflow-tooltip>
<el-table-column prop="categoryId" label="商品分类" show-overflow-tooltip/>
<el-table-column prop="picUrl" label="封面图" show-overflow-tooltip/>
<el-table-column prop="status" label="商品状态" show-overflow-tooltip>
<template #default="scope">
<dict-tag :options="status" :value="scope.row.status"></dict-tag>
</template>
</el-table-column>
<el-table-column prop="costPrice" label="成本单价，单位： 分" show-overflow-tooltip/>
<el-table-column prop="costPrice" label="成本单价" show-overflow-tooltip/>
<el-table-column prop="stock" label="库存" show-overflow-tooltip/>
<el-table-column prop="giveIntegral" label="赠送积分" show-overflow-tooltip/>
<el-table-column prop="merchantId" label="商户编号" show-overflow-tooltip/>
<el-table-column prop="deptId" label="部门id" show-overflow-tooltip/>
<!-- <el-table-column prop="giveIntegral" label="赠送积分" show-overflow-tooltip/>-->
<!-- <el-table-column prop="merchantId" label="商户编号" show-overflow-tooltip/>-->
<el-table-column prop="specification" label="规格" show-overflow-tooltip/>
<el-table-column prop="origin" label="产地" show-overflow-tooltip/>
<!-- <el-table-column prop="origin" label="产地" show-overflow-tooltip/>-->
<el-table-column prop="packingQuantity" label="装数" show-overflow-tooltip/>
<el-table-column prop="purchasePrice" label="进价（分为单位）" show-overflow-tooltip/>
<el-table-column prop="retailPrice" label="零售价（分为单位）" show-overflow-tooltip/>
<el-table-column prop="memberPrice1" label="会员价1（分为单位）" show-overflow-tooltip/>
<el-table-column prop="memberPrice2" label="会员价2（分为单位）" show-overflow-tooltip/>
<el-table-column prop="memberPrice3" label="会员价3（分为单位）" show-overflow-tooltip/>
<el-table-column prop="wholesalePrice1" label="批发价1（分为单位）" show-overflow-tooltip/>
<el-table-column prop="wholesalePrice2" label="批发价2（分为单位）" show-overflow-tooltip/>
<el-table-column prop="wholesalePrice3" label="批发价3（分为单位）" show-overflow-tooltip/>
<el-table-column prop="promotionPrice" label="促销价（分为单位）" show-overflow-tooltip/>
<el-table-column prop="productNature" label="商品性质(字典)" show-overflow-tooltip>
<el-table-column prop="purchasePrice" label="进价）" show-overflow-tooltip/>
<el-table-column prop="retailPrice" label="零售价" show-overflow-tooltip/>
<el-table-column prop="promotionPrice" label="促销价" show-overflow-tooltip/>
<el-table-column prop="productNature" label="商品性质" show-overflow-tooltip>
<template #default="scope">
<dict-tag :options="supermarket_nature" :value="scope.row.productNature"></dict-tag>
</template>
</el-table-column>
<el-table-column prop="archiverSignature" label="签名上锁" show-overflow-tooltip/>
<el-table-column prop="inventoryArea" label="区管理库存" show-overflow-tooltip/>
<el-table-column prop="commissionRate" label="比例提成" show-overflow-tooltip/>
<el-table-column prop="jointDeductionRate" label="联营扣率" show-overflow-tooltip/>
<el-table-column prop="inventoryUpperLimit" label="库存上限" show-overflow-tooltip/>
<el-table-column prop="inventoryLowerLimit" label="库存下限" show-overflow-tooltip/>
<el-table-column prop="grossMargin" label="毛利率" show-overflow-tooltip/>
<el-table-column prop="auxiliaryBarcodeId" label="辅助条码id" show-overflow-tooltip/>
<el-table-column prop="brandId" label="品牌id" show-overflow-tooltip/>
<el-table-column prop="supplierId" label="货商id" show-overflow-tooltip/>
<!-- <el-table-column prop="inventoryUpperLimit" label="库存上限" show-overflow-tooltip/>-->
<!-- <el-table-column prop="inventoryLowerLimit" label="库存下限" show-overflow-tooltip/>-->
<!-- <el-table-column prop="grossMargin" label="毛利率" show-overflow-tooltip/>-->
<el-table-column prop="brandId" label="品牌" show-overflow-tooltip/>
<el-table-column label="操作" width="150">
<template #default="scope">
<el-button icon="edit-pen" text type="primary" v-auth="'supermarket_supermarketSpu_edit'"
@@ -178,4 +159,4 @@ const handleDelete = async (ids: string[]) => {
useMessage().error(err.msg);
}
};
</script>
</script>