Skip to content

S
SuperMan
Commit 8f6a7584 authored by 沈良进's avatar 沈良进
Browse files
Options

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

parents 57836cc2 408523b0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 776 additions and 477 deletions
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 8f6a7584
......@@ -1738,7 +1738,7 @@
name: 'OPsalesCommissiondetails',
query: {
PeriodId: GetDetail.ReFinanceId,
OutBranchId: stringify(GetDetail.RB_Branch_Id),
OutBranchId: String(GetDetail.RB_Branch_Id),
blank: "y",
tab: "op提成明细"
}
......
src/components/FinancialModule/ImpressionTicketing/ImpressionTicketDetails.vue
View file @ 8f6a7584
......@@ -4,20 +4,20 @@
position: relative;
top: 1px;
}
.opUl li {
display: inline-block;
margin: 10px 15px 10px 0;
}
.domesticCommissiondetails .opUl li input {
height: 34px !important;
}
.domesticCommissiondetails .singeRowTable tr td {
padding: 8px 5px;
}
.domesticCommissiondetails .hoverSpan span:hover {
cursor: pointer;
text-decoration: underline;
......@@ -75,10 +75,10 @@
</div>
<div style="display: flex;align-items: center;height: 50px;justify-content: space-between;">
<div style="display: flex;align-items: center;">
</div>
<input type="button" class="normalBtn" value="导出" @click="exportExcel">
</div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"
style="margin-top: 10px;">
......@@ -107,7 +107,7 @@
<th>年终比例</th>
<th>期数</th>
<th width='300'>备注</th>
<!-- <th>操作</th> -->
</tr>
<tr v-for="item in dataList">
......@@ -120,7 +120,7 @@
<td>{{item.EmName}}</td>
<td><span class="cursor-p" @click="clickUrl(item,1)">{{item.OrderId}}</span></td>
<td>{{item.OrderTypeName}}</td>
<td style="font-size: 12px;">{{item.TCNUM?item.TCNUM:'-'}}
<td style="font-size: 12px;" :style="{'cursor':item.TCID?'pointer':''}" @click="item.TCID?goTravel(item.TCID):''">{{item.TCNUM?item.TCNUM:'-'}}
<p v-if="item.OutBranchName">{{item.OutBranchName?item.OutBranchName:'-'}}</p>
</td>
<td>{{item.LineName?item.LineName:'-'}}</td>
......@@ -131,7 +131,7 @@
<template v-else>-</template>
</td>
<td>{{item.Way==1?'销售额':'利润比'}}</td>
<td>{{item.OrderProfit?item.OrderProfit:'-'}}</td>
<td>{{item.YCommission?item.YCommission:'-'}}</td>
<td>{{item.Commission?item.Commission:'-'}}</td>
......@@ -159,12 +159,12 @@
<inAccordanceWith v-if="objNew" :msgNew="objNew"></inAccordanceWith>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false">取消</button> &nbsp;
<button class="normalBtn" type="primary" @click="outerVisible = false">确定</button>
<button class="normalBtn" type="primary" @click="outerVisible = false">确定</button>
</div>
</el-dialog>
</div>
</template>
<script>
import inAccordanceWith from "./inAccordanceWithDialog"
import moment from "moment"
......@@ -232,7 +232,7 @@
},
clickUrl(item,type){
if(type==2){//线索
}else{
this.OrderStatistics(item)
}
......@@ -292,8 +292,8 @@
err => {}
);
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
......@@ -329,13 +329,22 @@
}
);
},
goTravel(TCID) { //跳转到团队列表
this.$router.push({
path: 'TeamBalancePayment',//TravelControlList
query: {
id: TCID,
blank: 'y',
tab: '团队收支'//团控列表
}
});
},
exportExcel() { //导出
var fileName = "印象票务提成人员表.xls";
this.crmGetLocalFile("/api/Commission/GetCommissionOrderDetialToExcel", this.msg, fileName);
}
}
}
</script>
\ No newline at end of file
src/components/FinancialModule/ServiceCommission/ServiceCommissiondetails.vue
View file @ 8f6a7584
......@@ -372,11 +372,11 @@
},
goTravel(TCID) { //跳转到团队列表
this.$router.push({
path: 'TravelControlList',
path: 'TeamBalancePayment',//TravelControlList
query: {
TCID: TCID,
id: TCID,
blank: 'y',
tab: '团控列表'
tab: '团队收支'//团控列表
}
});
}
......
src/components/FinancialModule/TradeCommission/TicketDetails.vue
View file @ 8f6a7584
......@@ -321,20 +321,28 @@
},err=>{})
},
goTuanDetails(row) {
let name = ''
if (row.IsOneDayOrder == 1) {
name = 'groupTourOrderByTuanOne'
} else {
name = 'groupTourOrderByTuan'
}
this.$router.push({
name: name,
query: {
id: row.TCID,
tcmun: row.TCNUM,
blank: "y",
}
});
this.$router.push({
path: 'TeamBalancePayment',//TravelControlList
query: {
id: row.TCID,
blank: 'y',
tab: '团队收支'//团控列表
}
});
// let name = ''
// if (row.IsOneDayOrder == 1) {
// name = 'groupTourOrderByTuanOne'
// } else {
// name = 'groupTourOrderByTuan'
// }
// this.$router.push({
// name: name,
// query: {
// id: row.TCID,
// tcmun: row.TCNUM,
// blank: "y",
// }
// });
},
clickUrl(row,type){
let data = [{
......
src/components/FinancialModule/domestic/OPsalesCommissiondetails.vue
View file @ 8f6a7584
......@@ -4,26 +4,26 @@
position: relative;
top: 1px;
}
.opUl li {
display: inline-block;
margin: 10px 15px 10px 0;
}
.domesticCommissiondetails .opUl li input {
height: 34px !important;
}
.domesticCommissiondetails .singeRowTable tr td {
padding: 8px 5px;
}
.domesticCommissiondetails .hoverSpan span:hover {
cursor: pointer;
text-decoration: underline;
color: red;
}
</style>
<template>
<div class="flexOne domesticCommissiondetails">
......@@ -69,7 +69,7 @@
</el-option>
</el-select>
</li>
<!-- <li>
<em>订单号</em>
<el-input maxlength="50" v-model="msg.OrderId" class="permiss-input w200"
......@@ -80,9 +80,9 @@
<el-input maxlength="50" v-model="msg.TCNUM" class="permiss-input w200"
@keyup.native.enter="handleCurrentChange(1)" :placeholder="$t('pub.pleaseImport')"></el-input>
</li>
</ul>
</div>
<!-- <li>
......@@ -94,12 +94,12 @@
<span style="margin-left: 15px;">总人数：{{TotalNum}}人</span>
</div>
<input type="button" class="normalBtn" value="导出" @click="exportExcel">
</div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"
style="margin-top: 10px;">
<tr>
<th>公司</th>
<th>部门</th>
<th>销售</th>
......@@ -108,14 +108,14 @@
<!-- <th>订单号</th> -->
<th>人数</th>
<th>提成</th>
<th>期数</th>
<th width='400'>备注</th>
<!-- <th>操作</th> -->
</tr>
<tr v-for="item in dataList">
<td>{{item.BranchName}}</td>
<td>{{item.DeptName}}</td>
<td>{{item.UserName}}</td>
......@@ -124,24 +124,24 @@
<span style="cursor: pointer;text-decoration: underline;" @click="goTravel(item.TCID)">
{{item.TCNUM}}({{item.TCID}})
</span>
</td>
<td>{{item.TCProfit}}</td>
<td>{{item.PeopleCount}}</td>
<td>{{item.CommissionMoney}}</td>
<td>{{item.Periods}}</td>
<td>{{item.Description}}</td>
<!-- <td>
<el-tooltip class="item" effect="dark" content="查看" placement="top">
<el-button type="primary" class="CM_look" @click="goUrl('OPCommissionDetail',item.ID)"
icon="iconfont icon-chakan" circle></el-button>
</el-tooltip>
</td> -->
</tr>
<tr v-if="dataList.length==0">
......@@ -152,10 +152,10 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
</el-pagination>
</div>
</template>
<script>
import moment from "moment"
export default {
......@@ -186,7 +186,7 @@
TotalMoney: 0,
TotalNum: 0,
disabled: true
}
},
mounted() {
......@@ -205,7 +205,7 @@
if (this.$route.query.TCNUM) {
this.msg.TCNUM = this.$route.query.TCNUM
}
if (this.$route.query.RB_Department_Id && this.$route.query.RB_Department_Id > 0) {
this.msg.RB_Department_Id = Number(this.$route.query.RB_Department_Id)
}
......@@ -275,7 +275,7 @@
res => {
if (res.data.resultCode == 1) {
this.BranchList = res.data.data;
}
},
err => {}
......@@ -290,7 +290,7 @@
if (this.PeriodsList && this.PeriodsList.length > 0) {
// this.msg.Periods = Number(this.PeriodsList[0].Id)
}
} else {
this.Error(res.data.message);
}
......@@ -298,8 +298,8 @@
null
);
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
......@@ -342,7 +342,7 @@
let msg = JSON.parse(JSON.stringify(this.msg))
if (msg.OrderId == '') {
msg.OrderId = 0
}
let userInfo = this.getLocalStorage();
msg.EmployeeIdUser = userInfo.EmployeeId
......@@ -351,17 +351,16 @@
},
goTravel(TCID) { //跳转到团队列表
this.$router.push({
path: 'TravelControlList',
path: 'TeamBalancePayment',//TravelControlList
query: {
TCID: TCID,
id: TCID,
blank: 'y',
tab: '团控列表'
tab: '团队收支'//团控列表
}
});
}
}
}
</script>
\ No newline at end of file
src/components/FinancialModule/domesticCommission.vue
View file @ 8f6a7584
......@@ -81,7 +81,7 @@
icon="iconfont icon-chakan" circle></el-button>
</el-tooltip>
<el-tooltip v-if="cMaker==true" class="item" effect="dark" content="制单" placement="top">
<el-button @click="YijianZD(item)" type="danger" class="CM_look" v-if="cMaker==true"
<el-button @click="YijianZD(item)" type="danger" class="CM_look" v-if="cMaker==true"
icon="iconfont icon-mui-icon-add" circle></el-button>
</el-tooltip>
......@@ -168,7 +168,7 @@
if (res.data.resultCode == 1) {
this.PeriodsList = res.data.data;
// if(this.PeriodsList && this.PeriodsList.length>0){
// this.msg.Periods = Number(this.PeriodsList[0].Id)
// this.msg.Periods = Number(this.PeriodsList[0].Id)
// }
......@@ -237,7 +237,7 @@
);
},
YijianZD(item) {
let Money
let Money
if(this.msg.OutBranchId>-1){
if(item.BranchCommission>0){
Money=item.BranchCommission
......@@ -270,7 +270,7 @@
query.id = 28
query.Name = "总部销售提成单"
}
this.$router.push({
path: "/addFinancialDocuments",
query
......@@ -291,4 +291,4 @@
}
}
</script>
\ No newline at end of file
</script>
src/components/FinancialModule/domesticCommissiondetails.vue
View file @ 8f6a7584
......@@ -345,11 +345,11 @@
},
goTravel(TCID) { //跳转到团队列表
this.$router.push({
path: 'TravelControlList',
path: 'TeamBalancePayment',//TravelControlList
query: {
TCID: TCID,
id: TCID,
blank: 'y',
tab: '团控列表'
tab: '团队收支'//团控列表
}
});
}
......
src/components/SalesModule/groupTourOrder.vue
View file @ 8f6a7584
......@@ -180,7 +180,6 @@
.productQuerybottomLayer {
overflow: auto;
position: fixed;
/* max-height: 300px; */
z-index: 50;
bottom: 0;
left: 0;
......@@ -1309,29 +1308,7 @@
</el-row>
</el-form>
</div>
<!-- 修改备注 -->
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="isShowLayerRemarks"
style="height: 150px; min-height: 150px">
<p>
{{ $t("salesModule.UpRemarks") }}
<span class="fr" v-if="remarksMsg.isOrder == '1'">
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="cancelSubmitRemarks()" />
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitFormRematks('remarksMsg')" />
</span>
<span class="fr" v-else style="color: red">
{{ $t("salesModule.OPjinzhi") }}
</span>
</p>
<el-form :model="remarksMsg" ref="remarksMsg" label-position="right" :rules="RemarksRules" label-width="80px">
<el-row :gutter="20">
<el-col :span="24">
<el-form-item :label="$t('pub.pubRemark')" prop="Remarks">
<el-input v-model="remarksMsg.Remarks" type="textarea" maxlength="500"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!-- 申请优惠-->
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="SpecialOffer"
style="height: 150px; min-height: 200px">
......@@ -1968,7 +1945,7 @@
</el-upload>
</template>
<br />
<p style="color:red;font-size:12px;">申请发票需要上传确认函</p>
<p style="color:red;font-size:12px;">申请发票需要上传确认函</p>
</td>
<td class="groupTourOrderIcon">
<el-button-group v-if="item.commissionSharePeople !== userId">
......@@ -2406,6 +2383,12 @@
</div>
</div>
</div>
<!-- 修改订单备注 -->
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="isShowLayerRemarks"
style="height:150px;min-height:150px">
<orderRemark v-if="isShowLayerRemarks" :remarksMsg="remarksMsg" @close="closeDialog" @success="refreshPage">
</orderRemark>
</div>
<div class="combottomDiv" v-if="showChangeSales" style="height: 200px">
<updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan>
</div>
......@@ -2445,7 +2428,7 @@
import tripDownLoadCommon from "../commonPage/TripDownLoadCommon.vue";
import updateSalesMan from "../commonPage/updateSalesMan.vue";
import commissionDialog from "../FinancialModule/TradeCommission/commissionDialog"
import orderRemark from "../orderCommon/order-remark.vue"; //订单备注
export default {
data() {
return {
......@@ -2762,7 +2745,8 @@
payurlItem1: payURL1,
tripDownLoadCommon: tripDownLoadCommon,
updateSalesMan: updateSalesMan,
commissionDialog
commissionDialog,
orderRemark: orderRemark,
},
filters: {
priceFormat(value) {
......@@ -2784,6 +2768,15 @@
},
},
methods: {
//关闭弹窗
closeDialog() {
this.isShowLayerRemarks = false;
},
//刷新页面
refreshPage() {
this.isShowLayerRemarks = false;
this.getList();
},
GetSupperOrderEditAuth() {
var actionCode = this.$AuthCode.F_InvoiceManagement;
var actionCodeNew = this.$AuthCode.F_Finance_Create;
......@@ -3465,20 +3458,13 @@
})
.then(() => {
return;
this.isShowLayerRemarks = true;
this.isShowLayer = false;
this.$refs["addMsg"].resetFields();
this.clearMsg();
this.remarksMsg.OrderId = obj.orderId;
this.remarksMsg.Remarks = obj.remarks;
this.remarksMsg.OldRemarks = obj.remarks;
this.remarksMsg.isOrder = obj.isOrder;
})
.catch(() => {
this.$message.info("已取消！");
});
} else {
this.isShowLayerRemarks = true;
this.isShowLayer = false;
this.$refs["addMsg"].resetFields();
this.clearMsg();
......@@ -3486,6 +3472,7 @@
this.remarksMsg.Remarks = obj.remarks;
this.remarksMsg.OldRemarks = obj.remarks;
this.remarksMsg.isOrder = obj.isOrder;
this.isShowLayerRemarks = true;
}
},
getDetail(obj) {
......@@ -4130,33 +4117,7 @@
}
});
},
submitFormRematks(RemarksMsg) {
//提交创建、修改表单
this.$refs[RemarksMsg].validate((valid) => {
if (valid) {
this.apipost(
"sellorder_post_SetOrderRemarks",
this.remarksMsg,
(res) => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.remarksMsg.Remarks = "";
this.remarksMsg.OrderId = "0";
this.remarksMsg.isOrder = "1";
this.getList();
this.isShowLayerRemarks = false;
} else {
this.isShowLayerRemarks = false;
this.$message.error(res.data.message);
}
},
(err) => {}
);
} else {
return false;
}
});
},
cancelSubmit() {
this.isShowLayer = false;
this.$refs["addMsg"].resetFields();
......
src/components/SalesModule/groupTourOrderByTuanOne.vue
View file @ 8f6a7584
......@@ -1461,29 +1461,7 @@
</el-row>
</el-form>
</div>
<!-- 修改备注 -->
<div class="productQuerybottomLayer ownScrollbarStyle" v-if="isShowLayerRemarks"
style="height: 150px;min-height:150px;">
<p>修改备注
<span class="fr" v-if="remarksMsg.isOrder==1" style="margin-right:0px;">
<input type="button" class="hollowFixedBtn" value="取消" @click="cancelSubmitRemarks()" />
<input type="button" class="normalBtn" value="保存" @click="submitFormRematks('remarksMsg')" />
</span>
<span class="fr" v-else style="color:red;">
OP已禁止修改订单信息，请联系OP修改备注。
</span>
</p>
<el-form :model="remarksMsg" ref="remarksMsg" label-position="right" :rules="RemarksRules" label-width="80px">
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="备注" prop="Remarks">
<el-input v-model='remarksMsg.Remarks' type='textarea' maxlength='500'></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!--<span>{{tuanInfo}}</span>-->
<div
style="float:left; border-radius: 4px; margin: 20px 20px 20px 0; padding: 0 10px; height: 34px; line-height: 34px; background: #D2D2D2; font-size: 14px; color: #333; font-weight: bold;">
{{tuanInfo.config&&tuanInfo.config.LtName}}&nbsp;&nbsp;{{tuanInfo.config&&tuanInfo.config.TCNUM}}&nbsp;&nbsp;<span
......@@ -2307,6 +2285,14 @@
<button class="hollowFixedBtn" @click="OrderMoneyDialog=false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
<!-- 修改订单备注 -->
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="isShowLayerRemarks"
style="height:150px;min-height:150px">
<orderRemark v-if="isShowLayerRemarks" :remarksMsg="remarksMsg" @close="closeDialog" @success="refreshPage">
</orderRemark>
</div>
<a id='groupTourOrderByTuan_DownLoad' target="_blank" style="display:none">1不要删除</a>
</div>
</template>
......@@ -2317,6 +2303,7 @@
import payURL1 from "../commonPage/payURL1.vue";
import tripDownLoadCommon from "../commonPage/TripDownLoadCommon.vue";
import updateSalesMan from "../commonPage/updateSalesMan.vue";
import orderRemark from "../orderCommon/order-remark.vue"; //订单备注
export default {
data() {
return {
......@@ -2783,7 +2770,8 @@
payurlItem: payURL,
payurlItem1: payURL1,
tripDownLoadCommon: tripDownLoadCommon,
updateSalesMan: updateSalesMan
updateSalesMan: updateSalesMan,
orderRemark: orderRemark,
},
watch: {
fullHeight(val) {
......@@ -2817,6 +2805,15 @@
}
},
methods: {
//关闭弹窗
closeDialog() {
this.isShowLayerRemarks = false;
},
//刷新页面
refreshPage() {
this.isShowLayerRemarks = false;
this.getList();
},
getCountry() {
//获取国家
let msg = {};
......
src/components/SalesModule/groupTourOrderOne.vue
View file @ 8f6a7584
......@@ -1173,27 +1173,11 @@
</el-row>
</el-form>
</div>
<!-- 修改备注 -->
<!-- 修改订单备注 -->
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="isShowLayerRemarks"
style="height: 150px;min-height:150px;">
<p>{{$t('salesModule.UpRemarks')}}
<span class="fr" v-if="remarksMsg.isOrder=='1'">
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="cancelSubmitRemarks()" />
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitFormRematks('remarksMsg')" />
</span>
<span class="fr" v-else style="color:red;">
{{$t('salesModule.OPjinzhi')}}。
</span>
</p>
<el-form :model="remarksMsg" ref="remarksMsg" label-position="right" :rules="RemarksRules" label-width="80px">
<el-row :gutter="20">
<el-col :span="24">
<el-form-item :label="$t('pub.pubRemark')" prop="Remarks">
<el-input v-model='remarksMsg.Remarks' type='textarea' maxlength='500'></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
style="height:150px;min-height:150px">
<orderRemark v-if="isShowLayerRemarks" :remarksMsg="remarksMsg" @close="closeDialog" @success="refreshPage">
</orderRemark>
</div>
<!-- 申请优惠-->
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="SpecialOffer"
......@@ -1860,7 +1844,7 @@
import tripDownLoadCommon from '../commonPage/TripDownLoadCommon.vue'
import updateSalesMan from '../commonPage/updateSalesMan.vue'
import commissionDialog from "../FinancialModule/TradeCommission/commissionDialog"
import orderRemark from "../orderCommon/order-remark.vue"; //订单备注
export default {
data() {
return {
......@@ -2238,7 +2222,8 @@
payurlItem1: payURL1,
tripDownLoadCommon: tripDownLoadCommon,
updateSalesMan: updateSalesMan,
commissionDialog
commissionDialog,
orderRemark: orderRemark,
},
watch: {
fullHeight(val) {
......@@ -2272,6 +2257,15 @@
}
},
methods: {
//关闭弹窗
closeDialog() {
this.isShowLayerRemarks = false;
},
//刷新页面
refreshPage() {
this.isShowLayerRemarks = false;
this.getList();
},
//跳转至领取合同
goContract(item, sItem) {
let routeData = this.$router.resolve({
......@@ -3415,33 +3409,7 @@
}
})
},
submitFormRematks(RemarksMsg) {
//提交创建、修改表单
this.$refs[RemarksMsg].validate(valid => {
if (valid) {
this.apipost(
'sellorder_post_SetOrderRemarks',
this.remarksMsg,
res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message)
this.remarksMsg.Remarks = ''
this.remarksMsg.OrderId = '0'
this.remarksMsg.isOrder = '1'
this.getList()
this.isShowLayerRemarks = false
} else {
this.isShowLayerRemarks = false
this.$message.error(res.data.message)
}
},
err => {}
)
} else {
return false
}
})
},
cancelSubmit() {
this.isShowLayer = false
this.$refs['addMsg'].resetFields()
......
src/components/SalesModule/productOrderList.vue
View file @ 8f6a7584
......@@ -84,7 +84,7 @@
.superSearchLayer>div>span {
margin: 0 15px 0 5px;
}
.productQuerybottomLayer {
overflow: auto;
position: fixed;
......@@ -322,7 +322,7 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
</el-pagination>
</div>
</template>
......@@ -394,7 +394,7 @@
for (let i = 0; i < res.data.data.pageData.length; i++) {
res.data.data.pageData[i]["wxImage"] = "";
}
this.list = res.data.data.pageData;
this.list = res.data.data.pageData;
this.list.forEach(element => {
element.check = false
});
......@@ -543,7 +543,10 @@
}
if (this.msg.StartTime === "") {
let nowDay = this.FormartDate(new Date());
this.msg.StartTime = nowDay;
let nowdays = new Date()
let Year = new Date().getFullYear()
this.msg.StartTime = Year+'-01-01';
}
this.getCompanyList();//公司
this.getList();//产品列表
......
src/components/SingleContract.vue
View file @ 8f6a7584
......@@ -416,7 +416,7 @@
<tr>
<td>
<el-form-item label="合同章">
<el-select v-model="CtObj.SignType" placeholder="请选择">
<el-select v-model="CtObj.SignType" placeholder="请选择" @change="changeSignType">
<el-option key="0" label="和平章" :value="0">
</el-option>
<el-option key="1" label="日本公司章" :value="1">
......@@ -1271,7 +1271,7 @@
Tourists_Fax: "",
Tourists_EmergencyLinkMan: "",
Tourists_EmergencyLinkTel: "",
SignType:0,//合同章类型
SignType: 0, //合同章类型
TravelAgency_Name: "（株）ピースインターナショナル", //旅行社名称
TravelAgency_LicenseNum: "L-SC-CJ00015",
TravelAgency_DealMan: "",
......@@ -1438,6 +1438,15 @@
}
},
methods: {
changeSignType() {
if (this.CtObj.SignType == 0) {
this.CtObj.TravelAgency_Name = "四川和平国际旅行社有限公司";
this.CtObj.TravelAgency_Address = "成都市锦江区一环路东五段87号2幢23层2310.2311.2312号"
} else {
this.CtObj.TravelAgency_Name = "（株）ピースインターナショナル";
this.CtObj.TravelAgency_Address = "東京都北区滝野川5－41－3　TKビル9階";
}
},
//跳转锚点
goAnchor(selector) {
var anchor = this.$el.querySelector(selector)
......@@ -1777,7 +1786,9 @@
this.CtObj.HotelTotalPrice = tempObj.HotelTotalPrice;
this.CtObj.PickUpTotalPrice = tempObj.PickUpTotalPrice;
this.CtObj.VisaTotalPrice = tempObj.VisaTotalPrice;
this.CtObj.SignType=tempObj.SignType;
this.CtObj.SignType = tempObj.SignType;
this.CtObj.TravelAgency_Name=tempObj.TravelAgency_Name;
this.CtObj.TravelAgency_Address=tempObj.TravelAgency_Address;
this.CtObj.TicketAndHotelTotalPrice =
tempObj.TicketAndHotelTotalPrice;
if (
......
src/components/TravelContractConfirm.vue
View file @ 8f6a7584
......@@ -3803,6 +3803,8 @@
this.CtObj.Tourists_Sign = tempObj.Tourists_Sign;
this.CtObj.IsTravelAgencySignature = tempObj.IsTravelAgencySignature;
this.CtObj.ZhangImg = tempObj.ZhangImg;
this.CtObj.TravelAgency_Name = tempObj.TravelAgency_Name;
this.CtObj.TravelAgency_Address = tempObj.TravelAgency_Address;
this.CtObj.TicketAndHotelTotalPrice =
tempObj.TicketAndHotelTotalPrice;
if (
......
src/components/TravelContractView.vue
View file @ 8f6a7584
......@@ -409,7 +409,7 @@
</div>
<div class="contract">
<div class="title">
<h1>四川和平国际旅行社有限公司-单项委托协议[平台版2018]</h1>
<h1>{{CtObj.TravelAgency_Name}}-单项委托协议[平台版2018]</h1>
<p class="contractNo">合同编号：<span>{{CtObj.T_ContractNum}}</span></p>
</div>
<div class="menu">
......@@ -2268,6 +2268,8 @@
this.CtObj.Tourists_Sign = tempObj.Tourists_Sign;
this.CtObj.IsTravelAgencySignature = tempObj.IsTravelAgencySignature;
this.CtObj.ZhangImg = tempObj.ZhangImg;
this.CtObj.TravelAgency_Name = tempObj.TravelAgency_Name;
this.CtObj.TravelAgency_Address = tempObj.TravelAgency_Address;
this.CtObj.TicketAndHotelTotalPrice =
tempObj.TicketAndHotelTotalPrice;
if (
......
src/components/administrative/ElectronicAudit.vue
View file @ 8f6a7584
......@@ -290,6 +290,7 @@
<td>{{ item.C_TCNUM }}</td>
<td>{{ item.C_ProductName }}</td>
<td>
<span v-if="item.Status==3" style="color:red;">已驳回</span>
<span v-else-if="item.Status==1" style="color:blue;">待审核</span>
<span v-else-if="item.Status==2" style="color:green;">审核通过</span>
......@@ -315,7 +316,7 @@
<el-button type="danger" icon="iconfont icon-chehui" circle @click="SubmitContract(item,3)">
</el-button>
</el-tooltip>
<template v-if="item.Status==2">
<template v-if="item.Status==2||item.Status==4">
<el-tooltip class="item" effect="dark"
v-if="item.IsTravelAgencySignature==null|| item.IsTravelAgencySignature==0 " content="盖章"
placement="top-start">
......
src/components/commonPage/comCheckHotelV2.vue
View file @ 8f6a7584
......@@ -206,7 +206,6 @@
},
methods: {
getCheckHotel() {
this.dataList = [];
this.HotelList = [];
this.ThirdHotelList=[];
......@@ -300,7 +299,6 @@
}
}, err => {}, true)
},
handleCurrentChange(val) {
this.thirdHotelMsg.displayFrom = val;
this.GetThirdHotelList();
......
src/components/orderCommon/order-form2.vue
View file @ 8f6a7584
......@@ -147,7 +147,7 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<!--出发是否联运-->
......@@ -190,7 +190,7 @@
<el-switch v-model="addMsg.IsReturnIntermodal" active-value="1" inactive-value="2"
@change="getUnionTravelPrice(priceObj, 2)"></el-switch>
</el-form-item>
</el-col>
<el-col :span="4">
<!--返程联运时间-->
......
src/components/orderCommon/order-remark.vue 0 → 100644
View file @ 8f6a7584
<style scoped>
.commonOrderRemarkForm {
position: fixed;
left: 0;
right: 0;
bottom: 0;
z-index: 2;
overflow: auto;
/* max-height: 300px; */
border-top: 3px solid #38425d;
background-color: #ffffff;
padding: 10px 10px 0;
width: 100%;
padding: 20px 20px 10px 80px;
}
.commonOrderRemarkForm .title {
border-left: 3px solid #e95252;
text-indent: 15px;
height: 16px;
font-family: "PingFangSc-Fine";
font-size: 16px;
margin-bottom: 20px;
line-height: 14px;
color: #000;
}
</style>
<!--订单备注-->
<template>
<div class="commonOrderRemarkForm" style="height:150px;">
<p class="title">
修改备注
<span class="fr" v-if="postMsg.isOrder == 1" style="margin-right: 0px">
<input type="button" class="hollowFixedBtn" value="取消" @click="cancelSubmitRemarks()" />
<input type="button" class="normalBtn" value="保存" @click="submitFormRematks('orderRemarkMsg')" />
</span>
<span class="fr" v-else style="color: red">
OP已禁止修改订单信息，请联系OP修改备注。
</span>
</p>
<el-form :model="postMsg" ref="orderRemarkMsg" label-position="right" :rules="RemarksRules" label-width="80px">
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="备注" prop="Remarks">
<el-input v-model="postMsg.Remarks" type="textarea" maxlength="500"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</template>
<script>
export default {
props: ["remarksMsg"],
data() {
return {
RemarksRules: {
Remarks: [{
required: true,
message: "请输入备注信息",
trigger: "blur",
}],
},
postMsg: {
OrderId: "0",
OldRemarks: "",
Remarks: "",
isOrder: 1, //1-可以修改，0-不能修改【默认可以修改】
},
};
},
methods: {
//取消备注
cancelSubmitRemarks() {
this.postMsg.Remarks = "";
this.postMsg.OrderId = "0";
this.postMsg.isOrder = 1;
//关闭弹窗 调用父页面方法
this.$emit("close");
},
//提交备注信息
submitFormRematks(orderRemarkMsg) {
//提交创建、修改表单
this.$refs[orderRemarkMsg].validate((valid) => {
if (valid) {
this.apipost(
"sellorder_post_SetOrderRemarks",
this.postMsg,
(res) => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.postMsg.Remarks = "";
this.postMsg.OrderId = "0";
this.postMsg.isOrder = 1;
//调用父页面刷新方法
this.$emit("success");
} else {
this.$message.error(res.data.message);
}
},
(err) => {}
);
} else {
return false;
}
});
},
},
mounted() {
},
watch: {
//监听备注信息编号
remarksMsg: {
immediate: true,
handler(newVal) {
console.log("old", newVal);
this.postMsg.OrderId = this.remarksMsg.OrderId;
this.postMsg.OldRemarks = this.remarksMsg.OldRemarks;
this.postMsg.Remarks = this.remarksMsg.Remarks;
this.postMsg.isOrder = this.remarksMsg.isOrder;
},
deep: true
},
}
};
</script>
src/components/orderCommon/productOrderList.vue
View file @ 8f6a7584
......@@ -1151,7 +1151,7 @@
this.tripDetails = this.list[index].flightList;
},
goBuy(obj) {
this.teamInfo = obj;
this.teamInfo = JSON.parse(JSON.stringify(obj));
this.isShowTeamOrder = true;
},
// 产品详情
......
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