Merge remote-tracking branch 'origin/master'

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

@@ -175,8 +175,6 @@ export function querySubArea(req: QuerySubAreaReq): Promise<QhjMgrSubArea[]> {
  * /QhjMgr/QueryTradePosition
  */
 export function queryTradePosition(req: QueryTradePositionReq): Promise<QhjMgrPosition[]> {
-    const userid = getUsrId()
-    req.userid = userid
     return commonSearch_go('/QhjMgr/QueryTradePosition', req).catch((err) => {
         throw new Error(`查询持仓汇总: ${err}`);
     });

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

@@ -419,7 +419,7 @@ export interface QhjMgrSubArea {
  * 查询交易持仓
  */
 export interface QueryTradePositionReq {
-    userid?: number              // 用户ID
+    userid: number              // 用户ID
     userinfotype?: number      // 用户类型 1-个人 2-企业
     goodsid?: number            // 商品id
     filtername?: string          // 名称(模糊搜索账户)

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

@@ -18,6 +18,9 @@ import { defineComponent, ref } from 'vue';
 import { handleFilter, InputList, SelectList } from '@/common/setup/filter';
 import { initData } from '@/common/methods';
 import { getGoodsList } from '@/services/bus/goods';
+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',
@@ -26,7 +29,7 @@ export default defineComponent({
         const select = ref<SelectList[]>([
             {
                 value: undefined,
-                key: 'contracttype1',
+                key: 'userinfotype',
                 placeholder: '账号类型',
                 list: [
                     { value: 1, lable: '个人' },
@@ -46,8 +49,7 @@ export default defineComponent({
                 list: [],
             },
         ]);
-        const input: InputList[] = [{ value: '', placeholder: '模糊搜索账号', key: 'account' }];
-        const { selectList, inputList, fixedBtnList } = handleFilter(select, input, context);
+        const input: InputList[] = [{ value: '', placeholder: '模糊搜索账号', key: 'filtername' }];
         // 是否包含子级 1-包含
         const includesub = ref<boolean>(false);
 
@@ -59,10 +61,19 @@ export default defineComponent({
                 includesub.value = false;
             },
         };
+        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,

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

@@ -1,7 +1,7 @@
 <template>
   <!-- 单据查询 持仓-->
   <div class="platinum_document_query_position">
-    <Filter @search="updateColumn" />
+    <Filter @search="search" />
     <contextMenu :contextMenuList="firstBtn">
       <a-table :columns="columns"
                class="topTable hiddenFirstCol"
@@ -24,8 +24,10 @@
 <script lang="ts">
 import { defineComponent, initData, getTableColumns, getTableEvent, contextMenu, BtnList, _getBtnList, queryTableList } from '@/common/export/table';
 import { QueryTradePositionRsp } from '@/services/go/ermcp/order/interface';
+import { QueryTradePositionReq } from 'src/services/go/ermcp/qhj/interface';
 import Filter from './compoments/filter/index.vue';
 import { queryTradePosition } from '@/services/go/ermcp/qhj';
+import { getUserId } from '@/services/bus/account';
 
 export default defineComponent({
     name: 'platinum_document_query_position',
@@ -39,15 +41,26 @@ export default defineComponent({
         const [firstBtn] = _getBtnList('platinum_document_query_position', false).value;
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<QueryTradePositionRsp>();
+        function search(value: any) {
+            const { includesub, goodsid, filtername, userid, userinfotype } = value;
+            const param: QueryTradePositionReq = {
+                userid: userid[0] ? userid[0] : getUserId(),
+                userinfotype: userinfotype[0] ? userinfotype[0] : 0,
+                filtername: filtername[0],
+                goodsid: goodsid[0],
+                includesub,
+            };
+            queryTable(queryTradePosition, param);
+        }
         initData(() => {
             // 获取列表数据
-            queryTable(queryTradePosition, {});
+            queryTable(queryTradePosition, { userid: getUserId() });
             // 注册表头信息 过滤
             registerColumn('table_pcweb_qhj_order', ['contracttype1', 'goodsid', 'operatorid']);
         });
 
         return {
-            updateColumn,
+            search,
             columns,
             expandedRowKeys,
             selectedRow,