BUG修改

src/api/wms/supplierdeliverRequestMain/index.ts

@@ -87,6 +87,10 @@ export const rejSupplierdeliverRequestMain = async (id: number) => {
 export const genLabel = async (id) => {
   return await request.post({ url: `/wms/supplierdeliver-request-main/genLabel?id=` + id })
 }
+// 生成记录
+export const genRecordsSupplierdeliverRequestMain = async (id) => {
+  return await request.post({ url: `/wms/supplierdeliver-request-main/genRecords?id=` + id })
+}
 // 导出供应商发货申请主 Excel
 export const exportSupplierdeliverRequestMain = async (params) => {
   return await request.download({ url: `/wms/supplierdeliver-request-main/export-excel`, params })

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

@@ -38,7 +38,8 @@
 
   <!-- 详情 -->
   <Detail ref="detailRef" :isBasic="false" :allSchemas="SupplierdeliverRequestMain.allSchemas"
-    :detailAllSchemas="SupplierdeliverRequestDetail.allSchemas" :detailAllSchemasRules="SupplierdeliverRequestDetailRules"
+    :detailAllSchemas="SupplierdeliverRequestDetail.allSchemas"
+    :detailAllSchemasRules="SupplierdeliverRequestDetailRules"
     :apiCreate="SupplierdeliverRequestDetailApi.createSupplierdeliverRequestDetail"
     :apiUpdate="SupplierdeliverRequestDetailApi.updateSupplierdeliverRequestDetail"
     :apiPage="SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage"
@@ -46,11 +47,13 @@
     @searchTableSuccessDetail="searchTableSuccessDetail" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/supplierdeliver-request-main/import" :importTemplateData="importTemplateData"
+  <ImportForm ref="importFormRef" url="/wms/supplierdeliver-request-main/import"
-    @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+    :importTemplateData="importTemplateData" @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true"
+    :mode="2" />
 
   <!-- 打印 -->
-  <el-dialog v-model="dialogVisible" :title="dialogTitle" width="60%">
+  <point ref='pointRef' :detailListTableColumns='detailListTableColumns' />
+  <!-- <el-dialog v-model="dialogVisible" :title="dialogTitle" width="60%">
     <Table :columns="detailListTableColumns" :data="detatableData.tableList" :loading="detatableData.loading" :pagination="{
       total: detatableData.total
     }" v-model:pageSize="detatableData.pageSize" v-model:currentPage="detatableData.currentPage"
@@ -63,37 +66,38 @@
     <el-button @click="genLabel()">生成标签</el-button>
 
     <el-button @click="print">打印</el-button>
-  </el-dialog>
+  </el-dialog> -->
 </template>
 
 <script setup lang="ts">
-import download from '@/utils/download'
+  import download from '@/utils/download'
-import { getAccessToken } from '@/utils/auth'
+  import { getAccessToken } from '@/utils/auth'
-import { SupplierdeliverRequestMain, SupplierdeliverRequestMainRules, SupplierdeliverRequestDetail, SupplierdeliverRequestDetailRules } from './supplierdeliverRequestMain.data'
+  import { SupplierdeliverRequestMain, SupplierdeliverRequestMainRules, SupplierdeliverRequestDetail, SupplierdeliverRequestDetailRules } from './supplierdeliverRequestMain.data'
-import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
+  import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
-import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
+  import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
-import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import * as defaultButtons from '@/utils/disposition/defaultButtons'
-// import * as PackageApi from '@/api/wms/package'
+  import point from '@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue'
-// import * as BarbasicApi from '@/api/wms/barbasic'
+  // import * as PackageApi from '@/api/wms/package'
-
+  // import * as BarbasicApi from '@/api/wms/barbasic'
-// 供应商发货申请
+
-defineOptions({ name: 'SupplierdeliverRequestMain' })
+  // 供应商发货申请
-
+  defineOptions({ name: 'SupplierdeliverRequestMain' })
-const message = useMessage() // 消息弹窗
+
-const { t } = useI18n() // 国际化
+  const message = useMessage() // 消息弹窗
-
+  const { t } = useI18n() // 国际化
-const route = useRoute() // 路由信息
+
-const routeName = ref()
+  const route = useRoute() // 路由信息
-routeName.value = route.name
+  const routeName = ref()
-const tableColumns = ref(SupplierdeliverRequestMain.allSchemas.tableColumns)
+  routeName.value = route.name
-
+  const tableColumns = ref(SupplierdeliverRequestMain.allSchemas.tableColumns)
-// 字段设置 更新主列表字段
+
-const updataTableColumns = (val) => {
+  // 字段设置 更新主列表字段
+  const updataTableColumns = (val) => {
     tableColumns.value = val
-}
+  }
 
-// 查询页面返回
+  // 查询页面返回
-const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
+  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
     nextTick(() => {
       if (type == 'tableForm') {
         // 明细查询页赋值
@@ -104,29 +108,29 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         formRef.setValues(setV)
       }
     })
-}
+  }
-// 查询页面返回——详情
+  // 查询页面返回——详情
-const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+  const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
     nextTick(() => {
       const setV = {}
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
     })
