From 66779370f23cd8f8498cdd3809e7e9c62e79de76 Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Sat, 25 May 2024 15:58:29 +0800
Subject: [PATCH] fix product

---
 src/views/erp/mold/MoldBrandForm.vue          | 44 ++++++++++++------
 src/views/erp/mold/components/MoldList.vue    |  1 -
 src/views/erp/mold/index.vue                  | 28 +++++++----
 src/views/erp/product/product/ProductForm.vue |  4 +-
 src/views/mes/bom/BomForm.vue                 | 25 ++++++++--
 .../mes/bom/components/BomDetailForm.vue      | 46 ++++++++++++++++---
 .../mes/bom/components/BomDetailList.vue      |  6 +--
 src/views/mes/bom/index.vue                   | 31 +++++++++----
 8 files changed, 137 insertions(+), 48 deletions(-)

diff --git a/src/views/erp/mold/MoldBrandForm.vue b/src/views/erp/mold/MoldBrandForm.vue
index 71893f5a..203422f8 100644
--- a/src/views/erp/mold/MoldBrandForm.vue
+++ b/src/views/erp/mold/MoldBrandForm.vue
@@ -16,15 +16,29 @@
       <el-form-item label="规格" prop="moldType">
         <el-input v-model="formData.moldType" placeholder="请输入规格" />
       </el-form-item>
-      <el-form-item label="产品ID" prop="productId">
-        <el-input v-model="formData.productId" placeholder="请输入产品ID" />
+      <el-form-item label="产品" prop="productId">
+        <el-select
+          v-model="formData.productId"
+          clearable
+          filterable
+          placeholder="请选择产品"
+          class="!w-1/1"
+        >
+          <el-option
+            v-for="item in productList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="预期寿命(小时)" prop="useTime">
-        <el-date-picker
+        <el-input-number
           v-model="formData.useTime"
-          type="date"
-          value-format="x"
-          placeholder="选择预期寿命(小时)"
+          :min="0"
+          :precision="2"
+          class="!w-1/1"
+          placeholder="输入预期寿命(小时)"
         />
       </el-form-item>
       <el-form-item label="维保模式" prop="maintainType">
@@ -38,11 +52,12 @@
         </el-select>
       </el-form-item>
       <el-form-item label="维保周期" prop="maintainTime">
-        <el-date-picker
+        <el-input-number
           v-model="formData.maintainTime"
-          type="date"
-          value-format="x"
-          placeholder="选择维保周期"
+          :min="0"
+          :precision="2"
+          class="!w-1/1"
+          placeholder="输入维保周期"
         />
       </el-form-item>
       <el-form-item label="模具系数" prop="moldSize">
@@ -72,13 +87,13 @@
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE, getBoolDictOptions } from '@/utils/dict'
 import { MoldBrandApi, MoldBrandVO } from '@/api/erp/mold'
-
+import { ProductApi, ProductVO } from '@/api/erp/product/product'
 /** 模具型号 表单 */
 defineOptions({ name: 'MoldBrandForm' })
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
-
+const productList = ref<ProductVO[]>([]) // 产品列表
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
@@ -121,6 +136,8 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   }
+  // 加载产品、
+  productList.value = await ProductApi.getProductSimpleList()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -165,4 +182,5 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
\ No newline at end of file
+
+</script>
diff --git a/src/views/erp/mold/components/MoldList.vue b/src/views/erp/mold/components/MoldList.vue
index d40017b1..b68c3766 100644
--- a/src/views/erp/mold/components/MoldList.vue
+++ b/src/views/erp/mold/components/MoldList.vue
@@ -13,7 +13,6 @@
       <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="模具编码" align="center" prop="code" />
       <el-table-column label="模具名称" align="center" prop="name" />
-      <el-table-column label="单位ID" align="center" prop="unitId" />
       <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column label="机台ID" align="center" prop="machineId" />
       <el-table-column label="使用时间(小时)" align="center" prop="useTime" />
diff --git a/src/views/erp/mold/index.vue b/src/views/erp/mold/index.vue
index 2ad1245e..98210c01 100644
--- a/src/views/erp/mold/index.vue
+++ b/src/views/erp/mold/index.vue
@@ -35,14 +35,21 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="产品ID" prop="productId">
-        <el-input
+      <el-form-item label="产品" prop="productId">
+        <el-select
           v-model="queryParams.productId"
-          placeholder="请输入产品ID"
           clearable
-          @keyup.enter="handleQuery"
+          filterable
+          placeholder="请选择产品"
           class="!w-240px"
