diff --git a/pages/authorityApproval/components/cancelView.vue b/pages/authorityApproval/components/cancelView.vue
new file mode 100644
index 0000000..bce8e9c
--- /dev/null
+++ b/pages/authorityApproval/components/cancelView.vue
@@ -0,0 +1,921 @@
+<template>
+    <view v-if="data">
+        <view v-show="!showPopupBottom">
+            <view class="content-title">商户门店状态变更申请</view>
+            <p class="box-top">
+                <view class="item-title">日期：<text style="color:#333;font-size:24rpx;">{{data.OPERATE_DATE}}</text></view>
+                <text style="color:#F27B4C;font-size:24rpx;">{{stateEmun[data.PERMISSIONAPPLY_STATE]}}</text>
+            </p>
+            <BaseDetail :baseData="data"/>
+            <view class="card" v-if="shopDetail">
+                <view class="title-row">
+                    <view class="title">
+                        <view>变更情况</view>
+                    </view>
+                </view>
+                <view class="uni-flex jc-around  align-center" style="padding-top: 24rpx;">
+
+                    <view  style="text-align: center;">
+                        <view  style="font-size: 30rpx;">{{shopDetail.SHOPNAME}}</view>
+                        <view class="tag-value">
+                            <image src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAmCAMAAABDGm2rAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAIQUExURUdwTP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////4qa4JgAAACvdFJOUwCU4OoB7/1wQDD+BiFbBwI57WLEiI8EqYDuRtE/rh76Xg7n9RLKCeHwPnHoCyAryQ9Vl6MkbEEm6Sz3hYoFpsdhh2YI69gDjM0bnU1vHMgup+UQtVwVrUWDM9TXdUpEzL2r83ewxQxP7IKom6BDHymB5tOQlVJ2+1EZvt2zfxcxZbbAuXoNTIlTvBjjMrcKV6Rg/HnL+To4HYSTL3gWjvF+2Z7auJkqdNU1rIuGr9IcTW76AAACwElEQVRIx5WW9UNiQRDHV0BQkFAQ8xTRQ5EwsL2zz/b07Nbr7u7u7u7O/RePnd33HvD2wXN+gN3vzHxgh9l5IBxjZV15Y9evdSJmBdODD+/fQxzT/amGd8y15PYiGmYgu1U6eb7/F/49WakIwFiTKgHwAVl+4B92hKqnq5QBOH2/BMBVMflT6dgx/zdjzrtMAQbBNmc3HznjpkmzJglQfD7q+B/02LFgX/wR/JhEAdH4blcyqIMSAJeek/wlYxjbq5Z+zn5bfj/BAyDUWAZJVoRyhRNtNYneDLI3zlTYPuE3iA+gMdgWXu0UCP2ik32r7+W41KMEcPqIPE/Ou0UgGARnNusYjMeREgC1EHk3WW07xAD6KebLFH9qqzKgncgbYZmWLnRXPfVdEgBmpAxYQ+Qsus4vZAnrSOehDrYrfIniAEaInMQ2LuEjL3YjtPiIrJpaxidQHID1IJFrhW2zQOhBRRvgdpwUQ/kAM8jDYutlCQTXsDH8+iDidnEBNQ1EnZMEz3oGePr8FcZPLCguYK15B6htEdqt24zgTrNrX6BYQKpgMynbDXu6aGirNTLuzs3yfDj+0tAzJAPwTBuQVWYBHCM6VQBNoyzf1psErscqAE2ZRbL8Pje+C7U0DsQHGDW7MkblrWWpCPsuw6TYFIwFpEhmq+lEXOsngTltEH+6JEEfcKwWLmQu6oGEU86VAvKPk7gr4SZpxZHXRC2goEF8PhTkQErHigCeXrjNV2EzQC+zdyWAEIz2YNRE0u5TDyiX5g8x02rY5/nVAvbqSUy1JKTR58akTh0gADOxIvIKn6Atd1YVwJ8HJx6KEg9Twg0VADqMjLnRKitD8evEgGMQ4IiVWRk0bxMB6qCAdqfMcZQe4ksiADwffH0cD50N2kSA+nDj6r08jwXK8BXB/4o4NSi5kF3H94y+++wLVf4HlTtB2ack5W8AAAAASUVORK5CYII=" mode="aspectFit" style="width: 32rpx;height: 19rpx;margin-right: 8rpx;" />
+                            {{data.SERVERPART_NAME}}
+                        </view>
+                    </view>
+                    <view class="uni-flex uni-column"  style="padding-right: 20rpx;">
+                        <view class="uni-flex uni-row" style="align-items: center;padding-top: 8rpx;">
+                            <view class="date-ico">原</view>
+                            <text style="font-weight:bold; color: #878F94;">{{businessStatus[shopDetail.BUSINESS_ORISTATE]}}</text>
+                        </view>
+                        <view class="uni-flex uni-row end-date" style="align-items: center;">
+                            <view class="date-ico" style="background-color: #63A1E6;color: #fff;">现</view>
+                            <text style="font-weight:bold;margin-right: 16rpx;">{{businessStatus[shopDetail.BUSINESS_STATE]}}</text>
+                            <text class="fs24" style="color: #878F94;">{{$util.cutDate(shopDetail.BUSINESS_ENDDATE,'YYYY年MM月DD')}}</text>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <view class="card">
+                <view class="dataAppoved">
+                    <h2 style="font-weight: 700">营收详情</h2>
+                    <view class="top">
+                        <view class="left">
+                            <span :class="{'scan-ico':effectiveDetail.SCAN_TYPE===1,'shouchi-ico':effectiveDetail.SCAN_TYPE===2,'jiekou-ico':effectiveDetail.SCAN_TYPE===3}">{{effectiveDetail.SHOPNAME}}</span>
+                            <span style="color: #979797;">{{effectiveDetail.SERVERPART_NAME}}</span>
+                        </view>
+                        <view class="right">
+                            <span class="fourth-name">结账人员：</span>{{effectiveDetail.WORKER_NAME}}
+                            <div>{{effectiveDetail.ENDACCOUNT_DATE}}</div>
+                        </view>
+                    </view>
+                    <view class="commodity">
+                        <div style="width: 100%;display: flex;align-items: center;justify-content: space-between;margin-top: 16px">
+                            <div class="commodityContent">
+                                <span class="color1">{{showCash}}</span>
+                                <div>
+                                    <span class="ctitle">现金支付</span>
+                                </div>
+                            </div>
+                            <div class="add">+</div>
+                            <div class="commodityContent">
+                                <span class="color1">{{effectiveDetail.MOBILEPAYMENT?$util.fmoney(effectiveDetail.MOBILEPAYMENT):'0.00'}}</span>
+                                <div>
+                                    <span class="ctitle">移动支付</span>
+                                </div>
+
+                            </div>
+                            <div>=</div>
+                            <div class="commodityContent">
+                                <span class="color1">{{effectiveDetail.TOTALSELLAMOUNT?$util.fmoney(effectiveDetail.TOTALSELLAMOUNT):'0.00'}}</span>
+                                <div>
+                                    <span class="ctitle">销售金额</span>
+                                </div>
+                            </div>
+                        </div>
+                        <div style="width: 100%;display: flex;align-items: center;justify-content: space-between;margin-top: 16px">
+                            <div class="commodityContent">
+                                <span class="color1">{{effectiveDetail.CASHPAY_DOWNLORD?$util.fmoney(effectiveDetail.CASHPAY_DOWNLORD):'0.00'}}</span>
+                                <div>
+                                    <span class="ctitle">缴款金额</span>
+                                </div>
+                            </div>
+                            <div class="add">-</div>
+                            <div class="commodityContent">
+                                <span class="color1">{{showCash}}</span>
+                                <div>
+                                    <span class="ctitle">现金支付</span>
+                                </div>
+
+                            </div>
+                            <div>=</div>
+                            <div class="commodityContent">
+                                <span class="color1">{{effectiveDetail.DIFFERENT_PRICE?$util.fmoney(effectiveDetail.DIFFERENT_PRICE):'0.00'}}</span>
+                                <div>
+                                    <span class="ctitle">长短款额</span>
+                                </div>
+                            </div>
+                        </div>
+                        <div style="width: 100%;display: flex;align-items: center;justify-content: space-between;margin-top: 16px">
+                            <div class="commodityContent-cashpay">
+                                <span class="wid70" style="color: #333;">误差率：</span>
+                                <span class="color1" :class="{'text-red': calcWuchalv > 0.3}">{{calcWuchalv}}%</span>
+                            </div>
+                            <div style="color:#fff">-</div>
+                            <div class="commodityContent-cashpay">
+                                <span class="wid70">实收金额：</span>
+                                <view class="cashpay" >{{effectiveDetail.CASHPAY}}元</view>
+                            </div>
+                        </div>
+                    </view>
+                </view>
+            </view>
+
+            <view class="card" v-if="data.PendState===0">
+                <view class="row jc-between" style="padding-top: 0;">
+                    <view  style="color: #2f93e7;">审批意见</view>
+                    <text v-if="data.APPOVED_DATE" style="color:#878F94">{{$util.cutDate( data.APPOVED_DATE,'YYYY/MM/DD hh:ss')}}</text>
+                </view>
+                <view class="approved-reason">
+                    <view class="desc">
+                <textarea
+                        :value="approvalReason"
+                        placeholder="请输入"
+                        placeholder-style="color:#969EA4;line-height:2;padding-top:10rpx;"
+                        auto-height
+                        @blur="changeReason"
+                        auto-focus
+                ></textarea>
+                    </view>
+                </view>
+                <!--        v-if="data.PendState===0"-->
+            </view>
+
+
+
+
+            <view class="card" style="margin-bottom: 20px" v-if="data.PendState===0">
+                <view class="button-box">
+                    <span @tap="cancelApproval"><image src="@/static/images/bh-btn.png" mode="aspectFit"></image>否决</span>
+                    <span @click="savaShops"><image src="@/static/images/sh-btn.png" mode="aspectFit"></image>同意</span>
+                </view>
+            </view>
+        </view>
+
+
+    </view>
+</template>
+
+<script>
+import ShopList from "./SelectShopList.vue";
+import BaseDetail from "./baseDetail.vue";
+import UniPopup from "../../../components/uni-popup.vue";
+import {mapState} from "vuex";
+import Store from "../../../store/store";
+
+export default {
+    props: {
+        data: {
+            type: Object,
+        },
+        businessId: {
+            type: String,
+            required: true
+        },
+        approvalData:{ // 审核通过时，被授权的门店数据
+            type: Object,
+            required: false
+        },
+        imagsList:{ // 附件信息
+            type: Array,
+            required: false
+        },
+        effectiveDetail:{
+            type: Object,
+        }
+    },
+    components:{
+        ShopList,
+        UniPopup,
+        BaseDetail
+    },
+    computed: {
+        ...mapState({
+            user: (state)=>{ return state.userData}
+        }),
+        shopDetail () {
+            return this.approvalData && this.approvalData.ShopModifyList ? this.approvalData.ShopModifyList[0] :null
+        },
+        // 金额格式化处理
+        showCash() {
+          if (this.effectiveDetail.CASH){
+            return this.$util.fmoney(this.effectiveDetail.CASH)
+          }else {
+            return '0.00'
+          }
+        },
+        calcWuchalv(){ // 误差率
+          let _data = this.effectiveDetail
+          if ( _data.CASH == 0 ) {
+            if(_data.DIFFERENT_PRICE!=0) {
+              return "100.00";
+
+            }else {
+              return "0.00";
+            }
+          }
+          else {
+
+            return (Math.abs(_data.DIFFERENT_PRICE)  / _data.CASH * 100).toFixed(2);
+
+          }
+        }
+    },
+    data() {
+        return {
+            showPopupBottom: false,
+            shops:[],
+            selectShopids:[],
+            approvalReason: '',
+            isloading:false,
+            stateEmun: {2000:"办理中",3000:"未通过",9000:"已通过"},
+            businessStatus : {
+                3000: '关闭' ,
+                2000: '暂停'
+                ,
+                1010: '待运营'
+                ,
+                1000: '运营中'
+            },
+            isState2010:false,
+            isdisabled: true,
+        }
+    },
+    watch:{
+        data(newVal,oldVal){
+            console.log('newVal',newVal)
+            console.log('oldVal',oldVal)
+        }
+    },
+    methods: {
+      checkNum(event, s) {
+        let value = event.detail.value.match(/[+-]?\d+(\.\d{0,2})?/)
+        if (value) {
+          value = value[0]
+        } else {
+          value = 0
+        }
+        this.effectiveDetail[s] = value
+      },
+        changeReason(event){
+            this.approvalReason = event.detail.value
+        },
+        hidePopup(){
+            this.showPopupBottom = false
+        },
+        priviewImages(type){ // 1 身份证正反面 2 营业执照
+            uni.previewImage(type===1 ? {urls: this.personImges} : {urls: this.shopImges})
+        },
+        changeValues(values){
+            let list = [] // this.selectShopids
+            let _this =this
+            if(values.length){
+                _this.shops.forEach(n=>{
+                    const index = values.includes(n.value)
+                    if(index){
+                        list.push({
+                            PERMISSIONAPPLY_ID: this.data.PERMISSIONAPPLY_ID,
+                            SERVERPART_NAME: this.data.SERVERPART_NAME ,
+                            SERVERPART_ID: this.data.SERVERPART_ID,
+                            SERVERPARTSHOP_NAME: n.label,
+                            SERVERPARTSHOP_ID: n.value,
+                            PERMISSIONAPPLY_TYPE: 4000,
+                            PERMISSIONAPPLYDETAIL_TYPE:2000,
+                            OPERATE_DATE: new Date()
+                        })
+                    }
+                })
+            }
+            this.selectShopids=list
+            // this.hidePopup()
+        },
+        getShops(data) {
+            let _this = this
+            this.$request.$webGet('/EShangApiMain/BaseInfo/GetServerpartShopDDL',{
+                ProvinceCode: data.OWNERUNIT_ID,
+                ServerpartId: data.SERVERPART_ID
+            }).then(res=>{
+                if(res.Result_Code!==100) return
+                _this.shops = res.Result_Data.List
+            })
+        },
+        savaShops() {
+            let _this = this
+
+            if(_this.isloading) return
+            uni.showLoading({
+                title:'正在提交'
+            })
+            _this.isloading = true
+            let flag = false
+            if (this.data.PERMISSIONAPPLY_STATE===2000){
+                flag = true
+            }
+          let useData = Store.state.userData
+          let detail = _this.data
+          const date = new Date()
+          let y = date.getFullYear()
+          let m = date.getMonth() + 1
+          let d = date.getDate()
+          if (m<10){
+            m='0'+m
+          }
+          if (d<10){
+            d = '0'+d
+          }
+          let H = date.getHours()
+          H<10?`0${H}`:H
+          let M = date.getMinutes()
+          M<10?`0${M}`:M
+          let S = date.getSeconds()
+          S<10?`0${S}`:S
+          console.log('detail',detail)
+          console.log('_this.effectiveDetail',_this.effectiveDetail)
+          const req ={
+            PermissionApplyModel:{
+              PERMISSIONAPPLY_TYPE: 9000,
+              USER_MOBILEPHONE: detail.USER_MOBILEPHONE,
+              PERMISSIONAPPLY_DATE: detail.PERMISSIONAPPLY_DATE,
+              PERMISSIONAPPLY_REASON: detail.PERMISSIONAPPLY_REASON,
+              SERVERPART_ID: detail.SERVERPART_ID,
+              SERVERPART_NAME: detail.SERVERPART_NAME,
+              APPLYSHOP_NAME:_this.effectiveDetail.ENDACCOUNT_ID,
+              STAFF_ID: detail.STAFF_ID,
+              STAFF_NAME: detail.STAFF_NAME,
+              OPERATE_DATE: detail.OPERATE_DATE,
+              APPOVED_ID: useData.UserId,
+              APPOVED_NAME: useData.UserName,
+              APPOVED_INFO: this.approvalReason,
+              PERMISSIONAPPLY_ID: detail.PERMISSIONAPPLY_ID,
+              APPOVED_DATE: `${y}-${m}-${d} ${H}:${M}:${S}`,
+              PERMISSIONAPPLY_STATE: 9000,
+            }
+          }
+          console.log('req',req)
+          this.$request.$webPost('EShangApiMain/Verification/CancelEndaccount',req).then(res=>{
+            console.log('res',res)
+                uni.hideLoading()
+                _this.isloading=false
+                if (res.Result_Code===100){
+                    if (flag){
+                        _this.isState2010 = true
+                    }
+                }
+                if(res.Result_Code!==100) {
+                    uni.showModal({
+                        title: '温馨提示',
+                        content: res.Result_Desc
+                    })
+                    return
+                }
+                uni.showModal({
+                    title: '温馨提示',
+                    content: res.Result_Desc,
+                    showCancel:false,
+                    success: function (res) {
+                        if (res.confirm) {
+                            _this.$util.toNextRoute('reLaunch', "/pages/authorityApproval/index")
+                        }
+                    }
+                })
+          })
+
+
+            // const permissionApplyModel = {
+            //     ...this.data,
+            //     APPOVED_NAME: this.user.Membership_Name,
+            //     APPOVED_INFO: this.approvalReason ||'通过',
+            //     APPOVED_ID: this.user.UserId,
+            //     PERMISSIONAPPLY_STATE: this.data.PERMISSIONAPPLY_STATE===2000?2010:9000,
+            //     APPOVED_DATE: new Date()
+            // }
+            // console.log('req',permissionApplyModel)
+            // this.$request.$webPost('/EShangApiMain/BusinessProcess/ApprovedMerchantApply',{
+            //     PermissionApplyModel: permissionApplyModel,
+            //     ShopModifyList: this.approvalData.ShopModifyList
+            // }).then(res=>{
+            //     uni.hideLoading()
+            //     _this.isloading=false
+            //     if (res.Result_Code===100){
+            //         if (flag){
+            //             _this.isState2010 = true
+            //         }
+            //     }
+            //     console.log('res',res)
+            //
+            //     if(res.Result_Code!==100) {
+            //         uni.showModal({
+            //             title: '温馨提示',
+            //             content: res.Result_Desc
+            //         })
+            //         return
+            //     }
+            //     uni.showModal({
+            //         title: '温馨提示',
+            //         content: res.Result_Desc,
+            //         showCancel:false,
+            //         success: function (res) {
+            //             if (res.confirm) {
+            //                 _this.$util.toNextRoute('reLaunch', "/pages/authorityApproval/index")
+            //             }
+            //         }
+            //     })
+            // })
+        },
+        cancelApproval(){
+            let _this = this
+            if(!this.approvalReason){
+                uni.showToast({ title: '请填写否决意见' ,icon:'none'})
+                return
+            }
+            if(_this.isloading) return
+            uni.showLoading({
+                title:'正在提交'
+            })
+            _this.isloading=true
+            const permissionApplyModel = {
+                ...this.data,
+                APPOVED_NAME:this.user.Membership_Name,
+                APPOVED_INFO: this.approvalReason,
+                APPOVED_ID: this.user.UserId,
+                PERMISSIONAPPLY_STATE: 3000,
+                APPOVED_DATE: new Date()
+            }
+            this.$request.$webPost('/EShangApiMain/BusinessProcess/RejectPermissionApply',{
+                PermissionApplyModel: permissionApplyModel
+            }).then(res=>{
+                uni.hideLoading()
+                _this.isloading=false
+                if(res.Result_Code!==100) {
+                    uni.showModal({
+                        title: '温馨提示',
+                        content: res.Result_Desc
+                    })
+                    return
+                }
+                uni.showModal({
+                    title: '温馨提示',
+                    content: res.Result_Desc,
+                    showCancel:false,
+                    success: function (res) {
+                        if (res.confirm) {
+                            // _this.$emit('refresh')
+                            _this.$util.toNextRoute('reLaunch', "/pages/authorityApproval/index")
+                        }
+                    }
+                })
+
+            })
+        },
+      handleCancel(){
+
+      }
+    },
+}
+</script>
+
+<style lang="stylus">
+@import url("/common/css/tenderingDetail.css");
+.card {
+    background-color: #fff;
+    border-radius: 12rpx;
+    margin: 24rpx 24rpx 24rpx;
+    padding: 24rpx;
+    box-shadow: 0px 4px 12px 0px rgba(225,225,225,0.56);
+
+    .dataAppoved{
+        .top{
+          width: 100%;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          .left{
+            display: flex;
+            flex-direction: column;
+          }
+        }
+        .commodity{
+            .commodity {
+                width: 100%;
+                background-color: #fff;
+                padding: 30rpx 20rpx;
+                box-sizing: border-box;
+            }
+
+            .commodity>div {
+                display: flex;
+                justify-content: space-around;
+                font-size: 24rpx;
+                align-items: center;
+                margin-bottom: 30rpx;
+
+            }
+
+            .commodityContent {
+                box-sizing: border-box;
+                display: flex;
+                align-items: center;
+                width: 180rpx;
+                justify-content: center;
+                /* padding-top: 6rpx; */
+                box-shadow: 0px 1rpx 8rpx 0.4rpx #ccc;
+                flex-direction: column;
+                border-radius: 4rpx;
+            }
+
+            .commodityContent>div {
+                background: url('/static/images/effective/sjjy_jb.png') no-repeat center;
+                width: 100%;
+                text-align: center;
+                background-size: contain;
+            }
+
+            .commodity>div:last-child {
+                padding-top: 12rpx;
+                margin-bottom: 0;
+            }
+
+            /* .commodity img {
+              display: none;
+              width: 40rpx;
+              height: 40rpx;
+              vertical-align: middle;
+            } */
+
+            .cashpay-box image {
+                width: 40rpx;
+                height: 40rpx;
+            }
+
+            .color1 {
+                color: #333;
+                font-size: 28rpx;
+                line-height: 56rpx;
+            }
+
+            .ctitle {
+                color: #63A0E5;
+                font-size: 24rpx;
+            }
+
+            .text-red {
+                color: #D13B3B;
+                line-height: 60rpx;
+            }
+
+            .shenhe-mask {
+                position: fixed;
+                z-index: 998;
+                top: 0;
+                right: 0;
+                bottom: 0;
+                left: 0;
+                background-color: rgba(0, 0, 0, .6);
+            }
+
+            .text-content {
+                max-height: 150rpx;
+                height: 120rpx;
+                width: 100%;
+                font-size: 28rpx;
+                line-height: 1.5;
+            }
+
+            .check-reason {
+                background-color: #f8f9fa;
+                padding: 16rpx 20rpx;
+                box-sizing: border-box;
+                border-radius: 14rpx 14rpx 0 0;
+            }
+
+
+            .cashpay {
+                display: inline-block;
+                padding-left: 16rpx;
+                height: 60rpx;
+                line-height: 60rpx;
+                color: #878787;
+                box-sizing: border-box;
+                width: 160rpx;
+            }
+
+            .cashpay-box {
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                background-color: #f8f9fb;
+                padding: 26rpx 0;
+                flex-wrap: wrap;
+                /* margin: 0 26rpx; */
+            }
+
+            .cashpay-box>div {
+                width: 50%;
+                box-sizing: border-box;
+                display: flex;
+                align-items: center;
+                height: 70rpx;
+                padding-left: 36rpx;
+            }
+
+            .cashpay-check {
+                margin: 0 20rpx 0 10rpx;
+            }
+
+            .data-check {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                margin-bottom: 20rpx;
+            }
+
+            .data-check>.ctitle {
+                width: 30%;
+                display: flex;
+                justify-content: center;
+                color: #999;
+            }
+
+            .data-check-data {
+                box-sizing: border-box;
+                display: flex;
+                align-items: center;
+                width: 28%;
+                justify-content: center;
+                padding: 8rpx 0;
+                box-shadow: 0px 1px 8px 0.2px #e2e2e2;
+                height: auto;
+                border-radius: 4rpx;
+            }
+
+            .data-check-data input {
+                width: 90%;
+            }
+
+            .check-btn {
+                width: 48%;
+                background-color: #64a0e6;
+                border: none;
+                color: #fff;
+                height: 80rpx;
+                line-height: 80rpx;
+                margin-top: 30rpx;
+                text-align: center;
+                border-radius: 10rpx;
+            }
+
+            .no-check {
+                background-color: #fff;
+                color: #666;
+                border: 1px solid #d2d2d2;
+            }
+
+
+            /* 传输方法的图标 */
+            .scan-ico,
+            .shouchi-ico,
+            .jiekou-ico,
+            .weisc-ico {
+                display: flex;
+                align-items: center;
+
+            }
+
+            .scan-ico:after {
+                content: '';
+                display: block;
+                margin-left: 16rpx;
+                width: 30rpx;
+                height: 30rpx;
+                background: url(/static/images/effective/ewm.png) no-repeat center;
+                background-size: contain;
+            }
+
+            .shouchi-ico:after {
+                content: '';
+                display: block;
+                margin-left: 16rpx;
+                width: 21rpx;
+                height: 29rpx;
+                background: url(/static/images/effective/scj.png) no-repeat center;
+                background-size: contain;
+            }
+
+            .jiekou-ico:after {
+                content: '';
+                display: block;
+                margin-left: 16rpx;
+                width: 29rpx;
+                height: 27rpx;
+                background: url(/static/images/effective/jkcs.png) no-repeat center;
+                background-size: contain;
+            }
+
+
+            /* 图片上传 */
+            .img-box {
+                background: #f8f9fa;
+                padding: 10rpx 0 20rpx 20rpx;
+                border-radius: 0 0 14rpx 14rpx;
+            }
+
+            .upload-file-container {
+                display: flex;
+                align-items: center;
+                width: 100%;
+                /* min-height: 260rpx; */
+                box-sizing: border-box;
+                flex-wrap: wrap;
+            }
+
+            .upload-file-add-container {
+                position: relative;
+                border: 1rpx solid #ccc;
+                width: 136rpx;
+                height: 137rpx;
+                border-radius: 6rpx;
+                margin-bottom: 16rpx;
+            }
+
+            .upload-file-add-container::before {
+                content: '';
+                display: block;
+                position: absolute;
+                left: 40rpx;
+                top: 50%;
+                height: 2rpx;
+                background-color: #ccc;
+                width: 60rpx;
+            }
+
+            .upload-file-add-container::after {
+                content: '';
+                display: block;
+                position: absolute;
+                left: 50%;
+                top: 40rpx;
+                width: 2rpx;
+                height: 60rpx;
+                background-color: #ccc;
+            }
+
+
+            .upload-file-unit {
+                position: relative;
+                width: 137rpx;
+                height: 136rpx;
+                margin-right: 32rpx;
+                margin-bottom: 16rpx;
+                border-radius: 8rpx;
+                border: 2rpx solid #ccc;
+            }
+
+            .upload-file-unit image {
+                width: 136rpx;
+                height: 136rpx;
+                border-radius: 8rpx;
+            }
+
+            .upload-file-remove {
+                position: absolute;
+                top: -14rpx;
+                right: -12rpx;
+                display: inline-block;
+                width: 37rpx;
+                height: 37rpx;
+                line-height: 30rpx;
+                background-color: #ff0000;
+                color: #ffffff;
+                font-size: 30rpx;
+                border-radius: 50%;
+                text-align: center;
+                z-index: 1;
+            }
+        }
+
+
+
+
+    }
+
+
+    .row,.title-row {
+        display flex;
+        align-items center
+        line-height 2
+        padding 24rpx 0
+        .title {
+        flex 5
+        .tag {
+        background-color #5BC898
+        color #FFFFFF
+        padding 0rpx 8rpx
+        border-radius 6rpx
+        font-size 24rpx
+        display inline-block
+    }
+    font-size 26rpx
+    }
+    .desc {
+    flex 19
+    color #3C3C3C
+    font-size 26rpx
+    textarea {
+    width auto
+    height 50rpx
+    padding-top 4rpx
+    line-height 1.5
+    }
+    }
+    &:last-child {
+    border none
+    padding-top: 0
+    }
+
+    }
+    .row +.row {
+        padding-top: 0
+    }
+    .title-row {
+        border-bottom 1px solid #F1F1F1
+        padding-top 0
+    }
+    .approved-reason {
+        padding: 16rpx 24rpx;
+        background: #F8F9FB;
+        border-radius: 4rpx;
+        min-height: 97rpx;
+        line-height: 2;
+    }
+
+    .approvalList{
+        width: 100%;
+        box-sizing: border-box;
+        background: #fff;
+        .approvalItem{
+            width: 100%;
+            .top{
+                width: 100%;
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                .topLeft{
+                    display: flex;
+                    align-items: center;
+                    .stateIcon{
+                        width: 18px;
+                        height: 18px;
+                    }
+                    .stateName{
+
+                    }
+                }
+            }
+            .bottom{
+                width: 100%;
+                display: flex;
+                justify-content: flex-end;
+            }
+        }
+    }
+
+
+
+    .uni-icon-arrowright {
+        color: #969EA4;
+        font-size: 24rpx;
+        margin-left 16rpx;
+    }
+    .select-item {
+        background: #f6f9fe;
+        border none;
+        border-radius: 12rpx;
+        padding  24rpx
+        margin-top 24rpx
+    }
+    .tag-value {
+        font-size: 22rpx;
+        background-color: #63A1E6;
+        margin-top: 8rpx;
+        color: #fff;
+        border-radius: 20rpx;
+        padding: 0rpx 16rpx;
+        justify-content: flex-start;
+        display: flex;
+        align-items: center;
+    }
+    .end-date {
+        margin-top: 32upx;
+        position: relative;
+    }
+    .end-date:before {
+        content: '';
+        position: absolute;
+        height: 53upx;
+        width: 1upx;
+        border-left: 2upx dashed #BBC3C8;
+        top: -42upx;
+        left: 13upx;
+    }
+    .date-ico {
+        font-size: 20upx;
+        border-radius: 50%;
+        height: 30rpx;
+        width: 30rpx;
+        color: #fff;
+        text-align: center;
+        line-height: 30upx;
+        background-color: #BBC3C8;
+        margin-right: 16rpx;
+    }
+}
+</style>
diff --git a/pages/authorityApproval/components/shopChangeState.vue b/pages/authorityApproval/components/shopChangeState.vue
index 0150a3b..b094ab7 100644
--- a/pages/authorityApproval/components/shopChangeState.vue
+++ b/pages/authorityApproval/components/shopChangeState.vue
@@ -1,5 +1,5 @@
 <template>
