update

package-lock.json

@@ -15,7 +15,7 @@
         "decimal.js": "^10.4.3",
         "default-passive-events": "^2.0.0",
         "echarts": "^5.4.3",
-        "element-plus": "^2.7.3",
+        "element-plus": "^2.8.1",
         "google-protobuf": "^3.21.2",
         "grpc-web": "^1.5.0",
         "hqchart": "^1.1.12829",
@@ -1770,26 +1770,26 @@
       }
     },
     "node_modules/@floating-ui/core": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.2.tgz",
-      "integrity": "sha512-+2XpQV9LLZeanU4ZevzRnGFg2neDeKHgFLjP6YLW+tly0IvrhqT4u8enLGjLH3qeh85g19xY5rsAusfwTdn5lg==",
+      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.7.tgz",
+      "integrity": "sha512-yDzVT/Lm101nQ5TCVeK65LtdN7Tj4Qpr9RTXJ2vPFLqtLxwOrpoxAHAJI8J3yYWUc40J0BDBheaitK5SJmno2g==",
       "dependencies": {
-        "@floating-ui/utils": "^0.2.0"
+        "@floating-ui/utils": "^0.2.7"
       }
     },
     "node_modules/@floating-ui/dom": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.5.tgz",
-      "integrity": "sha512-Nsdud2X65Dz+1RHjAIP0t8z5e2ff/IRbei6BqFrl1urT8sDVzM1HMQ+R0XcU5ceRfyO3I6ayeqIfh+6Wb8LGTw==",
+      "version": "1.6.10",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.10.tgz",
+      "integrity": "sha512-fskgCFv8J8OamCmyun8MfjB1Olfn+uZKjOKZ0vhYF3gRmEUXcGOjxWL8bBr7i4kIuPZ2KD2S3EUIOxnjC8kl2A==",
       "dependencies": {
-        "@floating-ui/core": "^1.0.0",
-        "@floating-ui/utils": "^0.2.0"
+        "@floating-ui/core": "^1.6.0",
+        "@floating-ui/utils": "^0.2.7"
       }
     },
     "node_modules/@floating-ui/utils": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.2.tgz",
-      "integrity": "sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw=="
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.7.tgz",
+      "integrity": "sha512-X8R8Oj771YRl/w+c1HqAC1szL8zWQRwFvgDwT129k9ACdBoud/+/rX9V0qiMl6LWUdP9voC2nDVZYPMQQsb6eA=="
     },
     "node_modules/@hapi/hoek": {
       "version": "9.2.1",
@@ -2262,9 +2262,9 @@
       "dev": true
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.4",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.4.tgz",
-      "integrity": "sha512-wYCP26ZLxaT3R39kiN2+HcJ4kTd3U1waI/cY7ivWYqFP6pW3ZNpvi6Wd6PHZx7T/t8z0vlkXMg3QYLa7DZ/IJQ=="
+      "version": "4.17.7",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.7.tgz",
+      "integrity": "sha512-8wTvZawATi/lsmNu10/j2hk1KEP0IvjubqPE3cu1Xz7xfXXt5oCq3SNUz4fMIP4XGF9Ky+Ue2tBA3hcS7LSBlA=="
     },
     "node_modules/@types/lodash-es": {
       "version": "4.17.12",
@@ -4011,9 +4011,9 @@
       }
     },
     "node_modules/@vueuse/core/node_modules/vue-demi": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz",
-      "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==",
+      "version": "0.14.10",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
       "hasInstallScript": true,
       "bin": {
         "vue-demi-fix": "bin/vue-demi-fix.js",
@@ -4055,9 +4055,9 @@
       }
     },
     "node_modules/@vueuse/shared/node_modules/vue-demi": {
-      "version": "0.14.7",
-      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz",
-      "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==",
+      "version": "0.14.10",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
       "hasInstallScript": true,
       "bin": {
         "vue-demi-fix": "bin/vue-demi-fix.js",
@@ -6414,9 +6414,9 @@
       "integrity": "sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA=="
     },
     "node_modules/dayjs": {
-      "version": "1.11.11",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.11.tgz",
-      "integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg=="
+      "version": "1.11.13",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
     },
     "node_modules/debug": {
       "version": "4.3.4",
@@ -6818,9 +6818,9 @@
       "dev": true
     },
     "node_modules/element-plus": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.7.3.tgz",
-      "integrity": "sha512-OaqY1kQ2xzNyRFyge3fzM7jqMwux+464RBEqd+ybRV9xPiGxtgnj/sVK4iEbnKnzQIa9XK03DOIFzoToUhu1DA==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.8.1.tgz",
+      "integrity": "sha512-p11/6w/O0+hGvPhiN3jrcgh+XG+eg5jZlLdQVYvcPHZYhhCh3J3YeZWW1JO/REPES1vevkboT6VAi+9wHA8Dsg==",
       "dependencies": {
         "@ctrl/tinycolor": "^3.4.1",
         "@element-plus/icons-vue": "^2.3.1",
@@ -14657,26 +14657,26 @@
       }
     },
     "@floating-ui/core": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.2.tgz",
