Skip to content

L
linshenxs-shop
Commit 8cafabfd by cpa
Options

修改添加后页面

parent 4f05661c
Showing with 76 additions and 65 deletions
src/api/mall/merchantMallgoods.js
......@@ -96,7 +96,7 @@ export function isHot(parameter) {
export function delObj(parameter) {
return request({
url: '/admin/merchantMallGoods/mallGoods/',
url: '/admin/merchantMallGoods',
method: 'delete',
params:parameter
})
......
src/const/crud/mall/merchantMallgoods.js
......@@ -27,6 +27,14 @@ export const tableOption = {
"prop": "id",
span: 12,
"search": true,
showColumn: false
},
{
"type": "input",
"label": "商品ID",
"prop": "goodsId",
span: 12,
"search": true,
},
{
"type": "input",
......
src/const/crud/mall/merchantMallorder.js
......@@ -38,7 +38,7 @@ export const tableOption = {
"label": "状态",
"prop": "state",
"search": true,
"dicUrl": "/admin/merchantMallOrder/getOrderStateOptions",
"dicUrl": "/admin/merchantMallOrder/getMerchantOrderStateOptions",
},
{
"type": "input",
......
src/page/login/userlogin.vue
......@@ -69,7 +69,7 @@ export default {
state: "",
},
loginForm: {
username: "admin",
username: "13666292054",
password: "123456",
code: "",
randomStr: "blockPuzzle",
......
src/views/businessGoods/details.vue
......@@ -16,7 +16,7 @@
</div></el-col>
<el-col :span="12"><div class="grid-content bg-purple-light">
<el-form-item label="商品ID">
<span>{{info.id || ''}}</span>
<span>{{info.goodsId || ''}}</span>
</el-form-item>
</div></el-col>
</el-row>
......@@ -248,11 +248,9 @@
let table=[]
for (let i = 0; i <r.data.data.skus.length ; i++) {
table.push({商家价格:''})
table.push({售卖价格:''})
table.push({图片:''})
table.push({商品库存:''})
table[i].商家价格=r.data.data.skus[i].merchantPrice
table[i].售卖价格=r.data.data.skus[i].sellPrice
table[i].图片=r.data.data.skus[i].goodsImage
table[i].商品库存=r.data.data.skus[i].stock
}
......
src/views/businessGoods/goodsEdit/goods_edit.vue
<template>
<div class="execution">
<basic-container v-loading="loading">
<el-form :model="form" :rules="rules" ref="refForm" label-width="110px" label-position="left">
......@@ -7,8 +8,8 @@
<div class="zm_info_body">
<div class="zm_info_row">
<el-form-item label="商品名称" prop="goodsName">
<el-input v-model="form.goodsName" placeholder="输入商品名称" style="width: 230px;"></el-input>
<el-form-item label="商品名称" prop="goodsName" >
<el-input v-model="form.goodsName" placeholder="输入商品名称" maxlength="100" style="width: 230px;"></el-input>
</el-form-item>
<el-form-item label="商品分类" prop="goodsClassId" style="margin-left: 32px;">
<el-select v-model="form.goodsClassId" placeholder="请选择商品分类" style="width: 240px;" @change="onClassChange">
......@@ -161,6 +162,7 @@
</el-form>
</basic-container>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose">取 消</el-button>
<el-button type="primary" :loading="loading" @click="onSubmit">确 认</el-button>
......@@ -173,7 +175,7 @@
<script>
let DBG = true
let DBG = false
import {
ZmMixin
} from '@/mixins/ZmMixin.js'
......@@ -664,7 +666,7 @@
},
//点击退出
handleClose() {
this.$emit('close')
this.$emit('success')
},
//点击确认
onSubmit() {
......@@ -710,15 +712,6 @@
</script>
<style scoped>
.zm_info_header {
padding: 10px 16px;
display: flex;
align-items: center;
font-size: 14px;
color: #606266;
font-weight: 700;
background: #dedede;
}
.zm_info_body {
display: flex;
......@@ -732,26 +725,14 @@
align-items: center;
}
.zm_label {
width: 120px;
}
.zm_info_body .zm_info_row:not(:first-child) {
margin-top: 10px;
}
.image_item {
width: 100px;
height: 100px;
margin-right: 10px;
}
.upload {
display: flex;
flex-direction: column;
}
>>> .el-input-number__increase {
right: 1px!important
}
</style>
src/views/businessGoods/goodsEdit/goods_edit_pop.vue
......@@ -6,7 +6,7 @@
:close-on-click-modal="false"
:before-close="handleClose" append-to-body>
<goods-edit ref="editContent" :id="id" @success="onChangeDone"/>
<goods-edit ref="editContent" :key="id" @success="onChangeDone"/>
</el-dialog>
</template>
......@@ -23,8 +23,7 @@
},
computed: {
topTitle() {
console.log("【ID】:"+this.id)
return this.id?"新增商品":"编辑商品"
return this.id?"编辑商品":"新增商品"
}
},
watch: {
......@@ -38,7 +37,7 @@
},
methods: {
onChangeDone() {
this.show=false
this.$emit('success')
},
handleClose() {
this.$emit('close')
......
src/views/businessGoods/index.vue
......@@ -36,7 +36,7 @@
<el-button
type="primary"
size="small"
@click="batchIsUpon">上架</el-button>
@click="batchIsUpon(scope.row)">上架</el-button>
<el-button
type="primary"
size="small"
......@@ -91,10 +91,17 @@
methods: {
// 更新
handleUpdate: function (row, index, done,loading) {
console.log("执行编辑方法")
this.id=row.id
console.log("赋值id:"+row.id)
this.goodsEditVue=true
if(this.$refs.crud.tableSelect.length >1){
this.$message.error('请选择其中一条进行编辑')
return false
}else {
this.id=row.id
this.goodsEditVue=true
}
// console.log("执行编辑方法")
// this.id=row.id
// console.log("赋值id:"+row.id)
// this.goodsEditVue=true
},
// 添加
add() {
......@@ -150,24 +157,32 @@
this.selectedData = r
},
// 批量 上架
batchIsUpon() {
batchIsUpon(r) {
let d = this.selectedData
if(d == undefined || d.length == 0) {
this.$message.error('请选择项进行上架')
return
}
let ids = d.map(r => { return r.id }).join(',')
console.log(ids)
this.$confirm('请确认是否上架已勾选的商品', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(function () {
return isUpon({ids: ids})
}).then(data => {
this.$message.success('删除成功')
this.getList(this.page)
})
let a = d.map(r => { return r.stateName }).join(',')
if(a.search('平台下架') != -1){
this.$message.error('平台下架商品，无法操作')
return;
}else {
let ids = d.map(r => { return r.id }).join(',')
this.$confirm('请确认是否上架已勾选的商品', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(function () {
return isUpon({ids: ids})
}).then(data => {
this.$message.success('上架成功')
this.getList(this.page)
})
}
},
// 批量 下架
batchIsNotUpon() {
......@@ -176,6 +191,8 @@
this.$message.error('请选择项进行下架')
return
}
let ids = d.map(r => { return r.id }).join(',')
this.$confirm('请确认是否下架已勾选的商品', '提示', {
confirmButtonText: '确定',
......@@ -184,29 +201,38 @@
}).then(function () {
return isNotUpon({ids: ids})
}).then(data => {
this.$message.success('删除成功')
this.$message.success('下架成功')
this.getList(this.page)
})
},
// 批量删除
handleDelBatch() {
let d = this.selectedData
if(d == undefined || d.length == 0) {
this.$message.error('请选择项进行删除')
return
}
let ids = d.map(r => { return r.id }).join(',')
this.$confirm('是否确认删除？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
let a = d.map(r => { return r.stateName }).join(',')
if(a.search('有效') != -1){
this.$message.error('只能删除下架/平台下架商品')
return;
}else {
let ids = d.map(r => { return r.id }).join(',')
this.$confirm('是否确认删除？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(function () {
return delObj({ids: ids})
}).then(data => {
this.$notify.success('删除成功')
this.$refs.crud.toggleSelection();
this.refreshChange();
this.$notify.success('删除成功')
this.$refs.crud.toggleSelection();
this.refreshChange();
})
}
},
// 保存
......
src/views/businessOrder/index.vue
......@@ -21,10 +21,10 @@
<el-button type="button" size="small"
@click="checkTheDetails(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">详情</el-button>
<el-button type="button" size="small"
v-if="scope.row.state == 4"
v-if="scope.row.state == 1 || scope.row.state == 2"
@click="viewLogistics(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">查看物流</el-button>
<el-button type="button" size="small"
v-if="scope.row.state == 3"
v-if="scope.row.state == 0"
@click="shipsImmediately(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">立即发货</el-button>
<el-button type="button" size="small"
@click="handleDel(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">删除</el-button>
......@@ -249,7 +249,6 @@
viewLogistics(row){
// 1.打开对话框
this.dialogVisible = true
viewLogisticsApi(
{waybillNo:row.waybillNo,expressCompany:row.expressCompany}
).then(r=>{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment