From 36425404f496acfe0faef9ae70a8208b1a25d975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Thu, 21 Dec 2023 18:35:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=8B=86=E8=A7=A3=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=20=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productdismantleRecordMain/index.vue      |  72 ++++++-
 .../productdismantleRecordMain.data.ts        | 184 +++++++++++++++---
 .../productdismantleRequestMain/index.vue     |   1 +
 .../productdismantleRequestMain.data.ts       |  52 +++++
 4 files changed, 283 insertions(+), 26 deletions(-)

diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
index e33da1479..028834158 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
@@ -57,14 +57,39 @@
     :detailAllSchemas="ProductdismantleRecordDetaila.allSchemas"
     :detailAllSchemasRules="ProductdismantleRecordDetailaRules"
     :apiPage="ProductdismantleRecordDetailApi.getProductdismantleRecordDetailaPage"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
   />
+
+  <!-- bom列表 -->
+  <Dialog
+    :title="DialogTitle"
+    v-model="bomModelVisible"
+    width="80%"
+    :scroll="true"
+    max-height="450px"
+  >
+      <TableForm
+        ref="tableFormRef"
+        class="w-[100%]"
+        :tableFields="DismantleRecordDetailb.allSchemas.tableColumns"
+        :tableData="detatableDataBom.tableList"
+        :isShowButton="false"
+        :isShowReduceButton="false"
+      />
+    <template #footer>
+      <ButtonBase :Butttondata="ButttondataBom" @button-base-click="buttonBaseClickBom" />
+    </template>
+  </Dialog>
+
 </template>
 
 <script setup lang="ts">
 import download from '@/utils/download'
-import { ProductdismantleRecordMain,ProductdismantleRecordMainRules,ProductdismantleRecordDetaila,ProductdismantleRecordDetailaRules } from './productdismantleRecordMain.data'
+import { ProductdismantleRecordMain,ProductdismantleRecordMainRules,ProductdismantleRecordDetaila,ProductdismantleRecordDetailaRules, DismantleRecordDetailb } from './productdismantleRecordMain.data'
 import * as ProductdismantleRecordMainApi from '@/api/wms/productdismantleRecordMain'
 import * as ProductdismantleRecordDetailApi from '@/api/wms/productdismantleRecordDetaila'
+import * as DismantleRecordDetailbApi from '@/api/wms/dismantleRecordDetailb'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 // 制品拆解记录主
@@ -78,6 +103,51 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(ProductdismantleRecordMain.allSchemas.tableColumns)
 
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([{
+  label: 'Bom',
+  name: 'bom',
+  hide: false,
+  type: 'primary',
+  icon: '',
+  color: '',
+  hasPermi: '',
+  link: true, // 文本展现按钮
+}])
+
+// Bom 窗口
+const DialogTitle = ref('Bom信息')
+const bomModelVisible = ref(false)
+const rowId = ref()
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+  getListApi: DismantleRecordDetailbApi.getDismantleRecordDetailbPage
+})
+const { getList:getDetailListBom } = detatableMethodsBom
+/** bom 列表 表单 按钮 */
+const ButttondataBom = [
+  defaultButtons.formCloseBtn(null) // 关闭
+]
+// bom 列表 表单 按钮
+const buttonBaseClickBom = async (val) => {
+  if (val == 'close') {
+    bomModelVisible.value = false
+  }
+}
+
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    DialogTitle.value = '物品代码【' + row.itemCode + '】——Bom信息'
+    detatableDataBom.params = {
+       masterId: row.id
+    }
+    rowId.value =  row.id
+    await getDetailListBom()
+  }
+}
+
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
index 2fad824e8..543c8b2a1 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
@@ -582,6 +582,22 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[
       width: 150
     },
   },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:true,
+    tableForm: {
+      type: 'action',
+      buttonText: 'Bom',
+      buttonName: 'Bom'
+    }
+  }
 ]))
 
 //表单校验
@@ -638,6 +654,14 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: 'BOM版本',
@@ -646,6 +670,14 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '包装号',
@@ -654,6 +686,14 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '批次',
@@ -662,6 +702,14 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '库存状态',
@@ -673,6 +721,14 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '到库位代码',
@@ -681,6 +737,14 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '到库位组代码',
@@ -689,6 +753,14 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '到库区代码',
@@ -697,6 +769,14 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '单据号',
@@ -705,6 +785,14 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '物品代码',
@@ -713,6 +801,14 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '备注',
@@ -721,6 +817,14 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '创建时间',
@@ -736,20 +840,13 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'DatePicker',
       componentProps: {
+        disabled: true,
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
       }
     },
   },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '物品名称',
     field: 'itemName',
@@ -757,6 +854,14 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '物品描述1',
@@ -765,6 +870,14 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '物品描述2',
@@ -773,6 +886,14 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '项目代码',
@@ -781,6 +902,14 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '数量',
@@ -790,7 +919,12 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     form: {
-      component: 'InputNumber',
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
     }
   },
   {
@@ -803,23 +937,15 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
   },
-  // {
-  //   label: '任务明细ID',
-  //   field: 'jobDetailId',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  // {
-  //   label: '代码',
-  //   field: 'code',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
   {
     label: '接口类型',
     field: 'interfaceType',
@@ -830,6 +956,14 @@ export const DismantleRecordDetailb = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
   },
 ]))
 
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
index 8f8d020c2..c95e1f99c 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
@@ -176,6 +176,7 @@ const buttonOperationClick = async (row, label, index)=> {
     return
   }
   detatableDataBom.params.itemCode = row.itemCode
+  detatableDataBom.params.bomVersion = row.bomVersion
   detatableDataBom.params.masterId = ''
   DialogTitle.value = '物品代码:【' + row.itemCode + '】 Bom 信息'
   bomModelVisible.value = true
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
index 9543e8681..9dc642fc5 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts
@@ -23,6 +23,9 @@ import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
 import * as BalanceApi from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
+import {Bom} from "@/views/wms/basicDataManage/itemManage/bom/bom.data";
+import * as BomApi from "@/api/wms/bom";
+
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -590,6 +593,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
       }
     }
   },
+
   {
     label: '物品代码',
     field: 'itemCode',
@@ -931,6 +935,51 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     isTableForm: false,
     isForm: false
   },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+      searchField: 'version', // 查询弹窗赋值字段
+      searchTitle: '物料清单信息', // 查询弹窗标题
+      searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+      searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key:'productItemCode',
+        value:'itemCode',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
+        searchField: 'version', // 查询弹窗赋值字段
+        searchTitle: '物料清单信息', // 查询弹窗标题
+        searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
+        searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key:'productItemCode',
+          value:'itemCode',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+      }
+    },
+  },
   {
     label: '操作',
     field: 'action',
@@ -966,6 +1015,9 @@ export const ProductdismantleRequestDetailaRules = reactive({
   itemCode: [
     { required: true, message: '请选择物品代码', trigger: 'change' }
   ],
+  bomVersion: [
+    { required: true, message: '请选择Bom版本', trigger: 'change' }
+  ], 
 })
 
 /**