|
|
@@ -82,6 +82,7 @@
|
|
|
<el-table-column align="center" width="70px" label="交易数量" prop="count" />
|
|
|
<el-table-column align="center" width="90px" label="可平仓数量" prop="closeFlat" />
|
|
|
<el-table-column align="center" width="70px" label="平仓数量" prop="flatTotal" />
|
|
|
+ <el-table-column align="center" width="70px" label="执行数量" prop="allCount" />
|
|
|
<el-table-column align="center" label="客户信息" width="80px">
|
|
|
<template slot-scope="scope">
|
|
|
<el-image-viewer
|
|
|
@@ -117,7 +118,7 @@
|
|
|
<!-- <el-button v-permission="['trade:trade:edit']" v-else-if=" scope.row.status == 1" type="danger" size="small" @click="freezeOrActivationBtn(scope.row,'2')">完成</el-button> -->
|
|
|
<!-- <el-button v-permission="['trade:trade:edit']" v-if=" scope.row.status == 1" type="success" size="small" @click="handleUpdate(scope.row)">更新节点</el-button> -->
|
|
|
<el-button v-permission="['trade:trade:deal']" v-if=" scope.row.status == 2" type="success" size="small" @click="handleDeal(scope.row)">成交</el-button>
|
|
|
- <el-button v-permission="['trade:trade:modify']" v-if=" scope.row.status >= 2" type="success" size="small" @click="handleModify(scope.row)" >解冻保证金</el-button>
|
|
|
+ <el-button v-permission="['trade:trade:modify']" v-if=" scope.row.status >= 2&&scope.row.bond!=0" type="success" size="small" @click="handleModify(scope.row)" >解冻保证金</el-button>
|
|
|
<el-button v-permission="['trade:trade:modify']" v-if=" scope.row.depositNotPaid>0" type="success" size="small" @click="handlesupply(scope.row)" >补充保证金</el-button>
|
|
|
<el-button v-permission="['trade:trade:finish']" v-if=" scope.row.status==3" type="success" size="small" @click="handlefinish(scope.row)" >完成</el-button>
|
|
|
<el-button v-permission="['trade:trade:flat']" v-if=" scope.row.status == 3" type="success" size="small" @click="handleFlat(scope.row)" >平仓</el-button>
|
|
|
@@ -310,6 +311,28 @@
|
|
|
<el-button :loading="submiting" type="primary" @click="flatData">确定</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
+ <!-- 完成对话框 -->
|
|
|
+ <el-dialog
|
|
|
+ :visible.sync="finishVisible"
|
|
|
+ title="完成">
|
|
|
+ <el-form
|
|
|
+ ref="finishForm"
|
|
|
+ :rules="rulesfinish"
|
|
|
+ :model="finishForm"
|
|
|
+ status-icon
|
|
|
+ label-position="left"
|
|
|
+ label-width="150px"
|
|
|
+ style="width: 600px; margin-left:150px;"
|
|
|
+ >
|
|
|
+ <el-form-item style="margin-top:30px" label="实际执行数量" prop ="allCount">
|
|
|
+ <el-input v-model="finishForm.allCount"/>
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+ <div slot="footer" class="dialog-footer">
|
|
|
+ <el-button @click="finishVisible = false">取消</el-button>
|
|
|
+ <el-button :loading="submiting" type="primary" @click="finishData(finishForm)">确定</el-button>
|
|
|
+ </div>
|
|
|
+ </el-dialog>
|
|
|
<!--客户信息对话框 -->
|
|
|
<el-dialog
|
|
|
:visible.sync="informationFormVisible"
|
|
|
@@ -513,10 +536,10 @@ export default {
|
|
|
depositNotPaid: '',
|
|
|
usedDeposit: '',
|
|
|
flatForm: {
|
|
|
-
|
|
|
},
|
|
|
informationForm: {
|
|
|
-
|
|
|
+ },
|
|
|
+ finishForm: {
|
|
|
},
|
|
|
uploadPath,
|
|
|
readonly: true,
|
|
|
@@ -534,6 +557,7 @@ export default {
|
|
|
priceVisible: false,
|
|
|
modifyVisible: false,
|
|
|
flatVisible: false,
|
|
|
+ finishVisible: false,
|
|
|
informationFormVisible: false,
|
|
|
rules: {
|
|
|
|
|
|
@@ -547,6 +571,9 @@ export default {
|
|
|
flatTotal: [{ required: true, message: '平仓吨数不能为空', trigger: 'blur' }],
|
|
|
flatBasis: [{ required: true, message: '平仓基差不能为空', trigger: 'blur' }]
|
|
|
},
|
|
|
+ rulesfinish: {
|
|
|
+ allCount: [{ required: true, message: '实际执行数量不能为空', trigger: 'blur' }]
|
|
|
+ },
|
|
|
tradeStatusMap: [],
|
|
|
contractListImg: [],
|
|
|
srcList: []
|
|
|
@@ -926,30 +953,32 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
handlefinish(row) {
|
|
|
- this.$confirm('确认完成，是否继续?', '提示', {
|
|
|
- confirmButtonText: '确定',
|
|
|
- cancelButtonText: '取消',
|
|
|
- type: 'warning'
|
|
|
- }).then(() => {
|
|
|
- finish(row.id, 4).then(() => {
|
|
|
- this.submiting = false
|
|
|
- this.$notify.success({
|
|
|
- title: '成功',
|
|
|
- message: '完成成功'
|
|
|
- })
|
|
|
- this.getList()
|
|
|
- })
|
|
|
- .catch(response => {
|
|
|
- this.$notify.error({
|
|
|
- title: '失败',
|
|
|
- message: response.data.errmsg
|
|
|
- })
|
|
|
+ this.finishForm.id=row.id
|
|
|
+ this.finishVisible=true
|
|
|
+ },
|
|
|
+ finishData(row) {
|
|
|
+ this.$refs['finishForm'].validate(valid => {
|
|
|
+ if (valid) {
|
|
|
+ console.log(row)
|
|
|
+ this.submiting = true
|
|
|
+ finish(row.id, row.allCount, 4).then(() => {
|
|
|
+ this.finishVisible = false
|
|
|
this.submiting = false
|
|
|
+ this.$notify.success({
|
|
|
+ title: '成功',
|
|
|
+ message: '完成成功'
|
|
|
+ })
|
|
|
+ this.getList()
|
|
|
})
|
|
|
+ .catch(response => {
|
|
|
+ this.$notify.error({
|
|
|
+ title: '失败',
|
|
|
+ message: response.data.errmsg
|
|
|
+ })
|
|
|
+ this.submiting = false
|
|
|
+ })
|
|
|
+ }
|
|
|
})
|
|
|
- .catch(response => {
|
|
|
- return false
|
|
|
- })
|
|
|
},
|
|
|
flatData() {
|
|
|
this.$refs['flatForm'].validate(valid => {
|
zhangyuewww