-      "integrity": "sha512-+2XpQV9LLZeanU4ZevzRnGFg2neDeKHgFLjP6YLW+tly0IvrhqT4u8enLGjLH3qeh85g19xY5rsAusfwTdn5lg==",
+      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.7.tgz",
+      "integrity": "sha512-yDzVT/Lm101nQ5TCVeK65LtdN7Tj4Qpr9RTXJ2vPFLqtLxwOrpoxAHAJI8J3yYWUc40J0BDBheaitK5SJmno2g==",
       "requires": {
-        "@floating-ui/utils": "^0.2.0"
+        "@floating-ui/utils": "^0.2.7"
       }
     },
     "@floating-ui/dom": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.5.tgz",
-      "integrity": "sha512-Nsdud2X65Dz+1RHjAIP0t8z5e2ff/IRbei6BqFrl1urT8sDVzM1HMQ+R0XcU5ceRfyO3I6ayeqIfh+6Wb8LGTw==",
+      "version": "1.6.10",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.10.tgz",
+      "integrity": "sha512-fskgCFv8J8OamCmyun8MfjB1Olfn+uZKjOKZ0vhYF3gRmEUXcGOjxWL8bBr7i4kIuPZ2KD2S3EUIOxnjC8kl2A==",
       "requires": {
-        "@floating-ui/core": "^1.0.0",
-        "@floating-ui/utils": "^0.2.0"
+        "@floating-ui/core": "^1.6.0",
+        "@floating-ui/utils": "^0.2.7"
       }
     },
     "@floating-ui/utils": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.2.tgz",
-      "integrity": "sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw=="
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.7.tgz",
+      "integrity": "sha512-X8R8Oj771YRl/w+c1HqAC1szL8zWQRwFvgDwT129k9ACdBoud/+/rX9V0qiMl6LWUdP9voC2nDVZYPMQQsb6eA=="
     },
     "@hapi/hoek": {
       "version": "9.2.1",
@@ -15080,9 +15080,9 @@
       "dev": true
     },
     "@types/lodash": {
-      "version": "4.17.4",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.4.tgz",
-      "integrity": "sha512-wYCP26ZLxaT3R39kiN2+HcJ4kTd3U1waI/cY7ivWYqFP6pW3ZNpvi6Wd6PHZx7T/t8z0vlkXMg3QYLa7DZ/IJQ=="
+      "version": "4.17.7",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.7.tgz",
+      "integrity": "sha512-8wTvZawATi/lsmNu10/j2hk1KEP0IvjubqPE3cu1Xz7xfXXt5oCq3SNUz4fMIP4XGF9Ky+Ue2tBA3hcS7LSBlA=="
     },
     "@types/lodash-es": {
       "version": "4.17.12",
@@ -16316,9 +16316,9 @@
       },
       "dependencies": {
         "vue-demi": {
-          "version": "0.14.7",
-          "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz",
-          "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==",
+          "version": "0.14.10",
+          "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+          "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
           "requires": {}
         }
       }
@@ -16337,9 +16337,9 @@
       },
       "dependencies": {
         "vue-demi": {
-          "version": "0.14.7",
-          "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz",
-          "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==",
+          "version": "0.14.10",
+          "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+          "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
           "requires": {}
         }
       }
@@ -18013,9 +18013,9 @@
       "integrity": "sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA=="
     },
     "dayjs": {
-      "version": "1.11.11",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.11.tgz",
-      "integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg=="
+      "version": "1.11.13",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
     },
     "debug": {
       "version": "4.3.4",
@@ -18323,9 +18323,9 @@
       "dev": true
     },
     "element-plus": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.7.3.tgz",
