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

src/views/checked/problem/index.vue

@@ -97,10 +97,12 @@ export default {
         },
         /*  结束上报接口请求 */
         end(nums){
+            if(nums.troubleNumber>0){
                 if(!this.submitTroubleNumber){
                     this.$toast.fail('您需要至少提交一个问题才能结束上报！')
                     return
                 }
+            }
             this.$dialog.confirm({
                 title: '提示',
                 message: '您已提交'+this.submitTroubleNumber+'个问题'+'确定结束检查上报？',

src/views/checkedConfirm/confirmNote/index.vue

@@ -297,6 +297,7 @@ export default {
                     this.$toast.clear()
                     this.$toast.success('确认成功')
                     this.problem()
+                    this.$router.push('/checked-confirm')
                 }).catch(()=>{
                     this.$toast.clear()
                     this.$toast.fail('提交失败,请稍后再试')

src/views/notice/index.vue

@@ -11,6 +11,16 @@
 <template>
     <div>
        <LHeader v-bind:text="text" :goback="goback"></LHeader>
+       <van-search
+            v-model="value"
+            show-action
+            placeholder="请输入搜索内容"
+            @search="onSearch" 
+            >
+            <template #action>
+                <div @click="onSearch" >搜索</div>
+            </template>
+        </van-search>
         <div class="card"  v-for="(item,index) in noticeList"  :key="index" @click="cardLocation(item)">
             <div>负责人姓名：{{item.realName}}</div>
             <div>检查名称：{{item.name}}</div>
@@ -42,6 +52,7 @@ export default {
     },
     data() {
         return {
+            value:'',//列表搜索关键字值
             goback:'save-workbench',//返回工作台
             noticeList:[],//整改通知管理列表
             text:'整改通知管理',
@@ -60,7 +71,7 @@ export default {
                 loadingType: 'spinner',
                 duration: 0
             })
-            getFun('check/notify/list').then((Response)=>{
+            getFun('check/notify/list',{select:this.value}).then((Response)=>{
                 this.$toast.clear()
                 this.noticeList=Response.data
                 this.noticeList.forEach((item)=>{
@@ -68,6 +79,10 @@ export default {
                     item.OpenText="展开 ▼";
                 })
             })
+        },
+         /* 搜索查询列表接口 */
+        onSearch(){
+            this.init()
         },
         cardLocation(item){
             sessionStorage.setItem('projectId',item.projectId)