Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui

src/api/wms/bomDismantle/index.ts

@@ -4,3 +4,8 @@ import request from '@/config/axios'
 export const getBomDismantlePage = async (params) => {
   return await request.get({ url: `/wms/productrepair-request-main/bomPage`, params })
 }
+
+// 查询制品返修记录子列表
+export const getBomDismantleRecordPage = async (params) => {
+  return await request.get({ url: `/wms/productrepair-record-main/bomPage`, params })
+}

src/api/wms/productrepairRequestMain/index.ts

@@ -64,3 +64,33 @@ export const exportProductrepairRequestMain = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/productrepair-request-main/get-import-template' })
 }
+
+// 关闭-制品返修申请
+export const closeProductrepairRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productrepair-request-main/close?id=` + id })
+}
+
+// 重新添加-制品返修申请
+export const reAddProductrepairRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productrepair-request-main/reAdd?id=` + id })
+}
+
+// 提交审批-制品返修申请
+export const submitProductrepairRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productrepair-request-main/submit?id=` + id })
+}
+
+// 审批驳回-制品返修申请
+export const refusedProductrepairRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productrepair-request-main/refused?id=` + id })
+}
+
+// 审批通过-制品返修申请
+export const agreeProductrepairRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productrepair-request-main/agree?id=` + id })
+}
+
+// 处理-制品返修申请
+export const handleProductrepairRequestMain = async (id) => {
+  return await request.put({ url: `/wms/productrepair-request-main/handle?id=` + id })
+}

src/views/infra/apiAccessLog/index.vue

@@ -153,7 +153,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ApiAccessLogApi.exportApiAccessLog(queryParams)
-    download.excel(data, 'API 访问日志.xls')
+    download.excel(data, 'API 访问日志.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/infra/apiErrorLog/index.vue

@@ -235,7 +235,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ApiErrorLogApi.exportApiErrorLog(queryParams)
-    download.excel(data, '异常日志.xls')
+    download.excel(data, '异常日志.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/infra/config/index.vue

@@ -155,7 +155,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ConfigApi.exportConfig(queryParams)
-    download.excel(data, '参数配置.xls')
+    download.excel(data, '参数配置.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/infra/job/index.vue

@@ -155,7 +155,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await JobApi.exportJob(queryParams)
-    download.excel(data, '定时任务.xls')
+    download.excel(data, '定时任务.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/infra/job/logger/index.vue

@@ -182,7 +182,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await JobLogApi.exportJobLog(queryParams)
-    download.excel(data, '定时任务执行日志.xls')
+    download.excel(data, '定时任务执行日志.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/system/dict/data/index.vue

@@ -194,7 +194,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await DictDataApi.exportDictData(queryParams)
-    download.excel(data, '字典数据.xls')
+    download.excel(data, '字典数据.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/system/dict/index.vue

@@ -161,7 +161,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await DictTypeApi.exportDictType(queryParams)
-    download.excel(data, '字典类型.xls')
+    download.excel(data, '字典类型.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/system/errorCode/index.vue

@@ -157,7 +157,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ErrorCodeApi.excelErrorCode(queryParams)
-    download.excel(data, '错误码.xls')
+    download.excel(data, '错误码.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/system/loginlog/index.vue

@@ -126,7 +126,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await LoginLogApi.exportLoginLog(queryParams)
-    download.excel(data, '登录日志.xls')
+    download.excel(data, '登录日志.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/system/operatelog/index.vue

@@ -145,7 +145,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await OperateLogApi.exportOperateLog(queryParams)
-    download.excel(data, '操作日志.xls')
+    download.excel(data, '操作日志.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/system/post/index.vue

@@ -143,7 +143,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PostApi.exportPost(queryParams)
-    download.excel(data, '岗位列表.xls')
+    download.excel(data, '岗位列表.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/system/role/index.vue

@@ -250,7 +250,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await RoleApi.exportRole(queryParams)
-    download.excel(data, '角色列表.xls')
+    download.excel(data, '角色列表.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/system/sensitiveWord/index.vue

@@ -175,7 +175,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SensitiveWordApi.exportSensitiveWord(queryParams)
-    download.excel(data, '敏感词.xls')
+    download.excel(data, '敏感词.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/system/serialNumber/index.vue

@@ -168,7 +168,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SerialNumberApi.exportSerialNumber(queryParams)
-    download.excel(data, '流水号规则.xls')
+    download.excel(data, '流水号规则.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/system/sms/log/index.vue

@@ -171,7 +171,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SmsLogApi.exportSmsLog(queryParams)
-    download.excel(data, '短信日志.xls')
+    download.excel(data, '短信日志.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/system/sms/template/index.vue

@@ -197,7 +197,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SmsTemplateApi.exportSmsTemplate(queryParams)
-    download.excel(data, '短信模板.xls')
+    download.excel(data, '短信模板.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/system/tenant/index.vue

@@ -177,7 +177,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await TenantApi.exportTenant(queryParams)
-    download.excel(data, '租户列表.xls')
+    download.excel(data, '租户列表.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/system/user/UserImportForm.vue

@@ -130,6 +130,6 @@ const importTemplate = async () => {
   console.log(await UserApi.importUserTemplate());
   
   const res = await UserApi.importUserTemplate()
-  download.excel(res, '用户导入模版.xls')
+  download.excel(res, '用户导入模版.xlsx')
 }
 </script>

src/views/system/user/index.vue

@@ -195,7 +195,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await UserApi.exportUser(queryParams)
-    download.excel(data, '用户数据.xls')
+    download.excel(data, '用户数据.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/basicDataManage/labelManage/barbasic/index.vue

@@ -191,7 +191,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await BarbasicApi.exportBarbasic(setSearchParams)
-    download.excel(data, '条码实体基类.xls')
+    download.excel(data, '条码实体基类.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
@@ -206,7 +206,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '条码实体基类导入模版.xls'
+  templateTitle: '条码实体基类导入模版.xlsx'
 })
 // 导入成功之后
 const importSuccess = () => {

src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue

@@ -47,6 +47,7 @@
     :tableAllSchemas="ProductrepairRecordDetail.allSchemas"
     :tableFormRules="ProductrepairRecordDetailRules"
     :isBusiness="true"
+    @buttonOperationClick="buttonOperationClick"
   />
 
   <!-- 详情 -->
@@ -57,15 +58,42 @@
     :detailAllSchemas="ProductrepairRecordDetail.allSchemas"
     :detailAllSchemasRules="ProductrepairRecordDetailRules"
     :apiPage="ProductrepairRecordDetailApi.getProductrepairRecordDetailPage"
+    :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="BomDismantle.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 { ProductrepairRecordMain,ProductrepairRecordMainRules,ProductrepairRecordDetail,ProductrepairRecordDetailRules } from './productrepairRecordMain.data'
+import { ProductrepairRecordMain,ProductrepairRecordMainRules,ProductrepairRecordDetail,ProductrepairRecordDetailRules, BomDismantle } from './productrepairRecordMain.data'
 import * as ProductrepairRecordMainApi from '@/api/wms/productrepairRecordMain'
 import * as ProductrepairRecordDetailApi from '@/api/wms/productrepairRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as BomDismantleApi from "@/api/wms/bomDismantle";
+import {getBomDismantleRecordPage} from "@/api/wms/bomDismantle";
 
 // 制品返修记录主
 defineOptions({ name: 'ProductrepairRecordMain' })
@@ -78,6 +106,87 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(ProductrepairRecordMain.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 tableListBom = ref()
+const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useTable({
+  getListApi: BomDismantleApi.getBomDismantleRecordPage
+})
+
+const { getList:getDetailListBom } = detatableMethodsBom
+
+// 新增 tableform 按钮
+const buttonOperationClick = async (row, label, index)=> {
+  if (row.itemCode == '') {
+    message.warning('请选择物品代码！')
+    return
+  }
+  detatableDataBom.params.itemCode = row.itemCode
+  DialogTitle.value = '物品代码:【' + row.itemCode + '】 Bom 信息'
+  bomModelVisible.value = true
+  await getDetailListBom()
+  detatableDataBom.tableList.map(item => {
+    item.rowId = index
+    if(tableData.value[index].childList) {
+      tableData.value[index].childList.forEach(itemChild => {
+        if (itemChild.itemCode == item.itemCode) {
+          item.qty = itemChild.qty
+        }
+      })
+    }
+  })
+}
+
+/** bom 列表 表单 按钮 */
+const ButttondataBom = [
+  defaultButtons.formSaveBtn(null), // 保存
+  defaultButtons.formCloseBtn(null) // 关闭
+]
+// bom 列表 表单 按钮
+const buttonBaseClickBom = (val) => {
+  // 保存
+  if (val == 'save') {
+    // 根据 填写的数量 为基准 不填写数量的忽略
+    tableListBom.value = detatableDataBom.tableList.filter(item => (item.qty!=0))
+    tableData.value.forEach((item, index) => {
+      if(tableListBom.value[0].rowId == index) {
+        item.childList = tableListBom.value
+      }
+    })
+    console.log(157, tableData.value)
+    bomModelVisible.value = false
+  }
+  // 关闭
+  else 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
+    }
+    await getDetailListBom()
+  }
+}
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val

src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts

@@ -1,5 +1,7 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
+import {Bom} from "@/views/wms/basicDataManage/itemManage/bom/bom.data";
+import * as BomApi from "@/api/wms/bom";
 
 /**
  * @returns {Array} 制品返修记录主表
@@ -581,6 +583,69 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: 'Bom版本',
+    field: 'bomVersion',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      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: {
+        disabled: true,
+        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',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm: true,
+    tableForm: {
+      type: 'action',
+      buttonText: 'Bom',
+      buttonName: 'Bom'
+    }
+  },
 ]))
 
 //表单校验
@@ -625,3 +690,230 @@ export const ProductrepairRecordDetailRules = reactive({
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
 })
+
+/**
+ * @returns {Array} bom 拆解
+ */
+export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '行标记',
+    field: 'rowId',
+    isTableForm: false,
+    isForm: false,
+    tableForm:{
+      disabled: true
+    },
+    table: {
+      show: false
+    }
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    tableForm:{
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  }
+]))

src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue

@@ -69,6 +69,8 @@
     :apiPage="ProductrepairRequestDetailApi.getProductrepairRequestDetailaPage"
     :apiDelete="ProductrepairRequestDetailApi.deleteProductrepairRequestDetaila"
     @searchTableSuccessDetail="searchTableSuccessDetail"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
   />
 
   <!-- bom列表 -->
@@ -117,6 +119,18 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(ProductrepairRequestMain.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)
@@ -171,7 +185,6 @@ const buttonOperationClick = async (row, label, index)=> {
   })
 }
 
-
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -190,6 +203,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['uom'] = val[0]['uom']
         row['inventoryStatus'] = val[0]['inventoryStatus']
         row['fromLocationCode'] = val[0]['locationCode']
+      } else if(formField == 'productionLineCode'){
+        row['productionLineCode'] = val[0]['code']
+      } else if(formField == 'workStationCode'){
+        row['workStationCode'] = val[0]['code']
+      } else if(formField == 'formField'){
+        row['workStationCode'] = val[0]['code']
       } else {
         row[formField] = val[0][searchField]
       }
@@ -226,7 +245,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:productrepair-request-main:create'}), // 新增——需要手动修改下权限
-  defaultButtons.defaultImportBtn({hasPermi:'wms:productrepair-request-main:import'}), // 导入
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:productrepair-request-main:import'}), // 导入 暂时不做主子子表结构
   defaultButtons.defaultExportBtn({hasPermi:'wms:productrepair-request-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -284,14 +303,22 @@ const butttondata = (row) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     console.log('列表-操作按钮事件-关闭')
+    handleClose(row.id)
   } else if (val == 'mainReAdd') { // 重新添加
     console.log('列表-操作按钮事件-重新添加')
+    handleReAdd(row.id)
   } else if (val == 'mainSubmit') { // 提交审批
     console.log('列表-操作按钮事件-提交审批')
+    handleSubmit(row.id)
   } else if (val == 'mainTurnDown') { // 驳回
     console.log('列表-操作按钮事件-驳回')
+    handleRefused(row.id)
   } else if (val == 'mainApprove') { // 审批通过
     console.log('列表-操作按钮事件-审批通过')
+    handleAgree(row.id)
+  } else if (val == 'mainHandle') { // 处理
+    console.log('列表-操作按钮事件-处理')
+    handleHandle(row.id)
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
@@ -299,6 +326,66 @@ const buttonTableClick = async (val, row) => {
   }
 }
 
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await ProductrepairRequestMainApi.closeProductrepairRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmReAdd'))
+    await ProductrepairRequestMainApi.reAddProductrepairRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmSubmit'))
+    await ProductrepairRequestMainApi.submitProductrepairRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmRefused'))
+    await ProductrepairRequestMainApi.refusedProductrepairRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmAgree'))
+    await ProductrepairRequestMainApi.agreeProductrepairRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmHandle'))
+    await ProductrepairRequestMainApi.handleProductrepairRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    await getList()
+  } catch {}
+}
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
@@ -404,7 +491,19 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
-
+// 查看 Bom 按钮回调事件
+const tableFormButton = async (val , row) => {
+  if (val == 'bom') { // 查看 bom
+    bomModelVisible.value = true
+    DialogTitle.value = '物品代码【' + row.itemCode + '】——Bom信息'
+    detatableDataBom.params = {
+       itemCode: row.itemCode,
+       bomVersion: row.bomVersion,
+       masterId: row.id
+    }
+    await getDetailListBom()
+  }
+}
 
 /** 初始化 **/
 onMounted(async () => {

src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts

@@ -36,6 +36,8 @@ const queryParams = {
 
  // 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
+import {Bom} from "@/views/wms/basicDataManage/itemManage/bom/bom.data";
+import * as BomApi from "@/api/wms/bom";
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
 
@@ -830,6 +832,51 @@ export const ProductrepairRequestDetaila = 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',
@@ -1056,34 +1103,6 @@ export const ConsumereRequestDetailb = useCrudSchemas(reactive<CrudSchema[]>([
   }
 ]))
 
-//表单校验
-export const ConsumereRequestDetailbRules = reactive({
-  inventoryStatus: [
-    { required: true, message: '请选择库存状态', trigger: 'change' }
-  ],
-  packingNumber: [
-    { required: true, message: '请选择包装号', trigger: 'change' }
-  ],
-  batch: [
-    { required: true, message: '请输入批次', trigger: 'blur' }
-  ],
-  fromLocationCode: [
-    { required: true, message: '请选择从库位代码', trigger: 'change' }
-  ],
-  number: [
-    { required: true, message: '请输入单据号', trigger: 'blur' }
-  ],
-  itemCode: [
-    { required: true, message: '请选择物品代码', trigger: 'change' }
-  ],
-  createTime: [
-    { required: true, message: '请输入创建时间', trigger: 'blur' }
-  ],
-  creator: [
-    { required: true, message: '请输入创建者', trigger: 'blur' }
-  ],
-})
-
 
 /**
  * @returns {Array} bom 拆解
@@ -1096,6 +1115,9 @@ export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     tableForm:{
       disabled: true
+    },
+    table: {
+      show: false
     }
   },
   {
@@ -1124,4 +1146,186 @@ export const BomDismantle = useCrudSchemas(reactive<CrudSchema[]>([
       disabled: true
     }
   },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  }
 ]))

src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue

@@ -219,7 +219,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await InspectJobMainApi.exportInspectJobMain(setSearchParams)
-    download.excel(data, '检验任务主.xls')
+    download.excel(data, '检验任务主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue

@@ -144,7 +144,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await InspectRecordMainApi.exportInspectRecordMain(setSearchParams)
-    download.excel(data, '检验记录主.xls')
+    download.excel(data, '检验记录主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue

@@ -307,7 +307,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await InspectRequestMainApi.exportInspectRequestMain(setSearchParams)
-    download.excel(data, '检验申请主.xls')
+    download.excel(data, '检验申请主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue

@@ -350,7 +350,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '采购收货申请主导入模版.xls'
+  templateTitle: '采购收货申请主导入模版.xlsx'
 })
 
 // 导入成功之后

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue

@@ -219,7 +219,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereturnJobMainApi.exportPurchasereturnJobMain(setSearchParams)
-    download.excel(data, '采购退货任务主.xls')
+    download.excel(data, '采购退货任务主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue

@@ -142,7 +142,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(setSearchParams)
-    download.excel(data, '采购退货记录主.xls')
+    download.excel(data, '采购退货记录主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue

@@ -219,7 +219,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PutawayJobMainApi.exportPutawayJobMain(setSearchParams)
-    download.excel(data, '上架任务主.xls')
+    download.excel(data, '上架任务主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue

@@ -142,7 +142,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PutawayRecordMainApi.exportPutawayRecordMain(setSearchParams)
-    download.excel(data, '上架记录主.xls')
+    download.excel(data, '上架记录主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue

@@ -312,7 +312,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PutawayRequestMainApi.exportPutawayRequestMain(setSearchParams)
-    download.excel(data, '上架申请主.xls')
+    download.excel(data, '上架申请主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
@@ -365,7 +365,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '上架申请主导入模版.xls'
+  templateTitle: '上架申请主导入模版.xlsx'
 })
 
 // 导入成功之后

src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts

@@ -37,26 +37,6 @@ const userDept = userStore.userSelfInfo.dept
  * @returns {Array} 上架申请主表
  */
 export const PutawayRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '到货检验记录单号',
-    field: 'inspectRecordNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择到货检验记录单号', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '到货检验信息', // 查询弹窗标题
-        searchAllSchemas: InspectRequestMain.allSchemas, // 查询弹窗所需类
-        searchPage: InspectRequestMainApi.getInspectRequestMainPage // 查询弹窗所需分页方法
-      }
-    }
-  },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue

@@ -245,7 +245,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await DemandforecastingMainApi.exportDemandforecastingMain(setSearchParams)
-    download.excel(data, '要货预测主.xls')
+    download.excel(data, '要货预测主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
@@ -298,7 +298,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '要货预测主导入模版.xls'
+  templateTitle: '要货预测主导入模版.xlsx'
 })
 
 // 导入成功之后

src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue

@@ -273,7 +273,7 @@
       // 发起导出
       exportLoading.value = true
       const data = await PurchaseMainApi.exportPurchaseMain(setSearchParams)
-      download.excel(data, '采购订单主.xls')
+      download.excel(data, '采购订单主.xlsx')
     } catch {
     } finally {
       exportLoading.value = false

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@@ -323,7 +323,7 @@
       // 发起导出
       exportLoading.value = true
       const data = await PurchasePlanMainApi.exportPurchasePlanMain(setSearchParams)
-      download.excel(data, '要货计划主.xls')
+      download.excel(data, '要货计划主.xlsx')
     } catch {
     } finally {
       exportLoading.value = false
@@ -409,7 +409,7 @@
   // 导入附件弹窗所需的参数
   const importTemplateData = reactive({
     templateUrl: '',
-    templateTitle: '要货计划主导入模版.xls'
+    templateTitle: '要货计划主导入模版.xlsx'
   })
 
   // 导入成功之后

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue

@@ -144,7 +144,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SupplierdeliverRecordMainApi.exportSupplierdeliverRecordMain(setSearchParams)
-    download.excel(data, '供应商发货记录主.xls')
+    download.excel(data, '供应商发货记录主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts

@@ -391,57 +391,136 @@ export const SupplierdeliverRecordMainRules = reactive({
  * @returns {Array} 供应商发货记录子表
  */
 export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  // {
+  //   label: '从包装号',
+  //   field: 'fromPackingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '到包装号',
+  //   field: 'toPackingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '从批次',
+  //   field: 'fromBatch',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '到批次',
+  //   field: 'toBatch',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '替代批次',
+  //   field: 'altBatch',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '从器具号',
+  //   field: 'fromContainerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '到器具号',
+  //   field: 'toContainerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
-    label: '从包装号',
+    label: '订单行',
-    field: 'fromPackingNumber',
+    field: 'poLine',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到包装号',
+    label: '物品代码',
-    field: 'toPackingNumber',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从批次',
+    label: '数量',
-    field: 'fromBatch',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
-    label: '到批次',
+    label: '标包数量',
-    field: 'toBatch',
+    field: 'stdPackQty',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
-    label: '替代批次',
+    label: '标包单位',
-    field: 'altBatch',
+    field: 'stdPackUnit',
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从器具号',
+    label: '供应商计量数量',
-    field: 'fromContainerNumber',
+    field: 'supplierQty',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
-    label: '到器具号',
+    label: '供应商计量单位',
-    field: 'toContainerNumber',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -507,66 +586,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     },
   },
-  {
+  
-    label: '订单号',
-    field: 'poNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '标包数量',
-    field: 'stdPackQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '标包单位',
-    field: 'stdPackUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '供应商计量数量',
-    field: 'supplierQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '供应商计量单位',
-    field: 'supplierUom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '从库位代码',
     field: 'fromLocationCode',
@@ -631,14 +651,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
-  {
+ 
-    label: '物品代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '物品名称',
     field: 'itemName',
@@ -671,17 +684,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
-  {
+  
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
   {
     label: '计量单位',
     field: 'uom',

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@@ -109,9 +109,14 @@
        
        if(formField=='ppNumber'){
          // 获取子表数据 getBomDisassemble
-        PurchasePlanDetailApi.getPurchasePlanDetailList({
          number: val[0]['number']}).then(res => {
            if (res) tableData.value = res;
            tableData.value.forEach(item=>{
              item.batch = item.toBatch
+       PurchasePlanDetailApi.getPurchasePlanDetailList({
+         number: val[0]['number']}).then(res => {
+           if (res) tableData.value = res;
+           tableData.value.forEach(item=>{
+             item.batch = item.toBatch
              item.qty = 1
-            })
          }).catch(err => {
            console.log(err)
          })
+           })
+         }).catch(err => {
            console.log(err)
          })
        }
         formRef.setValues(setV)
       }
@@ -341,7 +346,7 @@
       // 发起导出
       exportLoading.value = true
       const data = await SupplierdeliverRequestMainApi.exportSupplierdeliverRequestMain(setSearchParams)
-      download.excel(data, '供应商发货申请主.xls')
+      download.excel(data, '供应商发货申请主.xlsx')
     } catch {
     } finally {
       exportLoading.value = false
@@ -520,7 +525,7 @@
   // 导入附件弹窗所需的参数
   const importTemplateData = reactive({
     templateUrl: '',
-    templateTitle: '供应商发货申请主导入模版.xls'
+    templateTitle: '供应商发货申请主导入模版.xlsx'
   })
 
   // 导入成功之后

src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue

@@ -7,19 +7,13 @@
   </ContentWrap>
 
   <!-- 列表头部 -->
-  <TableHead 
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
-    :HeadButttondata="HeadButttondata" 
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
-    @button-base-click="buttonBaseClick" 
+    :allSchemas="PurchaseclaimRequestMain.allSchemas" />
-    :routeName="routeName"
-    @updataTableColumns="updataTableColumns"
-    @searchFormClick="searchFormClick"
-    :allSchemas="PurchaseclaimRequestMain.allSchemas" 
-  />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table :columns="tableColumns" :data="tableObject.tableList"
+    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
-      :loading="tableObject.loading" :pagination="{
         total: tableObject.total
       }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort">
@@ -35,36 +29,22 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-    <BasicForm 
+  <BasicForm ref="formRef" @success="getList" :rules="PurchaseclaimRequestMainRules"
-      ref="formRef" 
+    :formAllSchemas="PurchaseclaimRequestMain.allSchemas" :tableAllSchemas="PurchaseclaimRequestDetail.allSchemas"
-      @success="getList" 
+    :tableFormRules="PurchaseclaimRequestDetailRules" :tableData="tableData"
-      :rules="PurchaseclaimRequestMainRules" 
-      :formAllSchemas="PurchaseclaimRequestMain.allSchemas" 
-      :tableAllSchemas="PurchaseclaimRequestDetail.allSchemas"
-      :tableFormRules="PurchaseclaimRequestDetailRules"
-      :tableData="tableData"
     :apiUpdate="PurchaseclaimRequestMainApi.updatePurchaseclaimRequestMain"
-      :apiCreate="PurchaseclaimRequestMainApi.createPurchaseclaimRequestMain"
+    :apiCreate="PurchaseclaimRequestMainApi.createPurchaseclaimRequestMain" :isBusiness="true"
-      :isBusiness="true"
+    @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess"
-      @handleAddTable="handleAddTable"
+    @submitForm="submitForm" />
-      @handleDeleteTable="handleDeleteTable"
-      @searchTableSuccess="searchTableSuccess"
-      @submitForm="submitForm"
-    />
 
   <!-- 详情 -->
-  <Detail 
+  <Detail ref="detailRef" :isBasic="false" :allSchemas="PurchaseclaimRequestMain.allSchemas"
-    ref="detailRef" 
+    :detailAllSchemas="PurchaseclaimRequestDetail.allSchemas" :detailAllSchemasRules="PurchaseclaimRequestDetailRules"
-    :isBasic="false" 
-    :allSchemas="PurchaseclaimRequestMain.allSchemas"
-    :detailAllSchemas="PurchaseclaimRequestDetail.allSchemas"
-    :detailAllSchemasRules="PurchaseclaimRequestDetailRules"
     :apiCreate="PurchaseclaimRequestDetailApi.createPurchaseclaimRequestDetail"
     :apiUpdate="PurchaseclaimRequestDetailApi.updatePurchaseclaimRequestDetail"
     :apiPage="PurchaseclaimRequestDetailApi.getPurchaseclaimRequestDetailPage"
     :apiDelete="PurchaseclaimRequestDetailApi.deletePurchaseclaimRequestDetail"
-    @searchTableSuccessDetail="searchTableSuccessDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail" />
-  />
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/purchaseclaim-request-main/import" :importTemplateData="importTemplateData"
@@ -99,8 +79,10 @@ const updataTableColumns = (val) => {
 
   // 查询页面返回
   const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+    
     nextTick(() => {
       if (type == 'tableForm') {
+        
         // 子表查询页赋值
         row[formField] = val[0][searchField]
         row['poLine'] = val[0]['poLine']
@@ -117,6 +99,25 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         // 主表查询页赋值
         const setV = {}
         setV[formField] = val[0][searchField]
+        
+        if(formField=='asnNumber'){
+          // 获取子表数据 getBomDisassemble
+         PurchasePlanDetailApi.getPurchasePlanDetailList({
+           number: val[0]['asnNumber']}).then(res => {
+             if (res) tableData.value = res;
+             tableData.value.forEach(item=>{
+               item.batch = item.toBatch
+               item.qty = 1
+             })
+           }).catch(err => {
+             console.log(err)
+           })
+        }
+        
+        
+        
+        
+        
         setV['ppNumber'] = val[0]['ppNumber']
         setV['supplierCode'] = val[0]['supplierCode']
         formRef.setValues(setV)
@@ -125,7 +126,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   }
   // 查询页面返回——详情
   const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+    console.log(456)
     nextTick(() => {
+      
       const setV = {}
       setV[formField] = val[0][searchField]
       setV['poLine'] = val[0]['poLine']
@@ -314,9 +317,7 @@ const submitForm = async (formType, data) => {
       getList()
     } finally {
       formRef.value.formLoading = false
-
     }
-
   }
 
   /** 导入 */