huangbin 4 роки тому
батько
коміт
27f198ff0c
18 змінених файлів з 81 додано та 44 видалено
  1. 3 1
      src/common/setup/filter/index.ts
  2. 5 0
      src/common/setup/filter/interface.ts
  3. 1 1
      src/views/information/custom/compoments/detail/index.vue
  4. 1 1
      src/views/manage/inventory-review/components/checkinDetail/index.vue
  5. 1 1
      src/views/platinum/platinum_customer_info/compoments/detail/index.vue
  6. 13 14
      src/views/platinum/platinum_financing_information/list/tab/compoments/detail/index.vue
  7. 1 1
      src/views/platinum/platinum_pick_query/list/tab/compoments/complete_stocking/index.vue
  8. 1 1
      src/views/platinum/platinum_pick_query/list/tab/compoments/confirm_pickup/index.vue
  9. 1 1
      src/views/platinum/platinum_pick_query/list/tab/compoments/detail/index.vue
  10. 1 1
      src/views/platinum/platinum_pick_query/list/tab/compoments/query_receipt/index.vue
  11. 2 3
      src/views/platinum/platinum_pick_query/list/tab/compoments/upload_logistics/index.vue
  12. 10 10
      src/views/platinum/platinum_recharge_withdrawal_review/compoments/filter/index.vue
  13. 1 1
      src/views/platinum/platinum_recharge_withdrawal_review/list/recharge/compoments/detail/index.vue
  14. 10 2
      src/views/platinum/platinum_recharge_withdrawal_review/list/recharge/compoments/payment/index.vue
  15. 10 2
      src/views/platinum/platinum_recharge_withdrawal_review/list/recharge/compoments/refuse/index.vue
  16. 1 1
      src/views/platinum/platinum_recharge_withdrawal_review/list/withdrawal/compoments/detail/index.vue
  17. 10 2
      src/views/platinum/platinum_recharge_withdrawal_review/list/withdrawal/compoments/refuse/index.vue
  18. 9 1
      src/views/platinum/platinum_recharge_withdrawal_review/list/withdrawal/compoments/withdrawal/index.vue

+ 3 - 1
src/common/setup/filter/index.ts

@@ -3,7 +3,7 @@ import * as type from './interface';
 import { InputList, SelectList } from './interface';
 
 
