From 073727f5d7d2e62518c8f8c57c3ebc8565aa0ce7 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Fri, 19 Apr 2024 11:18:47 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=EF=BC=8C=E6=89=93=E5=8D=B0=E5=85=A8=E9=83=A8=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRequestMain/index.vue      | 32 ++++++++++++++++++-
 .../supplierinvoiceRequestMain.data.ts        |  2 +-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 5acc8e857..67b6e6bff 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -90,7 +90,7 @@
     }]"
     annexAliasLabel="其他附件"
     :otherHeadButttonData="[{
-        label: '打印',
+        label: '打印明细',
         name: 'printing',
         hide: false,
         type: 'primary',
@@ -98,6 +98,26 @@
         color: '',
         float:'left',
         hasPermi: ''
+    },{
+        label: '打印全部发货单',
+        name: 'printing-all',
+        hide: false,
+        type: 'primary',
+        // icon: 'ep:operation',
+        color: '',
+        float:'left',
+        hasPermi: ''
+    }]"
+    :buttondataTable = "[{
+        label: '打印',
+        name: 'print',
+        hide: false,
+        type: 'primary',
+        // icon: 'ep:operation',
+        color: '',
+        float:'left',
+        link: true, // 文本展现按钮
+        hasPermi: ''
     }]"
     :isBasic="false" 
     :allSchemas="SupplierinvoiceRequestMain.allSchemas"
@@ -110,6 +130,7 @@
     :apiDelete="SupplierinvoiceRequestDetailApi.deleteSupplierinvoiceRequestDetail" 
     :Echo="Echo" 
     @buttonBaseClick="detailButtonBaseClick"
+    @tableFormButton="tableFormButton"
   />
 
   <!-- 导入 -->
@@ -632,9 +653,18 @@ const importSuccess = () => {
     if(val == 'printing'){
       // 单据打印
       handleDocumentPrint(clicKRowId.value)
+    }else if(val === 'printing-all'){
+      //打印全部发货单
+
     }
   }
 
+  const tableFormButton = (val, item) => {
+    console.log("点击的按钮",val)
+    if(val == 'print'){
+      // 打印
+    }
+  }
   // 单据打印
   const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
   const documentSrc = ref(BASE_URL + '/jmreport/view/936875675614240768?token=' + getAccessToken())
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index b627663e9..a8d603ad9 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1005,7 +1005,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isDetail: false,
     isForm: false,
     table: {
-      width: 150,
+      width: 250,
       fixed: 'right'
     },
     hiddenInMain:true,

From c6b284474ccf94c34e245d23ef8a0b6a932db2f3 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 19 Apr 2024 11:27:43 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InspectionRequestPackage.ts               |  27 +++
 src/api/qms/inspectionRequest/index.ts        |   5 -
 src/components/ListTable/src/ListTable.vue    | 186 ++++++++++++++++--
 .../inspection/inspectionRequest/index.vue    |  36 +++-
 .../inspectionRequest/inspectionMain.data.ts  |  17 +-
 5 files changed, 247 insertions(+), 24 deletions(-)
 create mode 100644 src/api/qms/inspectionRequest/InspectionRequestPackage.ts