-      "integrity": "sha512-OaqY1kQ2xzNyRFyge3fzM7jqMwux+464RBEqd+ybRV9xPiGxtgnj/sVK4iEbnKnzQIa9XK03DOIFzoToUhu1DA==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.8.1.tgz",
+      "integrity": "sha512-p11/6w/O0+hGvPhiN3jrcgh+XG+eg5jZlLdQVYvcPHZYhhCh3J3YeZWW1JO/REPES1vevkboT6VAi+9wHA8Dsg==",
       "requires": {
         "@ctrl/tinycolor": "^3.4.1",
         "@element-plus/icons-vue": "^2.3.1",

package.json

@@ -15,7 +15,7 @@
     "decimal.js": "^10.4.3",
     "default-passive-events": "^2.0.0",
     "echarts": "^5.4.3",
-    "element-plus": "^2.7.3",
+    "element-plus": "^2.8.1",
     "google-protobuf": "^3.21.2",
     "grpc-web": "^1.5.0",
     "hqchart": "^1.1.12829",

src/hooks/datatable/types.ts

@@ -24,6 +24,7 @@ export interface FilterSelect<T> {
     selectedValue?: T[keyof T],
     locked?: boolean, // 重置时是否阻止清空当前值
     placeholder?: string,
+    multiple?: boolean,
     options: {
         label: string,
         value: T[keyof T],

src/packages/pc/components/base/table-filter/index.less

@@ -8,10 +8,10 @@
     }
 
     .el-select {
-        width: 160px;
+        width: 180px;
     }
 
     .el-input {
-        width: 160px;
+        width: 180px;
     }
 }

src/packages/pc/components/base/table-filter/index.vue

@@ -4,7 +4,8 @@
       <slot name="before"></slot>
     </el-form-item>
     <el-form-item v-for="item in options.selectList" :key="item.key" :label="item.label">
-      <el-select :placeholder="item.placeholder ?? '请选择'" v-model="item.selectedValue" @change="item.onChange">
+      <el-select :placeholder="item.placeholder ?? '请选择'" v-model="item.selectedValue" :multiple="item.multiple" collapse-tags
+        @change="item.onChange">
         <el-option v-for="option in item.options" :key="option.value" :value="option.value" :label="option.label" />
       </el-select>
     </el-form-item>

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

@@ -1,44 +1,44 @@
 <!-- 市场运行管理-监控管理-账户风险监控 -->
 <template>
     <app-view>
+        <template #header>
+            <el-form ref="formRef" class="el-form--filter" :model="queryParams">
+                <el-form-item prop="orderbytype">
+                    <el-select v-model="queryParams.orderbytype">
+                        <el-option label="风险率" :value="0" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item prop="risk">
+                    监控当前风险率><el-input-number v-model="queryParams.risk" placeholder="请输入" />%
+                </el-form-item>
+                <el-form-item label="查询类型" prop="searchtype">
+                    <el-select v-model="queryParams.searchtype">
+                        <el-option label="交易商" :value="5" />
+                        <template v-if="userStore.userInfo.releType === 1">
+                            <el-option label="不限" :value="0" />
+                            <el-option label="自营会员" :value="2" />
+                        </template>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="所属机构" prop="puserid">
+                    <app-select-member v-model="queryParams.puserid" usertype="2,3" placeholder="代码或名称模糊匹配" />
+                </el-form-item>
+                <el-form-item>
+                    (默认风险率>50%;每10秒刷新一次,下次刷新: {{ countDown.time }})
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="countDown.stop" v-if="countDown.status.value">停止监控</el-button>
+                    <el-button type="primary" @click="startCountDown" v-else>开始监控</el-button>
+                </el-form-item>
+            </el-form>
+        </template>
         <app-table :data="dataList" :columns="tableColumns">
-            <template #headerLeft>
-                <el-form ref="formRef" class="el-form--filter" :model="queryParams">
-                    <el-form-item prop="orderbytype">
-                        <el-select v-model="queryParams.orderbytype">
-                            <el-option label="风险率" :value="0" />
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item prop="risk">
-                        监控当前风险率><el-input-number v-model="queryParams.risk" placeholder="请输入" />%
-                    </el-form-item>
-                    <el-form-item label="查询类型" prop="searchtype">
-                        <el-select v-model="queryParams.searchtype">
-                            <el-option label="交易商" :value="5" />
-                            <template v-if="userStore.userInfo.releType === 1">
-                                <el-option label="不限" :value="0" />
-                                <el-option label="自营会员" :value="2" />
-                            </template>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="所属机构" prop="puserid">
-                        <app-select-member v-model="queryParams.puserid" usertype="2,3" placeholder="代码或名称模糊匹配" />
-                    </el-form-item>
-                    <el-form-item>
-                        (默认风险率>50%;每10秒刷新一次,下次刷新: {{ countDown.time }})
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button type="primary" @click="countDown.stop" v-if="countDown.status.value">停止监控</el-button>
-                        <el-button type="primary" @click="startCountDown" v-else>开始监控</el-button>
-                    </el-form-item>
-                </el-form>
-            </template>
         </app-table>
     </app-view>
 </template>
 
 <script lang="ts" setup>
-import { ref,computed } from 'vue'
+import { ref, computed } from 'vue'
 import { ElMessage, FormInstance } from 'element-plus'
 import { useCountDown } from '@/hooks/countdown'
 import { useRequest } from '@/hooks/request'
@@ -66,22 +66,46 @@ const { dataList, run } = useRequest(marketRunInvestor, {
     }
 })
 
