修改千海金过滤

src/views/platinum/platinum_financing_information/list/tab/index.vue

@@ -23,8 +23,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList, _getBtnList } from '@/common/export/table';
-import { ErmcpWareHouseInfo } from '@/views/information/warehouse-info/list';
+import { defineComponent, initData, getTableColumns, getTableEvent, contextMenu, BtnList, _getBtnList } from '@/common/export/table';
 import Filter from './compoments/filter/index.vue';
 import { queryTableList } from './setup';
 import Detail from './compoments/detail/index.vue';
@@ -47,7 +46,7 @@ export default defineComponent({
             // 获取列表数据
             queryTable();
             // 注册表头信息 过滤
-            registerColumn('table_pcweb_qhj_fixed_financing_information', ['goodsid']);
+            registerColumn('table_pcweb_qhj_fixed_financing_information', ['goodsid', 'contractconfirmtime']);
         });
 
         return {

src/views/platinum/platinum_fixed_investment_price_query/compoments/filter/index.vue

@@ -37,9 +37,8 @@ export default defineComponent({
         const slotParam: SlotParam = {
             search(result: any) {
                 const time = date.value;
-                if (time) {
-                    result.tradedate = formatTime(time, 'd');
-                }
+                const temp = time ? [formatTime(time, 'd')] : [''];
+                result.tradedate = temp;
             },
             reset() {
                 date.value = undefined;

src/views/platinum/platinum_fixed_investment_price_query/list/tab/index.vue

@@ -39,7 +39,7 @@ export default defineComponent({
             // 获取列表数据
             queryTable();
             // 注册表头信息 过滤
-            registerColumn('table_pcweb_qhj_fixed_investment_price_query', ['warehousetype', 'warehousename', 'address']);
+            registerColumn('table_pcweb_qhj_fixed_investment_price_query', ['tradedate', 'goodsid']);
         });
 
         return {

src/views/platinum/platinum_fixed_investment_query/list/flow/compoments/filter/index.vue

@@ -21,8 +21,9 @@ import { defineComponent, ref } from 'vue';
 import { handleFilter, InputList, SelectList } from '@/common/setup/filter';
 import { Moment } from 'moment';
 import { SlotParam } from '@/common/setup/filter/interface';
-import { formatTime, initData } from '@/common/methods';
+import { initData } from '@/common/methods';
 import { getGoodsList } from '@/services/bus/goods';
+import { getRangeTime } from '@/utils/time';
 
 export default defineComponent({
     name: 'filter-flow',
@@ -40,10 +41,10 @@ export default defineComponent({
         const input: InputList[] = [{ value: '', placeholder: '模糊搜索账号', key: 'accountid' }];
         const slotParam: SlotParam = {
             search(result: any) {
+                // 处理范围时间内搜索
                 const time = date.value;
-                // if (time) {
-                //     result.tradedate = formatTime(time, 'd');
-                // }
+                const temp = time.length > 1 ? getRangeTime(time[0], time[1]) : [''];
+                result.triggertime = temp;
             },
             reset() {
                 date.value = [];

src/views/platinum/platinum_fixed_investment_query/list/flow/index.vue

@@ -45,7 +45,7 @@ export default defineComponent({
             // 获取列表数据
             queryTable();
             // 注册表头信息 过滤
-            registerColumn('table_pcweb_qhj_fixed_investment_flow_query', ['goodsid', 'accountid']);
+            registerColumn('table_pcweb_qhj_fixed_investment_flow_query', ['goodsid', 'accountid', 'triggertime']);
         });
 
         return {

src/views/platinum/platinum_fixed_investment_query/list/plan/compoments/filter/index.vue

@@ -48,9 +48,8 @@ export default defineComponent({
         const slotParam: SlotParam = {
             search(result: any) {
                 const time = date.value;
-                if (time) {
-                    result.tradedate = formatTime(time, 'd');
-                }
+                const temp = time ? [formatTime(time, 'd')] : [''];
+                result.nexttriggerdate = temp;
             },
             reset() {
                 date.value = undefined;

src/views/platinum/platinum_fixed_investment_query/list/plan/index.vue

@@ -23,7 +23,7 @@
 
 <script lang="ts">
 import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList, _getBtnList } from '@/common/export/table';
-import { ErmcpWareHouseInfo } from '@/views/information/warehouse-info/list';
+import { QhjRStrategy } from '@/services/go/ermcp/qhj/interface';
 import Filter from './compoments/filter/index.vue';
 import { queryTableList } from './setup';
 // import ControlModal from './compoments/controlModal/index.vue';
@@ -35,7 +35,7 @@ export default defineComponent({
         // 表头数据
         const { columns, registerColumn, updateColumn } = getTableColumns();
         // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick, btnClick } = getTableEvent<ErmcpWareHouseInfo>({});
+        const { expandedRowKeys, selectedRow, Rowclick, btnClick } = getTableEvent<QhjRStrategy>({});
         // 表格操作按钮列表
         const [firstBtn] = _getBtnList('platinum_fixed_investment_plan_query', false).value;
         // 表格列表数据
@@ -44,7 +44,7 @@ export default defineComponent({
             // 获取列表数据
             queryTable();
             // 注册表头信息 过滤
-            registerColumn('table_pcweb_qhj_fixed_investment_plan_query', ['goodsid', 'regularlystrategystatus', 'accountid']);
+            registerColumn('table_pcweb_qhj_fixed_investment_plan_query', ['goodsid', 'regularlystrategystatus', 'accountid', 'nexttriggerdate']);
         });
 
         return {

src/views/platinum/platinum_pick_query/compoments/filter/index.vue

@@ -20,6 +20,8 @@ import { handleFilter, InputList, SelectList } from '@/common/setup/filter';
 import { Moment } from 'moment';
 import { initData } from '@/common/methods';
 import { queryPickGoods } from '@/services/go/ermcp/qhj';
+import { SlotParam } from '@/common/setup/filter/interface';
+import { getRangeTime } from '@/utils/time';
 
 export default defineComponent({
     name: 'filter-platinum_pick_query',
@@ -29,7 +31,7 @@ export default defineComponent({
         const select: SelectList[] = [
             {
                 value: undefined,
-                key: 'contracttype1',
+                key: 'pickupgoodsname',
                 placeholder: '选择提货商品',
                 list: [],
             },
@@ -49,8 +51,19 @@ export default defineComponent({
                 ],
             },
         ];
-        const input: InputList[] = [{ value: '', placeholder: '模糊搜索商品名称', key: 'account' }];
-        const { selectList, inputList, fixedBtnList } = handleFilter(select, input, context);
+        const input: InputList[] = [{ value: '', placeholder: '模糊搜索商品名称', key: 'goodsname' }];
+        const slotParam: SlotParam = {
+            search(result: any) {
+                // 处理范围时间内搜索
+                const time = date.value;
+                const temp = time.length > 1 ? getRangeTime(time[0], time[1]) : [''];
+                result.reqtime = temp;
+            },
+            reset() {
+                date.value = [];
+            },
+        };
+        const { selectList, inputList, fixedBtnList } = handleFilter(select, input, context, slotParam);
         initData(() => {
             queryPickGoods().then((res) => {
                 select[0].list = res.map((e) => {

src/views/platinum/platinum_pick_query/list/tab/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 提货查询 -->
   <div class="platinum_pick_query_tab">
-    <Filter />
+    <Filter @search="updateColumn" />
     <contextMenu :contextMenuList="firstBtn">
       <a-table :columns="columns"
                class="topTable hiddenFirstCol"
@@ -22,11 +22,11 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList, _getBtnList } from '@/common/export/table';
-import { ErmcpWareHouseInfo } from '@/views/information/warehouse-info/list';
+import { defineComponent, initData, getTableColumns, getTableEvent, contextMenu, BtnList, _getBtnList } from '@/common/export/table';
 import Filter from '../../compoments/filter/index.vue';
 import { queryTableList } from './setup';
 import ControlModal from './compoments/controlModal/index.vue';
+import { QhjTradeGoodsPickup } from '@/services/go/ermcp/qhj/interface';
 
 export default defineComponent({
     name: 'platinum_pick_query_tab',
@@ -35,7 +35,7 @@ export default defineComponent({
         // 表头数据
         const { columns, registerColumn, updateColumn } = getTableColumns();
         // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick, btnClick } = getTableEvent<ErmcpWareHouseInfo>({});
+        const { expandedRowKeys, selectedRow, Rowclick, btnClick } = getTableEvent<QhjTradeGoodsPickup>({});
         // 表格操作按钮列表
         const [firstBtn] = _getBtnList('platinum_pick_query_tab', true).value;
         // 表格列表数据
@@ -44,12 +44,12 @@ export default defineComponent({
             // 获取列表数据
             queryTable();
             // 注册表头信息 过滤
-            registerColumn('table_pcweb_qhj_pickup_query', ['warehousetype', 'warehousename', 'address']);
+            registerColumn('table_pcweb_qhj_pickup_query', ['reqtime', 'pickupgoodsname', 'takeorderstatus', 'goodsname']);
         });
 
         return {
             columns,
-
+            updateColumn,
             expandedRowKeys,
             selectedRow,
             Rowclick,

src/views/platinum/platinum_recharge_withdrawal_review/compoments/filter/index.vue

@@ -18,8 +18,8 @@ import FilterOption from '@/common/components/filter/index.vue';
 import { defineComponent, ref } from 'vue';
 import { handleFilter, InputList, SelectList } from '@/common/setup/filter';
 import { Moment } from 'moment';
-import { formatTime } from '@/common/methods/format';
 import { SlotParam } from '@/common/setup/filter/interface';
+import { getRangeTime } from '@/utils/time';
 
 export default defineComponent({
     name: 'filter-withdrawal_review',
@@ -31,14 +31,10 @@ export default defineComponent({
 
         const slotParam: SlotParam = {
             search(result: any) {
-                const fn = (value: Moment) => {
-                    return formatTime(value, 'd') + ' ' + '00:00:00';
-                };
+                // 处理范围时间内搜索
                 const time = date.value;
-                if (time.length > 1) {
-                    result.begindate = fn(date.value[0]);
-                    result.enddate = fn(date.value[1]);
-                }
+                const temp = time.length > 1 ? getRangeTime(time[0], time[1]) : [''];
+                result.updatetime = temp;
             },
             reset() {
                 date.value = [];

src/views/platinum/platinum_recharge_withdrawal_review/list/recharge/index.vue

@@ -22,8 +22,8 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList, _getBtnList } from '@/common/export/table';
-import { ErmcpWareHouseInfo } from '@/views/information/warehouse-info/list';
+import { defineComponent, initData, getTableColumns, getTableEvent, contextMenu, BtnList, _getBtnList } from '@/common/export/table';
+import { QhjAccountOutInApply } from '@/services/go/ermcp/qhj/interface';
 import Filter from '../../compoments/filter/index.vue';
 import { queryTableList } from '../setup';
 import ControlModal from './compoments/controlModal/index.vue';
@@ -35,7 +35,7 @@ export default defineComponent({
         // 表头数据
         const { columns, registerColumn, updateColumn } = getTableColumns();
         // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick, btnClick } = getTableEvent<ErmcpWareHouseInfo>({});
+        const { expandedRowKeys, selectedRow, Rowclick, btnClick } = getTableEvent<QhjAccountOutInApply>({});
         // 表格操作按钮列表
         const [firstBtn] = _getBtnList('platinum_recharge_review_tab', true).value;
         // 表格列表数据
@@ -44,7 +44,7 @@ export default defineComponent({
             // 获取列表数据
             queryTable();
             // 注册表头信息 过滤
-            registerColumn('table_pcweb_qhj_recharge_review', ['accountcode']);
+            registerColumn('table_pcweb_qhj_recharge_review', ['accountcode', 'updatetime']);
         });
 
         return {

src/views/platinum/platinum_recharge_withdrawal_review/list/withdrawal/index.vue

@@ -22,8 +22,8 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList, _getBtnList } from '@/common/export/table';
-import { ErmcpWareHouseInfo } from '@/views/information/warehouse-info/list';
+import { defineComponent, initData, getTableColumns, getTableEvent, contextMenu, BtnList, _getBtnList } from '@/common/export/table';
+import { QhjAccountOutInApply } from '@/services/go/ermcp/qhj/interface';
 import Filter from '../../compoments/filter/index.vue';
 import { queryTableList } from '../setup';
 import ControlModal from './compoments/controlModal/index.vue';
@@ -35,7 +35,7 @@ export default defineComponent({
         // 表头数据
         const { columns, registerColumn, updateColumn } = getTableColumns();
         // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick, btnClick } = getTableEvent<ErmcpWareHouseInfo>({});
+        const { expandedRowKeys, selectedRow, Rowclick, btnClick } = getTableEvent<QhjAccountOutInApply>({});
         // 表格操作按钮列表
         const [firstBtn] = _getBtnList('platinum_withdrawal_review_tab', true).value;
         // 表格列表数据
@@ -44,7 +44,7 @@ export default defineComponent({
             // 获取列表数据
             queryTable();
             // 注册表头信息 过滤
-            registerColumn('table_pcweb_qhj_withdrawal_review', ['accountcode']);
+            registerColumn('table_pcweb_qhj_withdrawal_review', ['accountcode', 'updatetime']);
         });
 
         return {