diff --git a/src/api/qms/inspectionRequest/InspectionRequestPackage.ts b/src/api/qms/inspectionRequest/InspectionRequestPackage.ts
new file mode 100644
index 000000000..34acfaea4
--- /dev/null
+++ b/src/api/qms/inspectionRequest/InspectionRequestPackage.ts
@@ -0,0 +1,27 @@
+import request from '@/config/axios'
+export interface InspectionRequestPackageVO {
+  number: string
+  packageCode: string
+  packageSpecificationCode: string
+  amount: string
+  measuringUnit: string
+}
+
+//查询包装列表
+export const getInspectionRequestPackageList = async (id: number) => {
+  return await request.get({ url: `/qms/inspection-request-package/list?masterId=` + id })
+}
+// 新增检验申请
+export const createInspectionRequestPackage = async (data: InspectionRequestPackageVO) => {
+  return await request.post({ url: `/qms/inspection-request-package/create`, data })
+}
+
+// 修改检验申请
+export const updateInspectionRequestPackage = async (data: InspectionRequestPackageVO) => {
+  return await request.put({ url: `/qms/inspection-request-package/update`, data })
+}
+
+// 删除检验申请
+export const deleteInspectionRequestPackage = async (id: number) => {
+  return await request.delete({ url: `/qms/inspection-request-package/delete?id=` + id })
+}
\ No newline at end of file
diff --git a/src/api/qms/inspectionRequest/index.ts b/src/api/qms/inspectionRequest/index.ts
index 2c4664a94..5aaf60961 100644
--- a/src/api/qms/inspectionRequest/index.ts
+++ b/src/api/qms/inspectionRequest/index.ts
@@ -86,8 +86,3 @@ export const refusedInspectRequestMain = async (id) => {
 export const handleInspectRequestMain = async (id) => {
   return await request.put({ url: `/qms/inspection-request-main/handle?id=` + id })
 }
-
-//查询检验申请列表
-export const getInspectionRequestPackageList = async (id: number) => {
-  return await request.get({ url: `/qms/inspection-request-package/list?masterId=` + id })
-}
\ No newline at end of file
diff --git a/src/components/ListTable/src/ListTable.vue b/src/components/ListTable/src/ListTable.vue
index b9985a8d0..c5427483d 100644
--- a/src/components/ListTable/src/ListTable.vue
+++ b/src/components/ListTable/src/ListTable.vue
@@ -1,40 +1,202 @@
 <template>
   <div>
-    <Dialog v-model="isPackageShow" :title="dialogTitle" :width="width?width:'900px'" v-loading="packageLoading">
+    <Dialog
+      v-model="isPackageShow"
+      :title="dialogTitle"
+      :width="width ? width : '900px'"
+      v-loading="packageLoading"
+    >
+      <TableHead
+        :HeadButttondata="HeadButttondata"
+        :masterId="masterParmas.masterId"
+        @button-base-click="buttonBaseClick"
+        :allSchemas="detailAllSchemas"
+      />
       <Table
         ref="searchTableRef"
         :columns="columns"
         :data="allList"
         :reserveSelection="true"
         row-key="id"
-      />
+      >
+        <template #action="{ row }">
+          <ButtonBase
+            :Butttondata="butttondata"
+            @button-base-click="buttonTableClick($event, row)"
+          />
+        </template>
+      </Table>
     </Dialog>
+    <!-- 表单弹窗：添加/修改 -->
+    <BasicForm
+      ref="formRef"
+      :rules="detailAllSchemasRules"
+      :formAllSchemas="detailAllSchemas"
+      :isBusiness="false"
+      :apiUpdate="apiUpdate"
+      :apiCreate="apiCreate"
+      :isDetail="true"
+      :detailData="detailData"
+      @success="submitForm"
+    />
   </div>
 </template>
 
 <script lang="ts" setup>
-
-const isPackageShow = ref(false)
-const packageLoading = ref(false)
-const dialogTitle = ref()
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
 const message = useMessage() // 消息弹窗
-const columns = ref()
-const allList = ref()
+const { t } = useI18n() // 国际化
+
 // 接受父组件参数
 const props = defineProps({
   width: {
     type: String,
     required: false
   },
+  // 明细列表相关信息
+  detailAllSchemas: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  //  明细验证
+  detailAllSchemasRules: {
+    type: Object,
+    required: true,
+    default: null
+  },
+  // 子表新增API
+  apiCreate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表编辑API
+  apiUpdate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子表新增修改校验
+  detailValidate: {
+    type: Function,
+    required: false,
+    default: null
+  },
+  // 子列表 删除 展示与隐藏 ，默认展示
+  detailButtonIsShowDelete: {
+    type: Boolean,
+    required: false,
+    default: true
+  },
+  //  列表
+  list: {
+    type: Object,
+    required: true,
+    default: null
+  }
+})
+
+const isPackageShow = ref(false)
+const packageLoading = ref(false)
+const dialogTitle = ref()
+const columns = ref()
+const allList = ref([])
+
+//主表所需的参数
+const masterParmas = ref({
+  masterId: '', //主表id
+  number: '' //主表单据号
 })
-const openPackage = async (row?: any, titleName?: any,tableColumns?: any,list?: any) => {
+
+// 列表头部按钮
+const HeadButttondata = ref()
+// 列表-操作按钮
+const butttondata = ref()
+const detailData = ref({})
+const openPackage = async (row?: any, titleName?: any, tableColumns?: any, list?: any) => {
   isPackageShow.value = true
+  detailData.value = row
+  masterParmas.value.masterId = row.masterId || row.id
+  masterParmas.value.number = row.number
+  if(detailData.value.status ==1){
+    HeadButttondata.value =  [
+      defaultButtons.defaultAddBtn(null) // 新增
+    ]
+    butttondata.value =[
+      defaultButtons.mainListEditBtn(null), // 编辑
+      defaultButtons.mainListDeleteBtn(null) //删除
+    ]
+    columns.value = tableColumns
+  }else{
+    columns.value = tableColumns.filter(item=>item.field  != 'action')
+
+  }
   if (titleName) {
     dialogTitle.value = titleName
   }
-  columns.value = tableColumns.filter(item => (item.field !== 'action'))
-  allList.value = list
 }
-defineExpose({ openPackage }) // 提供 open 方法，用于打开弹窗
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') {
+    // 新增
+    openForm('create')
+  }
+}
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = async (type: string, row?: number) => {
+  formRef.value.open(type, row, masterParmas.value)
+}
+const submitForm = async (formType, data) => {
+  try {
+    // 子表新增编辑校验 如果业务需要子表提交校验 需在主页详情组件添加 detailValidate 参数及方法
+    const rs = (await props.detailValidate) ? await props.detailValidate(data) : true
+    if (!rs) return
+    emit('ListTableSubmit', formType, data)
+    // 刷新当前列表
+  } finally {
+    formRef.value.formLoading = false
+  }
+}
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') {
+    // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') {
+    // 删除
+    handleDelete(row)
+  }
+}
+const handleDelete = async (row: any) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    emit('ListTableSubmit', 'detele', row)
+  } catch {}
+}
+const emit = defineEmits(['ListTableSubmit']) // 定义 success 事件，用于操作成功后的回调
+defineExpose({ openPackage, formRef }) // 提供 open 方法，用于打开弹窗
+watch(
+  () => props.list,
+  (newValue) => {
+    allList.value = newValue
+    formRef.value.dialogVisible = false
+  },
+  {
+    deep: true
+  }
+)
 </script>
 
