update
This commit is contained in:
parent
6631d44447
commit
3f9b827c89
@ -17,7 +17,7 @@
|
|||||||
<i class="ico ico-qtyq"></i>
|
<i class="ico ico-qtyq"></i>
|
||||||
<span>申请说明:</span>
|
<span>申请说明:</span>
|
||||||
</p>
|
</p>
|
||||||
<div class="detail-cont">{{baseData.PERMISSIONAPPLY_REASON}}</div>
|
<div class="detail-cont">{{baseData.PERMISSIONAPPLY_REASON?baseData.PERMISSIONAPPLY_REASON:''}}</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- <view class="row">
|
<!-- <view class="row">
|
||||||
|
|||||||
@ -44,7 +44,7 @@
|
|||||||
<span style="color: #979797;">{{effectiveDetail.SERVERPART_NAME}}</span>
|
<span style="color: #979797;">{{effectiveDetail.SERVERPART_NAME}}</span>
|
||||||
</view>
|
</view>
|
||||||
<view class="right">
|
<view class="right">
|
||||||
<span class="fourth-name">结账人员:</span>{{effectiveDetail.WORKER_NAME}}
|
<span class="fourth-name">结账人员:</span>{{effectiveDetail.WORKER_NAME?effectiveDetail.WORKER_NAME:''}}
|
||||||
<div>{{effectiveDetail.ENDACCOUNT_DATE}}</div>
|
<div>{{effectiveDetail.ENDACCOUNT_DATE}}</div>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@ -98,12 +98,12 @@
|
|||||||
<div style="width: 100%;display: flex;align-items: center;justify-content: space-between;margin-top: 16px">
|
<div style="width: 100%;display: flex;align-items: center;justify-content: space-between;margin-top: 16px">
|
||||||
<div class="commodityContent-cashpay">
|
<div class="commodityContent-cashpay">
|
||||||
<span class="wid70" style="color: #333;">误差率:</span>
|
<span class="wid70" style="color: #333;">误差率:</span>
|
||||||
<span class="color1" :class="{'text-red': calcWuchalv > 0.3}">{{calcWuchalv}}%</span>
|
<span v-if="calcWuchalv" class="color1" :class="{'text-red': calcWuchalv > 0.3}">{{calcWuchalv}}%</span>
|
||||||
</div>
|
</div>
|
||||||
<div style="color:#fff">-</div>
|
<div style="color:#fff">-</div>
|
||||||
<div class="commodityContent-cashpay">
|
<div class="commodityContent-cashpay">
|
||||||
<span class="wid70">实收金额:</span>
|
<span class="wid70">实收金额:</span>
|
||||||
<view class="cashpay" >{{effectiveDetail.CASHPAY}}元</view>
|
<view class="cashpay" >{{effectiveDetail.CASHPAY?effectiveDetail.CASHPAY:''}}元</view>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</view>
|
</view>
|
||||||
@ -123,6 +123,7 @@
|
|||||||
placeholder-style="color:#969EA4;line-height:2;padding-top:10rpx;"
|
placeholder-style="color:#969EA4;line-height:2;padding-top:10rpx;"
|
||||||
auto-height
|
auto-height
|
||||||
@blur="changeReason"
|
@blur="changeReason"
|
||||||
|
@change="changeReason"
|
||||||
auto-focus
|
auto-focus
|
||||||
></textarea>
|
></textarea>
|
||||||
</view>
|
</view>
|
||||||
@ -204,9 +205,11 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
if ( Math.abs(_data.DIFFERENT_PRICE) && _data.CASH){
|
||||||
return (Math.abs(_data.DIFFERENT_PRICE) / _data.CASH * 100).toFixed(2);
|
return (Math.abs(_data.DIFFERENT_PRICE) / _data.CASH * 100).toFixed(2);
|
||||||
|
}else{
|
||||||
|
return ''
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -217,7 +220,7 @@ export default {
|
|||||||
selectShopids:[],
|
selectShopids:[],
|
||||||
approvalReason: '',
|
approvalReason: '',
|
||||||
isloading:false,
|
isloading:false,
|
||||||
stateEmun: {2000:"办理中",3000:"未通过",9000:"已通过"},
|
stateEmun: {2000:"办理中",3000:"已否决",9000:"已通过"},
|
||||||
businessStatus : {
|
businessStatus : {
|
||||||
3000: '关闭' ,
|
3000: '关闭' ,
|
||||||
2000: '暂停'
|
2000: '暂停'
|
||||||
@ -247,6 +250,7 @@ export default {
|
|||||||
this.effectiveDetail[s] = value
|
this.effectiveDetail[s] = value
|
||||||
},
|
},
|
||||||
changeReason(event){
|
changeReason(event){
|
||||||
|
console.log('event',event)
|
||||||
this.approvalReason = event.detail.value
|
this.approvalReason = event.detail.value
|
||||||
},
|
},
|
||||||
hidePopup(){
|
hidePopup(){
|
||||||
@ -292,12 +296,17 @@ export default {
|
|||||||
let _this = this
|
let _this = this
|
||||||
|
|
||||||
if(_this.isloading) return
|
if(_this.isloading) return
|
||||||
|
|
||||||
|
uni.showModal({
|
||||||
|
title: '同意作废申请?',
|
||||||
|
success: function (res) {
|
||||||
|
if (res.confirm) {
|
||||||
uni.showLoading({
|
uni.showLoading({
|
||||||
title:'正在提交'
|
title:'正在提交'
|
||||||
})
|
})
|
||||||
_this.isloading = true
|
_this.isloading = true
|
||||||
let flag = false
|
let flag = false
|
||||||
if (this.data.PERMISSIONAPPLY_STATE===2000){
|
if (_this.data.PERMISSIONAPPLY_STATE===2000){
|
||||||
flag = true
|
flag = true
|
||||||
}
|
}
|
||||||
let useData = Store.state.userData
|
let useData = Store.state.userData
|
||||||
@ -334,14 +343,14 @@ export default {
|
|||||||
OPERATE_DATE: detail.OPERATE_DATE,
|
OPERATE_DATE: detail.OPERATE_DATE,
|
||||||
APPOVED_ID: useData.UserId,
|
APPOVED_ID: useData.UserId,
|
||||||
APPOVED_NAME: useData.UserName,
|
APPOVED_NAME: useData.UserName,
|
||||||
APPOVED_INFO: this.approvalReason,
|
APPOVED_INFO: _this.approvalReason,
|
||||||
PERMISSIONAPPLY_ID: detail.PERMISSIONAPPLY_ID,
|
PERMISSIONAPPLY_ID: detail.PERMISSIONAPPLY_ID,
|
||||||
APPOVED_DATE: `${y}-${m}-${d} ${H}:${M}:${S}`,
|
APPOVED_DATE: `${y}-${m}-${d} ${H}:${M}:${S}`,
|
||||||
PERMISSIONAPPLY_STATE: 9000,
|
PERMISSIONAPPLY_STATE: 9000,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
console.log('req',req)
|
console.log('req',req)
|
||||||
this.$request.$webPost('EShangApiMain/Verification/CancelEndaccount',req).then(res=>{
|
_this.$request.$webPost('EShangApiMain/Verification/CancelEndaccount',req).then(res=>{
|
||||||
console.log('res',res)
|
console.log('res',res)
|
||||||
uni.hideLoading()
|
uni.hideLoading()
|
||||||
_this.isloading=false
|
_this.isloading=false
|
||||||
@ -368,7 +377,9 @@ export default {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// const permissionApplyModel = {
|
// const permissionApplyModel = {
|
||||||
// ...this.data,
|
// ...this.data,
|
||||||
@ -418,19 +429,25 @@ export default {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
if(_this.isloading) return
|
if(_this.isloading) return
|
||||||
|
let detail = _this.data
|
||||||
|
uni.showModal({
|
||||||
|
title: '否决作废申请?',
|
||||||
|
success: function (res) {
|
||||||
|
if (res.confirm) {
|
||||||
uni.showLoading({
|
uni.showLoading({
|
||||||
title:'正在提交'
|
title:'正在提交'
|
||||||
})
|
})
|
||||||
_this.isloading=true
|
_this.isloading=true
|
||||||
const permissionApplyModel = {
|
const permissionApplyModel = {
|
||||||
...this.data,
|
...this.data,
|
||||||
APPOVED_NAME:this.user.Membership_Name,
|
APPOVED_NAME:_this.user.Membership_Name,
|
||||||
APPOVED_INFO: this.approvalReason,
|
APPOVED_INFO: _this.approvalReason,
|
||||||
APPOVED_ID: this.user.UserId,
|
APPOVED_ID: _this.user.UserId,
|
||||||
PERMISSIONAPPLY_STATE: 3000,
|
PERMISSIONAPPLY_STATE: 3000,
|
||||||
|
PERMISSIONAPPLY_ID: detail.PERMISSIONAPPLY_ID,
|
||||||
APPOVED_DATE: new Date()
|
APPOVED_DATE: new Date()
|
||||||
}
|
}
|
||||||
this.$request.$webPost('/EShangApiMain/BusinessProcess/RejectPermissionApply',{
|
_this.$request.$webPost('/EShangApiMain/BusinessProcess/RejectPermissionApply',{
|
||||||
PermissionApplyModel: permissionApplyModel
|
PermissionApplyModel: permissionApplyModel
|
||||||
}).then(res=>{
|
}).then(res=>{
|
||||||
uni.hideLoading()
|
uni.hideLoading()
|
||||||
@ -455,6 +472,10 @@ export default {
|
|||||||
})
|
})
|
||||||
|
|
||||||
})
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
},
|
},
|
||||||
handleCancel(){
|
handleCancel(){
|
||||||
|
|
||||||
|
|||||||
14
util/api.js
14
util/api.js
@ -33,8 +33,7 @@ export default {
|
|||||||
data.WeChat_MiniProToken = Store.state.userData.WeChat_MiniProToken || ''
|
data.WeChat_MiniProToken = Store.state.userData.WeChat_MiniProToken || ''
|
||||||
data.WeChatAppId = 'wxa99ef047735c031e'
|
data.WeChatAppId = 'wxa99ef047735c031e'
|
||||||
|
|
||||||
data.memberShipId = !data.memberShipId ? (Store.state.userData.Membership_Id || '') :
|
data.memberShipId = !data.memberShipId ? (Store.state.userData.Membership_Id || '') :data.memberShipId // ||'3255' 1170386 1125717 //
|
||||||
data.memberShipId // ||'3255' 1170386 1125717 //
|
|
||||||
// ModuleGuid:"60ee4604-0830-4056-931d-d1f7e111810c,1d46081b-6ff8-44d5-9205-31c72bdb4328",
|
// ModuleGuid:"60ee4604-0830-4056-931d-d1f7e111810c,1d46081b-6ff8-44d5-9205-31c72bdb4328",
|
||||||
let str = ''
|
let str = ''
|
||||||
if (Store.state.userData.AuthorityInfo['1d46081b-6ff8-44d5-9205-31c72bdb4328']===1){
|
if (Store.state.userData.AuthorityInfo['1d46081b-6ff8-44d5-9205-31c72bdb4328']===1){
|
||||||
@ -77,18 +76,25 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (method == 'POST' && !isWebApi) {
|
if (method == 'POST' && !isWebApi) {
|
||||||
requstOptions.header = {
|
requstOptions.header = {
|
||||||
'content-type': 'application/x-www-form-urlencoded;charset=utf-8',
|
'content-type': 'application/x-www-form-urlencoded;charset=utf-8',
|
||||||
'ServerpartCodes':Store.state.userData.UserCityAuthority,
|
'ServerpartCodes':Store.state.userData.UserCityAuthority,
|
||||||
'ProvinceCode': Store.state.userData.ProvinceCode,
|
'ProvinceCode': Store.state.userData.ProvinceCode,
|
||||||
'ModuleGuid':ModuleGuid
|
'ModuleGuid':ModuleGuid,
|
||||||
|
'WeChat_AppId' : 'wxa99ef047735c031e',
|
||||||
|
'memberShipId' : !data.memberShipId ? (Store.state.userData.Membership_Id || '') :data.memberShipId,
|
||||||
|
'SourcePlatform': 'minProgram'
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
requstOptions.header = {
|
requstOptions.header = {
|
||||||
'ServerpartCodes':Store.state.userData.UserCityAuthority,
|
'ServerpartCodes':Store.state.userData.UserCityAuthority,
|
||||||
'ProvinceCode': Store.state.userData.ProvinceCode,
|
'ProvinceCode': Store.state.userData.ProvinceCode,
|
||||||
'ModuleGuid':ModuleGuid
|
'ModuleGuid':ModuleGuid,
|
||||||
|
'WeChat_AppId' : 'wxa99ef047735c031e',
|
||||||
|
'memberShipId' : !data.memberShipId ? (Store.state.userData.Membership_Id || '') :data.memberShipId,
|
||||||
|
'SourcePlatform': 'minProgram'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
requstOptions.success = (res) => {
|
requstOptions.success = (res) => {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user