会议管理修改

src/views/event/activity/popup.vue

@@ -143,7 +143,6 @@
           const popupData = { closeModal, data };
           emit('saveData', popupData);
         } catch (err: any) {
-          console.log(`err`, err)
           error(err.errorFields[0].errors[0]);
         }
       }

src/views/event/meeting/popup.vue

@@ -82,13 +82,13 @@
               },
             },
           ]);
+          data.plan = [];
+          data.apply = [];
+          data.actual = [];
         }
         // 时间戳处理
         data.starttime = data.starttime * 1000;
         data.endtime = data.endtime * 1000;
-        data.plan = [];
-        data.apply = [];
-        data.actual = [];
         setFieldsValue(data);
       });
 

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

@@ -47,6 +47,7 @@
       const [register, { openModal: openPopup }] = useModal();
       // 初始化
       function init() {
+        console.log(`edit props.value?`, props.value);
         nextTick(() => {
           if (props.type === '2') {
             state.placeholder = '添加相关个人';

src/views/member/member/data.ts

@@ -130,8 +130,8 @@ export function getFormConfig(): Partial<FormProps> {
         componentProps: {
           placeholder: '会员身份',
           options: [
-            { label: '个人', value: '2' },
-            { label: '单位', value: '1' },
+            { label: '个人', value: 2 },
+            { label: '单位', value: 1 },
           ],
         },
         colProps: {
@@ -214,16 +214,16 @@ export const schemas: FormSchema[] = [
       span: adaptWidth.elContainer,
     },
     componentProps: (value) => {
-      console.log(`value ---- type`, value);
+      console.log(`edit value ---- type`, value);
       return {
         // disabled: true,
         options: [
-          { label: '个人', value: '2' },
-          { label: '单位', value: '1' },
+          { label: '个人', value: 2 },
+          { label: '单位', value: 1 },
         ],
       };
     },
-    defaultValue: '2',
+    defaultValue: 2,
   },
   {
     field: 'duty',

src/views/member/member/index.vue

@@ -157,9 +157,9 @@
 
       async function handleEdit(record: EditRecordRow) {
         popupData.title = '编辑';
-        getUser({ id: record.id }).then((res) => {
+        await getUser({ id: record.id }).then((res) => {
           const data = res.row;
-          console.log(`edit----data`, data);
+          console.log(`edit----data0`, data);
           openPopup(true, data);
         });
       }

src/views/member/member/popup.vue

@@ -53,14 +53,13 @@
               componentProps: {
                 disabled: true,
                 options: [
-                  { label: '个人', value: '2' },
-                  { label: '单位', value: '1' },
+                  { label: '个人', value: 2 },
+                  { label: '单位', value: 1 },
                 ],
               },
             },
           ]);
           // data.username = data.admin.username;
-          setFieldsValue(data);
         } else {
           role.id = 0;
           updateSchema([
@@ -69,13 +68,15 @@
               componentProps: {
                 disabled: false,
                 options: [
-                  { label: '个人', value: '2' },
-                  { label: '单位', value: '1' },
+                  { label: '个人', value: 2 },
+                  { label: '单位', value: 1 },
                 ],
               },
             },
           ]);
         }
+        console.log(`edit data1`, data);
+        setFieldsValue(data);
       });
 
       async function confirm() {

src/views/money/dues/data.ts

@@ -82,8 +82,13 @@ export function getFormConfig(): Partial<FormProps> {
         field: `year`,
         label: `会费年份`,
         component: 'Input',
-        componentProps: {
-          placeholder: '会费年份',
+        render: ({ model, field }) => {
+          return h(YearPicker, {
+            value: model.year,
+            onChange(value) {
+              model[field] = value;
+            },
+          });
         },
         colProps: {
           xl: 12,