Skip to content

S
SuperMan
Commit 44b79b57 authored by wuchun's avatar wuchun
Browse files
Options

解决冲突

parents 8a8305f8 3e8f9c29
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4371 additions and 4071 deletions
src/assets/css/newTravelManager.css
View file @ 44b79b57
......@@ -1900,7 +1900,7 @@
min-height: 130px;
}
.quoTation ._content li{display: flex;padding: 0 30px;margin-top: 20px;height:65px;border: 1px solid #dddddd;background-color: white;font-size:12px;}
.quoTation ._content li{display: flex;padding: 0 30px;margin-top: 20px;height:75px;border: 1px solid #dddddd;background-color: white;font-size:12px;}
.quoTation ._content li:hover{box-shadow:0px 0px 20px rgba(191,191,191,1);transition: all linear 0.5s;}
.quoTation ._content li>div{padding: 9px 0}
.quoTation .QT_Style{width:30px;height:30px;background-color: #2AAEF2;border-radius:50%;font-size: 15px;line-height: 30px;
......
src/components/Buying/BuyingAdd.vue
View file @ 44b79b57
This diff is collapsed.
src/components/Contract/ElectronicContract.vue
View file @ 44b79b57
......@@ -920,7 +920,7 @@
<div class="EC_div" :class="{'checkedNav':cked==7}">
<div class="EC_ComTitle">委托授权书</div>
<template v-for="(item,index) in dataList.guestList">
<p class="shouquanNum" >{{index+1}}</p>
<p class="shouquanNum">{{index+1}}</p>
<div class="shouquanDiv">
<p class="ShouDiv_Title">委托授权书</p>
<p><span>{{dataList.company}}</span>：</p>
......@@ -939,7 +939,7 @@
联系电话：<span>{{dataList.clientCall}}</span>
</p>
<p>受托人承诺：本授权委托书为<span>{{item.surName+''+item.name}}
</span>（委托人姓名）本人出具，若不属实，因此产生的全部法律责任由受托人承担。受托人代表其他委托人在本合同书上签字，将严格履行受托人的权利和义务，将本合同的全部内容逐一向我代表的每一位委托人转达。>
</span>（委托人姓名）本人出具，若不属实，因此产生的全部法律责任由受托人承担。受托人代表其他委托人在本合同书上签字，将严格履行受托人的权利和义务，将本合同的全部内容逐一向我代表的每一位委托人转达。>
</p>
<p style="text-align:right;margin:20px 40px 20px 0">委托日期：<span>{{getDate(dataList.payDate)}}</span></p>
</div>
......@@ -1171,8 +1171,10 @@
</div>
<div class="EC_floatdiv">
<input type="button" class="normalBtn" v-if="dataList.status==1" @click="getinvalid()" value="作废" />
<input type="button" class="normalBtn" v-if="dataList.companySignature==''" @click="isShowFade=true,GetQrCode()" value="客户签字" />
<input type="button" class="normalBtn" v-if="dataList.companySignature!=''" value="下载" @click="toContractPDF(dataList.contractNum)" />
<input type="button" class="normalBtn" v-if="dataList.companySignature==''" @click="isShowFade=true,GetQrCode()"
value="客户签字" />
<input type="button" class="normalBtn" v-if="dataList.companySignature!=''" value="下载"
@click="toContractPDF(dataList.contractNum)" />
</div>
</div>
<div class="fade" v-show="isShowFade"></div>
......@@ -1201,7 +1203,7 @@
dataList: [],
isShowFade: false,
QRCodeStr: "",
pdfLoading:false
pdfLoading: false
};
},
methods: {
......@@ -1229,8 +1231,7 @@
} else {
}
}).catch(err => {
})
}).catch(err => {})
},
// 生成pdf
......@@ -1240,7 +1241,7 @@
TCID: this.$route.query.TCID,
orderID: this.$route.query.orderID,
};
this.pdfLoading=true;
this.pdfLoading = true;
this.$http({
headers: {
'Content-Type': 'application/json'
......@@ -1268,8 +1269,7 @@
},
//获取数据
getList() {
//this.apiJavaPost("/api/contract/getContractInfo", this.msg, res => {
this.apipost("travelcontract_post_GetContractInfoService", this.msg, res => {
this.apipost("travelcontract_post_GetContractInfoService", this.msg, res => {
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
} else {
......@@ -1318,21 +1318,20 @@
//作废
getinvalid() {
this.$confirm('是否作废?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.dataList.status=0;
//this.apiJavaPost("/api/contract/dosaveOrUpdate",this.dataList,res => {
this.apipost("travelcontract_post_UpdateStatusContractService", this.dataList, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
},null);
this.dataList.status = 0;
this.apipost("travelcontract_post_UpdateStatusContractService", this.dataList, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
}, null);
}).catch(() => {
this.$message.info('取消删除');
this.$message.info('取消删除');
});
}
},
......
src/components/Contract/TravelContract.vue
View file @ 44b79b57
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ 44b79b57
......@@ -333,7 +333,7 @@
this.GetList = newList;
}else{
this.GetList.forEach(y=>{
y.showYes = true
y.showYes = false
newList.push(JSON.parse(JSON.stringify(y)))
})
}
......
src/components/FinancialModule/FProcessManagement.vue
View file @ 44b79b57
......@@ -102,7 +102,7 @@
<span>注：财务基本流程包括（收款流程，付款流程，发票流程），如果需要其他的流程，比如退款流程等请在自定义流程下新增流程设置</span>
</li> -->
<li><input type="button" class="normalBtn" value="新增流程" @click="goUrl('addFinancialProcess',0,8)"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex();getTemplateList();"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex()"/>
</li>
</ul>
</div>
......@@ -125,6 +125,18 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="是否启用">
<el-tooltip :content="msg.Status==1?'启用':'停用'" placement="top">
<el-switch
@change="resetPageIndex"
v-model="msg.Status"
active-value="1"
inactive-value="2">
</el-switch>
</el-tooltip>
</el-form-item>
</el-col>
</el-row>
</el-form>
</ul>
......@@ -284,7 +296,8 @@ export default {
pageSize:6,
RB_BranchId:-1,
Name:'',
CostTypeID:0
CostTypeID:0,
Status:'1'
}
}
},created(){
......@@ -419,6 +432,7 @@ export default {
resetPageIndex() {
this.msg.pageIndex = 1
this.currentPage = 1
this.getTemplateList()
},
goUrl(path,id,isZ,Branch_Id) {
this.$router.push({ name: path,query:{"id":id,"isZ":isZ,"blank":'y',tab:"修改流程"} })
......
src/components/FinancialModule/ReportForm/ElectricalProfits.vue
View file @ 44b79b57
<template>
<div class="Sheepcommission">
<div class="query-box">
<div class="query-box">
<ul>
<li>
<span>
<em>名称</em>
<el-input type="text" v-model="msg.Name" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
<span>
<em>名称</em>
<el-input type="text" v-model="msg.Name" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>手机</em>
<el-input type="text" v-model="msg.Moblie" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
<span>
<em>手机</em>
<el-input type="text" v-model="msg.Moblie" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()" />
</li>
</ul>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<tr>
<th>用户ID</th>
<th>名称</th>
<th>手机</th>
<th>分销等级</th>
<th>累计佣金</th>
<th>可提现佣金</th>
<th>待结算佣金</th>
<th>可提现佣金</th>
<th>待结算佣金</th>
<th>已结算佣金</th>
</tr>
<tr v-for="(item,i) in dataList" :key="i">
<td>{{item.UserId}}</td>
......@@ -40,88 +39,82 @@
<td>{{item.TotalCommission}}</td>
<td>{{item.CommissionWithdrawal}}</td>
<td>
<span @click="goUrl(item)" class="underline point">{{item.WaitCommission}}</span>
<span @click="goUrl(item)" class="underline point">{{item.WaitCommission}}</span>
</td>
<td>
<span @click="goUrl(item)" class="underline point">{{item.Commission}}</span>
<span @click="goUrl(item)" class="underline point">{{item.Commission}}</span>
</td>
</tr>
<tr v-if="dataList.length==0">
<td colspan="15" align="center">暂无数据</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total='total'>
</el-pagination>
<el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize" :total='total'>
</el-pagination>
</div>
</template>
<script>
import moment from "moment";
export default {
name: "Feedback",
data() {
return {
total: 0,
msg: {
pageIndex: 1,
pageSize: 10,
Name:'',
Moblie:'',
IsSelectCommpany:1
},
dataList: [],
loading: false
};
},
created() {
this.getList();
},
mounted() {},
methods: {
goUrl(item) {
this.$router.push({
name: "commissionSubsidiary",
query: {
UserId: item.UserId,
blank:'y'
}
})
import moment from "moment";
export default {
name: "Feedback",
data() {
return {
total: 0,
msg: {
pageIndex: 1,
pageSize: 10,
Name: '',
Moblie: '',
IsSelectCommpany: 1
},
dataList: [],
loading: false
};
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
created() {
this.getList();
},
getList() {
this.loading = true;
this.apipost('Financial_get_GetMallUserCommissionPageList',this.msg,res=>{
mounted() {},
methods: {
goUrl(item) {
this.$router.push({
name: "commissionSubsidiary",
query: {
UserId: item.UserId,
blank: 'y'
}
})
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
getList() {
this.loading = true;
this.apipost('Financial_get_GetMallUserCommissionPageList', this.msg, res => {
this.loading = false;
if(res.data.resultCode==1){
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
}else{
this.$message.error(res.data.message);
}
},err=>{})
// this.apiJavaPostSmall("/api/ERPOrderCommission/GetDistributionCommissionPageList", this.msg, res => {
// if (res.data.resultCode === 1) {
// this.total = res.data.data.count;
// this.dataList = res.data.data.pageData;
// } else {
// this.Error(res.data.message);
// }
// }, null);
} else {
this.$message.error(res.data.message);
}
}, err => {})
},
}
};
}
};
</script>
<style>
.Sheepcommission .underline{
.Sheepcommission .underline {
text-decoration: underline;
}
.Sheepcommission .point{
}
.Sheepcommission .point {
cursor: pointer;
}
}
</style>
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 44b79b57
......@@ -1526,6 +1526,36 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "RoomFee",
formatter: this.moneyFormat,
title: "房费",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "MealFee",
formatter: this.moneyFormat,
title: "餐费",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "TicketFee",
formatter: this.moneyFormat,
title: "门票费",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "JiPiao",
formatter: this.moneyFormat,
......
src/components/FinancialModule/Sheepcommission.vue
View file @ 44b79b57
<template>
<div class="Sheepcommission">
<div class="query-box">
<div class="query-box">
<ul>
<li>
<span>
<em>名称</em>
<el-input type="text" v-model="msg.Name" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
<span>
<em>名称</em>
<el-input type="text" v-model="msg.Name" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>手机</em>
<el-input type="text" v-model="msg.Moblie" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
<span>
<em>手机</em>
<el-input type="text" v-model="msg.Moblie" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()" />
</li>
</ul>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<tr>
<th>用户ID</th>
<th>名称</th>
<th>手机</th>
<th>分销等级</th>
<th>累计佣金</th>
<th>可提现佣金</th>
<th>待结算佣金</th>
<th>可提现佣金</th>
<th>待结算佣金</th>
<th>已结算佣金</th>
</tr>
<tr v-for="(item,i) in dataList" :key="i">
<td>{{item.UserId}}</td>
......@@ -40,87 +39,81 @@
<td>{{item.TotalCommission}}</td>
<td>{{item.CommissionWithdrawal}}</td>
<td>
<span @click="goUrl(item)" class="underline point">{{item.WaitCommission}}</span>
<span @click="goUrl(item)" class="underline point">{{item.WaitCommission}}</span>
</td>
<td>
<span @click="goUrl(item)" class="underline point">{{item.Commission}}</span>
<span @click="goUrl(item)" class="underline point">{{item.Commission}}</span>
</td>
</tr>
<tr v-if="dataList.length==0">
<td colspan="15" align="center">暂无数据</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total='total'>
</el-pagination>
<el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize" :total='total'>
</el-pagination>
</div>
</template>
<script>
import moment from "moment";
export default {
name: "Feedback",
data() {
return {
total: 0,
msg: {
pageIndex: 1,
pageSize: 10,
Name:'',
Moblie:'',
},
dataList: [],
loading: false
};
},
created() {
this.getList();
},
mounted() {},
methods: {
goUrl(item) {
this.$router.push({
name: "commissionSubsidiary",
query: {
UserId: item.UserId,
blank:'y'
}
})
import moment from "moment";
export default {
name: "Feedback",
data() {
return {
total: 0,
msg: {
pageIndex: 1,
pageSize: 10,
Name: '',
Moblie: '',
},
dataList: [],
loading: false
};
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
created() {
this.getList();
},
getList() {
this.loading = true;
this.apipost('Financial_get_GetMallUserCommissionPageList',this.msg,res=>{
mounted() {},
methods: {
goUrl(item) {
this.$router.push({
name: "commissionSubsidiary",
query: {
UserId: item.UserId,
blank: 'y'
}
})
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
getList() {
this.loading = true;
this.apipost('Financial_get_GetMallUserCommissionPageList', this.msg, res => {
this.loading = false;
if(res.data.resultCode==1){
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
}else{
this.$message.error(res.data.message);
}
},err=>{})
// this.apiJavaPostSmall("/api/ERPOrderCommission/GetDistributionCommissionPageList", this.msg, res => {
// if (res.data.resultCode === 1) {
// this.total = res.data.data.count;
// this.dataList = res.data.data.pageData;
// } else {
// this.Error(res.data.message);
// }
// }, null);
} else {
this.$message.error(res.data.message);
}
}, err => {})
},
}
};
}
};
</script>
<style>
.Sheepcommission .underline{
.Sheepcommission .underline {
text-decoration: underline;
}
.Sheepcommission .point{
}
.Sheepcommission .point {
cursor: pointer;
}
}
</style>
src/components/FinancialModule/addFinancialProcess.vue
View file @ 44b79b57
......@@ -347,7 +347,7 @@
</el-form-item>
<el-form-item v-show="addMsg.IsShow==2" label="可显示部门">
<el-select filterable multiple v-model='addMsg.ShowDepartmentList' class="w200" style="max-height:100px;overflow:hidden" size="small">
<el-option v-for='item in DepartmentList'
<el-option v-for='item in DepartmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
:key='item.DepartmentID'>
......@@ -396,7 +396,7 @@
</el-form-item>
</div>
<el-form-item label="排序">
......@@ -405,12 +405,21 @@
<el-form-item :label="$t('fnc.mbmiaoshu')">
<el-input v-model="addMsg.DescribeInfo" class="w450" maxlength="100"></el-input>
</el-form-item>
<el-form-item label="使用端">
<el-select filterable multiple v-model='addMsg.PortTypeList' class="w200" style="max-height:100px;overflow:hidden" size="small">
<el-option v-for='item in PortTypeList'
:label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</el-form-item>
<div class="approval_page_title">{{$t('fnc.lcshezhi')}}</div>
<div class="approval_page_content">
<div class="approval_person_content">
<span class="approval_span_type">{{$t('fnc.mrspliucheng')}}</span>
<span style="float:right"><el-button @click="Auditshow=true,EditAudit()" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button></span>
<div class="approval_person_list fl">
<span class="approval_person_list_tit">{{$t('fnc.mrspiren')}}</span>
<div class="padding_l88">
......@@ -549,7 +558,7 @@
<el-input v-model.number="item.Sort" size="mini" style="width:200px"></el-input>
</li>
</ul>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="mini" @click="dialogVisible = false">取 消</el-button>
......@@ -566,6 +575,7 @@ export default {
components: { Treeselect },
data(){
return{
PortTypeList: [],
PropertyTypeList:[],
xingzhenState:false,
DepartmentList:[],
......@@ -575,6 +585,8 @@ export default {
TemplateId:0,
radio:1,
addMsg:{
PortTypeList: [],
PortType: '',
Id:0,
Name:'',
DescribeInfo:'',
......@@ -775,8 +787,21 @@ export default {
this.getRole()
this.getEmployeeList();
this.getDepartment();
this.getPortType()
},
methods:{
getPortType(){
this.apipost(
"Template_post_GetPortTypeEnumList",
{},
res => {
if (res.data.resultCode == 1) {
this.PortTypeList=res.data.data;
}
},
err => {}
);
},
getPropertyType(){
this.apipost(
"FinancialFlowTemplate_post_GetPropertyTypeList",
......@@ -809,7 +834,7 @@ export default {
},
RadioShow(val){
if(val==1){
this.addMsg.ShowEmployeeList=[];
this.addMsg.ShowDepartmentList=[];
}
......@@ -833,8 +858,8 @@ export default {
let id=this.myAuditList[i].Sort;
sum+=i+1;
sortnum+=this.myAuditList[i].Sort;
}
if(sum!=sortnum){
this.Error("请输入连续的排序！")
......@@ -846,7 +871,7 @@ export default {
this.Auditshow=false;
},
EditAudit(){
},
handleCheckAllChangeAcc(val) {
this.accListMsg = val ? [1,2,3,4] : [];
......@@ -884,8 +909,9 @@ export default {
this.addMsg.ShowEmployeeList = data.ShowEmployeeList;
this.addMsg.ShowDepartmentList = data.ShowDepartmentList;
this.addMsg.PropertyType= data.PropertyType;
this.addMsg.PortTypeList = data.PortType!=''?data.PortType.split(','):[];
this.addMsg.PortType= data.PortType;
if (data.list && data.list[0] !== -1) {
this.accListMsg = data.list;
}
......@@ -972,6 +998,11 @@ export default {
}
},
saveApproval(){ // 保存数据
if(this.addMsg.PortTypeList&&this.addMsg.PortTypeList.length>0){
this.addMsg.PortType = this.addMsg.PortTypeList.join(',')
}else{
this.addMsg.PortType = ''
}
if(this.xingzhenState){
if(!this.addMsg.PropertyType || this.addMsg.PropertyType=='' ){
this.Error("请选择审批类型！");
......@@ -1047,7 +1078,7 @@ export default {
this.$message.success(this.$t('tips.czchenggong'))
if(this.xingzhenState){
this.$router.push({ name: 'XProcessmanagement',query:{"type":this.addMsg.TemplateType,'Branch_Id':this.$route.query.Branch_Id} })
}else{
this.$router.push({ name: 'FProcessManagement',query:{"type":this.addMsg.TemplateType,'Branch_Id':this.$route.query.Branch_Id} })
......@@ -1058,6 +1089,8 @@ export default {
this.addMsg.TemplateSorce=2;
}
this.addMsg = {
PortTypeList: this.addMsg.PortTypeList,
PortType: this.addMsg.PortType,
PropertyType:'',
Id:this.addMsg.Id,
Name:this.addMsg.Name,
......@@ -1582,7 +1615,7 @@ export default {
AuditList.AuditDescription = this.AuditDescription;
AuditList.SpecialNode = this.GetNodeValue;
this.myAuditList.push(AuditList);
}
}
if(type==10){//分公司op
// if(!this.WindowID){
// this.$message.error("请选择窗口！")
......@@ -1595,7 +1628,7 @@ export default {
AuditList.AuditDescription = this.AuditDescription;
AuditList.SpecialNode = this.GetNodeValue;
this.myAuditList.push(AuditList);
}
}
if(type==11){//总部线控
AuditList.AuditType = 11;
AuditList.RoleOrInitiator = '';
......@@ -1604,7 +1637,7 @@ export default {
AuditList.AuditDescription = this.AuditDescription;
AuditList.SpecialNode = this.GetNodeValue;
this.myAuditList.push(AuditList);
}
}
if(type==8){//记账出纳
// if(!this.WindowID){
// this.$message.error("请选择窗口！")
......@@ -1617,7 +1650,7 @@ export default {
AuditList.AuditDescription = this.AuditDescription;
AuditList.SpecialNode = this.GetNodeValue;
this.myAuditList.push(AuditList);
}
}
if(type==9){//收款出纳
// if(!this.WindowID){
// this.$message.error("请选择窗口！")
......
src/components/FinancialModule/commissionSubsidiary.vue
View file @ 44b79b57
......@@ -170,14 +170,6 @@ export default {
},
err => {}
);
// this.apiJavaPostSmall("/api/ERPOrderCommission/GetDistributionOrderCommissionPageList", this.msg, res => {
// if (res.data.resultCode === 1) {
// this.total = res.data.data.count;
// this.dataList = res.data.data.pageData;
// } else {
// this.Error(res.data.message);
// }
// }, null);
}
}
};
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 44b79b57
......@@ -193,7 +193,8 @@
</td>
</tr>
</table>
<span style="color:red;font-weight:bold">报价金额：{{subItem.OfferUnitPrice}}/人</span>
<span style="font-weight:bold;font-size:14px;">报价酒店：<font style="color:red;">{{subItem.OfferHotelName}}(
{{subItem.OfferUnitPrice}}/标间)</font></span>
</td>
<!-- 机位总数/(Y/E/F) -->
<td v-if="childIndex==0" :rowspan="6">
......@@ -215,9 +216,9 @@
<tr>
<td width="70" style="text-align:center;" colspan="2">
<span style="color:green">{{subItem.NewHotelName}}</span>
<el-popover placement="right" width="540" trigger="click" >
<el-popover placement="right" width="540" trigger="click">
<comCheckHotel :ref="'comCheckHotel'+index+subIndex+''" v-on:childHotel="childHotelList"
:UseDate="item.UseTimeStr" :Country="ChooseCountry" >
:UseDate="item.UseTimeStr" :Country="ChooseCountry">
</comCheckHotel>
<el-button size="small" type="danger" :data-index="'comCheckHotel'+index+subIndex+''"
slot="reference" style="cursor:pointer;"
......@@ -953,7 +954,7 @@
}
}
this.apipost('dmcstatistics_get_GetHotelStaticsDetail_V2', msg, res => {
console.log("dmcstatistics_get_GetHotelStaticsDetail_V2",res.data);
console.log("dmcstatistics_get_GetHotelStaticsDetail_V2", res.data);
if (res.data.resultCode == 1) {
this.IsOperation = res.data.data.IsOperation;
if (this.IsEditHotel == 0) {
......@@ -970,7 +971,7 @@
if (list != null && list.length > 0) {
list.forEach((item, sIndex) => {
item.HotelOrderList.forEach(subItem => {
subItem.hotelList.push({
Name: subItem.NewHotelName,
ID: subItem.NewHotelId
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 44b79b57
......@@ -308,9 +308,10 @@
{{subItem.HotelName}}
</template>
<br />
<span style="color:green">报价金额 :{{subItem.OfferUnitPrice}}/人(标准间)</span>
<span style="font-weight:bold;font-size:14px;">报价酒店：<font style="color:red;">{{subItem.OfferHotelName}}(
{{subItem.OfferUnitPrice}}/标间)</font></span>
<br />
<span style="color:red" v-if="subItem.StandardRoomPrice">实际金额 :{{subItem.StandardRoomPrice}}/人(标准间)</span>
<span style="color:red" v-if="subItem.StandardRoomPrice">实际金额 :{{subItem.StandardRoomPrice}}/人(标间)</span>
</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length" style="text-align:left; ">
<a target="_blank" v-if="subItem.ContractUrl!==''" :href="subItem.ContractUrl"
......@@ -576,7 +577,10 @@
{{subItem.RealName? subItem.RealName : subItem.DiningName}}
</template>
<template v-if="subItem.DinnerOfferPrice&&subItem.DinnerOfferPrice>0">
<br /> 餐报价:<font style="color:red;"> {{subItem.DinnerOfferPrice}}</font>
<br />
<span style="font-weight:bold;font-size:14px;">报价餐厅:<font style="color:red;">
{{subItem.DinnerOfferName}}({{subItem.DinnerOfferPrice}}/人)
</font></span>
</template>
</td>
<td v-if="childIndex==0" :rowspan="3">
......@@ -706,8 +710,12 @@
</td>
<td v-if="childIndex==0" :rowspan="3">
{{subItem.ScenicName}}
<template v-if="subItem.ScenicOfferPrice&&subItem.ScenicOfferPrice>0">
<br /> 景点报价:<font style="color:red;"> {{subItem.ScenicOfferPrice}}</font>
<template v-if="subItem.ScenicOfferPrice&& subItem.ScenicOfferPrice>0">
<br />
<span style="font-weight:bold;font-size:14px;">报价景点：<font style="color:red;">
{{subItem.ScenicOfferName}}
({{subItem.ScenicOfferPrice}}/人)</font>
</span>
</template>
</td>
<td v-if="childIndex==0" :rowspan="3">
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 44b79b57
......@@ -102,9 +102,11 @@
</el-button>
</el-popover>
<template v-if="subItem.DinnerOfferPrice&&subItem.DinnerOfferPrice>0">
<br/> 餐报价:<font style="color:red;">{{subItem.DinnerOfferPrice}}</font>
<br />
<span style="font-weight:bold;font-size:14px;">报价餐厅:<font style="color:red;">
{{subItem.DinnerOfferName}}({{subItem.DinnerOfferPrice}}/人)
</font></span>
</template>
</td>
<td v-if="childIndex==0" :rowspan="3">
{{subItem.UseDinnerTypeStr}}
......@@ -181,17 +183,17 @@
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.pleaseSel')" :value='0'></el-option>
<!--v-if="subItem.PayStyleExt==1||LineId==90||LineId==168"-->
<el-option :label='$t("ground.xianfu")' :value='1' >
<el-option :label='$t("ground.xianfu")' :value='1'>
</el-option>
<!--v-if="subItem.PayStyleExt==2||LineId==90||LineId==168"-->
<el-option :label='$t("ground.qiandan")' :value='2' >
<el-option :label='$t("ground.qiandan")' :value='2'>
</el-option>
<!--v-if="subItem.PayStyleExt==3"-->
<el-option :label='$t("ground.shiwudk")' :value='3' ></el-option>
<el-option :label='$t("ground.shiwudk")' :value='3'></el-option>
<!--v-if="subItem.PayStyleExt==4"-->
<el-option :label='$t("ground.yufu")' :value='4' ></el-option>
<el-option :label='$t("ground.yufu")' :value='4'></el-option>
<!--v-if="subItem.PayStyleExt==5"-->
<el-option :label='$t("ground.yufukuandk")' :value='5' >
<el-option :label='$t("ground.yufukuandk")' :value='5'>
</el-option>
<el-option :label='$t("ground.lingduidydf")' :value='10'></el-option>
<el-option :label='$t("ground.gongsihetzf")' :value='6'></el-option>
......@@ -353,6 +355,7 @@
},
res => {
this.loading = false;
console.log("dmcstatistics_get_GetDinnerStaticsDetail", res.data);
if (res.data.resultCode == 1) {
var resultArray = res.data.data.DiningList;
this.IsOperation = res.data.data.IsOperation;
......
src/components/SalesModule/CouponsList.vue
View file @ 44b79b57
This diff is collapsed.
src/components/SalesModule/addPassenger.vue
View file @ 44b79b57
......@@ -1165,19 +1165,20 @@
if (this.addMsg.Marriage == "") {
this.addMsg.Marriage = "0";
}
if (this.ppAge <= 10 && this.addMsg.IsBed == 1) {
this.$confirm(this.$t('该游客未满十岁确认占床?'), this.$t('tips.tips'), {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.seveInfo(type)
}).catch(() => {
this.btnState = true
});
} else {
this.seveInfo(type)
}
// if (this.ppAge <= 10 && this.addMsg.IsBed == 1) {
// this.$confirm(this.$t('该游客未满十岁确认占床?'), this.$t('tips.tips'), {
// confirmButtonText: '确认',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() => {
// this.seveInfo(type)
// }).catch(() => {
// this.btnState = true
// });
// } else {
// this.seveInfo(type)
// }
this.seveInfo(type)
},
seveInfo(type) {
this.apipost(
......@@ -1543,7 +1544,7 @@
if (res.data.resultCode == 1) {
this.roomlist = res.data.data;
if (this.roomlist.length<1) {
if (this.roomlist.length < 1) {
this.UpdateOrderHouseBtn = true
}
} else {
......@@ -1596,7 +1597,7 @@
addhouse() {
let orderId = this.addMsg.OrderId;
let sex = this.addMsg.Sex;
if(!sex){
if (!sex) {
this.$message.error('请选择性别');
return
}
......
src/components/SalesVisa/components/visaOrderList.vue
View file @ 44b79b57
......@@ -762,6 +762,20 @@
</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">
<div class="fz12 flex-s">发票单据</div>
<div class="row wrap orderNo fz12 ml">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;"
: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 scope.row.invoiceApplyList"
@click="openDetails(x)">{{ x.frID }} {{ x.name?x.name:'' }}</span>
<span v-if="scope.row.invoiceApplyList&&scope.row.invoiceApplyList.length == 0" class="c9e fz12 mr">
暂无
</span>
</div>
</div>
</div>
<div
class="row wrap px15 bgE8F5E9 radius5 ml fz12 orderop" style="min-width: 150px;">
<div class="row-c cursor-pointer radius5 change py5" @click="goUrlVisaList(scope.row)"
......
src/components/TravelContractDetail.vue
View file @ 44b79b57
......@@ -1061,7 +1061,6 @@
},
//获取数据
getList() {
//this.apiJavaPost("/api/contract/getContractInfo", this.msg, res => {
this.apipost("travelcontract_post_GetContractInfoService", this.msg, res => {
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
......@@ -1135,7 +1134,6 @@
type: 'warning'
}).then(() => {
this.dataList.status = 0;
// this.apiJavaPost("/api/contract/dosaveOrUpdate", this.dataList, res => {
this.apipost("travelcontract_post_UpdateStatusContractService", this.dataList, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
......
src/components/TravelContractNew.vue
View file @ 44b79b57
......@@ -1499,7 +1499,6 @@
document.documentElement.scrollTop = anchor.offsetTop - 70
},
getList() {
// this.apiJavaPost("/api/contract/getContractInfo", this.msg, res => {
this.apipost("travelcontract_post_GetContractInfoService", this.msg, res => {
if (res.data.resultCode === 1) {
var tempObj = res.data.data;
......@@ -1698,7 +1697,6 @@
}
this.CtObj.travelContent = this.$refs.TcTravel_Table.innerHTML;
this.CtObj.rbGroupId = this.CurrentUserInfo.RB_Group_id
// this.apiJavaPost("/api/contract/dosaveOrUpdate", this.CtObj, res => {
this.apipost("travelcontract_post_SetContractService", this.CtObj, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
......@@ -1730,7 +1728,6 @@
}).then(() => {
this.CtObj.status = 0;
this.CtObj.auditContract = 0;
//this.apiJavaPost("/api/contract/dosaveOrUpdate", this.CtObj, res => {
this.apipost("travelcontract_post_UpdateStatusContractService", this.CtObj, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
......@@ -1759,8 +1756,6 @@
});
},
sendAudit() {
//this.CtObj.auditContract = 1;
//this.apiJavaPost("/api/contract/dosaveOrUpdate", this.CtObj, res => {
this.apipost("travelcontract_get_UpdateAuditContractService", {
"AuditContract": 1,
"Id": this.CtObj.Id
......@@ -1881,7 +1876,6 @@
let msg = {
orderId: this.msg.orderID
}
// this.apiJavaPost("/api/contract/getContractGuestByOrderId", msg, res => {
this.apipost("travelcontract_post_GetContractGuestByOrderId", msg, res => {
if (res.data.resultCode === 1) {
this.backGuest = res.data.data;
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ 44b79b57
......@@ -293,7 +293,11 @@
</span>
<span style="background:#85ce61; " class="newAopbdd">
<el-tooltip class="item" effect="dark" w450content="查看" placement="top-start" popper-class="max-w250">
<<<<<<< HEAD
<i @click="goUrl('QuotationAduit',item,1)" class="iconfont icon-view"></i>"></i>
=======
<i @click="goUrl('QuotationAduit',item.ID,1)" class="iconfont icon-view"></i>"></i>
>>>>>>> 3e8f9c2987e45c27bbea14ae5827ce25f6eeea3e
</el-tooltip>
</span>
<!-- <span style="background:#85ce61; " class="newAopbdd" @click="showDownLoad(item)">
......@@ -532,7 +536,11 @@
else if (this.postConfig.TeamType == 1) {
chooseLineList = this.LineList.filter(qItem => qItem.Is_PacketGroup == 1);
}
<<<<<<< HEAD
//当地游
=======
//当地游
>>>>>>> 3e8f9c2987e45c27bbea14ae5827ce25f6eeea3e
else if (this.postConfig.TeamType == 2) {
chooseLineList = this.LineList.filter(qItem => qItem.LineDirection == 3);
}
......
src/components/activity/CommodityActive.vue
View file @ 44b79b57
This diff is collapsed.
src/components/activity/CommodityType.vue
View file @ 44b79b57
This diff is collapsed.
src/components/activity/CouponList.vue
View file @ 44b79b57
......@@ -570,10 +570,7 @@
return this.$message.error(this.$t('rule.yxjzrbxdyksshijian'))
}
this.isleaveBtn = false;
this.apiJavaPost(
"/api/sell/coupon/setCoupon",
this.addMsg,
res => {
this.apiJavaPost("/api/sell/coupon/setCoupon", this.addMsg, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.outerVisible = false;
......
src/components/activity/IntegralMall.vue
View file @ 44b79b57
This diff is collapsed.
src/components/activity/TravelInfoList.vue
View file @ 44b79b57
This diff is collapsed.
src/components/administrative/Survey.vue
View file @ 44b79b57
This diff is collapsed.
src/components/commonPage/payURL.vue
View file @ 44b79b57
......@@ -148,7 +148,8 @@
"companyID":obj.outBranchId,//公司id
"path": "",
'blank':'y',
'orderObj':JSON.stringify(orderObj)
'orderObj':JSON.stringify(orderObj),
'searchTitle':'溢收团费退款'
}
});
}else{
......@@ -207,11 +208,11 @@
name: 'ChoiceAddFinancialDocuments',
query:{
"Type":2,
'searchTitle': '月结',
"companyID":obj.outBranchId,//公司id
"path": "",
'blank':'y',
'orderObj':JSON.stringify(orderObj)
'orderObj':JSON.stringify(orderObj),
'searchTitle': '团队成本月结'
}
});
}
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 44b79b57
......@@ -181,8 +181,8 @@
<th width="60">{{$t('ground.canshi')}}</th>
<th width="60">{{$t('MarketingActi.car')}}</th>
<th width="60">{{$t('leader.leader_Leader')}}<br />{{$t('ground.baozhang')}}</th>
<th width="60">{{$t('ground.htff')}}</th>
<th width="60">{{$t('ground.bjd')}}</th>
<th width="60">{{$t('ground.htff')}}</th>
<th width="60">{{$t('ground.ldrtf')}}</th>
<th width="120">{{$t('system.table_operation')}}</th>
</tr>
......@@ -382,6 +382,9 @@
<span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span>
</div>
</td>
<td>
<span @click="showDialog(0, item.OfferId)" style="cursor:pointer" v-if="item.OfferId">报价详情</span>
</td>
<td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0'>
<div class="fz16 fbold linkspan"
@click="goUrlLeaderIsApply('TravelPassengerList3',item,outItem,'合团分房表')"
......@@ -390,9 +393,6 @@
<span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span>
</div>
</td>
<td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0'>
<span @click="showDialog(0, item.OfferId)" style="cursor: pointer" v-if="item.OfferId">报价单</span>
</td>
<td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0' style="width: 150px;">
<el-popover width="100" trigger="click" popper-class="DMC_HotelPop">
<table style="width: 100%;" border="0" cellspacing="1" class="dmcTotalTable">
......@@ -519,7 +519,7 @@
</td>
</tr>
<tr :key="index+100">
<td colspan="23" style="text-align: left!important;padding:0 20px;">
<td colspan="24" style="text-align: left!important;padding:0 20px;">
<div class="link">
<p @click="getJourney(item)" style="padding-top:4px;">{{item.Title}}</p>
<div class="colorE95252" style="padding-top:5px;padding-bottom:4px;font-size:13px;">
......@@ -823,9 +823,11 @@
}, err => {})
},
getLineList() {
this.apipost("line_post_GetList", {
var postMsg = {
LineDirection: 2
}, res => { //
};
postMsg = {};
this.apipost("line_post_GetList", postMsg, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.LineList = res.data.data;
this.queryCommonData.PlaceList = []
......
src/components/dmc/manager/teamRevenueExpenditure.vue
View file @ 44b79b57
......@@ -41,6 +41,7 @@
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" value="新增付款" @click="goUrl(1,2)" /><input type="button" class="normalBtn"
value="新增收款" @click="goUrl(1,1)" />
<input type="button" class="normalBtn" value="预付款冲抵" @click="isOffset(1,2)" />
</span>
</p>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
......@@ -100,6 +101,7 @@
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" value="新增付款" @click="goUrl(2,2)" /><input type="button" class="normalBtn"
value="新增收款" @click="goUrl(2,1)" />
<input type="button" class="normalBtn" value="预付款冲抵" @click="isOffset(2,2)" />
</span>
</p>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
......@@ -159,6 +161,7 @@
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" value="新增付款" @click="goUrl(3,2)" /><input type="button" class="normalBtn"
value="新增收款" @click="goUrl(3,1)" />
<input type="button" class="normalBtn" value="预付款冲抵" @click="isOffset(3,2)" />
</span>
</p>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
......@@ -218,6 +221,7 @@
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" value="新增付款" @click="goUrl(5,2)" /><input type="button" class="normalBtn"
value="新增收款" @click="goUrl(5,1)" />
<input type="button" class="normalBtn" value="预付款冲抵" @click="isOffset(5,2)" />
</span>
</p>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
......@@ -278,6 +282,7 @@
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" value="新增付款" @click="goUrl(14,2)" /><input type="button"
class="normalBtn" value="新增收款" @click="goUrl(14,1)" />
<input type="button" class="normalBtn" value="预付款冲抵" @click="isOffset(14,2)" />
</span>
</p>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
......@@ -339,13 +344,25 @@
</el-carousel-item>
</el-carousel>
</div>
<offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
</div>
</template>
<script>
import offset from '../../public/offset.vue';
export default {
components: { offset },
data() {
return {
Handmsg: {
OtherType: 7,
ReFinanceId: 0,
Rate: 0,
TCNUM: '',
czState: true,
},
queryObj:null,
cdState: false,
LineId:0,
picIsShow: false,
picObj: [],
......@@ -363,6 +380,53 @@
}
},
methods: {
isOffset(_orderSource, _type){
this.goUrl(_orderSource, _type,'Offset')
},
// 制作单据
makeAdocument(row, index, num, name,Offset) {
if((num==2||num==3)&&row.Income<=0){
this.Info('请先制收款单据，再制成本或退款单据！')
return
}
if(Offset){
this.cdState = true
}
let type = 0
if(num==3){
type = 2
}else{
type = num
}
this.BillMakingMsg.ReFinanceId = row.OrderId;
this.BillMakingMsg.ReFinanceId2 = num;
if (name == "Hand") {
this.BillMakingMsg.OtherType = 62;
} else {
this.BillMakingMsg.OtherType = 61;
}
let text = "";
let query = {};
if (num == 1) {
text = "收款";
} else if (num == 2) {
text = "付款";
}
query = {
blank: "y",
tab: `新增${text}单据`,
Type: type,
tradeObj: JSON.stringify(this.BillMakingMsg),
};
this.queryObj = query
if(!Offset){
this.$store.commit("ChoiceAddFinancialDocuments");
this.$router.push({
path: "/ChoiceAddFinancialDocuments",
query
});
}
},
//跳转到财务页面
goFinaceURL(id) {
this.$router.push({
......@@ -438,7 +502,7 @@
})
this.picIsShow = true;
},
goUrl(_orderSource, _type) {
goUrl(_orderSource, _type,Offset) {
let TCIDARR = []
let id = [];
if(this.msgList&&this.msgList.length>0&&this.msgList[0].LineId==this.LineId){
......@@ -480,6 +544,25 @@
TCIDList: TCIDARR
}
id = id.length > 0 ? JSON.stringify(id) : null;
// 冲抵
if(Offset){
orderObj.TCIDList = [this.$route.query.id]
let query = {
'czmsg': this.Handmsg,
'Type': _type,
'path': 'teamRevenueExpenditure',
'companyID': this.msgList&&this.msgList.length>0&&this.msgList[0].OutBranchId!=null?this.msgList[0].OutBranchId:this.$route.query.OutBranchId,
'blank': 'y',
'orderObj': JSON.stringify(orderObj),
'OrderSource': _orderSource,
'searchTitle': '分摊'
};
this.queryObj = query
this.cdState = true
return
}
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query: {
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ 44b79b57
......@@ -338,7 +338,6 @@
}
}
if (this.isSubmit) {
this.isSubmit = false;
this.SaveData(SaveType);
}
},
......@@ -445,6 +444,7 @@
}
basicData.TeamType = this.TeamType;
basicData.IsUpdateHotel = this.PostConfig.IsUpdateHotel;
this.isSubmit = false;
this.apipost(
"travel_post_SetTravelConfigInfo",
basicData,
......
src/components/public/offset.vue
View file @ 44b79b57
This diff is collapsed.
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