过滤交易用户选项

src/common/setup/user/index.ts

@@ -2,6 +2,7 @@ import { queryResultLoadingAndInfo } from "@/common/methods/request/resultInfo";
 import { QueryAccMgrLoginUser } from "@/services/go/ermcp/account";
 import { ErmcpLoginUser, ErmcpLoginUserEx } from "@/services/go/ermcp/account/interface";
 import { Ref, ref } from "vue";
+import { getUserInfo, getAreaUserName } from '@/services/bus/user'
 
 /**
  * 获取(业务账户, 交易账户, 管理账户)
@@ -21,6 +22,37 @@ export function handlerManagerList(loading: Ref<boolean>, type: 1 | 2 | 3, isFil
                 return result
             })
     }
+
+    /**
+     * 查询交易用户
+     * @param showLoginUser 
+     * @returns 
+     */
+    async function queryTradeManager(showLoginUser?: boolean) {
+        const { userid, userstatus, usertype, mobile } = getUserInfo();
+        tableList.value = [];
+        await queryTable().then((res) => {
+            const user = res.find((e) => e.roleid === userid);
+            tableList.value = res;
+            if (user) {
+                // 非机构只能查看当前交易用户
+                tableList.value = [user];
+            }
+            if (showLoginUser) {
+                tableList.value.unshift({
+                    mobile, // 手机号
+                    accountstatus: userstatus, //  账户的状态 - 1:待激活 2:待审核 3:待复审 4:正常 5:审核拒绝 6:停用(注销) 7:注销(删除)
+                    querytype: type,  // 查询类型 1-业务账户 2-交易账户 3-管理账户
+                    roleid: userid, // 角色id(交易账户->用户id)
+                    rolename: getAreaUserName(), // 角色名称(交易账户->用户名称)
+                    userlist: [],  // 用户列表
+                    usertype,//用户类型 - 1:交易所 2:机构 3:会员子机构 4:经纪人 5:投资者 6:客户 7:企业成员(云平台)
+                })
+            }
+        })
+        return tableList.value;
+    }
+
     /**
      * 根据code 查找业务员、跟单员对应的名字
      * @param code
@@ -39,6 +71,7 @@ export function handlerManagerList(loading: Ref<boolean>, type: 1 | 2 | 3, isFil
         })
         return result
     }
+
     /**
      * 获取业务员、跟单员
      * @param roletype '22':业务员 '23':跟单员
@@ -62,5 +95,5 @@ export function handlerManagerList(loading: Ref<boolean>, type: 1 | 2 | 3, isFil
         return result
     }
 
-    return { tableList, queryTable, findManagerName, getBusinesserOrMerchandiser }
+    return { tableList, queryTable, queryTradeManager, findManagerName, getBusinesserOrMerchandiser }
 }

src/views/business/plan/components/add/index.vue

@@ -110,7 +110,7 @@ export default defineComponent({
     // 品种、品类
     const { DGList, getDG, gmlist, chooseMG, chooseWR, numberUnit } = getMiddleGoodsD(formState);
     // 交易用户
-    const { tableList, queryTable } = handlerManagerList(loading, 2);
+    const { tableList, queryTradeManager } = handlerManagerList(loading, 2);
     // 币种
     const priceTyep = getPayCurrencyTypeEnumList();
 
@@ -142,7 +142,7 @@ export default defineComponent({
     }
     initData(() => {
       getDG();
-      queryTable();
+      queryTradeManager();
     });
     return {
       visible,

src/views/hedgeditem/trade/components/add/index.vue

@@ -74,8 +74,8 @@ export default defineComponent({
         const { visible, cancel } = _closeModal(context);
         const { formElement, loading, formData, rules, disabledStartDate, disabledEndDate, formSubmit } = useForm();
 
-        const { tableList: traderList, queryTable } = handlerManagerList(loading, 2, true);
-        queryTable();
+        const { tableList: traderList, queryTradeManager } = handlerManagerList(loading, 2, true);
+        queryTradeManager();
 
         return {
             visible,

src/views/information/spot-contract/components/add/index.vue

@@ -347,7 +347,7 @@ export default defineComponent({
     const { getAmout } = handleAmout(formState);
     // 获取 业务账户
     const { queryTable: queryBusinessManager, getBusinesserOrMerchandiser } = handlerManagerList(loading, 1);
-    const { tableList: traderList, queryTable: queryTradeManager } = handlerManagerList(loading, 2, true);
+    const { tableList: traderList, queryTradeManager } = handlerManagerList(loading, 2, true);
     // 业务员
     const businesserList = ref<ErmcpLoginUser[]>([]);
     // 跟单员

src/views/information/spot-contract/components/detail/index.vue

@@ -133,7 +133,7 @@ export default defineComponent({
         { key: 5, name: '发票记录' },
         { key: 6, name: props.selectedRow.contracttype === 1 ? '入库记录' : '出库记录' },
         { key: 7, name: '变更记录' },
-        { key: 8, name: '关联记录' },
+        //{ key: 8, name: '关联记录' },
       ];
     activeKey.value = 1;
     function tabClick() {

src/views/report/components/filter/index.vue

@@ -52,7 +52,7 @@ export default defineComponent({
     const loading = ref<boolean>(false);
     // 交易用户
     const userList = ref<SelectOption[]>([]);
-    const { queryTable } = handlerManagerList(loading, 2);
+    const { queryTradeManager } = handlerManagerList(loading, 2);
     function reset() { //重置
       selectedReportType.value = oldSelectedReportType
       selectedUser.value = oldSelectedUser
@@ -63,23 +63,14 @@ export default defineComponent({
     initData(() => {
       // 处理刷新
       selectedUser.value.key = getUserId();
-      queryTable().then((res) => {
-        userList.value.length = 0;
-        const id = getUserId();
-        const has = res.find((e) => e.roleid === id);
-        if (has) {
-          userList.value.push({ value: id, lable: has.rolename });
-        } else {
-          // 没有找到代表着是机构,可以查看所有交易用户，不能查看交易员
-          userList.value.push({ value: id, lable: getAreaUserName() });
-          res.forEach((e) => {
-            userList.value.push({ value: e.roleid, lable: e.rolename });
-            // e.userlist.forEach((el) => {
-            //     userList.value.push({ value: el.loginid, lable: `${el.loginname}-${el.logincode}` });
-            //     // userList.value.push({ value: el.loginid, lable: el.loginname });
-            // });
-          });
-        }
+      queryTradeManager(true).then((res) => {
+        res.forEach((e) => {
+          userList.value.push({ value: e.roleid, lable: e.rolename });
+          // e.userlist.forEach((el) => {
+          //     userList.value.push({ value: el.loginid, lable: `${el.loginname}-${el.logincode}` });
+          //     // userList.value.push({ value: el.loginid, lable: el.loginname });
+          // });
+        });
       });
     });
     return {