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

测试问题修改

This commit is contained in:
zzyuan 2025-06-11 09:58:37 +08:00
parent 3cfc4a4585
commit c85262f492
9 changed files with 86 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/base/canteenStall/area/index.vue
View File

@ -111,8 +111,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="区域名称" align="center" key="areaName" prop="areaName" show-overflow-tooltip/> <el-table-column label="区域名称" align="center" key="areaName" prop="areaName" show-overflow-tooltip/>
<el-table-column label="区域描述" align="center" key="areaDescribe" prop="areaDescribe" show-overflow-tooltip/> <el-table-column label="区域描述" align="center" key="description" prop="description" show-overflow-tooltip/>
<el-table-column label="联系人" align="center" key="director" prop="director" show-overflow-tooltip/> <el-table-column label="联系人" align="center" key="manager" prop="manager" show-overflow-tooltip/>
<el-table-column label="联系方式" align="center" key="contactTel" prop="contactTel" show-overflow-tooltip/> <el-table-column label="联系方式" align="center" key="contactTel" prop="contactTel" show-overflow-tooltip/>
<el-table-column label="创建时间" align="center" key="createTime" prop="createTime" show-overflow-tooltip/> <el-table-column label="创建时间" align="center" key="createTime" prop="createTime" show-overflow-tooltip/>
<el-table-column label="操作" align="center" width="180"> <el-table-column label="操作" align="center" width="180">
@ -163,9 +163,9 @@
maxlength="30" maxlength="30"
/> />
</el-form-item> </el-form-item>
<el-form-item label="区域描述" prop="areaDescribe"> <el-form-item label="区域描述" prop="description">
<el-input <el-input
v-model="form.areaDescribe" v-model="form.description"
type="text" clearable type="text" clearable
placeholder="请输入区域描述" placeholder="请输入区域描述"
maxlength="30" maxlength="30"
@ -188,9 +188,9 @@
}" clearable> }" clearable>
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="联系人" prop="director"> <el-form-item label="联系人" prop="manager">
<el-input <el-input
v-model="form.director" v-model="form.manager"
type="text" clearable type="text" clearable
placeholder="请输入负责人" placeholder="请输入负责人"
maxlength="30" maxlength="30"
@ -411,11 +411,11 @@
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
console.log(row) console.log(row)
this.$set(this.form,"areaDescribe",row.areaDescribe) this.$set(this.form,"description",row.description)
this.$set(this.form,"areaId",row.areaId) this.$set(this.form,"areaId",row.areaId)
this.$set(this.form,"areaName",row.areaName) this.$set(this.form,"areaName",row.areaName)
this.$set(this.form,"contactTel",row.contactTel) this.$set(this.form,"contactTel",row.contactTel)
this.$set(this.form,"director",row.director) this.$set(this.form,"manager",row.manager)
this.$set(this.form,"parentName",row.parentName) this.$set(this.form,"parentName",row.parentName)
this.$set(this.form,"parentId",row.parentId) this.$set(this.form,"parentId",row.parentId)

42
src/views/base/canteenStall/stall/index.vue
View File

