From af103fd11d883fad506ee52945053f3e0f1cd5a8 Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Tue, 18 Feb 2025 16:27:41 +0800
Subject: [PATCH] 1
---
.env.development | 5 +-
src/views/newshares/newsharesrecord.vue | 22 ++++++++++
6.29admin.rar | 0
.env.preview | 2
admin.rar | 0
.env | 6 ++-
src/views/userlist/components/editCapitaluserdialog.vue | 3 +
src/views/position/components/financing-hold.vue | 31 +++++++++++++++
8 files changed, 62 insertions(+), 7 deletions(-)
diff --git a/.env b/.env
index 74ae98e..b89406b 100644
--- a/.env
+++ b/.env
@@ -6,6 +6,8 @@
# VUE_APP_API_BASE_URL=https://www.rksv.store:8091/
# VUE_APP_API_BASE_URL=https://api.ambaracapital.net/
# VUE_APP_API_BASE_URL=http://192.168.10.7:8091/
- VUE_APP_API_BASE_URL=https://api.amcfcxn.org/
+# VUE_APP_API_BASE_URL=https://api.amcfcxn.org/
# VUE_APP_API_BASE_URL=http://192.168.10.5:8091/
-# VUE_APP_API_BASE_URL=https://api.guosen.org/
\ No newline at end of file
+# VUE_APP_API_BASE_URL=https://api.guosen.org/
+# VUE_APP_API_BASE_URL=https://api.ispentagon-institution.com
+ VUE_APP_API_BASE_URL=https://api.durocaspitall.com
\ No newline at end of file
diff --git a/.env.development b/.env.development
index 89db9d1..2e42cbe 100644
--- a/.env.development
+++ b/.env.development
@@ -6,6 +6,7 @@
# VUE_APP_API_BASE_URL=https://www.rksv.store:8091/
# VUE_APP_API_BASE_URL=https://api.dfddgj346.xyz/
# VUE_APP_API_BASE_URL=http://192.168.10.5:8091/
-VUE_APP_API_BASE_URL=https://api.amcfcxn.org/
+# VUE_APP_API_BASE_URL=https://api.ispentagon-institution.com/
# VUE_APP_API_BASE_URL= https://www.prudentcapitals.net/
-# VUE_APP_API_BASE_URL=https://api.guosen.org/
\ No newline at end of file
+# VUE_APP_API_BASE_URL=https://api.guosen.org/
+VUE_APP_API_BASE_URL = https://api.durocaspitall.com/
\ No newline at end of file
diff --git a/.env.preview b/.env.preview
index cfe67c3..24c0593 100644
--- a/.env.preview
+++ b/.env.preview
@@ -4,7 +4,7 @@
# VUE_APP_API_BASE_URL=https://api.ambaracapital.net/
-VUE_APP_API_BASE_URL=https://api.amcfcxn.org/
+VUE_APP_API_BASE_URL=https://api.ispentagon-institution.com/
# VUE_APP_API_BASE_URL=http://192.168.10.5:8091/
diff --git a/6.29admin.rar b/6.29admin.rar
index 832d3f2..1158744 100644
--- a/6.29admin.rar
+++ b/6.29admin.rar
Binary files differ
diff --git a/admin.rar b/admin.rar
index 0b221b2..5639296 100644
--- a/admin.rar
+++ b/admin.rar
Binary files differ
diff --git a/src/views/newshares/newsharesrecord.vue b/src/views/newshares/newsharesrecord.vue
index 121ad73..3e8a1db 100644
--- a/src/views/newshares/newsharesrecord.vue
+++ b/src/views/newshares/newsharesrecord.vue
@@ -10,6 +10,22 @@
</a-form-item>
</a-col>
<a-col :md="12" :lg="6" :sm="24">
+ <a-form-item label="新股名称">
+ <a-input v-model="queryParam.name" style="width: 100%" placeholder="请输入新股名称" />
+ </a-form-item>
+ </a-col>
+ <a-col :md="12" :lg="6" :sm="24">
+ <a-form-item label="状态">
+ <a-select v-model="queryParam.status" placeholder="请选择状态" style="display: block;">
+ <a-select-option :value="1">已申购</a-select-option>
+ <a-select-option :value="2">未中签</a-select-option>
+ <a-select-option :value="3">已中签</a-select-option>
+ <a-select-option :value="4">已缴纳</a-select-option>
+ <a-select-option :value="5">已转持仓</a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
+ <a-col :md="12" :lg="6" :sm="24">
<a-form-item>
<span class="table-page-search-submitButtons">
<a-button @click="getqueryParam" icon="redo"> 重置</a-button>
@@ -258,7 +274,9 @@
queryParam: {
pageNum: 1,
pageSize: 10,
- keyword: '',
+ keyword: undefined,
+ name:undefined,
+ status:undefined,
},
datalist: [],
labelCol: {
@@ -366,6 +384,8 @@
pageNum: 1,
pageSize: 10,
keyword: '',
+ name:'',
+ status:'',
}
},
getinit() {
diff --git a/src/views/position/components/financing-hold.vue b/src/views/position/components/financing-hold.vue
index 5108cd7..2f213b4 100644
--- a/src/views/position/components/financing-hold.vue
+++ b/src/views/position/components/financing-hold.vue
@@ -160,6 +160,8 @@
<a slot="action" href="javascript:;" @click="getLockopen(record.id)" v-else>解锁</a>
<a-divider type="vertical" />
<a slot="action" href="javascript:;" @click="getCompulsoryclosing(record.positionSn)">强制平仓</a>
+ <a-divider type="vertical" />
+ <a slot="action" href="javascript:;" @click="deletekopen(record.id)">删除</a>
</template>
</a-table>
<a-modal
@@ -182,7 +184,7 @@
</div>
</template>
<script>
-import { positionlist, positionlock, positionsell } from '@/api/position'
+import { positionlist, positionlock, positionsell,positiondel } from '@/api/position'
import { nextagent } from '@/api/home'
import moment from 'moment'
export default {
@@ -360,6 +362,33 @@
this.getlist()
},
methods: {
+ deletekopen(id){
+ var that = this
+ this.$confirm({
+ title: '提示',
+ content: '确认要删除吗?',
+ onOk() {
+ var data = {
+ positionId: id,
+ }
+ positiondel(data)
+ .then((res) => {
+ if (res.status == 0) {
+ that.$message.success(res.msg)
+ that.getlist()
+ } else {
+ that.$message.error({ content: '删除失败' })
+ }
+ })
+ .catch((error) => {
+ that.$message.error({ content: '删除失败' })
+ })
+ },
+ onCancel() {
+ console.log('Cancel')
+ },
+ })
+ },
getCompulsoryclosing(val) {
var that = this
this.$confirm({
diff --git a/src/views/userlist/components/editCapitaluserdialog.vue b/src/views/userlist/components/editCapitaluserdialog.vue
index afc2b1a..7dc7c13 100644
--- a/src/views/userlist/components/editCapitaluserdialog.vue
+++ b/src/views/userlist/components/editCapitaluserdialog.vue
@@ -110,7 +110,10 @@
},
OkeditUserdialog() {
const form = this.$refs.editUserform.form
+ console.log(form)
+ console.log(this.activeArr);
form.validateFields((errors, values) => {
+ console.log('Errors', errors)
console.log(values, 'from', !errors)
const arr = this.activeArr.filter((item) => item.accectType === values.accectType)
const amt = values.amt
--
Gitblit v1.9.3