From cde2a71905f7619695afc387590116dcec650d30 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 19 Apr 2024 15:29:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E6=A0=87=E7=AD=BE=E5=AE=9E=E9=99=85=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=E7=9A=84=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/package/index.ts                  |  5 ++
 .../inventoryManage/balance/balance.data.ts   |  2 +-
 .../wms/inventoryManage/balance/index.vue     | 23 ++++++++
 .../wms/inventoryManage/package/index.vue     | 53 +++++++++++++++----
 4 files changed, 72 insertions(+), 11 deletions(-)

diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts
index 57f4e2429..10d13d4ed 100644
--- a/src/api/wms/package/index.ts
+++ b/src/api/wms/package/index.ts
@@ -105,3 +105,8 @@ export const batchPrintingLable = async (data: any) => {
 export const getLabel = async (id: number) => {
   return await request.get({ url: `/wms/package/getLabel?id=` + id })
 }
+
+// 查询包装列表
+export const getbalanceToPage = async (packingNumber: String) => {
+  return await request.get({ url: `/wms/package/balanceToPage?packingNumber=` + packingNumber})
+}
\ No newline at end of file
diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts
index 8aaf79117..4845a516e 100644
--- a/src/views/wms/inventoryManage/balance/balance.data.ts
+++ b/src/views/wms/inventoryManage/balance/balance.data.ts
@@ -429,7 +429,7 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 100,
+      width: 200,
       fixed: 'right'
     },
   }
diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
index 8ff5e6db3..54cc59455 100644
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -59,12 +59,14 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import * as BalanceApi from '@/api/wms/balance'
+import * as PackageApi from '@/api/wms/package'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
 import { Balance, BalanceRules } from './balance.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue' 
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import { getAccessToken } from '@/utils/auth'
 
 // 库存余额
 defineOptions({ name: 'Balance' })
@@ -142,6 +144,7 @@ const butttondata = [
     float:'right',
     hasPermi: ''
   },
+  defaultButtons.mainListPointBtn(null), // 标签打印
   // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑
   // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除
 ]
@@ -151,6 +154,8 @@ const buttonTableClick = async (val, row) => {
   if (val == 'bqxx') {
     let aaa = 'HPQ;V1.0;I'+row.itemCode+';P'+row.packingNumber+';B'+row.batch+';Q'+row.qty+';U'+row.uom
     alert(aaa)
+  }else if (val == 'point') { // 标签打印
+    handlePoint(row)
   }
   // if (val == 'edit') { // 编辑
   //   // const res = await BalanceApi.getItempackaging(row.id)
@@ -172,6 +177,24 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue,'transactionBalance')
 }
 
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+
+// 标签打印
+const handlePoint = async (row) => {
+  console.log(row.packingNumber,445555555555555);
+  PackageApi.getBalanceToPackage(row.packingNumber).then(res => {
+    console.log(res,66666666666);
+     // 判断是采购还是制造
+  if (res.asnNumber !== null && res.asnNumber !== '') {
+    const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+    window.open(src.value+'&id='+res.id)
+  } else {
+    const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+    window.open(src.value+'&id='+res.id)
+  }
+  })
+}
+
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {
diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue
index 3d8a3cdce..4b4bc7fad 100644
--- a/src/views/wms/inventoryManage/package/index.vue
+++ b/src/views/wms/inventoryManage/package/index.vue
@@ -41,7 +41,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm 
     ref="basicFormRef" 
-    @success="getList" 
+    @success="formsSuccess" 
     :rules="PackageRules" 
     :formAllSchemas="Package.allSchemas" 
     :searchTableParams="searchTableParams"
@@ -122,6 +122,8 @@ const HeadButttondata = [
 const buttonBaseClick = (val, item) => {
   if (val == 'add') { // 新增
     openForm('create')
+  } else if (val == 'update') { // 导入
+    openForm('update')
   } else if (val == 'import') { // 导入
     handleImport()
   } else if (val == 'export') { // 导出
@@ -149,18 +151,10 @@ const buttonBaseClick = (val, item) => {
 //   }
 // }
 
-// 列表-操作按钮
-// const butttondata = (row) => {
-//     return [
-//         defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
-//         defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
-//         defaultButtons.mainListPointBtn(null), // 标签打印
-//     ]
-// }
 
 // 列表-操作按钮
 const butttondata = [
-  // defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
+  defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
   // defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
   defaultButtons.mainListPointBtn(null), // 标签打印
 ]
@@ -179,6 +173,31 @@ const buttonTableClick = async (val, row) => {
 /** 添加/修改操作 */
 const basicFormRef = ref()
 const openForm =async (type: string, row?: number) => {
+  if(type == "update"){
+    Package.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'number') {
+              item.componentProps.disabled = true
+            }
+            if (item.field == 'itemCode') {
+              item.componentProps.disabled = true
+            }
+            if (item.field == 'itemName') {
+              item.componentProps.disabled = true
+            }
+          })     
+  }else {
+    Package.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'number') {
+        item.componentProps.disabled = false
+      }
+      if (item.field == 'itemCode') {
+              item.componentProps.disabled = true
+            }
+            if (item.field == 'itemName') {
+              item.componentProps.disabled = true
+            }
+    })  
+  }
   basicFormRef.value.open(type, row)
 }
 
@@ -221,8 +240,22 @@ const handleExport = async () => {
 
 const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
 
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  if (formType === 'create') {
+    await PackageApi.createPackage(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await PackageApi.updatePackage(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
 // 标签打印
 const handlePoint = async (row) => {
+  console.log(row,66666666666);
+  
   // 判断是采购还是制造
   if (row.asnNumber !== null && row.asnNumber !== '') {
     const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())