@ -523,6 +523,48 @@ export default {
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.mealtimeList = [
{
"mealtimeType": "1",
"mealtimeName": "早餐",
"orderTimeList":["05:00:00","10:00:00"],
"startTime": "05:00:00",
"endTime": "10:00:00",
"ifEnable":"1"
},
{
"mealtimeType": "2",
"mealtimeName": "午餐",
"orderTimeList":["10:00:01","14:00:00"],
"startTime": "10:00:01",
"endTime": "14:00:00",
"ifEnable":"1"
},
{
"mealtimeType": "3",
"mealtimeName": "下午茶",
"orderTimeList":["14:00:01","18:00:00"],
"startTime": "14:00:01",
"endTime": "18:00:00",
"ifEnable":"1"
},
{
"mealtimeType": "4",
"mealtimeName": "晚餐",
"orderTimeList":["18:00:01","21:00:00"],
"startTime": "18:00:01",
"endTime": "21:00:00",
"ifEnable":"1"
},
{
"mealtimeType": "5",
"mealtimeName": "夜宵",
"orderTimeList":["21:00:01","23:59:59"],
"startTime": "21:00:01",
"endTime": "23:59:59",
"ifEnable":"1"
}
],//餐次列表
this.stallId="" this.stallId=""
this.reset(); this.reset();
this.activeName="baseSetting" this.activeName="baseSetting"

38
src/views/base/mobile/bannerList/index.vue
View File

@ -214,7 +214,7 @@ export default {
computed: { computed: {
//图片上传1张后，隐藏上传框 //图片上传1张后，隐藏上传框
uploadDisabled() { uploadDisabled() {
return this.checkUrlList.length > 0 return this.checkUrlList.length > 1
}, },
}, },
methods: { methods: {
@ -347,22 +347,26 @@ export default {
reader.onload = (e) => { reader.onload = (e) => {
const img = new Image(); const img = new Image();
img.onload = () => { img.onload = () => {
const { width, height } = img; const { width, height } = img;
// 设置你希望限制的图片尺寸 // 设置你希望限制的图片尺寸
const MAX_WIDTH = 750; const MAX_WIDTH = 750;
const MAX_HEIGHT = 520; const MAX_HEIGHT = 520;
console.log(width) console.log(width)
console.log(height) console.log(height)
if (width <= MAX_WIDTH && height <= MAX_HEIGHT) { if (width <= MAX_WIDTH && height <= MAX_HEIGHT) {
this.form[fileType] = file.raw this.form[fileType] = file.raw
this.$refs['form'].validateField(fileType) this.$refs['form'].validateField(fileType)
this.$message.success(`图片尺寸符合要求: ${width}x${height}`); this.$message.success(`图片尺寸符合要求: ${width}x${height}`);
} else { } else {
this.$message.error(`图片尺寸不能超过 ${MAX_WIDTH}x${MAX_HEIGHT}`); this.$message.error(`图片尺寸不能超过 ${MAX_WIDTH}x${MAX_HEIGHT}`);
// 清空当前上传的文件 this.checkUrlNameList=[]
this.form[fileType] = '' this.checkUrlList=[]
this.$refs['form'].validateField(fileType) this.fileList=[]
} // 清空当前上传的文件
this.form[fileType] = ''
this.$refs['form'].validateField(fileType)
}
}; };
img.src = e.target.result; img.src = e.target.result;
}; };

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

@ -489,8 +489,8 @@
</el-col> </el-col>
--> -->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="菜品简介" prop="remark"> <el-form-item label="菜品简介" prop="intro">
<el-input v-model="baseForm.remark" type="textarea" :rows="2" maxlength="50" placeholder="请输入内容" ></el-input> <el-input v-model="baseForm.intro" type="textarea" :rows="2" maxlength="50" placeholder="请输入内容" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">

5
src/views/dish/material/components/MaterialDialog.vue
View File

@ -288,8 +288,9 @@ export default {
materialName: [{ required: true, message: '请输入原料名称', trigger: 'blur' }], materialName: [{ required: true, message: '请输入原料名称', trigger: 'blur' }],
areaId: [{ required: true, message: '请选择所属区域', trigger: 'change' }], areaId: [{ required: true, message: '请选择所属区域', trigger: 'change' }],
materialTypeId: [{ required: true, message: '请选择原料类别', trigger: 'change' }], materialTypeId: [{ required: true, message: '请选择原料类别', trigger: 'change' }],
salesMode: [{ required: true, message: '请选择计量类型', trigger: 'change' }], salesMode: [{ required: true, message: '请选择计量类型', trigger: 'change' }],
// unitId: [{ required: true, message: '请选择原料单位', trigger: 'change' }] nutritionTypeId: [{ required: true, message: '请选择营养信息类别', trigger: 'change' }],
nutritionId: [{ required: true, message: '请选择营养信息', trigger: 'change' }],
}, },
nutritionFields: [ nutritionFields: [
{ label: '可食部分', prop: 'edible', unit: 'g/100g' }, { label: '可食部分', prop: 'edible', unit: 'g/100g' },

3
src/views/dish/material/index.vue
View File

@ -493,6 +493,7 @@ export default {
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
this.getList(); this.getList();
this.getTreeData(); this.getTreeData();
this.$refs.materialDialog.getTypeTreeData();
}) })
.catch(() => {}); .catch(() => {});
}, },
@ -511,12 +512,14 @@ export default {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getTreeData(); this.getTreeData();
this.$refs.materialDialog.getTypeTreeData();
}); });
} else { } else {
addMaterialTypeApi(this.form).then(response => { addMaterialTypeApi(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getTreeData(); this.getTreeData();
this.$refs.materialDialog.getTypeTreeData();
}); });
} }
} }