-}
+  }
 
-// 子表新增的时候选择表格之后需要会显得字段
+  // 子表新增的时候选择表格之后需要会显得字段
-// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+  // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
-const Echo = []
+  const Echo = []
 
-const { tableObject, tableMethods } = useTable({
+  const { tableObject, tableMethods } = useTable({
     getListApi: SupplierdeliverRequestMainApi.getSupplierdeliverRequestMainPage // 分页接口
-})
+  })
 
-// 获得表格的各种操作
+  // 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
+  const { getList, setSearchParams } = tableMethods
 
-// 列表头部按钮
+  // 列表头部按钮
-const HeadButttondata = [
+  const HeadButttondata = [
     defaultButtons.defaultAddBtn({ hasPermi: 'wms:supplierdeliver-request-main:create' }), // 新增——需要手动修改下权限
     defaultButtons.defaultImportBtn({ hasPermi: 'wms:supplierdeliver-request-main:import' }), // 导入
     defaultButtons.defaultExportBtn({ hasPermi: 'wms:supplierdeliver-request-main:export' }), // 导出
@@ -141,10 +145,10 @@ const HeadButttondata = [
     //   icon: 'Select',
     //   color: ''
     // },
-]
+  ]
 
-// 头部按钮事件
+  // 头部按钮事件
-const buttonBaseClick = (val, item) => {
+  const buttonBaseClick = (val, item) => {
     if (val == 'add') { // 新增
       openForm('create')
     } else if (val == 'import') { // 导入
@@ -155,22 +159,22 @@ const buttonBaseClick = (val, item) => {
       getList()
     } else if (val == 'filtrate') { // 筛选
     }
-}
+  }
 
-// 根据状态返回该按钮是否显示
+  // 根据状态返回该按钮是否显示
-const isShowMainButton = (row, val) => {
+  const isShowMainButton = (row, val) => {
     if (val.indexOf(row.status) > -1) {
       return false
     } else {
       return true
     }
-}
+  }
 
-// 列表-操作按钮
+  // 列表-操作按钮
-const butttondata = (row) => {
+  const butttondata = (row) => {
     return [
       defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['5']) }), // 打开
-    defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1', '2', '3', '4']) }), // 关闭
+      defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1', '2',  '4']) }), // 关闭
       defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批
       defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过
       defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮
@@ -178,11 +182,22 @@ const butttondata = (row) => {
       defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:supplierdeliver-request-main:delete' }), // 删除
       defaultButtons.mainListPointBtn(null), // 标签打印
       defaultButtons.mainListDocumentPrintBtn(null), // 单据打印
+      // 生成记录
+      {
+        label: '处理',
+        name: 'genRecords',
+        hide: isShowMainButton(row, ['3']),
+        type: 'primary',
+        icon: '',
+        color: '',
+        hasPermi: '',
+        link: true, // 文本展现按钮
+      },
     ]
-}
+  }
 
