主子表接口

src/api/wms/purchaseclaimRequestDetail/index.ts

@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export interface PurchaseclaimRequestMainVO {
+  altBatch: string
+  amount: Number
+  batch: Number
+  id: string
+  itemCode: string
+  itemDesc1: string
+  itemDesc2: string
+  itemName: string
+  number: string
+  poLine: string
+  poNumber: string
+  projectCode: string
+  qty: Number
+  reason: string
+  remark: string
+  singlePrice: Number
+  uom: string
+}
+
+// 查询采购索赔申请子列表
+export const getPurchaseclaimRequestDetailPage = async (params) => {
+  return await request.get({ url: `/wms/purchaseclaim-request-detail/page`, params })
+}
+
+// 查询采购索赔申请子详情
+export const getPurchaseclaimRequesDetail = async (id: number) => {
+  return await request.get({ url: `/wms/purchaseclaim-request-detail/get?id=` + id })
+}
+
+// 新增采购索赔申请子
+export const createPurchaseclaimRequestDetail = async (data: PurchaseclaimRequestMainVO) => {
+  return await request.post({ url: `/wms/purchaseclaim-request-detail/create`, data })
+}
+
+// 修改采购索赔申请子
+export const updatePurchaseclaimRequestDetail = async (data: PurchaseclaimRequestMainVO) => {
+  return await request.put({ url: `/wms/purchaseclaim-request-detail/update`, data })
+}
+
+// 删除采购索赔申请子
+export const deletePurchaseclaimRequestDetail = async (id: number) => {
+  return await request.delete({ url: `/wms/purchaseclaim-request-detail/delete?id=` + id })
+}
+
+// 导出采购索赔申请子 Excel
+export const exportPurchaseclaimRequestDetail = async (params) => {
+  return await request.download({ url: `/wms/purchaseclaim-request-detail/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/purchaseclaim-request-detail/get-import-template' })
+}

src/components/BasicForm/src/BasicForm.vue

@@ -98,9 +98,14 @@
         <div class="w-[100%] flex">
           <el-input v-model="form['asnNumber']" :placeholder="'请选择发货单号'" @click="opensearchTable('asnNumber', 'asnNumber')" />
         </div>
+      </template>
+            <template #poNumber="form" v-if="props.searchTableParams?.find((item: any) => (item.formField == 'poNumber'))">
+          <div class="w-[100%] flex">
+            <el-input v-model="form['poNumber']" :placeholder="'请选择发货单号'" @click="opensearchTable('poNumber', 'poNumber')" />
+          </div>
         </template>
     </Form>
-    <div class="table" v-if="isBusiness">
+    <div class="table" v-if="isBusiness && formType == 'create'">
       <TableForm ref="tableFormRef" 
         class="w-[100%]" 
         :tableFields="tableAllSchemas.tableFormColumns"
@@ -127,6 +132,7 @@ import { SearchTable } from '@/components/SearchTable';
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import ButtonBase from '@/components/XButton/src/ButtonBase.vue'
 import TableForm from '@/components/TableForm/src/TableForm.vue'
+import { string } from 'vue-types';
 
 const props = defineProps({
   // 校验rules 
@@ -193,7 +199,13 @@ const props = defineProps({
     type: Object,
     required: true,
     default: null
-  }
+  },
+  // 主表id
+  masterId: {
+    type: String,
+    required: false,
+    default: null
+  },
 })
 
 const { t } = useI18n() // 国际化
@@ -233,6 +245,7 @@ const open = async (type: string, row?: any) => {
   resetForm()
   // 修改时，设置数据
   if (row) {
+    console.log(row);
     formLoading.value = true
     try {
       nextTick(() => {
@@ -243,7 +256,7 @@ const open = async (type: string, row?: any) => {
     }
   }
 }
-defineExpose({ open , formRef, opensearchTable, dialogVisible}) // 提供 open 方法，用于打开弹窗
+defineExpose({ open , formRef, opensearchTable, dialogVisible, formLoading }) // 提供 open 方法，用于打开弹窗
 
 /** 弹窗按钮 */
 const Butttondata = [
@@ -275,7 +288,7 @@ const submitForm = async () => {
   const valid = await elForm.validate()
   if (!valid) return
   // 针对主子表 明细校验
-  if (props.isBusiness) {
+  if (props.isBusiness && formType.value == 'create') {
     const validateForm = await tableFormRef.value.validateForm()
     if (!validateForm) {
       if (props.tableData.length == 0) {
@@ -291,7 +304,7 @@ const submitForm = async () => {
       emit('submitForm', formType.value, data  )
       // dialogVisible.value = false
     } finally {
-      formLoading.value = false
+      // formLoading.value = false
     }
   } else {
     // 基础数据单表——提交请求
@@ -299,6 +312,9 @@ const submitForm = async () => {
     try {
       // const data = unref(formRef)?.formModel as ItempackagingApi.ItempackagingVO 
       const data = unref(formRef)?.formModel
+      if(props.masterId){
+        data.masterId = props.masterId
+      }
       if (formType.value === 'create') {
         await props.apiCreate(data)
         message.success(t('common.createSuccess'))
@@ -334,7 +350,7 @@ const emit = defineEmits([
   'inpuFocus',
   'searchTableSuccess',
   'opensearchTable',
-  'submitForm'
+  'submitForm',
 ])
 //普通下拉改变事件
 const formSelectChange = (field, val) => {

src/components/Detail/src/Detail.vue

@@ -1,4 +1,5 @@
 <template>
+  <div>
   <el-drawer v-model="isShowDrawer" title="详情" direction="rtl" size="80%" v-loading="detailLoading">
     <template #header>
       <div class="font-size-18px">
@@ -9,6 +10,13 @@
       <Descriptions :data="detailData" labelClassName="label-class-name" label-align="left" direction="vertical"
         :column="8" :schema="allSchemas.detailSchema" :columns="2" width="200px" />
     </ContentWrap>
+      <!-- 列表头部 -->
+      <TableHead 
+        :HeadButttondata="HeadButttondata" 
+        @button-base-click="buttonBaseClick" 
+        :routeName="routeName"
+        @updataTableColumns="updataTableColumns"
+      />
     <Tabs :tabsList="tabsList" :current="current" @change="change" />
     <div class="flex" v-if="current == 0">
       <!-- 详情 -->
@@ -21,7 +29,11 @@
           :loading="tableObject.loading"
           :pagination="{ total: tableObject.total }" 
           v-model:pageSize="tableObject.pageSize"
-          v-model:currentPage="tableObject.currentPage" />
+          v-model:currentPage="tableObject.currentPage" >
+          <template #action="{ row }">
+            <ButtonBase :Butttondata="buttondata(row)" @button-base-click="buttonTableClick($event, row)" />
+          </template>
+        </Table>
       </ContentWrap>
       <ContentWrap class="w-[27%] ml-16px">
         <!-- 附件组件 -->
@@ -34,6 +46,20 @@
       </ContentWrap>
     </div>
   </el-drawer>
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="formRef" 
+    @success="getList" 
+    :rules="detailAllSchemasRules" 
+    :formAllSchemas="detailAllSchemas"
+    :searchTableParams="searchTableParams"
+    :isBusiness="false"
+    :apiUpdate="apiUpdate"
+    :apiCreate="apiCreate"
+    :masterId="masterId"
+    @searchTableSuccess="searchTableSuccess"
+  />
+</div>
 </template>
 
 <script lang="ts" setup>
@@ -43,10 +69,19 @@ import ChangeRecord from '@/components/ChangeRecord/src/ChangeRecord.vue'
 import Tabs from '@/components/Tabs/src/Tabs.vue'
 import * as RemarkApi from '@/api/wms/remark'
 import * as FileApi from '@/api/wms/file'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
 
+defineOptions({ name: 'Detail' })
 
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
 
-defineOptions({ name: 'Detail' })
 
 const props = defineProps({
   // 标签参数
@@ -73,18 +108,46 @@ const props = defineProps({
     required: true,
     default: null
   },
-  // 主表API
+  //  明细验证
-  detailApi: {
+  detailAllSchemasRules: {
     type: Object,
     required: true,
     default: null
-  }
+  },
+   //  明细查询
+  searchTableParams: {
+    type: Array,
+    required: true,
+    default: null
+  },
+  // 子表新增API
+  apiCreate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表编辑API
+  apiUpdate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表分页列表API
+  apiPage: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表删除API
+  apiDelete: {
+    type: Function,
+    required: false,
+    default: null
+  },
 })
-
+console.log(props.detailAllSchemas);
 const isShowDrawer = ref(false)
-
 const detailLoading = ref(false)
-
 const tabsList = ref(JSON.parse(JSON.stringify(props.tabs ? props.tabs : '')))
 
 if (tabsList.value && tabsList.value.length > 0) {
@@ -144,7 +207,7 @@ const change = (item, index) => {
 }
 
 
-
+const masterId=ref('')//主表id
 /** 打开弹窗 */
 const titleNameRef = ref()
 const titleValueRef = ref()
@@ -157,8 +220,10 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
   }
   // 加载明细列表
   if(!props.isBasic) {
+    // 设置主表id
+    masterId.value = row.id
     tableObject.params = {
-      id: row.id
+      masterId: row.id
     }
     getList()
   } 
@@ -199,11 +264,93 @@ const getChangeRecordList = async () => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: props.detailApi?.getDetasListPage // 在主表API中添加根据主表ID获取明细列表分页方法
+  getListApi: props.apiPage // 分页接口
 })
 // 获得表格的各种操作
 const { getList } = tableMethods
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchaseclaim-request-main:create' }), // 新增
+]
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮 
+    console.log('其他按钮', item)
+  }
+}
 
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+// 列表-操作按钮
+const buttondata = (row) => {
+  return [
+    defaultButtons.mainListEditBtn({ hide: false, hasPermi: 'wms:purchaseclaim-request-main:update' }), // 编辑
+    defaultButtons.mainListDeleteBtn({ hide: false, hasPermi: 'wms:purchaseclaim-request-main:delete' }), // 删除
+  ]
+}
+// 列表-操作按钮事件 
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = async (type: string, row?: number) => {
+  formRef.value.open(type, row)
+}
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+    } else {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      setV['ppNumber'] = val[0]['ppNumber']
+      setV['poLine'] = val[0]['poLine']
+      setV['batch'] = val[0]['batch']
+      setV['altBatch'] = val[0]['altBatch']
+      setV['reason'] = val[0]['reason']
+      setV['singlePrice'] = val[0]['singlePrice']
+      setV['amount'] = val[0]['amount']
+      setV['number'] = val[0]['number']
+      setV['itemCode'] = val[0]['itemCode']
+      setV['itemName'] = val[0]['itemName']
+      setV['itemDesc1'] = val[0]['itemDesc1']
+      setV['itemDesc2'] = val[0]['itemDesc2']
+      setV['projectCode'] = val[0]['projectCode']
+      setV['qty'] = val[0]['qty']
+      setV['uom'] = val[0]['uom']
+      setV['remark'] = val[0]['remark']
+      formRef.setValues(setV)
+    }
+  })
+}
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await props.apiDelete(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch { }
+}
 </script>
 <style lang="scss">
 .el-drawer__body {

src/utils/disposition/tableColumns.ts

@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,formatGetTime } from '@/utils/formatTime'
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index.ts'
 // import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
 // import { h } from 'vue'
@@ -10556,10 +10556,11 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'requestTime',
     formatter: dateFormatter,
     form: {
-      value: new Date(),
       component: 'DatePicker',
       componentProps: {
         type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
     },
     detail: {
@@ -10577,6 +10578,8 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'DatePicker',
       componentProps: {
         type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
     },
     detail: {
@@ -10786,75 +10789,126 @@ export const PurchaseclaimRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'poNumber',
     tableForm:{
       isInpuFocusShow: true
-    }
+    },
-    
+    table: {
+      width: 150
+    },
   },
   {
     label: '订单行',
-    field: 'poLine'
+    field: 'poLine',
+    table: {
+      width: 150
+    },
   },
   {
     label: '批次',
-    field: 'batch'
+    field: 'batch',
+    table: {
+      width: 150
+    },
   },
   {
     label: '替代批次',
-    field: 'altBatch'
+    field: 'altBatch',
+    table: {
+      width: 150
+    },
   },
   {
     label: '原因',
     field: 'reason',
-    dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
+    // dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
-    dictClass: 'string'
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
   },
   {
     label: '单价',
-    field: 'singlePrice'
+    field: 'singlePrice',
+    table: {
+      width: 150
+    },
   },
   {
     label: '金额',
-    field: 'amount'
+    field: 'amount',
+    table: {
+      width: 150
+    },
   },
   {
     label: '单据号',
-    field: 'number'
+    field: 'number',
+    table: {
+      width: 150
+    },
   },
   {
     label: '物品代码',
-    field: 'itemCode'
+    field: 'itemCode',
+    table: {
+      width: 150
+    },
   },
   {
     label: '物品名称',
-    field: 'itemName'
+    field: 'itemName',
+    table: {
+      width: 150
+    },
   },
   {
     label: '物品描述1',
-    field: 'itemDesc1'
+    field: 'itemDesc1',
+    table: {
+      width: 150
+    },
   },
   {
     label: '物品描述2',
-    field: 'itemDesc2'
+    field: 'itemDesc2',
+    table: {
+      width: 150
+    },
   },
   {
     label: '项目代码',
-    field: 'projectCode'
+    field: 'projectCode',
+    table: {
+      width: 150
+    },
   },
   {
     label: '数量',
-    field: 'qty'
+    field: 'qty',
+    table: {
+      width: 150
+    },
   },
   {
     label: '计量单位',
-    field: 'uom'
+    field: 'uom',
+    table: {
+      width: 150
+    },
   },
   {
     label: '备注',
-    field: 'remark'
+    field: 'remark',
+    table: {
+      width: 150
+    },
   },
   {
     label: '创建者',
     field: 'creator',
-    isTableForm:false
+    isTableForm:false,
+    table: {
+      width: 150
+    },
+    isForm:false
   },
   {
     label: '创建时间',
@@ -10864,12 +10918,20 @@ export const PurchaseclaimRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
-    isTableForm:false
+    isTableForm:false,
+    table: {
+      width: 150
+    },
+    isForm:false
   },
   {
     label: '最后更新者',
     field: 'updater',
-    isTableForm:false
+    isTableForm:false,
+    table: {
+      width: 150
+    },
+    isForm:false
   },
   {
     label: '最后更新时间',
@@ -10879,8 +10941,22 @@ export const PurchaseclaimRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
-    isTableForm:false
+    isTableForm:false,
+    table: {
+      width: 150
+    },
+    isForm:false
   },
+   {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150
+    },
+    isTableForm:false,
+  }
 ]))
 // 表单校验
 export const PurchaseclaimRequestDetailRules = reactive({

src/utils/formatTime.ts

@@ -155,6 +155,15 @@ export const dateFormatter = (row, column, cellValue) => {
   }
   return formatDate(cellValue)
 }
+// 获取时间戳
+export const formatGetTime = (row, column, cellValue) => {
+  console.log(cellValue.getTime())
+  // if (!cellValue) {
+  //   return
+  // }
+  // const time = new Date(cellValue).getTime()
+  // return time
+}
 
 /**
  * element plus 的时间 Formatter 实现，使用 YYYY-MM-DD 格式

src/views/wms/purchaseclaimRequestMain/index.vue

@@ -57,7 +57,12 @@
     :isBasic="false" 
     :allSchemas="PurchaseclaimRequestMain.allSchemas"
     :detailAllSchemas="PurchaseclaimRequestDetail.allSchemas"
-    :detailApi="PurchaseclaimRequestMainApi"
+    :detailAllSchemasRules="PurchaseclaimRequestDetailRules"
+    :searchTableParams="searchTableParams"
+    :apiCreate="PurchaseclaimRequestDetailApi.createPurchaseclaimRequestDetail"
+    :apiUpdate="PurchaseclaimRequestDetailApi.updatePurchaseclaimRequestDetail"
+    :apiPage="PurchaseclaimRequestDetailApi.getPurchaseclaimRequestDetailPage"
+    :apiDelete="PurchaseclaimRequestDetailApi.deletePurchaseclaimRequestDetail"
   />
 
   <!-- 导入 -->
@@ -67,6 +72,7 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as PurchaseclaimRequestMainApi from '@/api/wms/purchaseclaimRequestMain'
+import * as PurchaseclaimRequestDetailApi from '@/api/wms/purchaseclaimRequestDetail'
 import * as supplierdeliverRecordMainApi from '@/api/wms/supplierdeliverRecordMain'
 import * as supplierdeliverRecordDetailApi from '@/api/wms/supplierdeliverRecordDetail'
 import { PurchaseclaimRequestMain, PurchaseclaimRequestMainRules, PurchaseclaimRequestDetail, PurchaseclaimRequestDetailRules, SupplierdeliverRecordMain, SupplierdeliverRecordDetail } from '@/utils/disposition/tableColumns'
@@ -214,9 +220,13 @@ const buttonTableClick = async (val, row) => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm = (type: string, id?: number) => {
+const openForm =async (type: string, row?: number) => {
   tableData.value = [] // 重置明细数据
-  formRef.value.open(type, id)
+  //  if (row?.id) {
+  //   const data= await PurchaseclaimRequestMainApi.getPurchaseclaimRequestMain(row.id)
+  //   tableData.value = data.subList
+  // }
+  formRef.value.open(type, row)
 }
 
 /** 详情操作 */
@@ -273,7 +283,7 @@ const handleDeleteTable = (item, index) => {
 // 主子数据 提交
 const submitForm = async (formType, data) => {
   data.subList = tableData.value // 拼接子表数据参数
-  console.log(data);
+  try {
     if (formType === 'create') {
       await PurchaseclaimRequestMainApi.createPurchaseclaimRequestMain(data)
       message.success(t('common.createSuccess'))
@@ -282,9 +292,13 @@ const submitForm = async (formType, data) => {
       message.success(t('common.updateSuccess'))
     }
     formRef.value.dialogVisible = false
-
     // 刷新当前列表
     getList()
+  } finally {
+    formRef.value.formLoading = false
+
+  }
+
 }
 
 /** 导入 */