diff --git a/src/views/qms/inspection/inspectionRequest/index.vue b/src/views/qms/inspection/inspectionRequest/index.vue
index faf4cd7ca..8758854a1 100644
--- a/src/views/qms/inspection/inspectionRequest/index.vue
+++ b/src/views/qms/inspection/inspectionRequest/index.vue
@@ -1,4 +1,5 @@
 <template>
+  <div>
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <Search :schema="InspectionMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
@@ -45,24 +46,31 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="InspectionMain.allSchemas" />
+  <!-- <Detail ref="detailRef" :isBasic="true" :allSchemas="InspectionMain.allSchemas" /> -->
+  <!-- <Detail ref="detailRef" :isBasic="false" :allSchemas="InspectionMain.allSchemas"
+    :detailAllSchemas="InspectionRequestPackage.allSchemas" :detailAllSchemasRules="InspectionRequestPackageRules"
+    :apiPage="InspectionMainApi.getInspectionRequestPackageList"
+   /> -->
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/request/inspection-main/import" :importTemplateData="importTemplateData"
     @success="importSuccess" />
   <!-- 包装信息 -->
-  <ListTable ref="listTableRef" titleName="包装信息" />
+  <ListTable ref="listTableRef" titleName="包装信息" :allSchemas="InspectionMain.allSchemas"
+    :detailAllSchemas="InspectionRequestPackage.allSchemas" :detailAllSchemasRules="InspectionRequestPackageRules"
+    :list="list" @ListTableSubmit='ListTableSubmit'/>
+  </div>
 </template>
 
 <script setup lang="ts">
   import download from '@/utils/download'
   import { InspectionMain, InspectionMainRules,InspectionRequestPackage,InspectionRequestPackageRules } from './inspectionMain.data'
   import * as InspectionMainApi from '@/api/qms/inspectionRequest'
+  import * as InspectionRequestPackageApi from '@/api/qms/inspectionRequest/InspectionRequestPackage'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
   import ListTable from '@/components/ListTable/src/ListTable.vue'
   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 { InspectionJobPackage} from '../inspectionJob/inspectionJobMain.data'
 
   defineOptions({ name: 'InspectionMain' })
