BUG修改

src/api/wms/supplierdeliverRequestMain/index.ts

@@ -88,7 +88,7 @@ export const genLabel = async (id) => {
   return await request.post({ url: `/wms/supplierdeliver-request-main/genLabel?id=` + id })
 }
 // 生成记录
-export const genRecordsSupplierdeliverRequestMain = async (id) => {
+export const genRecordsSupplierinvoiceRequestMain = async (id) => {
   return await request.post({ url: `/wms/supplierdeliver-request-main/genRecords?id=` + id })
 }
 // 导出供应商发货申请主 Excel

src/api/wms/supplierinvoiceRequestDetail/index.ts

@@ -34,6 +34,11 @@ export const getSupplierinvoiceRequestDetailPage = async (params) => {
   }
 }
 
+// 查询供应商发票申请主详情
+export const getPoNumber = async (params) => {
+  return await request.get({ url: `/wms/supplierinvoice-request-detail/getPoNumber`, params})
+}
+
 // 查询供应商发票申请子详情
 export const getSupplierinvoiceRequestDetail = async (id: number) => {
   return await request.get({ url: `/wms/supplierinvoice-request-detail/get?id=` + id })

src/api/wms/supplierinvoiceRequestMain/index.ts

@@ -56,6 +56,30 @@ export const deleteSupplierinvoiceRequestMain = async (id: number) => {
   return await request.delete({ url: `/wms/supplierinvoice-request-main/delete?id=` + id })
 }
 
+// 打开供应商发货申请主
+export const opeSupplierinvoiceRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/supplierinvoice-request-main/open?id=` + id })
+}
+// 关闭供应商发货申请主
+export const cloSupplierinvoiceRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/supplierinvoice-request-main/close?id=` + id })
+}
+// 提交审批供应商发货申请主
+export const subSupplierinvoiceRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/supplierinvoice-request-main/sub?id=` + id })
+}
+// 审批通过供应商发货申请主
+export const appSupplierinvoiceRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/supplierinvoice-request-main/app?id=` + id })
+}
+// 驳回供应商发货申请主
+export const rejSupplierinvoiceRequestMain = async (id: number) => {
+  return await request.post({ url: `/wms/supplierinvoice-request-main/rej?id=` + id })
+}
+// 生成记录
+export const genRecordsSupplierinvoiceRequestMain = async (id) => {
+  return await request.post({ url: `/wms/supplierinvoice-request-main/genRecords?id=` + id })
+}
 // 导出供应商发票申请主 Excel
 export const exportSupplierinvoiceRequestMain = async (params) => {
   return await request.download({ url: `/wms/supplierinvoice-request-main/export-excel`, params })

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@@ -1,32 +1,21 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="SupplierinvoiceRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="SupplierinvoiceRequestMain.allSchemas.searchSchema" @search="setSearchParams"
+      @reset="setSearchParams" />
   </ContentWrap>
 
   <!-- 列表头部 -->
-    <TableHead
+  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
-      :HeadButttondata="HeadButttondata"
+    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
-      @button-base-click="buttonBaseClick"
+    :allSchemas="SupplierinvoiceRequestMain.allSchemas" />
-      :routeName="routeName"
-      @updataTableColumns="updataTableColumns"
-      @searchFormClick="searchFormClick"
-      :allSchemas="SupplierinvoiceRequestMain.allSchemas"
-    />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table
+    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
-      :columns="tableColumns"
-      :data="tableObject.tableList"
-      :loading="tableObject.loading"
-      :pagination="{
         total: tableObject.total
-      }"
+      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
-      v-model:pageSize="tableObject.pageSize"
+      v-model:sort="tableObject.sort">
-      v-model:currentPage="tableObject.currentPage"
-      v-model:sort="tableObject.sort"
-    >
       <template #number="{row}">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
           <span>{{ row.number }}</span>
