From 9f1f0e2f6d1c9a1ee7f83606cf49884bf7026091 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Mon, 15 Apr 2024 10:04:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B4=A8=E6=A3=80=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Detail/src/Detail.vue          | 24 ++++++++-------
 .../supplierdeliverInspectionDetail.data.ts   | 29 +++++++++++++++++++
 .../supplierdeliverRequestMain/index.vue      |  1 +
 3 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 770fc372c..83fcf090a 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -108,16 +108,19 @@
                 />
             </ElScrollbar>
           </ContentWrap> 
-           
-          <Table
-            v-if="!isBasic && fromeWhere != 'countPlan'"
-            :columns="annexItem.subDetailTableData.tableColumns"
-            :data="annexItem.subDetailTableData.tableList"
-            :loading="annexItem.subDetailTableData.loading"
-            :pagination="{ total: annexItem.subDetailTableData.tableList.length }"
-            v-model:pageSize="tableObjectRef.pageSize"
-            v-model:currentPage="tableObjectRef.currentPage"
-          />
+          <ContentWrap class="w-[100%]">
+            <Table 
+              v-if="!isBasic && fromeWhere != 'countPlan'"
+              :align="annexItem.align?annexItem.align:'center'"
+              :columns="annexItem.subDetailTableData.tableColumns"
+              :data="annexItem.subDetailTableData.tableList"
+              :loading="annexItem.subDetailTableData.loading"
+              :pagination="{ total: annexItem.subDetailTableData.tableList.length }"
+              v-model:pageSize="tableObjectRef.pageSize"
+              v-model:currentPage="tableObjectRef.currentPage"
+            />
+          </ContentWrap> 
+
         </div>
         <!-- 附件/备注/变更记录 -->
         <ContentWrap class="w-[100%]" v-show="tabsList[current].label=='附件'||tabsList[current].label=='备注'||tabsList[current].label=='变更记录'" :style="{height:remarkHeight+'px'}">
@@ -443,6 +446,7 @@ const getAnnexFileList =  async (row:id) => {
       annexData.annexList = annexList
     }else{
       annexTableData.value.push({
+        align:item.align,
         label: item.label,
         tableName: item?.tableName || '',
         annexList,
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
index ae04dccf8..0f55e8f0c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
@@ -9,10 +9,28 @@ export const SupplierdeliverInspectionDetailRules = reactive({
 })
 
 export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '上传质检报告',
+    field: 'uploadFile',
+    sort: 'custom',
+    isTable:false,
+    isTableForm:false,
+    form: {
+      component: 'UploadFile',
+      componentProps: {
+        upData:{
+          tableId: '',
+          tableName: 'SupplierdeliverInspectionDetail'
+        },
+        limit:1,
+      }
+    },
+  },
   {
     label: '代码',
     field: 'itemCode',
     sort: 'custom',
+    isForm:false,
     isSearch: true,
   },
   {
@@ -21,6 +39,7 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
     isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -33,18 +52,23 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
     label: '批次',
     field: 'batch',
     sort: 'custom',
+    isForm:false,
     isSearch: true,
   },
   {
     label: '计划数量',
     field: 'planQty',
     sort: 'custom',
+    isForm:false,
     isSearch: true,
   },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    isForm:false,
+    isTable: false,
+    isTableForm: false,
     isSearch: true,
   },
   {
@@ -61,6 +85,7 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    isTableForm: false,
     isForm: false,
   },
   {
@@ -69,11 +94,15 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
     sort: 'custom',
     isSearch: true,
     isForm: false,
+    isTable: false,
+    isTableForm: false,
   },
   {
     label: '操作',
     field: 'action',
     isForm: false,
+    isTable: false,
+    isTableForm: false,
     table: {
       width: 150,
       fixed: 'right'
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index f1a92a5c1..92ddf02a2 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -79,6 +79,7 @@
       prop: 'uploadFile',
       tableName:'SupplierdeliverInspectionDetail',
       hasSubDetail:true, // 附件中是否展示明细表
+      align:'left',
       //明细表数据
       subDetailTableData:{
         queryParams:[{