Commit c8d85167 authored by youjie's avatar youjie

no message

parent 5d1a27a6
......@@ -464,32 +464,7 @@ tr._item_list td:last-child {
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="目的地">
<el-select filterable v-model="msg.PlaceId" @change="getLineTeamList(msg.LineId,msg.PlaceId)">
<el-option :value="0" label="不限"></el-option>
<el-option
v-for="(item,index) in PlaceList"
:label="item.PlaceName"
:value="item.PlaceID"
:key="index+1000"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="系列:">
<el-select filterable v-model="msg.LineTeamId" class>
<el-option :value="0" label="不限"></el-option>
<el-option
v-for="item in LineTeamList"
:label="item.LtName"
:value="item.LtID"
:key="item.LtName"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="团号:">
<el-input v-model="msg.TCNUM" class></el-input>
......@@ -544,7 +519,54 @@ tr._item_list td:last-child {
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="结团状态 :">
<el-select v-model="msg.TravelStatus" class="w150">
<el-option value="-1" label="不限"></el-option>
<el-option value="1" label="未结团"></el-option>
<el-option value="2" label="已结团"></el-option>
<el-option value="5" label="待结团审核"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="毛利率 :">
<el-select v-model="msg.Q_MaoLi" class="w150">
<el-option value="-1" label="不限"></el-option>
<el-option value="5" label=">=5%"></el-option>
<el-option value="10" label=">=10%"></el-option>
<el-option value="15" label=">=15%"></el-option>
<el-option value="20" label=">=20%"></el-option>
</el-select>
</el-form-item>
</el-col>
<template v-if="heightQueryBox">
<el-col :span="4">
<el-form-item label="目的地">
<el-select filterable v-model="msg.PlaceId" @change="getLineTeamList(msg.LineId,msg.PlaceId)">
<el-option :value="0" label="不限"></el-option>
<el-option
v-for="(item,index) in PlaceList"
:label="item.PlaceName"
:value="item.PlaceID"
:key="index+1000"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="系列:">
<el-select filterable v-model="msg.LineTeamId" class>
<el-option :value="0" label="不限"></el-option>
<el-option
v-for="item in LineTeamList"
:label="item.LtName"
:value="item.LtID"
:key="item.LtName"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="状态:">
<el-select v-model="msg.QueryCondition" filterable class="w150">
......@@ -1023,6 +1045,8 @@ export default {
isShowType:true,
isShowGrounding:true,
msg: {
TravelStatus: '-1',
Q_MaoLi: '-1',
Is_Open:-1,
pageIndex: 1,
pageSize: 16,
......@@ -2502,9 +2526,9 @@ export default {
if(rowData.MaoLiRate < 0 && columnName=="MaoLiRate"){
return "column-cell-class-name-test-red"
}
if(rowData.ShiJiLiRun < 0 && columnName=="ShiJiLiRun"){
if(rowData.MaoLiRate >=15 && columnName=="ShiJiLiRun"){
return "column-cell-class-name-test-blue"
if((rowData.ShiJiLiRun < 0||rowData.MaoLiRate.split('%')[0] >=15) && columnName=="ShiJiLiRun"){
if(rowData.MaoLiRate.split('%')[0] >=15){
return "column-cell-class-name-test"
}else{
return "column-cell-class-name-test-red"
}
......
......@@ -116,7 +116,7 @@
</el-table-column>
<el-table-column v-if="active==2"
prop=""
label="审批信息">
label="审批信息" width="100">
<template slot-scope="scope">
<p>{{scope.row.AuditEmpName}}</p>
<p>{{scope.row.OutGroupAuditDate}}</p>
......
......@@ -775,7 +775,7 @@
class="row-c cursor-pointer radius5 change py5"
@click="clickCorrelation(item)"
>
<span class="c059FF6">关联OP</span>
<span class="c059FF6">修改关联</span>
</div>
</div>
<!-- <div v-if="item.OrderStatus==2" class="column-jac px15 bgE8F5E9 radius5 ml fz12 pa20 flex-s c20C997">
......
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