From 451674dd4dd784fa0725b4ba052d94449d892712 Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Sat, 28 Sep 2024 15:12:16 +0800
Subject: [PATCH] Merge branch '6-29印度股票' of http://124.156.157.155:8060/r/dg/dabao_admin into 6-29印度股票
---
src/views/product/shares.vue | 53 ++++++++++++++++++++---------------------------------
1 files changed, 20 insertions(+), 33 deletions(-)
diff --git a/src/views/product/shares.vue b/src/views/product/shares.vue
index 04978c8..d6934b9 100644
--- a/src/views/product/shares.vue
+++ b/src/views/product/shares.vue
@@ -4,30 +4,20 @@
<div class="table-page-search-wrapper">
<a-form layout="inline">
<a-row :gutter="48">
- <!-- <a-col :md="12" :lg="6" :sm="24">
- <a-form-item label="股票类型">
- <a-select v-model="queryParam.stockPlate" placeholder="请选择股票类型">
- <a-select-option :value="'A股'">股票</a-select-option>
- <a-select-option :value="'科创'">科创</a-select-option>
- </a-select>
- </a-form-item>
- </a-col> -->
- <!-- <a-col :md="12" :lg="6" :sm="24">
- <a-form-item label="沪深股">
- <a-select v-model="queryParam.stockType" placeholder="请选择显示状态">
- <a-select-option value="sh">沪股</a-select-option>
- <a-select-option value="sz">深股</a-select-option>
- <a-select-option value="bj">京股</a-select-option>
- <a-select-option value="hk">港股</a-select-option>
- <a-select-option value="us">美股</a-select-option>
- </a-select>
- </a-form-item>
- </a-col> -->
<a-col :md="12" :lg="6" :sm="24">
<a-form-item label="锁定状态">
<a-select v-model="queryParam.lockState" placeholder="请选择锁定状态">
<a-select-option :value="0">正常</a-select-option>
<a-select-option :value="1">锁定</a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
+
+ <a-col :md="12" :lg="6" :sm="24">
+ <a-form-item label="股票市场">
+ <a-select v-model="queryParam.stockGid" placeholder="请选择股票市场">
+ <a-select-option value="nse">nse</a-select-option>
+ <a-select-option value="bse">bse</a-select-option>
</a-select>
</a-form-item>
</a-col>
@@ -63,13 +53,6 @@
@click=";(queryParam.pageNum = 1), (pagination.current = 1), getlist()"
>查询
</a-button>
-
- <!-- <a-button
- type="primary"
- icon="plus"
- style="margin-left: 8px"
- @click="addUserdialog = true">
- 添加股票</a-button> -->
</span>
</a-form-item>
</a-col>
@@ -93,6 +76,8 @@
<span style="margin-right: 10px">{{ record.stockName }}</span>
<a-tag color="green">{{ record.stockCode }} </a-tag>
</div>
+
+ <!-- stockSpell -->
</template>
</span>
<span slot="stockType" slot-scope="text, record">
@@ -203,7 +188,7 @@
<a-form-item label="股票代码" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input
placeholder="请输入股票代码"
- v-decorator="['stockCode', { rules: [{ required: true, message: '请输入股票代码' }] }]"
+ v-decorator="['stockSpell', { rules: [{ required: true, message: '请输入股票代码' }] }]"
/>
</a-form-item>
<a-form-item label="股票类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -288,12 +273,12 @@
align: 'center',
scopedSlots: { customRender: 'stockName' },
},
- // {
- // title: '沪深京股',
- // dataIndex: 'stockType',
- // align: 'center',
- // scopedSlots: { customRender: 'stockType' }
- // },
+ {
+ title: '股票市场',
+ dataIndex: 'stockGid',
+ align: 'center',
+ scopedSlots: { customRender: 'stockGid' }
+ },
{
title: '现价',
dataIndex: 'nowPrice',
@@ -366,6 +351,7 @@
stockType: undefined,
showState: undefined,
lockState: undefined,
+ stockGid: undefined
},
datalist: [],
labelCol: {
@@ -459,6 +445,7 @@
stockType: undefined,
showState: undefined,
lockState: undefined,
+ stockGid:undefined
}
},
getinit() {
--
Gitblit v1.9.3