Skip to content

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

付款可负数，意见调查详情修改

parent 500295e6
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 62 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 076536ab
...@@ -704,26 +704,20 @@ ...@@ -704,26 +704,20 @@
<th>账户分类</th> <th>账户分类</th>
<th>付款方式</th> <th>付款方式</th>
<th>账户</th> <th>账户</th>
<!-- <th width="100px">账户余额</th> -->
<th>金额</th> <th>金额</th>
<th width="70">币种</th> <th width="70">币种</th>
<th width="150px">汇率</th> <th width="150px">汇率</th>
<!-- <th>手续费</th> -->
<th width="100px">总金额</th> <th width="100px">总金额</th>
<!-- <th>操作</th> -->
</tr> </tr>
<template v-for="(i,index) in payMsgList"> <template v-for="(i,index) in payMsgList">
<tr v-if="!i.show" @click="payMsgListShow(i, index)"> <tr v-if="!i.show" @click="payMsgListShow(i, index)">
<td>{{i.AccName}}</td> <td>{{i.AccName}}</td>
<td>{{i.Name}}</td> <td>{{i.Name}}</td>
<td>{{i.Account}}</td> <td>{{i.Account}}</td>
<!-- <td>{{item.balance}}</td> -->
<td>{{moneyFormat(i.OriginalMoney)}}</td> <td>{{moneyFormat(i.OriginalMoney)}}</td>
<td>{{i.CurrenName}}</td> <td>{{i.CurrenName}}</td>
<td>{{i.Rate}}</td> <td>{{i.Rate}}</td>
<!-- <td>{{item.Fee}}</td> -->
<td>{{moneyFormat(i.allMoney)}}</td> <td>{{moneyFormat(i.allMoney)}}</td>
<!-- <td></td> -->
</tr> </tr>
<tr v-else @keyup.enter="addList(2,index)"> <tr v-else @keyup.enter="addList(2,index)">
<td> <td>
...@@ -754,7 +748,7 @@ ...@@ -754,7 +748,7 @@
</el-select> </el-select>
</td> </td>
<td> <td>
<el-input v-model="i.OriginalMoney" @change="Calculation(1,index)" @blur="addList(2,index)" placeholder="请输入金额" type="number" class=" _border_b_1"></el-input> <el-input v-model="i.OriginalMoney" @change="Calculation(1,index)" @blur="addList(2,index)" @keyup.native="checkPrice(payMsgList[index],'OriginalMoney', true)" placeholder="请输入金额" type="text" class=" _border_b_1"></el-input>
</td> </td>
<td> <td>
<p>{{i.CurrenName}}</p> <p>{{i.CurrenName}}</p>
...@@ -795,7 +789,7 @@ ...@@ -795,7 +789,7 @@
</td> </td>
<!-- <td>{{payMsg.balance}}</td> --> <!-- <td>{{payMsg.balance}}</td> -->
<td> <td>
<el-input v-model="payMsg.OriginalMoney" @change="Calculation()" @blur="addList()" @keyup.native="checkPrice(payMsg,'OriginalMoney')" placeholder="请输入金额" type="number" class=" _border_b_1"></el-input> <el-input v-model="payMsg.OriginalMoney" @change="Calculation()" @blur="addList()" @keyup.native="checkPrice(payMsg,'OriginalMoney', true)" placeholder="请输入金额" type="text" class=" _border_b_1"></el-input>
</td> </td>
<td> <td>
<p>{{payMsg.CurrenName}}</p> <p>{{payMsg.CurrenName}}</p>
...@@ -1015,27 +1009,21 @@ ...@@ -1015,27 +1009,21 @@
<tr> <tr>
<th>账户分类</th> <th>账户分类</th>
<th>付款方式</th> <th>付款方式</th>
<th>账户</th> <th>账户</th>
<!-- <th width="100px">账户余额</th> -->
<th>金额</th> <th>金额</th>
<th width="70">币种</th> <th width="70">币种</th>
<th width="150px">汇率</th> <th width="150px">汇率</th>
<!-- <th>手续费</th> --> <th width="100px">总金额</th>
<th width="100px">总金额</th>
<!-- <th>操作</th> -->
</tr> </tr>
<template v-for="(i,index) in payMsgList"> <template v-for="(i,index) in payMsgList">
<tr v-if="!i.show" @click="payMsgListShow(i, index)"> <tr v-if="!i.show" @click="payMsgListShow(i, index)">
<td>{{i.AccName}}</td> <td>{{i.AccName}}</td>
<td>{{i.Name}}</td> <td>{{i.Name}}</td>
<td>{{i.Account}}</td> <td>{{i.Account}}</td>
<!-- <td>{{item.balance}}</td> -->
<td>{{moneyFormat(i.OriginalMoney)}}</td> <td>{{moneyFormat(i.OriginalMoney)}}</td>
<td>{{i.CurrenName}}</td> <td>{{i.CurrenName}}</td>
<td>{{i.Rate}}</td> <td>{{i.Rate}}</td>
<!-- <td>{{item.Fee}}</td> --> <td>{{moneyFormat(i.allMoney)}}</td>
<td>{{moneyFormat(i.allMoney)}}</td>
<!-- <td></td> -->
</tr> </tr>
<tr v-else @keyup.enter="addList(2,index)"> <tr v-else @keyup.enter="addList(2,index)">
<td> <td>
...@@ -1066,7 +1054,7 @@ ...@@ -1066,7 +1054,7 @@
</el-select> </el-select>
</td> </td>
<td> <td>
<el-input v-model="i.OriginalMoney" @change="Calculation(1,index)" @blur="addList(2,index)" placeholder="请输入金额" type="number" class=" _border_b_1"></el-input> <el-input v-model="i.OriginalMoney" @change="Calculation(1,index)" @blur="addList(2,index)" placeholder="请输入金额" type="text" class=" _border_b_1"></el-input>
</td> </td>
<td> <td>
<p>{{i.CurrenName}}</p> <p>{{i.CurrenName}}</p>
...@@ -1107,7 +1095,7 @@ ...@@ -1107,7 +1095,7 @@
</td> </td>
<!-- <td>{{payMsg.balance}}</td> --> <!-- <td>{{payMsg.balance}}</td> -->
<td> <td>
<el-input v-model="payMsg.OriginalMoney" @change="Calculation()" @blur="addList()" placeholder="请输入金额" type="number" class=" _border_b_1"></el-input> <el-input v-model="payMsg.OriginalMoney" @change="Calculation()" @blur="addList()" placeholder="请输入金额" type="text" class=" _border_b_1"></el-input>
</td> </td>
<td> <td>
<p>{{payMsg.CurrenName}}</p> <p>{{payMsg.CurrenName}}</p>
...@@ -1609,7 +1597,7 @@ export default { ...@@ -1609,7 +1597,7 @@ export default {
this.payMsgList[index].show = true this.payMsgList[index].show = true
} }
}, },
addList: function (type, index) { addList: function (type, index) {
if (type) { if (type) {
if (this.payMsgList[index].AccountId==='') return if (this.payMsgList[index].AccountId==='') return
if (this.payMsgList[index].Type==='') return if (this.payMsgList[index].Type==='') return
...@@ -1868,9 +1856,7 @@ export default { ...@@ -1868,9 +1856,7 @@ export default {
newmoney=`${newmoney}1`; newmoney=`${newmoney}1`;
} }
} }
this.payMsgList[index].allMoney = Math.round( newmoney* 100) / 100 / 100;
this.payMsgList[index].allMoney = Math.round( newmoney* 100) / 100 / 100;
} else { } else {
this.payMsg.Fee = isNaN(parseFloat(this.payMsg.Fee))?0:parseFloat(this.payMsg.Fee); this.payMsg.Fee = isNaN(parseFloat(this.payMsg.Fee))?0:parseFloat(this.payMsg.Fee);
this.payMsg.Rate = isNaN(parseFloat(this.payMsg.Rate))?0:parseFloat(this.payMsg.Rate); this.payMsg.Rate = isNaN(parseFloat(this.payMsg.Rate))?0:parseFloat(this.payMsg.Rate);
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 076536ab
...@@ -442,38 +442,6 @@ ...@@ -442,38 +442,6 @@
:key='item.DepartmentID'> :key='item.DepartmentID'>
</el-option> </el-option>
</el-select></span></p> </el-select></span></p>
<!-- <p class="_TCIDAndTCNUMList">
<span>
团队编号：
</span>
<template v-if="msg.TCIDList&&msg.TCIDList.length>0">
<p class="_TCIDAndTCNUMList_item"><span v-for="(i,ix) in msg.TCIDList" class="_jump_page _font_bold" @click="jumpPage('productQuery',i,1)">{{i}} <span v-if="ix!=msg.TCIDList.length-1">,</br></span></span></p>
</template>
<template v-else>
<span>无</span>
</template>
</p>
<p v-if="msg.TCIDAndTCNUMList.length==1" @click="jumpPage('TeamBalancePayment',msg.TCIDAndTCNUMList,5)" class="_jump_page _font_bold">团队收支</p>
<p v-if="msg.TCIDAndTCNUMList.length>1" @click="jumpPage('TeamBalancePayment',msg.TCIDAndTCNUMList,6)" class="_jump_page _font_bold">团队收支</p>
<template v-if="GetDetail.FrID==0">
<p v-if="orderObj.OrderSource==9&&orderObj.SourceID>0">国内票务：<span class="_jump_page _font_bold" @click="jumpPage('SettlementOrder',orderObj,2)">{{orderObj.SourceID}}</span></p>
<p v-if="orderObj.OrderSource==10&&orderObj.SourceID>0">签证：<span class="_jump_page _font_bold" @click="jumpPage('VisaProductCopy',orderObj,3)">{{orderObj.SourceID}}</span></p>
<p v-if="OrderSource==4&&orderObj.SourceID>0" class="_TCIDAndTCNUMList">
<span>机票收支：</span>
<span class="_TCIDAndTCNUMList_item">
<span v-for="(i,ix) in orderObj.TCIDAndTCNUMList" class="_jump_page _font_bold _font_bold" @click="jumpPage('FinancialOrder',orderObj,4)">{{i.TCNUM}}（{{orderObj.SourceID}}）
<span v-if="ix!=orderObj.TCIDAndTCNUMList.length-1">,</br></span>
</span>
</span>
<p class="_TCIDAndTCNUMList_item">
<template v-for="(i,ix) in orderObj.TCIDAndTCNUMList">
<span class="_jump_page _font_bold" @click="jumpPage('FinancialOrder',orderObj,4)">{{i.TCNUM}}（{{orderObj.SourceID}}） </span>
<span v-if="ix!=orderObj.TCIDAndTCNUMList.length-1"></br></span>
</template>
</p>
</p>
<p v-if="orderObj.OrderSource==4&&orderObj.SourceID>0" @click="jumpPage('FinancialOrder',orderObj.SourceID,4)" class="_jump_page _font_bold">机票收支</p>
</template> -->
<template v-if="GetDetail.FrID!=0"> <template v-if="GetDetail.FrID!=0">
<p v-if="GetDetail.OrderSource==9&&GetDetail.SourceID>0">{{$t("fnc.gnpiaowu")}}：<span class="_jump_page _font_bold" @click="jumpPage('SettlementOrder',GetDetail,2)">{{GetDetail.SourceID}}</span></p> <p v-if="GetDetail.OrderSource==9&&GetDetail.SourceID>0">{{$t("fnc.gnpiaowu")}}：<span class="_jump_page _font_bold" @click="jumpPage('SettlementOrder',GetDetail,2)">{{GetDetail.SourceID}}</span></p>
<p v-if="GetDetail.OrderSource==10&&GetDetail.SourceID>0">{{$t('active.cl_qianzheng')}}：<span class="_jump_page _font_bold" @click="jumpPage('VisaProductCopy',GetDetail,3)">{{GetDetail.SourceID}}</span></p> <p v-if="GetDetail.OrderSource==10&&GetDetail.SourceID>0">{{$t('active.cl_qianzheng')}}：<span class="_jump_page _font_bold" @click="jumpPage('VisaProductCopy',GetDetail,3)">{{GetDetail.SourceID}}</span></p>
......
src/components/SalesModule/investigationDetail.vue
View file @ 076536ab
...@@ -18,14 +18,12 @@ ...@@ -18,14 +18,12 @@
<template v-else-if="item.SurveyType === 2"> <template v-else-if="item.SurveyType === 2">
<template v-for="(r, i) in item.SurveyOptionsList" v-if="r.IsCheck!=='0'"> <template v-for="(r, i) in item.SurveyOptionsList" v-if="r.IsCheck!=='0'">
<span>{{r.OptionsName}}</span> <span>{{r.OptionsName}}</span>
</template> </template>
<!-- <el-radio v-for="(r, i) in item.SurveyOptionsList" v-model="item.lable" :label="r.ID" disabled="disabled" :key="i"></el-radio> -->
</template> </template>
<template v-else-if="item.SurveyType === 3"> <template v-else-if="item.SurveyType === 3">
<template v-for="(r, i) in item.SurveyOptionsList" v-if="r.IsCheck!=='0'"> <template v-for="(r, i) in item.SurveyOptionsList" v-if="r.IsCheck!=='0'">
<span>{{r.OptionsName}}</span> <span>{{r.OptionsName}}</span>
</template> </template>
<!-- <el-checkbox v-for="(r, i) in item.SurveyOptionsList" v-model="item.ckeckList" :label="r.ID" disabled="disabled" :key="i">{{r.OptionsName}}</el-checkbox > -->
</template> </template>
<template v-else-if="item.SurveyType === 4"> <template v-else-if="item.SurveyType === 4">
<span>{{item.TextContent}}</span> <span>{{item.TextContent}}</span>
......
src/components/SalesModule/investigationList.vue
View file @ 076536ab
...@@ -39,8 +39,9 @@ ...@@ -39,8 +39,9 @@
type="primary" type="primary"
icon="iconfont icon-sousuo" icon="iconfont icon-sousuo"
circle circle
@click="dialogTitle = '游客问券', showID = item.ID, DiaoChaShow = true" @click="dialogTitle = '游客问券', openPage(item)"
></el-button> ></el-button>
<!-- showID = item.ID, DiaoChaShow = true -->
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="查看游记" placement="top"> <el-tooltip class="item" effect="dark" content="查看游记" placement="top">
<el-button <el-button
...@@ -74,6 +75,7 @@ ...@@ -74,6 +75,7 @@
:before-close="closeDialog"> :before-close="closeDialog">
<YouJi :ID="showID"/> <YouJi :ID="showID"/>
</el-dialog> </el-dialog>
<a href="" id="blankLink" target="_blank" style="display:none">1</a>
</div> </div>
</template> </template>
<script> <script>
...@@ -98,6 +100,12 @@ export default { ...@@ -98,6 +100,12 @@ export default {
OrderID = this.$route.query.OrderId; OrderID = this.$route.query.OrderId;
this.getList(TCID, OrderID); this.getList(TCID, OrderID);
},methods: { },methods: {
openPage: function (obj){
console.log(obj)
let dom = document.querySelector("#blankLink");
dom.href = "http://activity.oytour.com/html/invesDetails2.html" + '?ID=' + obj.ID + '&name=' + encodeURI(obj.GuestName) + '&MobilePhone=' + obj.CustomerPhone
dom.click();
},
closeDialog: function () { closeDialog: function () {
this.DiaoChaShow = false; this.DiaoChaShow = false;
this.YouJiShow = false; this.YouJiShow = false;
......
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