-export function handleFilter(select: SelectList[] | Ref<SelectList[]>, input: InputList[], context: SetupContext) {
+export function handleFilter(select: SelectList[] | Ref<SelectList[]>, input: InputList[], context: SetupContext, slot?: type.SlotParam) {
     function getSelectedData(select: SelectList[] | Ref<SelectList[]>) {
         return isRef(select) ? select.value.map(e => {
             const fn = e.change;
@@ -41,11 +41,13 @@ export function handleFilter(select: SelectList[] | Ref<SelectList[]>, input: In
             const cache = value ? value : '';
             result[key] = [cache];
         });
+        slot?.search?.()
         context.emit('search', result);
     }
     function reset() {
         selectList.value.forEach((e) => (e.value = undefined));
         inputList.value.forEach((e) => (e.value = ''));
+        slot?.reset?.()
         search();
     }
     function updateSelected(select: SelectList[] | Ref<SelectList[]>,) {

+ 5 - 0
src/common/setup/filter/interface.ts

@@ -20,4 +20,9 @@ export interface FixedBtnList {
 
 export interface Obj {
     [props: string]: string[]
+}
+
+export interface SlotParam {
+    search?: Function;
+    reset?: Function;
 }

+ 1 - 1
src/views/information/custom/compoments/detail/index.vue

@@ -10,7 +10,7 @@
     <template #footer>
       <a-button key="submit"
                 type="primary"
-                :loading="loading.loading"
+                :loading="loading"
                 @click="cancel">关闭</a-button>
     </template>
     <Detail :selectedRow="selectedRow" />

+ 1 - 1
src/views/manage/inventory-review/components/checkinDetail/index.vue

@@ -10,7 +10,7 @@
     <template #footer>
       <a-button key="submit"
                 type="primary"
-                :loading="loading.loading"
+                :loading="loading"
                 @click="submit">关闭
       </a-button>
     </template>

+ 1 - 1
src/views/platinum/platinum_customer_info/compoments/detail/index.vue

@@ -10,7 +10,7 @@
     <template #footer>
       <a-button key="submit"
                 type="primary"
-                :loading="loading.loading"
+                :loading="loading"
                 @click="cancel">关闭</a-button>
     </template>
     <Detail :selectedRow="selectedRow" />

+ 13 - 14
src/views/platinum/platinum_financing_information/list/tab/compoments/detail/index.vue

@@ -9,7 +9,7 @@
     <template #footer>
       <a-button key="submit"
                 type="primary"
-                :loading="loading.loading"
+                :loading="loading"
                 @click="cancel">关闭</a-button>
     </template>
     <!-- <Des :list="desList" /> -->
@@ -92,13 +92,13 @@
       <fieldset class="formFieldSet">
         <legend>还款信息</legend>
         <div class="tableDatas tableContextCenter">
-            <a-table class="dialogTable"
-                    :columns="columns"
-                    :data-source="dataSource"
-                    :pagination="false">
+          <a-table class="dialogTable"
+                   :columns="columns"
+                   :data-source="dataSource"
+                   :pagination="false">
 
-            </a-table>
-            </div>
+          </a-table>
+        </div>
       </fieldset>
     </a-form>
   </a-modal>
@@ -124,7 +124,7 @@ export default defineComponent({
         const { visible, cancel } = closeModal('platinum_financing_information_detail');
         const loading = ref<boolean>(false);
         const { desList, getDesList } = handleDesList();
-        const dataSource =  [
+        const dataSource = [
             {
                 key: '1',
                 name: 'Mike',
@@ -136,10 +136,10 @@ export default defineComponent({
                 name: 'John',
                 age: 42,
                 address: '10 Downing Street',
-            }
-            ];
+            },
+        ];
 
-            const columns = [
+        const columns = [
             {
                 title: '追加/还款时间',
                 dataIndex: 'name',
@@ -154,8 +154,8 @@ export default defineComponent({
                 title: '剩余款',
                 dataIndex: 'address',
                 key: 'address',
-            }
-            ];
+            },
+        ];
         watchEffect(() => {
             // if (props.selectedRow.customername) {
             const data = props.selectedRow;
@@ -171,7 +171,6 @@ export default defineComponent({
                 { label: '备注', value: formatValue(data.remark) },
             ];
             getDesList(person);
-            
         });
         return {
             desList,

+ 1 - 1
src/views/platinum/platinum_pick_query/list/tab/compoments/complete_stocking/index.vue

@@ -10,7 +10,7 @@
     <template #footer>
       <a-button key="submit"
                 type="primary"
-                :loading="loading.loading"
+                :loading="loading"
                 @click="cancel">关闭</a-button>
     </template>
     <CommomDetail :selectedRow="selectedRow" />

+ 1 - 1
src/views/platinum/platinum_pick_query/list/tab/compoments/confirm_pickup/index.vue

@@ -10,7 +10,7 @@
     <template #footer>
       <a-button key="submit"
                 type="primary"
-                :loading="loading.loading"
+                :loading="loading"
                 @click="cancel">关闭</a-button>
     </template>
     <CommomDetail :selectedRow="selectedRow" />

+ 1 - 1
src/views/platinum/platinum_pick_query/list/tab/compoments/detail/index.vue

@@ -10,7 +10,7 @@
     <template #footer>
       <a-button key="submit"
                 type="primary"
-                :loading="loading.loading"
+                :loading="loading"
                 @click="cancel">关闭</a-button>
     </template>
     <CommomDetail :selectedRow="selectedRow" />

+ 1 - 1
src/views/platinum/platinum_pick_query/list/tab/compoments/query_receipt/index.vue

@@ -10,7 +10,7 @@
     <template #footer>
       <a-button key="submit"
                 type="primary"
-                :loading="loading.loading"
+                :loading="loading"
                 @click="cancel">关闭</a-button>
     </template>
     <CommomDetail :selectedRow="selectedRow" />

+ 2 - 3
src/views/platinum/platinum_pick_query/list/tab/compoments/upload_logistics/index.vue

@@ -10,12 +10,11 @@
     <template #footer>
       <a-button key="submit"
                 type="primary"
-                :loading="loading.loading"
+                :loading="loading"
                 @click="cancel">完成</a-button>
     </template>
     <a-form class="inlineForm mt10"
-            ref="formRef"
-            >
+            ref="formRef">
       <a-row :gutter="24">
         <a-col :span="24">
           <a-form-item label="物流公司"

+ 10 - 10
src/views/platinum/platinum_recharge_withdrawal_review/compoments/filter/index.vue

@@ -25,7 +25,7 @@ export default defineComponent({
     setup(props, context) {
         const date = ref<Moment[]>([]);
         const select: SelectList[] = [];
-        const input: InputList[] = [{ value: '', placeholder: '模糊搜索账号', key: 'account' }];
+        const input: InputList[] = [{ value: '', placeholder: '模糊搜索账号', key: 'accountcode' }];
         const { selectList, inputList, fixedBtnList } = handleFilter(select, input, context);
         return {
             date,
@@ -39,15 +39,15 @@ export default defineComponent({
 
 <style lang="less">
 .filterTable {
-  .commonPicker.ant-calendar-picker {
-    display: inline-flex;
-    padding-top: 9px;
-    padding-bottom: 6px;
-    margin-right: 10px;
-    .ant-input {
-      border: 0;
-      background: @m-grey9;
+    .commonPicker.ant-calendar-picker {
+        display: inline-flex;
+        padding-top: 9px;
+        padding-bottom: 6px;
+        margin-right: 10px;
+        .ant-input {
+            border: 0;
+            background: @m-grey9;
+        }
     }
-  }
 }
 </style>;

+ 1 - 1
src/views/platinum/platinum_recharge_withdrawal_review/list/recharge/compoments/detail/index.vue

@@ -10,7 +10,7 @@
     <template #footer>
       <a-button key="submit"
                 type="primary"
-                :loading="loading.loading"
+                :loading="loading"
                 @click="cancel">关闭</a-button>
     </template>
     <CommomDetail :selectedRow="selectedRow" />

+ 10 - 2
src/views/platinum/platinum_recharge_withdrawal_review/list/recharge/compoments/payment/index.vue

@@ -10,8 +10,8 @@
     <template #footer>
       <a-button key="submit"
                 type="primary"
-                :loading="loading.loading"
-                @click="cancel">确认</a-button>
+                :loading="loading"
+                @click="submit">确认</a-button>
     </template>
     <CommomDetail :selectedRow="selectedRow" />
   </a-modal>
@@ -21,6 +21,7 @@ import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import CommomDetail from '../common-detail/index.vue';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 
 export default defineComponent({
     name: 'platinum_recharge_review_confirm_payment',
@@ -34,7 +35,14 @@ export default defineComponent({
     setup(props, context) {
         const { visible, cancel } = closeModal('platinum_recharge_review_confirm_payment');
         const loading = ref<boolean>(false);
+        function submit() {
+            // requestResultLoadingAndInfo(QueryDeleteUserInfoApply, reqParams, loading, ['确认收款成功', '确认收款失败:']).then(() => {
+            //     cancel();
+            //     context.emit('refresh');
+            // });
+        }
         return {
+            submit,
             cancel,
             visible,
             loading,

+ 10 - 2
src/views/platinum/platinum_recharge_withdrawal_review/list/recharge/compoments/refuse/index.vue

@@ -5,12 +5,12 @@
            centered
            v-model:visible="visible"
            :maskClosable="false"
-           @cancel="cancel"
+           @cancel="submit"
            width="890px">
     <template #footer>
       <a-button key="submit"
                 type="primary"
-                :loading="loading.loading"
+                :loading="loading"
                 @click="cancel">拒绝</a-button>
     </template>
     <CommomDetail :selectedRow="selectedRow" />
@@ -22,6 +22,7 @@ import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import CommomDetail from '../common-detail/index.vue';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 
 export default defineComponent({
     name: 'custom-detail-desc',
@@ -35,8 +36,15 @@ export default defineComponent({
     setup(props, context) {
         const { visible, cancel } = closeModal('platinum_recharge_review_refuse');
         const loading = ref<boolean>(false);
+        function submit() {
+            // requestResultLoadingAndInfo(QueryDeleteUserInfoApply, reqParams, loading, ['审核拒绝成功', '审核拒绝失败:']).then(() => {
+            //     cancel();
+            //     context.emit('refresh');
+            // });
+        }
         return {
             cancel,
+            submit,
             visible,
             loading,
         };

+ 1 - 1
src/views/platinum/platinum_recharge_withdrawal_review/list/withdrawal/compoments/detail/index.vue

@@ -10,7 +10,7 @@
     <template #footer>
       <a-button key="submit"
                 type="primary"
-                :loading="loading.loading"
+                :loading="loading"
                 @click="cancel">关闭</a-button>
     </template>
     <CommomDetail :selectedRow="selectedRow" />

+ 10 - 2
src/views/platinum/platinum_recharge_withdrawal_review/list/withdrawal/compoments/refuse/index.vue

@@ -10,8 +10,8 @@
     <template #footer>
       <a-button key="submit"
                 type="primary"
-                :loading="loading.loading"
-                @click="cancel">拒绝</a-button>
+                :loading="loading"
+                @click="submit">拒绝</a-button>
     </template>
     <CommomDetail :selectedRow="selectedRow" />
   </a-modal>
@@ -22,6 +22,7 @@ import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import CommomDetail from '../common-detail/index.vue';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 
 export default defineComponent({
     name: 'custom-detail-desc',
@@ -35,8 +36,15 @@ export default defineComponent({
     setup(props, context) {
         const { visible, cancel } = closeModal('platinum_withdrawal_review_refuse');
         const loading = ref<boolean>(false);
+        function submit() {
+            // requestResultLoadingAndInfo(QueryDeleteUserInfoApply, reqParams, loading, ['审核拒绝成功', '审核拒绝失败:']).then(() => {
+            //     cancel();
+            //     context.emit('refresh');
+            // });
+        }
         return {
             cancel,
+            submit,
             visible,
             loading,
         };

+ 9 - 1
src/views/platinum/platinum_recharge_withdrawal_review/list/withdrawal/compoments/withdrawal/index.vue

@@ -10,7 +10,7 @@
     <template #footer>
       <a-button key="submit"
                 type="primary"
-                :loading="loading.loading"
+                :loading="loading"
                 @click="cancel">确认</a-button>
     </template>
     <CommomDetail :selectedRow="selectedRow" />
@@ -21,6 +21,7 @@ import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import CommomDetail from '../common-detail/index.vue';
+import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 
 export default defineComponent({
     name: 'platinum_withdrawal_review_confirm_withdrawal',
@@ -34,8 +35,15 @@ export default defineComponent({
     setup(props, context) {
         const { visible, cancel } = closeModal('platinum_withdrawal_review_confirm_withdrawal');
         const loading = ref<boolean>(false);
+        function submit() {
+            // requestResultLoadingAndInfo(QueryDeleteUserInfoApply, reqParams, loading, ['确认提现成功', '确认提现失败:']).then(() => {
+            //     cancel();
+            //     context.emit('refresh');
+            // });
+        }
         return {
             cancel,
+            submit,
             visible,
             loading,
         };