diff --git a/src/api/pms/productShow.js b/src/api/pms/productShow.js new file mode 100644 index 0000000..acf211e --- /dev/null +++ b/src/api/pms/productShow.js @@ -0,0 +1,64 @@ +import request from '@/utils/request' + +// 商品展示申请接口列表 +export function listProductShow(query, pageReq) { + return request({ + url: '/pms/productShow/list', + method: 'post', + data: query, + params: pageReq + }) +} +// 查询商品展示申请信息详细 +export function getProductShow(id) { + return request({ + url: '/pms/productShow/' + id, + method: 'get' + }) +} + +// 新增商品展示申请信息 +export function addProductShow(data) { + return request({ + url: '/pms/productShow', + method: 'post', + data: data + }) +} + +// 修改商品展示申请信息 +export function updateProductShow(data) { + return request({ + url: '/pms/productShow', + method: 'put', + data: data + }) +} + +// 删除商品展示申请信息 +export function delProductShow(id) { + return request({ + url: '/pms/productShow/' + id, + method: 'delete' + }) +} + +// 拒绝商品展示(管理员) +export function refuseProductShow(data) { + return request({ + url: '/pms/productShow/refuse/', + method: 'put', + data: data + }) +} + +// 通过商品展示(管理员) +export function passProductShow(data) { + return request({ + url: '/pms/productShow/pass/', + method: 'put', + data: data + }) +} + + diff --git a/src/components/system/tenant/changeTenant.vue b/src/components/system/tenant/changeTenant.vue index fc87cd3..c87a555 100644 --- a/src/components/system/tenant/changeTenant.vue +++ b/src/components/system/tenant/changeTenant.vue @@ -78,8 +78,8 @@ - - + + diff --git a/src/components/system/user/userSelect.vue b/src/components/system/user/userSelect.vue index 1d3f265..07d8067 100644 --- a/src/components/system/user/userSelect.vue +++ b/src/components/system/user/userSelect.vue @@ -75,8 +75,7 @@ export default { pageNum: this.pageNum }).then(response => { if (response.code === 200) { - this.staffList = response.rows - console.log(this.staffList) + this.staffList = response.rows.filter(item => item.userId !== '1'); this.hasMoreData = response.rows.length > 0 this.pageNum = this.pageNum + 1 } else { diff --git a/src/views/mall/product/AddProduct.vue b/src/views/mall/product/AddProduct.vue index de3ae61..fd09b6f 100644 --- a/src/views/mall/product/AddProduct.vue +++ b/src/views/mall/product/AddProduct.vue @@ -1,6 +1,6 @@ - + 基本信息 @@ -36,7 +36,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -180,7 +180,7 @@ - 确 定 + 确 定 取 消 @@ -196,6 +196,7 @@ import ProductCategorySelect from "@/views/components/ProductCategorySelect.vue" import BrandSelect from "@/views/components/BrandSelect.vue"; import CourseSelect from "@/views/mall/product/courseSelect"; import staffSelect from '@/components/system/staff/staffSelect' +import store from "@/store"; export default { name: "AddProduct", dicts: ['pms_publish_status','pms_is_course'], @@ -203,7 +204,7 @@ export default { data() { return { - rules: { + rules: { name: [ { required: true, message: '请输入商品名称', trigger: 'blur' }, ], @@ -246,16 +247,28 @@ export default { ] } ], - maxOptionNum: 44 + maxOptionNum: 44, + readOnly:false + }; + }, + computed:{ + isEdit(){ + return this.$route.query.id && !this.readOnly } }, created() { - const {id} = this.$route.query + const {id,readOnly} = this.$route.query if (id) { this.getInfo(id); } + this.readOnly = readOnly }, methods: { + checkPermi(permissions){ + const userPermissions = store.getters && store.getters.permissions + if (userPermissions.includes('*:*:*')) return true + return permissions.some(p => userPermissions.includes(p)) + }, handleConfirm(value){ this.form.courseName=value.courseName this.form.courseId =value.courseId diff --git a/src/views/mall/product/courseSelect.vue b/src/views/mall/product/courseSelect.vue index 34a5052..de08163 100644 --- a/src/views/mall/product/courseSelect.vue +++ b/src/views/mall/product/courseSelect.vue @@ -34,11 +34,55 @@ - - - - - + + + + + + + + + + + + + + + + + + + {{ scope.row.tuitionFee }} 元 + + + + + {{ scope.row.claFee }} 元 + + + + + + 全部校区 + + {{ scope.row.campusIds.split(',').length }}个校区 + {{ scope.row.storeNames }} + + + + + + + + + + 1){ this.$message.warning('请选择一条记录进行提交'); + return; } if (this.selectCourse.length==1){ this.$emit('onComplete', this.selectCourse[0]) diff --git a/src/views/mall/product/index.vue b/src/views/mall/product/index.vue index 57f99a9..cf71169 100644 --- a/src/views/mall/product/index.vue +++ b/src/views/mall/product/index.vue @@ -1,7 +1,7 @@ - + - - - - - + + + + + - + @@ -79,45 +69,44 @@ - - - 名称:{{ row.name }} - 编码:{{ row.outProductId }} + + + + + + + + + + {{ row.productCategoryName?row.productCategoryName:'默认' }} - - - 品牌:{{ row.brandName }} - 分类:{{ row.productCategoryName }} - - - - - 价格:{{ row.price }} - 排序:{{ row.sort }} + + + + + - - - - + + - + 修改 删除 @@ -138,12 +127,15 @@ diff --git a/src/views/mall/publishProduct/productSelect.vue b/src/views/mall/publishProduct/productSelect.vue new file mode 100644 index 0000000..6c0b71c --- /dev/null +++ b/src/views/mall/publishProduct/productSelect.vue @@ -0,0 +1,239 @@ + + + + + + + + + + + 搜索 + + + + 申请展示日期范围: + + 温馨提示:尽量选择2天后的日期开始展示,为审核留出足够时间 + + + + + + + + + + + 名称:{{ row.name }} + 编码:{{ row.outProductId }} + + + + + 品牌:{{ row.brandName }} + 分类:{{ row.productCategoryName }} + + + + + 价格:{{ row.price }} + 排序:{{ row.sort }} + + + + + + + + + + + + + + + + + diff --git a/src/views/mall/review/index.vue b/src/views/mall/review/index.vue new file mode 100644 index 0000000..dc0a361 --- /dev/null +++ b/src/views/mall/review/index.vue @@ -0,0 +1,376 @@ + + + + + + + + + + + + + + + + + + + 搜索 + + + + + + + + + + + + + + + + + + * 展示状态切换为定时任务,根据申请展示时间自动展示或结束展示,无需手动操作 + + + + + + 商品名称:{{ row.productName}} + 商品编号:{{ row.outProductId}} + + + + + 租户名称:{{ row.tenantName}} + 场馆名称:{{ row.storeName}} + + + + + 默认:场馆商品 + 商城上架分类:{{ row.productCategoryName?row.productCategoryName:"待定" }} + + + + + + {{ row.showFlag === '1' ? '展示' : '不展示' }} + + + + + + 待审核 + 审核通过 + 审核拒绝 + 展示中 + 展示期结束 + {{ row.applyStatus }} + + + + + {{ row.showStartTime?row.showStartTime.substr(0,10):"" }} + + + + + {{ row.showEndTime?row.showEndTime.substr(0,10):"" }} + + + + + {{ row.applyTime?row.applyTime.substr(0,10):"" }} + {{ row.applyTime?row.applyTime.substr(11,8):"" }} + + + + + {{ row.reviewTime?row.reviewTime.substr(0,10):"" }} + {{ row.reviewTime?row.reviewTime.substr(11,8):"" }} + + + + + + 操作 + + 商品详情 + + + + + + + + + + + + + + + + + + + + + {{this.form.showStartTime?form.showStartTime.substring(0,10):""}} + 至 + {{this.form.showEndTime?form.showEndTime.substring(0,10):""}} + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 0a420d2..0409752 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -71,7 +71,9 @@ - + @@ -101,7 +103,6 @@ v-hasPermi="['system:dept:add']" >新增 + @@ -295,7 +296,7 @@ export default { this.getList() this.msgSuccess('删除成功') } else { - this.msgError(response.respMsg) + this.msgError(response.message) } }).catch(function() {}) },