From a1f617e3246882640db2cb6c70c4ade3f1e5752a Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 14 Nov 2023 17:40:56 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/dict.ts | 1 +
.../strategySetting/configurationsetting/index.vue | 8 ++++++--
.../strategySetting/paramsetting/index.vue | 8 ++++++--
.../strategy/arrivalInspectionStrategy/index.vue | 3 +--
.../strategySetting/strategy/batchStrategy/index.vue | 3 +--
.../strategySetting/strategy/downShelfStrategy/index.vue | 3 +--
.../strategySetting/strategy/inspectStrategy/index.vue | 3 +--
.../strategy/manageAccuracyStrategy/index.vue | 3 +--
.../strategy/purchaseReceiptStrategy/index.vue | 3 +--
.../strategy/repairMaterialStrategy/index.vue | 3 +--
.../strategy/storageCapacityStrategy/index.vue | 3 +--
.../strategy/supplieDeliveryStrategy/index.vue | 3 +--
.../strategySetting/strategy/upShelfStrategy/index.vue | 3 +--
.../strategy/utensilCapacityStrategy/index.vue | 3 +--
.../strategy/warehouseStorageStrategy/index.vue | 3 +--
.../currencyexchange/currencyexchange.data.ts | 5 +++--
.../systemSetting/currencyexchange/index.vue | 7 +++----
17 files changed, 31 insertions(+), 34 deletions(-)
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 9ce197e82..94444b9f5 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -194,6 +194,7 @@ export enum DICT_TYPE {
ITEM_CONFIGURATION = 'item_configuration', // 物品配置
EQ_LEVEL = 'eq_level', // 质量等级
CURRENCY = 'currency', // 货币
+ BASIC_CURRENCY = 'basic_currency', // 货币
SUPPLIER_TYPE = 'supplier_type', // 供应商类型
CUSTOMER_TYPE = 'customer_type', // 客户类型
OWNER_TYPE = 'owner_type', // 货主类型
diff --git a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
index 08a960871..1892c5bc5 100644
--- a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
@@ -29,7 +29,7 @@
>
- {{ row.strategyType }}
+ {{ formatter(row.strategyType) }}
@@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
defineOptions({ name: 'Configurationsetting' })
@@ -202,7 +203,10 @@ const searchFormClick = (searchData) => {
}
getList() // 刷新当前列表
}
-
+const formatter = (type)=>{
+ let str = getStrDictOptions(DICT_TYPE.STRATEGY_TYPE).filter(item=>type==item.value)[0].label;
+ return str
+}
/** 初始化 **/
onMounted(async() => {
getList()
diff --git a/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue b/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue
index 68f074d31..a098fae59 100644
--- a/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue
@@ -29,7 +29,7 @@
>
- {{ row.strategyType }}
+ {{ formatter(row.strategyType) }}
@@ -65,6 +65,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
defineOptions({ name: 'Paramsetting' })
@@ -202,7 +203,10 @@ const searchFormClick = (searchData) => {
}
getList() // 刷新当前列表
}
-
+const formatter = (type)=>{
+ let str = getStrDictOptions(DICT_TYPE.STRATEGY_TYPE).filter(item=>type==item.value)[0].label;
+ return str
+}
/** 初始化 **/
onMounted(async() => {
getList()
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue
index 99f62a372..639e9593f 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue
@@ -8,8 +8,7 @@
class="!w-240px" />
-
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue
index 26d946ac8..937394b63 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue
@@ -8,8 +8,7 @@
class="!w-240px" />
-
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue
index 037a71e78..7e7e3431e 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue
@@ -8,8 +8,7 @@
class="!w-240px" />
-
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue
index c4881ed4b..ca8a89b3d 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue
@@ -8,8 +8,7 @@
class="!w-240px" />
-
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue
index 23c1464be..5dbb91f7d 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue
@@ -8,8 +8,7 @@
class="!w-240px" />
-
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue
index 358f0f0e8..3e9401b00 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue
@@ -9,8 +9,7 @@
class="!w-240px" />
-
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/index.vue
index cdfb11d40..039ee0989 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/index.vue
@@ -8,8 +8,7 @@
class="!w-240px" />
-
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue
index d8ff76860..e1eea8c30 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue
@@ -8,8 +8,7 @@
class="!w-240px" />
-
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
index 31d6fa974..b9480d824 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
@@ -9,8 +9,7 @@
class="!w-240px" />
-
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
index d3502ba54..f7b39fd6f 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue
@@ -9,8 +9,7 @@
class="!w-240px" />
-
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue
index f645fdc20..f94f16352 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue
@@ -8,8 +8,7 @@
class="!w-240px" />
-
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue
index a930c2d99..0c45d13b3 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue
@@ -9,8 +9,7 @@
class="!w-240px" />
-
+
diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts b/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts
index 1783cdc0c..2db86fdb9 100644
--- a/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts
+++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts
@@ -22,7 +22,7 @@ export const Currencyexchange = useCrudSchemas(reactive([
{
label: '基础货币',
field: 'basiccurrency',
- dictType: DICT_TYPE.CURRENCY,
+ dictType: DICT_TYPE.BASIC_CURRENCY,
dictClass: 'string',
isSearch: true,
isTable: true,
@@ -41,7 +41,8 @@ export const Currencyexchange = useCrudSchemas(reactive([
form: {
component: 'InputNumber',
componentProps: {
- min: 0
+ min: 0,
+ precision:6
}
},
},
diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
index a230e9238..12a04ec52 100644
--- a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
@@ -203,10 +203,9 @@ const searchFormClick = (searchData) => {
}
getList() // 刷新当前列表
}
-const formatter = (currency)=>{
- console.log(getStrDictOptions(DICT_TYPE.CURRENCY))
- let currencyStr = getStrDictOptions(DICT_TYPE.CURRENCY).filter(item=>currency==item.value)[0].label;
- return currencyStr
+const formatter = (type)=>{
+ let str = getStrDictOptions(DICT_TYPE.CURRENCY).filter(item=>type==item.value)[0].label;
+ return str
}
/** 初始化 **/
onMounted(async() => {
From daa40fd489520ac7a9f8f2bce6c2356f8989693e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 14 Nov 2023 18:44:01 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E9=82=AE?=
=?UTF-8?q?=E7=BC=96=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../documentsetting/documentsetting.data.ts | 1 +
.../basicDataManage/orderManage/owner/owner.data.ts | 11 ++++++++---
.../basicDataManage/orderManage/shift/shift.data.ts | 8 ++++++++
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts
index ee753a94b..fbe8db260 100644
--- a/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts
+++ b/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts
@@ -223,6 +223,7 @@ export const DocumentsettingRules = reactive({
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
description: [
+ { required: true, message: '请输入描述', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
type: [
diff --git a/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts b/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts
index a877766a1..2dc139fde 100644
--- a/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts
+++ b/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts
@@ -2,6 +2,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
const { t } = useI18n() // 国际化
+import {validateHanset,validateFax,validatePostCode} from '@/utils/validator'
+
/**
* @returns {Array} 货主
*/
@@ -273,13 +275,16 @@ export const OwnerRules = reactive({
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
phone: [
- { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+ { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+ { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
],
fax: [
- { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+ { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+ { validator:validateFax, message: '请输入正确的传真', trigger: 'blur'}
],
postId: [
- { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+ { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+ { validator:validatePostCode, message: '请输入正确的邮编', trigger: 'blur'}
],
contacts: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts
index 99f5b280a..58eb23e1c 100644
--- a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts
+++ b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts
@@ -68,6 +68,14 @@ export const Shift = useCrudSchemas(reactive([
}
},
isSearch: true,
+ search: {
+ show: true,
+ component: 'DatePicker',
+ componentProps: {
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ type: 'daterange',
+ }
+ }
},
{
label: '是否跨天',
From 88547f1262f0a7c087e4c0ffa220f8444825f617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E8=83=9C=E6=A5=A0?= <2792649152@qq.com>
Date: Tue, 14 Nov 2023 19:23:12 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../customerManage/customer/customer.data.ts | 11 +++++---
.../customerdock/customerdock.data.ts | 5 +++-
.../factoryModeling/dock/dock.data.ts | 5 +++-
.../orderManage/carrier/carrier.data.ts | 11 +++++---
.../supplierManage/supplier/supplier.data.ts | 11 +++++---
.../systemSetting/currencyexchange/index.vue | 26 ++++++++++++++++++-
.../systemSetting/systemcalendar/index.vue | 26 ++++++++++++++++++-
7 files changed, 82 insertions(+), 13 deletions(-)
diff --git a/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts b/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts
index 5a37002d9..0be4f9115 100644
--- a/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts
@@ -2,6 +2,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
const { t } = useI18n() // 国际化
+import {validateHanset,validateFax,validatePostCode} from '@/utils/validator'
+
/**
* @returns {Array} 客户
*/
@@ -274,13 +276,16 @@ export const CustomerRules = reactive({
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
phone: [
- { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+ { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+ { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
],
fax: [
- { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+ { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+ { validator:validateFax, message: '请输入正确的传真', trigger: 'blur'}
],
postId: [
- { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+ { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+ { validator:validatePostCode, message: '请输入正确的邮编', trigger: 'blur'}
],
contacts: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
index b163140af..063381cd1 100644
--- a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
@@ -2,6 +2,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
const { t } = useI18n() // 国际化
+import {validateHanset} from '@/utils/validator'
+
/**
* @returns {Array} 客户月台
*/
@@ -230,7 +232,8 @@ export const CustomerdockRules = reactive({
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
contactPhone: [
- { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+ { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+ { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
],
remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
index 4277a10ca..4a06cfaab 100644
--- a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
@@ -7,6 +7,8 @@ import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse
import * as LocationApi from '@/api/wms/location'
import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import {validateHanset} from '@/utils/validator'
+
const { t } = useI18n() // 国际化
/**
@@ -250,7 +252,8 @@ export const DockRules = reactive({
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
contactPhone: [
- { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+ { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+ { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
],
type: [
{ required: true, message: '请输入类型', trigger: 'change' }
diff --git a/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts b/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts
index ad35fb188..88fa83ec0 100644
--- a/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts
+++ b/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts
@@ -2,6 +2,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
const { t } = useI18n() // 国际化
+import {validateHanset,validateFax,validatePostCode} from '@/utils/validator'
+
/**
* @returns {Array} 承运商
*/
@@ -277,13 +279,16 @@ export const CarrierRules = reactive({
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
phone: [
- { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+ { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+ { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
],
fax: [
- { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+ { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+ { validator:validateFax, message: '请输入正确的传真', trigger: 'blur'}
],
postId: [
- { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+ { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+ { validator:validatePostCode, message: '请输入正确的邮编', trigger: 'blur'}
],
contacts: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts b/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts
index efeaeb9a0..62e5c662e 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts
@@ -2,6 +2,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
const { t } = useI18n() // 国际化
+import {validateHanset,validateFax,validatePostCode} from '@/utils/validator'
+
/**
* @returns {Array} 供应商
*/
@@ -270,13 +272,16 @@ export const SupplierRules = reactive({
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
],
phone: [
- { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+ { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+ { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
],
fax: [
- { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+ { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+ { validator:validateFax, message: '请输入正确的传真', trigger: 'blur'}
],
postId: [
- { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+ { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+ { validator:validatePostCode, message: '请输入正确的邮编', trigger: 'blur'}
],
contacts: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
index 12a04ec52..27075c47b 100644
--- a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue
@@ -41,7 +41,7 @@
{
basicFormRef.value.open(type, row)
}
+// form表单提交
+const formsSuccess = async (formType,data) => {
+ var isHave =Currencyexchange.allSchemas.formSchema.some(function (item) {
+ return item.field === 'activeTime' || item.field === 'expireTime';
+ });
+ if(isHave){
+ if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+ message.error('失效时间要大于生效时间')
+ return;
+ }
+ }
+ if(data.activeTime==0)data.activeTime = null;
+ if(data.expireTime==0)data.expireTime = null;
+ if (formType === 'create') {
+ await CurrencyexchangeApi.createCurrencyexchange(data)
+ message.success(t('common.createSuccess'))
+ } else {
+ await CurrencyexchangeApi.updateCurrencyexchange(data)
+ message.success(t('common.updateSuccess'))
+ }
+ basicFormRef.value.dialogVisible = false
+ getList()
+}
+
/** 详情操作 */
const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
diff --git a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue
index 24e86d3aa..1f1dea4b7 100644
--- a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue
+++ b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue
@@ -41,7 +41,7 @@
{
basicFormRef.value.open(type, row)
}
+// form表单提交
+const formsSuccess = async (formType,data) => {
+ var isHave =Systemcalendar.allSchemas.formSchema.some(function (item) {
+ return item.field === 'activeTime' || item.field === 'expireTime';
+ });
+ if(isHave){
+ if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+ message.error('失效时间要大于生效时间')
+ return;
+ }
+ }
+ if(data.activeTime==0)data.activeTime = null;
+ if(data.expireTime==0)data.expireTime = null;
+ if (formType === 'create') {
+ await SystemcalendarApi.createSystemcalendar(data)
+ message.success(t('common.createSuccess'))
+ } else {
+ await SystemcalendarApi.updateSystemcalendar(data)
+ message.success(t('common.updateSuccess'))
+ }
+ basicFormRef.value.dialogVisible = false
+ getList()
+}
+
/** 详情操作 */
const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
From d57f773dfb36fd9a16f25f8d039e2c615fccbccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E8=83=9C=E6=A5=A0?= <2792649152@qq.com>
Date: Wed, 15 Nov 2023 08:42:39 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=89=A9=E5=93=81?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../customeritem/customeritem.data.ts | 32 ++++++++++++++++++-
.../customerManage/customeritem/index.vue | 20 +-----------
2 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
index 23566be85..1d3abed5a 100644
--- a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
@@ -1,5 +1,12 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
+
+import * as CustomerApi from '@/api/wms/customer'
+import { Customer } from '../customer/customer.data'
+
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '../../itemManage/itembasic/itembasic.data'
+
const { t } = useI18n() // 国际化
/**
@@ -14,6 +21,17 @@ export const Customeritem = useCrudSchemas(reactive([
width: 150,
fixed: 'left'
},
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择客户代码', // 输入框占位文本
+ searchField: 'code', // 查询弹窗赋值字段
+ searchTitle: '客户信息', // 查询弹窗标题
+ searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
+ searchPage: CustomerApi.getCustomerPage // 查询弹窗所需分页方法
+ }
+ },
isSearch: true
},
{
@@ -23,6 +41,17 @@ export const Customeritem = useCrudSchemas(reactive([
table: {
width: 150
},
+ form: {
+ // labelMessage: '信息提示说明！！！',
+ componentProps: {
+ isSearchList: true, // 开启查询弹窗
+ searchListPlaceholder: '请选择物品代码', // 输入框占位文本
+ searchField: 'code', // 查询弹窗赋值字段
+ searchTitle: '物品基础信息', // 查询弹窗标题
+ searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+ searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
+ }
+ },
isSearch: true
},
{
@@ -55,7 +84,8 @@ export const Customeritem = useCrudSchemas(reactive([
form: {
component: 'InputNumber',
componentProps: {
- min: 0
+ min: 0,
+ precision: 6
}
},
},
diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue
index ada87ae89..bd8eee158 100644
--- a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue
@@ -43,8 +43,7 @@
ref="basicFormRef"
@success="formsSuccess"
:rules="CustomeritemRules"
- :formAllSchemas="Customeritem.allSchemas"
- :searchTableParams="searchTableParams"
+ :formAllSchemas="Customeritem.allSchemas"
:apiUpdate="CustomeritemApi.updateCustomeritem"
:apiCreate="CustomeritemApi.createCustomeritem"
@searchTableSuccess="searchTableSuccess"
@@ -61,12 +60,8 @@