单据查询 委托单

src/services/go/ermcp/qhj/index.ts

@@ -186,8 +186,6 @@ export function queryTradePosition(req: QueryTradePositionReq): Promise<QhjMgrPo
  * @param req
  */
 export function queryTradeOrderDetail(req: QueryTradeOrderDetailReq): Promise<QhjMgrTradeOrderDetailRsp[]> {
-    const userid = getUsrId()
-    req.userid = userid
     return commonSearch_go('/QhjMgr/QueryTradeOrderDetail', req).catch((err) => {
         throw new Error(`查询持仓汇总: ${err}`);
     });

src/services/go/ermcp/qhj/interface.ts

@@ -455,7 +455,7 @@ export interface QhjMgrPosition {
  * 查询委托明细
  */
 export interface QueryTradeOrderDetailReq {
-    userid?: number              // 用户ID
+    userid: number              // 用户ID
     userinfotype?: number       // 用户类型 1-个人 2-企业
     trademode?: number          // 交易模式
     goodsid?: number            // 商品id

src/views/platinum/platinum_document_query/list/order/compoments/filter/index.vue

@@ -8,7 +8,11 @@
                     format="YYYY-MM-DD" />
     <FilterOption :selectList="selectList"
                   :inputList="inputList"
-                  :fixedBtnList="fixedBtnList" />
+                  :fixedBtnList="fixedBtnList">
+      <template #selectAfter>
+        <a-checkbox v-model:checked="includesub">包含子级</a-checkbox>
+      </template>
+    </FilterOption>
     <slot></slot>
   </div>
 </template>
@@ -20,6 +24,10 @@ import { handleFilter, handleTimeFilter, InputList, SelectList } from '@/common/
 import { initData } from '@/common/methods';
 import { getGoodsList } from '@/services/bus/goods';
 import { Moment } from 'moment';
+import { getRangeTime } from '@/utils/time';
+import { queryTableList } from '@/common/setup/table';
+import { QhjParentAreaList } from '@/services/go/ermcp/qhj/interface';
+import { queryParentAreaList } from '@/services/go/ermcp/qhj';
 
 export default defineComponent({
     name: 'filter-platinum_pick_query',
@@ -29,11 +37,11 @@ export default defineComponent({
         const select = ref<SelectList[]>([
             {
                 value: undefined,
-                key: 'contracttype1',
+                key: 'userinfotype',
                 placeholder: '账号类型',
                 list: [
                     { value: 1, lable: '个人' },
-                    { value: -1, lable: '企业' },
+                    { value: 2, lable: '企业' },
                 ],
             },
             {
@@ -42,18 +50,47 @@ export default defineComponent({
                 placeholder: '选择商品',
                 list: [],
             },
+            {
+                value: undefined,
+                key: 'userid',
+                placeholder: '请选择子机构',
+                list: [],
+            },
         ]);
-        const input: InputList[] = [{ value: '', placeholder: '模糊搜索账号', key: 'account' }];
-        // 范围时间内过滤
-        const { getFilterRangeTime } = handleTimeFilter('ordertime');
+        const input: InputList[] = [{ value: '', placeholder: '模糊搜索账号', key: 'filtername' }];
+        // 是否包含子级 1-包含
+        const includesub = ref<boolean>(false);
 
-        const { selectList, inputList, fixedBtnList } = handleFilter(select, input, context, getFilterRangeTime(date));
+        const param = {
+            search(result: any) {
+                result.includesub = includesub.value ? 1 : 0;
+                // 处理范围时间内搜索
+                const time = date.value;
+                const temp = time.length > 1 ? getRangeTime(time[0], time[1]) : [''];
+                result.ordertime = temp;
+            },
+            reset() {
+                includesub.value = false;
+                date.value = [];
+            },
+        };
+
+        const { selectList, inputList, fixedBtnList } = handleFilter(select, input, context, param);
+        const { queryTable } = queryTableList<QhjParentAreaList>();
         initData(() => {
+            // 商品列表
             select.value[1].list = getGoodsList().map((e) => {
                 return { value: e.goodsid, lable: e.goodsname };
             });
+            // 机构列表
+            queryTable(queryParentAreaList).then((res) => {
+                select.value[2].list = res.map((e) => {
+                    return { value: e.userid, lable: e.accountname };
+                });
+            });
         });
         return {
+            includesub,
             date,
             selectList,
             inputList,

src/views/platinum/platinum_document_query/list/order/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 单据查询 委托单-->
   <div class="platinum_document_query_order">
-    <Filter @search="updateColumn" />
+    <Filter @search="search" />
     <contextMenu :contextMenuList="firstBtn">
       <a-table :columns="columns"
                class="topTable hiddenFirstCol"
@@ -26,6 +26,8 @@ import { defineComponent, initData, getTableColumns, getTableEvent, contextMenu,
 import { queryTradeOrderDetail } from '@/services/go/ermcp/qhj';
 import { QueryTradeOrderDetailRsp } from '@/services/go/ermcp/order/interface';
 import Filter from './compoments/filter/index.vue';
+import { QueryTradeOrderDetailReq } from '@/services/go/ermcp/qhj/interface';
+import { getUserId } from '@/services/bus/account';
 
 export default defineComponent({
     name: 'platinum_document_query_order',
@@ -39,16 +41,34 @@ export default defineComponent({
         const [firstBtn] = _getBtnList('platinum_document_query_order', false).value;
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList();
+        function search(value: any) {
+            console.log('value', value);
+
+            const { includesub, goodsid, filtername, userid, ordertime, userinfotype } = value;
+            const len = ordertime.length;
+            const param: QueryTradeOrderDetailReq = {
+                userid: userid[0] ? userid[0] : getUserId(),
+                userinfotype: userinfotype[0] ? userinfotype[0] : 0,
+                filtername: filtername[0],
+                begindate: len > 1 ? ordertime[0] : '',
+                enddate: len > 1 ? ordertime[len - 1] : '',
+                goodsid: goodsid[0],
+                includesub,
+            };
+            console.log(param);
+
+            queryTable(queryTradeOrderDetail, param);
+        }
         initData(() => {
             // 获取列表数据
-            queryTable(queryTradeOrderDetail, {});
+            queryTable(queryTradeOrderDetail, { userid: getUserId() });
             // 注册表头信息 过滤
             registerColumn('table_pcweb_qhj_order', ['goodsid', 'ordertime', 'operatorid']);
         });
 
         return {
             columns,
-            updateColumn,
+            search,
             expandedRowKeys,
             selectedRow,
             Rowclick,

src/views/platinum/platinum_document_query/list/position/compoments/filter/index.vue

@@ -33,7 +33,7 @@ export default defineComponent({
                 placeholder: '账号类型',
                 list: [
                     { value: 1, lable: '个人' },
-                    { value: -1, lable: '企业' },
+                    { value: 2, lable: '企业' },
                 ],
             },
             {

src/views/platinum/platinum_document_query/list/position/index.vue

@@ -34,7 +34,7 @@ export default defineComponent({
     components: { Filter, contextMenu, BtnList },
     setup() {
         // 表头数据
-        const { columns, registerColumn, updateColumn } = getTableColumns();
+        const { columns, registerColumn } = getTableColumns();
         // 表格事件
         const { expandedRowKeys, selectedRow, Rowclick, btnClick } = getTableEvent<QueryTradePositionRsp>({});
         // 表格操作按钮列表
@@ -56,7 +56,7 @@ export default defineComponent({
             // 获取列表数据
             queryTable(queryTradePosition, { userid: getUserId() });
             // 注册表头信息 过滤
-            registerColumn('table_pcweb_qhj_order', ['contracttype1', 'goodsid', 'operatorid']);
+            registerColumn('table_pcweb_qhj_order', []);
         });
 
         return {

src/views/platinum/platinum_document_query/list/success/compoments/filter/index.vue

@@ -33,7 +33,7 @@ export default defineComponent({
                 placeholder: '账号类型',
                 list: [
                     { value: 1, lable: '个人' },
-                    { value: -1, lable: '企业' },
+                    { value: 2, lable: '企业' },
                 ],
             },
             {

src/views/platinum/platinum_document_query/list/waiting/compoments/filter/index.vue

@@ -33,7 +33,7 @@ export default defineComponent({
                 placeholder: '账号类型',
                 list: [
                     { value: 1, lable: '个人' },
-                    { value: -1, lable: '企业' },
+                    { value: 2, lable: '企业' },
                 ],
             },
             {