Skip to content

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

'更新提交@@'

parent f72c0ae2
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 21 deletions
src/components/SalesModule/SalesFinancialDetail.vue
View file @ 28073935
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<ul class="clearfix"> <ul class="clearfix">
<li><span>团队编号：</span>{{tcnum}}</li> <li><span>团队编号：</span>{{tcnum}}</li>
<li><span>订单号：</span>{{orderId}}</li> <li><span>订单号：</span>{{orderId}}</li>
<li><span>业务员：</span>{{`王大毛`}}</li> <li> </li>
<li><span>{{activeTab===1 ? '应收' : '应付'}}金额：</span>{{moneyFormat(allMoney)}}</li> <li><span>{{activeTab===1 ? '应收' : '应付'}}金额：</span>{{moneyFormat(allMoney)}}</li>
<li><span>{{activeTab===1 ? '实收' : '实付'}}金额：</span>{{moneyFormat(shiMoney)}}</li> <li><span>{{activeTab===1 ? '实收' : '实付'}}金额：</span>{{moneyFormat(shiMoney)}}</li>
<li><span>{{activeTab===1 ? '待收' : '待付'}}金额：</span><span :class="{color_red:(allMoney-shiMoney)!==allMoney}">{{moneyFormat(allMoney-shiMoney)}}</span></li> <li><span>{{activeTab===1 ? '待收' : '待付'}}金额：</span><span :class="{color_red:(allMoney-shiMoney)!==allMoney}">{{moneyFormat(allMoney-shiMoney)}}</span></li>
...@@ -305,10 +305,11 @@ export default { ...@@ -305,10 +305,11 @@ export default {
} }
}, },
}, mounted() { }, mounted() {
this.orderId = this.msg.OrderID = this.$route.query.orderId let obj = this.$route.query.item
this.tcnum = this.$route.query.tcnum this.orderId = this.msg.OrderID = obj.orderId
this.tcid = this.$route.query.tcid this.tcnum = obj.tcnum
this.outBranchId = this.$route.query.outBranchId this.tcid = obj.tcid
this.outBranchId = obj.outBranchId
this.getList(1) this.getList(1)
} }
} }
......
src/components/SalesModule/groupTourOrder.vue
View file @ 28073935
...@@ -1398,27 +1398,28 @@ ...@@ -1398,27 +1398,28 @@
</div> </div>
</td> </td>
<td colspan="7" class="groupTourOrder_tickets" style="height: 40px;"> <td colspan="7" class="groupTourOrder_tickets" style="height: 40px;">
<div @click="goUrlSFD('SalesFinancialDetail', item.orderId, '销售财务单据', item.tcnum, item.tcid, item.outBranchId)"> <!-- @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)" -->
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>收款单据：</div> <div>收款单据：</div>
<div> <div>
<span v-for="(item2,index2) in item.financeList" :key="index2"> <span v-for="(item2,index2) in item.financeList" :key="index2">
<span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue">{{item2.frID}}</span> <span v-if="item2.colorState===1" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')" class="groupTourOrder_tickets_blue">{{item2.frID}}</span>
<span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green">{{item2.frID}}</span> <span v-else-if="item2.colorState===2" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')" class="groupTourOrder_tickets_green">{{item2.frID}}</span>
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red">{{item2.frID}}</span> <span v-else-if="item2.colorState===3" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')" class="groupTourOrder_tickets_red">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black">{{item2.frID}}</span> <span v-else-if="item2.colorState===4" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')" class="groupTourOrder_tickets_black">{{item2.frID}}</span>
<!-- @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')" --> <!-- @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')" -->
</span> </span>
<span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span> <span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span>
</div> </div>
</div> </div>
<div @click="goUrlSFD('SalesFinancialDetail', item.orderId, '销售财务单据', item.tcnum, item.tcid, item.outBranchId)"> <div>
<div>付款单据：</div> <div>付款单据：</div>
<div> <div>
<span v-for="(item2,index2) in item.refundFinanceList" :key="index2"> <span v-for="(item2,index2) in item.refundFinanceList" :key="index2">
<span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue">{{item2.frID}}</span> <span v-if="item2.colorState===1" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')" class="groupTourOrder_tickets_blue">{{item2.frID}}</span>
<span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green">{{item2.frID}}</span> <span v-else-if="item2.colorState===2" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')" class="groupTourOrder_tickets_green">{{item2.frID}}</span>
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red">{{item2.frID}}</span> <span v-else-if="item2.colorState===3" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')" class="groupTourOrder_tickets_red">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black">{{item2.frID}}</span> <span v-else-if="item2.colorState===4" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')" class="groupTourOrder_tickets_black">{{item2.frID}}</span>
</span> </span>
<span v-if="item.refundFinanceList.length===0" style="cursor: default;">暂无数据</span> <span v-if="item.refundFinanceList.length===0" style="cursor: default;">暂无数据</span>
</div> </div>
...@@ -1947,10 +1948,10 @@ export default { ...@@ -1947,10 +1948,10 @@ export default {
} }
} }
}, },
goUrlSFD: function (path, orderId, name, tcnum, tcid, outBranchId) { goUrlSFD: function (path, name, item) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { orderId: orderId, blank: 'y', tab: name, tcnum: tcnum, tcid: tcid, outBranchId: outBranchId} query: { blank: 'y', tab: name, item: item}
}); });
}, },
goUrlX(name, path, id, tcmun) { goUrlX(name, path, id, tcmun) {
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 28073935
...@@ -1414,7 +1414,7 @@ ...@@ -1414,7 +1414,7 @@
{{item.createBy}}<br/><span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span> {{item.createBy}}<br/><span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span>
</td> </td>
<td> <td>
<p v-if='item.isOwn==1||userId==1||userId==5||positionId==168' class="fz12 over_ellipsis" style="width: 120px;" :title="item.contactName">{{item.contactName}}</p> <p v-if='item.isOwn==1||userId==1||userId==5||positionId==168 || isUpdateOrder'class="fz12 over_ellipsis" style="width: 120px;" :title="item.contactName">{{item.contactName}}</p>
<p v-if='item.isOwn==1||userId==1||userId==5||positionId==168' class="fz12">{{item.contactMobile}}</p> <p v-if='item.isOwn==1||userId==1||userId==5||positionId==168' class="fz12">{{item.contactMobile}}</p>
<p v-if='item.isOwn==2&&userId!=1&&userId!=5&&positionId!=168'>*****</p> <p v-if='item.isOwn==2&&userId!=1&&userId!=5&&positionId!=168'>*****</p>
</td> </td>
...@@ -1457,12 +1457,12 @@ ...@@ -1457,12 +1457,12 @@
<span>{{item.tC_Price}}</span> <span>{{item.tC_Price}}</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||isUpdateOrder">{{item.unit_Price}}</span>
<span v-else>*****</span> <span v-else>*****</span>
</td> </td>
<td> <td>
<p style="color:#FF9C00"> <p style="color:#FF9C00">
<span v-if="item.isOwn==1||userId==1||userId==5||positionId==168">{{item.preferPrice}}</span> <span v-if="item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder">{{item.preferPrice}}</span>
<span v-else>*****</span> <span v-else>*****</span>
</p> </p>
</td> </td>
...@@ -1514,7 +1514,7 @@ ...@@ -1514,7 +1514,7 @@
<td class="groupTourOrderIcon"> <td class="groupTourOrderIcon">
<el-button-group v-if='item.isOwn==1 || userId==1||userId==5'> <el-button-group v-if='item.isOwn==1 || userId==1||userId==5'>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start"> <el-tooltip class="item" effect="dark" content="修改" placement="top-start">
<el-button v-if="(userId==1 || userId==5 || item.isUpdateOrder) || ( item.isOwn==1 &&item.isOrder=='1'&&item.isHaveFinance!='1'&&item.orderState!='1'&&item.orderState!='4')" type="primary" style='background:#00C6FF; border-color:#00C6FF' icon="iconfont icon-bianji-smal" @click='getDetail(item)'></el-button> <el-button v-if="(userId==1 || userId==5 || isUpdateOrder) || ( item.isOwn==1 &&item.isOrder=='1'&&item.isHaveFinance!='1'&&item.orderState!='1'&&item.orderState!='4')" type="primary" style='background:#00C6FF; border-color:#00C6FF' icon="iconfont icon-bianji-smal" @click='getDetail(item)'></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="修改备注" placement="top-start"> <el-tooltip class="item" effect="dark" content="修改备注" placement="top-start">
<el-button v-if="(userId==1||userId==5)|| ( item.isOwn==1 ||item.isHaveFinance=='1'||item.orderState=='1')" type="primary" style='background:#a55eea; border-color:#a55eea' icon="iconfont icon-beizhu" @click='getRemarks(item)'></el-button> <el-button v-if="(userId==1||userId==5)|| ( item.isOwn==1 ||item.isHaveFinance=='1'||item.orderState=='1')" type="primary" style='background:#a55eea; border-color:#a55eea' icon="iconfont icon-beizhu" @click='getRemarks(item)'></el-button>
...@@ -2095,6 +2095,7 @@ export default { ...@@ -2095,6 +2095,7 @@ export default {
pageSize: 1000, pageSize: 1000,
TCID: this.$route.query.id TCID: this.$route.query.id
}, },
isUpdateOrder: false,
cancelRtData: [], cancelRtData: [],
//返回数据 //返回数据
currentPage: 1, currentPage: 1,
...@@ -2196,6 +2197,12 @@ export default { ...@@ -2196,6 +2197,12 @@ export default {
} }
}, },
methods: { methods: {
goUrlSFD: function (path, name, item) {
this.$router.push({
name: path,
query: { blank: 'y', tab: name, item: item}
});
},
getItem(obj){ getItem(obj){
this.checkedObj=obj this.checkedObj=obj
}, },
...@@ -3387,6 +3394,7 @@ export default { ...@@ -3387,6 +3394,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.isUpdateOrder = res.data.data.pageData.isUpdateOrder
this.IsUpdateOrderMoney = res.data.data.pageData.isUpdateOrderMoney 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
......
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