修改单位管理

src/views/activity/activity/customCom/member/customCom/unit/data.ts

@@ -362,6 +362,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入法人代表');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;
@@ -440,6 +457,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入工商登记号');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;
@@ -524,6 +558,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入行业分类');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;
@@ -676,7 +727,6 @@ export const schemas: FormSchema[] = [
     rules: [
       {
         validator: async (_, value: any) => {
-          console.log(`网址 value`, value);
           const regex =
             /(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?/;
           if (value && !regex.test(value)) {
@@ -950,6 +1000,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入主要经营项目');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;

src/views/activity/activity/customCom/member/popup.vue

@@ -71,7 +71,7 @@
             data.fromId = data.unitName.id;
           }
           data.isCheck = 1;
-          data.source = 'active';
+          data.source = 'activity';
           data.jointime = moment(data.jointime).format('YYYY-MM-DD');
           delete data.relation;
           delete data.relationUnit;

src/views/activity/meeting/customCom/member/customCom/unit/data.ts

@@ -362,6 +362,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入法人代表');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;
@@ -440,6 +457,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入工商登记号');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;
@@ -524,6 +558,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入行业分类');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;
@@ -676,7 +727,6 @@ export const schemas: FormSchema[] = [
     rules: [
       {
         validator: async (_, value: any) => {
-          console.log(`网址 value`, value);
           const regex =
             /(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?/;
           if (value && !regex.test(value)) {
@@ -950,6 +1000,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入主要经营项目');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;

src/views/bill/bill/customCom/member/customCom/unit/data.ts

@@ -362,6 +362,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入法人代表');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;
@@ -440,6 +457,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入工商登记号');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;
@@ -524,6 +558,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入行业分类');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;
@@ -676,7 +727,6 @@ export const schemas: FormSchema[] = [
     rules: [
       {
         validator: async (_, value: any) => {
-          console.log(`网址 value`, value);
           const regex =
             /(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?/;
           if (value && !regex.test(value)) {
@@ -950,6 +1000,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入主要经营项目');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;

src/views/department/department/customCom/member/customCom/unit/data.ts

@@ -362,6 +362,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入法人代表');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;
@@ -440,6 +457,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入工商登记号');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;
@@ -524,6 +558,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入行业分类');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;
@@ -676,7 +727,6 @@ export const schemas: FormSchema[] = [
     rules: [
       {
         validator: async (_, value: any) => {
-          console.log(`网址 value`, value);
           const regex =
             /(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?/;
           if (value && !regex.test(value)) {
@@ -950,6 +1000,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入主要经营项目');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;

src/views/member/member/customCom/unit/data.ts

@@ -362,6 +362,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入法人代表');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;
@@ -440,6 +457,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入工商登记号');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;
@@ -524,6 +558,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入行业分类');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;
@@ -676,7 +727,6 @@ export const schemas: FormSchema[] = [
     rules: [
       {
         validator: async (_, value: any) => {
-          console.log(`网址 value`, value);
           const regex =
             /(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?/;
           if (value && !regex.test(value)) {
@@ -950,6 +1000,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入主要经营项目');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;

src/views/member/unit/data.ts

@@ -223,7 +223,6 @@ export function getFormConfig(): Partial<FormProps> {
         componentProps: {
           placeholder: '注册资金',
         },
-        defaultValue: '',
         colProps: {
           xl: 12,
           xxl: 8,
@@ -236,7 +235,6 @@ export function getFormConfig(): Partial<FormProps> {
         componentProps: {
           placeholder: '职工人数',
         },
-        defaultValue: '',
         colProps: {
           xl: 12,
           xxl: 8,
@@ -364,6 +362,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入法人代表');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;
@@ -442,6 +457,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入工商登记号');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;
@@ -526,6 +558,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入行业分类');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;
@@ -951,6 +1000,23 @@ export const schemas: FormSchema[] = [
       }
       return false;
     },
+    dynamicRules: ({ values }) => {
+      return [
+        {
+          required: true,
+          validator: async (_, value: any) => {
+            let dealValue = '';
+            if (value) {
+              dealValue = value.replace(/\s*/g, '');
+            }
+            if (values.nature && dealValue === '') {
+              return Promise.reject('请输入主要经营项目');
+            }
+          },
+          trigger: 'blur',
+        },
+      ];
+    },
     required: ({ values }) => {
       if (values.nature !== 0) {
         return true;