-// 列表-操作按钮事件
+  // 列表-操作按钮事件
-const buttonTableClick = async (val, row) => {
+  const buttonTableClick = async (val, row) => {
     if (val == 'mainPurPlanOpe') { // 打开
       handleOpe(row.id)
     } else if (val == 'mainPurPlanClo') {// 关闭
@@ -193,7 +208,9 @@ const buttonTableClick = async (val, row) => {
       handleApp(row.id)
     } else if (val == 'mainPlanTur') { // 驳回按钮
       handleTur(row.id)
-  } else if (val == 'edit') { // 编辑
+    }else if (val == 'genRecords') { // 驳回按钮
+      genRecords(row.id)
+    }else if (val == 'edit') { // 编辑
       openForm('update', row)
     } else if (val == 'delete') { // 删除
       handleDelete(row.id)
@@ -202,23 +219,22 @@ const buttonTableClick = async (val, row) => {
     } else if (val == 'documentPrint') { // 单据打印
       handleDocumentPrint(row.id)
     }
-}
+  }
   
-/** 添加/修改操作 */
+  /** 详情操作 */
-const formRef = ref()
+  const detailRef = ref()
-const openForm = async (type: string, row?: number) => {
+  const openDetail = (row : any, titleName : any, titleValue : any) => {
+    detailRef.value.openDetail(row, titleName, titleValue)
+  }
+  //添加/修改操作
+   const formRef = ref()
+  const openForm = async (type: string, row?: number) => {
     tableData.value = [] // 重置明细数据
     formRef.value.open(type, row)
-}
+  }
-
-/** 详情操作 */
-const detailRef = ref()
-const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue)
-}
 
