问题详情

解润东
20220105

src/components/header.vue

@@ -28,11 +28,15 @@ export default {
         text:{
             default:"未知",
             type:String
+        },
+        goback:{
+            default:"",
+            type:String
         }
     },
     data() {
         return {
-        
+            // goValue:this.goback
         }
     },
     mounted() {
@@ -41,7 +45,12 @@ export default {
     methods: {
         /* 左侧图标跳转方法 */
         to(){
-            history.go(-1)
+            //列表页的返回跳转工作台
+            if(this.goback){
+                this.$router.push('/'+this.goback)
+            }else{
+                history.go(-1)
+            }
         }
     }
 }

src/views/checked/index.vue

@@ -10,7 +10,7 @@
 
 <template>
     <div>
-       <LHeader v-bind:text="text"></LHeader>
+       <LHeader v-bind:text="text" v-bind:goback="goback"></LHeader>
        <van-search
             v-model="value"
             show-action
@@ -51,6 +51,7 @@ export default {
     },
     data() {
         return {
+            goback:'save-workbench',//返回工作台
             value:'',//列表搜索关键字值
             checkedList:[],//检查列表
             text:'检查执行',//顶部文本

src/views/checkedConfirm/index.vue

@@ -10,7 +10,7 @@
 
 <template>
     <div>
-       <LHeader v-bind:text="text"></LHeader>
+       <LHeader v-bind:text="text" :goback="goback"></LHeader>
         <div class="card" v-for="(item,index) in checkedConfirmList"  :key="index"  @click="cardLocation(item)">
             <div>负责人：{{item.name}}</div>
             <div>部门名称：{{item.realName}}</div>
@@ -40,6 +40,7 @@ export default {
     },
     data() {
         return {
+            goback:'save-workbench',//返回工作台
             checkedConfirmList:[],//检查确认列表
             text:'检查确认列表',//顶部文本
         }

src/views/notice/index.vue

@@ -10,7 +10,7 @@
 
 <template>
     <div>
-       <LHeader v-bind:text="text"></LHeader>
+       <LHeader v-bind:text="text" :goback="goback"></LHeader>
         <div class="card"  v-for="(item,index) in noticeList"  :key="index" @click="cardLocation(item)">
             <div>负责人姓名：{{item.realName}}</div>
             <div>检查名称：{{item.name}}</div>
@@ -42,6 +42,7 @@ export default {
     },
     data() {
         return {
+            goback:'save-workbench',//返回工作台
             noticeList:[],//整改通知管理列表
             text:'整改通知管理',
         }

src/views/notice/noticeList/index.vue

@@ -49,13 +49,13 @@
                     </tbody>
                 </table> -->
             </van-tab>
-            <van-tab title="问题记录">
+            <van-tab title="问题记录" v-if="finish=='true'?false:isFinish==true?false:true">
                 <van-checkbox-group v-model="result" @change="checkedEvent" ref="checkboxGroup">
                     <div class="card" v-for="(item,index) in noticeQuestionList"  :key="index">
                         <van-overlay @click.stop="close(item)" :show="item.show"  >
                             <van-button round type="primary" @click.stop="detail(index,item)">详情</van-button>
                             <van-button round type="info"  @click.stop="update(index,item)">修改</van-button>
-                            <van-button round type="warning " @click.stop="Delete(item)">删除</van-button>
+                            <van-button round type="warning"  @click.stop="Delete(item)">删除</van-button>
                         </van-overlay>
                         <van-checkbox :name="item.id" :disabled="finish=='true'?true:item.checkSubmitId?true:false">问题{{index+1}}</van-checkbox>
                         <div @click="cardClick(item)">
@@ -101,6 +101,63 @@
                     <van-button round type="info" size="large" @click="commit" :disabled="finish=='true'?true:isFinish==true?true:false">生成整改通知单</van-button>
                 </div>
             </van-tab>
+            <van-tab title="问题记录" v-else>
+                <!-- <van-checkbox-group v-model="result" @change="checkedEvent" ref="checkboxGroup"> -->
+                    <div class="card" v-for="(item,index) in noticeQuestionList"  :key="index">
+                        <van-overlay @click.stop="close(item)" :show="item.show"  >
+                            <van-button round type="primary" @click.stop="detail(index,item)">详情</van-button>
+                            <!-- <van-button round type="info" v-show="finish=='true'?false:isFinish==true?false:true" @click.stop="update(index,item)">修改</van-button>
+                            <van-button round type="warning" v-show="finish=='true'?false:isFinish==true?false:true" @click.stop="Delete(item)">删除</van-button> -->
+                        </van-overlay>
+                        <!-- <van-checkbox :name="item.id" :disabled="finish=='true'?true:item.checkSubmitId?true:false">问题{{index+1}}</van-checkbox> -->
+                        <div @click="cardClick(item)">
+                            <div>问题{{index+1}}</div>
+                            <div>负责人姓名：{{item.realName}}</div>
+                            <!-- <div>问题名称：{{item.title}}</div> -->
+                            <div>问题位置：{{item.address}}</div>
+                            <div>问题内容：{{item.context}}</div>
+                            <div>发现时间：{{item.checkTime}}</div>
+                        </div>
+                    </div>
+                    <div class="card">
+                        <div>整改完成时间：{{value}}</div>
+                        <div>人员组：{{person}}</div>
+                    </div>
+                <!-- </van-checkbox-group> -->
+                <!-- <div class="page-footer">
+                    <van-checkbox v-model="checkedAll" @change="checkedAllEvent" @click="checkedAllClick" :disabled="finish=='true'?true:false">全选</van-checkbox>
+                </div> -->
+                <!-- <van-field
+                    readonly
+                    clickable
+                    name="calendar"
+                    :value="value"
+                    label="整改完成时间"
+                    placeholder="请选择时间"
+                    @click="calendarOpen"
+                    />
+                <van-popup v-model="showCalendar" position="bottom">
+                    <van-datetime-picker v-model="currentDate" type="datehour" @confirm="onConfirm" @cancel="showCalendar=false" title="选择年月日小时"/>
+                </van-popup> 
+                <van-field
+                    readonly
+                    clickable
+                    name="person"
+                    :value="person"
+                    label="人员选择"
+                    placeholder="请选择人员"
+                    @click="personChecked"
+                />
+                <van-popup v-model="showCalendar2" position="bottom">
+                    <van-picker  ref="apicker" title="人员匹配" show-toolbar :columns="columns" @confirm="personOnConfirm" @cancel="showCalendar2=false"/>
+                </van-popup>  -->
+                <!-- <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="sign2"><span>项目经理签字确认：</span><van-tag color="#ffe1e1" :disabled="finish=='true'?true:false"><p v-show="istext2" @click="sign2" >电子签字</p><img  class="sign-img2" v-show="isImg2" :src="resultImg2" alt=""></van-tag></div> -->
+                <!-- <div class="page-footer-button">
+                    <van-button round type="info" size="large" @click="commit" :disabled="finish=='true'?true:isFinish==true?true:false">生成整改通知单</van-button>
+                </div> -->
+            </van-tab>
         </van-tabs>
         <!-- <div></div> -->
         <tab-bar :index="1"></tab-bar>
@@ -426,7 +483,16 @@ export default {
                 message: '确定生成整改通知单？',
             }).then(()=>{
                 if(checkedList.length==0){this.$toast.fail('提交失败,请至少选择一个问题');return}
+                var success=true
+                var num=0
+                this.noticeTableList.forEach((item)=>{
+                    if(item.submit==false){
+                        success=false;
+                        num++;
+                    }
+                })
                 if(this.value==''||this.resultImg==''||this.person==''){this.$toast.fail('提交失败,请完善信息！');return}
+                if(!success){this.$toast.fail('提交失败,有'+num+'个人未提交上报！');return}
                 this.$toast.loading({
                     message:'提交中...',
                     forbidClick: true,

src/views/saveWorkbench/index.vue

@@ -262,8 +262,8 @@ export default {
         this.getWorkList();
     },
     async mounted() {
-        await this.startRecognize();
-        await this.startScan();
+        // await this.startRecognize();
+        // await this.startScan();
     },
     methods: {
         myClick(data) {},