整改通知数据回显接口联调

解润东
2021110102

src/views/checked/problem/index.vue

@@ -21,7 +21,7 @@
         <div class="button-more">
             <van-button type="primary" round size="large" @click="problem" :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.addTroubleNumber<1?true:false">检查问题记录{{nums.troubleNumber}}</van-button>
+            <van-button type="primary" round size="large" @click="note" :disabled="nums.troubleNumber<1?true:false">检查问题记录{{nums.troubleNumber}}</van-button>
             <van-button type="primary" round size="large" @click="end" :disabled="finish=='true'?true:false">结束上报</van-button>
         </div>
     </div>

src/views/notice/noticeList/index.vue

@@ -59,7 +59,7 @@
                 <van-calendar v-model="showCalendar" @confirm="onConfirm" />
                 <div class="sign"><span>检查组负责人签字确认：</span><van-tag color="#ffe1e1" :disabled="finish=='true'?true:false"><p v-show="istext" @click="sign" >电子签字</p><img  class="sign-img" v-show="isImg" :src="resultImg" alt=""></van-tag></div>
                 <div class="page-footer-button">
-                    <van-button round type="info" size="large" @click="commit" :disabled="finish=='true'?true:false">生成整改通知单</van-button>
+                    <van-button round type="info" size="large" @click="commit" :disabled="finish=='true'?true:status==true?true:false">生成整改通知单</van-button>
                     <van-button round type="defult" size="large" @click="cancel" :disabled="finish=='true'?true:false">取消</van-button>
                 </div>
             </van-tab>
@@ -90,6 +90,7 @@ export default {
             id:'',//整改通知id
             showCalendar: false,//弹出层状态
             finish:'',//检查状态
+            status:false,//提交状态
         }
     },
     watch:{
@@ -144,7 +145,16 @@ export default {
         problem(){
             this.noticeQuestionList=[]
             getFun('check/notify/trouble/list',{planId:this.id}).then((Response)=>{
-                this.noticeQuestionList=Response.data
+                this.noticeQuestionList=Response.data.list
+                this.value=Response.data.finishTime
+                this.resultImg=Response.data.leaderSign
+                if(this.resultImg){
+                    console.log(this.resultImg)
+                    this.istext=false
+                    this.isImg=true
+                }
+                this.status=Response.data.status
+                console.log(this.status)
                 this.noticeQuestionList.forEach((item)=>{
                     if(item.checkSubmitId){
                         this.result.push(parseInt(item.checkSubmitId))