-        />
+        >
+          <el-option
+            v-for="item in productList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
       </el-form-item>
       
       <el-form-item label="维保模式" prop="maintainType">
@@ -190,13 +197,14 @@ import download from '@/utils/download'
 import { MoldBrandApi, MoldBrandVO } from '@/api/erp/mold'
 import MoldBrandForm from './MoldBrandForm.vue'
 import MoldList from './components/MoldList.vue'
+import { ProductApi, ProductVO } from '@/api/erp/product/product'
 
 /** 模具型号 列表 */
 defineOptions({ name: 'MoldBrand' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-
+const productList = ref<ProductVO[]>([]) // 产品列表
 const loading = ref(true) // 列表的加载中
 const list = ref<MoldBrandVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
@@ -283,7 +291,9 @@ const handleCurrentChange = (row) => {
 }
 
 /** 初始化 **/
-onMounted(() => {
-  getList()
+onMounted(async () => {
+  await getList()
+  // 加载产品、
+  productList.value = await ProductApi.getProductSimpleList()
 })
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/erp/product/product/ProductForm.vue b/src/views/erp/product/product/ProductForm.vue
index 3f9de0ad..e013f828 100644
--- a/src/views/erp/product/product/ProductForm.vue
+++ b/src/views/erp/product/product/ProductForm.vue
@@ -74,10 +74,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="重量（kg）" prop="weight">
+          <el-form-item label="重量（g）" prop="weight">
             <el-input-number
               v-model="formData.weight"
-              placeholder="请输入重量（kg）"
+              placeholder="请输入重量（g）"
               :min="0"
               class="!w-1/1"
             />
diff --git a/src/views/mes/bom/BomForm.vue b/src/views/mes/bom/BomForm.vue
index 4e49ed74..ee883cbc 100644
--- a/src/views/mes/bom/BomForm.vue
+++ b/src/views/mes/bom/BomForm.vue
@@ -13,8 +13,21 @@
       <el-form-item label="BOM版本" prop="version">
         <el-input v-model="formData.version" placeholder="请输入BOM版本" />
       </el-form-item>
-      <el-form-item label="产品ID" prop="productId">
-        <el-input v-model="formData.productId" placeholder="请输入产品ID" />
+      <el-form-item label="产品" prop="productId">
+        <el-select
+          v-model="formData.productId"
+          clearable
+          filterable
+          placeholder="请选择产品"
+          class="!w-1/1"
+        >
+          <el-option
+            v-for="item in productList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="单位" prop="unitId">
             <el-select v-model="formData.unitId" clearable placeholder="请选择单位" class="w-1/1">
@@ -61,6 +74,9 @@ import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
 import { BomApi, BomVO } from '@/api/mes/bom'
 import BomDetailForm from './components/BomDetailForm.vue'
 import { ProductUnitApi, ProductUnitVO } from '@/api/erp/product/unit'
+import { ProductApi, ProductVO } from '@/api/erp/product/product'
+
+const productList = ref<ProductVO[]>([]) // 产品列表
 const unitList = ref<ProductUnitVO[]>([]) // 产品单位列表
 
 /** 产品BOM 表单 */
@@ -113,7 +129,8 @@ const open = async (type: string, id?: number) => {
   }
   // 产品单位
   unitList.value = await ProductUnitApi.getProductUnitSimpleList()
-
+  // 加载产品、
+  productList.value = await ProductApi.getProductSimpleList()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -164,4 +181,4 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/mes/bom/components/BomDetailForm.vue b/src/views/mes/bom/components/BomDetailForm.vue
index 197aafd7..93e1f363 100644
--- a/src/views/mes/bom/components/BomDetailForm.vue
+++ b/src/views/mes/bom/components/BomDetailForm.vue
@@ -12,14 +12,27 @@
       <el-table-column label="产品" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
-            <el-input v-model="row.productId" placeholder="请输入产品ID" />
+            <el-select
+              v-model="row.productId"
+              clearable
+              filterable
+              @change="onChangeProduct($event, row)"
+              placeholder="请选择产品"
+            >
+              <el-option
+                v-for="item in productList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
           </el-form-item>
         </template>
       </el-table-column>
       <el-table-column label="单位" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.unitId`" :rules="formRules.unitId" class="mb-0px!">
-            <el-select v-model="row.unitId" clearable placeholder="请选择单位" class="w-1/1">
+            <el-select v-model="row.unitId" clearable filterable placeholder="请选择单位" class="w-1/1">
               <el-option
                 v-for="unit in unitList"
                 :key="unit.id"
@@ -67,8 +80,10 @@
 
 import { BomApi } from '@/api/mes/bom'
 import { ProductUnitApi, ProductUnitVO } from '@/api/erp/product/unit'
-const unitList = ref<ProductUnitVO[]>([]) // 产品单位列表
+import {ProductApi, ProductVO} from "@/api/erp/product/product";
 
+const unitList = ref<ProductUnitVO[]>([]) // 产品单位列表
+const productList = ref<ProductVO[]>([]) // 产品列表
 const props = defineProps<{
   bomId: undefined // BOM ID（主表的关联字段）
 }>()
@@ -81,6 +96,17 @@ const formRules = reactive({
 })
 const formRef = ref() // 表单 Ref
 
+/** 初始化 */
+onMounted(async () => {
+  // 产品单位
+  unitList.value = await ProductUnitApi.getProductUnitSimpleList()
+  productList.value = await ProductApi.getProductSimpleList()
+  // 默认添加一个
+  if (formData.value.length === 0) {
+    handleAdd()
+  }
+})
+
 /** 监听主表的关联字段的变化，加载对应的子表数据 */
 watch(
   () => props.bomId,
@@ -97,8 +123,6 @@ watch(
     } finally {
       formLoading.value = false
     }
-    // 产品单位
-    unitList.value = await ProductUnitApi.getProductUnitSimpleList()
   },
   { immediate: true }
   
@@ -136,4 +160,14 @@ const getData = () => {
 }
 
 defineExpose({ validate, getData })
-</script>
\ No newline at end of file
+
+/** 处理产品变更 */
+const onChangeProduct = (productId, row) => {
+  const product = productList.value.find((item) => item.id === productId)
+  if (product) {
+    // row.productUnitName = product.unitName
+  }
+  // // 加载库存
+  // setStockCount(row)
+}
+</script>
diff --git a/src/views/mes/bom/components/BomDetailList.vue b/src/views/mes/bom/components/BomDetailList.vue
index 939bc073..aa828597 100644
--- a/src/views/mes/bom/components/BomDetailList.vue
+++ b/src/views/mes/bom/components/BomDetailList.vue
@@ -3,8 +3,8 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="产品" align="center" prop="productId" />
-      <el-table-column label="单位" align="center" prop="unitId" />
+      <el-table-column label="原料" align="center" prop="productName" />
+      <el-table-column label="单位" align="center" prop="unitName" />
        <el-table-column label="用量" align="center" prop="usageNumber" />
       <el-table-column label="损耗率%" align="center" prop="yieldRate" />
       <el-table-column label="备注" align="center" prop="remark" />
@@ -57,4 +57,4 @@ const handleQuery = () => {
 onMounted(() => {
   getList()
 })
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/mes/bom/index.vue b/src/views/mes/bom/index.vue
index 418fca46..bb8ecd36 100644
--- a/src/views/mes/bom/index.vue
+++ b/src/views/mes/bom/index.vue
@@ -26,14 +26,21 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="产品ID" prop="productId">
-        <el-input
+      <el-form-item label="产品" prop="productId">
+        <el-select
           v-model="queryParams.productId"
-          placeholder="请输入产品ID"
           clearable
-          @keyup.enter="handleQuery"
+          filterable
+          placeholder="请选择产品"
           class="!w-240px"
-        />
+        >
+          <el-option
+            v-for="item in productList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
       </el-form-item>
     
       <el-form-item label="备注" prop="remark">
@@ -101,8 +108,8 @@
       <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="BOM编码" align="center" prop="code" />
       <el-table-column label="BOM版本" align="center" prop="version" />
-      <el-table-column label="产品ID" align="center" prop="productId" />
-      <el-table-column label="单位ID" align="center" prop="unitId" />
+      <el-table-column label="产品" align="center" prop="productName" />
+      <el-table-column label="单位" align="center" prop="unitName" />
       <el-table-column label="成品率%" align="center" prop="yieldRate" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="是否启用" align="center" prop="isEnable">
@@ -158,7 +165,9 @@ import download from '@/utils/download'
 import { BomApi, BomVO } from '@/api/mes/bom'
 import BomForm from './BomForm.vue'
 import BomDetailList from './components/BomDetailList.vue'
+import { ProductApi, ProductVO } from '@/api/erp/product/product'
 
+const productList = ref<ProductVO[]>([]) // 产品列表
 /** 产品BOM 列表 */
 defineOptions({ name: 'Bom' })
 
@@ -242,7 +251,9 @@ const handleExport = async () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
-  getList()
+onMounted(async () => {
+  await getList()
+  // 加载产品、
+  productList.value = await ProductApi.getProductSimpleList()
 })
-</script>
\ No newline at end of file
+</script>