From 39e69537e2b29313fc8383afe26ae291eaaa4992 Mon Sep 17 00:00:00 2001
From: dcc <dcc@163.com>
Date: Fri, 17 May 2024 18:38:42 +0800
Subject: [PATCH] 12345
---
src/config/router.config.js | 12 +++---
src/views/risksetting/productsetting.vue | 4 +-
src/views/newshares/newshareslist.vue | 71 +++++++++++++++++++++++++++--------
3 files changed, 63 insertions(+), 24 deletions(-)
diff --git a/src/config/router.config.js b/src/config/router.config.js
index 8bd85c5..bf0f69c 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -61,12 +61,12 @@
component: () => import('@/views/userlist/agentlist'),
meta: { title: '代理列表', keepAlive: true, permission: ['agentlist'] }
},
- {
- path: '/userlist/lervelist',
- name: 'lervelist',
- component: () => import('@/views/userlist/lervelist'),
- meta: { title: '杠杠申请列表', keepAlive: true, permission: ['agentlist'] }
- }
+ // {
+ // path: '/userlist/lervelist',
+ // name: 'lervelist',
+ // component: () => import('@/views/userlist/lervelist'),
+ // meta: { title: '杠杠申请列表', keepAlive: true, permission: ['agentlist'] }
+ // }
]
},
// {
diff --git a/src/views/newshares/newshareslist.vue b/src/views/newshares/newshareslist.vue
index 5a4638c..7a22047 100644
--- a/src/views/newshares/newshareslist.vue
+++ b/src/views/newshares/newshareslist.vue
@@ -161,8 +161,20 @@
</a-row>
<a-row :gutter="48">
<a-col :md="12" :lg="12" :sm="12">
+ <a-form-item label="股票账户" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-select
+ placeholder="请选择股票账户"
+ @change = 'rechargeNameChange'
+ v-decorator="['rechargeName', { rules: [{ required: true, message: '请选择股票账户' }] }]"
+ >
+ <a-select-option :value="item.name" v-for="(item,index) in rechargeAccountActions" :key="item.key">{{item.name}}</a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
+ <a-col :md="12" :lg="12" :sm="12">
<a-form-item label="股票类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select
+ :disabled="!(rechargeName&&rechargeName == '印股账户')"
placeholder="请选择股票类型"
v-decorator="['stockType', { rules: [{ required: true, message: '请选择股票类型' }] }]"
>
@@ -171,6 +183,8 @@
</a-select>
</a-form-item>
</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-select
@@ -182,8 +196,6 @@
</a-select>
</a-form-item>
</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-select
@@ -195,6 +207,9 @@
</a-select>
</a-form-item>
</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-date-picker
@@ -207,8 +222,6 @@
</a-date-picker>
</a-form-item>
</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-date-picker
@@ -216,18 +229,6 @@
style="width: 100%"
@change="getsubscriptionTime"
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-date-picker
- show-time
- style="width: 100%"
- @change="getListDate"
- v-decorator="['listDate', { rules: [{ required: true, message: '请填写上市时间' }] }]"
format="YYYY-MM-DD HH:mm:ss"
>
</a-date-picker>
@@ -241,6 +242,20 @@
</a-form-item>
</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-date-picker
+ show-time
+ style="width: 100%"
+ @change="getListDate"
+ v-decorator="['listDate', { rules: [{ required: true, message: '请填写上市时间' }] }]"
+ format="YYYY-MM-DD HH:mm:ss"
+ >
+ </a-date-picker>
+ </a-form-item>
+ </a-col>
+ </a-row>
</a-form>
</a-modal>
</page-header-wrapper>
@@ -253,6 +268,25 @@
name: 'Shares',
data () {
return {
+ rechargeName: '',
+ rechargeAccountActions: [
+ {
+ name: '美股账户',
+ key: "US",
+ },
+ {
+ name: '马股账户',
+ key: "MAS",
+ },
+ {
+ name: '港股账户',
+ key: "HK",
+ },
+ {
+ name: '印股账户',
+ key: "IN",
+ },
+ ],
columns: [
{
title: '新股名称 / 新股代码',
@@ -371,6 +405,7 @@
'subscriptionTime',
'type',
'stockType',
+ 'rechargeName',
'code',
'pe',
'listDate'
@@ -384,6 +419,9 @@
this.getlist()
},
methods: {
+ rechargeNameChange(e){
+ this.rechargeName = e
+ },
getdeleteStock (val) {
var that = this
this.$confirm({
@@ -421,6 +459,7 @@
this.addUserdialog = true
var currentTime = new Date()
this.fields.forEach((v) => this.addUserform.getFieldDecorator(v))
+ console.log(this.addUserform)
this.addUserform.setFieldsValue(pick(val, this.fields))
this.addUserform.setFieldsValue({
subscriptionTime: moment(val.subscriptionTime ? val.subscriptionTime : currentTime).format(
diff --git a/src/views/risksetting/productsetting.vue b/src/views/risksetting/productsetting.vue
index bc79a56..4ea2738 100644
--- a/src/views/risksetting/productsetting.vue
+++ b/src/views/risksetting/productsetting.vue
@@ -1,7 +1,7 @@
<template>
<page-header-wrapper>
<a-form :form="addUserform" class="form" ref="addUserform">
- <a-card class="card" title="A股" :bordered="false" :loading="loading">
+<!-- <a-card class="card" title="A股" :bordered="false" :loading="loading">
<span slot="extra">状态为开启即表示用户可以进行该产品的交易</span>
<a-row class="form-row" :gutter="48">
<a-col :md="8" :lg="8" :sm="12">
@@ -29,7 +29,7 @@
</a-form-item>
</a-col>
</a-row>
- </a-card>
+ </a-card>-->
<!-- <a-card class="card" title="期货" :bordered="false" :loading="loading"> -->
<!-- <span slot="extra">状态为开启即表示用户可以进行该产品的交易</span>
<a-row class="form-row" :gutter="48">
--
Gitblit v1.9.3