-const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'accountid', label: '账户' },
-    { field: 'memberusername', label: '所属会员' },
-    { field: 'parentusername', label: '所属机构' },
-    { field: 'freezemargin', label: '当前冻结资金' },
-    { field: 'usedmargin', label: '当前占用保证金', width: 140 },
-    { field: 'netbalance', label: '当前净值' },
-    { field: 'balance', label: '当前风险净值' },
-    { field: 'availmargin', label: '可用资金' },
-    { field: 'totalfrozen', label: '总冻结' },
-    { field: 'totalfloatpl', label: '浮动损益' },
-    { field: 'credit', label: '授信资金' },
-    { field: 'curriskrate', label: '当前风险率(%)' },
-    { field: 'currisklv', label: '当前风险等级' },
-    { field: 'operate', label: '操作', fixed: 'right' }
-])
+const tableColumns = computed<Model.TableColumn[]>(() => {
+    const { isshowrate, isshowsafe } = data.value ?? {}
+    if (isshowrate === '1' || isshowsafe === '1') {
+        return [
+            { field: 'accountid', label: '账户' },
+            { field: 'accountname', label: '账户名称' },
+            { field: 'memberusername', label: '所属会员' },
+            { field: 'parentusername', label: '所属机构' },
+            { field: 'freezemargin', label: '当前冻结资金' },
+            { field: 'usedmargin', label: '当前占用保证金', width: 140 },
+            { field: 'netbalance', label: '当前净值' },
+            { field: 'balance', label: '当前风险净值' },
+            { field: 'availmargin', label: '可用资金' },
+            { field: 'totalfrozen', label: '总冻结' },
+            { field: 'totalfloatpl', label: '浮动盈亏' },
+            { field: 'credit', label: '授信资金' },
+            { field: 'curriskrate', label: '当前风险率(%)' },
+            { field: 'currisklv', label: '当前风险等级' },
+            { field: 'operate', label: '操作', fixed: 'right' }
+        ]
+    }
+    return [
+        { field: 'accountid', label: '账户' },
+        { field: 'accountname', label: '账户名称' },
+        { field: 'memberusername', label: '所属会员' },
+        { field: 'parentusername', label: '所属机构' },
+        { field: 'freezemargin', label: '当前冻结资金' },
+        { field: 'usedmargin', label: '当前占用保证金', width: 140 },
+        { field: 'netbalance', label: '当前净值' },
+        { field: 'balance', label: '当前风险净值' },
+        { field: 'availmargin', label: '可用资金' },
+        { field: 'totalfrozen', label: '总冻结' },
+        { field: 'totalfloatpl', label: '浮动损益' },
+        { field: 'curriskrate', label: '当前风险率(%)' },
+        { field: 'currisklv', label: '当前风险等级' },
+        { field: 'currisksaferate', label: '当前安全度(%)' },
+        { field: 'currisksafelv', label: '当前安全等级' },
+        { field: 'operate', label: '操作', fixed: 'right' }
+    ]
+})
 
 const startCountDown = () => {
     countDown.start(() => run(queryParams.value))

src/packages/pc/views/query/warehouse_receipt/wrsumm/components/details/index.vue

@@ -0,0 +1,82 @@
+<!-- 查询管理-仓单查询-仓单汇总查询-详情 -->
+<template>
+    <teleport to="#appPageTeleport">
+        <app-view>
+            <app-table :data="dataList" :columns="tableColumns">
+                <template #headerLeft>
+                    <span>现货商品：{{ record.wrstandardname }}</span>
+                    <span>仓库：{{ record.warehousename }}</span>
+                    <span>单位：{{ record.enumdicname }}</span>
+                </template>
+                <template #headerRight>
+                    <div style="display: flex;">
+                        <el-select v-model="selectedUsers" placeholder="请选择持有人" multiple style="width: 180px;margin-right: 12px;">
+                            <el-option v-for="item in userList" :key="item.userid" :label="item.accountname"
+                                :value="item.userid">
+                                <div style="display: flex;justify-content: space-between;">
+                                    <span>{{ item.userid }}</span>
+                                    <span>{{ item.accountname }}</span>
+                                </div>
+                            </el-option>
+                        </el-select>
+                        <el-button type="primary" :loading="loading" @click="onSearch">查询</el-button>
+                        <el-button @click="emit('closed')">关闭</el-button>
+                    </div>
+                </template>
+                <template #footer>
+                    <app-pagination :total="total" v-model:page-size="pageSize" v-model:page-index="pageIndex"
+                        @change="run" />
+                </template>
+            </app-table>
+        </app-view>
+    </teleport>
+</template>
+
+<script lang="ts" setup>
+import { shallowRef, PropType } from 'vue'
+import { ElMessage } from 'element-plus'
+import { useRequest } from '@/hooks/request'
+import { summaryQueryInit, summaryQueryDetail } from '@/services/api/order'
+import AppTable from '@pc/components/base/table/index.vue'
+import AppPagination from '@pc/components/base/pagination/index.vue'
+
+const props = defineProps({
+    record: {
+        type: Object as PropType<Model.SummaryQueryRsp>,
+        required: true
+    }
+})
+
+const emit = defineEmits(['closed'])
+const loading = shallowRef(false)
+const selectedUsers = shallowRef<string[]>([])
+
+const { dataList: userList } = useRequest(summaryQueryInit)
+
+const { dataList, total, pageSize, pageIndex, run } = useRequest(summaryQueryDetail, {
+    params: {
+        pageNum: 1,
+        pageSize: 20,
+        ishis: props.record.ishis,
+        wrstandardid: props.record.wrstandardid
+    },
+    onError: (err) => {
+        ElMessage.error(err)
+    }
+})
+
+const tableColumns = shallowRef<Model.TableColumn[]>([
+    { field: 'accountname', label: '持有人' },
+    { field: 'accountid', label: '资金帐号' },
+    { field: 'ladingbillid', label: '仓单号' },
+    { field: 'qty', label: '数量' },
+    { field: 'freezerqty', label: '冻结' },
+    { field: 'wrfactortypename', label: '现货商品项值' },
+])
+
+const onSearch = () => {
+    run({
+        userids: selectedUsers.value.join(',')
+    })
+}
+</script>

src/packages/pc/views/query/warehouse_receipt/wrsumm/index.vue

@@ -1,7 +1,116 @@
 <!-- 查询管理-仓单查询-仓单汇总查询 -->
 <template>
-    <app-view></app-view>
+    <app-view>
+        <template #header>
+            <app-filter :options="filterOptons" />
+        </template>
+        <app-table :data="dataList" :columns="tableColumns" :loading="loading">
+            <!-- 操作 -->
+            <template #operate="{ row }">
+                <app-operation size="small" :data-list="getFilteredButtons()"
+                    @click="(code: string) => openComponent(code, row)" circle />
+            </template>
+            <template #footer>
+                <app-pagination :total="total" v-model:page-size="pageSize" v-model:page-index="pageIndex"
+                    @change="onSearch" />
+            </template>
+        </app-table>
+        <component :is="componentMap.get(componentId)" v-bind="{ record }" @closed="closeComponent"
+            v-if="componentId" />
+    </app-view>
 </template>
 
 <script lang="ts" setup>
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { useRequest } from '@/hooks/request'
+import { useDataFilter } from '@/hooks/datatable'
+import { useOperation } from '@/hooks/operation'
+import { initWarehouse, summaryQuery } from '@/services/api/order'
+import AppTable from '@pc/components/base/table/index.vue'
+import AppFilter from '@pc/components/base/table-filter/index.vue'
+import AppPagination from '@pc/components/base/pagination/index.vue'
+import AppOperation from '@pc/components/base/operation/index.vue'
+
+const { filterOptons, getQueryParams } = useDataFilter<Model.SummaryQueryReq>()
+
+const { componentMap, componentId, record, openComponent, closeComponent, getFilteredButtons } = useOperation<Model.SummaryQueryRsp>({
+    onClose: () => onSearch()
+})
+
+useRequest(initWarehouse, {
+    onSuccess: (res) => {
+        filterOptons.selectList[1].options = res.data.wrStandardList.map((e) => ({
+            label: e.wrstandardname,
+            value: e.wrstandardid
+        }))
+        filterOptons.selectList[2].options = res.data.warehouseInfoList.map((e) => ({
+            label: e.warehousename,
+            value: e.autoid
+        }))
+    },
+    onError: (err) => {
+        ElMessage.error(err)
+    }
+})
+
+const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(summaryQuery, {
+    params: {
+        pageNum: 1,
+        pageSize: 20,
+        ishis: 0
+    },
+    onError: (err) => {
+        ElMessage.error(err)
+    }
+})
+
+const tableColumns = ref<Model.TableColumn[]>([
+    { field: 'wrstandardname', label: '现货商品' },
+    { field: 'warehousename', label: '仓库' },
+    { field: 'totalqty', label: '总数量' },
+    { field: 'avaliableqty', label: '正常' },
+    { field: 'freezeqty', label: '冻结' },
+    { field: 'increaseqty', label: '今日增加' },
+    { field: 'decreaseqty', label: '今日减少' },
+    { field: 'enumdicname', label: '单位' },
+    { field: 'operate', label: '操作', fixed: 'right' }
+])
+
+filterOptons.selectList = [
+    {
+        key: 'ishis',
+        label: '查询类型',
+        selectedValue: 0,
+        locked: true,
+        options: [
+            { label: '当前', value: 0 },
+            { label: '历史', value: 1 },
+        ],
+    },
+    {
+        key: 'wrsids',
+        label: '仓库标准',
+        multiple: true,
+        options: [],
+    },
+    {
+        key: 'wareids',
+        label: '仓库',
+        multiple: true,
+        options: [],
+    }
+]
+
+filterOptons.buttonList = [
+    { lable: '查询', className: 'el-button--primary', onClick: () => onSearch() },
+    { lable: '重置', className: 'el-button--primary', onClick: () => onSearch(true) }
+]
+
+const onSearch = (clear = false) => {
+    const qs = getQueryParams(clear)
+    qs.wareids = Array.isArray(qs.wareids) ? qs.wareids.join(',') : qs.wareids
+    qs.wrsids = Array.isArray(qs.wrsids) ? qs.wrsids.join(',') : qs.wrsids
+    run(qs)
+}
 </script>

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

@@ -57,8 +57,8 @@ const { componentMap, componentId, record, openComponent, closeComponent, getFil
 const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(warehouseQuery, {
     manual: true,
     params: {
-        pagenum: 1,
-        pagesize: 20
+        pageNum: 1,
+        pageSize: 20
     },
     onError: (err) => {
         ElMessage.error(err)

src/packages/pc/views/query/warehouse_receipt_order/trade/index.vue

@@ -51,8 +51,8 @@ const { componentMap, componentId, record, openComponent, closeComponent, getFil
 const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryTradeOrder, {
     manual: true,
     params: {
-        pagenum: 1,
-        pagesize: 20
+        pageNum: 1,
+        pageSize: 20
     },
     onError: (err) => {
         ElMessage.error(err)

src/services/api/order/index.ts

@@ -146,11 +146,18 @@ export function summaryQuery(options: CommonFetchOptions<{ request: Model.Summar
 /**
  * 仓单查询--> 仓单汇总查询查询 --> 详情
  */
-export function summaryQueryDetail(options: CommonFetchOptions<{ request: Model.SummaryQueryDetailReq; response: Model.SummaryQueryDetailRsp; }>) {
+export function summaryQueryDetail(options: CommonFetchOptions<{ request: Model.SummaryQueryDetailReq; response: Model.SummaryQueryDetailRsp[]; }>) {
     return httpClient.commonRequest('/query/summaryQueryDetail', 'get', options)
 }
 
 /**
+ * 仓单查询--> 仓单汇总查询查询 --> 详情 --> 初始化持有人
+ */
+export function summaryQueryInit(options: CommonFetchOptions<{ response: Model.SummaryQueryInitRsp[]; }>) {
+    return httpClient.commonRequest('/query/summaryQueryInit', 'get', options)
+}
+
+/**
  * 仓单类订单查询--> 成交单查询 --> 导出
  */
 export function tradeOrderExport(options: CommonFetchOptions<{ request: Model.TradeOrderExportReq; response: string; }>) {

src/types/model/order.d.ts

@@ -361,26 +361,26 @@ declare namespace Model {
         sellcurpositionqty: number; // 卖持仓总数量
     }
 
-     /** 内部订单查询--> 商品成交汇总 --> 获取列表 请求 */
-     interface GoodsTradeReq {
+    /** 内部订单查询--> 商品成交汇总 --> 获取列表 请求 */
+    interface GoodsTradeReq {
         // 结束时间
-        enddate?: string; 
+        enddate?: string;
         //
-        excludeAccountIds?: string[] 
+        excludeAccountIds?: string[]
         // 排除资金账户
-        excludeaccountidsstr?: string; 
+        excludeaccountidsstr?: string;
         // 商品id
-        goodsid?: number; 
+        goodsid?: number;
         // 市场id
-        marketid?: number; 
+        marketid?: number;
         // 页码
-        pageNum?: number; 
+        pageNum?: number;
         // 页大小
-        pageSize?: number; 
+        pageSize?: number;
         // 汇总方式
-        summode?: number; 
+        summode?: number;
         // 开始时间
-        startdate?: string; 
+        startdate?: string;
         // 
         userid?: number;
     }
@@ -404,23 +404,23 @@ declare namespace Model {
     /** 内部订单查询--> 商品成交汇总 --> 导出 请求 */
     interface GoodsTradeExportReq {
         // 结束时间
-        enddate?: string; 
+        enddate?: string;
         //
-        excludeAccountIds?: string[] 
+        excludeAccountIds?: string[]
         // 排除资金账户
-        excludeaccountidsstr?: string; 
+        excludeaccountidsstr?: string;
         // 商品id
-        goodsid?: number; 
+        goodsid?: number;
         // 市场id
-        marketid?: number; 
+        marketid?: number;
         // 页码
-        pageNum?: number; 
+        pageNum?: number;
         // 页大小
-        pageSize?: number; 
+        pageSize?: number;
         // 汇总方式
-        summode?: number; 
+        summode?: number;
         // 开始时间
-        startdate?: string; 
+        startdate?: string;
         // 
         userid?: number;
     }
@@ -428,27 +428,27 @@ declare namespace Model {
     /** 内部订单查询--> 账户成交汇总 --> 获取列表 请求 */
     interface AccountTransactionsReq {
         // 交易商
-        accountid?: number; 
+        accountid?: number;
         // 结束时间
-        enddate?: string; 
+        enddate?: string;
         //
-        excludeAccountIds?: string[] 
+        excludeAccountIds?: string[]
         // 排除资金账户
-        excludeaccountidsstr?: string; 
+        excludeaccountidsstr?: string;
         // 商品id
-        goodsid?: number; 
+        goodsid?: number;
         // 页码
-        pageNum?: number; 
+        pageNum?: number;
         // 页大小
-        pageSize?: number; 
+        pageSize?: number;
         // 开始时间
-        startdate?: string; 
+        startdate?: string;
         // 汇总方式
-        summode?: number; 
+        summode?: number;
         // 
         userid?: number;
         // 市场id
-        marketid?: number; 
+        marketid?: number;
     }
 
     /** 内部订单查询--> 账户成交汇总 --> 获取列表 响应 */
@@ -476,23 +476,23 @@ declare namespace Model {
     /** 内部订单查询--> 账户成交汇总 --> 导出 请求 */
     interface AaccountExportReq {
         // 交易商
-        accountid?: number; 
+        accountid?: number;
         // 结束时间
-        enddate?: string; 
+        enddate?: string;
         //
-        excludeAccountIds?: string[] 
+        excludeAccountIds?: string[]
         // 排除资金账户
-        excludeaccountidsstr?: string; 
+        excludeaccountidsstr?: string;
         // 商品id
-        goodsid?: number; 
+        goodsid?: number;
         // 页码
-        pageNum?: number; 
+        pageNum?: number;
         // 页大小
-        pageSize?: number; 
+        pageSize?: number;
         // 开始时间
-        startdate?: string; 
+        startdate?: string;
         // 汇总方式
-        summode?: number; 
+        summode?: number;
         // 
         userid?: number;
     }
@@ -501,7 +501,7 @@ declare namespace Model {
     interface InitWarehouseRsp {
         warehouseInfoList: {
             // 详细地址
-            address: string; 
+            address: string;
             // 所属机构
             areauserid: number
             // 自增ID
@@ -603,17 +603,17 @@ declare namespace Model {
     /** 内部订单查询--> 机构成交汇总 --> 获取列表 请求 */
     interface InvestorOrderReq {
         // 开始时间
-        startdate?: string; 
+        startdate?: string;
         // 结束时间
-        enddate?: string; 
+        enddate?: string;
         // 商品id
-        goodsid?: number; 
+        goodsid?: number;
         // 交易商
-        parentuserid?: number; 
+        parentuserid?: number;
         // 页码
-        pageNum?: number; 
+        pageNum?: number;
         // 页大小
-        pageSize?: number; 
+        pageSize?: number;
         // 
         userid?: number;
     }
@@ -641,27 +641,27 @@ declare namespace Model {
     /** 仓单类订单查询--> 成交单查询 --> 获取列表 请求 */
     interface TradeOrderReq {
         // 会员或交易商代码/名称
-        accountname?: string; 
+        accountname?: string;
         // 方向
-        buyorsell?: number; 
+        buyorsell?: number;
         // 状态
-        handlestatus?: number; 
+        handlestatus?: number;
         // 结束世界
-        hisenddate?: string; 
+        hisenddate?: string;
         // 开始时间
-        hisstartdate?: string; 
+        hisstartdate?: string;
         // 查询类型 0正常 1历史
-        ishis?: number; 
+        ishis?: number;
         // 市场id
-        marketid?: number; 
+        marketid?: number;
         // 页码
-        pagenum?: number; 
+        pagenum?: number;
         // 页大小
-        pagesize?: number; 
+        pagesize?: number;
         // 成交单号
-        tradeid?: string; 
+        tradeid?: string;
         // 
-        userid?: number; 
+        userid?: number;
         // 类型
         wrtradetype?: number;
     }
@@ -707,21 +707,21 @@ declare namespace Model {
     /** 仓单查询--> 仓单汇总查询查询 --> 获取列表 请求 */
     interface SummaryQueryReq {
         // 结束时间
-        hisenddate?: string; 
+        hisenddate?: string;
         // 开始时间
-        hisstartdate?: string; 
+        hisstartdate?: string;
         // 查询类型 0正常 1历史
-        ishis?: number; 
+        ishis?: number;
         // 
-        memberuserid?: number; 
+        memberuserid?: number;
         // 页码
-        pageNum?: number; 
+        pageNum?: number;
         // 页大小
-        pageSize?: number; 
+        pageSize?: number;
         // 仓库
-        warehouseids?: number[]
+        wareids?: string;
         // 仓单标准
-        wrstandardids?: number[]
+        wrsids?: string;
     }
 
     /** 仓单类订单查询--> 成交单查询 --> 获取列表 响应 */
@@ -753,17 +753,17 @@ declare namespace Model {
     /** 仓单查询--> 仓单汇总查询查询 --> 详情 请求 */
     interface SummaryQueryDetailReq {
         // 查询类型 0正常 1历史
-        ishis?: number; 
+        ishis?: number;
         // 
-        memberuserid?: number; 
+        memberuserid?: number;
         // 页码
-        pageNum?: number; 
+        pageNum?: number;
         // 页大小
-        pageSize?: number; 
+        pageSize?: number;
         // 持有人
-        userids?: number[]
+        userids?: string;
         // id
-        wrstandardid?: number
+        wrstandardid?: number;
     }
 
     /** 仓单查询--> 仓单汇总查询查询 --> 详情 响应 */
@@ -782,26 +782,35 @@ declare namespace Model {
         wrfactortypename: string
     }
 
+    /** 仓单查询--> 仓单汇总查询查询 --> 详情 --> 初始化持有人 响应 */
+    interface SummaryQueryInitRsp {
+        accountname: string; // 账户名称
+        memberuserid: number; // 会员 及子机构管理员
+        parentuserid: number; // 所有子级
+        userid: string; // 账户id
+        usertype: string; // 账户类型 (默认 2)-- 1:交易所 2:机构 3:会员子机构 4:经纪人 5:投资者 6:客户 7:企业成员(云平台)
+    }
+
     /** 仓单类订单查询--> 成交单查询 --> 导出 请求 */
     interface TradeOrderExportReq {
         // 会员或交易商代码/名称
         accountname?: string
         // 方向
-        buyorsell?: number; 
+        buyorsell?: number;
         // 结束时间
-        hisenddate?: string; 
+        hisenddate?: string;
         // 开始时间
-        hisstartdate?: string; 
+        hisstartdate?: string;
         // 查询类型 0正常 1历史
-        ishis?: number; 
+        ishis?: number;
         // 市场id
-        marketid?: number; 
+        marketid?: number;
         // 页码
-        pageNum?: number; 
+        pageNum?: number;
         // 页大小
-        pageSize?: number; 
+        pageSize?: number;
         // 成交单号
-        tradeid?: string; 
+        tradeid?: string;
         //
         userid?: number
         // 类型
@@ -811,9 +820,9 @@ declare namespace Model {
     /** 仓单类订单查询--> 委托单查询 --> 详情 请求 */
     interface TradeOrderViewReq {
         // 查询类型 0正常 1历史
-        ishis?: number; 
+        ishis?: number;
         // 
-        wrtradeorderid?: number; 
+        wrtradeorderid?: number;
     }
 
     /** 仓单类订单查询--> 委托单查询 --> 详情 响应 */
@@ -882,7 +891,7 @@ declare namespace Model {
             weightratio: number
             // 仓单贸易委托单ID(挂牌委托)
             wrtradeorderid: number
-            
+
         }[]
         // 贸易对手表
         wrTradeMatchDetails: {
@@ -1048,11 +1057,11 @@ declare namespace Model {
     /** 仓单类订单查询--> 成交单查询 --> 详情 请求 */
     interface TradeTradedViewReq {
         // 查询类型 0正常 1历史
-        ishis?: number; 
+        ishis?: number;
         // wrtradeorderid
-        wrtradeorderid?: number; 
+        wrtradeorderid?: number;
         // wrtradetype
-        wrtradetype?: number; 
+        wrtradetype?: number;
     }
 
     /** 仓单类订单查询--> 成交单查询 --> 详情 响应 */
@@ -1156,57 +1165,57 @@ declare namespace Model {
     /** 仓单类订单查询--> 委托单查询 --> 导出 请求 */
     interface WarehouseExportReq {
         // 会员或交易商代码/名称
-        accountname?: string; 
+        accountname?: string;
         // 方向
-        buyorsell?: number; 
+        buyorsell?: number;
         // 状态
-        handlestatus?: number; 
+        handlestatus?: number;
         // 结束世界
-        hisenddate?: string; 
+        hisenddate?: string;
         // 开始时间
-        hisstartdate?: string; 
+        hisstartdate?: string;
         // 查询类型 0正常 1历史
-        ishis?: number; 
+        ishis?: number;
         // 市场id
-        marketid?: number; 
+        marketid?: number;
         // 页码
-        pagenum?: number; 
+        pageNum?: number;
         // 页大小
-        pagesize?: number; 
+        pageSize?: number;
         // 委托单号
-        tradeid?: string; 
+        tradeid?: string;
         // 
-        userid?: number; 
+        userid?: number;
         // 类型
-        wrtradetype?: number; 
+        wrtradetype?: number;
     }
 
     /** 仓单类订单查询--> 委托单查询 --> 获取列表 回应 */
     interface WarehouseQueryReq {
         // 会员或交易商代码/名称
-        accountname?: string; 
+        accountname?: string;
         // 方向
-        buyorsell?: number; 
+        buyorsell?: number;
         // 状态
-        handlestatus?: number; 
+        handlestatus?: number;
         // 结束世界
-        hisenddate?: string; 
+        hisenddate?: string;
         // 开始时间
-        hisstartdate?: string; 
+        hisstartdate?: string;
         // 查询类型 0正常 1历史
-        ishis?: number; 
+        ishis?: number;
         // 市场id
-        marketid?: number; 
+        marketid?: number;
         // 页码
-        pagenum?: number; 
+        pageNum?: number;
         // 页大小
-        pagesize?: number; 
+        pageSize?: number;
         // 委托单号
-        tradeid?: string; 
+        tradeid?: string;
         // 
-        userid?: number; 
+        userid?: number;
         // 类型
-        wrtradetype?: number; 
+        wrtradetype?: number;
     }
 
     /** 仓单类订单查询--> 委托单查询 --> 获取列表 请求 */