Commit cdf9f93a authored by zhengke's avatar zhengke

no message

parent ba012b52
...@@ -72,15 +72,18 @@ ...@@ -72,15 +72,18 @@
color: #2961FE; color: #2961FE;
} }
.agreement-IncomeMoney-box{ .agreement-IncomeMoney-box{
/* position: relative; */
}
.agreement-IncomeMoney-box .numIcon{
position: relative; position: relative;
} }
.agreement-IncomeMoney-pop{ .agreement-IncomeMoney-pop{
position: absolute; position: absolute;
top: -15px; top: -15px;
left: 80px; left: 30px;
z-index: 1; z-index: 1;
background: #fff; background: #fff;
padding: 3px 19px 5px 19px; padding: 10px 19px 10px 19px;
Box-shadow:5px 5px 10px 5px #ccc; Box-shadow:5px 5px 10px 5px #ccc;
} }
/deep/.el-table .cell{ /deep/.el-table .cell{
...@@ -185,7 +188,7 @@ ...@@ -185,7 +188,7 @@
{{scope.row.IncomeMoney}} {{scope.row.IncomeMoney}}
<i v-if="scope.row.OrderStatus==1" <i v-if="scope.row.OrderStatus==1"
@click="makeAdocument(scope.row,scope.$index,1)" @click="makeAdocument(scope.row,scope.$index,1)"
class="iconfont iconjia- numIcon"></i> class="iconfont iconjia- numIcon">
<div v-show="scope.row.actuallyReceived" class="agreement-IncomeMoney-pop"> <div v-show="scope.row.actuallyReceived" class="agreement-IncomeMoney-pop">
<div class="float-flag-shape"></div> <div class="float-flag-shape"></div>
<el-checkbox-group v-model="scope.row.checkList" <el-checkbox-group v-model="scope.row.checkList"
...@@ -194,11 +197,13 @@ ...@@ -194,11 +197,13 @@
:label="item.Id">{{item.Name}}</el-checkbox> :label="item.Id">{{item.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
<div class="agreement-Cancel"> <div class="agreement-Cancel">
<span @click="popCancelClick(scope.row,scope.$index,1)">取消</span> <span @click.stop="popCancelClick(scope.row,scope.$index,1)">取消</span>
<span @click="popClick(scope.row,scope.$index,1)">确定</span> <span @click.stop="popClick(scope.row,scope.$index,1)">确定</span>
</div> </div>
</div> </div>
</i>
</div> </div>
...@@ -214,7 +219,7 @@ ...@@ -214,7 +219,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div class="agreement-IncomeMoney-box"> <div class="agreement-IncomeMoney-box">
{{scope.row.PayMoney}}<i v-if="scope.row.OrderStatus==1" {{scope.row.PayMoney}}<i v-if="scope.row.OrderStatus==1"
@click="makeAdocument(scope.row,scope.$index,3)" class="iconfont iconjia- numIcon"></i> @click="makeAdocument(scope.row,scope.$index,3)" class="iconfont iconjia- numIcon">
<div v-show="scope.row.cost" class="agreement-IncomeMoney-pop"> <div v-show="scope.row.cost" class="agreement-IncomeMoney-pop">
<div class="float-flag-shape"></div> <div class="float-flag-shape"></div>
<el-radio-group v-model="scope.row.selectedType" @change="clickMultipleChoice(scope.row,scope.$index,3)"> <el-radio-group v-model="scope.row.selectedType" @change="clickMultipleChoice(scope.row,scope.$index,3)">
...@@ -222,11 +227,15 @@ ...@@ -222,11 +227,15 @@
:label="item.Id">{{item.Name}}</el-radio> :label="item.Id">{{item.Name}}</el-radio>
</el-radio-group> </el-radio-group>
<div class="agreement-Cancel"> <div class="agreement-Cancel">
<span @click="popCancelClick(scope.row,scope.$index,3)">取消</span> <span @click.stop="popCancelClick(scope.row,scope.$index,3)">取消</span>
<span @click="popClick(scope.row,scope.$index,3)">确定</span> <span @click.stop="popClick(scope.row,scope.$index,3)">确定</span>
</div> </div>
</div> </div>
</i>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -416,16 +425,12 @@ ...@@ -416,16 +425,12 @@
methods: { methods: {
// 取消 // 取消
popCancelClick(row, index, num){ popCancelClick(row, index, num){
if(num==1){
this.dataList[index].actuallyReceived =false
}
if(num==3){
this.dataList[index].cost =false
}
this.dataList.forEach(item=>{ this.dataList.forEach(item=>{
item.checkList = [] item.checkList = []
item.MultipleChoiceList = [] item.MultipleChoiceList = []
item.selectedType = '' item.selectedType = ''
item.actuallyReceived =false
item.cost =false
}) })
}, },
// 确定弹窗 // 确定弹窗
......
...@@ -41,6 +41,10 @@ ...@@ -41,6 +41,10 @@
.income_2{ .income_2{
color: #3FC4FF; color: #3FC4FF;
} }
.finance-content{
height: 600px;
overflow-y: scroll;
}
</style> </style>
<template> <template>
<div class="Business"> <div class="Business">
...@@ -74,7 +78,7 @@ ...@@ -74,7 +78,7 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<div class="page-content"> <div class="page-content finance-content">
<el-table <el-table
v-loading="loading" v-loading="loading"
stripe stripe
......
...@@ -507,7 +507,7 @@ ...@@ -507,7 +507,7 @@
<el-col :span="8" v-if="name=='新建机票订单'||name=='编辑机票订单'"> <el-col :span="8" v-if="name=='新建机票订单'||name=='编辑机票订单'">
<div class="MyEditForm-item"> <div class="MyEditForm-item">
<el-form-item label="出行概述" prop="StartCityName"> <el-form-item label="出行概述" prop="StartCityName">
<el-input placeholder="请输入出发时间、出发地、目的地" v-model="form.StartCityName"></el-input> <el-input placeholder="出发时间、出发地、目的地" v-model="form.StartCityName"></el-input>
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
...@@ -1213,7 +1213,7 @@ ...@@ -1213,7 +1213,7 @@
}, ], }, ],
StartCityName: [{ StartCityName: [{
required: true, required: true,
message: "请输入出时间、出发地、目的地", message: "请输入出时间、出发地、目的地",
trigger: "blur" trigger: "blur"
}, ], }, ],
// EndCityName: [ // EndCityName: [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment