From 39c7bae7786871367189e81820bea39b1d8e3955 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Tue, 9 Apr 2024 15:37:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=A8=8E=E7=8E=87?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BD=8D6=E4=BD=8D=E5=B0=8F=E6=95=B0?=
 =?UTF-8?q?=E4=B8=94=E4=B8=8D=E8=83=BD=E5=A4=A7=E4=BA=8E1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/systemInstallPackage/index.vue          | 9 ++++++++-
 .../strategy/supplieDeliveryStrategy/AddForm.vue         | 5 ++++-
 .../supplierManage/supplier/supplier.data.ts             | 4 +++-
 .../supplierdeliver/purchaseMain/index.vue               | 1 +
 .../supplierdeliver/purchaseMain/purchaseMain.data.ts    | 4 +++-
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/views/system/systemInstallPackage/index.vue b/src/views/system/systemInstallPackage/index.vue
index 83e7323c2..61b1e3d37 100644
--- a/src/views/system/systemInstallPackage/index.vue
+++ b/src/views/system/systemInstallPackage/index.vue
@@ -147,8 +147,15 @@ const openForm = (type: string, row?: any) => {
     }
     if(uploadFile){
       uploadFile['componentProps']['upData']['tableId'] = currentTime
+      uploadFile['componentProps']['modelValue']=  []
     }
-    
+  }
+  else if(type=='update'){
+    const uploadFile = SystemInstallPackage.allSchemas.formSchema.find(item=>item.field=='uploadFile')
+    uploadFile['componentProps']['modelValue']=  [{
+      name: row.installPackageUrl,
+      url: row.installPackageUrl,
+    }]
   }
   basicFormRef.value.open(type, row)
 }
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
index bc293b211..50ce4c375 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
@@ -261,6 +261,7 @@ import { getDockList } from '@/api/wms/dock'
 import { getLocationList } from '@/api/wms/location'
 import * as RuleApi from '@/api/wms/rule'
 import { isString } from '@/utils/is'
+import {validateHanset} from '@/utils/validator'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -312,7 +313,9 @@ const rules = ref({
   strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
   name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
   description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
+  PhoneNumber: [{ max: 11, message: '不得超过11个字符', trigger: 'blur' },
+  {message: '请输入联系电话', trigger: 'blur' ,validator:validateHanset}]
 })
 
 // 所有的范围类型
diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts b/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts
index 29733915b..cea87d094 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts
@@ -126,7 +126,9 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 0
+        min: 0,
+        max: 1,
+        precision: 6
       }
     },
     table: {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
index d1af5fe63..81b1e8ce6 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
@@ -140,6 +140,7 @@
           setV['contactName']=val[0]['contacts']
           setV['contactPhone']=val[0]['phone']
           setV['contactEmail']=val[0]['email']
+          setV['taxRate']=val[0]['taxRate']
         }
         formRef.setValues(setV)
       }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index 719ebdd67..e98b99bea 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -134,7 +134,9 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         style: {width:'100%'},
-        min: 0
+        min: 0,
+        max: 1,
+        precision: 6,
       }
     }
   },