-/** 删除按钮操作 */
+  /** 删除按钮操作 */
-const handleDelete = async (id: number) => {
+  const handleDelete = async (id : number) => {
     try {
       // 删除的二次确认
       await message.delConfirm()
@@ -228,10 +244,10 @@ const handleDelete = async (id: number) => {
       // 刷新列表
       await getList()
     } catch { }
-}
+  }
 
-/** 关闭按钮操作 */
+  /** 关闭按钮操作 */
-const handleClo = async (id: number) => {
+  const handleClo = async (id : number) => {
     try {
       // 关闭的二次确认
       await message.confirm('是否关闭所选中数据？')
@@ -241,10 +257,10 @@ const handleClo = async (id: number) => {
       // 刷新列表
       await getList()
     } catch { }
-}
+  }
 
-/** 打开按钮操作 */
+  /** 打开按钮操作 */
-const handleOpe = async (id: number) => {
+  const handleOpe = async (id : number) => {
     try {
       // 打开的二次确认
       await message.confirm('是否打开所选中数据？')
@@ -254,10 +270,10 @@ const handleOpe = async (id: number) => {
       // 刷新列表
       await getList()
     } catch { }
-}
+  }
 
-/** 提交审批按钮操作 */
+  /** 提交审批按钮操作 */
-const handleSub = async (id: number) => {
+  const handleSub = async (id : number) => {
     try {
       // 提交审批的二次确认
       await message.confirm('是否提交审批所选中数据？')
@@ -267,10 +283,10 @@ const handleSub = async (id: number) => {
       // 刷新列表
       await getList()
     } catch { }
-}
+  }
 
-/** 审批通过按钮操作 */
+  /** 审批通过按钮操作 */
-const handleApp = async (id: number) => {
+  const handleApp = async (id : number) => {
     try {
       // 审批通过的二次确认
       await message.confirm('是否审批通过所选中数据？')
@@ -280,10 +296,10 @@ const handleApp = async (id: number) => {
       // 刷新列表
       await getList()
     } catch { }
-}
+  }
 
-/** 驳回按钮操作 */
+  /** 驳回按钮操作 */
-const handleTur = async (id: number) => {
+  const handleTur = async (id : number) => {
     try {
       // 驳回的二次确认
       await message.confirm('是否驳回所选中数据？')
@@ -293,11 +309,24 @@ const handleTur = async (id: number) => {
       // 刷新列表
       await getList()
     } catch { }
-}
+  }
   
-/** 导出按钮操作 */
+  /** 处理按钮操作 */
-const exportLoading = ref(false) // 导出的加载中
+  const genRecords = async (id : number) => {
-const handleExport = async () => {
+    try {
+      // 处理的二次确认
+      await message.confirm('是否处理所选中数据？')
+      // 发起处理
+      await SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id)
+      message.success(t('处理成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
+  /** 导出按钮操作 */
+  const exportLoading = ref(false) // 导出的加载中
+  const handleExport = async () => {
     try {
       // 导出的二次确认
       await message.exportConfirm()
@@ -309,27 +338,20 @@ const handleExport = async () => {
     } finally {
       exportLoading.value = false
     }
-}
+  }
-
-//打印
-const { tableObject: detatableData, tableMethods: detatableMethods } = useTable({
-  getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage
-})
-
-const { getList: getDetailList } = detatableMethods
 
-const detailTableColumns = ref(SupplierdeliverRequestDetail.allSchemas.tableColumns)
+  const detailTableColumns = ref(SupplierdeliverRequestDetail.allSchemas.tableColumns)
-const detailListTableColumns = detailTableColumns.value.filter(item => item.label != '操作' && item.label != '创建者' && item.label != '创建时间' && item.label != '最后更新者' && item.label != '最后更新时间')
+  const detailListTableColumns = detailTableColumns.value.filter(item => item.label != '操作' && item.label != '创建者' && item.label != '创建时间' && item.label != '最后更新者' && item.label != '最后更新时间')
-const dialogVisible = ref(false)
+  const dialogVisible = ref(false)
-const isShow = ref(false)
+  const isShow = ref(false)
-const dialogTitle = ref('')
+  const dialogTitle = ref('')
-const closeDialog = () => {
+  const closeDialog = () => {
     dialogVisible.value = false
     isShow.value = false
-}
+  }
 
-/** 生成标签按钮操作 */
+  /** 生成标签按钮操作 */
-const genLabel = async () => {
+  const genLabel = async () => {
     try {
       // 生成标签的二次确认
       await message.confirm('是否为此数据生成标签？')
@@ -341,23 +363,23 @@ const genLabel = async () => {
       // 刷新列表
       await getList()
     } catch { }
-}
+  }
 
-const BASE_URL = 'http://dev.ccwin-in.com:25110'
+  const BASE_URL = 'http://dev.ccwin-in.com:25110'
-const src = ref(BASE_URL + '/jmreport/view/881303562245316608?token=' + getAccessToken())
+  const src = ref(BASE_URL + '/jmreport/view/881303562245316608?token=' + getAccessToken())
-const genLabelId = ref();
+  const genLabelId = ref();
-// 标签打印
+  // 标签打印
-const handlePoint = async (row) => {
+  const pointRef = ref()
-  tableObject.params = {
+  const handlePoint = async (row) => {
-    masterId: row.id,
+
+    pointRef.value.openPoint(row.id)
+    // console.log(tableObject.params);
+    // dialogVisible.value = true
+    // dialogTitle.value = row.number + '单据号'
+    // genLabelId.value = row.number
   }
-  await getDetailList()
-  dialogVisible.value = true
-  dialogTitle.value = row.number + '单据号'
-  genLabelId.value = row.number
-}
 
-const print = async () => {
+  const print = async () => {
     //向包装表里插入数据
     //   const packageArray:any= ref([])
     //   let packageObject = {
@@ -435,35 +457,35 @@ const print = async () => {
     //   })
     //   await BarbasicApi.createBarbasic(JSON.parse(JSON.stringify(barBasicArray.value)))
     window.open(src.value + '&number=' + detatableData.tableList[0].number)
-}
+  }
 
-// 单据打印
+  // 单据打印
-const documentSrc = ref(BASE_URL + '/jmreport/view/884680688168280064?token=' + getAccessToken())
+  const documentSrc = ref(BASE_URL + '/jmreport/view/884680688168280064?token=' + getAccessToken())
-const handleDocumentPrint = async (id) => {
+  const handleDocumentPrint = async (id) => {
     window.open(documentSrc.value + '&id=' + id)
-}
+  }
 
-/**
+  /**
     * tableForm方法
-*/
+  */
-const tableFormKeys = {}
+  const tableFormKeys = {}
-SupplierdeliverRequestDetail.allSchemas.tableFormColumns.forEach(item => {
+  SupplierdeliverRequestDetail.allSchemas.tableFormColumns.forEach(item => {
 
     tableFormKeys[item.field] = item.default ? item.default : ''
-})
+  })
-const tableData = ref([])
+  const tableData = ref([])
 
-// 添加明细
+  // 添加明细
-const handleAddTable = () => {
+  const handleAddTable = () => {
     tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
-}
+  }
-// 删除明细
+  // 删除明细
-const handleDeleteTable = (item, index) => {
+  const handleDeleteTable = (item, index) => {
     tableData.value.splice(index, 1)
-}
+  }
 
-// 主子数据 提交
+  // 主子数据 提交
-const submitForm = async (formType, data) => {
+  const submitForm = async (formType, data) => {
     data.subList = tableData.value // 拼接子表数据参数
     try {
       if (formType === 'create') {
@@ -479,37 +501,37 @@ const submitForm = async (formType, data) => {
     } finally {
       formRef.value.formLoading = false
     }
-}
+  }
 
-/** 导入 */
+  /** 导入 */
-const importFormRef = ref()
+  const importFormRef = ref()
-const handleImport = () => {
+  const handleImport = () => {
     importFormRef.value.open()
-}
+  }
 
-// 导入附件弹窗所需的参数
+  // 导入附件弹窗所需的参数
-const importTemplateData = reactive({
+  const importTemplateData = reactive({
     templateUrl: '',
     templateTitle: '供应商发货申请主导入模版.xls'
-})
+  })
 
-// 导入成功之后
+  // 导入成功之后
-const importSuccess = () => {
+  const importSuccess = () => {
     getList()
-}
+  }
 
-// 筛选提交
+  // 筛选提交
-const searchFormClick = (searchData) => {
+  const searchFormClick = (searchData) => {
     tableObject.params = {
       isSearch: true,
       filters: searchData.filters
     }
     getList() // 刷新当前列表
-}
+  }
 
-/** 初始化 **/
+  /** 初始化 **/
-onMounted(async () => {
+  onMounted(async () => {
     getList()
     importTemplateData.templateUrl = await SupplierdeliverRequestMainApi.importTemplate()
-})
+  })
 </script>

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

@@ -0,0 +1,98 @@
+<template>
+  <!-- 打印 -->
+  <el-dialog v-model="dialogVisiblePoint" :title="dialogTitle" width="60%">
+    <Table :columns="detailListTableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+      total: tableObject.total
+    }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort">
+      <template #batch="{ row }">
+        <el-input v-model="row.batch">{{ row.batch }}</el-input>
+      </template>
+    </Table>
+    <el-button @click="closeDialog">关闭</el-button>
+    <el-button @click="genLabel()">生成标签</el-button>
+
+    <el-button @click="print">打印</el-button>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { getAccessToken } from '@/utils/auth'
+import { SupplierdeliverRequestMain, SupplierdeliverRequestMainRules, SupplierdeliverRequestDetail, SupplierdeliverRequestDetailRules } from './supplierdeliverRequestMain.data'
+import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
+import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+// import * as PackageApi from '@/api/wms/package'
+// import * as BarbasicApi from '@/api/wms/barbasic'
+const props = defineProps({
+  // 表頭
+  detailListTableColumns: {
+    type: Array,
+    required: true,
+    default: null
+  },
+})
+
+// 供应商发货申请
+defineOptions({ name: 'SupplierdeliverRequestMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(SupplierdeliverRequestMain.allSchemas.tableColumns)
+
+
+const dialogVisiblePoint = ref(false)
+const { tableObject, tableMethods } = useTable({
+  getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage // 分页接口
+})
+const dialogVisible = ref(false)
+const isShow = ref(false)
+const dialogTitle = ref('')
+const closeDialog = () => {
+  dialogVisiblePoint.value = false
+  isShow.value = false
+}
+// const print = async () => {
+//   window.open(src.value + '&number=' + detatableData.tableList[0].number)
+// }
+
+/** 生成标签按钮操作 */
+const genLabel = async () => {
+  try {
+    // 生成标签的二次确认
+    await message.confirm('是否为此数据生成标签？')
+    // 发起生成标签
+    await SupplierdeliverRequestMainApi.genLabel(genLabelId.value)
+    dialogVisible.value = false
+    isShow.value = false
+    message.success(t('生成标签成功!'))
+    dialogVisiblePoint.value = false
+    isShow.value = false
+    // 刷新列表
+    await getList()
+  } catch { }
+}
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+const genLabelId = ref();
+const  openPoint = async (masterId)=>{
+  tableObject.params = {
+    masterId:masterId,
+  }
+  dialogVisiblePoint.value = true
+   genLabelId.value = masterId
+   getList()
+}
+defineExpose({ openPoint }) // 提供 open 方法，用于打开弹窗
+
+
+/** 初始化 **/
+onMounted(async () => {
+ 
+})
+</script>