2
src/views/dish/menu/detail.vue
View File

@ -131,7 +131,7 @@
:props="{ :props="{
emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的 checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
value:'typeId',label:'dishesTypeName' value:'dishesTypeId',label:'dishesTypeName'
}" clearable @change="getDishesPage"> }" clearable @change="getDishesPage">
</el-cascader> </el-cascader>
<!-- <el-select v-model="queryDish.typeId" style="width: 100%;" clearable @change="getDishesPage"> <!-- <el-select v-model="queryDish.typeId" style="width: 100%;" clearable @change="getDishesPage">

2
src/views/dish/menu/edit.vue
View File

@ -131,7 +131,7 @@
:props="{ :props="{
emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的 checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
value:'typeId',label:'dishesTypeName' value:'dishesTypeId',label:'dishesTypeName'
}" clearable @change="getDishesPage"> }" clearable @change="getDishesPage">
</el-cascader> </el-cascader>
<!-- <el-select v-model="queryDish.typeId" style="width: 100%;" clearable @change="getDishesPage"> <!-- <el-select v-model="queryDish.typeId" style="width: 100%;" clearable @change="getDishesPage">

10
src/views/superstore/shopMaterial/components/MaterialDialog.vue
View File

@ -129,12 +129,12 @@
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="商品简介" prop="productRemark"> <el-form-item label="商品简介" prop="description">
<el-input <el-input
type="textarea" type="textarea"
:rows="3" :rows="3"
placeholder="请输入商品简介" placeholder="请输入商品简介"
v-model="form.productRemark"> v-model="form.description">
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -207,7 +207,7 @@ export default {
size:'',//商品规格 size:'',//商品规格
taxRate:'',//商品税率 taxRate:'',//商品税率
supplyCertificate: '', supplyCertificate: '',
productRemark:"",//简介 description:"",//简介
imgUrl:"",//图片 imgUrl:"",//图片
}, },
@ -340,7 +340,7 @@ export default {
} }
this.$set(this.form,"qualityNum",row.qualityNum) this.$set(this.form,"qualityNum",row.qualityNum)
this.$set(this.form,"supplyCertificate","") this.$set(this.form,"supplyCertificate","")
this.$set(this.form,"productRemark",row.productRemark) this.$set(this.form,"description",row.description)
this.$set(this.form,"imgUrl",row.imgUrl) this.$set(this.form,"imgUrl",row.imgUrl)
//图片反显 //图片反显
if(row.imgUrl){ if(row.imgUrl){
@ -392,7 +392,7 @@ export default {
qualityType:"1",//保质期类型 qualityType:"1",//保质期类型
qualityNum:"",//保质期 qualityNum:"",//保质期
supplyCertificate: '', supplyCertificate: '',
productRemark:"",//简介 description:"",//简介
imgUrl:"" imgUrl:""
}; };
}, },