Skip to content

S
SuperMan
Commit b8d57cc4 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 61370e2a 678d540a
Hide whitespace changes
Inline Side-by-side
Showing with 2268 additions and 36 deletions
src/components/SalesModule/enrollTotal.vue
View file @ b8d57cc4
......@@ -169,6 +169,9 @@
<p>
<span>{{$t('salesModule.TCmoney')}}：{{countData.SumCommissionMoney}};</span>
</p>
<p>
<span>额外提成：{{countData.ExtraCommissionMoney}};</span>
</p>
</div>
</el-col>
</el-row>
......@@ -264,8 +267,8 @@
<td>
<span v-if='item.isEnd==0' style="cursor: pointer;">{{item.income}}</span>
<span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;">{{item.income}}</span>
<span v-if='item.dueInMoney==0' style="cursor: pointer;">{{item.income}}</span>
<span v-if='item.dueInMoney!=0' style="cursor: pointer;color: #e95252;">{{item.income}}</span>
</td>
<!-- 优惠 -->
<td>
......
src/components/SalesModule/groupTourOrder.vue
View file @ b8d57cc4
......@@ -1508,6 +1508,9 @@
<p>
<span>{{$t('salesModule.TCmoney')}}：{{countData.SumCommissionMoney}};</span>
</p>
<p>
<span>额外提成：{{countData.ExtraCommissionMoney}};</span>
</p>
</div>
</el-col>
</el-row>
......@@ -1657,9 +1660,9 @@
</tr>
</table>
</div>
<span v-if='item.isEnd==0' style="cursor: pointer;" @click="getOrderDetail(item)"
<span v-if='item.dueInMoney==0' style="cursor: pointer;" @click="getOrderDetail(item)"
slot="reference">{{item.income}}</span>
<span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;" @click="getOrderDetail(item)"
<span v-if='item.dueInMoney!=0' style="cursor: pointer;color: #e95252;" @click="getOrderDetail(item)"
slot="reference">{{item.income}}</span>
</el-popover>
</td>
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ b8d57cc4
......@@ -1907,7 +1907,7 @@
</table>
</div>
<span v-if='item.isOwn==1 || userId==1||userId==5 || isUpdateOrder'
:style="{cursor: 'pointer',color:item.isEnd===0 ? '' : '#e95252' }" @click="getOrderDetail(item)"
:style="{cursor: 'pointer',color:item.dueInMoney===0 ? '' : '#e95252' }" @click="getOrderDetail(item)"
slot="reference">{{item.income}}</span>
<span v-else>******</span>
</el-popover>
......@@ -2432,7 +2432,7 @@
</table>
</div>
<span v-if='item.isOwn==1 || userId==1||userId==5 || isUpdateOrder'
:style="{cursor: 'pointer',color:item.isEnd===0 ? '' : '#e95252' }" @click="getOrderDetail(item)"
:style="{cursor: 'pointer',color:item.dueInMoney===0 ? '' : '#e95252' }" @click="getOrderDetail(item)"
slot="reference">{{item.income}}</span>
<span v-else>******</span>
</el-popover>
......
src/components/SalesModule/planeTourOrder.vue
View file @ b8d57cc4
......@@ -1255,8 +1255,8 @@
</tr>
</table>
</div>
<span v-if='item.preferPrice==item.income' style="cursor: pointer;color: #FF9C00;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
<span v-if='item.preferPrice!=item.income' style="cursor: pointer;color: #e95252;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
<span v-if='item.dueInMoney==0' style="cursor: pointer;color: #FF9C00;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
<span v-if='item.dueInMoney!=0' style="cursor: pointer;color: #e95252;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
</el-popover>
</td>
<td>{{item.refund}}</td>
......
src/components/TravelContractConfirm.vue 0 → 100644
View file @ b8d57cc4
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ b8d57cc4
......@@ -1759,9 +1759,9 @@
</tr>
</table>
</div>
<span v-if='item.IsEnd==0' style="cursor: pointer;" @click="getOrderDetail(item)"
<span v-if='item.DueInMoney==0' style="cursor: pointer;" @click="getOrderDetail(item)"
slot="reference">{{item.Income}}</span>
<span v-if='item.IsEnd!=0' class="colorE95252" style="cursor: pointer;" @click="getOrderDetail(item)"
<span v-if='item.DueInMoney!=0' class="colorE95252" style="cursor: pointer;" @click="getOrderDetail(item)"
slot="reference">{{item.Income}}</span>
</el-popover>
</td>
......@@ -2099,9 +2099,9 @@
</tr>
</table>
</div>
<span v-if='childItem.IsEnd==0' style="cursor: pointer;" @click="getOrderDetail(childItem)"
<span v-if='childItem.DueInMoney==0' style="cursor: pointer;" @click="getOrderDetail(childItem)"
slot="reference">{{childItem.Income}}</span>
<span v-if='childItem.IsEnd!=0' class="colorE95252" style="cursor: pointer;"
<span v-if='childItem.DueInMoney!=0' class="colorE95252" style="cursor: pointer;"
@click="getOrderDetail(childItem)" slot="reference">{{childItem.Income}}</span>
</el-popover>
</td>
......@@ -2511,9 +2511,9 @@
</tr>
</table>
</div>
<span v-if='item.IsEnd==0' style="cursor: pointer;" @click="getOrderDetail(item)"
<span v-if='item.DueInMoney==0' style="cursor: pointer;" @click="getOrderDetail(item)"
slot="reference">{{item.Income}}</span>
<span v-if='item.IsEnd!=0' class="colorE95252" style="cursor: pointer;" @click="getOrderDetail(item)"
<span v-if='item.DueInMoney!=0' class="colorE95252" style="cursor: pointer;" @click="getOrderDetail(item)"
slot="reference">{{item.Income}}</span>
</el-popover>
</td>
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ b8d57cc4
......@@ -263,8 +263,8 @@
</td>
<td>
<span v-if="item.isEnd==0">{{item.income}}</span>
<span v-if="item.isEnd!=0" style="color: #e95252;">{{item.income}}</span>
<span v-if="item.dueInMoney==0">{{item.income}}</span>
<span v-if="item.dueInMoney!=0" style="color: #e95252;">{{item.income}}</span>
</td>
<!-- 优惠 -->
<td>
......
src/components/administrative/ContractManage.vue
View file @ b8d57cc4
......@@ -31,23 +31,45 @@
</span>
</li>
<li>
<span><em>{{ $t("sm.Date") }}</em>
<el-date-picker v-model="msg.StartDate" class="w135" value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateBefore"></el-date-picker>
-
<el-date-picker v-model="msg.EndDate" class="w135" value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateAfter"></el-date-picker>
<span><em>团号</em>
<el-input class="w210" v-model="msg.C_TCNUM" placeholder="请输入团号" @keyup.enter.native="getList">
</el-input>
</span>
</li>
<li>
<span><em>线路名称</em>
<el-input class="w210" v-model="msg.C_ProductName" placeholder="请输入线路名称" @keyup.enter.native="getList">
</el-input>
</span>
</li>
<li>
<span><em>经办人</em>
<el-input class="w210" v-model="msg.TravelAgency_DealMan" placeholder="请输入经办人"
@keyup.enter.native="getList">
</el-input>
</span>
</li>
<li>
<span><em>合同状态</em>
<el-select v-model="msg.Status" :placeholder="$t('pub.pleaseSel')">
<el-option label="请选择" :value="-1" :key="-1"> </el-option>
<el-option label="正常" :value="0" :key="0"> </el-option>
<el-option label="删除" :value="1" :key="1"> </el-option>
<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-option label="已盖章" :value="3" :key="3"> </el-option>
<el-option label="已签字" :value="4" :key="4"> </el-option>
</el-select>
</span>
</li>
<li>
<span><em>{{ $t("sm.Date") }}</em>
<el-date-picker v-model="msg.StartDate" class="w135" value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateBefore"></el-date-picker>
-
<el-date-picker v-model="msg.EndDate" class="w135" value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateAfter"></el-date-picker>
</span>
</li>
<li>
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="
getList();
......@@ -78,7 +100,8 @@
<th width="130">操作</th>
</tr>
<tr v-for="(item, index) in dataList" :key="index">
<td>{{ item.ID }}</td>
<td>{{ item.ID }}
</td>
<td>
<template v-if="item.CType == 2">
境内旅游合同
......@@ -91,7 +114,6 @@
</template>
</td>
<td>{{ item.T_ContractNum }}</td>
<td>{{ item.Tourists_Name }}</td>
<td>{{ item.TravelAgency_Name }}</td>
<td>{{ item.TravelAgency_DealMan }}</td>
......@@ -116,22 +138,23 @@
@click="goContract('SingleContract', item.ID, '单项委托合同')"></el-button>
</template>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="复制" placement="top-start">
<el-button type="warning" icon="iconfont icon-copy" circle @click="CopyContract(item)" style="padding:4px;"></el-button>
<el-button type="warning" icon="iconfont icon-copy" circle @click="CopyContract(item)" style="padding:4px;">
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="下载" placement="top-start">
<el-button type="success" icon="el-icon-download" circle @click="DownLoadContract(item)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="取消" placement="top-start">
<el-button type="danger" icon="el-icon-close" circle @click="DeleteContract(item)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="提交并盖章" placement="top-start">
<el-button type="danger" icon="el-icon-close" circle @click="SubmitContract(item)"></el-button>
</el-tooltip>
</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
</el-pagination>
......@@ -155,7 +178,10 @@
EndDate: "", //结束日期
Status: -1, //合同状态
pageIndex: 1,
pageSize: 15
pageSize: 15,
TravelAgency_DealMan: "", //经办人
C_TCNUM: "", //团号
C_ProductName: "", //线路名称
},
pickerBeginDateBefore: {
disabledDate: time => {
......@@ -179,6 +205,27 @@
this.getList();
},
methods: {
//提交并盖章
SubmitContract(item) {
var that = this;
this.Confirm("是否提交并盖章此合同?", function () {
that.apipost(
"travelcontract_post_UpdateTravelContractStatusService", {
ID: item.ID,
Status: 2
},
res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.getList();
} else {
that.Error(res.data.message);
}
},
err => {}
);
});
},
//复制合同
CopyContract(item) {
//获取列表数据
......@@ -238,10 +285,11 @@
var that = this;
this.Confirm("是否取消此合同?", function () {
var msg = {
ID: item.ID
ID: item.ID,
Status: 1
};
that.apipost(
"travelcontract_post_RemoveTravelContractService",
"travelcontract_post_UpdateTravelContractStatusService",
msg,
res => {
if (res.data.resultCode == 1) {
......
src/components/busManagement/busUsePrice.vue
View file @ b8d57cc4
......@@ -389,7 +389,7 @@
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('ground.songjiBj')" prop="SendPrice" style="display:none;">
<el-form-item :label="$t('ground.songjiBj')" style="display:none;">
<el-input v-model="addMsg.SendPrice" @keyup.native="checkPrice(addMsg,'SendPrice')"></el-input>
</el-form-item>
</el-col>
......@@ -404,7 +404,7 @@
</el-form-item>
</el-col>
<el-col :span="5" style="display:none;">
<el-form-item label="小时报价" prop="HourPrice">
<el-form-item label="小时报价" >
<el-input v-model="addMsg.HourPrice" @keyup.native="checkPrice(addMsg,'HourPrice')"></el-input>
</el-form-item>
</el-col>
......
src/router/config.js
View file @ b8d57cc4
......@@ -4265,6 +4265,14 @@ export default {
title: '一日游合同'
},
},
{
path: '/TravelContractConfirm', //电子合同签名
name: 'TravelContractConfirm',
component: resolve => require(['@/components/TravelContractConfirm'], resolve),
meta: {
title: '电子合同签名'
},
},
{
path: '/TravelContractDetail', //新电子合同详情
name: 'TravelContractDetail',
......
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