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,7 +66,7 @@
     <el-button @click="genLabel()">生成标签</el-button>
 
     <el-button @click="print">打印</el-button>
-  </el-dialog>
+  </el-dialog> -->
 </template>
 
 <script setup lang="ts">
@@ -73,6 +76,7 @@ import { SupplierdeliverRequestMain, SupplierdeliverRequestMainRules, Supplierde
   import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
   import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
+  import point from '@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue'
   // import * as PackageApi from '@/api/wms/package'
   // import * as BarbasicApi from '@/api/wms/barbasic'
 
@@ -170,7 +174,7 @@ const isShowMainButton = (row, val) => {
   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,6 +182,17 @@ 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, // 文本展现按钮
+      },
     ]
   }
 
@@ -193,6 +208,8 @@ const buttonTableClick = async (val, row) => {
       handleApp(row.id)
     } else if (val == 'mainPlanTur') { // 驳回按钮
       handleTur(row.id)
+    }else if (val == 'genRecords') { // 驳回按钮
+      genRecords(row.id)
     }else if (val == 'edit') { // 编辑
       openForm('update', row)
     } else if (val == 'delete') { // 删除
@@ -204,18 +221,17 @@ const buttonTableClick = async (val, row) => {
     }
   }
   
-/** 添加/修改操作 */
-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 formRef = ref()
+  const openForm = async (type: string, row?: number) => {
+    tableData.value = [] // 重置明细数据
+    formRef.value.open(type, row)
+  }
 
   /** 删除按钮操作 */
   const handleDelete = async (id : number) => {
@@ -295,6 +311,19 @@ const handleTur = async (id: number) => {
     } catch { }
   }
   
+  /** 处理按钮操作 */
+  const genRecords = async (id : number) => {
+    try {
+      // 处理的二次确认
+      await message.confirm('是否处理所选中数据？')
+      // 发起处理
+      await SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id)
+      message.success(t('处理成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
   /** 导出按钮操作 */
   const exportLoading = ref(false) // 导出的加载中
   const handleExport = async () => {
@@ -311,13 +340,6 @@ const handleExport = async () => {
     }
   }
 
-//打印
-const { tableObject: detatableData, tableMethods: detatableMethods } = useTable({
-  getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage
-})
-
-const { getList: getDetailList } = detatableMethods
-
   const detailTableColumns = ref(SupplierdeliverRequestDetail.allSchemas.tableColumns)
   const detailListTableColumns = detailTableColumns.value.filter(item => item.label != '操作' && item.label != '创建者' && item.label != '创建时间' && item.label != '最后更新者' && item.label != '最后更新时间')
   const dialogVisible = ref(false)
@@ -347,14 +369,14 @@ const BASE_URL = 'http://dev.ccwin-in.com:25110'
   const src = ref(BASE_URL + '/jmreport/view/881303562245316608?token=' + getAccessToken())
   const genLabelId = ref();
   // 标签打印
+  const pointRef = ref()
   const handlePoint = async (row) => {
-  tableObject.params = {
+
-    masterId: row.id,
+    pointRef.value.openPoint(row.id)
-  }
+    // console.log(tableObject.params);
-  await getDetailList()
+    // dialogVisible.value = true
-  dialogVisible.value = true
+    // dialogTitle.value = row.number + '单据号'
-  dialogTitle.value = row.number + '单据号'
+    // genLabelId.value = row.number
-  genLabelId.value = row.number
   }
 
   const print = async () => {

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>