From 81384835f6725f62ed74a245265a2224c347cf32 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sat, 14 Dec 2024 13:50:27 +0800
Subject: [PATCH] =?UTF-8?q?YT-1659=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=EF=BC=8C=E5=AD=90=E8=A1=A8=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=98=BE=E7=A4=BA=E3=80=81=E5=8F=8A=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BA=94=E4=B8=8E=E9=9C=80=E6=B1=82=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=80=E8=87=B4=EF=BC=8C=E7=8E=B0=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue      |  8 +++-
 .../supplierdeliverRequestMain.data.ts        | 38 +++++++++++++++++--
 .../supplierinvoiceInvoiced/index.vue         |  2 +-
 3 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 32cf5acde..08a41d8de 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -123,7 +123,11 @@
     :apiPage="SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage"
     :apiDelete="SupplierdeliverRequestDetailApi.deleteSupplierdeliverRequestDetail"
     @searchTableSuccessDetail="searchTableSuccessDetail"
-  />
+  >
+    <template #isPutaway="{ row }">
+     <el-tag type="primary">{{row.isPutaway ==1 ?'是':'否'}}</el-tag>
+    </template>
+  </Detail>
 
   <!-- 导入 -->
   <ImportForm
@@ -861,7 +865,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隐藏，其他都展示
+  annexInspectionDetail.value.hiddenDelete = row.status == 8 //HL-5838质检明细-删除按钮只有status=8隐藏，其他都展示
   detailRef.value.openDetail(row, titleName, titleValue, 'requestSupplierdeliverMain')
 }
 /** 上传履历表 */
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 83a4c317b..c3618b8be 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -13,6 +13,14 @@ import { cloneDeep } from 'lodash-es'
 import {validateInteger} from '@/utils/validator'
 const { t } = useI18n() // 国际化
 
+const valueFilter = [{
+  label: '是',
+  value:'1'
+}, {
+  label: '否',
+    value: '0'
+  }]
+     
 
 let PurchasePlanDetailSchemas = cloneDeep(PurchasePlanDetail.allSchemas)
 if(PurchasePlanDetailSchemas?.tableColumns){
@@ -417,6 +425,9 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
     isTableForm: false,
     isTable: false,
+    table: {
+      
+    },
     detail: {
       dictType: 'primary',
       valueFilter: (value) => {
@@ -1313,7 +1324,25 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTable: false,
     isForm: false
   },
-
+  {
+    label: '是否上架',
+    field: 'isPutaway',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    sort: 'custom',
+    // formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+    //   return valueFilter.find((account) => account.value == cellValue)?.label
+    // },
+    sortTableDefault: 10000,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -1322,7 +1351,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     hiddenInMain: false,
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -1338,6 +1367,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     isTableForm: false,
     isForm: false,
+    sortTableDefault:10000
   },
   {
     label: '创建者',
@@ -1346,10 +1376,10 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    hiddenInMain:false,
     isTableForm: false,
-    isTable: false,
+    isTable: true,
     isForm: false,
+    sortTableDefault: 10000
   },
   // {
   //   label: '最后更新时间',
diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue
index bc0b78565..312b8cce1 100644
--- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue
@@ -34,7 +34,7 @@
       </template>
       <template #action="{ row }">
         <ButtonBaseMore
-          :Butttondata="butttondata(row, $index)"
+          :Butttondata="butttondata(row)"
           @button-base-click="buttonTableClick($event, row)"
         />
       </template>