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/newshares/newshareslist.vue | 57 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/src/views/newshares/newshareslist.vue b/src/views/newshares/newshareslist.vue
index a124147..50e2bee 100644
--- a/src/views/newshares/newshareslist.vue
+++ b/src/views/newshares/newshareslist.vue
@@ -96,15 +96,7 @@
</div>
</template>
</span>
- <span slot="stockType" slot-scope="text, record">
- <template>
- <div>
- <a-tag :color="record.stockType == 'sh' ? 'purple' : record.stockType == 'sz' ? 'blue' : ''">
- {{ record.stockType == 'sh' ? '沪股' : record.stockType == 'sz' ? '深股' : record.stockType }}
- </a-tag>
- </div>
- </template>
- </span>
+
<template slot="action" slot-scope="text, record">
<a slot="action" href="javascript:;" @click="geteditStock(record)">{{ '修改新股' }}</a>
@@ -185,24 +177,24 @@
</a-row>
<a-row :gutter="48">
<a-col :md="12" :lg="12" :sm="12">
- <a-form-item label="认缴时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-item label="开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-date-picker
show-time
style="width: 100%"
@change="getsubscriptionTime"
- v-decorator="['subscriptionTime', { rules: [{ required: true, message: '请填写认缴时间' }] }]"
+ v-decorator="['subscriptionTime', { rules: [{ required: true, message: '请填写开始时间' }] }]"
format="YYYY-MM-DD HH:mm:ss"
>
</a-date-picker>
</a-form-item>
</a-col>
<a-col :md="12" :lg="12" :sm="12">
- <a-form-item label="申购时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-item label="结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-date-picker
show-time
style="width: 100%"
@change="getsubscribeTime"
- v-decorator="['subscribeTime', { rules: [{ required: true, message: '请填写申购时间' }] }]"
+ v-decorator="['subscribeTime', { rules: [{ required: true, message: '请填写结束时间' }] }]"
format="YYYY-MM-DD HH:mm:ss"
>
</a-date-picker>
@@ -222,13 +214,33 @@
</a-date-picker>
</a-form-item>
</a-col>
- <!-- <a-col :md="12" :lg="12" :sm="12">
- <a-form-item label="预估价格" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input
- placeholder="请输入预估价格"
- v-decorator="['pe', { rules: [{ required: true, message: '请输入预估价格', }] }]" />
+ <a-col :md="12" :lg="12" :sm="12">
+ <a-form-item label="新股市场" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-select
+ placeholder="请选择新股市场"
+ v-decorator="['stockType', { rules: [{ required: true, message: '新股市场' }] }]"
+ >
+ <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> -->
+ </a-col>
+ </a-row>
+ <a-row :gutter="48">
+ <a-col :md="12" :lg="12" :sm="12">
+ <a-form-item label="最低买入价格" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input
+ placeholder="请输入最低买入价格"
+ v-decorator="['minPrice' ]" />
+ </a-form-item>
+ </a-col>
+ <a-col :md="12" :lg="12" :sm="12">
+ <a-form-item label="密钥" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input
+ placeholder="请输入密钥"
+ v-decorator="['password' ]" />
+ </a-form-item>
+ </a-col>
</a-row>
</a-form>
</a-modal>
@@ -284,7 +296,7 @@
},
{
- title: '申购时间',
+ title: '结束时间',
dataIndex: 'subscribeTime',
align: 'center',
customRender: (text, row, index) => {
@@ -292,7 +304,7 @@
},
},
{
- title: '认缴时间',
+ title: '开始时间',
dataIndex: 'subscriptionTime',
align: 'center',
customRender: (text, row, index) => {
@@ -334,6 +346,7 @@
name: '',
zt: undefined,
type: undefined,
+ stockType:undefined,
},
datalist: [],
labelCol: {
@@ -363,6 +376,8 @@
'code',
'pe',
'listDate',
+ 'password',
+ 'minPrice'
],
currentdetail: '',
subscribeTime: '',
--
Gitblit v1.9.3