From b306d5b9d38eab4c23cb00b578f211fd00f5d008 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 13 Nov 2023 11:29:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchaseMain/purchaseMain.data.ts         | 68 ++++++++++++-------
 1 file changed, 45 insertions(+), 23 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index 7e134e4f1..d7344ebe2 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -94,6 +94,21 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       value: new Date().getTime()
     },
   },
+  {
+    label: '税率',
+    field: 'taxRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        style: {width:'100%'},
+        min: 0
+      }
+    }
+  },
   {
     label: '截止日期',
     field: 'dueDate',
@@ -124,20 +139,6 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '税率',
-    field: 'taxRate',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0
-      }
-    }
-  },
   {
     label: '联系人姓名',
     field: 'contactName',
@@ -162,6 +163,28 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '当前阶段',
+    field: 'currentStage',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        style: {width:'100%'},
+        min: 0
+      }
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '是否寄存订单',
     field: 'isConsignment',
@@ -188,6 +211,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isForm: false,
     form: {
       value: 'PurchaseReceipt',
       componentProps: {
@@ -195,14 +219,6 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '当前阶段',
-    field: 'currentStage',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '是否可用',
     field: 'available',
@@ -563,7 +579,8 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm: {
       type: 'InputNumber',
-      min: 0
+      min: 1,
+      precision: 6
     }
   },
   {
@@ -625,6 +642,8 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     isSearch: true,
     isTable: true,
+    isForm: false,
+    isTableForm: false,
     table: {
       width: 150
     },
@@ -655,6 +674,9 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    tableForm:{
+      type:'Select'
+    },
     form: {
       component: 'Switch',
       value: 'TRUE',