From 05f83decc81faaa188cc777fd2c719e6133ebeb4 Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Tue, 26 Aug 2025 14:45:13 +0800
Subject: [PATCH] 1
---
.env.development | 2
src/views/addSmart/addSmartrecord.vue | 55 +++++++++++++++++++--------
.env.preview | 2
.env | 2
src/api/newshares.js | 9 ++++
5 files changed, 50 insertions(+), 20 deletions(-)
diff --git a/.env b/.env
index 3336558..2d2899e 100644
--- a/.env
+++ b/.env
@@ -1,6 +1,6 @@
NODE_ENV=production
VUE_APP_PREVIEW=true
-VUE_APP_API_BASE_URL= https://api.bycarlyle.com/
+VUE_APP_API_BASE_URL= https://api.stcarlyle.com/
# VUE_APP_API_BASE_URL=http://www.jqydl.com:8091/
# VUE_APP_API_BASE_URL= https://api.dfddgj346.xyz/
# VUE_APP_API_BASE_URL=https://www.rksv.store:8091/
diff --git a/.env.development b/.env.development
index f2e941f..effec43 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@
# VUE_APP_API_BASE_URL=https://api.marwadi.online/
# VUE_APP_API_BASE_URL=https://www.rksv.store:8091/
# VUE_APP_API_BASE_URL=https://api.dfddgj346.xyz/
-VUE_APP_API_BASE_URL=https://api.bycarlyle.com/
+VUE_APP_API_BASE_URL=https://api.stcarlyle.com/
# VUE_APP_API_BASE_URL=https://api.durocaspitall.com/
# VUE_APP_API_BASE_URL=https://api.fidelityio.com/
# VUE_APP_API_BASE_URL= https://www.prudentcapitals.net/
diff --git a/.env.preview b/.env.preview
index b6d5fa0..778236f 100644
--- a/.env.preview
+++ b/.env.preview
@@ -2,6 +2,6 @@
VUE_APP_PREVIEW=true
-VUE_APP_API_BASE_URL=https://api.bycarlyle.com/
+VUE_APP_API_BASE_URL=https://api.stcarlyle.com/
# VUE_APP_API_BASE_URL=http://192.168.10.4:8091/
\ No newline at end of file
diff --git a/src/api/newshares.js b/src/api/newshares.js
index ef51797..18a7480 100644
--- a/src/api/newshares.js
+++ b/src/api/newshares.js
@@ -22,6 +22,7 @@
listIntraday:'/admin/smart/listIntraday.do',//日内审核列表
updateIntraday:'/admin/smart/updateIntraday.do',//日内审核
deleteIntraday:'/admin/smart/deleteIntraday.do',//删除日内
+ rejectIntraday:'/admin/smart/rejectIntraday.do',//驳回日内审核
getStockByKeyWords:'/admin/smart/getStockByKeyWords.do' //股票编码查询
}
@@ -36,7 +37,13 @@
* @param parameter
* @returns {*}
*/
-
+ export function rejectIntraday(parameter) {
+ return request({
+ url: userApi.rejectIntraday,
+ method: 'post',
+ data: qs.stringify(parameter),
+ })
+ }
export function getStockByKeyWords(parameter) {
return request({
url: userApi.getStockByKeyWords,
diff --git a/src/views/addSmart/addSmartrecord.vue b/src/views/addSmart/addSmartrecord.vue
index d843ed8..775a113 100644
--- a/src/views/addSmart/addSmartrecord.vue
+++ b/src/views/addSmart/addSmartrecord.vue
@@ -71,8 +71,18 @@
</div>
</template>
</span>
+ <span slot="priceType" slot-scope="text, record">
+ <template>
+ <div>
+ <span v-if="record.priceType==1">买涨</span>
+ <span v-if="record.priceType==2">买跌</span>
+ </div>
+ </template>
+ </span>
<template slot="action" slot-scope="text, record">
- <a slot="action" href="javascript:;" v-if="record.auditStatus==0" @click="geteditStock(record)">{{ '审核' }}</a>
+ <a slot="action" href="javascript:;" v-if="record.auditStatus==0" @click="geteditStock(record)">{{ '通过' }}</a>
+ <a-divider type="vertical" v-if="record.auditStatus==0" />
+ <a slot="action" href="javascript:;" v-if="record.auditStatus==0" @click="getbhStock(record)">{{ '驳回' }}</a>
<a-divider type="vertical" v-if="record.auditStatus==0" />
<a slot="action" href="javascript:;" @click="getdeleteStock(record,2)">{{ '删除' }}</a>
</template>
@@ -180,7 +190,7 @@
/>
</a-form-item>
</a-col>
- <a-col :md="12" :lg="12" :sm="12">
+ <!-- <a-col :md="12" :lg="12" :sm="12">
<a-form-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select
placeholder="请选择审核状态"
@@ -190,22 +200,23 @@
<a-select-option :value="2">驳回</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-date-picker
+ show-time
+ style="width: 100%"
+ @change="getendTime"
+ v-decorator="['orderTime', { rules: [{ required: true, message: '请选择结束日期' }] }]"
+ format="YYYY-MM-DD HH:mm:ss"
+ >
+ </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
- show-time
- style="width: 100%"
- @change="getendTime"
- v-decorator="['orderTime', { 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-select
@@ -224,7 +235,7 @@
</page-header-wrapper>
</template>
<script>
-import { getdazongshlist,dazongshcheck,listIntraday,updateIntraday,deleteIntraday,getStockByKeyWords } from '@/api/newshares'
+import { getdazongshlist,dazongshcheck,listIntraday,updateIntraday,deleteIntraday,getStockByKeyWords,rejectIntraday } from '@/api/newshares'
import { nextagent } from '@/api/home'
import pick from 'lodash.pick'
import moment from 'moment'
@@ -289,11 +300,13 @@
title: '订单状态',
dataIndex: 'auditStatus',
align: 'center',
+ scopedSlots: { customRender: 'auditStatus' },
},
{
title: '涨跌类型',
dataIndex: 'priceType',
align: 'center',
+ scopedSlots: { customRender: 'priceType' },
},
// {
// title: '手续费',
@@ -334,7 +347,7 @@
key: 'action',
align: 'center',
fixed: 'right',
- width: 150,
+ width: 180,
scopedSlots: { customRender: 'action' },
},
],
@@ -418,6 +431,16 @@
getendTime(date, dateString) {
this.ordertime = dateString
},
+ getbhStock(val) {
+ rejectIntraday({ id: val.id }).then((res) => {
+ if (res.status==0) {
+ this.$message.success(res.msg)
+ } else {
+ this.$message.error(res.msg)
+ }
+ this.getlist()
+ })
+ },
geteditStock(val) {
this.currentdetail = val
this.addUserdialog = true
--
Gitblit v1.9.3