Commit 5ab02301 authored by 华国豪's avatar 华国豪 🙄

'***麻烦各位更新一下index.js 里面的一个金额转换方法我加了东西 **** 修改了订单的金额修改权限问题@@@@'

parent 6b96539e
...@@ -533,6 +533,9 @@ export default { ...@@ -533,6 +533,9 @@ export default {
case "/AccountPageList": //财务 下属账号页面 case "/AccountPageList": //财务 下属账号页面
path = "/institutionsManagement"; path = "/institutionsManagement";
break; break;
case "/SalesFinancialDetail": //销售
path = "/groupTourOrder";
break;
} }
//找到Root //找到Root
...@@ -738,6 +741,9 @@ export default { ...@@ -738,6 +741,9 @@ export default {
case "/AccountPageList": //财务 下属账号页面 case "/AccountPageList": //财务 下属账号页面
path = "/institutionsManagement"; path = "/institutionsManagement";
break; break;
case "/SalesFinancialDetail": //销售
path = "/groupTourOrder";
break;
} }
//找到Root //找到Root
......
...@@ -955,6 +955,7 @@ export default { ...@@ -955,6 +955,7 @@ export default {
if(res.data.resultCode==1){ if(res.data.resultCode==1){
let AccList = res.data.data; let AccList = res.data.data;
let newAccList = []; let newAccList = [];
// if (typeof this.GetDetail.walist !== Array) return false
this.GetDetail.walist.forEach(x=>{ this.GetDetail.walist.forEach(x=>{
if (x.Type===1){ if (x.Type===1){
AccList.forEach(y=>{ AccList.forEach(y=>{
......
...@@ -804,7 +804,7 @@ ...@@ -804,7 +804,7 @@
</el-col> --> </el-col> -->
<el-col :span="4"> <el-col :span="4">
<el-form-item label="应收总额" prop="PreferPrice"> <el-form-item label="应收总额" prop="PreferPrice">
<el-input v-model='addMsg.PreferPrice' :disabled="true"></el-input> <el-input v-model='addMsg.PreferPrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
...@@ -1118,7 +1118,7 @@ ...@@ -1118,7 +1118,7 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="应收总额" prop="PreferPrice"> <el-form-item label="应收总额" prop="PreferPrice">
<el-input v-model='addMsg.PreferPrice' :disabled="true"></el-input> <el-input v-model='addMsg.PreferPrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
...@@ -1406,7 +1406,7 @@ ...@@ -1406,7 +1406,7 @@
<p v-if="item.isUnionOrder==1" class="GO_union"></p> <p v-if="item.isUnionOrder==1" class="GO_union"></p>
<p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}</p> <p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p> <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>发团:{{item.startDate}}</p> <p>下单时间:{{item.createDate}}</p>
</td> </td>
<td> <td>
<img v-if='!item.createPhoto' src="../../assets/img/litheader.png"/> <img v-if='!item.createPhoto' src="../../assets/img/litheader.png"/>
...@@ -1454,8 +1454,7 @@ ...@@ -1454,8 +1454,7 @@
</el-popover> </el-popover>
</td> </td>
<td style="color:#FF9C00"> <td style="color:#FF9C00">
<span v-if="item.isOwn==1||userId==1||userId==5||positionId==168">{{item.tC_Price}}</span> <span>{{item.tC_Price}}</span>
<span v-else>*****</span>
</td> </td>
<td style="color:#FF9C00"> <td style="color:#FF9C00">
<span v-if="item.isOwn==1||userId==1||userId==5||positionId==168">{{item.unit_Price}}</span> <span v-if="item.isOwn==1||userId==1||userId==5||positionId==168">{{item.unit_Price}}</span>
...@@ -1653,7 +1652,7 @@ ...@@ -1653,7 +1652,7 @@
<p v-if="item.isUnionOrder==1" class="GO_union"></p> <p v-if="item.isUnionOrder==1" class="GO_union"></p>
<p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}</p> <p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p> <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>发团:{{item.startDate}}</p> <p>下单时间:{{item.createDate}}</p>
</td> </td>
<td> <td>
<img v-if='!item.createPhoto' src="../../assets/img/litheader.png"/> <img v-if='!item.createPhoto' src="../../assets/img/litheader.png"/>
...@@ -1701,8 +1700,7 @@ ...@@ -1701,8 +1700,7 @@
</el-popover> </el-popover>
</td> </td>
<td style="color:#FF9C00"> <td style="color:#FF9C00">
<span v-if="item.isOwn==1||userId==1||userId==5||positionId==168">{{item.tC_Price}}</span> <span>{{item.tC_Price}}</span>
<span v-else>*****</span>
</td> </td>
<td style="color:#FF9C00"> <td style="color:#FF9C00">
<span v-if="item.isOwn==1||userId==1||userId==5||positionId==168">{{item.unit_Price}}</span> <span v-if="item.isOwn==1||userId==1||userId==5||positionId==168">{{item.unit_Price}}</span>
...@@ -2169,6 +2167,7 @@ export default { ...@@ -2169,6 +2167,7 @@ export default {
TCNUM: '' TCNUM: ''
} }
}, },
IsUpdateOrderMoney: false,
//订单编号及业务员信息 //订单编号及业务员信息
subInfo:{ subInfo:{
CreateBy:'', CreateBy:'',
...@@ -3386,6 +3385,7 @@ export default { ...@@ -3386,6 +3385,7 @@ export default {
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;
this.IsUpdateOrderMoney = res.data.data.pageData.isUpdateOrderMoney
this.cancelRtData = res.data.data.pageData.cancelRtData[0].list; this.cancelRtData = res.data.data.pageData.cancelRtData[0].list;
this.seat.YSeat = res.data.data.pageData.ySeatNum this.seat.YSeat = res.data.data.pageData.ySeatNum
this.seat.CSeat = res.data.data.pageData.eSeatNum this.seat.CSeat = res.data.data.pageData.eSeatNum
......
...@@ -888,8 +888,8 @@ ...@@ -888,8 +888,8 @@
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
<el-form-item label="应收总额" prop="PreferPrice"> <el-form-item label="应收总额" prop="PreferPrice">
<el-input v-model='addMsg.PreferPrice' :disabled="true"></el-input> <el-input v-model='addMsg.PreferPrice' :disabled="!this.OrderDataList.IsUpdateOrderMoney"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
...@@ -1158,9 +1158,9 @@ ...@@ -1158,9 +1158,9 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="应收总额" prop="PreferPrice"> <el-form-item label="应收总额" prop="PreferPrice">
<el-input v-model='addMsg.PreferPrice' @keyup.native="checkInteger(addMsg,'PreferPrice')" @input.native='getTicheng()' <el-input v-model='addMsg.PreferPrice' @keyup.native="checkInteger(addMsg,'PreferPrice')" @input.native='getTicheng()'
:disabled="true&&notUpdate"></el-input> :disabled="!this.OrderDataList.IsUpdateOrderMoney"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
...@@ -1328,7 +1328,7 @@ ...@@ -1328,7 +1328,7 @@
<div style="width: 100%; height: auto; overflow-x: auto;" class="ownScrollbarStyle"> <div style="width: 100%; height: auto; overflow-x: auto;" class="ownScrollbarStyle">
<table class="RegisTrationTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'> <table class="RegisTrationTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr> <tr>
<th width="130">单号</th> <th width="240">单号</th>
<th width="150">客户信息</th> <th width="150">客户信息</th>
<th width="70">人数/机位数</th> <th width="70">人数/机位数</th>
<th width="110">单价</th> <th width="110">单价</th>
...@@ -1358,7 +1358,8 @@ ...@@ -1358,7 +1358,8 @@
</div> </div>
<div class="RL_CreatInfo">{{item.CreateBy}}<span v-if="item.LeaveStr!=''" style="color:red">({{item.LeaveStr}})</span></div> <div class="RL_CreatInfo">{{item.CreateBy}}<span v-if="item.LeaveStr!=''" style="color:red">({{item.LeaveStr}})</span></div>
<div class="RL_CreatInfo">关联销售:{{item.CommissionSPeopleName}}</div> <div class="RL_CreatInfo">关联销售:{{item.CommissionSPeopleName}}</div>
<p>发团:{{item.startDate}}</p> <p>下单时间:{{item.CreateDate}}</p>
</td> </td>
<td> <td>
<p class="fz12 over_ellipsis" style="width: 90%;">领队控位</p> <p class="fz12 over_ellipsis" style="width: 90%;">领队控位</p>
......
...@@ -115,13 +115,13 @@ export default { ...@@ -115,13 +115,13 @@ export default {
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function () {
let domainUrl = ''; let domainUrl = '';
let locationName = window.location.hostname; let locationName = window.location.hostname;
// domainUrl = "http://192.168.2.214:8082"; //214主域名 domainUrl = "http://192.168.2.214:8082"; //214主域名
// domainUrl = "http://192.168.2.88"; //王悦主域名 // domainUrl = "http://192.168.2.88"; //王悦主域名
// domainUrl = "http://127.0.0.1"; //214主域名 // domainUrl = "http://127.0.0.1"; //214主域名
// domainUrl = "http://192.168.2.16:8083"; //王悦主域名 // domainUrl = "http://192.168.2.16:8083"; //刘东主域名
// domainUrl = "http://127.0.0.1"; //214主域名 // domainUrl = "http://127.0.0.1"; //214主域名
// domainUrl = "http://192.168.2.65:8025"; //吴春主域名 // domainUrl = "http://192.168.2.65:8025"; //吴春主域名
domainUrl = "http://192.168.2.214:8082"; //罗超主域名 // domainUrl = "http://192.168.2.106:8082"; //罗超主域名
if (locationName.indexOf('oytour')!==-1) { if (locationName.indexOf('oytour')!==-1) {
domainUrl = "https://reborn.oytour.com"; domainUrl = "https://reborn.oytour.com";
}else if (locationName.indexOf('viitto')!==-1) { }else if (locationName.indexOf('viitto')!==-1) {
...@@ -525,6 +525,7 @@ export default { ...@@ -525,6 +525,7 @@ export default {
//价钱格式化,三位数逗号分隔,保留两位小数 duanjun //价钱格式化,三位数逗号分隔,保留两位小数 duanjun
Vue.prototype.moneyFormat = function (value) { Vue.prototype.moneyFormat = function (value) {
if(!value) return ('0.00')
let nStr = Number(value).toFixed(2) let nStr = Number(value).toFixed(2)
nStr += ''; nStr += '';
let x = nStr.split('.'); let x = nStr.split('.');
......
...@@ -1771,6 +1771,14 @@ export default { ...@@ -1771,6 +1771,14 @@ export default {
title: '跟团游订单' title: '跟团游订单'
}, },
}, },
{ // 销售 跟团游订单
path: '/SalesFinancialDetail',
name: 'SalesFinancialDetail',
component: resolve => require(['@/components/SalesModule/SalesFinancialDetail'], resolve),
meta: {
title: '销售财务单据'
},
},
{ // 销售 拜访月历 { // 销售 拜访月历
path: '/visitMonthStatistics', path: '/visitMonthStatistics',
name: 'visitMonthStatistics', name: 'visitMonthStatistics',
......
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