测试问题修改3
This commit is contained in:
parent
bcc85a2f9d
commit
e76d04825c
|
|
@ -331,7 +331,6 @@
|
|||
this.loading = false;
|
||||
});
|
||||
},
|
||||
|
||||
handleTabClick(tab, event) {
|
||||
console.log(tab, event);
|
||||
},
|
||||
|
|
@ -388,15 +387,13 @@
|
|||
},
|
||||
/** 提交按钮 */
|
||||
submitForm: function() {
|
||||
// console.log(this.baseForm)
|
||||
console.log(this.checkUrlList)
|
||||
this.$refs["baseForm"].validate(valid => {//基本设置表单校验
|
||||
if (valid) {
|
||||
this.baseForm.bizStartTime=this.rangeTime[0]
|
||||
this.baseForm.bizEndTime=this.rangeTime[1]
|
||||
// this.$set(this.baseForm,"imgUrl",this.checkUrlList[0])
|
||||
if (this.canteenId != "") {
|
||||
param.canteenId = this.canteenId
|
||||
updateCanteenApi(this.baseForm).then(response => {
|
||||
updateCanteenApi(this.baseForm).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
|
|
@ -443,7 +440,7 @@
|
|||
},
|
||||
// 上传之前
|
||||
handleBeforeUpload(file) {
|
||||
const isLt = file.size / 1024 / 1024 < 5
|
||||
const isLt = file.size / 1024 / 1024 < 10
|
||||
if (!isLt) {
|
||||
this.$modal.msgError(`图片大小不能超过 5 MB`)
|
||||
return false
|
||||
|
|
|
|||
|
|
@ -605,40 +605,40 @@
|
|||
<el-col :span="24">
|
||||
<el-table :data="formTable" size="mini" style="width: 100%">
|
||||
<el-table-column label="加工时间（min）" prop="processingTime" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="可食部分(g/100g)" prop="edible" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="水分(g/100g)" prop="water" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="可食部分(g)" prop="edible" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="水分(g)" prop="water" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="热量（千卡/100g）" prop="calories" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="蛋白质(g/100g)" prop="protein" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="脂肪(g/100g)" prop="fat" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="碳水化合物(g/100g)" prop="carbohydrate" align="center" width="150"></el-table-column>
|
||||
<el-table-column label="膳食纤维(g/100g)" prop="dietaryFiber" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="胆固醇(mg/100g)" prop="cholesterol" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="蛋白质(g)" prop="protein" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="脂肪(g)" prop="fat" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="碳水化合物(g)" prop="carbohydrate" align="center" width="150"></el-table-column>
|
||||
<el-table-column label="膳食纤维(g)" prop="dietaryFiber" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="胆固醇(mg)" prop="cholesterol" align="center" width="140"></el-table-column>
|
||||
</el-table>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-table :data="formTable" size="mini" style="width: 100%">
|
||||
<el-table-column label="灰分(g/100g)" prop="ash" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="维生素A(μg/100g)" prop="vitaminA" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="胡萝卜素(μg/100g)" prop="carotene" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="视黄醇(μg/100g)" prop="retinol" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="硫胺素(mg/100g)" prop="thiamine" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="核黄素(mg/100g)" prop="riboflavin" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="烟酸/尼克酸(mg/100g)" prop="niacin" align="center" width="150"></el-table-column>
|
||||
<el-table-column label="维生素C(mg/100g)" prop="vitaminC" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="维生素D(μg/100g)" prop="vitaminD" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="灰分(g)" prop="ash" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="维生素A(μg)" prop="vitaminA" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="胡萝卜素(μg)" prop="carotene" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="视黄醇(μg)" prop="retinol" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="硫胺素(mg)" prop="thiamine" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="核黄素(mg)" prop="riboflavin" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="烟酸/尼克酸(mg)" prop="niacin" align="center" width="150"></el-table-column>
|
||||
<el-table-column label="维生素C(mg)" prop="vitaminC" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="维生素D(μg)" prop="vitaminD" align="center" width="140"></el-table-column>
|
||||
</el-table>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-table :data="formTable" size="mini" style="width: 100%">
|
||||
<el-table-column label="维生素E(mg/100g)" prop="vitaminE" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="钙(mg/100g)" prop="calcium" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="磷(mg/100g)" prop="phosphorus" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="钾(mg/100g)" prop="kalium" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="钠 (mg/100g)" prop="sodium" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="镁(mg/100g)" prop="magnesium" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="铁 (mg/100g)" prop="iron" align="center" width="150"></el-table-column>
|
||||
<el-table-column label="锌(mg/100g)" prop="zinc" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="硒(μg/100g)" prop="selenium" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="维生素E(mg)" prop="vitaminE" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="钙(mg)" prop="calcium" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="磷(mg)" prop="phosphorus" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="钾(mg)" prop="kalium" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="钠 (mg)" prop="sodium" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="镁(mg)" prop="magnesium" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="铁 (mg)" prop="iron" align="center" width="150"></el-table-column>
|
||||
<el-table-column label="锌(mg)" prop="zinc" align="center" width="140"></el-table-column>
|
||||
<el-table-column label="硒(μg)" prop="selenium" align="center" width="140"></el-table-column>
|
||||
</el-table>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
|
|||
|
|
@ -285,6 +285,7 @@ export default {
|
|||
}
|
||||
],
|
||||
rules: {
|
||||
materialCode: [{ required: true, message: '请输入原料编码', trigger: 'blur' }],
|
||||
materialName: [{ required: true, message: '请输入原料名称', trigger: 'blur' }],
|
||||
areaId: [{ required: true, message: '请选择所属区域', trigger: 'change' }],
|
||||
materialTypeId: [{ required: true, message: '请选择原料类别', trigger: 'change' }],
|
||||
|
|
|
|||
|
|
@ -715,7 +715,7 @@
|
|||
this.orderDetailList.forEach((item,index)=>{
|
||||
this.$set(this.orderDetailList[index],"unRefundNum",item.quantity-item.refundNum)
|
||||
this.$set(this.orderDetailList[index],"goRefundNum",item.unRefundNum)
|
||||
this.$set(this.orderDetailList[index],"refundMoney",Number(item.quantity)*(item.salePrice).toFixed(2))
|
||||
this.$set(this.orderDetailList[index],"refundMoney",Number(item.goRefundNum)*(item.salePrice).toFixed(2))
|
||||
})
|
||||
this.refundList=[]
|
||||
this.openPart = true;
|
||||
|
|
@ -726,10 +726,15 @@
|
|||
row.goRefundNum=row.unRefundNum
|
||||
}
|
||||
row.refundMoney = Number(row.goRefundNum)*(row.salePrice).toFixed(2)
|
||||
this.refundList.forEach((item) => {
|
||||
if(item.detailId==row.detailId){
|
||||
this.$set(item,"quantity",row.goRefundNum)
|
||||
}
|
||||
})
|
||||
},
|
||||
choseRefundTypeRadio(e){},
|
||||
handleSelectionChange(selection){
|
||||
console.log(selection)
|
||||
// console.log(selection)
|
||||
this.refundList = selection.map((item) => {
|
||||
let obj = {'detailId':item.detailId,'quantity':item.goRefundNum}
|
||||
return obj
|
||||
|
|
@ -775,11 +780,7 @@
|
|||
});
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
},
|
||||
/** 退单按钮操作 */
|
||||
handleRefund(row) {
|
||||
|
|
@ -858,18 +859,18 @@
|
|||
if(this.ableList.length>0){
|
||||
if(this.handleType=="退单"){
|
||||
this.ableList.forEach(item=>{
|
||||
let param = {
|
||||
backType: 1,
|
||||
macOrderId:item.macOrderId,
|
||||
orderId:item.orderId
|
||||
}
|
||||
refundOrderApi(param).then(response => {
|
||||
if(response.code!=200){
|
||||
this.$modal.msgError(response.msg);
|
||||
let param = {
|
||||
backType: 1,
|
||||
macOrderId:item.macOrderId,
|
||||
orderId:item.orderId
|
||||
}
|
||||
});
|
||||
refundOrderApi(param).then(response => {
|
||||
// if(response.code!=200){
|
||||
// this.$modal.msgError(response.msg);
|
||||
// }
|
||||
});
|
||||
})
|
||||
this.$modal.msgSuccess("退单成功");
|
||||
this.$modal.msgSuccess("批量退单完成");
|
||||
}
|
||||
if(this.handleType=="核销"){
|
||||
this.ableList.forEach(item=>{
|
||||
|
|
@ -877,16 +878,17 @@
|
|||
orderId:item.orderId
|
||||
}
|
||||
writeOffOrderApi(param).then(response => {
|
||||
if(response.code!=200){
|
||||
this.$modal.msgError(response.msg);
|
||||
}
|
||||
// if(response.code!=200){
|
||||
// this.$modal.msgError(response.msg);
|
||||
// }
|
||||
});
|
||||
})
|
||||
this.$modal.msgSuccess("核销成功");
|
||||
this.$modal.msgSuccess("批量核销完成");
|
||||
}
|
||||
setTimeout(()=>{
|
||||
this.getList()
|
||||
this.$refs.multipleTable.clearSelection()
|
||||
this.openRemind = false
|
||||
},1000)
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -685,7 +685,7 @@ export default {
|
|||
this.orderDetailList.forEach((item,index)=>{
|
||||
this.$set(this.orderDetailList[index],"unRefundNum",item.quantity-item.refundNum)
|
||||
this.$set(this.orderDetailList[index],"goRefundNum",item.unRefundNum)
|
||||
this.$set(this.orderDetailList[index],"refundMoney",Number(item.quantity)*(item.salePrice).toFixed(2))
|
||||
this.$set(this.orderDetailList[index],"refundMoney",Number(item.goRefundNum)*(item.salePrice).toFixed(2))
|
||||
})
|
||||
this.refundList=[]
|
||||
this.openPart = true;
|
||||
|
|
@ -696,6 +696,11 @@ export default {
|
|||
row.goRefundNum=row.unRefundNum
|
||||
}
|
||||
row.refundMoney = Number(row.goRefundNum)*(row.salePrice).toFixed(2)
|
||||
this.refundList.forEach((item) => {
|
||||
if(item.detailId==row.detailId){
|
||||
this.$set(item,"quantity",row.goRefundNum)
|
||||
}
|
||||
})
|
||||
},
|
||||
//数量退款/金额退款
|
||||
choseRefundTypeRadio(e){},
|
||||
|
|
@ -712,45 +717,45 @@ export default {
|
|||
},
|
||||
//部分退款提交
|
||||
confirmRefund(){
|
||||
if(this.refundType==1){
|
||||
if(this.refundList.length==0){
|
||||
this.$modal.msgError("请先勾选退款菜品!");
|
||||
}else{
|
||||
console.log(this.refundList)
|
||||
let param = {
|
||||
orderPartRefundDetailList:this.refundList,
|
||||
orderId:this.rowData.orderId
|
||||
}
|
||||
if(this.refundType==1){
|
||||
if(this.refundList.length==0){
|
||||
this.$modal.msgError("请先勾选退款菜品!");
|
||||
}else{
|
||||
console.log(this.refundList)
|
||||
let param = {
|
||||
orderPartRefundDetailList:this.refundList,
|
||||
orderId:this.rowData.orderId
|
||||
}
|
||||
refundOrderPartApi(param).then(response => {
|
||||
if(response.code==200){
|
||||
this.$modal.msgSuccess("退款成功");
|
||||
}
|
||||
this.getList()
|
||||
this.openPart = false;
|
||||
}).catch(err => {
|
||||
this.refundList = []
|
||||
this.$refs.multiplePartTable.clearSelection()
|
||||
})
|
||||
}
|
||||
}
|
||||
if(this.refundType==2){
|
||||
this.$refs["rowData"].validate(valid => {
|
||||
if (valid) {
|
||||
let param = {
|
||||
refundAmount:Number(this.rowData.refundMoney*100),
|
||||
orderId:this.rowData.orderId
|
||||
}
|
||||
refundOrderPartApi(param).then(response => {
|
||||
if(response.code==200){
|
||||
this.$modal.msgSuccess("退款成功");
|
||||
}
|
||||
this.getList()
|
||||
this.openPart = false;
|
||||
}).catch(err => {
|
||||
this.refundList = []
|
||||
this.$refs.multiplePartTable.clearSelection()
|
||||
})
|
||||
}
|
||||
}
|
||||
if(this.refundType==2){
|
||||
this.$refs["rowData"].validate(valid => {
|
||||
if (valid) {
|
||||
let param = {
|
||||
refundAmount:Number(this.rowData.refundMoney*100),
|
||||
orderId:this.rowData.orderId
|
||||
}
|
||||
refundOrderPartApi(param).then(response => {
|
||||
if(response.code==200){
|
||||
this.$modal.msgSuccess("退款成功");
|
||||
}
|
||||
this.getList()
|
||||
this.openPart = false;
|
||||
});
|
||||
}
|
||||
});
|
||||
if(response.code==200){
|
||||
this.$modal.msgSuccess("退款成功");
|
||||
}
|
||||
this.getList()
|
||||
this.openPart = false;
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -836,12 +841,12 @@ export default {
|
|||
orderId:item.orderId
|
||||
}
|
||||
refundOrderApi(param).then(response => {
|
||||
if(response.code!=200){
|
||||
this.$modal.msgError(response.msg);
|
||||
}
|
||||
// if(response.code!=200){
|
||||
// this.$modal.msgError(response.msg);
|
||||
// }
|
||||
});
|
||||
})
|
||||
this.$modal.msgSuccess("退单成功");
|
||||
this.$modal.msgSuccess("批量退单完成");
|
||||
}
|
||||
if(this.handleType=="核销"){
|
||||
this.ableList.forEach(item=>{
|
||||
|
|
@ -849,18 +854,18 @@ export default {
|
|||
orderIdList:[item.orderId ]
|
||||
}
|
||||
writeOffOrderApi(param).then(response => {
|
||||
if(response.code!=200){
|
||||
this.$modal.msgError(response.msg);
|
||||
}
|
||||
// if(response.code!=200){
|
||||
// this.$modal.msgError(response.msg);
|
||||
// }
|
||||
});
|
||||
})
|
||||
this.$modal.msgSuccess("核销成功");
|
||||
this.$modal.msgSuccess("批量核销完成");
|
||||
}
|
||||
this.openRemind = true
|
||||
this.$refs.multipleTable.clearSelection()
|
||||
setTimeout(()=>{
|
||||
this.openRemind = false
|
||||
this.getList()
|
||||
},1000)
|
||||
},500)
|
||||
}
|
||||
},
|
||||
//同步订单状态
|
||||
|
|
|
|||
|
|
@ -550,7 +550,7 @@
|
|||
this.orderDetailList.forEach((item,index)=>{
|
||||
this.$set(this.orderDetailList[index],"unRefundNum",item.quantity-item.refundNum)
|
||||
this.$set(this.orderDetailList[index],"goRefundNum",item.unRefundNum)
|
||||
this.$set(this.orderDetailList[index],"refundMoney",Number(item.quantity)*(item.salePrice).toFixed(2))
|
||||
this.$set(this.orderDetailList[index],"refundMoney",Number(item.goRefundNum)*(item.salePrice).toFixed(2))
|
||||
})
|
||||
this.refundList=[]
|
||||
this.openPart = true;
|
||||
|
|
@ -561,6 +561,11 @@
|
|||
row.goRefundNum=row.unRefundNum
|
||||
}
|
||||
row.refundMoney = Number(row.goRefundNum)*(row.salePrice).toFixed(2)
|
||||
this.refundList.forEach((item) => {
|
||||
if(item.detailId==row.detailId){
|
||||
this.$set(item,"quantity",row.goRefundNum)
|
||||
}
|
||||
})
|
||||
},
|
||||
selectable(row){
|
||||
return row.unRefundNum>0
|
||||
|
|
@ -663,12 +668,12 @@
|
|||
orderId:item.orderId
|
||||
}
|
||||
refundOrderApi(param).then(response => {
|
||||
if(response.code!=200){
|
||||
this.$modal.msgError(response.msg);
|
||||
}
|
||||
// if(response.code!=200){
|
||||
// this.$modal.msgError(response.msg);
|
||||
// }
|
||||
});
|
||||
})
|
||||
this.$modal.msgSuccess("退单成功");
|
||||
this.$modal.msgSuccess("批量退单完成");
|
||||
}
|
||||
if(this.handleType=="核销"){
|
||||
this.ableList.forEach(item=>{
|
||||
|
|
@ -676,17 +681,18 @@
|
|||
orderId:item.orderId
|
||||
}
|
||||
writeOffOrderApi(param).then(response => {
|
||||
if(response.code!=200){
|
||||
this.$modal.msgError(response.msg);
|
||||
}
|
||||
// if(response.code!=200){
|
||||
// this.$modal.msgError(response.msg);
|
||||
// }
|
||||
});
|
||||
})
|
||||
this.$modal.msgSuccess("核销成功");
|
||||
this.$modal.msgSuccess("批量核销完成");
|
||||
}
|
||||
setTimeout(()=>{
|
||||
this.openRemind = false
|
||||
this.getList()
|
||||
this.$refs.multipleTable.clearSelection()
|
||||
},1000)
|
||||
},500)
|
||||
}
|
||||
},
|
||||
//同步订单状态
|
||||
|
|
|
|||
Loading…
Reference in New Issue