Skip to content

S
SuperMan
Commit 1071fb19 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

禁止修改汇率，增加投诉单号

parent d7277f93
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 13 deletions
src/components/FinancialModule/ChoiceAddFinancialDocuments.vue
View file @ 1071fb19
...@@ -172,7 +172,6 @@ export default { ...@@ -172,7 +172,6 @@ export default {
if (valid) { if (valid) {
this.apipost('Financial_post_GetTemplateDetail', this.ruleForm, r=>{ this.apipost('Financial_post_GetTemplateDetail', this.ruleForm, r=>{
if (r.data.resultCode===1) { if (r.data.resultCode===1) {
console.log(r)
if (this.ruleForm.Type ===1 ){ if (this.ruleForm.Type ===1 ){
this.R = r.data.data this.R = r.data.data
} else { } else {
...@@ -183,7 +182,6 @@ export default { ...@@ -183,7 +182,6 @@ export default {
} }
}, null) }, null)
} else { } else {
console.log('error submit!!');
return false; return false;
} }
}); });
...@@ -212,9 +210,12 @@ export default { ...@@ -212,9 +210,12 @@ export default {
} }
}, },
Financial_post_GetList(){ //获取 Financial_post_GetList(){ //获取
console.log("111");
this.apipost('Financial_post_GetList',{},res=>{ this.apipost('Financial_post_GetList',{},res=>{
console.log("res",res);
if(res.data.resultCode==1){ if(res.data.resultCode==1){
let data = res.data.data; let data = res.data.data;
console.log("data",data)
if(data){ if(data){
data.forEach(x => { data.forEach(x => {
if(x.Type==1){ if(x.Type==1){
...@@ -261,14 +262,19 @@ export default { ...@@ -261,14 +262,19 @@ export default {
}else{} }else{}
},err=>{}) },err=>{})
}, },
},mounted(){ },
created(){
this.Financial_post_GetList();
},
mounted(){
this.MsgBus.$on('bankAddPage',() =>{ this.MsgBus.$on('bankAddPage',() =>{
this.F = false; this.F = false;
this.R = false; this.R = false;
}); });
let userInfo=this.getLocalStorage(); let userInfo=this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id= userInfo.RB_Group_id; //集团ID this.getCompanyMsg.RB_Group_Id= userInfo.RB_Group_id; //集团ID
this.Financial_post_GetList();
this.showTab = this.$route.query.Type?this.$route.query.Type:0; this.showTab = this.$route.query.Type?this.$route.query.Type:0;
if(this.showTab==1){ if(this.showTab==1){
this.GetList = this.collectList; this.GetList = this.collectList;
......
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ 1071fb19
...@@ -133,11 +133,14 @@ ...@@ -133,11 +133,14 @@
}) })
this.GetList = newList this.GetList = newList
} }
console.log("this.GetList",this.GetList)
}, },
Financial_post_GetList(){ //获取 Financial_post_GetList(){ //获取
this.apipost('Financial_post_GetList',{},res=>{ this.apipost('Financial_post_GetList',{},res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
let data = res.data.data; let data = res.data.data;
console.log("data",data);
if(data){ if(data){
data.forEach(x => { data.forEach(x => {
if(x.Type==1){ if(x.Type==1){
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 1071fb19
...@@ -317,7 +317,7 @@ ...@@ -317,7 +317,7 @@
</el-select> </el-select>
</td> </td>
<td height="26px">{{da.yTotalPrice}}</td> <td height="26px">{{da.yTotalPrice}}</td>
<td height="26px"><el-input v-model="da.Rate" type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input></td> <td height="26px"><el-input v-model="da.Rate" :disabled="true" type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input></td>
<td height="26px">{{da.bTotalPrice}}</td> <td height="26px">{{da.bTotalPrice}}</td>
<td height="26px"><el-input v-model="da.Remark" type="textarea" class="w80 _border_b_1"></el-input> <i @click="deleteRow(daIn,da)" class="_delete_row iconfont icon-img_delete_small"></i></td> <td height="26px"><el-input v-model="da.Remark" type="textarea" class="w80 _border_b_1"></el-input> <i @click="deleteRow(daIn,da)" class="_delete_row iconfont icon-img_delete_small"></i></td>
</tr> </tr>
...@@ -355,7 +355,7 @@ ...@@ -355,7 +355,7 @@
</el-select> </el-select>
</td> </td>
<td>{{detailList.yTotalPrice}}</td> <td>{{detailList.yTotalPrice}}</td>
<td><el-input v-model="detailList.Rate" type="text" @blur="addList(1)" @change="Calculation(1)" class="w80 _border_b_1"></el-input></td> <td><el-input v-model="detailList.Rate" :disabled="true" type="text" @blur="addList(1)" @change="Calculation(1)" class="w80 _border_b_1"></el-input></td>
<td>{{detailList.bTotalPrice}}</td> <td>{{detailList.bTotalPrice}}</td>
<td><el-input v-model="detailList.Remark" type="textarea" @blur="addList(1)" class="w80 _border_b_1"></el-input></td> <td><el-input v-model="detailList.Remark" type="textarea" @blur="addList(1)" class="w80 _border_b_1"></el-input></td>
</tr> </tr>
...@@ -1178,6 +1178,7 @@ export default { ...@@ -1178,6 +1178,7 @@ export default {
this.apipost('Financial_post_Get',{ID:id,TempId:tempId,TCIDList:(this.orderObj&&this.orderObj.TCIDList)?this.orderObj.TCIDList:[]}, res => { this.apipost('Financial_post_Get',{ID:id,TempId:tempId,TCIDList:(this.orderObj&&this.orderObj.TCIDList)?this.orderObj.TCIDList:[]}, res => {
// console.log(this.orderObj.TCIDList) // console.log(this.orderObj.TCIDList)
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
console.log("res.data",res.data)
let data= res.data.data; let data= res.data.data;
data.IsLeader = 1; data.IsLeader = 1;
this.msg = JSON.parse(JSON.stringify(data)); this.msg = JSON.parse(JSON.stringify(data));
...@@ -1226,6 +1227,7 @@ export default { ...@@ -1226,6 +1227,7 @@ export default {
this.IsUploadPic = data.IsUploadPic; this.IsUploadPic = data.IsUploadPic;
this.msg.IsPublic = data.IsPublic; this.msg.IsPublic = data.IsPublic;
this.GetDetail = data; this.GetDetail = data;
this.Description=this.GetDetail.Description;
if(this.orderObj){ if(this.orderObj){
this.msg.OrderID = this.orderObj.OrderID?this.orderObj.OrderID:0; this.msg.OrderID = this.orderObj.OrderID?this.orderObj.OrderID:0;
this.OrderSource = this.msg.OrderSource = this.orderObj.OrderSource?this.orderObj.OrderSource:0; this.OrderSource = this.msg.OrderSource = this.orderObj.OrderSource?this.orderObj.OrderSource:0;
...@@ -1309,9 +1311,11 @@ export default { ...@@ -1309,9 +1311,11 @@ export default {
if(this.orderObj!=null&&this.orderObj.OrderSource===10){ if(this.orderObj!=null&&this.orderObj.OrderSource===10){
that.Description="旅客名单："; that.Description="旅客名单：";
that.describeList=JSON.parse(sessionStorage.getItem("saveGuestInfo")); that.describeList=JSON.parse(sessionStorage.getItem("saveGuestInfo"));
console.log("that.describeList",that.describeList)
that.describeList.forEach(item=>{ that.describeList.forEach(item=>{
that.Description+=item.GuestName+" "; that.Description+=item.GuestName+" ";
}) })
console.log("that.Description",that.Description)
} }
},mounted(){ },mounted(){
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
......
src/components/FinancialModule/addFinancialGZDocuments.vue
View file @ 1071fb19
...@@ -279,7 +279,7 @@ ...@@ -279,7 +279,7 @@
</el-select> </el-select>
</td> </td>
<td height="26px">{{da.yTotalPrice}}</td> <td height="26px">{{da.yTotalPrice}}</td>
<td height="26px"><el-input v-model="da.Rate" type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input></td> <td height="26px"><el-input v-model="da.Rate" :disabled="true" type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input></td>
<td height="26px">{{da.bTotalPrice}}</td> <td height="26px">{{da.bTotalPrice}}</td>
<td height="26px"> <td height="26px">
<el-select <el-select
...@@ -343,7 +343,7 @@ ...@@ -343,7 +343,7 @@
</el-select> </el-select>
</td> </td>
<td>{{detailList.yTotalPrice}}</td> <td>{{detailList.yTotalPrice}}</td>
<td><el-input v-model="detailList.Rate" type="text" @blur="addList(1)" @change="Calculation(1)" class="w80 _border_b_1"></el-input></td> <td><el-input v-model="detailList.Rate" :disabled="true" type="text" @blur="addList(1)" @change="Calculation(1)" class="w80 _border_b_1"></el-input></td>
<td>{{detailList.bTotalPrice}}</td> <td>{{detailList.bTotalPrice}}</td>
<td height="26px"> <td height="26px">
<el-select <el-select
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 1071fb19
...@@ -241,7 +241,8 @@ ...@@ -241,7 +241,8 @@
<span class="w80">{{da.currenName}}</span> <span class="w80">{{da.currenName}}</span>
</td> </td>
<td height="26px">{{da.yTotalPrice}}</td> <td height="26px">{{da.yTotalPrice}}</td>
<td height="26px"><el-input v-model="da.Rate" type="text" @change="Calculation(2,daIn+1)" @blur="addList(2,daIn+1)" class="w80 _border_b_1"></el-input></td> <!-- @change="Calculation(2,daIn+1)" @blur="addList(2,daIn+1)" -->
<td height="26px"><el-input v-model="da.Rate" :disabled="true" type="text" class="w80 _border_b_1"></el-input></td>
<td height="26px">{{da.bTotalPrice}}</td> <td height="26px">{{da.bTotalPrice}}</td>
<td height="26px"><el-input v-model="da.Remark" type="textarea" class="w80 _border_b_1"></el-input> <i @click="deleteRow(daIn,da)" class="_delete_row iconfont icon-img_delete_small"></i> </td> <td height="26px"><el-input v-model="da.Remark" type="textarea" class="w80 _border_b_1"></el-input> <i @click="deleteRow(daIn,da)" class="_delete_row iconfont icon-img_delete_small"></i> </td>
</tr> </tr>
...@@ -272,7 +273,8 @@ ...@@ -272,7 +273,8 @@
<span class="w110">{{detailList.currenName}}</span> <span class="w110">{{detailList.currenName}}</span>
</td> </td>
<td>{{detailList.yTotalPrice}}</td> <td>{{detailList.yTotalPrice}}</td>
<td><el-input v-model="detailList.Rate" type="text" @change="Calculation(1)" @blur="addList(1)" class="w80 _border_b_1"></el-input></td> <!-- @change="Calculation(1)" @blur="addList(1)" -->
<td><el-input v-model="detailList.Rate" :disabled="true" type="text" class="w80 _border_b_1"></el-input></td>
<td>{{detailList.bTotalPrice}}</td> <td>{{detailList.bTotalPrice}}</td>
<td><el-input v-model="detailList.Remark" @blur="addList(1)" type="textarea" class="w80 _border_b_1"></el-input></td> <td><el-input v-model="detailList.Remark" @blur="addList(1)" type="textarea" class="w80 _border_b_1"></el-input></td>
</tr> </tr>
...@@ -1307,6 +1309,7 @@ export default { ...@@ -1307,6 +1309,7 @@ export default {
// }) // })
// TCID.split(0,TCID.length-1) // TCID.split(0,TCID.length-1)
this.apipost('Financial_post_Get',{ID:id,TempId:tempId,TCIDList:(this.orderObj&&this.orderObj.TCIDList)?this.orderObj.TCIDList:[]}, res => { this.apipost('Financial_post_Get',{ID:id,TempId:tempId,TCIDList:(this.orderObj&&this.orderObj.TCIDList)?this.orderObj.TCIDList:[]}, res => {
this.loading = false;
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
let data= res.data.data; let data= res.data.data;
this.msg = JSON.parse(JSON.stringify(data)); this.msg = JSON.parse(JSON.stringify(data));
......
src/components/SalesModule/groupTourOrder.vue
View file @ 1071fb19
...@@ -1786,7 +1786,7 @@ ...@@ -1786,7 +1786,7 @@
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div> <div>
<div><span>备注：</span> <div><span>备注：</span>
<p><span v-if="item.tsId>0">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',item.tsId,item.orderId,'投诉详情')">{{item.tsId}}</a> ;</span><span <p><span v-for="ts in item.tsIdList">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',ts,item.orderId,'投诉详情')">{{ts}}</a> ;</span><span
v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}} v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}
</p></div> </p></div>
<div> <div>
...@@ -3486,7 +3486,8 @@ ...@@ -3486,7 +3486,8 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.loading = false this.loading = false
this.total = res.data.data.count this.total = res.data.data.count
this.list = res.data.data.pageData this.list = res.data.data.pageData;
console.log("this.list",this.list)
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 1071fb19
...@@ -1773,7 +1773,7 @@ ...@@ -1773,7 +1773,7 @@
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div> <div>
<div><span>备注：</span><p> <div><span>备注：</span><p>
<span v-if="item.tsId>0">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',item.tsId,item.orderId,'投诉详情')">{{item.tsId}}</a> ;</span> <span v-for="ts in item.tsIdList">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',ts,item.orderId,'投诉详情')">{{ts}} </a> ;</span>
<span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div> <span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div>
<div> <div>
<!-- <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> --> <!-- <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> -->
...@@ -3998,6 +3998,7 @@ submitYSZEForm(){ ...@@ -3998,6 +3998,7 @@ submitYSZEForm(){
this.tuanMsg, this.tuanMsg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
console.log("res",res);
this.loading = false; this.loading = false;
this.total = res.data.data.count; this.total = res.data.data.count;
this.list = res.data.data.pageData.rtData; this.list = res.data.data.pageData.rtData;
......
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