-	<view v-if="data" >
+	<view v-if="data">
 		<view v-show="!showPopupBottom">
 			<view class="content-title">商户门店状态变更申请</view>
 			<p class="box-top">
@@ -137,13 +137,10 @@
 				stateEmun: {2000:"办理中",3000:"未通过",9000:"已通过"},
 				businessStatus : {
 				   3000: '关闭' ,
-
 				   2000: '暂停'
 				,
-
 				   1010: '待运营'
 				,
-
 				   1000: '运营中'
 				},
 				isState2010:false,
diff --git a/pages/authorityApproval/detail.vue b/pages/authorityApproval/detail.vue
index 50557d1..cc0ff73 100644
--- a/pages/authorityApproval/detail.vue
+++ b/pages/authorityApproval/detail.vue
@@ -13,6 +13,10 @@
 				<MerchartInfoView :businessId="pageData.id" :data="approvalInfo" ref="shop" @refresh="reload"
 					:approvalData="approvalData" />
 			</view>
+			<view v-if="pageData.type=='9'">
+				<CancelView :businessId="pageData.id" :data="approvalInfo" ref="shop" @refresh="reload"
+										:approvalData="approvalData" :effectiveDetail="effectiveDetail"/>
+			</view>
 		</view>
 		<noFound v-show="!loading && !approvalInfo.PERMISSIONAPPLY_ID" :nodata="true" text="抱歉,没有找到该数据" />
 	</view>