@@ -39,38 +28,22 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm
+  <BasicForm ref="formRef" @success="getList" :rules="SupplierinvoiceRequestMainRules"
-    ref="formRef"
+    :formAllSchemas="SupplierinvoiceRequestMain.allSchemas" :searchTableParams="searchTableParams"
-    @success="getList"
+    :tableAllSchemas="SupplierinvoiceRequestDetail.allSchemas" :tableFormRules="SupplierinvoiceRequestDetailRules"
-    :rules="SupplierinvoiceRequestMainRules"
+    :tableData="tableData" :apiUpdate="SupplierinvoiceRequestMainApi.updateSupplierinvoiceRequestMain"
-    :formAllSchemas="SupplierinvoiceRequestMain.allSchemas"
+    :apiCreate="SupplierinvoiceRequestMainApi.createSupplierinvoiceRequestMain" :isBusiness="true"
-    :searchTableParams="searchTableParams"
+    @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess"
-    :tableAllSchemas="SupplierinvoiceRequestDetail.allSchemas"
+    @submitForm="submitForm" />
-    :tableFormRules="SupplierinvoiceRequestDetailRules"
-    :tableData="tableData"
-    :apiUpdate="SupplierinvoiceRequestMainApi.updateSupplierinvoiceRequestMain"
-    :apiCreate="SupplierinvoiceRequestMainApi.createSupplierinvoiceRequestMain"
-    :isBusiness="true"
-    @handleAddTable="handleAddTable"
-    @handleDeleteTable="handleDeleteTable"
-    @searchTableSuccess="searchTableSuccess"
-    @submitForm="submitForm"
-  />
 
   <!-- 详情 -->
-  <Detail
+  <Detail ref="detailRef" :isBasic="false" :allSchemas="SupplierinvoiceRequestMain.allSchemas"
-    ref="detailRef"
-    :isBasic="false"
-    :allSchemas="SupplierinvoiceRequestMain.allSchemas"
     :detailAllSchemas="SupplierinvoiceRequestDetail.allSchemas"
-    :detailAllSchemasRules="SupplierinvoiceRequestDetailRules"
+    :detailAllSchemasRules="SupplierinvoiceRequestDetailRules" :searchTableParams="searchTableParams"
-    :searchTableParams="searchTableParams"
     :apiCreate="SupplierinvoiceRequestDetailApi.createSupplierinvoiceRequestDetail"
     :apiUpdate="SupplierinvoiceRequestDetailApi.updateSupplierinvoiceRequestDetail"
     :apiPage="SupplierinvoiceRequestDetailApi.getSupplierinvoiceRequestDetailPage"
-    :apiDelete="SupplierinvoiceRequestDetailApi.deleteSupplierinvoiceRequestDetail"
+    :apiDelete="SupplierinvoiceRequestDetailApi.deleteSupplierinvoiceRequestDetail" :Echo="Echo" />
-    :Echo="Echo"
-  />
 </template>
 
 <script setup lang="ts">
@@ -112,22 +85,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     nextTick(() => {
       if (type == 'tableForm') {
         // 明细查询页赋值
-      //row[formField] = val[0][searchField]
+        row[formField] = val[0][searchField]
-      //row['poLine'] = val[0]['poLine']
+        if (formField == 'poNumber') {
-      //row['batch'] = val[0]['toBatch']
+          row['poNumber'] = val[0]['poNumber']
-      //row['altBatch'] = val[0]['altBatch']
+          row['poLine'] = val[0]['poLine']
-      //row['itemCode'] = val[0]['itemCode']
+          row['itemCode'] = val[0]['itemCode']
-      //row['itemName'] = val[0]['itemName']
+        }
-      //row['itemDesc1'] = val[0]['itemDesc1']
-      //row['itemDesc2'] = val[0]['itemDesc2']
-      //row['projectCode'] = val[0]['projectCode']
-      //row['qty'] = val[0]['qty']
-      //row['uom'] = val[0]['uom']
       } else {
         const setV = {}
         setV[formField] = val[0][searchField]
-      //setV['ppNumber'] = val[0]['ppNumber']
-      //setV['supplierCode'] = val[0]['supplierCode']
         formRef.setValues(setV)
       }
     })
