From 77ca10be626f41877e065b8a0ebcacade048cc80 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 25 Apr 2024 08:41:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B4=A8=E9=87=8F=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E4=BF=AE=E6=94=B9=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliver/deliverJobMain/index.vue          |  8 ++--
 .../supplierdeliverInspectionDetail.data.ts   | 37 +++++++++++++------
 .../supplierdeliverRequestMain/index.vue      |  5 ++-
 .../supplierdeliverRequestMain.data.ts        | 24 ++++++------
 4 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
index ffeaf4fa7..d2717d85e 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
@@ -185,10 +185,10 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
-    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
-    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
 
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
index 0f55e8f0c..fce77e26e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
@@ -1,13 +1,6 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 
-// 表单校验
-export const SupplierdeliverInspectionDetailRules = reactive({
-  itemCode: [required],
-  uom: [required],
-  concurrencyStamp: [required],
-})
-
 export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '上传质检报告',
@@ -20,14 +13,16 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
       componentProps: {
         upData:{
           tableId: '',
-          tableName: 'SupplierdeliverInspectionDetail'
+          tableName: 'SupplierdeliverInspectionDetail',
         },
         limit:1,
+        fileType:['apk'],
+        fileSize:100
       }
     },
   },
   {
-    label: '代码',
+    label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
     isForm:false,
@@ -49,14 +44,14 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
     }
   },
   {
-    label: '批次',
+    label: '供应商批次',
     field: 'batch',
     sort: 'custom',
     isForm:false,
     isSearch: true,
   },
   {
-    label: '计划数量',
+    label: '发货数量',
     field: 'planQty',
     sort: 'custom',
     isForm:false,
@@ -109,3 +104,23 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
     }
   }
 ]))
+
+
+//表单校验
+export const SupplierdeliverInspectionDetailRules = reactive({
+  uploadFile: [
+    { required: true, message: '请上传文件', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请输入物料代码', trigger: 'blur' }
+  ],
+  uom: [
+    { required: true, message: '请输入计量单位', trigger: 'blur' }
+  ],
+  batch: [
+    { required: true, message: '请输入供应商批次', trigger: 'blur' }
+  ],
+  planQty: [
+    { required: true, message: '请输入发货数量', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 64cd4f287..bd5e7f601 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -138,6 +138,7 @@
     @success="getList"
     :formAllSchemas="SupplierdeliverInspectionDetail.allSchemas"
     :tableAllSchemas="SupplierdeliverInspectionDetail.allSchemas"
+    :tableFormRules="SupplierdeliverInspectionDetailRules"
     :tableData="ploadQualityReportTableData"
     @handleAddTable="SupplierdeliverInspectionDetailApi.createSupplierdeliverInspectionDetail"
     @handleDeleteTable="SupplierdeliverInspectionDetailApi.deleteSupplierdeliverInspectionDetail"
@@ -165,9 +166,9 @@ import {
   SupplierdeliverRequestDetail,
   SupplierdeliverRequestDetailRules,
   SupplierdeliverRequestDetailLabel,
-  SupplierdeliverRequestPackage
+  SupplierdeliverRequestPackage,
 } from './supplierdeliverRequestMain.data'
-import {    SupplierdeliverInspectionDetail} from '../supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data'
+import {    SupplierdeliverInspectionDetail,SupplierdeliverInspectionDetailRules} from '../supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data'
 import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
 import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 4541e64ad..5db73f796 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1649,7 +1649,9 @@ export const UploadQualityReport = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         upData:{
           tableId: '',
-          tableName: 'UploadQualityReport'
+          tableName: 'UploadQualityReport',
+          fileType:['apk'],
+          fileSize:100
         },
         limit:1,
       }
@@ -1681,7 +1683,16 @@ export const UploadQualityReport = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '数量',
+    label: '供应商批次',
+    field: 'batch',
+    sort: 'custom',
+    isForm:false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '发货数量',
     field: 'planQty',
     table: {
       width: 150
@@ -1693,15 +1704,6 @@ export const UploadQualityReport = useCrudSchemas(reactive<CrudSchema[]>([
       precision: 6
     }
   },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    isForm:false,
-    table: {
-      width: 150
-    },
-  },
 ]))
 export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[]>([
   {