Skip to content

S
SuperMan
Commit d1ead1aa authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents b1a7d803 2fbdee90
Hide whitespace changes
Inline Side-by-side
Showing with 193 additions and 140 deletions
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ d1ead1aa
...@@ -375,9 +375,9 @@ ...@@ -375,9 +375,9 @@
<span v-if="GetDetail.TemplateId==48 || (GetDetail.TemplateId==43&&GetDetail.IsPublic==4)" class="sqs" @click="goUrl('Application',GetDetail.FrID)">申请书下载</span> <span v-if="GetDetail.TemplateId==48 || (GetDetail.TemplateId==43&&GetDetail.IsPublic==4)" class="sqs" @click="goUrl('Application',GetDetail.FrID)">申请书下载</span>
<p class="_tit">{{GetDetail.FinanceName}} <span :class="{color_shz:(GetDetail.StatusStr!=='通过' && GetDetail.StatusStr!=='驳回' && GetDetail.StatusStr!=='作废'),color_tg:GetDetail.StatusStr==='通过',color_bh:GetDetail.StatusStr==='驳回'}">{{GetDetail.StatusStr}}</span></p> <p class="_tit">{{GetDetail.FinanceName}} <span :class="{color_shz:(GetDetail.StatusStr!=='通过' && GetDetail.StatusStr!=='驳回' && GetDetail.StatusStr!=='作废'),color_tg:GetDetail.StatusStr==='通过',color_bh:GetDetail.StatusStr==='驳回'}">{{GetDetail.StatusStr}}</span></p>
<div class="_conten"> <div class="_conten">
<my-Bill v-if="GetDetail.Type===2 && GetDetail.Type!==5 && showModel" :isPrintPage="false" :GetDetail="GetDetail" :width="widthSon" :color="colorSon"></my-Bill> <my-Bill v-if="GetDetail.Type===2 && GetDetail.Type!==5" :isPrintPage="false" :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-Bill>
<my-RVB-Bill v-else-if="GetDetail.Type===1 && showModel" :GetDetail="GetDetail" :isPrintPage="false" :width="widthSon" :color="colorSon"></my-RVB-Bill> <my-RVB-Bill v-else-if="GetDetail.Type===1" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon" :color="colorSon"></my-RVB-Bill>
<my-GZ-Bill v-else-if="GetDetail.Type===7 && showModel" :GetDetail="GetDetail" :width="widthSon" :color="colorSon"></my-GZ-Bill> <my-GZ-Bill v-else-if="GetDetail.Type===7" :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-GZ-Bill>
<div class="_explain"> <div class="_explain">
<p>附加说明： <span class="fr" v-if="GetDetail.ComplainID > 0" @click="goComplain('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)"> <span style="color:#000">投诉单号：</span> <span class="cursorpointer text-decoration">{{GetDetail.ComplainID}}</span></span> </p> <p>附加说明： <span class="fr" v-if="GetDetail.ComplainID > 0" @click="goComplain('ComplaintsDetail', GetDetail.ComplainID,GetDetail.OrderID)"> <span style="color:#000">投诉单号：</span> <span class="cursorpointer text-decoration">{{GetDetail.ComplainID}}</span></span> </p>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0"> <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
......
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ d1ead1aa
...@@ -307,7 +307,7 @@ ...@@ -307,7 +307,7 @@
</template> </template>
<script> <script>
export default { export default {
props:["ID","width","color","isPrintPage","name","OrderSource","GetDetail"], //接收参数 ID width color props:["ID","width","color","isPrintPage","name","OrderSource"], //接收参数 ID width color
data(){ data(){
return{ return{
loading:false, loading:false,
...@@ -317,6 +317,7 @@ export default { ...@@ -317,6 +317,7 @@ export default {
printTime:'', printTime:'',
currentMoney:0, currentMoney:0,
benMoney:0, benMoney:0,
GetDetail:{}
} }
},created(){ },created(){
let date = new Date(), let date = new Date(),
...@@ -355,20 +356,19 @@ export default { ...@@ -355,20 +356,19 @@ export default {
}) })
} }
}, },
Financial_post_GetDetail(){ //获取单据详情 Financial_post_GetDetail(id){ //获取单据详情
// if(!id) return if(!id) return
this.loading = true; this.loading = true;
// this.apipost('Financial_post_GetDetail',{ID:id}, res => { this.apipost('Financial_post_GetDetail',{ID:id}, res => {
// if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
let data = this.GetDetail; let data= res.data.data;
console.log(data.DetailList) data.DetailList.forEach(x=>{
// this.GetDetail.DetailList.forEach(x=>{ x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
// x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100) x.Money = Math.round(x.Money * 100) / 100
// x.Money = Math.round(x.Money * 100) / 100 x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
// x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100 this.currentMoney += parseFloat(x.OriginalMoney);
// this.currentMoney += parseFloat(x.OriginalMoney); this.benMoney += parseFloat(x.Money);
// this.benMoney += parseFloat(x.Money); })
// })
this.currentMoney = Math.round(this.currentMoney * 100) / 100; this.currentMoney = Math.round(this.currentMoney * 100) / 100;
this.benMoney = Math.round(this.benMoney * 100) / 100; this.benMoney = Math.round(this.benMoney * 100) / 100;
this.$emit('headCallBack', this.currentMoney); this.$emit('headCallBack', this.currentMoney);
...@@ -380,10 +380,10 @@ export default { ...@@ -380,10 +380,10 @@ export default {
this.GetDetail = data; this.GetDetail = data;
console.log(this.GetDetail) console.log(this.GetDetail)
this.loading=false this.loading=false
// this.$set(this.$data,"GetDetail",data); this.$set(this.$data,"GetDetail",data);
// console.log(this.GetDetail) console.log(this.GetDetail)
// } }
// }, err => {}) }, err => {})
}, },
},mounted(){ },mounted(){
// console.log(this.ID+"mounted") // console.log(this.ID+"mounted")
...@@ -395,24 +395,23 @@ export default { ...@@ -395,24 +395,23 @@ export default {
this.EndDate = yaer + '-' + month + '-' + dateS; this.EndDate = yaer + '-' + month + '-' + dateS;
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId; this.EmployeeId = userInfo.EmployeeId;
this.Financial_post_GetDetail(); this.Financial_post_GetDetail(this.ID);
},watch: { // 监听参数变化 },watch: { // 监听参数变化
// GetDetail: { GetDetail: {
// handler: function(val, oldVal) { handler: function(val, oldVal) {
// // console.log(val) // console.log(val)
// // console.log(oldVal) // console.log(oldVal)
// }, },
// deep: true deep: true
// }, },
// ID:{ ID:{
// handler: function(val, oldVal) { handler: function(val, oldVal) {
// this.ID = val this.ID = val
// this.Financial_post_GetDetail(this.ID) this.Financial_post_GetDetail(this.ID)
// // console.log(val) // console.log(val)
// }, },
// deep: true deep: true
// } }
} }
} }
</script> </script>
src/components/FinancialModule/FinancialSubmodule/DjieMergeBillModule.vue
View file @ d1ead1aa
...@@ -332,11 +332,11 @@ ...@@ -332,11 +332,11 @@
}) })
} }
}, },
Financial_post_GetDetail(){ //获取单据详情 Financial_post_GetDetail(id){ //获取单据详情
// if(!id) return if(!id) return
this.loading = true; this.loading = true;
// this.apipost('Financial_post_GetDetail',{ID:id}, res => { this.apipost('Financial_post_GetDetail',{ID:id}, res => {
// if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
let data= this.GetDetail; let data= this.GetDetail;
data.DetailList.forEach(x=>{ data.DetailList.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100) x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
...@@ -360,10 +360,10 @@ ...@@ -360,10 +360,10 @@
data.AuditSteps.reverse() data.AuditSteps.reverse()
this.GetDetail = data; this.GetDetail = data;
this.loading=false this.loading=false
// this.$set(this.$data,"GetDetail",data); this.$set(this.$data,"GetDetail",data);
// console.log(this.GetDetail) console.log(this.GetDetail)
// } }
// }, err => {}) }, err => {})
}, },
},mounted(){ },mounted(){
// console.log(this.ID+"mounted") // console.log(this.ID+"mounted")
...@@ -375,23 +375,23 @@ ...@@ -375,23 +375,23 @@
this.EndDate = yaer + '-' + month + '-' + dateS; this.EndDate = yaer + '-' + month + '-' + dateS;
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId; this.EmployeeId = userInfo.EmployeeId;
this.Financial_post_GetDetail(); this.Financial_post_GetDetail(THIS.ID);
},watch: { // 监听参数变化 },watch: { // 监听参数变化
// GetDetail: { GetDetail: {
// handler: function(val, oldVal) { handler: function(val, oldVal) {
// // console.log(val) // console.log(val)
// // console.log(oldVal) // console.log(oldVal)
// }, },
// deep: true deep: true
// }, },
// ID:{ ID:{
// handler: function(val, oldVal) { handler: function(val, oldVal) {
// this.ID = val this.ID = val
// this.Financial_post_GetDetail(this.ID) this.Financial_post_GetDetail(this.ID)
// // console.log(val) // console.log(val)
// }, },
// deep: true deep: true
// } }
} }
} }
</script> </script>
src/components/FinancialModule/FinancialSubmodule/GZBillModule.vue
View file @ d1ead1aa
...@@ -372,11 +372,11 @@ export default { ...@@ -372,11 +372,11 @@ export default {
}) })
} }
}, },
Financial_post_GetDetail(){ //获取单据详情 Financial_post_GetDetail(id){ //获取单据详情
// if(!id) return if(!id) return
this.loading = true; this.loading = true;
// this.apipost('Financial_post_GetDetail',{ID:id}, res => { this.apipost('Financial_post_GetDetail',{ID:id}, res => {
// if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
let data= this.GetDetail; let data= this.GetDetail;
data.DetailList.forEach(x=>{ data.DetailList.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100) x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
...@@ -396,9 +396,9 @@ export default { ...@@ -396,9 +396,9 @@ export default {
console.log(this.GetDetail) console.log(this.GetDetail)
this.loading=false this.loading=false
// this.$set(this.$data,"GetDetail",data); // this.$set(this.$data,"GetDetail",data);
// console.log(this.GetDetail) console.log(this.GetDetail)
// } }
// }, err => {}) }, err => {})
}, },
},mounted(){ },mounted(){
// console.log(this.ID+"mounted") // console.log(this.ID+"mounted")
...@@ -410,23 +410,23 @@ export default { ...@@ -410,23 +410,23 @@ export default {
this.EndDate = yaer + '-' + month + '-' + dateS; this.EndDate = yaer + '-' + month + '-' + dateS;
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId; this.EmployeeId = userInfo.EmployeeId;
this.Financial_post_GetDetail(); this.Financial_post_GetDetail(this.ID);
},watch: { // 监听参数变化 },watch: { // 监听参数变化
// GetDetail: { GetDetail: {
// handler: function(val, oldVal) { handler: function(val, oldVal) {
// // console.log(val) // console.log(val)
// // console.log(oldVal) // console.log(oldVal)
// }, },
// deep: true deep: true
// }, },
// ID:{ ID:{
// handler: function(val, oldVal) { handler: function(val, oldVal) {
// this.ID = val this.ID = val
// this.Financial_post_GetDetail(this.ID) this.Financial_post_GetDetail(this.ID)
// // console.log(val) // console.log(val)
// }, },
// deep: true deep: true
// } }
} }
} }
</script> </script>
src/components/FinancialModule/FinancialSubmodule/ReceivablesModule.vue
View file @ d1ead1aa
...@@ -284,7 +284,7 @@ ...@@ -284,7 +284,7 @@
</template> </template>
<script> <script>
export default { export default {
props:["ID","width","color","isPrintPage","name","Num","OrderSource","GetDetail"], //接收参数 ID width color isPrintPage props:[" ","width","color","isPrintPage","name","Num","OrderSource","GetDetail"], //接收参数 ID width color isPrintPage
data(){ data(){
return{ return{
loading:false, loading:false,
...@@ -336,12 +336,12 @@ export default { ...@@ -336,12 +336,12 @@ export default {
}) })
} }
}, },
Financial_post_GetDetail(){ //获取单据详情 Financial_post_GetDetail(id){ //获取单据详情
// if(!id) return; if(!id) return;
this.loading = true; this.loading = true;
// this.apipost('Financial_post_GetDetail',{ID:id}, res => { this.apipost('Financial_post_GetDetail',{ID:id}, res => {
// if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
let data = this.GetDetail; let data= res.data.data;
let numberC = 0; let numberC = 0;
let price = 0; let price = 0;
let rate = 0; let rate = 0;
...@@ -354,7 +354,7 @@ export default { ...@@ -354,7 +354,7 @@ export default {
}) })
this.currentMoney = Math.round(this.currentMoney * 100) / 100; this.currentMoney = Math.round(this.currentMoney * 100) / 100;
this.benMoney = Math.round(this.benMoney * 100) / 100; this.benMoney = Math.round(this.benMoney * 100) / 100;
// let m = data.PayMoney?data.PayMoney:data.Money; let m = data.PayMoney?data.PayMoney:data.Money;
data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Money); data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Money);
data.ChinesePayMoney = this.$commonUtils.changeMoneyToChinese(data.PayMoney) data.ChinesePayMoney = this.$commonUtils.changeMoneyToChinese(data.PayMoney)
data.PayMoney = this.$commonUtils.addCommas(Math.round(data.PayMoney * 100) / 100) data.PayMoney = this.$commonUtils.addCommas(Math.round(data.PayMoney * 100) / 100)
...@@ -362,10 +362,10 @@ export default { ...@@ -362,10 +362,10 @@ export default {
data.AuditSteps.reverse(); data.AuditSteps.reverse();
this.GetDetail = data; this.GetDetail = data;
this.loading=false this.loading=false
// this.$set(this.$data,"GetDetail",data); this.$set(this.$data,"GetDetail",data);
// console.log(this.GetDetail) console.log(this.GetDetail)
// } }
// }, err => {}) }, err => {})
}, },
},mounted(){ },mounted(){
// console.log(this.ID+"mounted") // console.log(this.ID+"mounted")
...@@ -377,25 +377,24 @@ export default { ...@@ -377,25 +377,24 @@ export default {
this.EndDate = yaer + '-' + month + '-' + dateS; this.EndDate = yaer + '-' + month + '-' + dateS;
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId; this.EmployeeId = userInfo.EmployeeId;
this.Financial_post_GetDetail(); this.Financial_post_GetDetail(this.ID);
// this.Financial_post_GetDetail(this.ID);
},watch: { // 监听参数变化 },watch: { // 监听参数变化
// GetDetail: { GetDetail: {
// handler: function(val, oldVal) { handler: function(val, oldVal) {
// // console.log(val) // console.log(val)
// // console.log(oldVal) // console.log(oldVal)
// }, },
// deep: true deep: true
// }, },
// ID:{ ID:{
// handler: function(val, oldVal) { handler: function(val, oldVal) {
// this.ID = val this.ID = val
// // console.log(val+"watch") // console.log(val+"watch")
// this.Financial_post_GetDetail(this.ID) this.Financial_post_GetDetail(this.ID)
// // console.log(val) // console.log(val)
// }, },
// deep: true deep: true
// }, },
num: { num: {
handler: function(val, oldVal) { handler: function(val, oldVal) {
console.log(val) console.log(val)
......
src/components/SalesModule/CustomerAnalysis.vue
View file @ d1ead1aa
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
<img v-else src="../../assets/img/default.png" alt=""> <img v-else src="../../assets/img/default.png" alt="">
</div> </div>
<div> <div>
<p>{{datainfo.Contact}}</p> <p>{{datainfo.CustomerName}}</p>
<p style="color:#7F8593;font-size:14px">{{datainfo.CustomerName}}</p> <p style="color:#7F8593;font-size:14px">{{datainfo.Contact}}</p>
</div> </div>
</div> </div>
</div> </div>
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<el-row :gutter="23" justify="space-between"> <el-row :gutter="23" justify="space-between">
<el-col :span="16"><div id="chartsMap" class="bgDiv" style="height:400px;width:100%;padding:20px 10px"></div> </el-col> <el-col :span="16"><div id="chartsMap" class="bgDiv" style="height:400px;width:100%;padding:20px 10px"></div> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="bgDiv" style="padding:20px 30px;height:400px;"> <div class="bgDiv" style="padding:20px 30px;height:400px;overflow:auto">
<p style="color:#2C3343;margin-bottom:30px">价格区间占比</p> <p style="color:#2C3343;margin-bottom:30px">价格区间占比</p>
<div v-for="(item,index) in datainfo.priceList" :key="index" class="perceItem"> <div v-for="(item,index) in datainfo.priceList" :key="index" class="perceItem">
<el-row :gutter="22"> <el-row :gutter="22">
...@@ -85,10 +85,10 @@ ...@@ -85,10 +85,10 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<div class="third" style="padding:0 10px;margin-top:20px"> <div class="third" style="padding:0 10px;margin:20px 0 40px 0">
<el-row :gutter="23" justify="space-between"> <el-row :gutter="23" justify="space-between">
<el-col :span="8"> <el-col :span="8">
<div class="bgDiv" style="padding:20px 30px;height:320px;"> <div class="bgDiv" style="padding:20px 30px;height:320px;overflow:auto">
<p style="color:#2C3343;margin-bottom:30px">返利红包预期收益</p> <p style="color:#2C3343;margin-bottom:30px">返利红包预期收益</p>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
...@@ -108,19 +108,21 @@ ...@@ -108,19 +108,21 @@
<el-col :span="18"> <el-col :span="18">
<div style="margin-bottom:20px" v-for="(item,index) in datainfo.list" :key="index+500"> <div style="margin-bottom:20px" v-for="(item,index) in datainfo.list" :key="index+500">
<div> <div>
<p style="color:#7F8593;font-size:12px">月交易额达<span style="color:#7F8593">￥{{item.Money}}</span> 返{{item.Ratio}}%</p> <p style="color:#7F8593;font-size:12px">年交易额达<span style="color:#7F8593">￥{{item.Money}}</span> 返{{item.Ratio}}‰</p>
</div> </div>
<div> <div>
<el-row :gutter="23" justify="space-between"> <el-row :gutter="23" justify="space-between">
<el-col :span="18"> <el-col :span="18">
<p style="margin-top:6px"> <p style="margin-top:6px">
<el-progress :color="colorMethod(item)" :show-text="false" :stroke-width="12" :percentage="datainfo.totalYearPrice"></el-progress> <!-- 数据是：{{datainfo.totalYearPrice/item.Money>1?100:(datainfo.totalYearPrice/item.Money)*100}} -->
<el-progress :color="colorMethod(item)" :show-text="false" :stroke-width="12" :percentage="datainfo.totalYearPrice/item.Money>1?100:(datainfo.totalYearPrice/item.Money)*100"></el-progress>
</p> </p>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<span><img v-if="item.ActivateState==2" style="width:20px;height:20px" src="../../assets/img/saleRank/gou.png" alt=""></span> <span v-if="item.ActivateState==2"><img style="width:20px;height:20px" src="../../assets/img/saleRank/gou.png" alt=""></span>
<span style="font-size:14px;font-weight:bold;color:#2C3343" v-if="item.ActivateState==0">未开启</span>
<span style="font-size:14px;font-weight:bold;color:#2C3343" v-if="item.ActivateState==1">还差 ¥{{item.PriceSpread}}满足</span>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
...@@ -130,12 +132,12 @@ ...@@ -130,12 +132,12 @@
</div> </div>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<div class="bgDiv" style="padding:20px 30px;height:320px;"> <div class="bgDiv" style="padding:20px 30px;height:320px;overflow:auto">
<p style="color:#2C3343;margin-bottom:30px">交客线路占比</p> <p style="color:#2C3343;margin-bottom:30px">交客线路占比</p>
<div v-for="(item,index) in datainfo.LineIdList" :key="index+100" class="circleItem"> <div v-for="(item,index) in datainfo.LineIdList" :key="index+100" class="circleItem">
<div style="height:126px;position:relative"> <div style="height:126px;position:relative">
<div class="Linetext"> <div class="Linetext">
<p style="font-size:34px">{{Number(item.Total)}}<span style="font-size:14px">%</span></p> <p style="font-size:34px">{{Number(item.Total)}}<span style="font-size:14px">‰</span></p>
<p style="font-size:14px">{{item.TypeName}}</p> <p style="font-size:14px">{{item.TypeName}}</p>
</div> </div>
<el-progress :color="item.color" :show-text="false" type="circle" :stroke-width="16" :percentage="Number(item.Total)"></el-progress> <el-progress :color="item.color" :show-text="false" type="circle" :stroke-width="16" :percentage="Number(item.Total)"></el-progress>
...@@ -190,10 +192,9 @@ export default { ...@@ -190,10 +192,9 @@ export default {
getData(){ getData(){
this.loading=true; this.loading=true;
this.apipost('app_customer_GetCustomerOrderInfo', {customerId:this.customerId}, res => { this.apipost('app_customer_GetCustomerOrderInfo', {customerId:this.customerId}, res => {
console.log("res.data",res.data)
this.loading=false; this.loading=false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
res.data.data.LineIdList.forEach(item => { res.data.data.LineIdList.forEach(item => {
this.colorList.forEach(color=>{ this.colorList.forEach(color=>{
item.color=color; item.color=color;
......
src/components/SalesModule/HappyPassbook.vue
View file @ d1ead1aa
...@@ -132,25 +132,28 @@ ...@@ -132,25 +132,28 @@
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr> <tr>
<th>金额</th> <th>门店名称</th>
<th>类型</th> <th>类型</th>
<th>金额</th>
<th>描述</th> <th>描述</th>
<th>时间</th> <th>时间</th>
<th>历史余额</th> <th>历史余额</th>
</tr> </tr>
<tr v-for="(item,index) in DataList" :key="index+500"> <tr v-for="(item,index) in DataList" :key="index+500">
<td>{{item.Money}}</td> <td>{{item.CustomerName}}({{item.Contact}})</td>
<td> <td>
<span>{{item.Type==1?"收入":"折扣"}}</span> <span>{{item.Type==1?"收入":"折扣"}}</span>
</td> </td>
<td>{{item.Money}}</td>
<td>{{item.Description}}</td> <td>{{item.Description}}</td>
<td>{{item.UpdateTime}}</td> <td>{{item.UpdateTime}}</td>
<td>{{item.AccountMoney}}</td> <td>{{item.AccountMoney}}</td>
</tr> </tr>
<tr v-if='DataList.length==0'> <tr v-if='DataList.length==0'>
<td colspan="5" align="center">暂无数据</td> <td colspan="6" align="center">暂无数据</td>
</tr> </tr>
</table> </table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
......
src/components/SalesModule/MyCustomer.vue
View file @ d1ead1aa
...@@ -70,6 +70,11 @@ ...@@ -70,6 +70,11 @@
.page_MyCustomerSearch ._class_b{ .page_MyCustomerSearch ._class_b{
color: #257BF1 !important color: #257BF1 !important
} }
.xqBtn{
background: #09D49D;
padding:2px 6px;
color:#fff!important;
}
</style> </style>
<template> <template>
<div class="page_MyCustomer"> <div class="page_MyCustomer">
...@@ -105,7 +110,7 @@ ...@@ -105,7 +110,7 @@
<div class="_mc_list _scrollbar" :class="addShow==true?'_edHeight':''"> <div class="_mc_list _scrollbar" :class="addShow==true?'_edHeight':''">
<ul class="clearfix"> <ul class="clearfix">
<li v-for="(item,index) in dataList" @click="goUrl(type,item.customerId)"> <li v-for="(item,index) in dataList" @click="goUrl(type,item.customerId)">
<i class="iconDelete2 iconfont icon-zongbiao" @click.stop="goUrC('CustomerAnalysis',item.customerId)"></i>
<i class="iconDelete1 iconfont icon-kehuguanxi_kehu" @click.stop="goUrlT('empBankAccount',item.customerId)"></i> <i class="iconDelete1 iconfont icon-kehuguanxi_kehu" @click.stop="goUrlT('empBankAccount',item.customerId)"></i>
<i class="iconDelete iconfont icon-kehuguanxi_delete1" @click.stop="deleteCustomer(item)"></i> <i class="iconDelete iconfont icon-kehuguanxi_delete1" @click.stop="deleteCustomer(item)"></i>
<img src="../../assets/img/vip.png" style="left: 134px; top: 50px;" v-show="item.isMember==1&&type==2"/> <img src="../../assets/img/vip.png" style="left: 134px; top: 50px;" v-show="item.isMember==1&&type==2"/>
...@@ -133,7 +138,9 @@ ...@@ -133,7 +138,9 @@
<p class="_other_n" v-else>最近拜访：暂无</p> <p class="_other_n" v-else>最近拜访：暂无</p>
</div> </div>
<div class="_bt"> <div class="_bt">
<p>累计交易额度 <span> {{item.tradeTotal}}</span></p> <p>累计交易额度 <span> {{item.tradeTotal}}</span>
<span class="xqBtn" @click.stop="goUrC('CustomerAnalysis',item.customerId)">详情</span>
</p>
<p>询价与需求 <span> {{item.inquireCount}}</span></p> <p>询价与需求 <span> {{item.inquireCount}}</span></p>
</div> </div>
</li> </li>
......
src/components/SalesModule/enrollTotal.vue
View file @ d1ead1aa
...@@ -286,7 +286,7 @@ ...@@ -286,7 +286,7 @@
<th>金额</th> <th>金额</th>
<th>类型</th> <th>类型</th>
<th>描述</th> <th>描述</th>
<th>时间</th> <th>时间（<span @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</span>）</th>
</tr> </tr>
<tr v-for="(item2,index2) in redBagList" <tr v-for="(item2,index2) in redBagList"
:key="index2"> :key="index2">
...@@ -435,6 +435,7 @@ ...@@ -435,6 +435,7 @@
return obj; return obj;
}, },
redBagList:[], redBagList:[],
happy:false,
defaultImg: 'this.src="' + require("../../assets/img/litheader.png") + '"', defaultImg: 'this.src="' + require("../../assets/img/litheader.png") + '"',
currentPage: 1, currentPage: 1,
total: 0, total: 0,
...@@ -516,6 +517,7 @@ ...@@ -516,6 +517,7 @@
}, },
methods: { methods: {
goUrlHappy(item){ goUrlHappy(item){
this.happy=false;
this.$router.push({ this.$router.push({
name: "HappyPassbook", name: "HappyPassbook",
query: { query: {
...@@ -791,6 +793,47 @@ ...@@ -791,6 +793,47 @@
text-indent: 15px; text-indent: 15px;
} }
*/ */
.personNolayer p {
height: 28px;
line-height: 28px;
padding-left: 15px;
}
.personNolayer p>span {
font-size: 12px;
color: #333;
margin-right: 15px;
}
.personNolayer table {
padding: 10px 0 0 20px;
width: 100%;
background-color: #ededed;
border-collapse: collapse;
border: 1px solid #d2d2d2;
font-size: 12px;
}
.personNolayer table th {
background-color: #ededed;
height: 34px;
text-indent: 15px;
}
.personNolayer table td {
background-color: #ffffff;
padding: 9px 15px;
color: #333333;
border: 1px solid #d2d2d2;
}
.personNolayer table ._color_666 {
color: #666666;
}
.personNolayer table tr._color_666 th {
padding: 9px 15px;
}
.personNolayer table th{ .personNolayer table th{
background-color: #ededed; background-color: #ededed;
......
src/components/SalesModule/groupTourOrder.vue
View file @ d1ead1aa
...@@ -1664,7 +1664,7 @@ ...@@ -1664,7 +1664,7 @@
<th>金额</th> <th>金额</th>
<th>类型</th> <th>类型</th>
<th>描述</th> <th>描述</th>
<th>时间</th> <th>时间（<span @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</span>）</th>
</tr> </tr>
<tr v-for="(item2,index2) in redBagList" <tr v-for="(item2,index2) in redBagList"
:key="index2"> :key="index2">
...@@ -1678,9 +1678,6 @@ ...@@ -1678,9 +1678,6 @@
<tr v-if='redBagList.length==0'> <tr v-if='redBagList.length==0'>
<td colspan="4" align="center">暂无数据</td> <td colspan="4" align="center">暂无数据</td>
</tr> </tr>
<tr>
<!-- <td @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</td> -->
</tr>
</table> </table>
</div> </div>
<span @click="getRedBag(item)" style="cursor: pointer;color: #e95252;" slot="reference">{{item.redEnvelopeMoney}}</span> <span @click="getRedBag(item)" style="cursor: pointer;color: #e95252;" slot="reference">{{item.redEnvelopeMoney}}</span>
...@@ -1939,6 +1936,7 @@ ...@@ -1939,6 +1936,7 @@
export default { export default {
data() { data() {
return { return {
happy:false,
redBagList:[], redBagList:[],
// 修改应收总额 // 修改应收总额
Ysze: false, Ysze: false,
...@@ -2242,6 +2240,7 @@ ...@@ -2242,6 +2240,7 @@
}, },
methods: { methods: {
goUrlHappy(item){ goUrlHappy(item){
this.happy=false;
this.$router.push({ this.$router.push({
name: "HappyPassbook", name: "HappyPassbook",
query: { query: {
...@@ -2251,6 +2250,7 @@ ...@@ -2251,6 +2250,7 @@
}); });
}, },
getRedBag(item){ getRedBag(item){
console.log("111")
let msg={ let msg={
CustomerId:item.customerId, CustomerId:item.customerId,
pageIndex: 1, pageIndex: 1,
...@@ -2258,6 +2258,7 @@ ...@@ -2258,6 +2258,7 @@
}; };
if(item.customerId){ if(item.customerId){
this.apipost('customer_post_GetC_BigRedEnvelopeInfoList',msg, res => { this.apipost('customer_post_GetC_BigRedEnvelopeInfoList',msg, res => {
this.happy=true;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.redBagList = res.data.data.pageData; this.redBagList = res.data.data.pageData;
} else { } else {
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ d1ead1aa
...@@ -1650,7 +1650,7 @@ ...@@ -1650,7 +1650,7 @@
<th>金额</th> <th>金额</th>
<th>类型</th> <th>类型</th>
<th>描述</th> <th>描述</th>
<th>时间</th> <th>时间(<span @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</span>)</th>
</tr> </tr>
<tr v-for="(item2,index2) in redBagList" <tr v-for="(item2,index2) in redBagList"
:key="index2"> :key="index2">
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ d1ead1aa
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
<th width="80">{{$t('fnc.yszonge')}}</th> <th width="80">{{$t('fnc.yszonge')}}</th>
<th width="80">{{$t('fnc.shishou')}}</th> <th width="80">{{$t('fnc.shishou')}}</th>
<th width="70">{{$t('fnc.youhui')}}</th> <th width="70">{{$t('fnc.youhui')}}</th>
<th width="70">幸福存折</th> <th width="80">幸福存折</th>
<th width="70">{{$t('fnc.xiaofei')}}</th> <th width="70">{{$t('fnc.xiaofei')}}</th>
<th width="70">{{$t('fnc.tuikuan')}}</th> <th width="70">{{$t('fnc.tuikuan')}}</th>
<th width="70">{{$t('fnc.ptshuijin')}}</th> <th width="70">{{$t('fnc.ptshuijin')}}</th>
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
<th>金额</th> <th>金额</th>
<th>类型</th> <th>类型</th>
<th>描述</th> <th>描述</th>
<th>时间</th> <th>时间(<span @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</span>)</th>
</tr> </tr>
<tr v-for="(item2,index2) in redBagList" <tr v-for="(item2,index2) in redBagList"
:key="index2"> :key="index2">
......
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