Commit cf6ecc04 authored by 罗新东's avatar 罗新东
Browse files

Merge branch 'develop' of http://git.censoft.com.cn/BCDH-HSE/bcdh-app into develop

parents 674e0324 74a6ae88

src/views/checked/problem/index.vue

+7 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
            <van-button type="primary" round size="large" @click="problem(nums)" :disabled="finish=='true'?true:false">临时问题上报{{'('+nums.addTroubleNumber+')'}}</van-button>

            <van-button type="primary" round size="large" @click="formwork">检查清单模板{{'('+nums.listNumber+')'}}</van-button>

            <van-button type="primary" round size="large" @click="note" :disabled="nums.troubleNumber<1?true:false">检查问题记录{{'('+nums.troubleNumber+')'}}</van-button>

            <van-button type="info" round size="large" @click="end" :disabled="finish=='true'?true:false">结束上报</van-button>

            <van-button type="info" round size="large" @click="end(nums)">结束上报</van-button>

        </div>

        <tab-bar :index="1"></tab-bar>

    </div>
@@ -45,6 +45,7 @@ export default { 
            nums:{},//问题上报清单列表

            text:'问题上报',//顶部文本

            finish:'',//提交状态

            submitTroubleNumber:0//问题记录问题提交数量

        }

    },

    mounted() {
@@ -66,6 +67,7 @@ export default { 
            }else{

                //当清单模板，问题列表，问题记录不进行提交操作返回该页面调用缓存数据

                this.nums=JSON.parse(sessionStorage.getItem('nums'))

                this.submitTroubleNumber=JSON.parse(sessionStorage.getItem('submitTroubleNumber'))

            }

        }

    },
@@ -81,21 +83,23 @@ export default { 
            this.nums=[];

            getFun('check/carry/count',{planId:this.id}).then((Response)=>{

                this.$toast.clear()

                this.submitTroubleNumber=Response.data.submitTroubleNumber

                this.nums=Response.data

                sessionStorage.setItem('deptNameList',JSON.stringify(Response.data.deptNameList))

                sessionStorage.setItem('deptIdList',JSON.stringify(Response.data.deptIdList))

                sessionStorage.setItem('projectFlag',Response.data.projectFlag)

                sessionStorage.setItem('nums',JSON.stringify(this.nums))

                sessionStorage.setItem('submitTroubleNumber',this.submitTroubleNumber)

            }).catch(()=>{

                this.$toast.clear()

                this.$toast.fail('加载失败,请稍后再试')

            })

        },

        /*  结束上报接口请求 */

        end(){

        end(nums){

            this.$dialog.confirm({

                title: '提示',

                message: '确定结束检查上报？',

                message: this.submitTroubleNumber?'您已提交'+this.submitTroubleNumber+'个问题'+'确定结束检查上报？':'您未提交问题，确定结束检查上报？',

            }).then(()=>{

                postFun('check/carry/trouble/finish',{planId:this.id}).then((Response)=>{

                    this.$toast.clear()

src/views/checked/problem/note/edit/index.vue

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ export default { 
                    this.$router.push({

                        name:'note',

                        query:{

                            pageName:'problemList'

                            pageName:'problemList',

                        }

                    })

                }).catch(()=>{