@@ -22,6 +26,8 @@
 	import ShopApproval from './components/shopApproval.vue'
 	import ShopChangeState from './components/shopChangeState.vue'
 	import MerchartInfoView from './components/merchartInfoView.vue'
+	import CancelView from "./components/cancelView.vue";
+	import Store from "../../store/store";
 	export default {
 		data() {
 			return {
@@ -31,15 +37,206 @@
 				},
 				loading: true,
 				approvalInfo: {},
+				ENDACCOUNT_ID:'',
+				imagesList:[],
+				Audit_List:[],
+				effectiveDetail:{},
+				endaccountMsg:[],
+				isFACTAMOUNT_SALE:'',
+				isTICKETCODE_CIGARETTE:'',
+				isFACT_AMOUNT:'',
+				isSELLCOUNT_PROMOTION:'',
 				approvalData: {} // 审批后授权的列表
 			}
 		},
 		components: {
 			ShopApproval,
 			ShopChangeState,
-			MerchartInfoView
+			MerchartInfoView,
+			CancelView
 		},
 		methods: {
+			// 验证促销数据
+			checkPromotion(_data){
+				if (_data.SELLCOUNT_PROMOTION != 0 && _data.SELLCOUNT_PROMOTION != '') {
+					return true
+				} else {
+					return false
+				}
+			},
+			// 获取单品数据、移动支付等校验数据
+			getEndAccountDate(datatype) { // 获取更新过的数据校验数据
+				let _this = this
+				let _detail = this.effectiveDetail
+				_this.$request.$get('GetEndAccountData', {
+					serverpart_Id: _detail.SERVERPART_ID,
+					serverpart_Code: _detail.SERVERPARTCODE,
+					machine_Code: _detail.MACHINECODE,
+					shop_Code: _detail.SHOPCODE,
+					province_Code: _detail.PROVINCE_CODE,
+					endAccount_StartDate: _detail.ENDACCOUNT_STARTDATE,
+					endAccount_Date: _detail.ENDACCOUNT_DATE,
+					fact_Amount: _detail.FACT_AMOUNT,
+					cash_Pay: _detail.CASHPAY,
+					sale_Correct: _detail.SALE_CORRECT,
+					mobile_Payment: _detail.MOBILEPAYMENT,
+					mobile_Correct: _detail.MOBILE_CORRECT,
+					endAccount_Id: _detail.ENDACCOUNT_ID,
+					data_Type: datatype
+				}).then(res => {
+					let _data = res.Result_Data
+					if (datatype == 1) {
+						_detail.FACTAMOUNT_SALE = _data.FactAmount_Sale = Number(_data.FactAmount_Sale) //单品金额
+						_detail.SELLCOUNT_SALE = _data.SellCount_Sale //单品金额
+						_this.isFACTAMOUNT_SALE = _this.checkSinglePro(_detail)
+					}
+					if (datatype == 2) {
+						_detail.TICKETCODE_CIGARETTE = _data.TicketCode_Cigarette //香烟客单数量
+						_detail.SELLCOUNT_CIGARETTE = _data.SellCount_Cigarette
+						_detail.FACTAMOUNT_CIGARETTE = _data.FactAmount_Cigarette
+						_this.isTICKETCODE_CIGARETTE = _this.checkCigarette(_detail)
+					}
+					if (datatype == 3) {
+						_detail.FACT_AMOUNT = Number(_data.Fact_Amount) //移动支付销售金额
+						_detail.TICKETCOUNT = _data.Ticket_Count //移动支付销售金额
+						_this.isFACT_AMOUNT = _this.checkMobileCorrect(_detail)
+					}
+					if (datatype == 4) {
+						_detail.SELLCOUNT_PROMOTION = _data.SellSount_Promotion //促销数量
+						_detail.FACTAMOUNT_PROMOTION = _data.FactAmount_Promotion //促销数量
+						_this.isSELLCOUNT_PROMOTION = _this.checkPromotion(_detail)
+					}
+				})
+			},
+			// 验证香烟数据
+			checkCigarette(_data) {
+				if (_data.TICKETCODE_CIGARETTE && _data.TICKETCODE_CIGARETTE != NaN && Number(_data.TICKETCODE_CIGARETTE) !== 0) {
+					return true
+				} else {
+					return false
+				}
+			},
+			calcWuchalv(){ // 误差率
+				let _data = this.effectiveDetail
+				if ( _data.CASH == 0 ) {
+					if(_data.DIFFERENT_PRICE!=0) {
+						return "100.00";
+
+					}else {
+						return "0.00";
+					}
+				}
+				else {
+
+					return (Math.abs(_data.DIFFERENT_PRICE)  / _data.CASH * 100).toFixed(2);
+
+				}
+			},
+			// 验证移动支付
+			checkMobileCorrect(_data){
+
+				if ((_data.FACT_AMOUNT + _data.SALE_CORRECT) == _data.MOBILEPAYMENT) { // 公式： fa+sc=mp+mc; sc=mc-mpb
+					_data.MOBILE_CORRECT = 0
+					this.mobliePayBalance = - _data.SALE_CORRECT
+					return 1
+				} else {
+					this.mobliePayBalance = _data.FACT_AMOUNT - _data.MOBILEPAYMENT // 移动冲正支付差额 实收金额-移动支付金额
+
+					if(_data.MOBILE_CORRECT ==''){ // 默认到账差额为零，使等式成立
+						this.effectiveDetail.MOBILE_CORRECT = this.mobliePayBalance // 移动冲正
+						this.effectiveDetail.SALE_CORRECT = 0  // 到账实差
+					}
+					return 0 // 移动冲正 = 移动支付差额+到账实差
+
+				}
+			},
+			//  单品数据判断
+			checkSinglePro(_data) { // 单品计算公式：FACTAMOUNT_SALE = TOTALSELLAMOUNT 或者 TOTALSELLAMOUNT = FACTAMOUNT_SALE + FACTAMOUNT 或 (_data.TOTALSELLAMOUNT+FACTAMOUNT) == _this.FACTAMOUNT_SALE
+
+				if (_data.FACTAMOUNT_SALE == _data.TOTALSELLAMOUNT || (_data.TOTALSELLAMOUNT + _data.FACTAMOUNT) == _data.FACTAMOUNT_SALE || _data.FACTAMOUNT_SALE == _data.CASHPAY) {
+					return 1
+				} else {
+					return 0
+				}
+			},
+			// 数据校验门店列表
+			getEffectiveDetail() {
+				let _this = this
+        console.log('_this.ENDACCOUNT_ID',_this.ENDACCOUNT_ID)
+				this.$request.$get('GetEndaccountDetails', {
+					Endaccount_ID: _this.ENDACCOUNT_ID
+				}).then(res => {
+					_this.loading = false
+					uni.hideLoading()
+					console.log('res111',res)
+					if (!res.Result_Code || res.Result_Code != '100') return
+
+					_this.imagesList = res.Result_Data.Image_List ? res.Result_Data.Image_List.List : []
+					if (res.Result_Data.Audit_List) { // 若稽核数据存在，则赋值
+						_this.Audit_List = res.Result_Data.Audit_List.List
+					}
+					let _data = res.Result_Data.Endaccount_List
+
+
+					_this.effectiveDetail = _data
+
+          if (_data){
+            _this.endaccountMsg = _data.ENDACCOUNT_DESC.split("|");
+          }
+
+					// 如果当前数据为日结校验状态，并且单品数据为空 则异步请求远程单品数据，移动支付数据，香烟数据、促销数据;否则，验证这些数据是否正确
+
+
+					if (_data.SCAN_TYPE != 3) { // 若数据传输类型为接口传输 则不需要远程请求单品数据,默认单品销售金额=收银端销售金额， 移动支付实收金额 = 收银端移动支付
+						if (_data.TREATMENT_MARKSTATE==0 && _data.FACTAMOUNT_SALE == "") {
+							_data.FACTAMOUNT = _data.FACTAMOUNT == '' ? 0 : _data.FACTAMOUNT
+							_data.SALE_CORRECT = _data.SALE_CORRECT == '' ? 0 : _data.SALE_CORRECT
+							_this.getEndAccountDate(1) // 单品数据
+							_this.getEndAccountDate(2) // 香烟数据
+							_this.getEndAccountDate(3) // 移动支付
+							_this.getEndAccountDate(4) //促销数据
+						}else {
+							_this.isFACTAMOUNT_SALE = _this.checkSinglePro(_data) // 单品数据 是否一致
+							_this.isTICKETCODE_CIGARETTE = _this.checkCigarette(_data) // 香烟数据
+							_this.isFACT_AMOUNT = _this.checkMobileCorrect(_data) // 移动支付
+							_this.isSELLCOUNT_PROMOTION = _this.checkPromotion(_data) // 促销数据
+						}
+
+					} else {
+						_data.FACTAMOUNT_SALE = _data.TOTALSELLAMOUNT
+						_data.FACT_AMOUNT = _data.MOBILEPAYMENT
+						_this.isFACTAMOUNT_SALE = _this.checkSinglePro(_data) // 单品数据
+						_this.isFACT_AMOUNT = _this.checkMobileCorrect(_data) // 移动支付
+						_this.isTICKETCODE_CIGARETTE = _this.checkCigarette(_data) // 香烟数据
+					}
+
+					if (_data.PENDSTATE == 0) {
+						console.log('store',Store.state.userData.AuthorityInfo['51b6817d-62a9-4b3a-8e6a-abd7e077271a'])
+						// if (Store.state.userData.AuthorityInfo['51b6817d-62a9-4b3a-8e6a-abd7e077271a']===1){
+						if (_data.TREATMENT_MARKSTATE == 0) { // 待处理
+							_this.isCheck = 1
+							_this.isdisabled = false
+						}
+						if (_data.TREATMENT_MARKSTATE == 3) { // 主任复核
+							_this.isCheck = 2
+							// _this.Toexamine = true;
+							_this.examineType = "SubmitEndaccount"
+						} else if (_data.TREATMENT_MARKSTATE == 1) { // 财务审核
+							_this.isCheck = 2
+							// _this.Toexamine = true;
+							_this.examineType = "ApproveEndaccount"
+						}
+						// }
+					} else { // 已审结
+						_this.examineType = "";
+						_this.isCheck = 0;
+					}
+
+					_this.effectiveShow = true
+					_this.$forceUpdate()
+				})
+			},
+
 			getDetail(opt) {
 				let _this = this
 				this.$request.$webGet('/EShangApiMain/Platform/GetPermissionApplyDetail?permissionApplyid=' + opt.id).then(
@@ -51,7 +248,11 @@
 							return
 						}
 						_this.approvalInfo = res.Result_Data
+						_this.ENDACCOUNT_ID = _this.approvalInfo.APPLYSHOP_NAME
 						console.log('approvalInfo',res.Result_Data)
+            if (_this.pageData.type==='9'){
+              _this.getEffectiveDetail()
+            }
 						if ( ['4','8'].indexOf(_this.pageData.type)>-1) {
 							_this.$nextTick(()=>{
 
@@ -77,7 +278,6 @@
 				})
 			},
 			reload() {
-
 				this.getDetail(this.pageData)
 				this.getDetailList(this.pageData)
 			}
diff --git a/pages/authorityApproval/index.vue b/pages/authorityApproval/index.vue
index 0297200..fec3299 100644
--- a/pages/authorityApproval/index.vue
+++ b/pages/authorityApproval/index.vue
@@ -55,7 +55,7 @@
 		data() {
 			return {
 				activeType: '2000,2010', // 数据审批状态 2000 待审批，3000 未通过， 9000 已通过
-				selectTypeIndex: '4,7,8',
+				selectTypeIndex: '4,7,8,9',
 				showPop: false,
 				pageData: {
 					pageIndex: 1,
diff --git a/pages/dataSummary/detail.vue b/pages/dataSummary/detail.vue
index c63f234..fec0149 100644
--- a/pages/dataSummary/detail.vue
+++ b/pages/dataSummary/detail.vue
@@ -27,13 +27,13 @@
 							</div>
 							<div class="contentTwo-right"> {{effectiveDetail.DESCRIPTION_DATE}} </div>
 						</div>
-						
+
 						<div class="desc-info">
 							<div class="fourth-name ">校验意见：</div>
 							<div>{{effectiveDetail.DIFFERENCE_REASON}}</div>
 						</div>
 					</template>
-			
+
 					<template v-if="effectiveDetail.APPROVE_STAFF !== '' && effectiveDetail.TREATMENT_MARKSTATE!==1">
 						<div class="content-line uni-flex ai-center jc-between">
 							<div class="contentTwo-left">
@@ -50,7 +50,7 @@
 							<div>{{effectiveDetail.APPROVED_INFO}}</div>
 						</div>
 					</template>
-					
+
 					<template v-if="effectiveDetail.ENDACCOUNT_DESC !=='' ">
 						<div class="content-line uni-flex ai-center jc-between">
 							<div class="contentTwo-left">
@@ -60,7 +60,7 @@
 							<div class="contentTwo-right"><span>{{endaccountMsg[1]}}</span>
 							</div>
 						</div>
-						
+
 						<div class="desc-info">
 							<div class="fourth-name">确认意见：</div><span>{{endaccountMsg[2]}}</span>
 						</div>
@@ -171,7 +171,7 @@
 			</div>
 
 
-			<div v-show="showPopupYj||showPopupCheck" class="shenhe-mask" @click.stop="maskFn()"></div>
+			<div v-show="showPopupYj||showPopupCheck||showPopupCancel " class="shenhe-mask" @click.stop="maskFn()"></div>
 			<div class="opinion2" v-show="showPopupYj">
 				<div>
 					<p class="opinion2-title"><span>{{isback? '驳回':'确认'}}意见</span></p>
@@ -268,9 +268,35 @@
 				</div>
 			</div>
 
+			<div class="opinion2" v-show="showPopupCancel">
+				<div>
+					<p class="opinion2-title"><span>作废原因</span></p>
+					<textarea v-model="cancelReason" placeholder="请填写作废原因" class="text-content check-reason" />
+				</div>
+				<div class="img-box">
+
+					<div class="upload-file-container">
+						<div class="upload-file-unit" v-for="(item,index) in uploadImgList" :key="index">
+							<span class="upload-file-remove" @click.stop="deleteImgFunc(index)">-</span>
+							<image mode="aspectFill" :src="item" @tap="showUpImg(index)" />
+						</div>
+						<div class="upload-file-add" @click="chooseImage">
+							<div class="upload-file-add-container"></div>
+						</div>
+					</div>
+				</div>
+				<div class="check-btn-box">
+					<div class="check-btn no-check" @click="noCancel">取消</div>
+					<div class="check-btn" @click="handleCancel()">作废</div>
+				</div>
+			</div>
+
 			<div class="check-btn-box page-btn-box" v-if="isCheck!==0">
 				<!-- 财务审核 -->
 				<template v-if="isCheck==2">
+					<div class="check-btn" @click="openCancel()">
+						<span>作废</span>
+					</div>
 					<div class="check-btn" @click="menuImg(true)">
 						<span>驳回</span>
 					</div>
@@ -282,12 +308,14 @@
 				<template v-else-if="isCheck==1">
 					<!-- 单品数据错误或移动支付错误 （isFACTAMOUNT_SALE == 0 || 单品数据不一致） -->
 					<div class="check-btn" @click="correctFn" v-if=" isFACT_AMOUNT == 0">
-
 						<span>一键冲正</span>
 					</div>
 					<div class="check-btn" @click="checkOutFn()">
 						<span>校验</span>
 					</div>
+					<div class="check-btn" @click="openCancel()">
+						<span>作废</span>
+					</div>
 				</template>
 			</div>
 
@@ -306,13 +334,16 @@
 	import uniLoadMore from './components/uni-load-more.vue';
 
 	import {mapState, mapGetters,mapMutations} from "vuex";
+	import Store from "../../store/store";
 	export default {
 		data() {
 			return {
 				loading: true,
 				showPopupCheck: false,
+				showPopupCancel: false,
 				showPopupYj: false,
 				isdisabled: true,
+				cancelType:1,// 默认为1   1为申请作废 2为审批作废  权限审批或者推送为2
 				ischeckOut: false,
 				effectiveDetail: {},
 				effectiveShow: false,
@@ -322,13 +353,14 @@
 				PURCHASEDESC: "" ,//意见
 				examineType: "", // 校验请求接口名称
 				endaccountMsg: [], // 主任意见
-				
+
 				mobliePayBalance: 0, // 移动冲正支付差额
 				isFACTAMOUNT_SALE: 2, // 2 正在加载，1单品数据一致，0单品数据不一致
 				isFACT_AMOUNT: 2,
 				isTICKETCODE_CIGARETTE: false,
 				isSELLCOUNT_PROMOTION: false,
 				checkReason: "已确认", //校验原由
+				cancelReason:'',// 作废原由
 				contentText: {
 					contentdown: "",
 					contentrefresh: "",
@@ -342,7 +374,7 @@
 		},
 		computed: {
 			...mapState({
-				user: (state)=>{ 
+				user: (state)=>{
 					let { UserName, Membership_Id } = state.userData
 					return { UserName:UserName, Membership_Id:Membership_Id }
 				}
@@ -368,15 +400,15 @@
 				if ( _data.CASH == 0 ) {
 					if(_data.DIFFERENT_PRICE!=0) {
 						return "100.00";
-						
+
 					}else {
 						return "0.00";
 					}
-				} 
+				}
 				else {
-					
+
 					return (Math.abs(_data.DIFFERENT_PRICE)  / _data.CASH * 100).toFixed(2);
-				
+
 				}
 			}
 		},
@@ -395,7 +427,7 @@
 				})
 				uni.previewImage({
 					urls: list,
-					current: 0,	
+					current: 0,
 					loop: true,
 					indicator: 'number'
 				});
@@ -424,7 +456,7 @@
 								uni.getFileSystemManager().readFile({
 									filePath: n, //选择图片返回的相对路径
 									encoding: 'base64', //编码格式
-									success: function(res) { // 
+									success: function(res) { //
 										let base64 = 'data:image/jpeg;base64,' + res
 											.data //.replace(/\+/ig,'%2B') //不加上这串字符，在页面无法显示的哦
 
@@ -465,43 +497,43 @@
 					endAccount_Id: _detail.ENDACCOUNT_ID,
 					data_Type: datatype
 				}).then(res => {
-				
+
 					let _data = res.Result_Data
 					if (datatype == 1) {
 						_detail.FACTAMOUNT_SALE = _data.FactAmount_Sale = Number(_data.FactAmount_Sale) //单品金额
-						_detail.SELLCOUNT_SALE = _data.SellCount_Sale //单品金额 
+						_detail.SELLCOUNT_SALE = _data.SellCount_Sale //单品金额
 
 						_this.isFACTAMOUNT_SALE = _this.checkSinglePro(_detail)
 					}
-					
+
 					if (datatype == 2) {
 						_detail.TICKETCODE_CIGARETTE = _data.TicketCode_Cigarette //香烟客单数量
 						_detail.SELLCOUNT_CIGARETTE = _data.SellCount_Cigarette
 						_detail.FACTAMOUNT_CIGARETTE = _data.FactAmount_Cigarette
 
 						_this.isTICKETCODE_CIGARETTE = _this.checkCigarette(_detail)
-						
+
 					}
 					if (datatype == 3) {
 
 						_detail.FACT_AMOUNT = Number(_data.Fact_Amount) //移动支付销售金额
 						_detail.TICKETCOUNT = _data.Ticket_Count //移动支付销售金额
-						
+
 						_this.isFACT_AMOUNT = _this.checkMobileCorrect(_detail)
-						
+
 					}
 					if (datatype == 4) {
 						_detail.SELLCOUNT_PROMOTION = _data.SellSount_Promotion //促销数量
 						_detail.FACTAMOUNT_PROMOTION = _data.FactAmount_Promotion //促销数量
-						
+
 						_this.isSELLCOUNT_PROMOTION = _this.checkPromotion(_detail)
-						
+
 					}
 				})
 			},
 			//  单品数据判断
 			checkSinglePro(_data) { // 单品计算公式：FACTAMOUNT_SALE = TOTALSELLAMOUNT 或者 TOTALSELLAMOUNT = FACTAMOUNT_SALE + FACTAMOUNT 或 (_data.TOTALSELLAMOUNT+FACTAMOUNT) == _this.FACTAMOUNT_SALE
-				
+
 				if (_data.FACTAMOUNT_SALE == _data.TOTALSELLAMOUNT || (_data.TOTALSELLAMOUNT + _data.FACTAMOUNT) == _data.FACTAMOUNT_SALE || _data.FACTAMOUNT_SALE == _data.CASHPAY) {
 					return 1
 				} else {
@@ -518,22 +550,95 @@
 			},
 			// 验证移动支付
 			checkMobileCorrect(_data){
-				
+
 				if ((_data.FACT_AMOUNT + _data.SALE_CORRECT) == _data.MOBILEPAYMENT) { // 公式： fa+sc=mp+mc; sc=mc-mpb
 					_data.MOBILE_CORRECT = 0
 					this.mobliePayBalance = - _data.SALE_CORRECT
 					return 1
 				} else {
 					this.mobliePayBalance = _data.FACT_AMOUNT - _data.MOBILEPAYMENT // 移动冲正支付差额 实收金额-移动支付金额
-					
+
 					if(_data.MOBILE_CORRECT ==''){ // 默认到账差额为零，使等式成立
 						this.effectiveDetail.MOBILE_CORRECT = this.mobliePayBalance // 移动冲正
 						this.effectiveDetail.SALE_CORRECT = 0  // 到账实差
 					}
 					return 0 // 移动冲正 = 移动支付差额+到账实差
-				
+
 				}
 			},
+			// 作废弹出框
+			openCancel(type){
+				this.showPopupCancel = true
+				console.log('this.showPopupCancel',this.showPopupCancel)
+			},
+			// 作废按钮
+			handleCancel(){
+				let _this = this
+				uni.showLoading({
+					title: '正在提交...',
+					mask: true
+				})
+				console.log('Store.state.userData',Store.state.userData)
+				let useData = Store.state.userData
+				let detail = this.effectiveDetail
+				console.log('this.effectiveDetail',this.effectiveDetail)
+				const date = new Date()
+				let y = date.getFullYear()
+				let m = date.getMonth() + 1
+				let d = date.getDate()
+				if (m<10){
+					m='0'+m
+				}
+				if (d<10){
+					d = '0'+d
+				}
+        let H = date.getHours()
+        H<10?`0${H}`:H
+        let M = date.getMinutes()
+        M<10?`0${M}`:M
+        let S = date.getSeconds()
+        S<10?`0${S}`:S
+				let req = {
+					PermissionApplyModel:{}
+				}
+				// 申请作废的时候
+				console.log('useData',useData)
+				if (this.cancelType===1){
+					req.PermissionApplyModel={
+						PERMISSIONAPPLY_TYPE: 9000,
+						USER_MOBILEPHONE: useData.Membership_Phone,
+						PERMISSIONAPPLY_DATE: `${y}-${m}-${d} ${H}:${M}:${S}`,
+						PERMISSIONAPPLY_REASON: this.cancelReason,
+						SERVERPART_ID: detail.SERVERPART_ID,
+						SERVERPART_NAME: detail.SERVERPART_NAME,
+						APPLYSHOP_NAME: detail.ENDACCOUNT_ID,
+						STAFF_ID: useData.UserId,
+						STAFF_NAME: useData.UserName,
+						OPERATE_DATE:`${y}-${m}-${d} ${H}:${M}:${S}`,
+						PERMISSIONAPPLY_STATE: 2000,
+					}
+				}
+				console.log('req',req)
+				this.$request.$webPost('/EShangApiMain/Verification/ApplyEndaccountInvalid',req).then(res=>{
+					console.log('res',res)
+					uni.hideLoading()
+					if (res.Result_Code===100){
+						uni.showToast({
+							icon: 'none',
+							title: res.Result_Desc,
+							success() {
+								_this.showPopupCancel = false
+								setTimeout(function() {
+									uni.navigateBack({
+										delta: 1
+									})
+								}, 1000)
+
+							}
+						});
+					}
+				})
+			},
 			// 验证促销数据
 			checkPromotion(_data){
 				if (_data.SELLCOUNT_PROMOTION != 0 && _data.SELLCOUNT_PROMOTION != '') {
@@ -550,7 +655,7 @@
 				}).then(res => {
 					_this.loading = false
 					uni.hideLoading()
-
+					console.log('res',res)
 					if (!res.Result_Code || res.Result_Code != '100') return
 
 					_this.imagesList = res.Result_Data.Image_List ? res.Result_Data.Image_List.List : []
@@ -560,11 +665,13 @@
 					let _data = res.Result_Data.Endaccount_List
 
 					_this.effectiveDetail = _data
-					
-					_this.endaccountMsg = _data.ENDACCOUNT_DESC.split("|");
-					
+          console.log('_data',_data)
+          if (_data.ENDACCOUNT_DESC){
+            _this.endaccountMsg = _data.ENDACCOUNT_DESC.split("|");
+          }
+
 					// 如果当前数据为日结校验状态，并且单品数据为空 则异步请求远程单品数据，移动支付数据，香烟数据、促销数据;否则，验证这些数据是否正确
-					
+
 
 					if (_data.SCAN_TYPE != 3) { // 若数据传输类型为接口传输 则不需要远程请求单品数据,默认单品销售金额=收银端销售金额， 移动支付实收金额 = 收银端移动支付
 						if (_data.TREATMENT_MARKSTATE==0 && _data.FACTAMOUNT_SALE == "") {
@@ -576,11 +683,11 @@
 							_this.getEndAccountDate(4) //促销数据
 						}else {
 							_this.isFACTAMOUNT_SALE = _this.checkSinglePro(_data) // 单品数据 是否一致
-							_this.isTICKETCODE_CIGARETTE = _this.checkCigarette(_data) // 香烟数据 
+							_this.isTICKETCODE_CIGARETTE = _this.checkCigarette(_data) // 香烟数据
 							_this.isFACT_AMOUNT = _this.checkMobileCorrect(_data) // 移动支付
 							_this.isSELLCOUNT_PROMOTION = _this.checkPromotion(_data) // 促销数据
 						}
-						
+
 					} else {
 						_data.FACTAMOUNT_SALE = _data.TOTALSELLAMOUNT
 						_data.FACT_AMOUNT = _data.MOBILEPAYMENT
@@ -588,31 +695,34 @@
 						_this.isFACT_AMOUNT = _this.checkMobileCorrect(_data) // 移动支付
 						_this.isTICKETCODE_CIGARETTE = _this.checkCigarette(_data) // 香烟数据
 					}
-					
+
 					if (_data.PENDSTATE == 0) {
-						if (_data.TREATMENT_MARKSTATE == 0) { // 待处理
-							_this.isCheck = 1
-							_this.isdisabled = false
-						}
-						if (_data.TREATMENT_MARKSTATE == 3) { // 主任复核
-							_this.isCheck = 2
-							// _this.Toexamine = true;
-							_this.examineType = "SubmitEndaccount"
-						} else if (_data.TREATMENT_MARKSTATE == 1) { // 财务审核
-							_this.isCheck = 2
-							// _this.Toexamine = true;
-							_this.examineType = "ApproveEndaccount"
-						}
+						console.log('store',Store.state.userData.AuthorityInfo['51b6817d-62a9-4b3a-8e6a-abd7e077271a'])
+						// if (Store.state.userData.AuthorityInfo['51b6817d-62a9-4b3a-8e6a-abd7e077271a']===1){
+							if (_data.TREATMENT_MARKSTATE == 0) { // 待处理
+								_this.isCheck = 1
+								_this.isdisabled = false
+							}
+							if (_data.TREATMENT_MARKSTATE == 3) { // 主任复核
+								_this.isCheck = 2
+								// _this.Toexamine = true;
+								_this.examineType = "SubmitEndaccount"
+							} else if (_data.TREATMENT_MARKSTATE == 1) { // 财务审核
+								_this.isCheck = 2
+								// _this.Toexamine = true;
+								_this.examineType = "ApproveEndaccount"
+							}
+						// }
 					} else { // 已审结
 						_this.examineType = "";
 						_this.isCheck = 0;
 					}
-					
+
 					_this.effectiveShow = true
 					_this.$forceUpdate()
 				})
 			},
-			
+
 			maskFn() {
 				this.showPopupCheck = false
 				this.showPopupYj = false
@@ -620,6 +730,9 @@
 			noCheck() {
 				this.showPopupCheck = false
 			},
+			noCancel(){
+				this.showPopupCancel = false
+			},
 			menuImg(isback) {
 				this.isback = isback
 				this.PURCHASEDESC = isback ? '' : "同意"
@@ -698,7 +811,7 @@
 
 
 				if (effectiveDetail.SCAN_TYPE === 3 || _this.isFACT_AMOUNT == 1) { // 接口传输时 忽略   单品数据一致（_this.isFACTAMOUNT_SALE == 1 &&），移动支付一致
-					
+
 					_this.showPopupCheck = true
 					if (effectiveDetail.CASHPAY !== effectiveDetail.TOTALSELLAMOUNT + effectiveDetail.CORRECT_AMOUNT) { // 校验 实收金额 = 销售+冲正 等式是否成立 不成立则
 
@@ -707,12 +820,12 @@
 					} else {
 						_this.ischeckOut = false
 					}
-				} else  { // 单品数据不一致（_this.isFACTAMOUNT_SALE == 1 &&），if ( _this.isFACT_AMOUNT == 0) 移动支付不一致  
-					
+				} else  { // 单品数据不一致（_this.isFACTAMOUNT_SALE == 1 &&），if ( _this.isFACT_AMOUNT == 0) 移动支付不一致
+
 					_this.showPopupCheck = true
 					_this.ischeckOut = true
 					effectiveDetail.CASH_CORRECT = Math.round((effectiveDetail.CASHPAY - effectiveDetail.TOTALSELLAMOUNT - effectiveDetail.MOBILE_CORRECT) * 100) / 100 // 默认现金冲正金额
-				} 
+				}
 				// else {
 				// 	uni.showToast({
 				// 		icon: 'none',
@@ -725,11 +838,11 @@
 			checkSubmit() {
 				let _this = this
 				let effectiveDetail = this.effectiveDetail
-				
+
 				// let money1 = parseFloat(effectiveDetail.CASHPAY) === parseFloat(effectiveDetail.TOTALSELLAMOUNT+_this.correctAmout) // 实收金额 = 销售+冲正
 				// let money2 = parseFloat(_this.correctAmout) == parseFloat(effectiveDetail.MOBILE_CORRECT+effectiveDetail.CASH_CORRECT) // 冲正 = 移动冲正+现金冲正
 				// let money3 = parseFloat(effectiveDetail.MOBILE_CORRECT) == parseFloat(_this.mobliePayBalance + _this.saleCorrect) // 移动冲正 = 移动支付差额+到账实差
-			 
+
 				// if (money1 && money2) {
 
 				// 	if (_this.isFACT_AMOUNT == 0 && !money3) {
@@ -847,7 +960,7 @@
 								success() {
 									_this.showPopupYj = false
 									_this.getEffectiveDetail()
-									
+
 								}
 							});
 							// _this.showPopupMiddle = false
@@ -1199,11 +1312,11 @@
 		text-align: center;
 	} */
 	.commodityContent-cashpay {
-	
+
 		justify-content: flex-start;
 		box-shadow: unset;
 		display: flex;
-		
+
 	}
 
 	/* 	.commoditytitle {
diff --git a/pages/register/register.vue b/pages/register/register.vue
index d014d96..c60ac9c 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -7,11 +7,11 @@
 				<button type="primary" class="btn" open-type="getUserInfo" @getuserinfo="bindGetUserInfo">微信授权</button>
 			</view>
 			<view class="desc" v-else>
-		 
+
 				<button type="primary" class="btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">快速登录账号</button>
 			</view>
-			
-			
+
+
 		</view>
 		<view class="login-tip-text">
 			该小程序仅供企业内部人员登录使用，<br/>您的手机号是核实身份的唯一凭证。
@@ -25,7 +25,7 @@
 		data() {
 			return {
 				shouldNavback: false,
-				
+
 			}
 		},
 		computed:{
@@ -62,7 +62,7 @@
 							_this.updateUserFn(rs.Result_Data)
 							_this.$util.toNextRoute('switchTab', '/pages/index/index')
 							// uni.switchTab({url: '/pages/index/index'})
-						  
+
 						} else {
 							uni.showToast({title: rs.Result_Desc || '服务器错误,请联系管理员。', icon: 'none'})
 						}
@@ -85,8 +85,10 @@
 							  encryptedData: encodeURIComponent(res.encryptedData),
 							  iv: encodeURIComponent(res.iv),
 							}
+              console.log('res',res)
 							// _this.$request.$webPost('WebAPI_Push/WeChat/BusinessLicensed',arr).then(function (rs) {
 							_this.$request.$get('WeChat_BusinessLicensed',arr).then(function (rs) {
+                console.log(rs)
 								uni.hideLoading()
 								 if(rs.Result_Code==100){
 									let newUser = rs.Result_Data
@@ -97,7 +99,7 @@
 										_this.$util.toNextRoute('switchTab', '/pages/index/index')
 										// uni.reLaunch({url: '/pages/index/index'})
 									}else{
-										
+
 									}
 									_this.$forceUpdate()
 								 }else{
@@ -148,6 +150,6 @@
 		text-align: center;
 		font-size: 26rpx;
 		color: #888;
-		
+
 	}
 </style>
diff --git a/util/api.js b/util/api.js
index 6ad44bd..60b5963 100644
--- a/util/api.js
+++ b/util/api.js
@@ -47,6 +47,13 @@ export default {
 					str +=',60ee4604-0830-4056-931d-d1f7e111810c'
 				}
 			}
+			if (Store.state.userData.AuthorityInfo['27109d64-63f9-4bb9-ab90-4c2c92296c73']===1){
+				if (str===''){
+					str = '27109d64-63f9-4bb9-ab90-4c2c92296c73'
+				}else{
+					str +=',27109d64-63f9-4bb9-ab90-4c2c92296c73'
+				}
+			}
 			if (str===''){
 				str = 0
 			}
diff --git a/wechat_yxcl.zip b/wechat_yxcl.zip
new file mode 100644
index 0000000..e217fab
Binary files /dev/null and b/wechat_yxcl.zip differ