Skip to content

S
soss
Commit 9f5ba20f by lixiaomin
Options

修改页面

parent e00b0a87
Showing with 189 additions and 251 deletions
src/views/goods/category/index.vue
......@@ -36,7 +36,18 @@
<el-table-column label="编码" align="center" prop="code" />
<el-table-column label="备注" align="center" prop="remarks" />
<el-table-column label="商品数量" align="center" prop="goodsCount" />
<el-table-column label="排序"/>
<el-table-column label="排序">
<template slot-scope="scope">
<div style="display: flex;">
<div>
<el-button v-show="scope.$index!=0" size="mini" round icon="el-icon-arrow-up" @click="upClick(scope.row,'up')"></el-button>
</div>
<div>
<el-button v-show="scope.$index+1!=total" size="mini" round icon="el-icon-arrow-down" @click="downClick(scope.row,'down')"></el-button>
</div>
</div>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="state">
<template slot-scope="scope">
<span v-if="scope.row.state == 1">启用</span>
......@@ -137,6 +148,14 @@ export default {
this.getList();
},
methods: {
downClick(row,tag){
},
upClick(row,tag){
},
/** 查询列表 */
getList() {
this.loading = true;
......
src/views/goods/goods/components/Form.vue
......@@ -161,7 +161,7 @@ export default {
}
};
var validateDiscount = (rule, value, callback) => {
var regular=/(^[+]{0,1}([1-9]+)$)|(^[+]{0,1}([1-9]+)[\.]{1}[0-9]{1,2}$)/; //正数（保留2位小数)
var regular=/(^[+]{0,1}([0-9]+)$)|(^[+]{0,1}([0-9]+)[\.]{1}[0-9]{1,2}$)/; //正数（保留2位小数)
if (value == undefined || value === '') {
callback(new Error('不能为空'));
}else if(!regular.test(value)){
......@@ -178,7 +178,7 @@ export default {
};
var validatePrice = (rule, value, callback) => {
//let regular = /(^[+]{0,1}([1-9]+)$)|(^[+]{0,1}(\d+\.\d{1,2})$)/ //正数（保留2位小数)
var regular=/(^[+]{0,1}([1-9]+)$)|(^[+]{0,1}([1-9]+)[\.]{1}[0-9]{1,2}$)/; //正数 ,小数可有可无，最多2位
var regular=/(^[+]{0,1}([0-9]+)$)|(^[+]{0,1}([0-9]+)[\.]{1}[0-9]{1,2}$)/; //正数 ,小数可有可无，最多2位
if (value == undefined || value === '') {
callback(new Error('不能为空'));
}else if(!regular.test(value)){
......@@ -270,19 +270,9 @@ export default {
this.form = {
pics: {},
id: null,
spuName: null,
productionTime: null,
discountPrice: null,
originalPrice: null,
label: null,
desc: null,
remark: null,
createTime: null,
updateTime: null,
createUserId: null,
updateUserId: null,
shelfTime: null,
status: "1",
remark: null
};
this.resetForm("form");
},
......
src/views/goods/goods/index.vue
......@@ -52,7 +52,7 @@
<el-table-column label="售价" align="center" prop="price" />
<el-table-column label="总销量" align="center" prop="salesVolume" width="150" />
<el-table-column label="创建时间" align="center" prop="createdAt" width="150" />
<el-table-column label="上架时间" align="center" prop="shelfat" width="150" />
<el-table-column label="上架时间" align="center" prop="shelfAt" width="150" />
<el-table-column label="状态" align="center" prop="state" width="150">
<template slot-scope="scope">
<span v-if="scope.row.state == 1">已创建</span>
......@@ -64,9 +64,8 @@
</el-table-column>
<el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width">
<template slot-scope="scope">
<!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:category:edit']">修改</el-button> -->
<el-button size="mini" type="text" @click="handleUpdateState(scope.row)"
v-if="authBtn(['1'], scope.row.state)" >已完成编程</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-if="authBtn(['1', '2', '3', '4'], scope.row.state)">删除</el-button>
<el-button size="mini" type="text" v-if="authBtn(['2', '4'], scope.row.state)"
......@@ -186,6 +185,14 @@ export default {
handleUpdate(row) {
this.$refs.Form.handleUpdate(row.id);
},
handleUpdateState(row){
updateSpu({id:row.id,state:'2'}).then((response) => {
if(response.code=="200"){
this.$modal.msgSuccess("已完成编程成功!");
this.getList();
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
......
src/views/order/index.vue
......@@ -40,87 +40,25 @@
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:order:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['system:order:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:order:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:order:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
<el-table-column width="55" type="selection" align="center" />
<el-table-column width="200" label="主键" align="center" prop="id" />
<el-table-column width="200" label="订单号" align="center" prop="orderNo" />
<el-table-column width="200" label="订单顺序号" align="center" prop="orderNum" />
<el-table-column width="200" label="用户ID" align="center" prop="userId" />
<el-table-column width="200" label="冗余" align="center" prop="userName" />
<el-table-column width="200" label="冗余" align="center" prop="userPhone" />
<el-table-column width="200" label="支付时间" align="center" prop="payTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column width="200" label="完成时间" align="center" prop="finishTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column width="200" label="订单金额" align="center" prop="amount" />
<el-table-column width="200" label="商品数量" align="center" prop="goodsNum" />
<el-table-column width="200" label="取餐码" align="center" prop="pickCode" />
<el-table-column width="200" label="店铺ID" align="center" prop="shopId" />
<el-table-column width="200" label="机器ID" align="center" prop="machineId" />
<el-table-column width="200" label="点单屏序号" align="center" prop="source" />
<el-table-column width="200" label="订单状态" align="center" prop="state">
<template slot-scope="scope">
<span v-if="scope.row.state == 0">创建未校验</span>
<span v-if="scope.row.state == 1">未支付</span>
<span v-if="scope.row.state == 2">已支付</span>
<span v-if="scope.row.state == 3">支付制作中</span>
<span v-if="scope.row.state == 4">制作完成未取</span>
<span v-if="scope.row.state == 5">待取超时</span>
<span v-if="scope.row.state == 6">正常完成</span>
<span v-if="scope.row.state == 7">未支付取消</span>
<span v-if="scope.row.state == 8">支付后制作前取消</span>
<span v-if="scope.row.state == 9">制作中取消</span>
<span v-if="scope.row.state == 10">制作完成取消</span>
<span v-if="scope.row.state == 11">已退款</span>
<span v-if="scope.row.state == 12">部分退款</span>
<span v-if="scope.row.state == 50">其他人工干预状态</span>
</template>
</el-table-column>
<el-table-column width="200" label="创建时间" align="center" prop="createdAt">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createdAt, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column width="200" label="更新时间" align="center" prop="updatedAt">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updatedAt, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
</el-form>
<el-table v-loading="loading" :data="orderList">
<el-table-column label="订单编号" align="center" prop="orderNo" />
<el-table-column label="顺序号" align="center" prop="orderNum" />
<el-table-column label="商品数量" align="center" prop="goodsNum" />
<el-table-column label="金额" align="center" prop="amount" />
<el-table-column label="城市" align="center" prop="shop.city" />
<el-table-column label="店铺" align="center" prop="shop.name" />
<el-table-column label="订单来源" align="center" prop="source" />
<el-table-column label="用户名称" align="center" prop="userName" />
<el-table-column label="创建时间" align="center" prop="createdAt"/>
<el-table-column label="付款时间" align="center" prop="payTime"/>
<el-table-column label="订单状态" align="center" prop="state">
<template slot-scope="scope">{{formatterState(scope.row.state)}}</template>
</el-table-column>
<el-table-column width="200" label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:order:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:order:remove']">删除</el-button>
v-hasPermi="['system:order:edit']">修改</el-button>
</template>
</el-table-column>
</el-table>
......@@ -128,43 +66,77 @@
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 添加或修改订单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="订单号" prop="orderNo">
<el-input v-model="form.orderNo" placeholder="请输入订单号" />
</el-form-item>
<el-form-item label="冗余" prop="userName">
<el-input v-model="form.userName" placeholder="请输入冗余" />
</el-form-item>
<el-form-item label="冗余" prop="userPhone">
<el-input v-model="form.userPhone" placeholder="请输入冗余" />
</el-form-item>
<el-form-item label="支付时间" prop="payTime">
<el-date-picker clearable v-model="form.payTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择支付时间">
</el-date-picker>
</el-form-item>
<el-form-item label="完成时间" prop="finishTime">
<el-date-picker clearable v-model="form.finishTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="订单金额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入订单金额" />
</el-form-item>
<el-form-item label="取餐码" prop="pickCode">
<el-input v-model="form.pickCode" placeholder="请输入取餐码" />
</el-form-item>
<el-form-item label="创建时间" prop="createdAt">
<el-date-picker clearable v-model="form.createdAt" type="date" value-format="yyyy-MM-dd"
placeholder="请选择创建时间">
</el-date-picker>
</el-form-item>
<el-form-item label="更新时间" prop="updatedAt">
<el-date-picker clearable v-model="form.updatedAt" type="date" value-format="yyyy-MM-dd"
placeholder="请选择更新时间">
</el-date-picker>
</el-form-item>
<!-- 详情对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-form ref="form" :model="form" label-width="80px">
<el-row>
<el-col :span="8">
<el-form-item label="订单编号" >
<el-input v-model="form.orderNo" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="顺序号" >
<el-input v-model="form.orderNum" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="订单状态" >
<el-input v-model="form.state" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="城市" >
<el-input disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="店铺" >
<el-input disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="创建时间" >
<el-input v-model="form.createdAt" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="商品数量" >
<el-input v-model="form.goodsNum" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="金额" >
<el-input v-model="form.amount" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="付款时间" >
<el-input v-model="form.payTime" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="用户昵称" >
<el-input v-model="form.userName" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="用户电话" >
<el-input disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="完成时间" >
<el-input v-model="form.finishTime" disabled/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
......@@ -175,7 +147,7 @@
</template>
<script>
import { listOrder, getOrder, delOrder, addOrder, updateOrder } from "@/api/system/order";
import { listOrder, getOrder } from "@/api/system/order";
export default {
name: "Order",
......@@ -221,61 +193,47 @@ export default {
updatedAt: null
},
// 表单参数
form: {},
// 表单校验
rules: {
orderNo: [
{ required: true, message: "订单号不能为空", trigger: "blur" }
],
orderNum: [
{ required: true, message: "订单顺序号不能为空", trigger: "blur" }
],
userId: [
{ required: true, message: "用户ID不能为空", trigger: "blur" }
],
userName: [
{ required: true, message: "冗余不能为空", trigger: "blur" }
],
payTime: [
{ required: true, message: "支付时间不能为空", trigger: "blur" }
],
finishTime: [
{ required: true, message: "完成时间不能为空", trigger: "blur" }
],
amount: [
{ required: true, message: "订单金额不能为空", trigger: "blur" }
],
goodsNum: [
{ required: true, message: "商品数量不能为空", trigger: "blur" }
],
pickCode: [
{ required: true, message: "取餐码不能为空", trigger: "blur" }
],
shopId: [
{ required: true, message: "店铺ID不能为空", trigger: "blur" }
],
machineId: [
{ required: true, message: "机器ID不能为空", trigger: "blur" }
],
source: [
{ required: true, message: "点单屏序号不能为空", trigger: "blur" }
],
state: [
{ required: true, message: "订单状态 0 创建未校验 1 未支付 2 已支付 3 支付制作中 4 制作完成未取 5 待取超时 6 正常完成 7 未支付取消 8 支付后制作前取消 9 制作中取消 10 制作完成取消 11 已退款 12 部分退款 50 其他人工干预状态不能为空", trigger: "blur" }
],
createdAt: [
{ required: true, message: "创建时间不能为空", trigger: "blur" }
],
updatedAt: [
{ required: true, message: "更新时间不能为空", trigger: "blur" }
]
}
form: {}
};
},
created() {
this.getList();
},
methods: {
formatterState(state){
if(state == 0){
return "创建未校验";
}else if(state == 1){
return "未支付";
}else if(state == 2){
return "已支付";
}else if(state == 3){
return "支付制作中";
}else if(state == 4){
return "制作完成未取";
}else if(state == 5){
return "待取超时";
}else if(state == 6){
return "正常完成";
}else if(state == 7){
return "未支付取消";
}else if(state == 8){
return "支付后制作前取消";
}else if(state == 9){
return "制作中取消";
}else if(state == 10){
return "制作完成取消";
}else if(state == 11){
return "已退款";
}else if(state == 11){
return "已退款";
}else if(state == 12){
return "部分退款";
}else if(state == 50){
return "其他人工干预状态";
}
},
/** 查询订单列表 */
getList() {
this.loading = true;
......@@ -287,31 +245,7 @@ export default {
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
orderNo: null,
orderNum: null,
userId: null,
userName: null,
userPhone: null,
payTime: null,
finishTime: null,
amount: null,
goodsNum: null,
pickCode: null,
shopId: null,
machineId: null,
source: null,
state: null,
createdAt: null,
updatedAt: null
};
this.resetForm("form");
this.open = false;
},
/** 搜索按钮操作 */
handleQuery() {
......@@ -323,18 +257,6 @@ export default {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加订单";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
......@@ -342,38 +264,13 @@ export default {
getOrder(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改订单";
this.title = "订单信息";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateOrder(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addOrder(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除订单编号为"' + ids + '"的数据项？').then(function () {
return delOrder(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => { });
this.open=false;
},
/** 导出按钮操作 */
handleExport() {
......
src/views/shop/shop/components/recommend.vue
......@@ -2,10 +2,20 @@
<div>
<el-table v-loading="loading" :data="orderList">
<el-table-column label="商品名称" align="center" prop="name" />
<el-table-column label="编码" align="center" prop="code" />
<el-table-column label="缩略图" align="center" prop="" width="150">
<template slot-scope="scope">
<div class="image-tmp">
<el-image style="width: 100px; height: 100px" :src="getPicsList(scope.row.pics)" :preview-src-list="getPicsBigList(scope.row.pics)">
<div slot="error" class="image-slot"></div>
</el-image>
</div>
</template>
</el-table-column>
<el-table-column label="商品分类" align="center" prop="categoryName" width="100" />
<el-table-column label="折扣价" align="center" prop="discount" />
<el-table-column label="原价" align="center" prop="price" />
<el-table-column label="销售总量" align="center" prop="salesVolume" />
<el-table-column label="推荐时间" align="center" prop="recDate" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-popconfirm title="确定要移除吗？" @confirm="removeRecommend(scope.row)">
......@@ -46,6 +56,16 @@ export default {
//this.getList()
},
methods: {
getPicsList(str){
let picObj = JSON.parse(str);
return picObj.thumbnail
},
getPicsBigList(str){
let list=[];
let picObj = JSON.parse(str);
list.push(picObj.thumbnail)
return list;
},
getList() {
this.loading = true;
recommendList({ ...this.queryParams, shopId: this.shopId, type: 1 }).then(response => {
......
src/views/shop/shop/index.vue
......@@ -77,8 +77,10 @@
<el-button size="mini" type="text" v-if="authBtn(['1'], scope.row.state)"
@click="setShopState(scope.row, 2, 'setState')">
暂停营业</el-button>
<el-button size="mini" type="text" v-if="authBtn(['2', '3'], scope.row.state)"
<el-button size="mini" type="text" v-if="authBtn(['2'], scope.row.state)"
@click="setShopState(scope.row, 1, 'setState')">开始营业</el-button>
<el-button size="mini" type="text" v-if="authBtn(['3'], scope.row.state)"
@click="setShopState(scope.row, 1, 'setState')">恢复营业</el-button>
<el-button v-show="scope.row.isDefault=='0'" size="mini" type="text" @click="setShopState(scope.row)">设为默认</el-button>
</template>
</el-table-column>
......@@ -229,7 +231,10 @@ export default {
params.isDefault = 1
}
updateShop(params).then(res => {
this.getList()
if(res.code="200"){
this.getList();
}
})
}
......
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