@@ -157,12 +165,13 @@
       defaultButtons.mainListSubmitBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'qms:inspection-request-main:submit' }), // 提交审批
       defaultButtons.mainListTurnDownBtn({ hide: isShowMainButton(row, ['2']), hasPermi: 'qms:inspection-request-main:refused' }), // 驳回
       defaultButtons.mainListApproveBtn({ hide: isShowMainButton(row, ['2']), hasPermi: 'qms:inspection-request-main:agree' }), // 审批通过
-      defaultButtons.mainListHandleBtn({ hide: isShowMainButton(row, ['3']), hasPermi: 'qms:inspection-request-main:handle' }), // 处理
+      defaultButtons.mainListHandleBtn({ hide: isShowMainButton(row, ['3']), hasPermi:  'qms:inspection-request-main:handle' }), // 处理
       defaultButtons.mainListPackageBtn(null), // 包装
       defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'qms:inspection-request-main:edit'}), // 编辑
     ]
   }
 const listTableRef = ref()
+const list = ref([])
   // 列表-操作按钮事件
   const buttonTableClick = async (val, row) => {
     if (val == 'mainClose') { // 关闭
@@ -180,8 +189,9 @@ const listTableRef = ref()
     } else if (val == 'edit') { // 编辑
       openForm('update', row)
     }else if (val == 'mainPackage') { // 包装
-      const list = await InspectionMainApi.getInspectionRequestPackageList(row.id)
-      listTableRef.value.openPackage(row,'包装信息',InspectionRequestPackage.allSchemas.tableColumns,list)
+      list.value = await InspectionRequestPackageApi.getInspectionRequestPackageList(row.id)
+      // row.status = '1'
+      listTableRef.value.openPackage(row,'包装信息',InspectionRequestPackage.allSchemas.tableColumns)
     }
   }
 
@@ -374,6 +384,20 @@ const handleAddTable = () => {
 // 删除明细
 const handleDeleteTable = (item, index) => {
   tableData.value.splice(index, 1)
+}
+const ListTableSubmit =async (formType,data)=>{
+console.log(formType,data)
+ if (formType === 'create') {
+      await InspectionRequestPackageApi.createInspectionRequestPackage(data)
+      message.success(t('common.createSuccess'))
+    } else if(formType === 'updete') {
+      await InspectionRequestPackageApi.updateInspectionRequestPackage(data)
+      message.success(t('common.updateSuccess'))
+    }else {
+      await InspectionRequestPackageApi.deleteInspectionRequestPackage(data.id)
+      message.success(t('common.updateSuccess'))
+    }
+    list.value = await InspectionRequestPackageApi.getInspectionRequestPackageList(data.masterId)
 }
   /** 初始化 **/
   onMounted(async () => {
diff --git a/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts b/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts
index ff7d3cdf0..b0c0dddc0 100644
--- a/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts
+++ b/src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts
@@ -433,7 +433,12 @@ export const InspectionRequestPackage = useCrudSchemas(reactive<CrudSchema[]>([
     table:{
       width:200
     },
-    isTableForm:false
+    isTableForm:false,
+    form:{
+      componentProps:{
+        disabled:true
+      }
+    }
   },
   {
     label: '包装号',
@@ -487,4 +492,14 @@ export const InspectionRequestPackage = useCrudSchemas(reactive<CrudSchema[]>([
       width:150
     }
   },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    isTable:true,
+    table: {
+      width: 120,
+      fixed: 'right'
+    }
+  }
 ]))

From 63d3c0f82587678049fef188f75727830d845dfc Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 19 Apr 2024 11:46:36 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceipt/purchasereceiptRecordMain/index.vue       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
index 1623ca0f8..95dd86091 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@@ -163,8 +163,8 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-   defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag === false }),// 生成到货检验申请
-   defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag === false }),// 生成采购上架申请
+   defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
+   defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请
   ]
 }
 

