safecheck-client 4.0.0-9 → 4.0.0-90

package/src/components/paper/PicViewer.vue

@@ -1,18 +1,18 @@
-<template>
-  <div>
-    <a href="#" class="btn btn-primary" @click="this.$back('items')" width="800" height="600">&lt;&lt;</a>
-    <img :src="pic_path">
-  </div>
-</template>
-
-<script>
-export default {
-  title: '图片浏览',
-  props: ['pic_path'],
-  data() {
-    return {
-      pic_path : this.pic_path
-    }
-  }
-}
-</script>
+<template>
+  <div>
+    <a href="#" class="btn btn-primary" @click="this.$back('items')" width="800" height="600">&lt;&lt;</a>
+    <img :src="pic_path">
+  </div>
+</template>
+
+<script>
+export default {
+  title: '图片浏览',
+  props: ['pic_path'],
+  data() {
+    return {
+      pic_path : this.pic_path
+    }
+  }
+}
+</script>

package/src/components/pc/AddToCheckBook.vue

@@ -1,26 +1,26 @@
 <template>
   <div id='AddTobook'>
     <div class="auto select-overspread">
+      <button class="button_new" style="margin-right: 10px"  @click="showUploadCodeCondition()">导入编号</button>
       <validator name='v'>
         <ul class="nav nav-tabs">
           <p class="bg-info text-center" style="padding: 8px;">{{tabstitles[$parent.$refs.tabs.active]}}</p>
         </ul>
-        <div class="form-horizontal select-overspread container-fluid auto" style="margin-top:20px;flex: 1;" v-show="!($parent.$refs.tabs.active == 2)">
+        <div class="form-horizontal select-overspread container-fluid auto" style="margin-top:20px;flex: 1;">
           <div class="row" style="text-align: center">
-
             <div class="col-sm-12 form-group" :class="[$v.f_check_book_num.required ? 'has-error' : '']">
-              <label class="font_normal_body" style="width: 26%;">目标片区</label>
+              <label class="font_normal_body" style="width: 26%;">目标安检册</label>
               <input type="text" v-model="model.f_check_book_num" v-show="false"
                      v-validate:f_check_book_num='{required: true }'>
               <v-select :value.sync="model.f_check_book_num" v-model="model.f_check_book_num"
-                        :options='checkbook' placeholder='片区'
+                        :options='checkbook' placeholder='安检册'
                         :value-single="true" :search="true"
                         style="width:60%"
                         close-on-select></v-select>
             </div>
           </div>
         </div>
-        <div class="row"  v-show="!($parent.$refs.tabs.active == 2)">
+        <div class="row"  >
           <div style="float:right;margin-top: 250px;margin-right: 20px;">
             <button @click="confirm()" class="btn button_search" style="width: 70px" :disabled='!$v.valid'>
               <span class="glyphicon glyphicon-floppy-disk"></span>保存
@@ -29,8 +29,23 @@
         </div>
       </validator>
     </div>
+    <modal :show.sync="excelUserCondtion" width="500px" v-ref:modal1 >
+      <div slot="modal-header" class="modal-header">
+        <h4 class="modal-title">
+          导入用户编号
+        </h4>
+      </div>
+      <div slot="modal-body" class="modal-body">
+        <div class="row">
+          <file-upload class="my-file-uploader " name="UploadFile" class="btn btn-success" style="border-radius: 2px;"
+                       action="api/af-safecheck/file/uploadFile" tagname="安检册导入" v-ref:file :headers="headers" multiple></file-upload>
+          <img src="../../assets/anjince.png" style="width: 100%"/>
+        </div>
+      </div>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
   </div>
-
 </template>
 
 <script>
@@ -45,16 +60,17 @@
         model:{
           f_check_book_num:''
         },
+        excelUserCondtion:false,
         checkbook: [],
         checkbooks:[],
