bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

组件问题修改

This commit is contained in:
zzyuan 2025-03-21 17:59:18 +08:00
parent f58abc9f0b
commit e1e701430d
9 changed files with 246 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/dish/dish.js
View File

@ -127,6 +127,18 @@ export function editMenuDishesApi(data) {
data: data
})
}
// 菜品列表-详情
export function menuDishesDetailApi(data) {
return request({
url: '/smart-canteen/api/v2/menudishes/detail/'+data.dishesId,
method: 'post',
headers: {
"merchant-id":"378915229716713472",
},
data: data
})
}
// 菜品列表-删除
export function removeMenuDishesApi(dishesId) {
return request({

70
src/views/accountCenter/account/accountManager/expired.vue
View File

@ -10,7 +10,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="yyyy-MM-dd HH:mm:ss" style="width: 240px"
format="yyyy-MM-dd HH:mm:ss" style="width: 340px"
:default-time="['00:00:00', '23:59:59']"
:picker-options="pickerOptions" >
</el-date-picker>
@ -176,34 +176,38 @@
walletMinAmount:null,
walletMaxAmount:null,
},
dateRange:[new Date(),new Date()],
dateRange:this.defaultDateRange(),
pickerOptions: {
shortcuts: [{
text: '最近一周',
onClick(picker) {
const start = new Date();
const end = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 6);
picker.$emit('pick', [start, end]);
}
},{
text: '最近一个月',
onClick(picker) {
const start = new Date();
const end = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit('pick', [start, end]);
}
},{
text: '最近三个月',
onClick(picker) {
const start = new Date();
const end = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 91);
picker.$emit('pick', [start, end]);
}
}]
},
shortcuts: [{
text: '最近一周',
onClick(picker) {
const end = new Date(new Date().toLocaleDateString());
end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);
const start = new Date((new Date().toLocaleDateString()));
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近一个月',
onClick(picker) {
const end = new Date(new Date().toLocaleDateString());
end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);
const start = new Date((new Date().toLocaleDateString()));
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近三个月',
onClick(picker) {
const end = new Date(new Date().toLocaleDateString());
end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);
const start = new Date((new Date().toLocaleDateString()));
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit('pick', [start, end]);
}
}]
},
};
@ -284,6 +288,16 @@
// }
// }
},
defaultDateRange() {
const end = new Date(new Date().toLocaleDateString());
end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);
const start = new Date((new Date().toLocaleDateString()));
start.setTime(start.getTime());
this.start = parseInt(start.getTime() / 1000)
this.end = parseInt(end.getTime() / 1000)
return [start, end]
},
//日期
formatDate(date) {
// 格式化为 YYYY-MM-DD

72
src/views/accountCenter/account/accountManager/logoff.vue
View File

@ -10,7 +10,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="yyyy-MM-dd HH:mm:ss" style="width: 240px"
format="yyyy-MM-dd HH:mm:ss" style="width: 340px"
:default-time="['00:00:00', '23:59:59']"
:picker-options="pickerOptions" >
</el-date-picker>
@ -169,41 +169,45 @@
pageNum: 1,
pageSize: 10,
accStatusList:[3],
orgIdList:[],
orgIdList:[],
orgLevel:2,
keyword:null,
walletType:null,
walletMinAmount:null,
walletMaxAmount:null,
},
dateRange:[new Date(),new Date()],
dateRange:this.defaultDateRange(),
pickerOptions: {
shortcuts: [{
text: '最近一周',
onClick(picker) {
const start = new Date();
const end = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 6);
picker.$emit('pick', [start, end]);
}
},{
text: '最近一个月',
onClick(picker) {
const start = new Date();
const end = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit('pick', [start, end]);
}
},{
text: '最近三个月',
onClick(picker) {
const start = new Date();
const end = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 91);
picker.$emit('pick', [start, end]);
}
}]
},
shortcuts: [{
text: '最近一周',
onClick(picker) {
const end = new Date(new Date().toLocaleDateString());
end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);
const start = new Date((new Date().toLocaleDateString()));
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近一个月',
onClick(picker) {
const end = new Date(new Date().toLocaleDateString());
end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);
const start = new Date((new Date().toLocaleDateString()));
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近三个月',
onClick(picker) {
const end = new Date(new Date().toLocaleDateString());
end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);
const start = new Date((new Date().toLocaleDateString()));
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit('pick', [start, end]);
}
}]
},
};
@ -284,6 +288,16 @@
// }
// }
},
defaultDateRange() {
const end = new Date(new Date().toLocaleDateString());
end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);
const start = new Date((new Date().toLocaleDateString()));
start.setTime(start.getTime());
this.start = parseInt(start.getTime() / 1000)
this.end = parseInt(end.getTime() / 1000)
return [start, end]
},
//日期
formatDate(date) {
// 格式化为 YYYY-MM-DD

70
src/views/accountCenter/account/tradeRecords/index.vue
View File

@ -10,7 +10,7 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="yyyy-MM-dd HH:mm:ss" style="width: 240px"
format="yyyy-MM-dd HH:mm:ss" style="width: 340px"
:default-time="['00:00:00', '23:59:59']"
:picker-options="pickerOptions" >
</el-date-picker>
@ -145,34 +145,38 @@
tableListData: [],
// 是否显示弹出层
open: false,
dateRange:[new Date(),new Date()],
dateRange:this.defaultDateRange(),
pickerOptions: {
shortcuts: [{
text: '最近一周',
onClick(picker) {
const start = new Date();
const end = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 6);
picker.$emit('pick', [start, end]);
}
},{
text: '最近一个月',
onClick(picker) {
const start = new Date();
const end = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit('pick', [start, end]);
}
},{
text: '最近三个月',
onClick(picker) {
const start = new Date();
const end = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 91);
picker.$emit('pick', [start, end]);
}
}]
},
shortcuts: [{
text: '最近一周',
onClick(picker) {
const end = new Date(new Date().toLocaleDateString());
end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);
const start = new Date((new Date().toLocaleDateString()));
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近一个月',
onClick(picker) {
const end = new Date(new Date().toLocaleDateString());
end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);
const start = new Date((new Date().toLocaleDateString()));
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近三个月',
onClick(picker) {
const end = new Date(new Date().toLocaleDateString());
end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);
const start = new Date((new Date().toLocaleDateString()));
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit('pick', [start, end]);
}
}]
},
deptOptions:[],//组织树
// 查询参数
queryParams: {
@ -256,6 +260,16 @@
this.loading = false;
});
},
defaultDateRange() {
const end = new Date(new Date().toLocaleDateString());
end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);
const start = new Date((new Date().toLocaleDateString()));
start.setTime(start.getTime());
this.start = parseInt(start.getTime() / 1000)
this.end = parseInt(end.getTime() / 1000)
return [start, end]
},
//日期
formatDate(date) {
// 格式化为 YYYY-MM-DD

8
src/views/accountCenter/consume/consumeSummary/index.vue
View File

@ -12,7 +12,7 @@
<el-form-item label="日期">
<el-date-picker
v-model="dateRange"
type="datetimerange"
type="daterange"
align="right"
unlink-panels
range-separator="至"
@ -76,7 +76,7 @@
<el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true" v-if="activeName=='cust'"/>
<el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" v-if="activeName=='cust'||activeName=='organization'"/>
<el-table-column label="用户类别" align="center" prop="psnTypeName" :show-overflow-tooltip="true" v-if="activeName=='cust'||activeName=='psn'"/>
<el-table-column label="正常消费">
<el-table-column label="正常消费" align="center">
<el-table-column label="次数" align="center" prop="consumeNum" :show-overflow-tooltip="true" />
<el-table-column label="金额" align="center" prop="consumeAmount" :show-overflow-tooltip="true" >
<template slot-scope="scope">
@ -84,7 +84,7 @@
</template>
</el-table-column>
</el-table-column>
<el-table-column label="补扣消费">
<el-table-column label="补扣消费" align="center">
<el-table-column label="次数" align="center" prop="consumeRepairNum" :show-overflow-tooltip="true" />
<el-table-column label="金额" align="center" prop="consumeRepairAmount" :show-overflow-tooltip="true" >
<template slot-scope="scope">
@ -92,7 +92,7 @@
</template>
</el-table-column>
</el-table-column>
<el-table-column label="退单退款">
<el-table-column label="退单退款" align="center">
<el-table-column label="次数" align="center" prop="consumeRefundNum" :show-overflow-tooltip="true"/>
<el-table-column label="金额" align="center" prop="consumeRefundAmount" :show-overflow-tooltip="true">
<template slot-scope="scope">

2
src/views/accountCenter/consume/consumerWalletSummary/index.vue
View File

@ -12,7 +12,7 @@
<el-form-item label="日期">
<el-date-picker
v-model="dateRange"
type="datetimerange"
type="daterange"
align="right"
unlink-panels
range-separator="至"

68
src/views/accountCenter/consume/trade/index.vue
View File

@ -181,34 +181,38 @@
tableListData: [],
// 是否显示弹出层
open: false,
dateRange:[new Date(),new Date()],
dateRange:this.defaultDateRange(),
pickerOptions: {
shortcuts: [{
text: '最近一周',
onClick(picker) {
const start = new Date();
const end = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 6);
picker.$emit('pick', [start, end]);
}
},{
text: '最近一个月',
onClick(picker) {
const start = new Date();
const end = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit('pick', [start, end]);
}
},{
text: '最近三个月',
onClick(picker) {
const start = new Date();
const end = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 91);
picker.$emit('pick', [start, end]);
}
}]
},
shortcuts: [{
text: '最近一周',
onClick(picker) {
const end = new Date(new Date().toLocaleDateString());
end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);
const start = new Date((new Date().toLocaleDateString()));
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近一个月',
onClick(picker) {
const end = new Date(new Date().toLocaleDateString());
end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);
const start = new Date((new Date().toLocaleDateString()));
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近三个月',
onClick(picker) {
const end = new Date(new Date().toLocaleDateString());
end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);
const start = new Date((new Date().toLocaleDateString()));
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit('pick', [start, end]);
}
}]
},
deptOptions:[],//组织树
psnTypeOptions:[],
// 查询参数
@ -304,6 +308,16 @@
this.loading = false;
});
},
defaultDateRange() {
const end = new Date(new Date().toLocaleDateString());
end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);
const start = new Date((new Date().toLocaleDateString()));
start.setTime(start.getTime());
this.start = parseInt(start.getTime() / 1000)
this.end = parseInt(end.getTime() / 1000)
return [start, end]
},
//日期
formatDate(date) {
// 格式化为 YYYY-MM-DD

77
src/views/dish/dish/index.vue
View File

@ -296,7 +296,7 @@
emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
checkStrictly: true,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
value:'id',label:'treeName'
}" clearable @change="handleAreaChange">
}" clearable @change="handleAreaChange2">
</el-cascader>
</el-form-item>
</el-col>
@ -305,8 +305,8 @@
<el-row>
<el-col :span="12">
<el-form-item label="所属食堂" prop="canteenId">
<el-select v-model="baseForm.canteenId" placeholder="请选择所属食堂" style="width: 100%;" @change="handleCanteenChange">
<el-option v-for="item in canteenOptions"
<el-select v-model="baseForm.canteenId" placeholder="请选择所属食堂" style="width: 100%;" clearable @change="handleCanteenChange2">
<el-option v-for="item in canteenOptions2"
:key="item.canteenId"
:label="item.canteenName"
:value="item.canteenId"
@ -316,8 +316,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="所属档口" prop="stallId">
<el-select v-model="baseForm.stallId" placeholder="请选择所属档口" style="width: 100%;" >
<el-option v-for="item in stallOptions"
<el-select v-model="baseForm.stallId" placeholder="请选择所属档口" style="width: 100%;" clearable>
<el-option v-for="item in stallOptions2"
:key="item.stallId"
:label="item.stallName"
:value="item.stallId"
@ -593,7 +593,7 @@
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { menuDishesTypeAllListApi,addMenuDishesTypeApi, editMenuDishesTypeApi, removeMenuDishesTypeApi, systemAreaTreeApi,getCanteenByAreaApi,getStallByCanteenApi} from "@/api/dish/dish";
import { getMenuDishesListApi,addMenuDishesApi, editMenuDishesApi,removeMenuDishesApi } from "@/api/dish/dish";
import { getMenuDishesListApi,addMenuDishesApi, editMenuDishesApi,menuDishesDetailApi,removeMenuDishesApi } from "@/api/dish/dish";
import { getMenuDishesCookListApi, getMenuDishesLabelListApi, getMenuDishesTasteListApi, getMenuDishesEffectListApi, getMenuDishesStyleListApi, getMenuDishesSuitListApi } from "@/api/dish/type"
import { removeMaterialApi,batchRemoveMaterialApi} from "@/api/dish/material";
import { imgUpLoadTwo } from '@/api/system/upload'
@ -659,6 +659,8 @@
]
},
treeAreaOptions:[],//区域树
canteenOptions2:[],//食堂下拉选
stallOptions2:[],//档口下拉选
batchIds:[],
openDish: false,//菜品弹窗开关
activeName:"baseInfo",
@ -830,23 +832,41 @@
});
},
handleAreaChange(e){
console.log(this.queryParams.areaIds)
let param= {
areaIdList:this.queryParams.areaIds||[this.baseForm.areaId]
areaIdList:this.queryParams.areaIds
}
getCanteenByAreaApi(param).then((response) => {
this.canteenOptions=response||[]
});
},
handleCanteenChange(e){
console.log(this.queryParams.canteenIds)
handleAreaChange2(e){
let param= {
canteenIdList:this.queryParams.canteenIds||[this.baseForm.canteenId]
areaIdList:[this.baseForm.areaId]
}
getCanteenByAreaApi(param).then((response) => {
this.canteenOptions2=response||[]
this.baseForm.canteenId=null
this.stallOptions2 = []
this.baseForm.stallId=null
});
},
handleCanteenChange(e){
let param= {
canteenIdList:this.queryParams.canteenIds
}
getStallByCanteenApi(param).then((response) => {
this.stallOptions=response||[]
});
},
handleCanteenChange2(e){
let param= {
canteenIdList:[this.baseForm.canteenId]
}
getStallByCanteenApi(param).then((response) => {
this.stallOptions2=response||[]
this.baseForm.stallId=null
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
@ -903,10 +923,7 @@
});
getMenuDishesSuitListApi({"content":JSON.stringify(param)}).then(response => {
this.dishesSuitOptions = response.data.records;
});
});
},
resetDishDialog(){
@ -948,16 +965,26 @@
/** 修改按钮操作 */
handleUpdate(row) {
this.getAllSelectList()
this.resetDishDialog()
this.baseForm = Object.assign({}, row)
this.$set(this.baseForm,"salesMode",row.salesMode+'')
this.$set(this.baseForm,"sizeType",row.sizeType+'')
this.$set(this.baseForm,"mealType",row.mealType+'')
this.fileList=[{url:this.baseForm.imageUrl}]
this.checkUrlList=[this.baseForm.imageUrl]
this.title = "修改";
this.openDish = true;
console.log(row)
menuDishesDetailApi({"dishesId":row.dishesId}).then(response => {
this.getAllSelectList()
this.resetDishDialog()
this.baseForm = response
getCanteenByAreaApi({areaIdList:[this.baseForm.areaId]}).then((response) => {
this.canteenOptions2=response||[]
});
getStallByCanteenApi({canteenIdList:[this.baseForm.canteenId]}).then((response) => {
this.stallOptions2=response||[]
});
this.$set(this.baseForm,"salesMode",response.salesMode+'')
this.$set(this.baseForm,"sizeType",response.sizeType+'')
this.$set(this.baseForm,"mealType",response.mealType+'')
this.fileList=[{url:this.baseForm.imageUrl}]
this.checkUrlList=[this.baseForm.imageUrl]
this.title = "修改";
this.openDish = true;
});
},
/** 处理对话框提交 */

13
src/views/superstore/super/index.vue
View File

@ -121,7 +121,7 @@
<el-col :span="12">
<el-form-item label="超市仓库" prop="warehouseId">
<el-select v-model="baseForm.warehouseId" placeholder="请选择超市仓库" style="width: 100%;">
<el-option v-for="item in wareHouseOptions"
<el-option v-for="item in wareHouseOptions2"
:key="item.warehouseId"
:label="item.warehouseName"
:value="item.warehouseId"
@ -343,6 +343,7 @@
areaIdList: [],
},
wareHouseOptions:[],
wareHouseOptions2:[],
psnTypeOptions:[],
userOptions:[],
activeName:"baseSetting",
@ -428,7 +429,10 @@
],
areaId: [
{ required: true, message: "所属区域不能为空", trigger: "blur" }
]
],
deliveryWayList: [
{ required: true, message: "配送方式不能为空", trigger: "change" }
],
},
// 总条数
dialogTotal: 0,
@ -535,7 +539,7 @@
areaIdList:[this.baseForm.areaId]
}
drpWareHousePageApi(param).then(response => {
this.wareHouseOptions = response.data.records
this.wareHouseOptions2 = response.data.records
});
if(row.imgUrl){
this.fileList=[{url:row.imgUrl}]
@ -583,7 +587,8 @@
areaIdList:[val]
}
drpWareHousePageApi(param).then(response => {
this.wareHouseOptions = response.data.records
this.wareHouseOptions2 = response.data.records
this.baseForm.warehouseId = null
});
},
//用户类型