From a93859edb5f9b17febd09b3d4caddb883e89e361 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 19 Apr 2024 11:50:44 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E7=9A=84=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptRecordMain.data.ts                      | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index 2f2b8b3b5..de243d9c7 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -352,7 +352,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {
@@ -561,7 +560,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'uom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {
@@ -584,7 +582,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '包装规格',
     field: 'packUnit',
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {
@@ -608,7 +605,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'supplierUom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {
@@ -621,7 +617,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'inventoryStatus',
     dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {
@@ -787,7 +782,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'failedReason',
     dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {
@@ -846,7 +840,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {

From 176182390456f8b7fe2da74cebb210976c6114a2 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Fri, 19 Apr 2024 13:28:02 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=EF=BC=8C=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/package/index.ts                  |  5 ++
 .../supplierdeliverRequestMain/index.vue      | 66 +++++++++++++++++--
 .../supplierdeliverRequestMain.data.ts        | 51 ++++++++++++++
 3 files changed, 118 insertions(+), 4 deletions(-)

diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts
index 316ad8611..57f4e2429 100644
--- a/src/api/wms/package/index.ts
+++ b/src/api/wms/package/index.ts
@@ -100,3 +100,8 @@ export const createPackageLabel = async (data: PackageVO) => {
 export const batchPrintingLable = async (data: any) => {
   return await request.post({ url: `/wms/package/batchPrintingLable`, data })
 }
+
+// 打印标签获取包装列表
+export const getLabel = async (id: number) => {
+  return await request.get({ url: `/wms/package/getLabel?id=` + id })
+}
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 56a4424a1..b720e813e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -20,8 +20,8 @@
   />
 
   <!-- 列表 -->
-  <ContentWrap>
-    <Table
+  <ContentWrap >
+    <Table v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -146,6 +146,10 @@
       <span>1111</span>
     </template>
   </BasicForm>
+
+  <!-- 标签打印 -->
+  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
+
  
 </template>
 
@@ -159,7 +163,8 @@ import {
   SupplierdeliverRequestMainRules,
   SupplierdeliverRequestDetail,
   SupplierdeliverRequestDetailRules,
-  SupplierdeliverRequestDetailLabel
+  SupplierdeliverRequestDetailLabel,
+  SupplierdeliverRequestPackage
 } from './supplierdeliverRequestMain.data'
 import {    SupplierdeliverInspectionDetail} from '../supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data'
 import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
@@ -168,6 +173,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import * as SupplierdeliverInspectionDetailApi from '@/api/wms/supplierdeliverInspectionDetail'
+import * as PackageApi from '@/api/wms/package'
 import { PurchasePlanDetail } from '../purchasePlanMain/purchasePlanMain.data'
 import { addDay } from '@/utils/formatTime'
 
@@ -752,8 +758,60 @@ const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
 const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
 
 // 标签打印
+const searchTableRef = ref()
 const labelPrint = async (row) => {
-  window.open(src.value + '&asn_number=' + row.asnNumber)
+  tableObject.loading = true
+  const subTableDFata = await PackageApi.getLabel(row.masterId)
+  tableObject.loading = false
+  const tableObject1 = {
+    // 当前页
+    currentPage: 1,
+    // 导出加载中
+    exportLoading: false,
+    // 加载中
+    loading: false,
+    // 页数
+    pageSize: subTableDFata.length,
+    params:null,
+    // 排序
+    sort: {
+      order: '', // 排序规则
+      prop: '' // 排序字段
+    },
+    // 总条数
+    total: subTableDFata.length,
+    // 表格数据
+    tableList: subTableDFata,
+    currentRow:null
+  }
+  console.log("标签打印",subTableDFata,tableObject1,SupplierdeliverRequestPackage.allSchemas)
+
+  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
+
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+  searchTableRef.value.openData("采购收货记录单号",tableObject1,{tableColumns},true)
+
+  // window.open(src.value + '&asn_number=' + row.asnNumber)
+}
+// 批量打印
+const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
+  let rows:any = []
+  val.forEach(item=>{
+    rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
+  })
+  if(rows.length == 0){
+    message.warning("请先选择要打印的数据!")
+    return
+  }
+  await PackageApi.batchPrintingLable(rows.join(',')).then(res => {
+      console.log(res)
+      window.open(src.value + '&asn_number=' + res)
+  }).catch(err => {
+    console.log(err)
+    message.error('创建标签失败')
+  })
 }
 
 const print = async () => {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 69fe8457c..e7cab7a50 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1662,4 +1662,55 @@ export const UploadQualityReport = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+]))
+export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+  },
+{
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+  },
+{
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+  },
+{
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'SelectV2'
+    },
+    table: {
+      width: 150,
+    },
+  },
+{
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
 ]))
\ No newline at end of file

From e55d19e00deb6e0aea63a1840855afde14f78329 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 19 Apr 2024 13:31:22 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain.data.ts                           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 69fe8457c..d7c32ecdf 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -857,7 +857,6 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     sort: 'custom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     table: {
       width: 150