diff --git a/src/api/mes/feedingrecord/index.ts b/src/api/mes/feedingrecord/index.ts
index b6a2d6a5..7fc8602f 100644
--- a/src/api/mes/feedingrecord/index.ts
+++ b/src/api/mes/feedingrecord/index.ts
@@ -1,57 +1,61 @@
-import request from '@/config/axios'
-
-// 投料记录 VO
-export interface FeedingRecordVO {
- id: number // id
- feedingRecordCode: string // 单号
- productId: number // 产品id
- planId: number // 计划id
- itemId: number // 原料id
- feedingPipeline: string // 制浆线
- feedingType: string // 投料类型
- weight: number // 重量
- feedingTime: Date // 投料时间
- userId: number // 记录人
- remark: string // 备注
- recordStatus: string // 状态
-}
-
-// 投料记录 API
-export const FeedingRecordApi = {
- // 查询投料记录分页
- getFeedingRecordPage: async (params: any) => {
- return await request.get({ url: `/mes/feeding-record/page`, params })
- },
-
- // 查询投料记录详情
- getFeedingRecord: async (id: number) => {
- return await request.get({ url: `/mes/feeding-record/get?id=` + id })
- },
-
- // 新增投料记录
- createFeedingRecord: async (data: FeedingRecordVO) => {
- return await request.post({ url: `/mes/feeding-record/create`, data })
- },
-
- // 修改投料记录
- updateFeedingRecord: async (data: FeedingRecordVO) => {
- return await request.put({ url: `/mes/feeding-record/update`, data })
- },
-
- // 删除投料记录
- deleteFeedingRecord: async (id: number) => {
- return await request.delete({ url: `/mes/feeding-record/delete?id=` + id })
- },
-
- // 导出投料记录 Excel
- exportFeedingRecord: async (params) => {
- return await request.download({ url: `/mes/feeding-record/export-excel`, params })
- },
-
-// ==================== 子表（投料记录明细） ====================
-
- // 获得投料记录明细列表
- getFeedingRecordDetailListByRecordId: async (recordId) => {
- return await request.get({ url: `/mes/feeding-record/feeding-record-detail/list-by-record-id?recordId=` + recordId })
- },
-}
\ No newline at end of file
+import request from '@/config/axios'
+
+// 投料记录 VO
+export interface FeedingRecordVO {
+ id: number // id
+ feedingRecordCode: string // 单号
+ productId: number // 产品id
+ planId: number // 计划id
+ itemId: number // 原料id
+ feedingPipeline: string // 制浆线
+ feedingType: string // 投料类型
+ weight: number // 重量
+ feedingTime: Date // 投料时间
+ userId: number // 记录人
+ remark: string // 备注
+ recordStatus: string // 状态
+}
+
+// 投料记录 API
+export const FeedingRecordApi = {
+ // 查询投料记录分页
+ getFeedingRecordPage: async (params: any) => {
+ return await request.get({ url: `/mes/feeding-record/page`, params })
+ },
+
+ // 查询投料记录详情
+ getFeedingRecord: async (id: number) => {
+ return await request.get({ url: `/mes/feeding-record/get?id=` + id })
+ },
+
+ // 新增投料记录
+ createFeedingRecord: async (data: FeedingRecordVO) => {
+ return await request.post({ url: `/mes/feeding-record/create`, data })
+ },
+
+ // 修改投料记录
+ updateFeedingRecord: async (data: FeedingRecordVO) => {
+ return await request.put({ url: `/mes/feeding-record/update`, data })
+ },
+
+ // 删除投料记录
+ deleteFeedingRecord: async (id: number) => {
+ return await request.delete({ url: `/mes/feeding-record/delete?id=` + id })
+ },
+
+ // 导出投料记录 Excel
+ exportFeedingRecord: async (params) => {
+ return await request.download({ url: `/mes/feeding-record/export-excel`, params })
+ },
+
+// ==================== 子表（投料记录明细） ====================
+
+ // 获得投料记录明细列表
+ getFeedingRecordDetailListByRecordId: async (recordId) => {
+ return await request.get({ url: `/mes/feeding-record/feeding-record-detail/list-by-record-id?recordId=` + recordId })
+ },
+ // 提交投料记录
+ updateFeedingRecordStatus: async (id:number, status:string) => {
+ return await request.put({ url: `/mes/feeding-record/update-status?id=` + id+`&status=`+status })
+ },
+}
diff --git a/src/api/mes/plan/index.ts b/src/api/mes/plan/index.ts
index 04d5b5ea..8389d183 100644
--- a/src/api/mes/plan/index.ts
+++ b/src/api/mes/plan/index.ts
@@ -21,6 +21,7 @@ export interface PlanVO {
productionManager: number // 生产主管
remark: string // 备注
isEnable: boolean // 是否启用
+ feedingPipeline: string //制浆线
}
// 生产计划 API
diff --git a/src/views/erp/product/product/index.vue b/src/views/erp/product/product/index.vue
index e9912c2c..d85441bc 100644
--- a/src/views/erp/product/product/index.vue
+++ b/src/views/erp/product/product/index.vue
@@ -20,17 +20,17 @@
class="!w-240px"
/>
-
-
-
+
+
+
+
+
+
+
+
+
+
+
搜索
重置
@@ -57,6 +57,15 @@
+
+
+
+
+
+
+
+
+
@@ -221,4 +230,10 @@ onMounted(async () => {
const categoryData = await ProductCategoryApi.getProductCategorySimpleList()
categoryList.value = handleTree(categoryData, 'id', 'parentId')
})
+
+/** tab 切换 */
+const handleTabClick = (tab: TabsPaneContext) => {
+ queryParams.categoryId = tab.paneName
+ handleQuery()
+}
diff --git a/src/views/erp/purchase/in/components/PurchaseInItemForm.vue b/src/views/erp/purchase/in/components/PurchaseInItemForm.vue
index 68bc7d19..1b27318f 100644
--- a/src/views/erp/purchase/in/components/PurchaseInItemForm.vue
+++ b/src/views/erp/purchase/in/components/PurchaseInItemForm.vue
@@ -105,7 +105,7 @@
diff --git a/src/views/erp/purchase/order/PurchaseOrderForm.vue b/src/views/erp/purchase/order/PurchaseOrderForm.vue
index b2cf8d45..899207bb 100644
--- a/src/views/erp/purchase/order/PurchaseOrderForm.vue
+++ b/src/views/erp/purchase/order/PurchaseOrderForm.vue
@@ -224,7 +224,7 @@ const open = async (type: string, id?: number, itemList?: ItemRequisitionAndStoc
//物料申购会传过来列表
if(itemList){
- itemFormRef.value.handleItemListAdd(itemList)
+ await itemFormRef.value.handleItemListAdd(itemList)
}
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
diff --git a/src/views/erp/purchase/order/components/PurchaseOrderItemForm.vue b/src/views/erp/purchase/order/components/PurchaseOrderItemForm.vue
index 16c715ba..1154572d 100644
--- a/src/views/erp/purchase/order/components/PurchaseOrderItemForm.vue
+++ b/src/views/erp/purchase/order/components/PurchaseOrderItemForm.vue
@@ -126,7 +126,9 @@
- —
+
+
+
@@ -266,7 +268,7 @@ const validate = () => {
/** 物料申购会调用 */
const handleItemListAdd = async (itemList: ItemRequisitionAndStockVO[]) => {
-
+ //formData.value = []
for (let i = 0; i < itemList.length; i++) {
const row = {
id: undefined,
diff --git a/src/views/mes/feedingrecord/index.vue b/src/views/mes/feedingrecord/index.vue
index 753bad95..2608d7b4 100644
--- a/src/views/mes/feedingrecord/index.vue
+++ b/src/views/mes/feedingrecord/index.vue
@@ -176,6 +176,15 @@
>
删除
+
+ 提交
+
@@ -290,4 +299,17 @@ const handleExport = async () => {
onMounted(() => {
getList()
})
+/** 提交记录操作 */
+const handleUpdateStatus = async (id: number, status:string) => {
+ try {
+ // 二次确认
+ await message.confirm("确认提交投料记录？", "一旦提交成功无法撤回！")
+ // 发起删除
+ await FeedingRecordApi.updateFeedingRecordStatus(id,status)
+ message.success("提交成功！")
+ // 刷新列表
+ await getList()
+ } catch {}
+}
+
diff --git a/src/views/mes/itemrequisition/components/ItemRequisitionDetailList.vue b/src/views/mes/itemrequisition/components/ItemRequisitionDetailList.vue
index 85baf029..64645c32 100644
--- a/src/views/mes/itemrequisition/components/ItemRequisitionDetailList.vue
+++ b/src/views/mes/itemrequisition/components/ItemRequisitionDetailList.vue
@@ -5,7 +5,7 @@
-
+
diff --git a/src/views/mes/plan/components/Paigong.vue b/src/views/mes/plan/components/Paigong.vue
index 18af0473..d7344cb8 100644
--- a/src/views/mes/plan/components/Paigong.vue
+++ b/src/views/mes/plan/components/Paigong.vue
@@ -11,6 +11,17 @@
+
+
+
+ {{ dict.label }}
+
+
+
@@ -46,6 +57,7 @@
diff --git a/src/views/mes/stockout/components/StockOutItemForm.vue b/src/views/mes/stockout/components/StockOutItemForm.vue
index a8422f0d..e719a3a3 100644
--- a/src/views/mes/stockout/components/StockOutItemForm.vue
+++ b/src/views/mes/stockout/components/StockOutItemForm.vue
@@ -98,7 +98,9 @@
- —
+
+
+
diff --git a/src/views/mes/tasksummary/components/PlanForm.vue b/src/views/mes/tasksummary/components/PlanForm.vue
index ac259577..a90873df 100644
--- a/src/views/mes/tasksummary/components/PlanForm.vue
+++ b/src/views/mes/tasksummary/components/PlanForm.vue
@@ -70,7 +70,7 @@
-
+
@@ -180,8 +180,27 @@ const setData = (data) => {
formData.value = data
}
defineExpose({ validate, getData , setData})
-/** 删除按钮操作 */
+/** 复制按钮操作 */
const handleCopy = (row) => {
- formData.value.push(row)
+ const newRow = {
+ id: undefined,
+ code: undefined,
+ productId: undefined,
+ productName: undefined,
+ planNumber: undefined,
+ planStartTime: undefined,
+ planEndTime: undefined,
+ remark: undefined,
+ isEnable: undefined,
+ }
+ newRow.code = row.code + (Math.floor(Math.random() * 10) + 1)
+ newRow.productId = row.productId
+ newRow.remark = row.remark
+ newRow.isEnable = row.isEnable
+ newRow.planStartTime = row.planStartTime
+ newRow.planEndTime = row.planEndTime
+ newRow.planNumber= row.planNumber
+ newRow.productName = row.productName
+ formData.value.push(newRow)
}