From 2226e5f345f395a9ad1d03b477f1ad55209caedd Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Wed, 24 Apr 2024 08:21:08 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E7=BB=93=E7=AE=97--=E4=B8=BB=E5=AD=90?=
 =?UTF-8?q?=E8=A1=A8=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customersettleRecordMain/index.vue        | 15 ++++++----
 .../customersettleRequestMain/index.vue       | 29 +++++++++++--------
 .../stockupMainRequest.data.ts                |  1 -
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue
index 3cc5fd025..4ad315706 100644
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="CustomersettleRecordMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...CustomersettleRecordMain.allSchemas.searchSchema,...CustomersettleRecordDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="CustomersettleRecordMain.allSchemas"
+      :detailAllSchemas="CustomersettleRecordDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -32,8 +33,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -76,7 +77,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(CustomersettleRecordMain.allSchemas.tableColumns)
+const tableColumns = ref([...CustomersettleRecordMain.allSchemas.tableColumns,...CustomersettleRecordDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -125,7 +126,11 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => {
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
   return []
 }
 
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
index 014e8b64c..97d3ccb28 100644
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="CustomersettleRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...CustomersettleRequestMain.allSchemas.searchSchema,...CustomersettleRequestDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="CustomersettleRequestMain.allSchemas"
+      :detailAllSchemas="CustomersettleRequestDetail.allSchemas"
     />
 
   <!-- 列表 -->
@@ -32,8 +33,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -96,7 +97,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(CustomersettleRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...CustomersettleRequestMain.allSchemas.tableColumns,...CustomersettleRequestDetail.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -205,7 +206,11 @@ const isShowMainButton = (row,val) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => {
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
     return [
         defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:customersettle-request-main:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:customersettle-request-main:reAdd'}), //重新添加
@@ -224,7 +229,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    CustomersettleRequestMainApi.close(row.id).then(() => {
+    CustomersettleRequestMainApi.close(row.masterId).then(() => {
       tableObject.loading = false
       message.success(t('common.updateSuccess'))
       getList()
@@ -234,7 +239,7 @@ const buttonTableClick = async (val, row) => {
     })  } else if (val == 'mainReAdd') { // 重新添加
       await message.confirm('确认要重新添加吗？')
       tableObject.loading = true
-      CustomersettleRequestMainApi.reAdd(row.id).then(() => {
+      CustomersettleRequestMainApi.reAdd(row.masterId).then(() => {
       tableObject.loading = false
       message.success(t('common.updateSuccess'))
       getList()
@@ -245,7 +250,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainSubmit') { // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    CustomersettleRequestMainApi.submit(row.id).then(() => {
+    CustomersettleRequestMainApi.submit(row.masterId).then(() => {
       tableObject.loading = false
       message.success(t('common.updateSuccess'))
       getList()
@@ -256,7 +261,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainTurnDown') { // 驳回
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    CustomersettleRequestMainApi.refused(row.id).then(() => {
+    CustomersettleRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       getList()
     }).catch(err => {
@@ -264,7 +269,7 @@ const buttonTableClick = async (val, row) => {
     })
   } else if (val == 'mainApprove') { // 审批通过
     tableObject.loading = true
-    CustomersettleRequestMainApi.agree(row.id).then(() => {
+    CustomersettleRequestMainApi.agree(row.masterId).then(() => {
       tableObject.loading = false
       message.success(t('common.updateSuccess'))
       getList()
@@ -274,7 +279,7 @@ const buttonTableClick = async (val, row) => {
     })
   } else if (val == 'mainHandle') { // 处理
     tableObject.loading = true
-    CustomersettleRequestMainApi.handle(row.id).then(() => {
+    CustomersettleRequestMainApi.handle(row.masterId).then(() => {
       tableObject.loading = false
       message.success(t('common.updateSuccess'))
       getList()
@@ -285,7 +290,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑 
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
 }
 
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
index c9f1f60d3..eafa982ad 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
@@ -283,7 +283,6 @@ export const StockupMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isForm: false,
   },
   {
     label: '备注',

From f917f48a718d1d4d061223361193e50cfb71be7f Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Wed, 24 Apr 2024 08:39:07 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E4=B8=BB=E5=AD=90?=
 =?UTF-8?q?=E8=A1=A8=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stockup/stockupMainJob/index.vue          | 21 +++++++++-----
 .../stockup/stockupMainRecord/index.vue       | 15 ++++++----
 .../stockup/stockupMainRequest/index.vue      | 29 +++++++++++--------
 3 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
index 2cc34ba9d..47e324345 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="StockupMainJob.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...StockupMainJob.allSchemas.searchSchema,...StockupDetailJob.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="StockupMainJob.allSchemas"
+      :detailAllSchemas="StockupDetailJob.allSchemas"
     />
 
   <!-- 列表 -->
@@ -32,8 +33,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -82,7 +83,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(StockupMainJob.allSchemas.tableColumns)
+const tableColumns = ref([...StockupMainJob.allSchemas.tableColumns,...StockupDetailJob.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -179,7 +180,11 @@ const isShowMainButton = (row,val) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => {
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
   return [
     // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
@@ -193,11 +198,11 @@ const buttonTableClick = async (val, row) => {
    if (val == 'mainJobExe') { // 执行
     handleHandle
   } else if (val == 'mainJobAba') { // 放弃
-    StockupJobMainApi.abandonStockupMainJob(row.id)
+    StockupJobMainApi.abandonStockupMainJob(row.masterId)
   } else if (val == 'mainJobClo') { // 关闭
-    StockupJobMainApi.closeStockupMainJob(row.id)
+    StockupJobMainApi.closeStockupMainJob(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
-    StockupJobMainApi.acceptStockupMainJob(row.id)
+    StockupJobMainApi.acceptStockupMainJob(row.masterId)
   }
 }
 // 获取部门 用于详情 部门回显
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
index 55f3d28ac..db0df9c55 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="StockupMainRecord.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...StockupMainRecord.allSchemas.searchSchema,...StockupDetailRecord.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="StockupMainRecord.allSchemas"
+      :detailAllSchemas="StockupDetailRecord.allSchemas"
     />
 
   <!-- 列表 -->
@@ -32,8 +33,8 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -77,7 +78,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(StockupMainRecord.allSchemas.tableColumns)
+const tableColumns = ref([...StockupMainRecord.allSchemas.tableColumns,...StockupDetailRecord.allSchemas.tableMainColumns])
 
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
@@ -126,7 +127,11 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => {
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
   return []
 }
 
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
index db525c575..bd38437ea 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="StockupMainRequest.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...StockupMainRequest.allSchemas.searchSchema,...StockupDetailRequest.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -12,6 +12,7 @@
       @updataTableColumns="updataTableColumns"
       @searchFormClick="searchFormClick"
       :allSchemas="StockupMainRequest.allSchemas"
+      :detailAllSchemas="StockupDetailRequest.allSchemas"
     />
 
   <!-- 列表 -->
@@ -33,8 +34,8 @@
         </el-button>
         
       </template>
-      <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+      <template #action="{ row,$index }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -100,7 +101,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
-const tableColumns = ref(StockupMainRequest.allSchemas.tableColumns)
+const tableColumns = ref([...StockupMainRequest.allSchemas.tableColumns,...StockupDetailRequest.allSchemas.tableMainColumns])
 
 const isShowButton = ref(true)
 
@@ -228,7 +229,11 @@ const isShowMainButton = (row,val) => {
 }
 
 // 列表-操作按钮
-const butttondata = (row) => {
+const butttondata = (row,$index) => {
+  const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
+  if(findIndex>0&&findIndex<$index){
+    return []
+  }
     return [
     defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:stockup-main-request:close'}), // 关闭
         defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:stockup-main-request:reAdd'}), //重新添加
@@ -248,7 +253,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    StockupMainRequestApi.close(row.id).then(() => {
+    StockupMainRequestApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -259,7 +264,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainReAdd') { // 重新添加
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    StockupMainRequestApi.reAdd(row.id).then(() => {
+    StockupMainRequestApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -270,7 +275,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainSubmit') { // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    StockupMainRequestApi.submit(row.id).then(() => {
+    StockupMainRequestApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -281,7 +286,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainTurnDown') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    StockupMainRequestApi.refused(row.id).then(() => {
+    StockupMainRequestApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -292,7 +297,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainApprove') { // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    StockupMainRequestApi.agree(row.id).then(() => {
+    StockupMainRequestApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -303,7 +308,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainHandle') { // 处理
     await message.confirm('确认要处理吗？')
     tableObject.loading = true
-    StockupMainRequestApi.handle(row.id).then(() => {
+    StockupMainRequestApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -314,7 +319,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑 
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
 }
 

From a36dce9f7f480c6b9933cd237a4fef69bd142129 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Wed, 24 Apr 2024 08:45:07 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue      | 67 ++++++++++---------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index c449b614b..d502407d3 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -772,40 +772,41 @@ const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAcces
 // 标签打印
 const searchTableRef = ref()
 const labelPrint = async (row) => {
-  // 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)
+  console.log("------------",row);
+  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)
+  // window.open(src.value + '&asn_number=' + row.asnNumber)
 }
 // 批量打印
 const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {

From 4a27981ff0647fd9810aba010358f7d796e98b4e Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Wed, 24 Apr 2024 08:46:56 +0800
Subject: [PATCH 4/6] =?UTF-8?q?MES=20=E9=BD=90=E5=A5=97=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E2=80=94=E2=80=94>=E8=8E=B7=E5=8F=96=E9=BD=90=E5=A5=97?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5:BOM=E8=B4=A8=E6=A3=80=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/orderDay/components/orderDetail.vue  | 2 +-
 src/views/mes/workScheduling/components/Detail.vue | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/views/mes/orderDay/components/orderDetail.vue b/src/views/mes/orderDay/components/orderDetail.vue
index b2901483c..486efad04 100644
--- a/src/views/mes/orderDay/components/orderDetail.vue
+++ b/src/views/mes/orderDay/components/orderDetail.vue
@@ -199,7 +199,7 @@ const emit = defineEmits([
 ])
 
 //监视属性
-watch()
+//watch()
 </script>
 <style lang="scss">
 .el-drawer__body {
diff --git a/src/views/mes/workScheduling/components/Detail.vue b/src/views/mes/workScheduling/components/Detail.vue
index 7da6f49e8..c58a01025 100644
--- a/src/views/mes/workScheduling/components/Detail.vue
+++ b/src/views/mes/workScheduling/components/Detail.vue
@@ -409,7 +409,6 @@ const remarkHeight = computed(() => {
   const tab = unref(tabRef)
   const tabTop = tab?.$el.getBoundingClientRect().top
   const tabHeight = tab?.$el.getBoundingClientRect().height
-  console.log('tabTop',tabTop)
   const height = window.innerHeight - (tabTop) - (tabHeight) - 60
   return height
 })
@@ -444,7 +443,6 @@ const getFileList = async () => {
 }
 // 获取其他附件列表篇
 const getAnnexFileList =  async (row:id) => {
-  console.log('getAnnexFileList')
   props.annexTable?.forEach(async (item) => {
     let requstData = {...remarksData.data,tableName: item?.tableName} 
     const annexList = await FileApi.getFileList(requstData)
@@ -472,7 +470,6 @@ const getAnnexFileList =  async (row:id) => {
         await getSubList()
         item.subDetailTableData.tableList = subTableObject.tableList
         annexItem.subDetailTableData.tableList
-        console.log('subTableObject',annexTableData.value)
       }
     }
   })

From 43ebbcd93b07585c4ee92d10dd7f8df825f017ab Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 24 Apr 2024 08:47:01 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=87=87=E6=A0=B7?=
 =?UTF-8?q?=E6=80=BB=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qms/inspection/inspectionJob/addForm.vue  | 20 ++++++-------
 .../inspectionJob/inspectionJobMain.data.ts   | 28 +++++++++----------
 .../inspectionRecordMain.data.ts              | 20 ++++++-------
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/views/qms/inspection/inspectionJob/addForm.vue b/src/views/qms/inspection/inspectionJob/addForm.vue
index 983e249ad..74718db60 100644
--- a/src/views/qms/inspection/inspectionJob/addForm.vue
+++ b/src/views/qms/inspection/inspectionJob/addForm.vue
@@ -529,15 +529,15 @@ const submitForm = async () => {
     if(data.value.packageList?.length>0){
       const validateForm1 = await tableFormRef.value.validateForm()
     if (!validateForm1) return
-      let number = 0
-      data.value.packageList.forEach(cur=>{
-        number += parseFloat(cur.sampleAmount)
-      })
-      number = number.toFixed('2')
-      if(number != data.value.sampleTotalAmount){
-        message.error(`采样数量之和必须等于采样总数量`)
-        return
-      }
+      // let number = 0
+      // data.value.packageList.forEach(cur=>{
+      //   number += parseFloat(cur.sampleAmount)
+      // })
+      // number = number.toFixed('2')
+      // if(number != data.value.sampleTotalAmount){
+      //   message.error(`采样数量之和必须等于采样总数量`)
+      //   return
+      // }
     }
    
     const bol2 = await validateForm(formFeaturesRef.value)
@@ -783,7 +783,7 @@ const resultEntryMethodChange = (e, item) => {
   item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
   if (e == 0) {
     // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-    for (let i = 0; i < data.value.sampleTotalAmount; i++) {
+    for (let i = 0; i <  parseInt(item.inspectionJobCharacteristicsUpdateReqVO.inspectionQty); i++) {
       item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
         inspectionValue: '', //检验值
         qualitativeCode: '', //定性字典项值
diff --git a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
index 44b6cbc1f..0a658181a 100644
--- a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
+++ b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
@@ -219,20 +219,20 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     }
   },
-  {
-    label: '采样总数量',
-    field: 'sampleTotalAmount',
-    sort: 'custom',
-    isSearch: false,
-    form: {
-      componentProps:{
-        disabled:true
-      }
-    },
-    table: {
-      width: 150
-    }
-  },
+  // {
+  //   label: '采样总数量',
+  //   field: 'sampleTotalAmount',
+  //   sort: 'custom',
+  //   isSearch: false,
+  //   form: {
+  //     componentProps:{
+  //       disabled:true
+  //     }
+  //   },
+  //   table: {
+  //     width: 150
+  //   }
+  // },
   {
     label: '检验类型',
     field: 'inspectionType',
diff --git a/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts
index 1d5eb9a1c..07e3085c3 100644
--- a/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts
+++ b/src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts
@@ -134,16 +134,16 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     }
   },
-  {
-    label: '采样总数量',
-    field: 'sampleTotalAmount',
-    sort: 'custom',
-    isSearch: false,
-    isForm:false,
-    table: {
-      width: 150
-    }
-  },
+  // {
+  //   label: '采样总数量',
+  //   field: 'sampleTotalAmount',
+  //   sort: 'custom',
+  //   isSearch: false,
+  //   isForm:false,
+  //   table: {
+  //     width: 150
+  //   }
+  // },
   {
     label: '检验类型',
     field: 'inspectionType',

From 3f1206863e83651afb65131d85239b932cc67523 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 24 Apr 2024 09:20:38 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=9A=90=E8=97=8Faql=E5=92=8C=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E6=B0=B4=E5=B9=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/qms/inspectionTemplate/index.ts       |  2 +-
 .../inspectionScheme/addForm.vue              | 39 +++++++++++++------
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/api/qms/inspectionTemplate/index.ts b/src/api/qms/inspectionTemplate/index.ts
index 9fe18afcd..f3bf638d2 100644
--- a/src/api/qms/inspectionTemplate/index.ts
+++ b/src/api/qms/inspectionTemplate/index.ts
@@ -2,7 +2,7 @@ import request from '@/config/axios'
 
 
 
-// 查询采样过程列表
+// 列表
 export const getListByTempleteCode = async (code) => {
   return await request.get({ url: `/qms/inspection-process/getListByTempleteCode?code=`+code})
 }
diff --git a/src/views/qms/basicDataManage/inspectionScheme/addForm.vue b/src/views/qms/basicDataManage/inspectionScheme/addForm.vue
index 7d4e8c830..50c0c07a5 100644
--- a/src/views/qms/basicDataManage/inspectionScheme/addForm.vue
+++ b/src/views/qms/basicDataManage/inspectionScheme/addForm.vue
@@ -163,7 +163,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="12" v-if="isShowField !=0">
               <el-form-item label="aql" prop="aql">
                 <el-select v-model="data.aql" placeholder="请选择aql">
                   <el-option
@@ -175,7 +175,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="12" v-if="isShowField!=0">
               <el-form-item label="检验水平" prop="inspectionLevel">
                 <el-select v-model="data.inspectionLevel" placeholder="请选择检验水平">
                   <el-option
@@ -761,6 +761,7 @@ const rules = ref({
     { required: true, message: '请输入选定集', trigger: 'blur' }
   ]
 })
+const isShowField = ref(0)//是否显示aql和检验水平字段 0隐藏 大于0显示
 /** 打开弹窗 */
 let tabIndex = 1
 const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
@@ -771,6 +772,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     dialogTitle.value = t('action.' + type)
   }
   formType.value = type
+  isShowField.value=0//设置isShowField == 0隐藏aql和检验水平字段
   if (row) {
     data.value = JSON.parse(JSON.stringify(row))
     let list = []
@@ -779,7 +781,6 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     } else {
       list = await InspectionProcessPageApi.getListByTempleteCode(row.programmeTemplateCode)
     }
-
     rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
       rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
       rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
@@ -797,7 +798,18 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
         if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) {
           rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
         } 
+        if(item.inspectionCharacteristicsBaseVO.sampleType == 4){
+          isShowField.value+=1//设置isShowField > 0显示aql和检验水平字段
+        }
       })
+      // 显示aql和检验水平字段的时候添加必填规则
+      if( isShowField.value>0){
+       rules.value.aql[0].required = true
+       rules.value.aql[0].required = true
+      }else{
+        rules.value.aql[0].required = false
+       rules.value.aql[0].required = false
+      }
     data.value.process = list
   } else {
     data.value = {
@@ -1085,14 +1097,10 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
     } else if (formField == 'inspectionType') {
       data.value.testTypeName = val[0].description
     } else if (formField == 'programmeTemplateCode') {
+      isShowField.value=0//设置isShowField == 0隐藏aql和检验水平字段
       data.value.programmeTemplateName = val[0].description
       data.value['dynamicUpdateCode'] = val[0].dynamicUpdateCode
       data.value.dynamicUpdateName = val[0].dynamicUpdateName
-      console.log(val[0])
-      
-    }
-    if (formField == 'programmeTemplateCode') {
-      
       let list = await InspectionProcessPageApi.getListByTempleteCode(val[0].code)
       rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
       rules.value['inspectionCharacteristicsBaseVO.quantifyLowlimit'][0].required = false
@@ -1111,11 +1119,20 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
         if (item.inspectionCharacteristicsBaseVO.quantifyIsTarget) {
           rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = true
         } 
+        if(item.inspectionCharacteristicsBaseVO.sampleType == 4){
+          isShowField.value+=1//设置isShowField > 0显示aql和检验水平字段
+        }
       })
+      // 显示aql和检验水平字段的时候添加必填规则
+      if( isShowField.value>0){
+       rules.value.aql[0].required = true
+       rules.value.aql[0].required = true
+      }else{
+        rules.value.aql[0].required = false
+       rules.value.aql[0].required = false
+      }
       data.value.process = list
-    }
-
-    if (formField == 'dynamicUpdateCode') {
+    }else if (formField == 'dynamicUpdateCode') {
       data.value[formField] = val[0].code
       data.value.dynamicUpdateName = val[0].description
     }