diff --git a/src/router/index.js b/src/router/index.js index 6d2edd98..51995136 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -142,6 +142,26 @@ export const constantRoutes = [ }, ] }, + {//供应链-生产计划新增详情 + path: '/foodManage/purchaseManage', + component: Layout, + hidden: true, + redirect: 'noredirect', + children: [ + { + path: 'productionPlanDetail', + component: () => import('@/views/foodManage/purchaseManage/productionPlan/detail'), + name: 'ProductionPlanDetail', + meta: { title: '生产计划详情', icon: '' } + }, + { + path: 'productionPlanEdit', + component: () => import('@/views/foodManage/purchaseManage/productionPlan/edit'), + name: 'ProductionPlanEdit', + meta: { title: '生产计划新增/编辑', icon: '' } + }, + ] + }, {//供应链-采购计划新增详情 path: '/foodManage/purchaseManage', component: Layout, @@ -152,13 +172,13 @@ export const constantRoutes = [ path: 'planDetail', component: () => import('@/views/foodManage/purchaseManage/purchasePlan/detail'), name: 'PlanDetail', - meta: { title: '计划详情', icon: '' } + meta: { title: '采购计划详情', icon: '' } }, { path: 'planEdit', component: () => import('@/views/foodManage/purchaseManage/purchasePlan/edit'), name: 'PlanEdit', - meta: { title: '计划新增/编辑', icon: '' } + meta: { title: '采购计划新增/编辑', icon: '' } }, ] }, @@ -291,6 +311,26 @@ export const constantRoutes = [ }, ] }, + {//供应链-库存管理-货品调拨 + path: '/foodManage/stockManage', + component: Layout, + hidden: true, + redirect: 'noredirect', + children: [ + { + path: 'goodsTransferDetail', + component: () => import('@/views/foodManage/stockManage/goodsTransfer/detail'), + name: 'GoodsTransferDetail', + meta: { title: '货品调拨详情', icon: '' } + }, + { + path: 'goodsTransferEdit', + component: () => import('@/views/foodManage/stockManage/goodsTransfer/edit'), + name: 'GoodsTransferEdit', + meta: { title: '货品调拨新增/编辑', icon: '' } + }, + ] + }, {//供应链-领料管理-领料单新增详情 path: '/foodManage/pickManage', component: Layout, diff --git a/src/views/canteen/dish/menu/detail.vue b/src/views/canteen/dish/menu/detail.vue index fd564166..4307b0ca 100644 --- a/src/views/canteen/dish/menu/detail.vue +++ b/src/views/canteen/dish/menu/detail.vue @@ -1409,11 +1409,11 @@ export default { "recipeId": this.dialogQueryParams.recipeId } getMenuRecipeTemplateDetailApi(param).then((response) => { - if(response.length>0){ - for (let i = 0; i < response.length; i++) { + if(response.data.length>0){ + for (let i = 0;i < response.data.length;i++) { this.dialogDetailList.forEach(item=>{ - if(item.mealtimeType==response[i].mealtimeType){ - item.dishesList = response[i].dishesList; + if(item.mealtimeType==response.data[i].mealtimeType){ + item.dishesList = response.data[i].dishesList; } }) } diff --git a/src/views/canteen/dish/menu/edit.vue b/src/views/canteen/dish/menu/edit.vue index dbc3970a..061898a2 100644 --- a/src/views/canteen/dish/menu/edit.vue +++ b/src/views/canteen/dish/menu/edit.vue @@ -1628,7 +1628,8 @@ export default { } getMenuRecipeTemplateDetailApi(param).then((response) => { if(response.data.length>0){ - for (let i = 0; i < response.data.length; i++) { + for (let i = 0;i < response.data.length;i++) { + console.log(this.dialogDetailList) this.dialogDetailList.forEach(item=>{ if(item.mealtimeType==response.data[i].mealtimeType){ item.dishesList = response.data[i].dishesList; diff --git a/src/views/foodManage/stockManage/goodsTransfer/detail.vue b/src/views/foodManage/stockManage/goodsTransfer/detail.vue new file mode 100644 index 00000000..eef83b38 --- /dev/null +++ b/src/views/foodManage/stockManage/goodsTransfer/detail.vue @@ -0,0 +1,293 @@ + + + + \ No newline at end of file diff --git a/src/views/foodManage/stockManage/goodsTransfer/edit.vue b/src/views/foodManage/stockManage/goodsTransfer/edit.vue new file mode 100644 index 00000000..280d25c7 --- /dev/null +++ b/src/views/foodManage/stockManage/goodsTransfer/edit.vue @@ -0,0 +1,683 @@ + + + + \ No newline at end of file diff --git a/src/views/foodManage/stockManage/goodsTransfer/index.vue b/src/views/foodManage/stockManage/goodsTransfer/index.vue new file mode 100644 index 00000000..953cc882 --- /dev/null +++ b/src/views/foodManage/stockManage/goodsTransfer/index.vue @@ -0,0 +1,345 @@ + + + diff --git a/src/views/foodManage/stockManage/inventoryCount/edit.vue b/src/views/foodManage/stockManage/inventoryCount/edit.vue index 686350ca..ff72f9c2 100644 --- a/src/views/foodManage/stockManage/inventoryCount/edit.vue +++ b/src/views/foodManage/stockManage/inventoryCount/edit.vue @@ -24,7 +24,7 @@ > - + @@ -55,7 +55,7 @@
添加货品 - 导入库存盘点 + 删除
@@ -70,37 +70,43 @@ + - + - - - - - - - - + + + + + + + - + - + - - - + + + @@ -263,8 +263,7 @@