Merge remote-tracking branch 'origin/master'

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

@@ -227,7 +227,7 @@ const handleExport = async () => {
   }
 }
 
-const BASE_URL = import.meta.env.VITE_BASE_URL
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
 const src = ref(BASE_URL + '/jmreport/view/894718245021065216?token=' + getAccessToken())
 // 标签打印
 const handlePoint = async (id) => {

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

@@ -182,7 +182,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
   } else if (val == 'point') { // 标签打印
-    handlePoint(row.id)
+    handlePoint(row)
   }
 }
 
@@ -227,11 +227,11 @@ const handleExport = async () => {
   }
 }
 
-const BASE_URL = import.meta.env.VITE_BASE_URL
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
 const src = ref(BASE_URL + '/jmreport/view/894703223549108224?token=' + getAccessToken())
 // 标签打印
-const handlePoint = async (id) => {
+const handlePoint = async (row) => {
-  window.open(src.value+'&id='+id)
+  window.open(src.value+'&id='+row.id)
 }
 
 /** 导入 */

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

@@ -227,7 +227,7 @@ const handleExport = async () => {
   }
 }
 
-const BASE_URL = import.meta.env.VITE_BASE_URL
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
 const src = ref(BASE_URL + '/jmreport/view/894703223549108224?token=' + getAccessToken())
 // 标签打印
 const handlePoint = async (id) => {

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

@@ -1,7 +1,8 @@
 <template>
   <!-- 打印 -->
   <el-dialog v-model="dialogVisiblePoint" :title="dialogTitle" width="60%">
-    <Table :columns="detailListTableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <ContentWrap>
+      <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">
@@ -9,22 +10,16 @@
         <el-input v-model="row.batch">{{ row.batch }}</el-input>
       </template>
     </Table>
-    <el-button @click="closeDialog">关闭</el-button>
+    </ContentWrap>
-    <el-button @click="genLabel()">生成标签</el-button>
+    <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonTableClick($event)"/>
-
-    <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: {
@@ -39,11 +34,20 @@ 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 Butttondata = [
+  {
+    label: '生成标签',
+    name: 'ssbq',
+    hide: false,
+    type: 'primary',
+    icon: 'ep:select',
+    color: '',
+    hasPermi: '',
+    link: false, // 文本展现按钮
+  },
+  defaultButtons.formCloseBtn(null) // 关闭
+]
 
 const dialogVisiblePoint = ref(false)
 const { tableObject, tableMethods } = useTable({
@@ -56,9 +60,6 @@ const closeDialog = () => {
   dialogVisiblePoint.value = false
   isShow.value = false
 }
-// const print = async () => {
-//   window.open(src.value + '&number=' + detatableData.tableList[0].number)
-// }
 
 /** 生成标签按钮操作 */
 const genLabel = async () => {
@@ -78,7 +79,7 @@ const genLabel = async () => {
 }
 
 // 获得表格的各种操作
-const { getList, setSearchParams } = tableMethods
+const { getList } = tableMethods
 const genLabelId = ref();
 const  openPoint = async (masterId)=>{
   tableObject.params = {
@@ -90,6 +91,14 @@ const  openPoint = async (masterId)=>{
 }
 defineExpose({ openPoint }) // 提供 open 方法，用于打开弹窗
 
+  // 列表-操作按钮事件
+  const buttonTableClick = async (val) => {
+    if (val == 'ssbq') { // 生成标签
+      genLabel()
+    } else if (val == 'close') {// 关闭
+      closeDialog()
+    }
+  }
 
 /** 初始化 **/
 onMounted(async () => {