From bc980dbbe5993ae6dc2d451f48ac14aac5161356 Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Sun, 7 Jul 2024 11:53:18 +0800
Subject: [PATCH] fix some bug
---
src/views/erp/mold/MoldBrandForm.vue | 26 +++++------------
src/views/erp/mold/components/MoldForm.vue | 5 +---
src/views/erp/mold/components/MoldList.vue | 9 +++---
src/views/erp/mold/index.vue | 29 +++++--------------
.../mes/feedingrecord/FeedingRecordForm.vue | 22 +++++++++++++-
src/views/mes/machine/index.vue | 1 +
src/views/mes/organization/WorkerIndex.vue | 1 +
src/views/mes/organization/index.vue | 1 +
.../mes/producereport/DailyReportIndex.vue | 27 +++++++++--------
.../producereport/components/ReplaceForm.vue | 2 +-
10 files changed, 60 insertions(+), 63 deletions(-)
diff --git a/src/views/erp/mold/MoldBrandForm.vue b/src/views/erp/mold/MoldBrandForm.vue
index 203422f8..d066154d 100644
--- a/src/views/erp/mold/MoldBrandForm.vue
+++ b/src/views/erp/mold/MoldBrandForm.vue
@@ -32,7 +32,10 @@
/>
-
+
+
+
+
-
-
-
+
-
-
-
- {{ dict.label }}
-
-
-
确 定
@@ -116,8 +106,7 @@ const formRules = reactive({
name: [{ required: true, message: '型号名称不能为空', trigger: 'blur' }],
moldType: [{ required: true, message: '规格不能为空', trigger: 'blur' }],
productId: [{ required: true, message: '产品ID不能为空', trigger: 'blur' }],
- moldSize: [{ required: true, message: '模具系数不能为空', trigger: 'blur' }],
- isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }]
+ moldSize: [{ required: true, message: '模具系数不能为空', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref
@@ -137,7 +126,7 @@ const open = async (type: string, id?: number) => {
}
}
// 加载产品、
- productList.value = await ProductApi.getProductSimpleList()
+ productList.value = await ProductApi.getMesProductSimpleList()
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -149,6 +138,7 @@ const submitForm = async () => {
// 提交请求
formLoading.value = true
try {
+ formData.value.isEnable = true
const data = formData.value as unknown as MoldBrandVO
if (formType.value === 'create') {
await MoldBrandApi.createMoldBrand(data)
diff --git a/src/views/erp/mold/components/MoldForm.vue b/src/views/erp/mold/components/MoldForm.vue
index cb637117..7294b767 100644
--- a/src/views/erp/mold/components/MoldForm.vue
+++ b/src/views/erp/mold/components/MoldForm.vue
@@ -23,10 +23,7 @@
/>
-
-
-
-
+
新增
-
-
+
-
+
-
+
{
await getList()
} catch {}
}
-
\ No newline at end of file
+
diff --git a/src/views/erp/mold/index.vue b/src/views/erp/mold/index.vue
index 98210c01..723624d5 100644
--- a/src/views/erp/mold/index.vue
+++ b/src/views/erp/mold/index.vue
@@ -67,16 +67,7 @@
/>
-
-
-
-
+
-
-
-
+
+
-
-
+
@@ -136,11 +125,7 @@
-
-
-
-
-
+
-
+
{
onMounted(async () => {
await getList()
// 加载产品、
- productList.value = await ProductApi.getProductSimpleList()
+ productList.value = await ProductApi.getMesProductSimpleList()
})
diff --git a/src/views/mes/feedingrecord/FeedingRecordForm.vue b/src/views/mes/feedingrecord/FeedingRecordForm.vue
index 9294cb81..23f47719 100644
--- a/src/views/mes/feedingrecord/FeedingRecordForm.vue
+++ b/src/views/mes/feedingrecord/FeedingRecordForm.vue
@@ -32,6 +32,22 @@
+
+
+
+
+
@@ -65,13 +81,14 @@
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
import { FeedingRecordApi, FeedingRecordVO } from '@/api/mes/feedingrecord'
import FeedingRecordDetailForm from './components/FeedingRecordDetailForm.vue'
+import {ProductApi, ProductVO} from "@/api/erp/product/product";
/** 投料记录 表单 */
defineOptions({ name: 'FeedingRecordForm' })
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
-
+const productList = ref([]) // 产品列表
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
@@ -81,6 +98,7 @@ const formData = ref({
feedingRecordCode: undefined,
productId: undefined,
planId: undefined,
+ productId: undefined,
itemId: undefined,
feedingPipeline: undefined,
feedingType: undefined,
@@ -117,6 +135,8 @@ const open = async (type: string, id?: number) => {
formLoading.value = false
}
}
+ // 加载产品、
+ productList.value = await ProductApi.getMesProductSimpleList()
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
diff --git a/src/views/mes/machine/index.vue b/src/views/mes/machine/index.vue
index 4d54b66c..97876bd4 100644
--- a/src/views/mes/machine/index.vue
+++ b/src/views/mes/machine/index.vue
@@ -152,6 +152,7 @@
+
diff --git a/src/views/mes/organization/WorkerIndex.vue b/src/views/mes/organization/WorkerIndex.vue
index 738b931c..0a4efe31 100644
--- a/src/views/mes/organization/WorkerIndex.vue
+++ b/src/views/mes/organization/WorkerIndex.vue
@@ -83,6 +83,7 @@
+
diff --git a/src/views/mes/organization/index.vue b/src/views/mes/organization/index.vue
index 2e0ca252..bc3e3237 100644
--- a/src/views/mes/organization/index.vue
+++ b/src/views/mes/organization/index.vue
@@ -123,6 +123,7 @@
+
-
+
+
+
+
+
+
+
+
-
-
-
-
-
@@ -88,6 +89,7 @@
+
@@ -278,6 +280,7 @@ onMounted(async () => {
userList.value = await UserApi.getSimpleUserList()
// 加载产品、
productList.value = await ProductApi.getMesProductSimpleList()
+
})
/** tab 切换 */
let activeName = 'chengxing'
diff --git a/src/views/mes/producereport/components/ReplaceForm.vue b/src/views/mes/producereport/components/ReplaceForm.vue
index 98ffe3f8..3620b294 100644
--- a/src/views/mes/producereport/components/ReplaceForm.vue
+++ b/src/views/mes/producereport/components/ReplaceForm.vue
@@ -222,7 +222,7 @@ const open = async (type: string, id?: number) => {
resetForm()
formData.value.reportDate = getCurrentDate()
formData.value.groupType = 1
- formData.value.orgType = 'zhijiang'
+ formData.value.orgType = 'chengxing'
warningInfo.value = ''
isDisableUpdate.value = false
// 修改时，设置数据