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([ 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([ component: 'InputNumber', componentProps: { style: {width:'100%'}, - min: 0 + min: 0, + max: 1, + precision: 6, } } },