diff --git a/src/views/canteen/dish/material/components/MaterialDialog.vue b/src/views/canteen/dish/material/components/MaterialDialog.vue index cb5df339..19225513 100644 --- a/src/views/canteen/dish/material/components/MaterialDialog.vue +++ b/src/views/canteen/dish/material/components/MaterialDialog.vue @@ -7,7 +7,7 @@ :close-on-click-modal="false" :destroy-on-close="true" @close="handleClose" - > + >
@@ -37,7 +37,7 @@ - + - + - + - + - + - +

营养信息

- + @@ -135,14 +135,14 @@ - + - - + + - + @@ -155,7 +155,7 @@ - + @@ -164,16 +164,16 @@ - + - + - + -
+
确 定 取 消 @@ -202,22 +202,22 @@ export default { activeTab: 'basic', treeAreaOptions:[],//区域树 treeTypeOptions:[],//类型树 - unitOptions:[],//单位下拉 + unitOptions:[],//单位下拉 nutritionTypeTreeData:[],//类别接口返回数据（未处理） cascaderOptions: [], // 级联选择器的选项（已处理） - nutritionOptions:[], + nutritionOptions:[], menuMaterialNutritionDTO:{ processingTime: '0',//加工时间（min） edible: '0',//可食部分(g/100g) water: '0',//水分(g/100g) calories: '0',//热量(千卡/100g) - protein: '0',//蛋白质(g/100g) + protein: '0',//蛋白质(g/100g) fat: '0',//脂肪(g/100g) carbohydrate: '0',//碳水化合物(g/100g) dietaryFiber: '0',//膳食纤维(g/100g) cholesterol: '0',//胆固醇(mg/100g) ash: '0',//灰分(g/100g) - vitaminA: '0',//维生素a(μg/100g) + vitaminA: '0',//维生素a(μg/100g) carotene: '0',//胡萝卜素(μg/100g) retinol: '0',//视黄醇(μg/100g) thiamine: '0',//硫胺素(mg/100g) @@ -227,13 +227,13 @@ export default { vitaminE: '0',//维生素e(g/100g) calcium: '0',//钙(mg/100g) phosphorus: '0',//磷(mg/100g) - kalium: '0',//钾(mg/100g) + kalium: '0',//钾(mg/100g) sodium: '0',//钠(mg/100g) magnesium: '0',//镁(mg/100g) iron: '0',//铁(mg/100g) zinc: '0',//锌(mg/100g) selenium: '0',//硒(μg/100g) - cuprum: '0',//铜(mg/100g) + cuprum: '0',//铜(mg/100g) manganese: '0',//锰(mg/100g) iodine: '0' }, @@ -241,29 +241,29 @@ export default { materialCode: '',//原料名称 materialName: '',//原料名称 areaId: null,//所属区域 - materialTypeId: null,//原料类别 - salesMode: '2',//计量类型 + materialTypeId: null,//原料类别 + salesMode: '1',//计量类型 unitId: '',//原料单位 unitPrice: '',//原料进价(元) barCode: '',//条码 nutritionTypeId:null,//营养信息类型 - nutritionId:null,//营养信息 + nutritionId:null,//营养信息 //营养信息 menuMaterialNutritionDTO: {} }, formTable:[ - { + { processingTime: '0',//加工时间（min） edible: '0',//可食部分(g/100g) water: '0',//水分(g/100g) calories: '0',//热量(千卡/100g) - protein: '0',//蛋白质(g/100g) + protein: '0',//蛋白质(g/100g) fat: '0',//脂肪(g/100g) carbohydrate: '0',//碳水化合物(g/100g) dietaryFiber: '0',//膳食纤维(g/100g) cholesterol: '0',//胆固醇(mg/100g) ash: '0',//灰分(g/100g) - vitaminA: '0',//维生素a(μg/100g) + vitaminA: '0',//维生素a(μg/100g) carotene: '0',//胡萝卜素(μg/100g) retinol: '0',//视黄醇(μg/100g) thiamine: '0',//硫胺素(mg/100g) @@ -273,13 +273,13 @@ export default { vitaminE: '0',//维生素e(g/100g) calcium: '0',//钙(mg/100g) phosphorus: '0',//磷(mg/100g) - kalium: '0',//钾(mg/100g) + kalium: '0',//钾(mg/100g) sodium: '0',//钠(mg/100g) magnesium: '0',//镁(mg/100g) iron: '0',//铁(mg/100g) zinc: '0',//锌(mg/100g) selenium: '0',//硒(μg/100g) - cuprum: '0',//铜(mg/100g) + cuprum: '0',//铜(mg/100g) manganese: '0',//锰(mg/100g) iodine: '0' } @@ -289,7 +289,7 @@ export default { materialName: [{ required: true, message: '请输入原料名称', trigger: 'blur' }], areaId: [{ required: true, message: '请选择所属区域', trigger: 'change' }], materialTypeId: [{ required: true, message: '请选择原料类别', trigger: 'change' }], - salesMode: [{ required: true, message: '请选择计量类型', trigger: 'change' }], + salesMode: [{ required: true, message: '请选择计量类型', trigger: 'change' }], nutritionTypeId: [{ required: true, message: '请选择营养信息类别', trigger: 'change' }], nutritionId: [{ required: true, message: '请选择营养信息', trigger: 'change' }], }, @@ -333,18 +333,18 @@ export default { created() { this.getAreaTreeData();//获取区域树 this.getTypeTreeData();//获取原料类别树 - this.getDrpUnitList();//获取单位类型下拉 + this.getDrpUnitList();//获取单位类型下拉 this.getNutritionTypeList()//获取营养信息类别树 }, methods: { //区域树 getAreaTreeData() { systemAreaTreeApi({}).then((response) => { - this.treeAreaOptions = response.data; + this.treeAreaOptions = response.data; }); }, //基础设置-选择区域 - handleAreaChange(val){ + handleAreaChange(val){ // this.form.categoryId=null // this.getTypeTreeData() // this.getDrpUnitList() @@ -361,25 +361,25 @@ export default { }, //单位类型拉下选 getDrpUnitList() { - let param = { + let param = { "weighType":this.form.salesMode, - "pageNum": 1, + "pageNum": 1, "pageSize": 100 } this.form.unitId=null getDrpUnitListApi(param).then((response) => { - this.unitOptions = response.rows; + this.unitOptions = response.rows; }); - }, - //获取营养信息类别 + }, + //获取营养信息类别 getNutritionTypeList() { nutritionTypeListApi().then(response => { this.typeTreeData = response.data; - this.cascaderOptions = this.cascaderOptionsMethod(); + this.cascaderOptions = this.cascaderOptionsMethod(); }).catch(error => { console.error("Failed to fetch food types:", error); }); - }, + }, //生成级联选择器的选项数据 cascaderOptionsMethod() { if (this.typeTreeData.length==0) { @@ -401,22 +401,27 @@ export default { }, //选中营养信息类别 handleNutritionChange(value) { - console.log("选中营养信息类别",value) - this.nutritionAllList(value) - }, + console.log("选中营养信息类别",value) + this.nutritionAllList(value) + }, //获取营养信息下拉 nutritionAllList(value){ let param = { categoryId:value } - nutritionAllListApi(param).then((response) => { + nutritionAllListApi(param).then((response) => { this.$set(this.form,"nutritionId",null) this.nutritionOptions = response.data; }); }, //选中营养信息 chosenNutrition(){ - console.log("选中营养信息",this.form.nutritionId) + console.log("选中营养信息",this.form.nutritionId) + if (!this.form.nutritionId) { + // 清空选择时重置为默认值 + this.resetNutritionTable(); + return; + } getNutritionInfo({nutritionId: this.form.nutritionId}).then((response) => { if(response.data){ this.form.menuMaterialNutritionDTO = response.data @@ -424,12 +429,12 @@ export default { }else{ this.form.menuMaterialNutritionDTO = this.menuMaterialNutritionDTO this.formTable = [this.menuMaterialNutritionDTO] - } + } }); - }, + }, handleNumericInput(field, event) { - // const value = event.target.value; - const value = event; + // const value = event.target.value; + const value = event; // 只允许输入数字和小数点 let newValue = value.replace(/[^\d.]/g, ''); @@ -448,14 +453,14 @@ export default { if (field.includes('.')) { const [obj, prop] = field.split('.'); this.form[obj][prop] = newValue; - } else { + } else { this.form[field] = newValue; } - }, + }, formatNumericValue(field) { let value; if (field.includes('.')) { - const [obj, prop] = field.split('.'); + const [obj, prop] = field.split('.'); value = this.form[obj][prop]; } else { value = this.form[field]; @@ -494,22 +499,22 @@ export default { setFormData(row){ console.log(row) // this.getTypeTreeData() - // this.getDrpUnitList() + // this.getDrpUnitList() this.$set(this.form,"areaId",row.areaId) this.$set(this.form,"areaName",row.areaName) this.$set(this.form,"materialTypeId",row.materialTypeId) this.$set(this.form,"materialTypeName",row.materialTypeName) this.$set(this.form,"materialCode",row.materialCode) this.$set(this.form,"materialId",row.materialId) - this.$set(this.form,"materialName",row.materialName) + this.$set(this.form,"materialName",row.materialName) this.$set(this.form,"salesMode",row.salesMode+'') this.getDrpUnitList() this.$set(this.form,"unitId",row.unitId) - this.$set(this.form,"salePrice",Number((row.salePrice/100).toFixed(2))) - this.$set(this.form,"unitPrice",Number((row.unitPrice/100).toFixed(2))) - this.$set(this.form,"barCode",row.barCode) + this.$set(this.form,"salePrice",Number((row.salePrice/100).toFixed(2))) + this.$set(this.form,"unitPrice",Number((row.unitPrice/100).toFixed(2))) + this.$set(this.form,"barCode",row.barCode) if(row.nutritionTypeId){ - this.$set(this.form,"nutritionTypeId",Number(row.nutritionTypeId)) + this.$set(this.form,"nutritionTypeId",Number(row.nutritionTypeId)) this.nutritionAllList(this.form.nutritionTypeId) setTimeout(()=>{ this.$set(this.form,"nutritionId",row.nutritionId) @@ -521,7 +526,7 @@ export default { }else{ this.form.menuMaterialNutritionDTO = this.menuMaterialNutritionDTO this.formTable = [this.menuMaterialNutritionDTO] - } + } }); }else{ this.form.menuMaterialNutritionDTO = this.menuMaterialNutritionDTO @@ -532,35 +537,35 @@ export default { this.$set(this.form,"nutritionType",null) this.form.menuMaterialNutritionDTO = this.menuMaterialNutritionDTO this.formTable = [this.menuMaterialNutritionDTO] - } - }, + } + }, submitForm() { this.$refs.form.validate(valid => { if (valid) { this.form.salePrice = Number(this.form.salePrice); - this.form.unitPrice = Number(this.form.unitPrice); + this.form.unitPrice = Number(this.form.unitPrice); this.$emit('submit', this.form); } }); - }, + }, handleClose() { this.$emit('update:visible', false); this.$nextTick(() => { this.reset(); }); - }, + }, cancel() { this.$emit('update:visible', false); this.$nextTick(() => { this.reset(); }); - }, + }, reset() { this.form = { materialName: '',//原料名称 areaId: null,//所属区域 - materialTypeId: null,//原料类别 - salesMode: '2',//计量类型 + materialTypeId: null,//原料类别 + salesMode: '1',//计量类型 unitId: '',//原料单位 unitPrice: '',//原料进价(元) barCode: '',//条码