wangwei 3 роки тому
батько
коміт
f1dd1d9643
2 змінених файлів з 32 додано та 17 видалено
  1. 28 16
      src/views/money/bill/data.ts
  2. 4 1
      src/views/money/bill/popup.vue

+ 28 - 16
src/views/money/bill/data.ts

@@ -3,7 +3,7 @@ import { FormSchema } from '/@/components/Form/index';
 import { adapt } from '/@/utils/adapt';
 import { h } from 'vue';
 import { Tag } from 'ant-design-vue';
-import CustomInput from './customCom/CustomInput.vue';
+// import CustomInput from './customCom/CustomInput.vue';
 import CustomApiSelect from './customCom/CustomApiSelect.vue';
 import CustomApiTypeSelect from './customCom/CustomApiTypeSelect.vue';
 import YearPicker from './customCom/YearPicker.vue';
@@ -11,6 +11,7 @@ import moment from 'moment';
 import { getYearFee } from '/@/api/sys/money';
 import UploadFile from '/@/views/general/config/customComponents/UploadFile.vue';
 import { getAccountList, getTypeList } from '/@/api/sys/money';
+import { getUserList } from '/@/api/sys/member';
 
 const adaptWidth = adapt();
 
@@ -399,25 +400,36 @@ export const schemas: FormSchema[] = [
     colProps: {
       span: adaptWidth.elContainer,
     },
+    // render: ({ model, field }) => {
+    //   return h(CustomInput, {
+    //     value: model.user,
+    //     placeholder: '添加会员',
+    //     onChange(value) {
+    //       model[field] = value;
+    //       if (model.user.id && model.year) {
+    //         let year = 0;
+    //         if (model.year.year) {
+    //           year = model.year.year;
+    //         } else {
+    //           year = model.year;
+    //         }
+    //         getYearFee({ user_id: model.user.id, year }).then((res) => {
+    //           if (res.money) {
+    //             model.money = res.money;
+    //           }
+    //         });
+    //       }
+    //     },
+    //   });
+    // },
     render: ({ model, field }) => {
-      return h(CustomInput, {
+      return h(CustomApiSelect, {
+        placeholder: '相关会员',
+        api: getUserList,
         value: model.user,
-        placeholder: '添加会员',
+        // immediate: false,
         onChange(value) {
           model[field] = value;
-          if (model.user.id && model.year) {
-            let year = 0;
-            if (model.year.year) {
-              year = model.year.year;
-            } else {
-              year = model.year;
-            }
-            getYearFee({ user_id: model.user.id, year }).then((res) => {
-              if (res.money) {
-                model.money = res.money;
-              }
-            });
-          }
         },
       });
     },

+ 4 - 1
src/views/money/bill/popup.vue

@@ -109,7 +109,10 @@
           if (typeof data.typename === 'number') {
             data.typeId = data.typename;
           }
-          data.userId = data.user.id;
+          if (typeof data.user === 'number') {
+            data.userId = data.user;
+          }
+          // data.userId = data.user.id;
           delete data.account;
           delete data.inaccount;
           delete data.typename;