@@ -146,7 +112,6 @@ const { getList, setSearchParams } = tableMethods
   // 列表头部按钮
   const HeadButttondata = [
     defaultButtons.defaultAddBtn({ hasPermi: 'wms:supplierinvoice-request-main:create' }), // 新增——需要手动修改下权限
-  
     defaultButtons.defaultExportBtn({ hasPermi: 'wms:supplierinvoice-request-main:export' }), // 导出
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选
@@ -189,13 +154,24 @@ const isShowMainButton = (row,val) => {
   // 列表-操作按钮
   const butttondata = (row) => {
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭
+      defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['5']) }), // 打开
-        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // 重新添加
+      defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1', '2', '4']) }), // 关闭
-        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // 提交审批
+      defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批
-        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // 驳回
+      defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过
-        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过
+      defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮
       defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierinvoice-request-main:update' }), // 编辑
-        defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-request-main:delete'}), // 删除
+      // 生成记录
+      {
+        label: '处理',
+        name: 'genRecords',
+        hide: isShowMainButton(row, ['3']),
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: '',
+        link: true, // 文本展现按钮
+      },
+      // defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-request-main:delete'}), // 删除
     ]
   }
 
@@ -203,16 +179,18 @@ const butttondata = (row) => {
 
   // 列表-操作按钮事件
   const buttonTableClick = async (val, row) => {
-  if (val == 'mainClose') { // 关闭
+    if (val == 'mainPurPlanOpe') { // 打开
-    console.log('列表-操作按钮事件-关闭')
+      handleOpe(row.id)
-  } else if (val == 'mainReAdd') { // 重新添加
+    } else if (val == 'mainPurPlanClo') {// 关闭
-    console.log('列表-操作按钮事件-重新添加')
+      handleClo(row.id)
-  } else if (val == 'mainSubmit') { // 提交审批
+    } else if (val == 'mainPlanSub') { // 提交审批
-    console.log('列表-操作按钮事件-提交审批')
+      handleSub(row.id)
-  } else if (val == 'mainTurnDown') { // 驳回
+    } else if (val == 'mainPlanApp') { // 审批通过
-    console.log('列表-操作按钮事件-驳回')
+      handleApp(row.id)
-  } else if (val == 'mainApprove') { // 审批通过
+    } else if (val == 'mainPlanTur') { // 驳回按钮
-    console.log('列表-操作按钮事件-审批通过')
+      handleTur(row.id)
+    } else if (val == 'genRecords') { // 处理
+      genRecords(row.id)
     } else if (val == 'edit') { // 编辑
       openForm('update', row)
     } else if (val == 'delete') { // 删除
@@ -246,6 +224,84 @@ const handleDelete = async (id: number) => {
     } catch { }
   }
 
+  /** 关闭按钮操作 */
+  const handleClo = async (id : number) => {
+    try {
+      // 关闭的二次确认
+      await message.confirm('是否关闭所选中数据？')
+      // 发起关闭
+      await SupplierinvoiceRequestMainApi.cloSupplierinvoiceRequestMain(id)
+      message.success(t('关闭成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
+  /** 打开按钮操作 */
+  const handleOpe = async (id : number) => {
+    try {
+      // 打开的二次确认
+      await message.confirm('是否打开所选中数据？')
+      // 发起打开
+      await SupplierinvoiceRequestMainApi.opeSupplierinvoiceRequestMain(id)
+      message.success(t('打开成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
+  /** 提交审批按钮操作 */
+  const handleSub = async (id : number) => {
+    try {
+      // 提交审批的二次确认
+      await message.confirm('是否提交审批所选中数据？')
+      // 发起提交审批
+      await SupplierinvoiceRequestMainApi.subSupplierinvoiceRequestMain(id)
+      message.success(t('提交审批成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
+  /** 审批通过按钮操作 */
+  const handleApp = async (id : number) => {
+    try {
+      // 审批通过的二次确认
+      await message.confirm('是否审批通过所选中数据？')
+      // 发起审批通过
+      await SupplierinvoiceRequestMainApi.appSupplierinvoiceRequestMain(id)
+      message.success(t('审批通过成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
+  /** 驳回按钮操作 */
+  const handleTur = async (id : number) => {
+    try {
+      // 驳回的二次确认
+      await message.confirm('是否驳回所选中数据？')
+      // 发起驳回
+      await SupplierinvoiceRequestMainApi.rejSupplierinvoiceRequestMain(id)
+      message.success(t('驳回成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+  
+  /** 处理按钮操作 */
+  const genRecords = async (id : number) => {
+    try {
+      // 处理的二次确认
+      await message.confirm('是否处理所选中数据？')
+      // 发起处理
+      await SupplierinvoiceRequestMainApi.genRecordsSupplierinvoiceRequestMain(id)
+      message.success(t('处理成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
   /** 导出按钮操作 */
   const exportLoading = ref(false) // 导出的加载中
   const handleExport = async () => {

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@@ -6,6 +6,7 @@ const { t } = useI18n() // 国际化
 const recordTypeList = [{ label: '收货单号', value: '1' }, { label: '退货单号', value: '2' }, { label: '索赔单号', value: '3' }]
 import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
 import * as supplierinvoiceRequestMainApi from '@/api/wms/supplierinvoiceRequestMain'
+import * as supplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceRequestDetail'
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
@@ -333,6 +334,78 @@ export const SupplierinvoiceRequestMainRules = reactive({
   ]
 })
 
+/**
+ * @returns {Array} 展示的表格
+ */
+export const SupplierinvoiceRequestDetailaa = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '订单行',
+    field: 'poNumber'
+  },
+  {
+    label: '订单行',
+    field: 'poLine'
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode'
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode'
+  },
+  {
+    label: '批次',
+    field: 'batch'
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    form: {
+      component: 'InputNumber',
+    }
+  },
+
+  {
+    label: '备注',
+    field: 'remark',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm: false,
+  }
+]))
 /**
  * @returns {Array} 供应商发票申请子表
  */
@@ -351,7 +424,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   },
   {
     label: '单号',
-   field: 'requesNumber',
+    field: 'recordNumber',
     sort: 'custom',
     table: {
       width: 150
@@ -376,28 +449,76 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '货主代码',
+    label: '订单号',
-    field: 'ownerCode'
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
     },
-  {
+    form: {
-    label: '批次',
+      // labelMessage: '信息提示说明！！！',
-    field: 'batch'
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '订单号信息',
+        searchAllSchemas: SupplierinvoiceRequestDetailaa.allSchemas,
+        searchPage: supplierinvoiceRequestDetailApi.getPoNumber
+      }
     },
-  
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '订单号信息',
+      searchAllSchemas: SupplierinvoiceRequestDetailaa.allSchemas,
+      searchPage: supplierinvoiceRequestDetailApi.getPoNumber,
+      searchCondition: [
         {
-    label: '订单号',
+          key: 'number',
-    field: 'poNumber'
+          value: 'recordNumber',
+          isMainValue: true
+        }
+        ,
+        {
+          key: 'recordType',
+          value: 'recordType',
+          isMainValue: true
+        }]
+    }
   },
   {
     label: '订单行',
-    field: 'poLine'
+    field: 'poLine',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
   },
- 
   {
     label: '物品代码',
-   field: 'itemCode'
+    field: 'itemCode',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode'
+  },
+  {
+    label: '批次',
+    field: 'batch'
   },
- 
   {
     label: '单价',
     field: 'singlePrice',