Merge remote-tracking branch 'origin/hella_online_20240904' into hella_online_20240904

src/components/Annex/src/Annex.vue

@@ -4,7 +4,9 @@
     <div class="title flex items-center">
       <!-- <div class="title-txt">附件</div> -->
       <UploadFile :isShowFile="false" :isShowTip="false" :fileType="fileType" :fileSize="fileSize" :title="t('ts.添加附件')" :upData="upData" :limit="10"
-        @update:modelValue="handleAnnexSuccess" v-if="showAddBtn&&annexData.annexList.length<5"/>
+      @update:modelValue="handleAnnexSuccess" v-if="showAddBtn"/>
+      <!-- HL-5838 5条限制影响了供应商发货申请上传质检报告，这个限制没找到认领的需求，所以放开 -->
+      <!-- @update:modelValue="handleAnnexSuccess" v-if="showAddBtn&&annexData.annexList.length<5"/> -->
     </div>
     <div class="list">
       <div class="item flex items-start" v-for="(item, index) in annexData.annexList" :key="index">

src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts

@@ -399,6 +399,14 @@ export const ScrapRecordMain = useCrudSchemas(
         // }
       }
     },
+    {
+      label: '关联单据号',
+      field: 'relateRecordNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+    },
     {
       label: '创建时间',
       field: 'createTime',

src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts

@@ -298,6 +298,14 @@ export const ProductscrapRecordMain = useCrudSchemas(
         // }
       }
     },
+    {
+      label: '关联单据号',
+      field: 'relateRecordNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+    },
     {
       label: '创建者',
       field: 'creator',

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts

@@ -76,7 +76,7 @@ export const Supplier1 = useCrudSchemas(reactive<CrudSchema[]>([
 export const Version = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '供应商代码',
-    field: 'supplerCodes',
+    field: 'supplierCodes',
     sort: 'custom',
     isSearch:true,
   },

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts

@@ -15,7 +15,7 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
           tableId: '',
           tableName: 'SupplierdeliverInspectionDetail',
         },
-        fileType:['pdf','png','jpg','jpeg'],
+        fileType:['pdf'],
         fileSize:100,
         limit:20000
       }

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

@@ -100,32 +100,7 @@
   <Detail
     ref="detailRef"
     :annexTable="[
-      {
-        label: '质检明细',
-        prop: 'uploadFile',
-        tableName: 'SupplierdeliverInspectionDetail',
-        hasSubDetail: true, // 附件中是否展示明细表
-        showPreview: true, // 附件中是否展示预览按钮
-        hiddenUpload:false,
-        hiddenDelete:false,
-        fileType: ['pdf', 'jpg', 'png', 'jpeg'],
-        align: 'left',
-        //明细表数据
-        subDetailTableData: {
-          queryParams: [
-            {
-              queryField: 'masterId',
-              rowField: 'masterId'
-            }
-          ], // 查询参数
-          getSubList: SupplierdeliverInspectionDetailApi.getSupplierdeliverInspectionDetailPage, //请求接口
-          tableColumns: SupplierdeliverInspectionDetail.allSchemas.tableColumns,
-          tableList: [], //表格数据
-          total: 1,
-          pageSize: 10,
-          currentPage: 1
-        }
-      }
+      annexInspectionDetail
     ]"
     :isBasic="false"
     :allSchemas="SupplierdeliverRequestMain.allSchemas"
@@ -239,12 +214,38 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 const count = ref(0)
 routeName.value = route.name
-
+const annexInspectionDetail = ref({
+  label: '质检明细',
+  prop: 'uploadFile',
+  tableName: 'SupplierdeliverInspectionDetail',
+  hasSubDetail: true, // 附件中是否展示明细表
+  showPreview: true, // 附件中是否展示预览按钮
+  hiddenUpload:false,
+  hiddenDelete:false,
+  fileType: ['pdf'],
+  align: 'left',
+  //明细表数据
+  subDetailTableData: {
+    queryParams: [
+      {
+        queryField: 'masterId',
+        rowField: 'masterId'
+      }
+    ], // 查询参数
+    getSubList: SupplierdeliverInspectionDetailApi.getSupplierdeliverInspectionDetailPage, //请求接口
+    tableColumns: SupplierdeliverInspectionDetail.allSchemas.tableColumns,
+    tableList: [], //表格数据
+    total: 1,
+    pageSize: 10,
+    currentPage: 1
+  }
+})
 const tableColumns = ref([
   ...SupplierdeliverRequestMain.allSchemas.tableColumns,
   ...SupplierdeliverRequestDetail.allSchemas.tableMainColumns
 ])
 
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -790,6 +791,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
     .get(CACHE_KEY.DEPT)
     .find((account) => account.id == row.departmentCode)?.name
   if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  annexInspectionDetail.value.hiddenDelete = row.status==8 //HL-5838质检明细-删除按钮只有status=8隐藏，其他都展示
   detailRef.value.openDetail(row, titleName, titleValue, 'requestSupplierdeliverMain')
 }
 //添加/修改操作