-
+
-
-
{{effectiveDetail.SHOPNAME}}
-
+
@@ -47,37 +47,68 @@
{{effectiveDetail.TREATMENT_MARK}}
-
主任名称：{{zhur[0]}}
- {{zhur[1]}}
+ 主任名称：{{endaccountMsg[0]}}
+ {{endaccountMsg[1]}}
-
确认意见
{{zhur[2]}}
+ 确认意见
{{endaccountMsg[2]}}
- 营收详情
+
+
+
+ 稽核信息
+ 营收详情
查看账单图片
-
{{CASH}}
- 
+
现金支付
+
现金支付
+
-
+
-
-
{{MOBILEPAYMENT}}
+
+
+
- 
+
移动支付
@@ -86,7 +117,7 @@
+
移动支付
{{TOTALSELLAMOUNT}}
@@ -95,15 +126,15 @@
- 
+
销售金额
+
销售金额
{{CASHPAY_DOWNLORD}}
-
+
缴款金额
+
缴款金额
-
-
+
-
+
-
-
{{CASH}}
-
- 
+
现金支付
@@ -112,12 +143,12 @@
+
现金支付
{{DIFFERENT_PRICE}}
- 
+
长短款额
+
长短款额
+
-
-
误差率：
{{wcl}}%
@@ -131,37 +162,38 @@
- 
- 单品记录：
- 
- 
-
-
- 单品记录：
-
-
-
- 
- 移动支付：
-
+
+
- 移动支付：
-
-
-
+
+ 单品记录：
+
+
+
+
+
+
+
-
- 
- 香烟数据：
-
-
-
- 香烟数据：
-
-
- 
- 促销数据：
-
-
-
- 促销数据：
-
-
-
+
+
+ 香烟数据：
+
+
+
+
+
+
+ {{isback? '驳回':'确认'}}意见
@@ -172,104 +204,104 @@取消
-
-
-
+
+ 数据校验
-
-
-
-
-
-
- =
-
- {{mobileChongzheng}}
-
- +
-
- {{SALE_CORRECT}}
-
-
-
-
- 移动冲正
- 移动支付差额
- 到账实差
-
-
+
+
数据校验
+
-
- {{effectiveDetail.CASHPAY}}
+
-
+
+
=
- {{effectiveDetail.TOTALSELLAMOUNT}}
+ {{mobileChongzheng}}
+
- {{CORRECT_AMOUNT}}
-
-
- 实收金额
- 销售金额
- 冲正金额
-
-
-
- {{CORRECT_AMOUNT}}
-
- =
-
- {{effectiveDetail.MOBILE_CORRECT||0}}
-
- +
-
-
-
+ {{SALE_CORRECT}}
- 冲正金额
移动冲正
- 现金冲正
+ 移动支付差额
+ 到账实差
+
+
+
+
-
+ {{effectiveDetail.CASHPAY}}
+
+ =
+
+ {{effectiveDetail.TOTALSELLAMOUNT}}
+
+ +
+
+ {{CORRECT_AMOUNT}}
-
校验原因
- +
+ 实收金额
+ 销售金额
+ 冲正金额
-
-
-
- 校验
- 取消
+
+
+
+ {{CORRECT_AMOUNT}}
+
+ =
+
+ {{effectiveDetail.MOBILE_CORRECT||0}}
+
+ +
+
+
+
+
+
+
+ 冲正金额
+ 移动冲正
+ 现金冲正
-
-
-
- 驳回
+
+
- 校验原因
+
-
- 审核
+
-
+
校验
+ 取消
-
-
- 一键冲正
-
-
-
- 校验
-
+
+
+
+
+
+ 驳回
+
+
+
+ 审核
+
+
+
+
+
+ 一键冲正
+
+
+
+ 校验
+
+
@@ -284,7 +316,7 @@
import uniPopup from '@/components/uni-popup.vue';
import uniLoadMore from '@/components/uni-load-more.vue';
- import {mapGetters} from "vuex";
+ import {mapGetters,mapMutations} from "vuex";
export default {
data() {
let offsetTop = 0;
@@ -306,14 +338,13 @@
isCheck: 0, // 0 不显示按钮 1 数据校验按钮 2 财务审核按钮
PopupVisible3: false,
Opinion: "", //意见
- trialani: false,
-
+
PURCHASEDESC: "",
examineType: "",
opinionType: "",
moneyJj: "",
cans: [],
- zhur: [],
+ endaccountMsg: [], // 主任意见
wcl: "",
cor: "",
cashpay: "",
@@ -344,12 +375,14 @@
contentnomore: ""
},
isback:false ,// 是否是驳回
- imagesList: []
+ imagesList: [],
+ Audit_List: []
}
},
computed:{
...mapGetters({
- 'user':'getUser'
+ 'user':'getUser',
+ reloading:'shouldReLoadingList'
}),
// 金额格式化处理
TOTALSELLAMOUNT(){
@@ -398,10 +431,9 @@
components: {
uniPopup,
uniLoadMore
-
},
-
methods: {
+ ...mapMutations(['shouldReLoadingList']),
// 图片预览
showImg() {
let list = []
@@ -500,9 +532,14 @@
}).then(res => {
_this.loading = false
uni.hideLoading()
+
if (!res.Result_Code|| res.Result_Code!='100') return
_this.imagesList = res.Result_Data.Image_List
+ if(res.Result_Data.Audit_List){
+
+ _this.Audit_List = res.Result_Data.Audit_List.List
+ }
let _data = res.Result_Data.Endaccount_List
_this.effectiveShow = true
@@ -569,7 +606,7 @@
}
_this.cashpay = _data.CASHPAY
_this.cashCorrect = _data.CASH_CORRECT
- _this.zhur = _data.ENDACCOUNT_DESC.split("|");
+ _this.endaccountMsg = _data.ENDACCOUNT_DESC.split("|");
if (_data.TOTALSELLAMOUNT != 0) {
let moj =parseFloat(_data.TOTALSELLAMOUNT)/parseFloat(_data.TICKETCOUNT);
let l = moj.toString().indexOf(".") + 3;
@@ -799,20 +836,17 @@
_this.$request.$post(_this.examineType,JSON).then(res => {
uni.hideLoading()
if(res.Result_Code == 100){
- _this.showPopupMiddle = false
- _this.showPopupYj = false
- _this.getEffectiveDetail()
uni.showToast({
icon: 'none',
title: '审核通过',
- duration: 1000
+
});
-
- uni.$emit('datasummary',true)
- }else{
_this.showPopupMiddle = false
_this.showPopupYj = false
_this.getEffectiveDetail()
+
+ uni.$emit('datasummary',true)
+ }else{
uni.showModal({
title:'温馨提示',
content:res.Result_Desc,
@@ -821,6 +855,9 @@
}
})
+ _this.showPopupMiddle = false
+ _this.showPopupYj = false
+ _this.getEffectiveDetail()
}
@@ -867,12 +904,31 @@
}
})
+ },
+ toPage(item){
+ this.$util.toNextRoute('navigateTo', '/pages/cashAudit/detail?id='+item.CHECKACCOUNT_ID)
+
}
},
onUnload() {
this.$util.addUserBehavior()
+
+ },
+ onShow() {
+ let _this = this
+
+ if(this.reloading) {
+ uni.showLoading({
+ title:'正在加载'
+ })
+
+
+ this.getEffectiveDetail()
+ this.shouldReLoadingList(false)
+ }
},
onLoad(option) {
+ let _this = this
if(option.SERVERPART_ID) {
this.SERVERPART_ID = option.SERVERPART_ID
}
@@ -881,6 +937,7 @@
title:'正在加载'
})
this.getEffectiveDetail()
+
}
}
@@ -892,23 +949,25 @@
.effectiveDetail {
width: 100%;
box-sizing: border-box;
+ /* background-color: #fff; */
+ padding-bottom: 140rpx;
}
.contentTwo-head {
width: 100%;
box-sizing: border-box;
- padding: 20rpx 30rpx;
- background-color: #fff;
+ padding: 30rpx 26rpx 0 26rpx;
position: relative;
font-size: 24rpx;
+ background-color: #fafafa;
}
- /* .content-detail-box{
- box-shadow: 0px 1px 8px 0.2px #e2e2e2;
- border-radius: 10rpx;
- padding: 0 20rpx;
- margin-bottom: 20rpx;
- } */
+ .content-detail-box {
+ box-shadow: 0rpx 2rpx 8rpx 0px rgba(231,231,231,0.67);
+ border-radius: 7rpx;
+ padding: 20rpx 20rpx;
+ background-color: #fff;
+ }
.content-detail-box span{
font-size: 24rpx;
}
@@ -939,6 +998,7 @@
display: inline-block;
color: #979797;
font-size: 24rpx;
+ line-height: 60rpx;
}
.contentTwo-right {
@@ -947,6 +1007,7 @@
width: 280rpx;
display: flex;
align-items: center;
+ font-size: 24rpx;
}
.contentTwo-name {
@@ -955,7 +1016,7 @@
}
.contentTwo-text {
- font-size: 32rpx;
+ font-size: 30rpx;
}
.lie_right2 {
@@ -974,6 +1035,16 @@
margin-top: 20rpx;
margin-bottom: 80rpx;
}
+ .page-btn-box {
+ margin-bottom: 0;
+ position: fixed;
+ width: 100%;
+ background-color: #fafafa;
+ padding-bottom: 40rpx;
+ bottom: 0;
+ left: 0;
+ z-index: 2;
+ }
.check-btn {
flex:1;
text-align: center;
@@ -1055,13 +1126,17 @@
line-height: 80rpx;
}
- .commodityP {
- color: #b7b8ba;
- padding: 0.5rem;
+ .modle-title {
+ color: #000;
+ padding: 36rpx 30rpx 24rpx 30rpx;
+ font-size: 26rpx;
display: flex;
align-items: center;
justify-content: space-between;
}
+ .modle-title h2 {
+ font-weight: bolder;
+ }
.photo-btn {
display: flex;
align-items: center;
@@ -1097,7 +1172,7 @@
font-size: 24rpx;
color: #333;
}
- .add{
+ .add {
width: 20rpx;
text-align: center;
}
@@ -1118,21 +1193,6 @@
padding-top: 0.5rem;
}
- .trialani {
- width: 10rem;
- height: 6rem;
- box-shadow: 0px 1px 8px 0.2px #e2e2e2;
- text-align: center;
- background-color: #fff;
- position: fixed;
- top: 42%;
- left: 50%;
- -webkit-transform: translate3d(-50%, -50%, 0);
- -moz-transform: translate3d(-50%, -50%, 0);
- -o-transform: translate3d(-50%, -50%, 0);
- -ms-transform: translate3d(-50%, -50%, 0);
- transform: translate3d(-50%, -50%, 0);
- }
.commodity {
width: 100%;
@@ -1154,7 +1214,6 @@
width: 100%;
text-align: center;
background-size: contain;
- margin-top: 2rpx;
}
.commodity>div:last-child{
padding-top: 12rpx;
@@ -1167,22 +1226,17 @@
/* display: inline-block; */
vertical-align: middle;
}
- .cashpay-box img,.to-examine img{
+ .cashpay-box image,.to-examine img{
width: 40rpx;
height: 40rpx;
}
.color1 {
- display: block;
- text-align: left;
color: #333;
font-size:28rpx;
- line-height: 60rpx;
+ line-height: 56rpx;
}
.ctitle {
- display: inline-block;
- text-align: left;
- vertical-align: middle;
color: #63A0E5;
font-size: 24rpx;
}
@@ -1200,7 +1254,7 @@
left: 0;
background-color: rgba(0, 0, 0, .6);
}
- .text-content{
+ .text-content {
height: 150rpx;
width: 100%;
font-size: 28rpx
@@ -1216,8 +1270,7 @@
.cashpay{
display: inline-block;
border-bottom: 1rpx solid #63a0e5;
- /* border-radius: 10rpx; */
- /* margin-left: 10rpx; */
+
padding-left: 16rpx;
height: 60rpx;
line-height: 60rpx;
@@ -1225,15 +1278,16 @@
box-sizing: border-box;
width: 160rpx;
}
- .cashpay-box{
+ .cashpay-box {
display: flex;
align-items: center;
justify-content: space-between;
- background-color: #eeeeee;
- padding: 30rpx;
+ background-color: #f8f9fb;
+ padding: 26rpx 34rpx;
flex-wrap: wrap;
+ /* margin: 0 26rpx; */
}
- .cashpay-box>div{
+ .cashpay-box > div{
width: 50%;
display: flex;
align-items: center;
@@ -1334,4 +1388,61 @@
.ico-sjx:before{
background-image: url('/static/images/expense/sjx.png');
}
+
+ /* 稽核信息 */
+ .crashaudit-cell {
+ margin: 0 26rpx;
+ background: #ffffff;
+ border-radius: 8rpx;
+ box-shadow: 0rpx 2rpx 8rpx 0rpx rgba(231,231,231,0.67);
+ overflow: hidden;
+ position: relative;
+ padding: 10rpx 30rpx 16rpx 30rpx;
+ }
+ .crashaudit-cell + .crashaudit-cell {
+ margin-top: 22rpx;
+ }
+ .crashaudit-cell::before {
+ content: '';
+ display: block;
+ width: 6rpx;
+ height: 100%;
+ background-color: #4da2eb;
+ position: absolute;
+ left: 0;
+ top: 0;
+ z-index: 1;
+ }
+ .crashaudit-cell.aready::before {
+ background-color: #dbdbdb;
+ }
+ .crashaudit-cell > view {
+ margin-bottom: 8rpx;
+ }
+ .crashaudit-cell >view+view {
+ margin-bottom: 0rpx;
+ }
+ .crashaudit-cell text{
+ font-size: 22rpx;
+ }
+ .crashaudit-cell text.status-text {
+ color: #F4904E;
+ font-size: 24rpx;
+ }
+ .crashaudit-cell.aready text.status-text {
+ color: #ADB2BF;
+ }
+ .crashaudit-cell .price-text {
+ color: #D75B5B;
+ }
+ .crashaudit-cell view .flex-1 {
+ flex: 1;
+ }
+ .crashaudit-cell view > text:first-child {
+ color: #ADB2BF;
+ }
+ .crashaudit-cell view.desc-text {
+
+ line-height: 1.4;
+ }
diff --git a/pages/mbwa/mbwaDetail.vue b/pages/mbwa/mbwaDetail.vue
index 07931a9..6b8f5b6 100644
--- a/pages/mbwa/mbwaDetail.vue
+++ b/pages/mbwa/mbwaDetail.vue
@@ -269,9 +269,10 @@
_this.mbwaShow =true
_this.showData = rs.Data
_this.showData.status = keys[_this.showData.PROCESSMODE]
-
- if(_this.showData.SORTNUM===0){
- switch (_this.showData.PROCESSMODE){
+ let processmode = parseInt(_this.showData.PROCESSMODE)
+
+ if(_this.showData.SORTNUM==0){
+ switch (processmode){
case 1:
_this.getDEALER()
_this.isManager = 1
@@ -285,6 +286,7 @@
default:
break;
}
+ _this.$forceUpdate()
}
let arr = []
let dealerImgList = []
diff --git a/static/images/revenue/down-arrow.png b/static/images/revenue/down-arrow.png
new file mode 100644
index 0000000..b997cfd
Binary files /dev/null and b/static/images/revenue/down-arrow.png differ
diff --git a/static/images/revenue/up-arrow.png b/static/images/revenue/up-arrow.png
new file mode 100644
index 0000000..ccef1cc
Binary files /dev/null and b/static/images/revenue/up-arrow.png differ
diff --git a/static/images/revenue/ysqs.png b/static/images/revenue/ysqs.png
new file mode 100644
index 0000000..4486ced
Binary files /dev/null and b/static/images/revenue/ysqs.png differ
diff --git a/util/apiPath.js b/util/apiPath.js
index 12dadba..c38920c 100644
--- a/util/apiPath.js
+++ b/util/apiPath.js
@@ -1,7 +1,7 @@
export default {
baseURL: 'https://user.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx', // 合作商户请求
- // baseURL: 'http://192.168.11.140:8999/Coop.Merchant/Handler/handler_ajax.ashx', // 合作商户请求
+ // baseURL: 'http://192.168.11.140:8000/Coop.Merchant/Handler/handler_ajax.ashx', // 合作商户请求
mpUrl: 'https://mp.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx', // 接口
apiurl: 'https://api.eshangtech.com/', // web api/WeChatPushAPI/