Skip to content

S
SuperMan
Commit 8a674765 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 72c2b183 099d032e
Show whitespace changes
Inline Side-by-side
Showing with 973 additions and 750 deletions
src/components/SalesModule/Common/addTeamman.vue
View file @ 8a674765
...@@ -65,15 +65,15 @@ ...@@ -65,15 +65,15 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</div> </div>
<!-- <div class="MyEditForm-item" > <div class="MyEditForm-item" >
<el-form-item label="权限" class="label-pad-left form-check"> <el-form-item label="权限" class="label-pad-left form-check">
<div class="pad-left-10"> <div class="pad-left-10">
<el-radio v-model="form.IsRead" :label="1">只读</el-radio> <el-radio v-model="form.IsRead" :label="1">只读</el-radio>
<el-radio v-model="form.IsRead" :label="0">读写</el-radio> <el-radio v-model="form.IsRead" :label="0">读写</el-radio>
</div> </div>
</el-form-item> </el-form-item>
</div> --> </div>
<div class="MyEditForm-item"> <!-- <div class="MyEditForm-item">
<el-form-item label="同时添加至" class="label-pad-left form-check"> <el-form-item label="同时添加至" class="label-pad-left form-check">
<div class="pad-left-10"> <div class="pad-left-10">
<el-checkbox-group v-model="TransferOther"> <el-checkbox-group v-model="TransferOther">
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
</el-checkbox-group> </el-checkbox-group>
</div> </div>
</el-form-item> </el-form-item>
</div> </div> -->
</el-form> </el-form>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -134,13 +134,13 @@ ...@@ -134,13 +134,13 @@
}); });
this.form.EmpIds = str.substring(0, str.length - 1); this.form.EmpIds = str.substring(0, str.length - 1);
} }
if (this.TransferOther.length < 1) { // if (this.TransferOther.length < 1) {
let str2 = ""; // let str2 = "";
this.TransferOther.map((x, i) => { // this.TransferOther.map((x, i) => {
str2 = str2 + x + ","; // str2 = str2 + x + ",";
}); // });
this.form.TransferOther = str2.substring(0, str2.length - 1); // this.form.TransferOther = str2.substring(0, str2.length - 1);
} // }
this.loading = true this.loading = true
this.crmapipost("/api/Customer/AddTeamMembers", this.form, (res) => { this.crmapipost("/api/Customer/AddTeamMembers", this.form, (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
CustomerId: 0, CustomerId: 0,
EmpIds: [], EmpIds: [],
IsRead: 0, IsRead: 0,
TransferOther: [], TransferOther: '',
}; };
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
}, },
......
src/components/SalesVisa/VisaProduct.vue
View file @ 8a674765
...@@ -293,71 +293,76 @@ ...@@ -293,71 +293,76 @@
<button class="hollowFixedBtn" @click="getList()">查询</button> <button class="hollowFixedBtn" @click="getList()">查询</button>
<!-- <button class="normalBtn" v-show="!buttonshow" @click="cancelEdit(),addShow=true" v-if="msg.isFinacial==1">添加</button> --> <!-- <button class="normalBtn" v-show="!buttonshow" @click="cancelEdit(),addShow=true" v-if="msg.isFinacial==1">添加</button> -->
<button class="normalBtn" @click="AddVisaProduct" v-if="msg.isFinacial==1">添加</button> <button class="normalBtn" @click="AddVisaProduct" v-if="msg.isFinacial==1">添加</button>
</li> </li>
</ul> </ul>
</div> </div>
<el-table
<table class="VisaProductTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading"> ref="multipleTable"
<tr> :data="dataList"
<th width="5%">公司</th> tooltip-effect="dark"
<th width="10%">产品名称</th> style="width: 100%"
<th width="5%">签证类型</th> >
<th width="12%">价格有效日期</th> <el-table-column label="公司" prop="BranchName"></el-table-column>
<th width="8%">成本价</th> <el-table-column label="产品名称" prop="Name"></el-table-column>
<th width="7%">同业价</th> <el-table-column label="签证类型" prop="">
<th width="8%">直客价</th> <template slot-scope="scope">
<th width="6%">状态</th> <span v-if="scope.row.VisaType==1" class="geqian">个签</span>
<th width="6%">订单数</th>
<!-- <th width="12%">总人数（剩余人数）</th> -->
<th width="8%">创建者</th>
<th width="8%">广告图</th>
<th width="7%">申请表</th>
<th width="14%">操作</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.BranchName}}</td>
<td>{{item.Name}}</td>
<td>
<span v-if="item.VisaType==1" class="geqian">个签</span>
<span v-else class="tuanqian">团签</span> <span v-else class="tuanqian">团签</span>
</td> </template>
<td> </el-table-column>
<el-table-column label="价格有效日期" prop="" width="200">
<template slot-scope="scope">
<p> <p>
结束日期：<span class="fbold">{{item.SendVisaDate}}</span> 结束日期：<span class="fbold">{{scope.row.SendVisaDate}}</span>
</p> </p>
<p> <p>
开始日期：<span class="fbold">{{item.EffectiveStartDate}}</span> 开始日期：<span class="fbold">{{scope.row.EffectiveStartDate}}</span>
</p> </p>
</template>
</td> </el-table-column>
<td> <el-table-column label="成本价" prop="">
<span class="totalPrice fbold" style="color: #47BF8C;">￥{{moneyFormat(item.CostPrice)}}</span> <template slot-scope="scope">
</td> <span class="totalPrice fbold" style="color: #47BF8C;">￥{{moneyFormat(scope.row.CostPrice)}}</span>
<td> </template>
<span class="totalPrice fbold" style="color: #f90;">￥{{moneyFormat(item.VisaPrice)}}</span> </el-table-column>
</td> <el-table-column label="同业价" prop="">
<td> <template slot-scope="scope">
<span class="totalPrice fbold" style="color: #f90;">￥{{moneyFormat(item.VisaB2CPrice)}}</span> <span class="totalPrice fbold" style="color: #f90;">￥{{moneyFormat(scope.row.VisaPrice)}}</span>
</td> </template>
<td> </el-table-column>
<i v-if="item.VisaStatus==1" class="iconfont icon-shangjia" style="color:#4BCA81;"></i> <el-table-column label="直客价" prop="">
<template slot-scope="scope">
<span class="totalPrice fbold" style="color: #f90;">￥{{moneyFormat(scope.row.VisaB2CPrice)}}</span>
</template>
</el-table-column>
<el-table-column label="状态" prop="">
<template slot-scope="scope">
<i v-if="scope.row.VisaStatus==1" class="iconfont icon-shangjia" style="color:#4BCA81;"></i>
<i v-else class="iconfont icon-xiajia" style="color:#4BCA81;"></i> <i v-else class="iconfont icon-xiajia" style="color:#4BCA81;"></i>
{{item.VisaStatus==1?"上架":"下架"}} {{scope.row.VisaStatus==1?"上架":"下架"}}
</td> </template>
<td> </el-table-column>
<span class="orderNum" @click="goUrl(item)">{{item.OrderNum}}</span> <el-table-column label="订单数" prop="">
</td> <template slot-scope="scope">
<!-- <td> <span class="orderNum" @click="goUrl(scope.row)">{{scope.row.OrderNum}}</span>
<span class="peopleNum">{{item.PeopleNum}}(<span class="surplusNum">{{item.SurplusNum}}</span>)</span> </template>
</td>--> </el-table-column>
<td> <!-- <el-table-column label="总人数（剩余人数）" prop="">
<img v-if="!item.CreatePhoto" src="../../assets/img/litheader.png"> <template slot-scope="scope">
<img v-if="item.CreatePhoto" :onerror="defaultImg" :src="item.CreatePhoto"> <span class="peopleNum">{{scope.row.PeopleNum}}(<span class="surplusNum">{{scope.row.SurplusNum}}</span>)</span>
<span class="createName">{{item.CreateName}}</span> </template>
</td> </el-table-column> -->
<td> <el-table-column label="创建者" prop="">
<p v-for="(item2, index2) in item.AdvertisingFileList" :key="index2"> <template slot-scope="scope">
<!-- <img v-if="!scope.row.CreatePhoto" src="../../assets/img/litheader.png">
<img v-if="scope.row.CreatePhoto" :onerror="defaultImg" :src="scope.row.CreatePhoto"> -->
<span class="createName">{{scope.row.CreateName}}</span>
</template>
</el-table-column>
<el-table-column label="广告图" prop="">
<template slot-scope="scope">
<p v-for="(item2, index2) in scope.row.AdvertisingFileList" :key="index2">
<span <span
style="cursor:pointer;text-decoration: underline;" style="cursor:pointer;text-decoration: underline;"
@click="downloadFile(item2)" @click="downloadFile(item2)"
...@@ -365,22 +370,24 @@ ...@@ -365,22 +370,24 @@
<i <i
class="iconfont icon-Close" class="iconfont icon-Close"
style="font-size:12px;cursor:pointer;" style="font-size:12px;cursor:pointer;"
@click="delUnpload(item.Id,item2,'广告图',1)" @click="delUnpload(scope.row.Id,item2,'广告图',1)"
></i> ></i>
</p> </p>
<el-upload <el-upload
:http-request="uploadImg" :http-request="uploadImg"
:data="item" :data="scope.row"
ref="upload" ref="upload"
:multiple="false" :multiple="false"
:show-file-list="false" :show-file-list="false"
action action
> >
<span style="color:#00C6FF;cursor:pointer;" @click="saveitem(item.Id,1)">上传广告图</span> <span style="color:#00C6FF;cursor:pointer;" @click="saveitem(scope.row.Id,1)">上传广告图</span>
</el-upload> </el-upload>
</td> </template>
<td> </el-table-column>
<p v-for="(item2, index2) in item.ApplyForCounterfoilList" :key="index2+100"> <el-table-column label="申请表" prop="">
<template slot-scope="scope">
<p v-for="(item2, index2) in scope.row.ApplyForCounterfoilList" :key="index2+100">
<span <span
style="cursor:pointer;text-decoration: underline;" style="cursor:pointer;text-decoration: underline;"
@click="downloadFile(item2)" @click="downloadFile(item2)"
...@@ -388,34 +395,36 @@ ...@@ -388,34 +395,36 @@
<i <i
class="iconfont icon-Close" class="iconfont icon-Close"
style="font-size:12px;cursor:pointer;" style="font-size:12px;cursor:pointer;"
@click="delUnpload(item.Id,item2,'申请表',2)" @click="delUnpload(scope.row.Id,item2,'申请表',2)"
></i> ></i>
</p> </p>
<el-upload <el-upload
:http-request="uploadImg" :http-request="uploadImg"
:data="item" :data="scope.row"
ref="upload" ref="upload"
:multiple="false" :multiple="false"
:show-file-list="false" :show-file-list="false"
action action
> >
<span style="color:#00C6FF;cursor:pointer;" @click="saveitem(item.Id,2)">上传申请表</span> <span style="color:#00C6FF;cursor:pointer;" @click="saveitem(scope.row.Id,2)">上传申请表</span>
</el-upload> </el-upload>
</td> </template>
<td class="groupTourOrderIcon"> </el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button-group> <el-button-group>
<!-- <el-tooltip <!-- <el-tooltip
class="item" class="item"
effect="dark" effect="dark"
content="修改" content="修改"
placement="top-start" placement="top-start"
v-if="item.SendVisaStatus==1&&msg.isFinacial==1" v-if="scope.row.SendVisaStatus==1&&msg.isFinacial==1"
> >
<el-button v-show="!buttonshow" <el-button v-show="!buttonshow"
type="primary" type="primary"
style="background:#409EFF; border-color:#409EFF" style="background:#409EFF; border-color:#409EFF"
icon="iconfont icon-img_bianji_small" icon="iconfont icon-img_bianji_small"
@click="getDetail(item)" @click="getDetail(scope.row)"
></el-button> ></el-button>
</el-tooltip> --> </el-tooltip> -->
<div style="display:inline-block"> <div style="display:inline-block">
...@@ -424,13 +433,13 @@ ...@@ -424,13 +433,13 @@
effect="dark" effect="dark"
content="修改" content="修改"
placement="top-start" placement="top-start"
v-if="item.SendVisaStatus==1&&msg.isFinacial==1" v-if="scope.row.SendVisaStatus==1&&msg.isFinacial==1"
> >
<el-button <el-button
type="primary" type="primary"
style="background:#409EFF; border-color:#409EFF" style="background:#409EFF; border-color:#409EFF"
icon="iconfont icon-img_bianji_small" icon="iconfont icon-img_bianji_small"
@click="EditVisaProduct(item)" @click="EditVisaProduct(scope.row)"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
...@@ -443,7 +452,7 @@ ...@@ -443,7 +452,7 @@
<el-button <el-button
style="background:#E95252; border-color:#E95252;color:#fff" style="background:#E95252; border-color:#E95252;color:#fff"
icon="iconfont icon-chakan" icon="iconfont icon-chakan"
@click="ChaKan(item)" @click="ChaKan(scope.row)"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
</div> </div>
...@@ -452,7 +461,7 @@ ...@@ -452,7 +461,7 @@
<el-button <el-button
type="primary" type="primary"
style="background:#25C1C3; border-color:#25C1C3" style="background:#25C1C3; border-color:#25C1C3"
@click="goUrl(item)" @click="goUrl(scope.row)"
icon="iconfont icon-img_cz" icon="iconfont icon-img_cz"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
...@@ -460,30 +469,30 @@ ...@@ -460,30 +469,30 @@
effect="dark" effect="dark"
content="签证列表" content="签证列表"
placement="top-start" placement="top-start"
v-if="item.VisaManagementId>0" v-if="scope.row.VisaManagementId>0"
> >
<el-button <el-button
type="primary" type="primary"
@click="goUrlVisaList(item)" @click="goUrlVisaList(scope.row)"
style="background:#47BF8C; border-color:#47BF8C" style="background:#47BF8C; border-color:#47BF8C"
icon="iconfont icon-biaoge" icon="iconfont icon-biaoge"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
v-if="item.OrderNum>0&&msg.isFinacial==1" v-if="scope.row.OrderNum>0&&msg.isFinacial==1"
effect="dark" effect="dark"
content="结算" content="结算"
placement="top-start" placement="top-start"
> >
<el-button <el-button
type="primary" type="primary"
@click="goUrlJS(item)" @click="goUrlJS(scope.row)"
style="background:#5EBB64; border-color:#5EBB64" style="background:#5EBB64; border-color:#5EBB64"
icon="iconfont icon-qian" icon="iconfont icon-qian"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
v-if="item.VisaStatus==1&&msg.isFinacial==1" v-if="scope.row.VisaStatus==1&&msg.isFinacial==1"
effect="dark" effect="dark"
content="下架" content="下架"
placement="top-start" placement="top-start"
...@@ -492,11 +501,11 @@ ...@@ -492,11 +501,11 @@
type="primary" type="primary"
style="background:#F0A748; border-color:#F0A748" style="background:#F0A748; border-color:#F0A748"
icon="iconfont icon-xiajia1" icon="iconfont icon-xiajia1"
@click="updateVisaStatus(item)" @click="updateVisaStatus(scope.row)"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
v-if="item.VisaStatus==2&&item.SendVisaStatus==1&&msg.isFinacial==1" v-if="scope.row.VisaStatus==2&&scope.row.SendVisaStatus==1&&msg.isFinacial==1"
effect="dark" effect="dark"
content="上架" content="上架"
placement="top-start" placement="top-start"
...@@ -505,16 +514,14 @@ ...@@ -505,16 +514,14 @@
type="primary" type="primary"
style="background:#F0A748; border-color:#F0A748" style="background:#F0A748; border-color:#F0A748"
icon="iconfont icon-shangjia1" icon="iconfont icon-shangjia1"
@click="updateVisaStatus(item)" @click="updateVisaStatus(scope.row)"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
</el-button-group> </el-button-group>
</td> </template>
</tr> </el-table-column>
<tr v-show="dataList.length==0"> </el-table>
<td v-show="dataList.length==0" colspan="10" align="center">暂无数据</td>
</tr>
</table>
<el-pagination <el-pagination
background background
...@@ -628,7 +635,7 @@ export default { ...@@ -628,7 +635,7 @@ export default {
ProductID: 0, ProductID: 0,
VisaStatus: "-1", VisaStatus: "-1",
isFinacial: 1, isFinacial: 1,
BranchId: "-1" BranchId: "-1",
}, },
addMsg: { addMsg: {
Id: 0, Id: 0,
...@@ -692,6 +699,7 @@ export default { ...@@ -692,6 +699,7 @@ export default {
VisaManagementList: [], VisaManagementList: [],
// buttonshow:false, // buttonshow:false,
Type:0, Type:0,
}; };
}, },
created(){ created(){
......
src/components/SalesVisa/VisaProductOrder.vue
View file @ 8a674765
...@@ -644,6 +644,7 @@ ...@@ -644,6 +644,7 @@
.VisaProductTable tr { .VisaProductTable tr {
background: #fff; background: #fff;
text-align: left; text-align: left;
border: 1px solid #cccccc;
} }
.VisaProductTable tr td { .VisaProductTable tr td {
...@@ -840,6 +841,15 @@ ...@@ -840,6 +841,15 @@
<el-option label="待付款" value="3" key='3'></el-option> <el-option label="待付款" value="3" key='3'></el-option>
</el-select> </el-select>
</span></li> </span></li>
<li>
<span>
<em>完结状态</em>
<el-select v-model='msg.IsFinish'>
<el-option label="不限" value="0" key='0'></el-option>
<el-option label="已完结" value="1" key='1'></el-option>
<el-option label="未完结" value="2" key='2'></el-option>
</el-select>
</span></li>
<li><span><em>报入日期</em> <li><span><em>报入日期</em>
<el-date-picker v-model='msg.StartTime' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='msg.StartTime' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
- -
...@@ -852,7 +862,8 @@ ...@@ -852,7 +862,8 @@
<li> <li>
<button class="hollowFixedBtn" @click="getList()">查询</button> <button class="hollowFixedBtn" @click="getList()">查询</button>
<button class="hollowFixedBtn" @click="goUrlCb">查看成本</button> <button class="hollowFixedBtn" @click="goUrlCb">查看成本</button>
<el-button v-if="IsSupperOrderEdit" class="hollowFixedBtn" @click="setCompleted"
:loading="CompletedLoading">一键完结</el-button>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -871,7 +882,22 @@ ...@@ -871,7 +882,22 @@
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
<span>成本：{{moneyFormat(CostMoney)}}</span> <span>成本：{{moneyFormat(CostMoney)}}</span>
</div> </div>
<table class="VisaProductTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'> <el-table v-loading='loading'
ref="multipleTable"
:data="dataList"
tooltip-effect="dark"
style="width: 100%"
row-key="Id"
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
:selectable="selectable"
:reserve-selection="true" v-if="IsSupperOrderEdit"/>
</el-table-column>
<el-table-column :label="IsSupperOrderEdit?'全选':''">
<template slot-scope="scope">
<table class="VisaProductTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th width="11%">单号</th> <th width="11%">单号</th>
<th width="6%">业务员</th> <th width="6%">业务员</th>
...@@ -890,96 +916,115 @@ ...@@ -890,96 +916,115 @@
<th width="5%">在途</th> <th width="5%">在途</th>
<th width="4%">订单状态</th> <th width="4%">订单状态</th>
<th width="5%">状态</th> <th width="5%">状态</th>
<th width="14%">操作</th> <th width="4%">完结状态</th>
<th width="10%">操作</th>
</tr> </tr>
<tbody v-for='(item,index) in dataList'> <tbody>
<tr> <tr>
<td> <td>
<span class="fz16">{{item.VisaTCNUM}}({{item.Id}})</span> <span class="fz16">{{scope.row.VisaTCNUM}}({{scope.row.Id}})</span>
</td> </td>
<td><img v-if='!item.CreatePhoto' src="../../assets/img/litheader.png" /> <td><img v-if='!scope.row.CreatePhoto' src="../../assets/img/litheader.png" />
<img v-if='item.CreatePhoto' :onerror="defaultImg" :src='item.CreatePhoto' /> <img v-if='scope.row.CreatePhoto' :onerror="defaultImg" :src='scope.row.CreatePhoto' />
<span class="VO_createName">{{item.CreateName}}</span></td> <span class="VO_createName">{{scope.row.CreateName}}</span></td>
<td>{{item.OutBranchName}}</td> <td>{{scope.row.OutBranchName}}</td>
<td class="fz16"> <td class="fz16">
<span class="fz16">{{item.PeopleNum}}</span> <span class="fz16">{{scope.row.PeopleNum}}</span>
</td> </td>
<td> <td>
<span class="fz16">{{item.DepartDate}}</span> <span class="fz16">{{scope.row.DepartDate}}</span>
</td> </td>
<td> <td>
<span class="fz16">{{item.CreateTime}}</span> <span class="fz16">{{scope.row.CreateTime}}</span>
</td> </td>
<td> <td>
<span class="totalPrice">￥{{moneyFormat(item.TotalPrice)}}</span> <span class="totalPrice">￥{{moneyFormat(scope.row.TotalPrice)}}</span>
</td> </td>
<td> <td>
<span class="income">￥{{moneyFormat(item.Income)}}</span> <span class="income">￥{{moneyFormat(scope.row.Income)}}</span>
</td> </td>
<td> <td>
<span>￥{{moneyFormat(item.RefundMoney)}}</span> <span>￥{{moneyFormat(scope.row.RefundMoney)}}</span>
</td> </td>
<td> <td>
<span>￥{{moneyFormat(item.PlatformTax)}}</span> <span>￥{{moneyFormat(scope.row.PlatformTax)}}</span>
</td> </td>
<td> <td>
<span>￥{{moneyFormat(item.CostMoney)}}</span> <span>￥{{moneyFormat(scope.row.CostMoney)}}</span>
</td> </td>
<td> <td>
<span>￥{{moneyFormat(item.DiscountMoney)}}</span> <span>￥{{moneyFormat(scope.row.DiscountMoney)}}</span>
</td> </td>
<td> <td>
<span>￥{{moneyFormat(item.DueInMoney)}}</span> <span>￥{{moneyFormat(scope.row.DueInMoney)}}</span>
</td> </td>
<td> <td>
<span>￥{{moneyFormat(item.ZaiTu)}}</span> <span>￥{{moneyFormat(scope.row.ZaiTu)}}</span>
</td> </td>
<td> <td>
<span v-if="item.VisaOrderStatus==1">正常</span> <span v-if="scope.row.VisaOrderStatus==1">正常</span>
<span v-if="item.VisaOrderStatus==2">取消</span> <span v-if="scope.row.VisaOrderStatus==2">取消</span>
<span v-if="item.VisaOrderStatus==3">待付款</span> <span v-if="scope.row.VisaOrderStatus==3">待付款</span>
<span class="fz12" v-if="item.VisaOrderStatus==2">操作：{{item.UpdateName}}</span> <span class="fz12" v-if="scope.row.VisaOrderStatus==2">操作：{{scope.row.UpdateName}}</span>
</td> </td>
<td> <td>
<span> <span>
<i v-if="item.IsCommission==1" class="iconfont icon-yiqueren" style="color:#4BCA81;"></i> <i v-if="scope.row.IsCommission==1" class="iconfont icon-yiqueren" style="color:#4BCA81;"></i>
<i v-else class="iconfont icon-yiquxiao" style="color:#E95252;"></i> <i v-else class="iconfont icon-yiquxiao" style="color:#E95252;"></i>
{{item.IsCommission==1?"已提成":"未提成"}} {{scope.row.IsCommission==1?"已提成":"未提成"}}
</span>
</td>
<td>
<span :class="{ cF1416C: scope.row.IsFinish == 0,c20C997: scope.row.IsFinish == 1 }">
<template v-if="scope.row.IsFinish==1">
已完结 / {{scope.row.FinishTime}}
</template>
<template v-else>
未完结
</template>
</span> </span>
</td> </td>
<td class="groupTourOrderIcon"> <td class="groupTourOrderIcon">
<el-tooltip effect="dark" content="签证详情" placement="top-start" v-if="item.VisaPlanIdStr !=''"> <el-tooltip effect="dark" content="签证详情" placement="top-start" v-if="scope.row.VisaPlanIdStr !=''">
<el-button type="primary" @click="goUrlVisaList(item)" style='background:#00C6FF; border-color:#00C6FF' <el-button type="primary" @click="goUrlVisaList(scope.row)" style='background:#00C6FF; border-color:#00C6FF'
icon="iconfont icon-sousuo"></el-button> icon="iconfont icon-sousuo"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="item.Income<=0&&item.VisaOrderStatus==1&&item.UpdateStatus==1" class="item" effect="dark" <el-tooltip v-if="scope.row.Income<=0&&scope.row.VisaOrderStatus==1&&scope.row.UpdateStatus==1" class="item" effect="dark"
content="取消" placement="top-start"> content="取消" placement="top-start">
<el-button type="primary" style='background:#E95252; border-color:#E95252;' <el-button type="primary" style='background:#E95252; border-color:#E95252;'
icon="iconfont icon-xingzhuangkaobei" @click='cancelOrder(item)'></el-button> icon="iconfont icon-xingzhuangkaobei" @click='cancelOrder(scope.row)'></el-button>
</el-tooltip> </el-tooltip>
<!-- 订单拆分 --> <!-- 订单拆分 -->
<el-tooltip v-if="item.PeopleNum==item.GuestList.length" class="item" effect="dark" content="订单拆分" <el-tooltip v-if="scope.row.PeopleNum==scope.row.GuestList.length" class="item" effect="dark" content="订单拆分"
placement="top-start"> placement="top-start">
<el-button type="primary" style='background:#47BF8C; border-color:#47BF8C;' icon="el-icon-edit" <el-button type="primary" style='background:#47BF8C; border-color:#47BF8C;' icon="el-icon-edit"
@click="goUrl2('OrderSplitting',item.Id,'订单拆分')"></el-button> @click="goUrl2('OrderSplitting',scope.row.Id,'订单拆分')"></el-button>
</el-tooltip> </el-tooltip>
<!-- 修改金额 --> <!-- 修改金额 -->
<el-tooltip v-if="IsSupperOrderEdit&& item.VisaType==1" class="item" effect="dark" content="修改金额" <el-tooltip v-if="IsSupperOrderEdit&& scope.row.VisaType==1" class="item" effect="dark" content="修改金额"
placement="top-start"> placement="top-start">
<el-button type="primary" style='background:#E95252; border-color:#E95252;padding:5px' icon="el-icon-edit" <el-button type="primary" style='background:#E95252; border-color:#E95252;padding:5px' icon="el-icon-edit"
@click='Edit(item)'></el-button> @click='Edit(scope.row)'></el-button>
</el-tooltip>
<!-- 完结 -->
<el-tooltip v-if="IsSupperOrderEdit&&scope.row.IsFinish!=1
&&scope.row.Income>0&&scope.row.DueInMoney==0" class="item" effect="dark" content="完结"
placement="top-start">
<el-button type="primary" style='background:#E95252; border-color:#E95252;padding:5px'
icon="el-icon-check"
@click='setCompleted(scope.row.Id,scope.row)' :loading="scope.row.loading"></el-button>
</el-tooltip> </el-tooltip>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="17" class="RL_Order" style="height:40px;"> <td colspan="18" class="RL_Order" style="height:40px;">
<span class="VO-remarkTitle">名单:</span> <span class="VO-remarkTitle">名单:</span>
<span class="VO-redType VO-remarkCon" v-if="item.GuestList.length>0" style="cursor:pointer"> <span class="VO-redType VO-remarkCon" v-if="scope.row.GuestList.length>0" style="cursor:pointer">
<span v-for="(childItem) in item.GuestList" style="margin-right:10px;" <span v-for="(childItem) in scope.row.GuestList" style="margin-right:10px;"
@click="goUrl2('VisapassengerList',item.Id,'旅客名单')">{{childItem.userName}}</span> @click="goUrl2('VisapassengerList',scope.row.Id,'旅客名单')">{{childItem.userName}}</span>
</span> </span>
<span class="VO-redType VO-remarkCon" v-else> <span class="VO-redType VO-remarkCon" v-else>
<span>暂无名单</span> <span>暂无名单</span>
...@@ -987,11 +1032,11 @@ ...@@ -987,11 +1032,11 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="8" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="9" class="groupTourOrder_remarks" style="height: 40px;">
<div> <div>
<div> <div>
<span class="VO-remarkTitle">备注：</span> <span class="VO-remarkTitle">备注：</span>
<span class="VO-redType VO-remarkCon">{{item.Remark}}</span> <span class="VO-redType VO-remarkCon">{{scope.row.Remark}}</span>
</div> </div>
</div> </div>
</td> </td>
...@@ -1002,16 +1047,16 @@ ...@@ -1002,16 +1047,16 @@
<span>收款单据：</span> <span>收款单据：</span>
<span class="cursor-pointer radius5 mr mb px5" <span class="cursor-pointer radius5 mr mb px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3, :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.FinanceList" 'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in scope.row.FinanceList"
@click="goUrl2('FinancialDocumentsDetail',x.FrID,'财务单据')">{{ x.FrID }}</span> @click="goUrl2('FinancialDocumentsDetail',x.FrID,'财务单据')">{{ x.FrID }}</span>
<span v-if="item.FinanceList&&item.FinanceList.length == 0" class="c9e fz12 mr"> <span v-if="scope.row.FinanceList&&scope.row.FinanceList.length == 0" class="c9e fz12 mr">
暂无 暂无
</span> </span>
<div class="item right20 top0"> <div class="item right20 top0">
<el-tooltip v-if="item.visaOrderStatus!=2" class="" effect="dark" content="制单" <el-tooltip v-if="scope.row.visaOrderStatus!=2" class="" effect="dark" content="制单"
placement="top"> placement="top">
<i class="el-icon-circle-plus cursor-pointer c059FF6" <i class="el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item, index, 1)"></i> @click="makeAdocument(scope.row, index, 1)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
...@@ -1019,16 +1064,16 @@ ...@@ -1019,16 +1064,16 @@
<span>退款单据：</span> <span>退款单据：</span>
<span class="cursor-pointer radius5 mr mb px5" <span class="cursor-pointer radius5 mr mb px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3, :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.RefundFinanceList" 'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in scope.row.RefundFinanceList"
@click="goUrl2('FinancialDocumentsDetail',x.FrID,'财务单据')">{{ x.FrID }}</span> @click="goUrl2('FinancialDocumentsDetail',x.FrID,'财务单据')">{{ x.FrID }}</span>
<span v-if="item.RefundFinanceList&&item.RefundFinanceList.length == 0" class="c9e fz12 mr"> <span v-if="scope.row.RefundFinanceList&&scope.row.RefundFinanceList.length == 0" class="c9e fz12 mr">
暂无 暂无
</span> </span>
<div class="item right20 top0"> <div class="item right20 top0">
<el-tooltip v-if="item.visaOrderStatus!=2" class="" effect="dark" content="制单" <el-tooltip v-if="scope.row.visaOrderStatus!=2" class="" effect="dark" content="制单"
placement="top"> placement="top">
<i class="el-icon-circle-plus cursor-pointer c059FF6" <i class="el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item, index, 2)"></i> @click="makeAdocument(scope.row, index, 2)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
...@@ -1036,20 +1081,20 @@ ...@@ -1036,20 +1081,20 @@
<span>成本单据：</span> <span>成本单据：</span>
<span class="cursor-pointer radius5 mr mb px5" <span class="cursor-pointer radius5 mr mb px5"
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3, :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.CostFinanceList" 'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in scope.row.CostFinanceList"
@click="goUrl2('FinancialDocumentsDetail',x.FrID,'财务单据')">{{ x.FrID }}</span> @click="goUrl2('FinancialDocumentsDetail',x.FrID,'财务单据')">{{ x.FrID }}</span>
<span v-if="item.CostFinanceList&&item.CostFinanceList.length == 0" class="c9e fz12 mr"> <span v-if="scope.row.CostFinanceList&&scope.row.CostFinanceList.length == 0" class="c9e fz12 mr">
暂无 暂无
</span> </span>
<div class="item right20 top0" v-if="item.visaOrderStatus!=2"> <div class="item right20 top0" v-if="scope.row.visaOrderStatus!=2">
<el-tooltip class="" effect="dark" content="制单" <el-tooltip class="" effect="dark" content="制单"
placement="top"> placement="top">
<i class="el-icon-circle-plus cursor-pointer c059FF6" <i class="el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item, index, 3)"></i> @click="makeAdocument(scope.row, index, 3)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="" effect="dark" content="冲抵" placement="top"> <el-tooltip class="" effect="dark" content="冲抵" placement="top">
<i class="el-icon-circle-plus cursor-pointer c3FC4FF" <i class="el-icon-circle-plus cursor-pointer c3FC4FF"
@click="isOffset(item, index, 3)"></i> @click="isOffset(scope.row, index, 3)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
...@@ -1069,7 +1114,7 @@ ...@@ -1069,7 +1114,7 @@
</div> </div>
<div style="margin-top: 5px;"> <div style="margin-top: 5px;">
<span>{{$t('salesModule.Invoice')}}：</span> <span>{{$t('salesModule.Invoice')}}：</span>
<span v-for="(item2,index2) in item.invoiceApplyList" :key="index2" <span v-for="(item2,index2) in scope.row.invoiceApplyList" :key="index2"
style="margin-right:10px;cursor:pointer;"> style="margin-right:10px;cursor:pointer;">
<span v-if="item2.invoiceApplyState === 6" class="groupTourOrder_tickets_blue" <span v-if="item2.invoiceApplyState === 6" class="groupTourOrder_tickets_blue"
@click="goIisDetail(item2.id)">{{item2.id}}</span> @click="goIisDetail(item2.id)">{{item2.id}}</span>
...@@ -1081,20 +1126,17 @@ ...@@ -1081,20 +1126,17 @@
<span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black" <span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black"
@click="goIisDetail(item2.id)">{{item2.id}}</span> @click="goIisDetail(item2.id)">{{item2.id}}</span>
</span> </span>
<span v-if="item.InvoiceApplyList.length===0" <span v-if="scope.row.InvoiceApplyList.length===0"
style="cursor: default;">{{$t('system.content_noData')}}</span> style="cursor: default;">{{$t('system.content_noData')}}</span>
</div> </div>
</div> </div>
</td> </td>
</tr> </tr>
<tr>
<td colspan="18" style="height: 1px;magrin:0;padding: 0;background-color: #000;"></td>
</tr>
</tbody> </tbody>
<tr v-show="dataList.length==0">
<td colspan="18" align="center">暂无数据</td>
</tr>
</table> </table>
</template>
</el-table-column>
</el-table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total"
:page-size="this.msg.pageSize" :total="total"> :page-size="this.msg.pageSize" :total="total">
</el-pagination> </el-pagination>
...@@ -1130,6 +1172,7 @@ ...@@ -1130,6 +1172,7 @@
EmId: '-1', EmId: '-1',
VisaOrderStatus: "0", VisaOrderStatus: "0",
OrderId: '', OrderId: '',
IsFinish: '0'
}, },
dataList: [], dataList: [],
EmployeeList: [], EmployeeList: [],
...@@ -1148,9 +1191,68 @@ ...@@ -1148,9 +1191,68 @@
TotalPrice: 0, TotalPrice: 0,
}, },
cbId: 0, cbId: 0,
CompletedLoading: false,
multipleSelection: [],
} }
}, },
methods: { methods: {
selectable(row, index){
if (this.dataList[index].IsFinish!=1&&this.dataList[index].Income>0&&this.dataList[index].DueInMoney==0) {
return true;
} else {
return false;
}
},
handleSelectionChange(val) {
this.multipleSelection = val.map(x=>{ return x.Id});
},
setCompleted(id,row){
let ids = ''
if(id>0){
ids = id
}else{
if(this.multipleSelection.length==0) return this.$message.error('请勾选需要完结的数据')
ids = this.multipleSelection.join(',')
}
if(ids == '') {
this.$message.error('请勾选需要完结的数据')
}
this.$confirm('是否确认完结?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
if(id>0){
row.loading = true
}else{
this.CompletedLoading = true
}
this.apipost('dmc_post_SetVisaOrderFinish', {
VisaOrderIds: ids
}, res => {
if (res.data.resultCode == 1) {
if(id>0){
row.loading = false
}else{
this.CompletedLoading = false
}
this.multipleSelection = []
this.$message.success('操作成功！');
this.getList()
} else {
if(id>0){
row.loading = false
}else{
this.CompletedLoading = false
}
this.$message.error(res.data.message);
}
}, err => {})
}).catch(() => {
this.$message.info('已取消！');
});
},
isOffset(row, index, num){ isOffset(row, index, num){
this.makeAdocument(row, index, num,'Offset') this.makeAdocument(row, index, num,'Offset')
}, },
...@@ -1304,6 +1406,12 @@ ...@@ -1304,6 +1406,12 @@
this.loading = false; this.loading = false;
this.dataList = [] this.dataList = []
} else { } else {
let arrList = function(list){
list.forEach(x => {
x.loading = false
});
}
arrList(res.data.data.pageData)
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
this.total = res.data.data.count; this.total = res.data.data.count;
this.loading = false; this.loading = false;
......
src/components/SalesVisa/components/VisaProductOrder.vue
View file @ 8a674765
...@@ -336,6 +336,15 @@ ...@@ -336,6 +336,15 @@
<el-option label="待付款" value="3" key='3'></el-option> <el-option label="待付款" value="3" key='3'></el-option>
</el-select> </el-select>
</span></li> </span></li>
<li>
<span>
<em>完结状态</em>
<el-select v-model='msg.IsFinish'>
<el-option label="不限" value="0" key='0'></el-option>
<el-option label="已完结" value="1" key='1'></el-option>
<el-option label="未完结" value="2" key='2'></el-option>
</el-select>
</span></li>
<li v-if="pagesTitle!='销售'"> <li v-if="pagesTitle!='销售'">
<span> <span>
<em>业务员</em> <em>业务员</em>
...@@ -518,7 +527,8 @@ ...@@ -518,7 +527,8 @@
VisaOrderStatus: '0', VisaOrderStatus: '0',
CreateBy: 0, CreateBy: 0,
RB_Branch_Id: -1, RB_Branch_Id: -1,
OrderId: 0 OrderId: 0,
IsFinish: '0',
}, },
addMsg: { addMsg: {
Id: 0, Id: 0,
...@@ -791,8 +801,15 @@ ...@@ -791,8 +801,15 @@
this.apipost(url, this.msg, res => { this.apipost(url, this.msg, res => {
if (res.data.resultCode == 0) { if (res.data.resultCode == 0) {
this.loading = false; this.loading = false;
this.dataList = [] this.dataList = []
} else { } else {
let arrList = function(list){
list.forEach(x => {
x.loading = false
});
}
arrList(res.data.data.pageData)
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
this.total = res.data.data.count; this.total = res.data.data.count;
this.loading = false; this.loading = false;
...@@ -908,4 +925,3 @@ ...@@ -908,4 +925,3 @@
} }
</script> </script>
\ No newline at end of file
src/components/SalesVisa/components/visaOrderList.vue
View file @ 8a674765
...@@ -484,7 +484,7 @@ ...@@ -484,7 +484,7 @@
} }
/deep/.el-table tr td:first-child { /deep/.el-table tr td:first-child {
border-bottom: 0; /* border-bottom: 0; */
} }
/deep/.el-table tr:last-child td { /deep/.el-table tr:last-child td {
...@@ -503,43 +503,71 @@ ...@@ -503,43 +503,71 @@
<template> <template>
<div> <div>
<div v-for="(item, index) in OrderList" class="column bgf radius5 px15 mb20"> <div style="text-align: right;position: fixed;top: 62px; right: 89px;">
<el-button class="hollowFixedBtn" v-if="IsSupperOrderEdit&&pagesTitle!='销售'" @click="setCompleted"
:loading="CompletedLoading">一键完结</el-button>
</div>
<el-table
ref="multipleTable"
:data="OrderList"
tooltip-effect="dark"
style="width: 100%"
row-key="id"
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
:selectable="selectable"
:reserve-selection="true" v-if="pagesTitle!='销售'"/>
</el-table-column>
<el-table-column
:label="pagesTitle!='销售'?'全选':''">
<template slot-scope="scope">
<div class="row-c justify-sb align-c py"> <div class="row-c justify-sb align-c py">
<div class="row-c"> <div class="row-c">
<div> <div>
<div class="orderType cf fz12" :class="{ active: item.visaOrderStatus == 1,activeNo: item.visaOrderStatus == 2 }"> <div class="orderType cf fz12" :class="{ active: scope.row.visaOrderStatus == 1,activeNo: scope.row.visaOrderStatus == 2 }">
<template v-if="item.visaOrderStatus == 1">正常</template> <template v-if="scope.row.visaOrderStatus == 1">正常</template>
<template v-else-if="item.visaOrderStatus == 3">待付款</template> <template v-else-if="scope.row.visaOrderStatus == 3">待付款</template>
<template v-else-if="item.visaOrderStatus == 2">取消</template> <template v-else-if="scope.row.visaOrderStatus == 2">取消</template>
</div> </div>
</div>
<div class="cblack fz14 mr" :class="{ cF1416C: scope.row.isFinish == 0,c20C997: scope.row.isFinish == 1 }">
<template v-if="scope.row.isFinish == 1">
已完结 / {{scope.row.finishTime}}
</template>
<template v-else>
未完结
</template>
</div> </div>
<div class="c9e fz12"> <div class="c9e fz12">
<span>{{$t('fnc.danhao')}}：</span> <span>{{$t('fnc.danhao')}}：</span>
<span>{{item.visaTCNUM}}({{item.id}})</span> <span>{{scope.row.visaTCNUM}}({{scope.row.id}})</span>
<span class="copy cblack cursor-pointer" v-if="copyId != item.id" @click="CopyHandler(item)">复制</span> <span class="copy cblack cursor-pointer" v-if="copyId != scope.row.id" @click="CopyHandler(scope.row)">复制</span>
<span class="copy c059FF6 bgD9F3FF cursor-pointer" v-else><i class="el-icon-check mr"></i>已复制</span> <span class="copy c059FF6 bgD9F3FF cursor-pointer" v-else><i class="el-icon-check mr"></i>已复制</span>
</div> </div>
</div> </div>
<div class="row c9e fz12"> <div class="row c9e fz12">
<div class="row-c"> <div class="row-c">
<span class="mr" v-if="item.lureEmpName">引流人：{{ item.lureEmpName }}</span> <span class="mr" v-if="scope.row.lureEmpName">引流人：{{ scope.row.lureEmpName }}</span>
<template v-if="item.createName"> <template v-if="scope.row.createName">
<span class="mr">创建人：</span> <span class="mr">创建人：</span>
<span class="mr">{{ item.createName }}</span> <span class="mr">{{ scope.row.createName }}</span>
<el-image class="mr" v-if="item.createPhoto" <el-image class="mr" v-if="scope.row.createPhoto"
style="width: 20px; height: 20px;border-radius: 50%;" style="width: 20px; height: 20px;border-radius: 50%;"
:src="item.createPhoto" :src="scope.row.createPhoto"
:preview-src-list="[item.createPhoto]"> :preview-src-list="[scope.row.createPhoto]">
</el-image> </el-image>
</template> </template>
</div> </div>
<span>下单时间：</span> <span>下单时间：</span>
<span>{{ item.createTime }}</span> <span>{{ scope.row.createTime }}</span>
</div> </div>
</div> </div>
<div class="mb"> <div class="mb">
<el-table :data="[item]" style="width:100%" border> <el-table :data="[scope.row]" style="width:100%" border>
<el-table-column label="公司" min-width="100" style="background:#EAEAEA"> <el-table-column label="公司" min-width="100" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<template> <template>
...@@ -611,13 +639,13 @@ ...@@ -611,13 +639,13 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="提成" style="background:#EAEAEA" <el-table-column label="提成" style="background:#EAEAEA"
v-if="(item.commissionMoney&&item.commissionMoney>0)||(item.opCommission&&item.opCommission>0)"> v-if="(scope.row.commissionMoney&&scope.row.commissionMoney>0)||(scope.row.opCommission&&scope.row.opCommission>0)">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="width100-float-l" v-if="item.commissionMoney&&item.commissionMoney>0"> <div class="width100-float-l" v-if="scope.row.commissionMoney&&scope.row.commissionMoney>0">
<span class="float-l">销售：<span class="cF1416C">￥</span></span> <span class="float-l">销售：<span class="cF1416C">￥</span></span>
<commissionDialog :objNew="scope.row" :OP="0"></commissionDialog> <commissionDialog :objNew="scope.row" :OP="0"></commissionDialog>
</div> </div>
<div class="width100-float-l" v-if="item.opCommission&&item.opCommission>0"> <div class="width100-float-l" v-if="scope.row.opCommission&&item.opCommission>0">
<span class="float-l">OP：<span class="cF1416C">￥</span></span> <span class="float-l">OP：<span class="cF1416C">￥</span></span>
<commissionDialog :objNew="scope.row" :OP="1"></commissionDialog> <commissionDialog :objNew="scope.row" :OP="1"></commissionDialog>
</div> </div>
...@@ -626,20 +654,20 @@ ...@@ -626,20 +654,20 @@
<template slot="append" > <template slot="append" >
<div class="row justify-sb" style="padding:10px;"> <div class="row justify-sb" style="padding:10px;">
<div class="cF1416C flex-g" style="min-width: 300px;" > <div class="cF1416C flex-g" style="min-width: 300px;" >
<div class="row flex-wrap mb"v-if="item.guestList&&item.guestList.length>0"> <div class="row flex-wrap mb"v-if="scope.row.guestList&&scope.row.guestList.length>0">
<span class="flex-s">旅客名单：</span> <span class="flex-s">旅客名单：</span>
<div class="row wrap orderNo fz12 ml"> <div class="row wrap orderNo fz12 ml">
<span class="cursor-pointer radius5 mr px5 bgf5 c3FC4FF" style="margin: 3px;" v-for="(x, i) in item.guestList" <span class="cursor-pointer radius5 mr px5 bgf5 c3FC4FF" style="margin: 3px;" v-for="(x, i) in scope.row.guestList"
@click="goUrl2('VisapassengerList',item.id,'旅客名单')">{{ x.userName }}</span> @click="goUrl2('VisapassengerList',scope.row.id,'旅客名单')">{{ x.userName }}</span>
</div> </div>
</div> </div>
<!-- v-if="(pagesTitle=='OP'&&!item.remark)||item.remark" --> <!-- v-if="(pagesTitle=='OP'&&!scope.row.remark)||scope.row.remark" -->
<div> <div>
{{$t('pub.pubRemark')}}：{{ item.remark?item.remark:'-' }} {{$t('pub.pubRemark')}}：{{ scope.row.remark?scope.row.remark:'-' }}
<!-- v-if="pagesTitle=='OP'" --> <!-- v-if="pagesTitle=='OP'" -->
<el-tooltip class="item" effect="dark" :content="$t('salesModule.UpRemarks')" <el-tooltip class="item" effect="dark" :content="$t('salesModule.UpRemarks')"
placement="top-start"> placement="top-start">
<i class="el-icon-edit cursor-pointer c059FF6 mx" @click='getDetail(item,true)'></i> <i class="el-icon-edit cursor-pointer c059FF6 mx" @click='getDetail(scope.row,true)'></i>
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
...@@ -651,16 +679,16 @@ ...@@ -651,16 +679,16 @@
<div class="row wrap orderNo fz12 ml"> <div class="row wrap orderNo fz12 ml">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;" <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;"
:class="{'bgD9F3FF':x.status==1,'bgFAEAED':x.status==2,'bjFFF3E0':x.status==3, :class="{'bgD9F3FF':x.status==1,'bgFAEAED':x.status==2,'bjFFF3E0':x.status==3,
'c3FC4FF':x.status==1,'cF1416C':x.status==2,'cff9800':x.status==3}" v-for="(x, i) in item.financeList" 'c3FC4FF':x.status==1,'cF1416C':x.status==2,'cff9800':x.status==3}" v-for="(x, i) in scope.row.financeList"
@click="openDetails(x)">{{ x.frID }}</span> @click="openDetails(x)">{{ x.frID }}</span>
<span v-if="item.financeList&&item.financeList.length == 0" class="c9e fz12 mr"> <span v-if="scope.row.financeList&&scope.row.financeList.length == 0" class="c9e fz12 mr">
暂无 暂无
</span> </span>
</div> </div>
</div> </div>
<el-tooltip v-if="item.visaOrderStatus!=2" class="item" effect="dark" content="制单" placement="top"> <el-tooltip v-if="scope.row.visaOrderStatus!=2" class="item" effect="dark" content="制单" placement="top">
<i class="el-icon-circle-plus cursor-pointer c059FF6" <i class="el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item, index, 1)"></i> @click="makeAdocument(scope.row, index, 1)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="row-c justify-sb px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 200px;max-width: 400px;"> <div class="row-c justify-sb px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 200px;max-width: 400px;">
...@@ -669,16 +697,16 @@ ...@@ -669,16 +697,16 @@
<div class="row wrap orderNo fz12 ml"> <div class="row wrap orderNo fz12 ml">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;" <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;"
:class="{'bgD9F3FF':x.status==1,'bgFAEAED':x.status==2,'bjFFF3E0':x.status==3, :class="{'bgD9F3FF':x.status==1,'bgFAEAED':x.status==2,'bjFFF3E0':x.status==3,
'c3FC4FF':x.status==1,'cF1416C':x.status==2,'cff9800':x.status==3}" v-for="(x, i) in item.refundFinanceList" 'c3FC4FF':x.status==1,'cF1416C':x.status==2,'cff9800':x.status==3}" v-for="(x, i) in scope.row.refundFinanceList"
@click="openDetails(x)">{{ x.frID }}</span> @click="openDetails(x)">{{ x.frID }}</span>
<span v-if="item.refundFinanceList&&item.refundFinanceList.length == 0" class="c9e fz12 mr"> <span v-if="scope.row.refundFinanceList&&scope.row.refundFinanceList.length == 0" class="c9e fz12 mr">
暂无 暂无
</span> </span>
</div> </div>
</div> </div>
<el-tooltip v-if="item.visaOrderStatus!=2" class="item" effect="dark" content="制单" placement="top"> <el-tooltip v-if="scope.row.visaOrderStatus!=2" class="item" effect="dark" content="制单" placement="top">
<i class="el-icon-circle-plus cursor-pointer c059FF6" <i class="el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item, index, 2)"></i> @click="makeAdocument(scope.row, index, 2)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="row-c justify-sb px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 200px;max-width: 400px;"> <div class="row-c justify-sb px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 200px;max-width: 400px;">
...@@ -687,58 +715,64 @@ ...@@ -687,58 +715,64 @@
<div class="row wrap orderNo fz12 ml"> <div class="row wrap orderNo fz12 ml">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;" <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;"
:class="{'bgD9F3FF':x.status==1,'bgFAEAED':x.status==2,'bjFFF3E0':x.status==3, :class="{'bgD9F3FF':x.status==1,'bgFAEAED':x.status==2,'bjFFF3E0':x.status==3,
'c3FC4FF':x.status==1,'cF1416C':x.status==2,'cff9800':x.status==3}" v-for="(x, i) in item.costFinanceList" 'c3FC4FF':x.status==1,'cF1416C':x.status==2,'cff9800':x.status==3}" v-for="(x, i) in scope.row.costFinanceList"
@click="openDetails(x)">{{ x.frID }}</span> @click="openDetails(x)">{{ x.frID }}</span>
<span v-if="item.costFinanceList&&item.costFinanceList.length == 0" class="c9e fz12 mr"> <span v-if="scope.row.costFinanceList&&scope.row.costFinanceList.length == 0" class="c9e fz12 mr">
暂无 暂无
</span> </span>
</div> </div>
</div> </div>
<div class="item" v-if="item.visaOrderStatus!=2&& pagesTitle != '销售'"> <div class="item" v-if="scope.row.visaOrderStatus!=2&& pagesTitle != '销售'">
<el-tooltip class="" effect="dark" content="制单" <el-tooltip class="" effect="dark" content="制单"
placement="top"> placement="top">
<i class="el-icon-circle-plus cursor-pointer c059FF6" <i class="el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item, index, 3)"></i> @click="makeAdocument(scope.row, index, 3)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="" effect="dark" content="冲抵" placement="top"> <el-tooltip class="" effect="dark" content="冲抵" placement="top">
<i class="el-icon-circle-plus cursor-pointer c3FC4FF" <i class="el-icon-circle-plus cursor-pointer c3FC4FF"
@click="isOffset(item, index, 3)"></i> @click="isOffset(scope.row, index, 3)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<div <div
class="row wrap px15 bgE8F5E9 radius5 ml fz12 orderop" style="min-width: 150px;"> class="row wrap px15 bgE8F5E9 radius5 ml fz12 orderop" style="min-width: 150px;">
<div class="row-c cursor-pointer radius5 change py5" @click="goUrlVisaList(item)" <div class="row-c cursor-pointer radius5 change py5" @click="goUrlVisaList(scope.row)"
v-if="item.VisaPlanIdStr!=''&&pagesTitle!='销售'"> v-if="scope.row.VisaPlanIdStr!=''&&pagesTitle!='销售'">
<span class="c059FF6">签证详情</span> <span class="c059FF6">签证详情</span>
</div> </div>
<div class="row-c cursor-pointer radius5 change py5" @click="getDetail(item,false)" <div class="row-c cursor-pointer radius5 change py5" @click="getDetail(scope.row,false)"
v-if="item.income<=0&&(item.visaOrderStatus==1||item.visaOrderStatus==3)&&item.visaStatus==1&&pagesTitle=='销售'"> v-if="scope.row.income<=0&&(scope.row.visaOrderStatus==1||scope.row.visaOrderStatus==3)&&scope.row.visaStatus==1&&pagesTitle=='销售'">
<span class="c059FF6">{{$t('system.table_edit')}}订单</span> <span class="c059FF6">{{$t('system.table_edit')}}订单</span>
</div> </div>
<div class="row-c cursor-pointer radius5 cancel py5" @click='cancelOrder(item)' <div class="row-c cursor-pointer radius5 cancel py5" @click='cancelOrder(scope.row)'
v-if="item.income<=0&&(item.visaOrderStatus==1||item.visaOrderStatus==3)"> v-if="scope.row.income<=0&&(scope.row.visaOrderStatus==1||scope.row.visaOrderStatus==3)">
<span class="cF1416C">{{ $t('pub.cancelBtn') }}</span> <span class="cF1416C">{{ $t('pub.cancelBtn') }}</span>
</div> </div>
<div class="row-c cursor-pointer radius5 change py5" @click='goUrlT(item)' <div class="row-c cursor-pointer radius5 change py5" @click='goUrlT(scope.row)'
v-if="(item.visaOrderStatus==1||item.visaOrderStatus==3)&&item.visaStatus==1&&pagesTitle=='销售'"> v-if="(scope.row.visaOrderStatus==1||scope.row.visaOrderStatus==3)&&scope.row.visaStatus==1&&pagesTitle=='销售'">
<span class="c059FF6">{{ $t('salesModule.LKMD') }}</span> <span class="c059FF6">{{ $t('salesModule.LKMD') }}</span>
</div> </div>
<div class="row-c cursor-pointer radius5 change1 py5" <div class="row-c cursor-pointer radius5 change1 py5"
@click='goUrlAdd("invoicesManagerAdd", item.id, item.visaId, item.customerId, 2)' @click='goUrlAdd("invoicesManagerAdd", scope.row.id, scope.row.visaId, scope.row.customerId, 2)'
v-if="(qjGroupId==userInfo.RB_Group_id || F_InvoiceManagement)&&pagesTitle=='销售'"> v-if="(qjGroupId==userInfo.RB_Group_id || F_InvoiceManagement)&&pagesTitle=='销售'">
<span class="c20C997">{{ $t('salesModule.ApplyInvoice') }}</span> <span class="c20C997">{{ $t('salesModule.ApplyInvoice') }}</span>
</div> </div>
<template v-if="pagesTitle!='销售'"> <template v-if="pagesTitle!='销售'">
<div class="row-c cursor-pointer radius5 cancel py5" @click="goUrl2('OrderSplitting',item.id,'订单拆分')" <div class="row-c cursor-pointer radius5 cancel py5" @click="goUrl2('OrderSplitting',scope.row.id,'订单拆分')"
v-if="item.peopleNum==item.guestList.length"> v-if="scope.row.peopleNum==scope.row.guestList.length">
<span class="cF1416C">订单拆分</span> <span class="cF1416C">订单拆分</span>
</div> </div>
<div class="row-c cursor-pointer radius5 change py5" <div class="row-c cursor-pointer radius5 change py5"
@click='Edit(item)' @click='Edit(scope.row)'
v-if="IsSupperOrderEdit"> v-if="IsSupperOrderEdit">
<span class="c059FF6">修改金额</span> <span class="c059FF6">修改金额</span>
</div> </div>
<div v-if="IsSupperOrderEdit&&pagesTitle!='销售'&&scope.row.isFinish!=1
&&scope.row.income>0&&scope.row.dueInMoney==0"
class="row-c cursor-pointer radius5 change py5"
@click='setCompleted(scope.row.id,scope.row)' v-loading="scope.row.loading">
<span class="c059FF6">完结</span>
</div>
</template> </template>
</div> </div>
</div> </div>
...@@ -748,9 +782,9 @@ ...@@ -748,9 +782,9 @@
</template> </template>
</el-table> </el-table>
</div> </div>
</template>
</el-table-column>
</div> </el-table>
<div class="_mc_edit _scrollbar" :class="addShow==true?'edHeight':''"> <div class="_mc_edit _scrollbar" :class="addShow==true?'edHeight':''">
<p class="_tit">{{$t('salesModule.UpOrder')}} <p class="_tit">{{$t('salesModule.UpOrder')}}
<span class="fr"> <span class="fr">
...@@ -883,6 +917,8 @@ export default { ...@@ -883,6 +917,8 @@ export default {
props: ["OrderList", "pagesTitle"], props: ["OrderList", "pagesTitle"],
data() { data() {
return { return {
CompletedLoading: false,
multipleSelection: [],
isCommissionDialog: false, isCommissionDialog: false,
objNew:{}, objNew:{},
queryObj:null, queryObj:null,
...@@ -1194,7 +1230,62 @@ export default { ...@@ -1194,7 +1230,62 @@ export default {
} }
}); });
}, },
selectable(row, index){
if (this.OrderList[index].isFinish!=1&&this.OrderList[index].income>0&&this.OrderList[index].dueInMoney==0) {
return true;
} else {
return false;
}
},
handleSelectionChange(val) {
this.multipleSelection = val.map(x=>{ return x.id});
},
setCompleted(id,row){
let ids = ''
if(id>0){
ids = id
}else{
if(this.multipleSelection.length==0) return this.$message.error('请勾选需要完结的数据')
ids = this.multipleSelection.join(',')
}
if(ids == '') {
this.$message.error('请勾选需要完结的数据')
}
this.$confirm('是否确认完结?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
if(id>0){
row.loading = true
}else{
this.CompletedLoading = true
}
this.apipost('dmc_post_SetVisaOrderFinish', {
VisaOrderIds: ids
}, res => {
if (res.data.resultCode == 1) {
if(id>0){
row.loading = false
}else{
this.CompletedLoading = false
}
this.multipleSelection = []
this.$message.success('操作成功！');
this.$emit('success')
} else {
if(id>0){
row.loading = false
}else{
this.CompletedLoading = false
}
this.$message.error(res.data.message);
}
}, err => {})
}).catch(() => {
this.$message.info('已取消！');
});
},
cancelOrder(obj) { cancelOrder(obj) {
this.$confirm('是否取消?', '提示', { this.$confirm('是否取消?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
......
src/components/temp/operation.vue
View file @ 8a674765
...@@ -527,6 +527,7 @@ ...@@ -527,6 +527,7 @@
1.以上制度公司会因市场变动与业务实际情况及公司规模採取适当因应或调整,敬请注意!!</br> 1.以上制度公司会因市场变动与业务实际情况及公司规模採取适当因应或调整,敬请注意!!</br>
2.购物佣金不计入OP毛利奖金</br> 2.购物佣金不计入OP毛利奖金</br>
3.如果小包团、落地散团出现利润亏损，需其他团分摊亏损的利润</br> 3.如果小包团、落地散团出现利润亏损，需其他团分摊亏损的利润</br>
4.签证订单 需OP点完结后方可参与提成。</br>
</div> </div>
<div style="display: none; padding: 10px 0 0 0;color: #E95252;line-height: 30px;width: 50%;white-space: wrap;"> <div style="display: none; padding: 10px 0 0 0;color: #E95252;line-height: 30px;width: 50%;white-space: wrap;">
<p style="font-weight: bold;">关于提成发放流程的补充通知：</p> <p style="font-weight: bold;">关于提成发放流程的补充通知：</p>
...@@ -538,8 +539,7 @@ ...@@ -538,8 +539,7 @@
2.未在规定时间内改价平账订单，违反提成规则，该订单报名当事人提成金额为0。</br> 2.未在规定时间内改价平账订单，违反提成规则，该订单报名当事人提成金额为0。</br>
3.未平账订单继续追溯至下个月，直到全部帐平为止，再放发上月其他订单提成</br> 3.未平账订单继续追溯至下个月，直到全部帐平为止，再放发上月其他订单提成</br>
4.未结团团期或成本遗漏补录等原因，造成团队利润变动，销售提成会在次月再次验证此团利润，多退少补；</br> 4.未结团团期或成本遗漏补录等原因，造成团队利润变动，销售提成会在次月再次验证此团利润，多退少补；</br>
5.签证订单 需OP点完结后方可参与提成。</br> 5.提成工作环环相扣，请所有人员务必有公德心，同时遵守工作流程，尊重他人。</br>
6.提成工作环环相扣，请所有人员务必有公德心，同时遵守工作流程，尊重他人。</br>
</div> </div>
</div> </div>
......
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