From 4509913942adc0d72d908379e12f9e664abea06c 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 13:06:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8E=82=E5=BB=BA=E6=A8=A1=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../areabasic/areabasic.data.ts               |  9 ++++++-
 .../factoryModeling/areabasic/index.vue       | 26 ++++++++++++++++++-
 .../factoryModeling/dock/dock.data.ts         | 21 ++++++++++++++-
 .../factoryModeling/dock/index.vue            | 26 ++++++++++++++++++-
 .../factoryModeling/location/index.vue        | 26 ++++++++++++++++++-
 .../factoryModeling/location/location.data.ts | 18 +++++++++++--
 .../factoryModeling/locationgroup/index.vue   | 26 ++++++++++++++++++-
 .../locationgroup/locationgroup.data.ts       |  9 ++++++-
 .../factoryModeling/process/index.vue         | 26 ++++++++++++++++++-
 .../factoryModeling/process/process.data.ts   |  9 ++++++-
 .../factoryModeling/productionline/index.vue  | 26 ++++++++++++++++++-
 .../productionline/productionline.data.ts     |  9 ++++++-
 .../factoryModeling/warehouse/index.vue       | 26 ++++++++++++++++++-
 .../warehouse/warehouse.data.ts               | 12 ++++++++-
 .../factoryModeling/workshop/index.vue        | 26 ++++++++++++++++++-
 .../factoryModeling/workshop/workshop.data.ts |  9 ++++++-
 .../factoryModeling/workstation/index.vue     | 26 ++++++++++++++++++-
 .../workstation/workstation.data.ts           |  9 ++++++-
 18 files changed, 320 insertions(+), 19 deletions(-)

diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
index 7e276e349..807d356bf 100644
--- a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
@@ -199,7 +199,14 @@ export const Area = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const AreaRules = reactive({
   code: [
-    { required: true, message: '请输入代码', trigger: 'blur' }
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   warehouseCode: [
     { required: true, message: '请输入仓库代码', trigger: 'change' }
diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
index 459698825..3bc1ac6bc 100644
--- a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue
@@ -41,7 +41,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm 
     ref="basicFormRef" 
-    @success="getList" 
+    @success="formsSuccess" 
     :rules="AreaRules" 
     :formAllSchemas="Area.allSchemas"
     :apiUpdate="AreaApi.updateArea"
@@ -145,6 +145,30 @@ const openForm = (type: string, row?: any) => {
   basicFormRef.value.open(type, row)
 }
 
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Area.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 AreaApi.createArea(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await AreaApi.updateArea(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
index 4a73ab074..4277a10ca 100644
--- a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
@@ -234,7 +234,23 @@ export const Dock = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const DockRules = reactive({
   code: [
-    { required: true, message: '请输入代码', trigger: 'blur' }
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  city: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  address: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  contactPerson: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  contactPhone: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   type: [
     { required: true, message: '请输入类型', trigger: 'change' }
@@ -245,6 +261,9 @@ export const DockRules = reactive({
   defaultLocationCode: [
     { required: true, message: '请输入默认库位代码', trigger: 'change' }
   ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
   available:  [
     { required: true, message: '请选择是否可用', trigger: 'change' }
   ],
diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue
index f4010dc17..a411e6025 100644
--- a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue
@@ -41,7 +41,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm 
     ref="basicFormRef" 
-    @success="getList" 
+    @success="formsSuccess" 
     :rules="DockRules" 
     :formAllSchemas="Dock.allSchemas"
     :apiUpdate="DockApi.updateDock"
@@ -160,6 +160,30 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue, 'baiscDock')
 }
 
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Dock.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 DockApi.createDock(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await DockApi.updateDock(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {
diff --git a/src/views/wms/basicDataManage/factoryModeling/location/index.vue b/src/views/wms/basicDataManage/factoryModeling/location/index.vue
index 6c50907e3..90f4f44ca 100644
--- a/src/views/wms/basicDataManage/factoryModeling/location/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/location/index.vue
@@ -41,7 +41,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm 
     ref="basicFormRef" 
-    @success="getList" 
+    @success="formsSuccess" 
     :rules="LocationRules" 
     :formAllSchemas="Location.allSchemas"
     :apiUpdate="LocationApi.updateLocation"
@@ -145,6 +145,30 @@ const openForm = (type: string, row?: any) => {
   basicFormRef.value.open(type, row)
 }
 
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Location.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 LocationApi.createLocation(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await LocationApi.updateLocation(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
index 9477cc8a2..1e69d178f 100644
--- a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts
@@ -348,7 +348,20 @@ export const Location = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const LocationRules = reactive({
   code: [
-    { required: true, message: '请输入代码', trigger: 'blur' }
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  aisle: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  shelf: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   warehouseCode: [
     { required: true, message: '请输入仓库代码', trigger: 'change' }
@@ -369,7 +382,8 @@ export const LocationRules = reactive({
     { required: true, message: '请输入拣料优先级', trigger: 'blur' }
   ],
   userGroupCode: [
-    { required: true, message: '请输入用户组代码', trigger: 'blur' }
+    { required: true, message: '请输入用户组代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   available:  [
     { required: true, message: '请选择是否可用', trigger: 'change' }
diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue
index 5ad19b713..856972377 100644
--- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue
@@ -41,7 +41,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm 
     ref="basicFormRef" 
-    @success="getList" 
+    @success="formsSuccess" 
     :rules="LocationgroupRules" 
     :formAllSchemas="Locationgroup.allSchemas"
     :apiUpdate="LocationgroupApi.updateLocationgroup"
@@ -145,6 +145,30 @@ const openForm = (type: string, row?: any) => {
   basicFormRef.value.open(type, row)
 }
 
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Locationgroup.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 LocationgroupApi.createLocationgroup(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await LocationgroupApi.updateLocationgroup(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
index 12d6fdb8f..f55dba16a 100644
--- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts
@@ -191,7 +191,11 @@ export const Locationgroup = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const LocationgroupRules = reactive({
   code: [
-    { required: true, message: '请输入代码', trigger: 'blur' }
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   warehouseCode: [
     { required: true, message: '请输入仓库代码', trigger: 'change' }
@@ -199,6 +203,9 @@ export const LocationgroupRules = reactive({
   areaCode: [
     { required: true, message: '请输入库区代码', trigger: 'change' }
   ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
   available:  [
     { required: true, message: '请选择是否可用', trigger: 'change' }
   ],
diff --git a/src/views/wms/basicDataManage/factoryModeling/process/index.vue b/src/views/wms/basicDataManage/factoryModeling/process/index.vue
index 94fc95501..ac8f74c37 100644
--- a/src/views/wms/basicDataManage/factoryModeling/process/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/process/index.vue
@@ -41,7 +41,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm 
     ref="basicFormRef" 
-    @success="getList" 
+    @success="formsSuccess" 
     :rules="ProcessRules" 
     :formAllSchemas="Process.allSchemas"
     :apiUpdate="ProcessApi.updateProcess"
@@ -145,6 +145,30 @@ const openForm = (type: string, row?: any) => {
   basicFormRef.value.open(type, row)
 }
 
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Process.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 ProcessApi.createProcess(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await ProcessApi.updateProcess(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts b/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts
index 29bf45ef8..b3e1de3b8 100644
--- a/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts
@@ -202,7 +202,11 @@ export const Process = useCrudSchemas(reactive<CrudSchema[]>([
 //表单检验
 export const ProcessRules = reactive({
   code: [
-    { required: true, message: '请输入代码', trigger: 'blur' }
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   workshopCode: [
     { required: true, message: '请输入车间代码', trigger: 'change' }
@@ -210,6 +214,9 @@ export const ProcessRules = reactive({
   productionLineCode: [
     { required: true, message: '请输入生产线代码', trigger: 'change' }
   ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
   available:  [
     { required: true, message: '请选择是否可用', trigger: 'change' }
   ],
diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
index 597505e9c..4cb299b47 100644
--- a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue
@@ -41,7 +41,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm 
     ref="basicFormRef" 
-    @success="getList" 
+    @success="formsSuccess" 
     :rules="ProductionlineRules" 
     :formAllSchemas="Productionline.allSchemas"
     :apiUpdate="ProductionlineApi.updateProductionline"
@@ -145,6 +145,30 @@ const openForm = (type: string, row?: any) => {
   basicFormRef.value.open(type, row)
 }
 
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Productionline.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 ProductionlineApi.createProductionline(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await ProductionlineApi.updateProductionline(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts
index 296b0a8a6..1c1a40d89 100644
--- a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts
@@ -221,11 +221,18 @@ export const Productionline = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const ProductionlineRules = reactive({
   code: [
-    { required: true, message: '请输入代码', trigger: 'blur' }
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   workshopCode: [
     { required: true, message: '请输入车间代码', trigger: 'change' }
   ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
   available:  [
     { required: true, message: '请选择是否可用', trigger: 'change' }
   ],
diff --git a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue
index 11a52e128..b45cdb6a3 100644
--- a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue
@@ -41,7 +41,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm 
     ref="basicFormRef" 
-    @success="getList" 
+    @success="formsSuccess" 
     :rules="WarehouseRules" 
     :formAllSchemas="Warehouse.allSchemas"
     :apiUpdate="WarehouseApi.updateWarehouse"
@@ -144,6 +144,30 @@ const openForm = (type: string, row?: any) => {
   basicFormRef.value.open(type, row)
 }
 
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Warehouse.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 WarehouseApi.createWarehouse(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await WarehouseApi.updateWarehouse(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/factoryModeling/warehouse/warehouse.data.ts b/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts
index c80ba6d14..7075981f3 100644
--- a/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts
@@ -165,7 +165,17 @@ export const Warehouse = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const WarehouseRules = reactive({
   code: [
-    { required: true, message: '请输入代码', trigger: 'blur' }
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  description: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   available:  [
     { required: true, message: '请选择是否可用', trigger: 'change' }
diff --git a/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue b/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue
index edae21a74..4238ddc94 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue
@@ -41,7 +41,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm 
     ref="basicFormRef" 
-    @success="getList" 
+    @success="formsSuccess" 
     :rules="WorkshopRules" 
     :formAllSchemas="Workshop.allSchemas"
     :apiUpdate="WorkshopApi.updateWorkshop"
@@ -144,6 +144,30 @@ const openForm = (type: string, row?: any) => {
   basicFormRef.value.open(type, row)
 }
 
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Workshop.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 WorkshopApi.createWorkshop(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await WorkshopApi.updateWorkshop(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/factoryModeling/workshop/workshop.data.ts b/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts
index f877f6ebf..ae263da1c 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts
@@ -157,7 +157,14 @@ export const Workshop = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const WorkshopRules = reactive({
   code: [
-    { required: true, message: '请输入代码', trigger: 'blur' }
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   available:  [
     { required: true, message: '请选择是否可用', trigger: 'change' }
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
index a80c5bcba..8425e8987 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
@@ -41,7 +41,7 @@
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm 
     ref="basicFormRef" 
-    @success="getList" 
+    @success="formsSuccess" 
     :rules="WorkstationRules" 
     :formAllSchemas="Workstation.allSchemas"
     :apiUpdate="WorkstationApi.updateWorkstation"
@@ -145,6 +145,30 @@ const openForm = (type: string, row?: any) => {
   basicFormRef.value.open(type, row)
 }
 
+// form表单提交
+const formsSuccess = async (formType,data) => {
+      var isHave =Workstation.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 WorkstationApi.createWorkstation(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await WorkstationApi.updateWorkstation(data)
+        message.success(t('common.updateSuccess'))
+      }
+      basicFormRef.value.dialogVisible = false
+      getList()
+}
+
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
index 283ac15a6..e5db17583 100644
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts
@@ -243,7 +243,14 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
 //表单检验
 export const WorkstationRules = reactive({
   code: [
-    { required: true, message: '请输入代码', trigger: 'blur' }
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   workshopCode: [
     { required: true, message: '请输入车间代码', trigger: 'change' }