update

src/packages/pc/views/marketrun/monitor/positionsumm/index.vue

@@ -111,16 +111,15 @@ const onSearch = () => {
         if (isValid) {
             const qs = getQueryParams()
             run(qs)
+        } else {
+            countDown.stop()
         }
     })
 }
 
 const startCountDown = () => {
     const { refTimeInput } = getQueryParams()
-    countDown.start(() => {
-        const qs = getQueryParams()
-        run(qs)
-    }, refTimeInput)
+    countDown.start(() => onSearch(), refTimeInput)
 }
 
 onUnmounted(() => {

src/packages/pc/views/query/order/close/index.vue

@@ -19,7 +19,7 @@
                 <template #goodsid="{ item }">
                     <el-form-item :label="item.label" prop="goodsid">
                         <app-select-goods v-model="item.value"
-                            :params="{ trademodels: '52', goodsStatusIds: '3,6,7' }" />
+                            :params="{ trademodels: '52,10', goodsStatusIds: '3,6,7' }" />
                     </el-form-item>
                 </template>
                 <template #areauserid="{ item }">

src/packages/pc/views/query/order/list/index.vue

@@ -3,11 +3,20 @@
     <app-view>
         <template #header>
             <app-filter :option="filterOption">
+                <!-- 商品 -->
+                <template #goodsid="{ item }">
+                    <el-form-item :label="item.label" prop="goodsid">
+                        <app-select-goods v-model="item.value"
+                            :params="{ trademodels: '52,10', goodsStatusIds: '3,6,7' }" />
+                    </el-form-item>
+                </template>
+                <!-- 所属机构 -->
                 <template #parantareaid="{ item }">
                     <el-form-item :label="item.label" prop="parantareaid">
                         <app-select-investor v-model="item.value" />
                     </el-form-item>
                 </template>
+                <!-- 有效持仓 -->
                 <template #validholderqty="{ item }">
                     <el-form-item :label="item.label" prop="validholderqty">
                         <el-switch v-model="item.value" :active-value="1" :inactive-value="0" />
@@ -48,6 +57,7 @@ import AppTable from '@pc/components/base/table/index.vue'
 import AppPagination from '@pc/components/base/pagination/index.vue'
 import AppOperation from '@pc/components/base/operation/index.vue'
 import AppFilter from '@pc/components/base/table-filter-v2/index.vue'
+import AppSelectGoods from '@pc/components/modules/select-goods/index.vue'
 import AppSelectInvestor from '@pc/components/modules/select-investor/index.vue'
 import { i18n } from '@/stores'
 
@@ -62,7 +72,8 @@ const { componentMap, componentId, record, openComponent, closeComponent, getAct
 const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryOrder, {
     defaultParams: {
         pageNum: 1,
-        pageSize: 20
+        pageSize: 20,
+        validholderqty: 1
     },
     onError: (err) => {
         ElMessage.error(err)

src/packages/pc/views/query/order/monitor/index.vue

@@ -10,15 +10,16 @@
                     </el-form-item>
                 </template>
                 <el-form-item>
-                    <el-button type="primary" @click="countDown.stop" v-if="countDown.status.value">{{
-                        t('query.order.monitor.start')
-                    }}</el-button>
-                    <el-button type="primary" @click="startCountDown" v-else>{{ t('query.order.monitor.stop')
-                    }}</el-button>
+                    <el-button type="primary" @click="countDown.stop" v-if="countDown.status.value">
+                        {{ t('query.order.monitor.stop') }}
+                    </el-button>
+                    <el-button type="primary" @click="startCountDown" v-else>
+                        {{ t('query.order.monitor.start') }}
+                    </el-button>
                 </el-form-item>
             </app-filter>
         </template>
-        <app-table :data="dataList" :columns="tableColumns" :loading="loading">
+        <app-table :data="dataList" :columns="tableColumns">
             <template #headerLeft>
                 <ul style="display: flex;gap: 20px;" v-if="data">
                     <li>
@@ -52,7 +53,7 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef } from 'vue'
+import { shallowRef, onMounted } from 'vue'
 import { ElMessage } from 'element-plus'
 import { useEnum } from '@/hooks/enum'
 import { useCountDown } from '@/hooks/countdown'
@@ -120,6 +121,9 @@ const { dataList, total, pageSize, pageIndex, loading, run: getMonitorddjk } = u
     },
     onError: (err) => {
         ElMessage.error(err)
+    },
+    onFinally: () => {
+        startCountDown()
     }
 })
 

src/packages/pc/views/query/order/report/index.vue

@@ -13,7 +13,7 @@
                 <template #goodsid="{ item }">
                     <el-form-item :label="item.label" prop="goodsid">
                         <app-select-goods v-model="item.value"
-                            :params="{ trademodels: '52', goodsStatusIds: '3,6,7' }" />
+                            :params="{ trademodels: '52,10', goodsStatusIds: '3,6,7' }" />
                     </el-form-item>
                 </template>
                 <template #areauserid="{ item }">

src/packages/pc/views/query/order/terminate/index.vue

@@ -19,7 +19,7 @@
                 <template #goodsid="{ item }">
                     <el-form-item :label="item.label" prop="goodsid">
                         <app-select-goods v-model="item.value"
-                            :params="{ trademodels: '52', goodsStatusIds: '3,6,7' }" />
+                            :params="{ trademodels: '52,10', goodsStatusIds: '3,6,7' }" />
                     </el-form-item>
                 </template>
             </app-filter>

src/services/api/common/index.ts

@@ -64,6 +64,9 @@ export function orderListAll(options: CommonFetchOptions<{ request: Model.OrderL
  * 商品查询下拉框
  */
 export function queryGoodsSelect(options: CommonFetchOptions<{ request: Model.GoodsSelectReq; response: Model.GoodsSelectRsp[]; }>) {
+    if (options.data) {
+        options.data.orgztypes = userStore.userInfo.orgztypes
+    }
     return httpClient.commonRequest('/common/queryGoodsSelect', 'get', options)
 }
 
@@ -71,6 +74,9 @@ export function queryGoodsSelect(options: CommonFetchOptions<{ request: Model.Go
  * 下拉查询商品： 平台+运营机构同时有权限的菜单中过滤商品时使用
  */
 export function queryGoodsSelectYYJG(options: CommonFetchOptions<{ request: Model.GoodsSelectYYJGReq; response: Model.GoodsSelectYYJGRsp[]; }>) {
+    if (options.data) {
+        options.data.orgztypes = userStore.userInfo.orgztypes
+    }
     return httpClient.commonRequest('/common/queryGoodsSelectYYJG', 'get', options)
 }
 

src/types/model/base.d.ts

@@ -320,35 +320,39 @@ declare namespace Base {
 
     /** 基础数据管理-->数据字典管理-->获取树结构 响应 */
     interface EnumDicsRsp {
-        enumdics: {
-            autoid: number; // 自增ID
-            enumdiccode: string; // 枚举代码
-            enumdicname: string; // 枚举名称
-            enumgroupid: number; // 所属枚举分组ID
-            ismappingtobank: number; // 是否映射到银行服务 - 0:不映射 1:映射
-            itemmaintaintype: number; // 子项维护类型 - 1:不可维护 2:系统项内维护 3:客户自主维护 4:初始化维护(如交易模式,交易属性)
-            itemstatus: number; // 枚举项状态 - 1.启用 2.不启用
-            modifyflag: number; // 修改标志 - 0:不允许修改 1:允许修改
-            remark: string; // 备注
-            showflag: number; // 是否显示 - 0:不显示 1:显示
-        }[];
-        enumgroups: {
-            enumgroupid: number; // 枚举分组ID
-            enumgroupname: string; // 枚举分组名称
-            remark: string; // 备注
-        }[];
+        enumdics: EnumDic[];
+        enumgroups: EnumGroup[];
+    }
+
+    interface EnumDic {
+        autoid: number; // 自增ID
+        enumdiccode: string; // 枚举代码
+        enumdicname: string; // 枚举名称
+        enumgroupid: number; // 所属枚举分组ID
+        ismappingtobank: number; // 是否映射到银行服务 - 0:不映射 1:映射
+        itemmaintaintype: number; // 子项维护类型 - 1:不可维护 2:系统项内维护 3:客户自主维护 4:初始化维护(如交易模式,交易属性)
+        itemstatus: number; // 枚举项状态 - 1.启用 2.不启用
+        modifyflag: number; // 修改标志 - 0:不允许修改 1:允许修改
+        remark: string; // 备注
+        showflag: number; // 是否显示 - 0:不显示 1:显示
+    }
+
+    interface EnumGroup {
+        enumgroupid: number; // 枚举分组ID
+        enumgroupname: string; // 枚举分组名称
+        remark: string; // 备注
     }
 
     /** 基础数据管理-->数据字典管理-->获取列表 请求 */
     interface EnumDicItemByPageReq {
-        enumdiccode: string;
-        enumgroupid: number;
-        enumitemstatus: number;
-        ismappingtobank: number;
-        modifyflag: number;
+        enumdiccode?: string;
+        enumgroupid?: number;
+        enumitemstatus?: number;
+        ismappingtobank?: number;
+        modifyflag?: number;
         pageNum: number; // 页码
         pageSize: number; // 页大小
-        showflag: number;
+        showflag?: number;
     }
 
     /** 基础数据管理-->数据字典管理-->获取列表 响应 */

src/types/model/common.d.ts

@@ -183,6 +183,7 @@ declare namespace Model {
         marketId?: number;
         searchCode?: string;
         trademodels?: string;
+        orgztypes?: string; // 管理员所属机构角色类型
     }
 
     /** 商品查询下拉框 响应 */