-        tabstitles:['请选择小区添加到目标片区','请选择单位添加到目标片区','用户无法单独添加到片区内']
+        tabstitles:['请选择用户添加到安检册内']
       }
     },
     created () {
     },
     ready () {
       // this.close()
-      new HttpResetClass().load('POST','api/af-safecheck/sql/safe_singleTable_OrderBy',{data: {
+      new HttpResetClass().load('POST','api/af-safecheck/sql/safe_singleTable_OrderBy?pageNo=1&pageSize=9999999',{data: {
           items: 'id,f_check_book_name,f_check_book_type,f_user_type',
           tablename: 't_check_book',
           condition: `1=1`,
@@ -69,10 +85,17 @@
             value:item.id
           })
         })
-        this.checkbook = this.checkbooks.filter(item=>item.f_user_type==='民用')
+        this.checkbook = this.checkbooks
       })
     },
     methods: {
+      cancel(){
+        this.showCondtion=false
+        this.excelUserCondtion=false
+      },
+      showUploadCodeCondition(){
+        this.excelUserCondtion=true
+      },
        selectbook(val){
 
       },
@@ -82,7 +105,7 @@
 
       confirm () {
          if (!this.model.f_check_book_num){
-           this.$showMessage('请选择片区')
+           this.$showMessage('请选择目标安检册')
            return
          }
         console.log(this.$parent.$refs.tabs.active)
@@ -90,6 +113,7 @@
         console.log(this.$parent.bookAll)
         console.log(this.$parent.bookCondition)
         let userCondition = ''
+        let f_userinfo_ids = "'"
         if(this.$parent.bookAll){
           if(!this.$parent.bookCondition){
             this.$showMessage("请先查询")
@@ -98,13 +122,27 @@
             userCondition = this.$parent.bookCondition
           }
         }else if(this.$parent.bookList.length > 0){
-          userCondition = this.$parent.$refs.tabs.active ===0? 'ta.id in (' + this.$parent.bookList.toString() + ')':
-            'tc.id in (' + this.$parent.bookList.toString() + ')'
+          if(this.$parent.$refs.tabs.active ===0){
+            for(let i = 0;i<this.$parent.bookList.length;i++){
+              if(i === this.$parent.bookList.length-1){
+                f_userinfo_ids += this.$parent.bookList[i].f_userinfo_id + "'"
+              }else{
+                f_userinfo_ids += this.$parent.bookList[i].f_userinfo_id + "','"
+              }
+            }
+            userCondition ='tui.f_userinfo_id in (' + f_userinfo_ids+ ')'
+          }
+          if(this.$parent.$refs.tabs.active ===1){
+
+          }
+          if(this.$parent.$refs.tabs.active ===2){
+
+          }
         }else{
-          this.$showMessage(this.$parent.$refs.tabs.active===0?'请选择小区':'请选择单位')
+          this.$showMessage(this.$parent.$refs.tabs.active===3?'请选择用户':'请选择')
           return;
         }
-        if(this.$parent.$refs.tabs.active ===0){
+        if(this.$parent.$refs.tabs.active ===1){
           new HttpResetClass().load('POST', 'api/af-safecheck/logic/updateCheckBook', {data: {f_check_book_id: this.model.f_check_book_num,
                 f_check_book_type:'小区',condition:userCondition}},
             {resolveMsg: null, rejectMsg: '添加失败'}).then(res=>{
@@ -120,7 +158,27 @@
               this.$showMessage("添加失败")
             }
           })
-        }else{
+        }else if(this.$parent.$refs.tabs.active ===0){
+          new HttpResetClass().load('POST', 'api/af-safecheck/logic/updateCheckBook', {data: {
+                f_check_book_id: this.model.f_check_book_num,
+                f_check_book_type:'用户',
+                booklist:this.$parent.bookList,
+                condition:userCondition
+                }},
+            {resolveMsg: null, rejectMsg: '添加失败'}).then(res=>{
+            if(res && res.data){
+              this.model.f_check_book_num = ""
+              this.$showMessage("本次成功添加"+this.$parent.bookList.length+"个用户",['confirm']).then(res=>{
+                if(res==='confirm'){
+                  console.log("刷新了")
+                  bus.$emit('fresh-area')
+                }
+              })
+            }else{
+              this.$showMessage("添加失败")
+            }
+          })
+        }  else{
           new HttpResetClass().load('POST', 'api/af-safecheck/logic/updateCheckBook', {data: {f_check_book_id: this.model.f_check_book_num,
                 f_check_book_type:'单位',condition:userCondition}},
             {resolveMsg: null, rejectMsg: '添加失败'}).then(res=>{
@@ -140,17 +198,36 @@
       }
     },
     watch:{
-      '$parent.$refs.tabs.active'(val){
-        if(val =='0'){
-          this.checkbook = this.checkbooks.filter(item=>item.f_user_type==='民用')
-        }else{
-          this.checkbook = this.checkbooks.filter(item=>item.f_user_type==='非民用')
-        }
-        this.model.f_check_book_num = ''
-      }
+      // '$parent.$refs.tabs.active'(val){
+      //   if(val =='0'){
+      //     this.checkbook = this.checkbooks.filter(item=>item.f_user_type==='民用')
+      //   }else{
+      //     this.checkbook = this.checkbooks.filter(item=>item.f_user_type==='非民用')
+      //   }
+      //   this.model.f_check_book_num = ''
+      // }
     },
     computed: {
 
+    },
+    events: {
+      onFileUpload: function (file, res) {
+         if ( this.model.f_check_book_num==''){
+           this.$showMessage("请先选择目标安检册")
+           return
+         }
+        let data = {
+          f_check_book_id: this.model.f_check_book_num,
+          filepath: res.f_downloadpath
+        }
+        new HttpResetClass().load('POST','/api/af-safecheck/logic/checkbookImport', {data: data}, {
+          resolveMsg: '导入成功！',
+          rejectMsg: '导入失败'
+        }).then((res) => {
+          this.excelUserCondtion = false
+        })
+      },
+
     }
   }
 </script>

package/src/components/pc/CheckBook.vue

@@ -218,6 +218,8 @@ export default {
     showdetails (row) {
       console.log('showdetails',row)
       this.rowData = row
+      this.rowData.f_check_book_type='用户'
+      this.rowData.f_user_type=''
       this.showItem = false
       this.showItemUser = true
     },

package/src/components/pc/CheckBookDetails.vue

@@ -3,7 +3,7 @@
     <validator name='v'>
       <form class="form-horizontal" novalidate>
         <ul class="nav nav-tabs" style="margin-bottom: 10px">
-          <li class="active"><a href="#">片区信息</a></li>
+          <li class="active"><a href="#">安检册信息</a></li>
         </ul>
         <div class="row" style="margin-top: 10px">
           <div class="col-sm-12 form-group"  style="margin: 0">
@@ -38,43 +38,10 @@
                       close-on-select></v-select>
           </div>
           <div class="form-group col-sm-6"  style="margin-top: 20px" :class="[$v.f_check_book_name.required ? 'has-error' : '']">
-            <label class="font_normal_body">片区名称</label>
+            <label class="font_normal_body">安检册名称</label>
             <input type="text" class="input_search" v-model="checkBook.f_check_book_name"
                    style="width: 60%" v-validate:f_check_book_name='{ required: true }'>
           </div>
-          <div class="form-group col-sm-6"  style="margin-top: 20px">
-            <label class="font_normal_body">执行日期</label>
-            <datepicker
-              :value.sync="checkBook.f_run_date"
-              style="width: 60%"
-              :format="'yyyy-MM-dd'"
-              v-model="checkBook.f_run_date"
-            >
-            </datepicker>
-          </div>
-          <div class="form-group col-sm-6"  style="margin-top: 20px">
-            <label class="font_normal_body">执行周期</label>
-            <input type="number" class="input_search" v-model="checkBook.f_around_time"
-                   style="width: 60%"  >
-          </div>
-          <div class="form-group col-sm-6"  style="margin-top: 20px">
-            <label class="font_normal_body">周期单位</label>
-            <v-select :value.sync="checkBook.f_around_unit" v-model='checkBook.f_around_unit'
-                      :value-single="true" style="width: 60%"
-                      class="select_list select"
-                      :options='aroundUnit' placeholder=''
-                      close-on-select></v-select>
-          </div>
-
-
-<!--          <div class="form-group col-sm-6"  style="margin-top: 20px">-->
-<!--            <label class="font_normal_body">自动下发</label>-->
-<!--            <v-select :value.sync="checkBook.f_is_auto" v-model='checkBook.f_is_auto'-->
-<!--                      :value-single="true" style="width: 60%"-->
-<!--                      class="select_list select"-->
-<!--                      :options='autos' placeholder=''-->
-<!--                      close-on-select></v-select>-->
-<!--          </div>-->
         </div>
       </form>
       <div style="text-align:right;height:auto;margin-top:6px;margin-right: 10%">
@@ -150,7 +117,7 @@ export default {
     },
     confirm () {
       if(!this.checkBook.f_check_book_name){
-        this.$showMessage('请填写片区名称')
+        this.$showMessage('请填写安检册名称')
         return
       }
       // if(!this.checkBook.f_check_book_type){
@@ -168,15 +135,15 @@ export default {
       console.log('checkbook', this.checkBook)
       let http = new HttpResetClass()
       http.load('POST', 'api/af-safecheck/logic/safeEntity', {data: {tableName: 't_check_book', entityData: this.checkBook}},
-        {resolveMsg: '保存片区信息成功', rejectMsg: '保存片区信息失败'}).then(res => {
+        {resolveMsg: '保存安检册信息成功', rejectMsg: '保存安检册信息失败'}).then(res => {
         if (res.data.code === 200) {
-          this.$showMessage('保存片区信息成功',['confirm']).then(res=>{
+          this.$showMessage('保存安检册信息成功',['confirm']).then(res=>{
             if (res==='confirm'){
               bus.$emit('fresh-main')
             }
           })
         }else{
-          this.$showMessage('保存片区信息失败')
+          this.$showMessage('保存安检册信息失败')
         }
       })
     },

package/src/components/pc/CheckBookEntry.vue

@@ -2,15 +2,15 @@
   <div id='checkbookEntry' class="flex-row binary">
     <div class="binary-left">
       <tabset v-ref:tabs :close="false" class="nav-tabss">
-        <tab header="小区查询">
-          <check-book-search-area @book-list="setBookList" @book-all="setBookAll" @book-condition="setCondition"></check-book-search-area>
-        </tab>
-        <tab header="单位查询">
-          <check-book-search-unit @book-list="setBookList" @book-all="setBookAll" @book-condition="setCondition"></check-book-search-unit>
-        </tab>
         <tab header="用户查询">
           <check-book-search-user @book-list="setBookList" @book-all="setBookAll" @book-condition="setCondition"></check-book-search-user>
         </tab>
+<!--        <tab header="小区查询">-->
+<!--          <check-book-search-area @book-list="setBookList" @book-all="setBookAll" @book-condition="setCondition"></check-book-search-area>-->
+<!--        </tab>-->
+<!--        <tab header="单位查询">-->
+<!--          <check-book-search-unit @book-list="setBookList" @book-all="setBookAll" @book-condition="setCondition"></check-book-search-unit>-->
+<!--        </tab>-->
       </tabset>
     </div>
     <div class="binary-right">
@@ -38,7 +38,6 @@
     methods: {
       setBookList(val){
         console.log("555555")
-        // console.log("66666",val)
         this.bookList = val
       },
       setBookAll(val){

package/src/components/pc/CheckBookList.vue

@@ -16,41 +16,41 @@
               </role-selector-safe>
             </div>
             <div :class="$parent.$parent.style">
-              <label class="font_normal_body">片区名称</label>
+              <label class="font_normal_body">安检册名称</label>
               <v-select :value.sync="model.f_check_book_id" v-model='model.f_check_book_id'
                         :value-single="true" style="width: 60%"
                         class="select_list select"
-                        :options='$parent.$parent.checkBooks' placeholder='片区名称'
+                        :options='$parent.$parent.checkBooks' placeholder='安检册名称'
                         close-on-select
                         condition="tcb.id ='{}'"></v-select>
             </div>
-<!--            <div :class="$parent.$parent.style">-->
-<!--              <label class="font_normal_body">表册类型</label>-->
-<!--              <v-select :value.sync="model.f_check_book_type" v-model='model.f_check_book_type'-->
-<!--                        :value-single="true" style="width: 60%"-->
-<!--                        class="select_list select"-->
-<!--                        :options='$parent.$parent.bookTypes' placeholder='表册类型'-->
-<!--                        close-on-select-->
-<!--                        condition="tcb.f_check_book_type ='{}'"></v-select>-->
-<!--            </div>-->
-<!--            <div :class="$parent.$parent.style">-->
-<!--              <label class="font_normal_body">用户类型</label>-->
-<!--              <v-select :value.sync="model.f_user_type" v-model='model.f_user_type'-->
-<!--                        :value-single="true" style="width: 60%"-->
-<!--                        class="select_list select"-->
-<!--                        :options='$parent.$parent.userTypes' placeholder='用户类型'-->
-<!--                        close-on-select-->
-<!--                        condition="tcb.f_user_type ='{}'"></v-select>-->
-<!--            </div>-->
+            <!--            <div :class="$parent.$parent.style">-->
+            <!--              <label class="font_normal_body">表册类型</label>-->
+            <!--              <v-select :value.sync="model.f_check_book_type" v-model='model.f_check_book_type'-->
+            <!--                        :value-single="true" style="width: 60%"-->
+            <!--                        class="select_list select"-->
+            <!--                        :options='$parent.$parent.bookTypes' placeholder='表册类型'-->
+            <!--                        close-on-select-->
+            <!--                        condition="tcb.f_check_book_type ='{}'"></v-select>-->
+            <!--            </div>-->
+            <!--            <div :class="$parent.$parent.style">-->
+            <!--              <label class="font_normal_body">用户类型</label>-->
+            <!--              <v-select :value.sync="model.f_user_type" v-model='model.f_user_type'-->
+            <!--                        :value-single="true" style="width: 60%"-->
+            <!--                        class="select_list select"-->
+            <!--                        :options='$parent.$parent.userTypes' placeholder='用户类型'-->
+            <!--                        close-on-select-->
+            <!--                        condition="tcb.f_user_type ='{}'"></v-select>-->
+            <!--            </div>-->
             <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>
-              <button type="button" class="button_new button_spacing" @click="$parent.$parent.add()">新增片区</button>
-              <button type="button" class="button_new button_spacing" @click="$parent.$parent.showModal = true">片区用户管理</button>
+              <button type="button" class="button_new button_spacing" @click="$parent.$parent.add()">新增安检册</button>
+              <button type="button" class="button_new button_spacing" @click="$parent.$parent.showModal = true">安检册用户管理</button>
               <div style="float: right" class="button_spacing"
                    v-show="$parent.$parent.$parent.showItem ||$parent.$parent.$parent.showItemUser"
                    :class="{'button_shrink_left':$parent.$parent.$parent.showItemAll,'button_shrink_right':!$parent.$parent.$parent.showItemAll}"
                    @click="($parent.$parent.$parent.showItem =false) || ($parent.$parent.$parent.showItemUser =false)"></div>
-              </div>
+            </div>
 
 
           </div>
@@ -69,26 +69,26 @@
               </role-selector-safe>
             </div>
             <div :class="$parent.$parent.style">
-              <label class="font_normal_body">片区名</label>
+              <label class="font_normal_body">安检册名</label>
               <v-select :value.sync="model.f_check_book_id" v-model='model.f_check_book_id'
                         :value-single="true" style="width: 60%"
                         class="select_list select"
-                        :options='$parent.$parent.checkBooks' placeholder='片区名称'
+                        :options='$parent.$parent.checkBooks' placeholder='安检册名称'
                         close-on-select
                         condition="tcb.id ='{}'"></v-select>
             </div>
             <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>
-              <button type="button" class="button_new button_spacing" @click="$parent.$parent.add()">新增片区</button>
-              <button type="button" class="button_new button_spacing" @click="$parent.$parent.showModal = true">片区用户管理</button>
+              <button type="button" class="button_new button_spacing" @click="$parent.$parent.add()">新增安检册</button>
+              <button type="button" class="button_new button_spacing" @click="$parent.$parent.showModal = true">安检册用户管理</button>
               <div style="float: right" class="button_spacing"
                    v-show="$parent.$parent.$parent.showItem ||$parent.$parent.$parent.showItemUser"
                    :class="{'button_shrink_left':$parent.$parent.$parent.showItemAll,'button_shrink_right':!$parent.$parent.$parent.showItemAll}"
                    @click="($parent.$parent.$parent.showItem =false) || ($parent.$parent.$parent.showItemUser =false)"></div>
-<!--              <div style="float: right" class="button_spacing"-->
-<!--                   :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"-->
-<!--                   @click="$parent.$parent.hidden()">-->
-<!--              </div>-->
+              <!--              <div style="float: right" class="button_spacing"-->
+              <!--                   :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"-->
+              <!--                   @click="$parent.$parent.hidden()">-->
+              <!--              </div>-->
             </div>
 
           </div>
@@ -102,11 +102,11 @@
               <nobr>所属安检员</nobr>
             </th>
             <th>
-              <nobr>片区名称</nobr>
+              <nobr>安检册名称</nobr>
             </th>
-<!--            <th>-->
-<!--              <nobr>片区类型</nobr>-->
-<!--            </th>-->
+            <!--            <th>-->
+            <!--              <nobr>安检册类型</nobr>-->
+            <!--            </th>-->
             <th>
               <nobr>用户类型</nobr>
             </th>
@@ -116,15 +116,8 @@
             <th>
               <nobr>创建人</nobr>
             </th>
-
-            <th>
-              <nobr>执行日期</nobr>
-            </th>
-            <th>
-              <nobr>执行周期</nobr>
-            </th>
             <th>
-              <nobr>小区/单位数量</nobr>
+              <nobr>用户数量</nobr>
             </th>
             <th>
               <nobr>已下发</nobr>
@@ -132,38 +125,36 @@
             <th>
               <nobr>未下发</nobr>
             </th>
-            <th>
+<!--            <th>
               <nobr>已检</nobr>
             </th>
             <th>
               <nobr>未检</nobr>
-            </th>
-<!--            <th v-show="$parent.$parent.$parent.showCaoZuo">-->
-<!--              <nobr>操作</nobr>-->
-<!--            </th>-->
+            </th>-->
+            <!--            <th v-show="$parent.$parent.$parent.showCaoZuo">-->
+            <!--              <nobr>操作</nobr>-->
+            <!--            </th>-->
           </tr>
         </template>
         <template partial='body'>
           <td  style="text-align: center;">{{ row.f_checker_name }}</td>
           <td  style="text-align: center;">{{ row.f_check_book_name }}</td>
-<!--          <td  style="text-align: center;">{{ row.f_check_book_type }}</td>-->
+          <!--          <td  style="text-align: center;">{{ row.f_check_book_type }}</td>-->
           <td  style="text-align: center;">{{ row.f_user_type }}</td>
           <td  style="text-align: center;">{{ row.f_create_date }}</td>
           <td  style="text-align: center;">{{ row.f_create_person }}</td>
-          <td  style="text-align: center;">{{ row.f_run_date }}</td>
-          <td  style="text-align: center;">{{ row.f_around_time }}{{ row.f_around_unit }}</td>
-          <td  style="text-align: center;"><button @click.stop="$parent.$parent.$parent.details(row)" class="btn btn-link"><b>{{row.f_user_type==='民用'?row.num2:row.num3}}</b></button></td>
+          <td  style="text-align: center;"><button @click.stop="$parent.$parent.$parent.details(row)" class="btn btn-link"><b>{{row.num}}</b></button></td>
           <td  style="text-align: center;">{{ row.xiafa }}</td>
           <td  style="text-align: center;">{{ row.f_user_type =='民用'?row.num-row.xiafa:row.num4-row.xiafa }}</td>
-          <td  style="text-align: center;">{{ row.yijian }}</td>
-          <td  style="text-align: center;">{{ row.weijian }}</td>
-<!--          <td  v-show="row.f_check_book_type!='小区'" style="text-align: center;"><button class="button_spacing button_search-1" @click.stop='$parent.$parent.$parent.send(row)'>下发</button></td>-->
+<!--          <td  style="text-align: center;">{{ row.yijian }}</td>
+          <td  style="text-align: center;">{{ row.weijian }}</td>-->
+          <!--          <td  v-show="row.f_check_book_type!='小区'" style="text-align: center;"><button class="button_spacing button_search-1" @click.stop='$parent.$parent.$parent.send(row)'>下发</button></td>-->
         </template>
       </data-grid>
     </criteria-paged>
     <modal :show.sync="showModal" :backdrop="false" id="checkbookEntryShow">
       <article slot="modal-body" class="modal-body">
-        <check-book-entry v-if="showModal" @select-changed="selectedEntry"></check-book-entry>
+        <check-book-entry v-if="showModal" @select-changed="selectedEntry" :showtype="showtype"></check-book-entry>
       </article>
       <footer slot="modal-footer">
       </footer>
@@ -268,7 +259,7 @@ export default {
     },
     freshCheckBook () {
       this.checkBooks = []
-      new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
+      new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy?pageNo=1&pageSize=9999999`, {
         data: {
           items: 'id,f_check_book_name',
           tablename: 't_check_book',
@@ -278,10 +269,10 @@ export default {
       }, {resolveMsg: null, rejectMsg: null}).then(res => {
         this.checkBooks.push({label: '全部', value: ''})
         res.data.forEach(ress => {
-            this.checkBooks.push({
-              label: ress.f_check_book_name,
-              value: ress.id
-            })
+          this.checkBooks.push({
+            label: ress.f_check_book_name,
+            value: ress.id
+          })
         })
       })
     },
@@ -298,12 +289,12 @@ export default {
       //tag
       let http = new HttpResetClass()
       http.load('POST', 'api/af-safecheck/logic/safeEntity', {data:{tableName:'t_check_book',entityData:this.checkBook}},
-        {resolveMsg: '更新片区信息成功', rejectMsg: '保存片区信息成功'}).then(res=>{
-          if (res.data.code===200){
-            this.$showMessage('修改成功')
-            this.showModal = false
-            this.checkBook= {}
-          }
+        {resolveMsg: '更新安检册信息成功', rejectMsg: '保存安检册信息成功'}).then(res=>{
+        if (res.data.code===200){
+          this.$showMessage('修改成功')
+          this.showModal = false
+          this.checkBook= {}
+        }
       })
     },
     cancel () {
@@ -318,9 +309,7 @@ export default {
       // //tag
       this.$parent.showItem = false
       this.$parent.showItemUser = false
-      if(this.model.f_filialeids){
-        args.condition += ` and f_orgid in ${this.model.f_filialeids}`
-      }
+      args.condition += ` and f_orgid in ${this.model.f_filialeids}`
       args.condition += ` and tcb.f_user_type ='${this.showtype}' `
       return this.model.search(args.condition, args.model)
     },
@@ -334,9 +323,9 @@ export default {
         let upAddress = `update t_user_address set f_check_book_id = null where f_check_book_id = '${val.id}'`
         let delCheckBook= `delete from t_check_book where id ='${val.id}'`
         await http.load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: upAddress}},
-          {resolveMsg: null, rejectMsg: '删除片区失败'})
+          {resolveMsg: null, rejectMsg: '删除安检册失败'})
         await http.load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: delCheckBook}},
-          {resolveMsg: null, rejectMsg: '删除片区失败'})
+          {resolveMsg: null, rejectMsg: '删除安检册失败'})
         this.$showMessage('删除成功')
         this.$refs.paged.$refs.criteria.search()
       }catch (e) {