11

src/components/Form/src/components/CarArrayCom.vue

@@ -29,9 +29,10 @@
 <script lang="ts">
   import { defineComponent, onUpdated, reactive, nextTick, toRefs, watch } from 'vue';
   import { Input } from 'ant-design-vue';
+  import { propTypes } from '/@/utils/propTypes';
 
   const props = {
-    value: { type: [], default: [] },
+    value: propTypes.oneOfType([propTypes.object, propTypes.string, propTypes.array]),
     placeholder: { type: String, default: '' },
   };
 
@@ -42,7 +43,7 @@
     emits: ['change'],
     setup(props, { emit }) {
       const state = reactive({
-        list: [] as object[],
+        list: [] as any,
       });
       // 初始化
       function init() {
@@ -50,7 +51,7 @@
           state.list = props.value;
         });
       }
-      watch(props.value, (value: object[]) => {
+      watch(props.value as any, (value: object[]) => {
         state.list = value;
       });
       onUpdated(() => {

src/components/Form/src/components/FamilyArrCom.vue

@@ -41,9 +41,10 @@
 <script lang="ts">
   import { defineComponent, onUpdated, reactive, nextTick, toRefs, watch } from 'vue';
   import { Input } from 'ant-design-vue';
+  import { propTypes } from '/@/utils/propTypes';
 
   const props = {
-    value: { type: [], default: [] },
+    value: propTypes.oneOfType([propTypes.object, propTypes.string, propTypes.array]),
     placeholder: { type: String, default: '' },
   };
 
@@ -54,18 +55,15 @@
     emits: ['change'],
     setup(props, { emit }) {
       const state = reactive({
-        list: [] as object[],
+        list: [] as any,
       });
       // 初始化
       function init() {
-        // setTimeout(() => {
-
-        // }, 200);
         nextTick(() => {
           state.list = props.value;
         });
       }
-      watch(props.value, (value: object[]) => {
+      watch(props.value as any, (value: object[]) => {
         state.list = value;
       });
       onUpdated(() => {

src/views/activity/activity/customCom/CustomInput.vue

@@ -13,9 +13,15 @@
   import { Input } from 'ant-design-vue';
   import Popup from './popup.vue';
   import { useModal } from '/@/components/Modal';
+  import { propTypes } from '/@/utils/propTypes';
 
   const props = {
-    value: { type: Object, default: '' },
+    value: propTypes.oneOfType([
+      propTypes.object,
+      propTypes.number,
+      propTypes.string,
+      propTypes.array,
+    ]),
     placeholder: { type: String, default: '' },
   };
   interface State {

src/views/activity/activity/customCom/member/customCom/person/index.vue

@@ -34,7 +34,7 @@
   export default defineComponent({
     name: 'Person',
     components: { BasicTable, Popup },
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(_, { emit }) {
       const { createMessage } = useMessage();
       const { success /*, error*/ } = createMessage;

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

@@ -20,7 +20,7 @@
 
   export default defineComponent({
     components: { BasicModal, Person, Unit },
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(_, { emit }) {
       const state = reactive({
         title: '',

src/views/activity/activity/customCom/member/customCom/unit/index.vue

@@ -34,7 +34,7 @@
   export default defineComponent({
     name: 'Unit',
     components: { BasicTable, Popup },
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(_, { emit }) {
       const { createMessage } = useMessage();
       const { success /*, error*/ } = createMessage;

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

@@ -47,7 +47,7 @@
     name: 'User',
     components: { BasicTable, Popup },
     props,
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(props, { emit }) {
       const { createMessage } = useMessage();
       const { success /*, error*/ } = createMessage;

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

@@ -18,7 +18,7 @@
 
   export default defineComponent({
     components: { BasicModal, Member },
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(_, { emit }) {
       const state = reactive({
         title: '',

src/views/activity/meeting/customCom/CustomInput.vue

@@ -13,9 +13,15 @@
   import { Input } from 'ant-design-vue';
   import Popup from './popup.vue';
   import { useModal } from '/@/components/Modal';
+  import { propTypes } from '/@/utils/propTypes';
 
   const props = {
-    value: { type: Object, default: '' },
+    value: propTypes.oneOfType([
+      propTypes.object,
+      propTypes.number,
+      propTypes.string,
+      propTypes.array,
+    ]),
     placeholder: { type: String, default: '' },
   };
   interface State {

src/views/activity/meeting/customCom/member/customCom/person/index.vue

@@ -34,7 +34,7 @@
   export default defineComponent({
     name: 'Person',
     components: { BasicTable, Popup },
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(_, { emit }) {
       const { createMessage } = useMessage();
       const { success /*, error*/ } = createMessage;

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

@@ -20,7 +20,7 @@
 
   export default defineComponent({
     components: { BasicModal, Person, Unit },
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(_, { emit }) {
       const state = reactive({
         title: '',

src/views/activity/meeting/customCom/member/customCom/unit/index.vue

@@ -34,7 +34,7 @@
   export default defineComponent({
     name: 'Unit',
     components: { BasicTable, Popup },
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(_, { emit }) {
       const { createMessage } = useMessage();
       const { success /*, error*/ } = createMessage;

src/views/activity/meeting/customCom/member/index.vue

@@ -47,7 +47,7 @@
     name: 'User',
     components: { BasicTable, Popup },
     props,
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(props, { emit }) {
       const { createMessage } = useMessage();
       const { success /*, error*/ } = createMessage;

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

@@ -18,7 +18,7 @@
 
   export default defineComponent({
     components: { BasicModal, Member },
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(_, { emit }) {
       const state = reactive({
         title: '',

src/views/bill/account/customCom/popup.vue

@@ -17,7 +17,7 @@
 
   export default defineComponent({
     components: { BasicModal, AccountRecord },
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(_, { emit }) {
       const state = reactive({
         title: '',

src/views/bill/account/data.ts

@@ -146,7 +146,6 @@ export function getFormConfig(): Partial<FormProps> {
         label: `创建日期`,
         component: 'RangePicker',
         componentProps: {
-          placeholder: '创建日期',
           showTime: true,
         },
         colProps: {

src/views/bill/bill/customCom/CustomApiSelect.vue

@@ -59,7 +59,7 @@
         propTypes.string,
         propTypes.array,
       ]),
-      hideid: Number,
+      hideid: propTypes.oneOfType([propTypes.number, propTypes.string]),
       numberToString: propTypes.bool,
       api: {
         type: Function as PropType<(arg?: Recordable) => Promise<OptionsItem[]>>,

src/views/bill/bill/customCom/CustomInput.vue

@@ -34,14 +34,15 @@
   import { Checkbox } from 'ant-design-vue';
   import Popup from './popup.vue';
   import { useModal } from '/@/components/Modal';
+  import { propTypes } from '/@/utils/propTypes';
 
   const props = {
-    value: { type: Object, default: '' },
+    value: propTypes.oneOfType([propTypes.object, propTypes.string, propTypes.array]),
     placeholder: { type: String, default: '' },
     type: { type: Number, default: 1 },
   };
   interface State {
-    value: object | string;
+    value: any;
     placeholder: string;
     disabled: boolean;
     type: number;
@@ -68,10 +69,8 @@
       function init() {
         nextTick(() => {
           state.type = props.type;
-          if (props.value.name) {
+          if (props.value && props.value.name) {
             state.value = props.value.name;
-          } else if (props.value.url) {
-            state.value = props.value.url;
           } else {
             state.value = props.value;
             if (props.value === '会费') {

src/views/bill/bill/customCom/YearPicker.vue

@@ -27,7 +27,7 @@
   }
 
   export default defineComponent({
-    name: 'CustomInput',
+    name: 'YearPicker',
     components: { [DatePicker.name]: DatePicker },
     props,
     emits: ['change'],

src/views/bill/bill/customCom/account/index.vue

@@ -34,7 +34,7 @@
   export default defineComponent({
     name: 'Account',
     components: { BasicTable, Popup },
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(_, { emit }) {
       const { createMessage } = useMessage();
       const { success /*, error*/ } = createMessage;

src/views/bill/bill/customCom/member/customCom/person/index.vue

@@ -34,7 +34,7 @@
   export default defineComponent({
     name: 'Person',
     components: { BasicTable, Popup },
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(_, { emit }) {
       const { createMessage } = useMessage();
       const { success /*, error*/ } = createMessage;

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

@@ -20,7 +20,7 @@
 
   export default defineComponent({
     components: { BasicModal, Person, Unit },
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(_, { emit }) {
       const state = reactive({
         title: '',

src/views/bill/bill/customCom/member/customCom/unit/index.vue

@@ -34,7 +34,7 @@
   export default defineComponent({
     name: 'Unit',
     components: { BasicTable, Popup },
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(_, { emit }) {
       const { createMessage } = useMessage();
       const { success /*, error*/ } = createMessage;

src/views/bill/bill/customCom/member/index.vue

@@ -44,7 +44,7 @@
   export default defineComponent({
     name: 'User',
     components: { BasicTable, Popup },
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(_, { emit }) {
       const { createMessage } = useMessage();
       const { success /*, error*/ } = createMessage;

src/views/bill/bill/customCom/popup.vue

@@ -20,7 +20,7 @@
 
   export default defineComponent({
     components: { BasicModal, Member, Type },
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(_, { emit }) {
       const { createMessage } = useMessage();
       const { error } = createMessage;

src/views/bill/bill/customCom/type/index.vue

@@ -39,7 +39,7 @@
     name: 'Type',
     components: { BasicTable, Popup },
     props,
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(props, { emit }) {
       const { createMessage } = useMessage();
       const { success /*, error*/ } = createMessage;

src/views/bill/dues/data.ts

@@ -162,7 +162,6 @@ export function getFormConfig(): Partial<FormProps> {
         label: `创建日期`,
         component: 'RangePicker',
         componentProps: {
-          placeholder: '创建日期',
           showTime: true,
         },
         colProps: {

src/views/bill/type/data.ts

@@ -140,7 +140,6 @@ export function getFormConfig(): Partial<FormProps> {
         label: `创建日期`,
         component: 'RangePicker',
         componentProps: {
-          placeholder: '创建日期',
           showTime: true,
         },
         colProps: {

src/views/department/department/customCom/member/customCom/person/index.vue

@@ -34,7 +34,7 @@
   export default defineComponent({
     name: 'Person',
     components: { BasicTable, Popup },
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(_, { emit }) {
       const { createMessage } = useMessage();
       const { success /*, error*/ } = createMessage;

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

@@ -20,7 +20,7 @@
 
   export default defineComponent({
     components: { BasicModal, Person, Unit },
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(_, { emit }) {
       const state = reactive({
         title: '',

src/views/department/department/customCom/member/customCom/unit/index.vue

@@ -34,7 +34,7 @@
   export default defineComponent({
     name: 'Unit',
     components: { BasicTable, Popup },
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(_, { emit }) {
       const { createMessage } = useMessage();
       const { success /*, error*/ } = createMessage;

src/views/department/department/customCom/member/index.vue

@@ -47,7 +47,7 @@
     name: 'User',
     components: { BasicTable, Popup },
     props,
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(props, { emit }) {
       const { createMessage } = useMessage();
       const { success /*, error*/ } = createMessage;

src/views/department/department/customCom/popup.vue

@@ -18,7 +18,7 @@
 
   export default defineComponent({
     components: { BasicModal, Member },
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(_, { emit }) {
       const state = reactive({
         title: '',

src/views/member/member/customCom/CustomInput.vue

@@ -20,16 +20,17 @@
   import { Input } from 'ant-design-vue';
   import Popup from './popup.vue';
   import { useModal } from '/@/components/Modal';
+  import { propTypes } from '/@/utils/propTypes';
 
   const props = {
-    value: { type: Object, default: '' },
-    type: { type: String, default: '' },
+    value: propTypes.oneOfType([propTypes.object, propTypes.string, propTypes.array]),
+    type: { type: Number, default: 2 },
   };
   interface State {
-    value: object | string;
+    value: any;
     placeholder: string;
     disabled: boolean;
-    type: string;
+    type: number;
   }
 
   export default defineComponent({
@@ -42,18 +43,18 @@
         value: '',
         placeholder: '添加相关个人',
         disabled: false,
-        type: '2',
+        type: 2,
       });
       const [register, { openModal: openPopup }] = useModal();
       // 初始化
       function init() {
         nextTick(() => {
-          if (props.type === '2') {
+          if (props.type === 2) {
             state.placeholder = '添加相关个人';
           } else {
             state.placeholder = '添加相关单位';
           }
-          if (props.value.name) {
+          if (props.value && props.value.name) {
             state.value = props.value.name;
           } else {
             state.value = props.value;

src/views/member/member/customCom/CustomInputPassword.vue

@@ -9,14 +9,15 @@
 <script lang="ts">
   import { defineComponent, onUpdated, reactive, toRefs } from 'vue';
   import { Input } from 'ant-design-vue';
+  import { propTypes } from '/@/utils/propTypes';
 
   const props = {
-    value: { type: Object, default: '123456' },
+    value: propTypes.oneOfType([propTypes.object, propTypes.string, propTypes.array]),
     tip: { type: String, default: '' },
     placeholder: { type: String, default: '' },
   };
   interface State {
-    value: object | string;
+    value: any;
     placeholder: string;
     tip: string;
   }

src/views/member/member/customCom/person/index.vue

@@ -34,7 +34,7 @@
   export default defineComponent({
     name: 'Person',
     components: { BasicTable, Popup },
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(_, { emit }) {
       const { createMessage } = useMessage();
       const { success /*, error*/ } = createMessage;

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

@@ -20,7 +20,7 @@
 
   export default defineComponent({
     components: { BasicModal, Person, Unit },
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(_, { emit }) {
       const state = reactive({
         title: '',

src/views/member/member/customCom/unit/index.vue

@@ -34,7 +34,7 @@
   export default defineComponent({
     name: 'Unit',
     components: { BasicTable, Popup },
-    emits: ['select'],
+    emits: ['register', 'select'],
     setup(_, { emit }) {
       const { createMessage } = useMessage();
       const { success /*, error*/ } = createMessage;

src/views/member/member/data.ts

@@ -229,7 +229,6 @@ export const schemas: FormSchema[] = [
     },
     componentProps: () => {
       return {
-        // disabled: true,
         options: [
           { label: '个人', value: 2 },
           { label: '单位', value: 1 },

src/views/member/person/data.ts

@@ -647,7 +647,7 @@ export const schemas: FormSchema[] = [
     defaultValue: [],
     componentProps: ({ formModel }) => {
       return {
-        placeholder: '家庭主要成员',
+        // placeholder: '家庭主要成员',
         value: formModel.family,
         onChange: () => {},
       };

src/views/member/unit/data.ts

@@ -136,7 +136,6 @@ export function getFormConfig(): Partial<FormProps> {
         component: 'RangePicker',
         componentProps: {
           valueFormat: 'YYYY-MM-DD',
-          placeholder: '成立时间',
         },
         colProps: {
           xl: 12,

src/views/member/unit/index.vue

@@ -222,9 +222,7 @@
 
       async function saveData(params: any) {
         const data = params.data;
-        console.log(`save----data----data`, data);
         const closeModel = params.closeModal;
-        console.log(`data`, data);
         if (!data.id) {
           await addUnit(data).then((res) => {
             console.log(res);

src/views/member/unit/popup.vue

@@ -50,6 +50,21 @@
       //   });
       const [register, { closeModal }] = useModalInner((data) => {
         resetFields();
+        if (data.technology === 1) {
+          data.technology = true;
+        } else {
+          data.technology = false;
+        }
+        if (data.quality === 1) {
+          data.quality = true;
+        } else {
+          data.quality = false;
+        }
+        if (data.foreignTrade === 1) {
+          data.foreignTrade = true;
+        } else {
+          data.foreignTrade = false;
+        }
         setFieldsValue(data);
         role.id = data.id;
       });