diff --git a/src/api/dish/material.js b/src/api/dish/material.js index 7866aad9..e51e79e1 100644 --- a/src/api/dish/material.js +++ b/src/api/dish/material.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 原料类别树 export function systemMaterialTreeApi(data) { return request({ - url: '/smart-canteen/menu_material_category/getTree', + url: '/smart-canteen/cook_material_type/getTree', method: 'post', headers: { "merchant-id":"378915229716713472", @@ -14,7 +14,7 @@ export function systemMaterialTreeApi(data) { // 新增原料类别 export function addMaterialTypeApi(data) { return request({ - url: '/smart-canteen/menu_material_category/add', + url: '/smart-canteen/cook_material_type/add', method: 'post', headers: { "merchant-id":"378915229716713472", @@ -25,7 +25,7 @@ export function addMaterialTypeApi(data) { //修改原料类别 export function updateMaterialTypeApi(data) { return request({ - url: '/smart-canteen/menu_material_category/edit', + url: '/smart-canteen/cook_material_type/edit', method: 'post', headers: { "merchant-id":"378915229716713472", @@ -36,19 +36,18 @@ export function updateMaterialTypeApi(data) { //删除原料类别 export function removeMaterialTypeApi(data) { return request({ - url: '/smart-canteen/menu_material_category/del', + url: '/smart-canteen/cook_material_type/del/'+data.id, method: 'post', headers: { "merchant-id":"378915229716713472", - }, - data: data + } }) } // 查询原料列表 export function getMaterialListApi(data) { return request({ - url: '/smart-canteen/menu_material/list', + url: '/smart-canteen/cook_material/list', method: 'get', headers: { "merchant-id":"378915229716713472", @@ -60,7 +59,7 @@ export function getMaterialListApi(data) { // 新增原料 export function addMaterialApi(data) { return request({ - url: '/smart-canteen/menu_material/addMessage', + url: '/smart-canteen/cook_material/add', method: 'post', headers: { "merchant-id":"378915229716713472", @@ -72,7 +71,7 @@ export function addMaterialApi(data) { // 编辑原料 export function updateMaterialApi(data) { return request({ - url: '/smart-canteen/menu_material/edit', + url: '/smart-canteen/cook_material/edit', method: 'post', headers: { "merchant-id":"378915229716713472", @@ -84,14 +83,18 @@ export function updateMaterialApi(data) { // 删除原料 export function removeMaterialApi(data) { return request({ - url: '/smart-canteen/menu_material/del', + url: '/smart-canteen/cook_material/del/'+data.materialId, method: 'post', headers: { "merchant-id":"378915229716713472", - }, - data: data + } }) } + + + + + // 批量删除原料 export function batchRemoveMaterialApi(data) { return request({ @@ -118,12 +121,12 @@ export function batchUpdateMaterialApi(data) { //{current: 1, size: -1, ifListUse: 1, areaId: '421488254718578688'} export function getDrpUnitListApi(data) { return request({ - url: '/smart-canteen/menu_material/getDrpUnit', - method: 'post', + url: '/smart-canteen/supply_product_unit/list', + method: 'get', headers: { "merchant-id":"378915229716713472", }, - data: data + params: data }) } diff --git a/src/api/dish/nutritionInfo.js b/src/api/dish/nutritionInfo.js index bc7aa936..5fa4d2df 100644 --- a/src/api/dish/nutritionInfo.js +++ b/src/api/dish/nutritionInfo.js @@ -69,8 +69,7 @@ export function delNutrition(data) { method: 'post' }) } - - + // 查询详细数据 export function getNutritionInfo(data) { return request({ @@ -78,24 +77,7 @@ export function getNutritionInfo(data) { method: 'get', }) } - - - - - - - - - - - - - - - - - - + // 获取所有营养信息 export function nutritionAllListApi(data) { return request({ diff --git a/src/views/dish/material/components/MaterialDialog.vue b/src/views/dish/material/components/MaterialDialog.vue index b2093a36..5a38d47a 100644 --- a/src/views/dish/material/components/MaterialDialog.vue +++ b/src/views/dish/material/components/MaterialDialog.vue @@ -13,6 +13,16 @@ + + + + + - - + + - --> + @@ -89,14 +99,14 @@ --> - + - - + + - -

营养信息

@@ -201,28 +166,12 @@ - - + - - - +
@@ -253,13 +202,10 @@ export default { activeTab: 'basic', treeAreaOptions:[],//区域树 treeTypeOptions:[],//类型树 - unitOptions:[],//单位下拉 - + unitOptions:[],//单位下拉 nutritionTypeTreeData:[],//类别接口返回数据（未处理） cascaderOptions: [], // 级联选择器的选项（已处理） - nutritionOptions:[], - bigType:"", - littleType:"", + nutritionOptions:[], menuMaterialNutritionDTO:{ processingTime: '0',//加工时间（min） edible: '0',//可食部分(g/100g) @@ -292,29 +238,16 @@ export default { iodine: '0' }, form: { + materialCode: '',//原料名称 materialName: '',//原料名称 areaId: null,//所属区域 - categoryId: null,//原料类别 - materialType: 1, - salesMode: '2',//计量类型 + materialTypeId: null,//原料类别 + salesMode: '1',//计量类型 unitId: '',//原料单位 unitPrice: '',//原料进价(元) barCode: '',//条码 - nutritionType:null,//营养信息类型 - categoryId:null,//营养信息 - shelfLifeType:"1",//保质期类型 - shelfLifeDays:"",//保质期 - purPriceCeiling:'',//采购上限价格 - size:'',//原料规格 - taxRate:'',//原料税率 - // safeConfigDTO:{ - // ifNeedDetect: '2',//是否检测（1是2否） - // detectInstitution:'1',//检测机构(1自检,2供应商检,3自检或供应商检,4自检且供应商检) - // detectItem:"1",// - // }, - // qualificationCert: '', - // firstProcessList: [''], - // cutProcessList: [''], + nutritionTypeId:null,//营养信息类型 + nutritionId:null,//营养信息 //营养信息 menuMaterialNutritionDTO: {} }, @@ -354,7 +287,7 @@ export default { rules: { materialName: [{ required: true, message: '请输入原料名称', trigger: 'blur' }], areaId: [{ required: true, message: '请选择所属区域', trigger: 'change' }], - categoryId: [{ required: true, message: '请选择原料类别', trigger: 'change' }], + materialTypeId: [{ required: true, message: '请选择原料类别', trigger: 'change' }], salesMode: [{ required: true, message: '请选择计量类型', trigger: 'change' }], // unitId: [{ required: true, message: '请选择原料单位', trigger: 'change' }] }, @@ -399,29 +332,25 @@ export default { this.getAreaTreeData();//获取区域树 this.getTypeTreeData();//获取原料类别树 this.getDrpUnitList();//获取单位类型下拉 - this.getNutritionType()//获取营养信息类别树 + this.getNutritionTypeList()//获取营养信息类别树 }, methods: { //区域树 getAreaTreeData() { systemAreaTreeApi({}).then((response) => { - this.treeAreaOptions = response.data; - console.log(this.treeAreaOptions) + this.treeAreaOptions = response.data; }); }, //基础设置-选择区域 - handleAreaChange(val){ - console.log(this.form) - this.form.categoryId=null - this.getTypeTreeData() - this.getDrpUnitList() + handleAreaChange(val){ + // this.form.categoryId=null + // this.getTypeTreeData() + // this.getDrpUnitList() }, //类型树 getTypeTreeData() { let param = { - categoryType:1, - ifAdd: 1, - areaId:this.form.areaId + // areaId:this.form.areaId } systemMaterialTreeApi(param).then((response) => { this.treeTypeOptions = response.data; @@ -429,91 +358,63 @@ export default { }, //单位类型拉下选 getDrpUnitList() { - let param = { - weighType:this.form.salesMode, - // areaId: this.form.areaId||"" - // ifListUse: 1, - // current: 1, - // size: -1 + let param = { + "weighType":this.form.salesMode, + "pageNum": 1, + "pageSize": 100 } this.form.unitId=null getDrpUnitListApi(param).then((response) => { - this.unitOptions = response.data; - // if(response.data.records.length>0){ - // response.data.records.forEach(item => { - // if(item.weighType==this.form.salesMode){ - // this.unitOptions.push(item) - // } - // }); - // } + this.unitOptions = response.rows; }); }, - //获取营养类别 - getNutritionType() { + //获取营养信息类别 + getNutritionTypeList() { nutritionTypeListApi().then(response => { - this.nutritionTypeTreeData = response.data; - this.cascaderOptions = this.cascaderOptionsMethod(); - console.log(this.cascaderOptions) - // this.updateCascaderOptions(); // 在获取数据后更新级联选择器选项 + this.typeTreeData = response.data; + this.cascaderOptions = this.cascaderOptionsMethod(); }).catch(error => { console.error("Failed to fetch food types:", error); }); }, //生成级联选择器的选项数据 cascaderOptionsMethod() { - if (this.nutritionTypeTreeData.length==0) { + if (this.typeTreeData.length==0) { return []; } - return this.nutritionTypeTreeData.map(item => ({ - value: item.id, - label: item.bigType, + return this.typeTreeData.map(item => ({ + id: item.id, + label: item.name, parentId:0, - level:1, + level:0, children: item.littleTypeList.map(subItem => ({ - value: subItem.id,//父子类别value一致时选中识别不出来，加个#号区分 - label: subItem.bigType, - bigType: item.bigType, + id: subItem.id,//父子类别value一致时选中识别不出来，加个#号区分 + label: subItem.name, + bigType: item.name, parentId:item.id, - level:2 + level:1 })) })); }, - // 获取父节点的类别名称 - getParentCategoryName(Id) { - const findNode = (nodes) => { - for (let node of nodes) { - if (node.value == Id) { - return node; - } - if (node.children) { - const result = findNode(node.children); - if (result) return result; - } - } - return ""; - }; - return findNode(this.cascaderOptions); - }, //选中营养信息类别 handleNutritionChange(value) { console.log("选中营养信息类别",value) - // this.nutritionAllList() - + this.nutritionAllList(value) }, //获取营养信息下拉 - nutritionAllList(){ + nutritionAllList(value){ let param = { - + categoryId:value } nutritionAllListApi(param).then((response) => { - this.$set(this.form,"categoryId",null) + this.$set(this.form,"nutritionId",null) this.nutritionOptions = response.data; }); }, //选中营养信息 chosenNutrition(){ - console.log("选中营养信息",this.form.categoryId) - getNutritionInfo({categoryId: this.form.categoryId}).then((response) => { + console.log("选中营养信息",this.form.nutritionId) + getNutritionInfo({nutritionId: this.form.nutritionId}).then((response) => { if(response.data){ this.form.menuMaterialNutritionDTO = response.data this.formTable = [this.form.menuMaterialNutritionDTO] @@ -522,10 +423,7 @@ export default { this.formTable = [this.menuMaterialNutritionDTO] } }); - }, - - - + }, handleNumericInput(field, event) { // const value = event.target.value; const value = event; @@ -550,8 +448,7 @@ export default { } else { this.form[field] = newValue; } - }, - + }, formatNumericValue(field) { let value; if (field.includes('.')) { @@ -593,50 +490,27 @@ export default { setFormData(row){ console.log(row) + // this.getTypeTreeData() + // this.getDrpUnitList() this.$set(this.form,"areaId",row.areaId) - this.getTypeTreeData() - this.getDrpUnitList() - this.$set(this.form,"id",row.id) this.$set(this.form,"areaName",row.areaName) - this.$set(this.form,"categoryId",row.categoryId) - this.$set(this.form,"categoryName",row.categoryName) + 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,"materialType",row.materialType) + 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,"unitPrice",Number((row.unitPrice/100).toFixed(2))) - this.$set(this.form,"barCode",row.barCode) - - if(row.shelfLifeType){ - this.$set(this.form,"shelfLifeType",row.shelfLifeType+"") - }else{ - this.$set(this.form,"shelfLifeType","1") - } - this.$set(this.form,"shelfLifeDays",row.shelfLifeDays) - this.$set(this.form,"purPriceCeiling",Number((row.purPriceCeiling/100).toFixed(2))) - this.$set(this.form,"size",row.size) - this.$set(this.form,"taxRate",row.taxRate) - - // this.$set(this.form.safeConfigDTO,"ifNeedDetect",row.safeConfigDTO.ifNeedDetect+'') - // this.$set(this.form.safeConfigDTO,"detectInstitution",row.safeConfigDTO.detectInstitution+'') - // this.$set(this.form.safeConfigDTO,"detectItem",row.safeConfigDTO.detectItem+'') - - // this.$set(this.form,"qualificationCert","") - // this.$set(this.form,"firstProcessList",row.firstProcessList) - // this.$set(this.form,"cutProcessList",row.cutProcessList) - - if(row.nutritionType){ - this.$set(this.form,"nutritionType",Number(row.nutritionType)) - let obj = this.getParentCategoryName(row.nutritionType) - this.bigType = obj.bigType - this.littleType = obj.label - this.nutritionAllList() + this.$set(this.form,"barCode",row.barCode) + if(row.nutritionTypeId){ + this.$set(this.form,"nutritionTypeId",Number(row.nutritionTypeId)) + this.nutritionAllList(this.form.nutritionTypeId) setTimeout(()=>{ - this.$set(this.form,"categoryId",row.categoryId) - if(this.form.categoryId){ - getNutritionInfo({categoryId: this.form.categoryId}).then((response) => { + this.$set(this.form,"nutritionId",row.nutritionId) + if(this.form.nutritionId){ + getNutritionInfo({nutritionId: this.form.nutritionId}).then((response) => { if(response.data){ this.form.menuMaterialNutritionDTO = response.data this.formTable = [this.form.menuMaterialNutritionDTO] @@ -649,63 +523,44 @@ export default { this.form.menuMaterialNutritionDTO = this.menuMaterialNutritionDTO this.formTable = [this.menuMaterialNutritionDTO] } - },800) + },600) }else{ 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.unitPrice = Number(this.form.unitPrice)*100 - this.form.purPriceCeiling = Number(this.form.purPriceCeiling)*100 + this.form.unitPrice = Number(this.form.unitPrice)*100 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,//所属区域 - categoryId: null,//原料类别 - materialType: 1, - salesMode: '2',//计量类型 + materialTypeId: null,//原料类别 + salesMode: '1',//计量类型 unitId: '',//原料单位 unitPrice: '',//原料进价(元) barCode: '',//条码 nutritionType:null,//营养信息类型 - categoryId:null,//营养信息 - shelfLifeType:"1",//保质期类型 - shelfLifeDays:"",//保质期 - purPriceCeiling:'',//采购上限价格 - size:'',//原料规格 - taxRate:'',//原料税率 - // safeConfigDTO:{ - // ifNeedDetect: '2',//是否检测（1是2否） - // detectInstitution:'1',//检测机构(1自检,2供应商检,3自检或供应商检,4自检且供应商检) - // detectItem:"1",// - // }, - // qualificationCert: '', - // firstProcessList: [''], - // cutProcessList: [''], + nutritionId:null,//营养信息 //营养信息 menuMaterialNutritionDTO: this.menuMaterialNutritionDTO }; diff --git a/src/views/dish/material/index.vue b/src/views/dish/material/index.vue index ba290272..196a107f 100644 --- a/src/views/dish/material/index.vue +++ b/src/views/dish/material/index.vue @@ -42,7 +42,7 @@ @@ -60,7 +60,7 @@ size="mini" icon="el-icon-delete" style="color: #f56c6c" - v-if="data.parentId != '-1'" + v-if="data.parentId != '0'" @click.stop="() => removeTreeNode(data)" > @@ -98,15 +98,6 @@ @keyup.enter.native="handleQuery" /> - 新增 - + +
确 定 @@ -311,18 +275,19 @@
+ - - + + - +
确 定 @@ -391,9 +356,7 @@ export default { pageSize: 10, areaId:null, materialName:"", - barCode:"", - materialCode:"", - materialType:1, //类型(1原料2商品) + materialCode:"", categoryIdList:[] }, // 总条数 @@ -407,14 +370,13 @@ export default { title: "", // 表单参数 form: { - categoryName: "", + materialTypeName: "", parentId: "", - categoryType: "", - superAreaName: "", + goodsType: "", }, // 表单校验 rules: { - categoryName: [ + materialTypeName: [ { required: true, message: "类别名称不能为空", @@ -427,8 +389,8 @@ export default { batchIds:[], openEdit:false, editForm:{ - categoryNames:"", - categroyId:null + materialTypeName:"", + materialTypeId:null }, editRules: { categroyId: [ @@ -471,8 +433,7 @@ export default { systemMaterialTreeApi({categoryType:1}).then((response) => { this.treeOptions = response.data; this.addLevel(this.treeOptions) - console.log("this.treeOptions",this.treeOptions) - this.queryParams.materialType=this.treeOptions[0].categoryType; + console.log("this.treeOptions",this.treeOptions) if(this.treeOptions && this.treeOptions.length > 0){ this.getList(); } else { @@ -502,7 +463,7 @@ export default { this.form={} this.resetForm("form"); this.$set(this.form,"parentId",data.id) - this.$set(this.form,"categoryType",data.categoryType) + this.$set(this.form,"goodsType",data.categoryType) this.open = true; this.title = "新增"; }, @@ -513,37 +474,20 @@ export default { this.resetForm("form"); this.form = { ...data, - // categoryId:data.id, - // superAreaName: data.parentId === "-1" ? "" : this.getParentCategoryName(data.parentId) }; - console.log(this.form) - console.log(this.treeOptions) + this.$set(this.form,"materialTypeId",data.id) + this.$set(this.form,"materialTypeName",data.categoryName) + this.$set(this.form,"goodsType",data.categoryType) this.open = true; this.title = "修改"; }, - // 获取父节点的类别名称 - getParentCategoryName(parentId) { - const findNode = (nodes) => { - for (let node of nodes) { - if (node.id === parentId) { - return node.categoryName; - } - if (node.children) { - const result = findNode(node.children); - if (result) return result; - } - } - return ""; - }; - return findNode(this.treeOptions); - }, /* 树节点删除 */ removeTreeNode(data) { console.log(data, "删除时的数据源--"); this.$modal .confirm("是否确认删除数据项？") .then(function () { - return removeMaterialTypeApi({"ids":[data.id]}); + return removeMaterialTypeApi({"id":data.id}); }) .then(() => { this.$modal.msgSuccess("删除成功"); @@ -562,14 +506,13 @@ export default { handleSubmit() { this.$refs.form.validate(valid => { if (valid) { - if (this.form.id != undefined) { + if (this.form.materialTypeId != undefined) { updateMaterialTypeApi(this.form).then(response => { this.$modal.msgSuccess("修改成功"); this.open = false; this.getTreeData(); }); - } else { - console.log(this.form) + } else { addMaterialTypeApi(this.form).then(response => { this.$modal.msgSuccess("新增成功"); this.open = false; @@ -602,10 +545,8 @@ export default { "pageNum": this.queryParams.pageNum, "areaId": this.queryParams.areaId, "materialName": this.queryParams.materialName, - "barCode": this.queryParams.barCode, - "materialCode": this.queryParams.materialCode, - "materialType": this.queryParams.materialType,//类型(1原料2商品) - "categoryIdList": this.$refs.typeTree.getCheckedKeys(), + "materialCode": this.queryParams.materialCode, + "materialTypeIds": this.$refs.typeTree.getCheckedKeys(), } getMaterialListApi(params).then((response) => { this.tableList = response.rows; @@ -658,7 +599,7 @@ export default { this.$modal .confirm("是否确认删除数据项？") .then(function () { - return removeMaterialApi({"ids":[row.id]}); + return removeMaterialApi({"materialId":row.materialId}); }) .then(() => { this.$modal.msgSuccess("删除成功");