safecheck-client 4.0.1-6 → 4.0.1-60

package/src/components/map/SecurityCheckCoordinates.vue

@@ -0,0 +1,350 @@
+<template>
+  <div class="flex-row">
+    <div class="basic-main" style="flex:7">
+      <div id="check_map" style="height:100%">
+      </div>
+    </div>
+    <div id="zzz" class="basic-main" style="flex:1;margin-left: 0px;overflow: hidden">
+      <div class="panel panel-info" style="margin-top:0px; height: 100%; display: flex; flex-direction: column;">
+        <div class="panel-heading" style="height: 50px">
+          <h3 class="panel-title">状态选择</h3>
+        </div>
+        <div class="panel-body">
+          <ul class="safe_ul_sty">
+            <li class="safe_li_sty"><input class="safe_checkbox_sty" v-model="mulchs.level1" @change="enableChange('level1',mulchs.level1)" type="checkbox"/><img class="safe_deimg" src="../../assets/警告 (3).png"/>拒检</li>
+            <li class="safe_li_sty"><input class="safe_checkbox_sty" v-model="mulchs.level3" @change="enableChange('level3',mulchs.level3)" type="checkbox"/><img class="safe_deimg" src="../../assets/警告 (4).png"/>到访不遇</li>
+            <li class="safe_li_sty"><input class="safe_checkbox_sty" v-model="mulchs.problems" @change="enableChange('problems',mulchs.problems)" type="checkbox"/><img class="safe_deimg" src="../../assets/警告 (5).png"/>正常</li>
+          </ul>
+        </div>
+        <div class="panel-heading" style="height: 50px">
+          <h3 class="panel-title">时间选择</h3>
+        </div>
+        <div class="panel-body">
+          <div class="row" style="height: 50px">
+            <datepicker
+              :value.sync="f_check_start"
+              placeholder='开始时间'
+              :disabled-days-of-week="[]"
+              @change="safeRefresh"
+              :format="'yyyy-MM-dd'"
+              :show-rest-button="reset"
+              v-model="f_check_start">
+            </datepicker>
+          </div>
+
+          <div class="row" style="height: 50px">
+            <datepicker
+              :value.sync="f_check_end"
+              placeholder='结束时间'
+              :disabled-days-of-week="[]"
+              @change="safeRefresh"
+              :format="'yyyy-MM-dd'"
+              :show-rest-button="reset"
+              v-model="f_check_end">
+            </datepicker>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import * as Util from '../Util'
+import {HttpResetClass} from 'vue-client'
+
+export default {
+  title: '用户安检定位信息',
+  data() {
+    return {
+      loading: false,
+      f_check_start:'',
+      f_check_end:'',
+      map:null,
+      infoWindow:null,
+      level1Mulchs:null,//拒检点位
+      level3Mulchs:null,//到访不遇点位
+      problemsMulchs:null,//正常点位
+      level1:[],
+      level3:[],
+      problems:[],
+      defectList:{rows:[]},
+      intervalNum:'',
+      mulchs:{//覆盖物控制显示
+        level1:true,
+        level3:true,
+        problems:true
+      },
+      styleObject :[
+        {
+          url: require('../../assets/警告 (3).png'), //拒检图标URL
+          anchor: new AMap.Pixel(14, 8),  // 图标偏移位置
+          size: new AMap.Size(26, 28)  //图标大小
+        },
+        {
+          url: require('../../assets/警告 (4).png'), //到访不遇图标URL
+          anchor: new AMap.Pixel(14, 8),  // 图标偏移位置
+          size: new AMap.Size(26, 28)  //图标大小
+        },
+        {
+          url: require('../../assets/警告 (5).png'), //正常图标URL
+          anchor: new AMap.Pixel(14, 8),  // 图标偏移位置
+          size: new AMap.Size(26, 28)  //图标大小
+        }
+      ]
+    }
+  },
+  async ready(){
+    this.initMap()
+    await this.getNewData(`f_longitude is not null and f_latitude is not null`)
+    this.assemblyData()
+    this.intervalNum=window.setInterval(this.safeRefresh, 240000)
+  },
+  methods: {
+    async getNewData (condition) {
+      this.loading = true
+      let arr = await new HttpResetClass().load('POST', `api/af-safecheck/sql/safe_singleTable_OrderBy`,
+        {
+          data: {
+            items:'*',
+            tablename: 't_check_paper',
+            condition: condition,
+            orderitem: 'f_entry_status'
+          }}, {resolveMsg: null, rejectMsg: null})
+      if (arr.data) {
+        this.level1 = []
+        this.level3 = []
+        this.problems = []
+        arr.data.forEach((defect) => {
+          if (defect.f_entry_status == '拒检' ) {
+            this.level1.push(defect)
+          } else if (defect.f_entry_status == '到访不遇' ) {
+            this.level3.push(defect)
+          } else {
+            this.problems.push(defect)
+          }
+        })
+      }
+      this.loading = false
+      this.defectList.rows = arr.data
+    },
+    getDefectContent(row){
+      return `
+             <div style="padding:0px;margin-left: 8px;"><b>安检内容</b></div>
+              <div class="panel panel-default" style="background-color: azure;border-radius: 5px;margin-left: 8px;">
+                <div class="panel-body">
+                  <ul style="list-style-type: none;font-size: 15px;">
+                      <li style="margin: 3px 0;">用户姓名: ${row.f_user_name}</li>
+                      <li style="margin: 3px 0;">用户地址: ${row.f_address}</li>
+                      <li style="margin: 3px 0;">安检状态: ${row.f_entry_status}</li>
+                      <li style="margin: 3px 0;">安检时间: ${row.f_offsite_time}</li>
+                      <li style="margin: 3px 0;">安检人员: ${row.f_checker_name}</li>
+                  </ul>
+                </div>
+              </div>`
+    },
+    assemblyData(){
+      let a2=[]
+      for(let i=0;i<this.level1.length;i++){
+        a2.push({
+          lnglat: [this.level1[i].f_longitude, this.level1[i].f_latitude], //点标记位置
+          name: '拒检',
+          id:i,
+          rowstr:this.level1[i]
+        })
+      }
+      this.level1Mulchs.setData(a2);
+      this.level1Mulchs.setMap(this.map);
+
+      let a4=[]
+      for(let p=0;p<this.level3.length;p++){
+        if (this.level3[p].f_longitude&&this.level3[p].f_latitude){
+          a4.push({
+            lnglat: [this.level3[p].f_longitude, this.level3[p].f_latitude], //点标记位置
+            name: '到访不遇',
+            id:p,
+            rowstr:this.level3[p]
+          })
+        }
+      }
+      this.level3Mulchs.setData(a4);
+      this.level3Mulchs.setMap(this.map);
+
+      let a5=[]
+      for(let l=0;l<this.problems.length;l++){
+        if (this.problems[l].f_longitude&&this.problems[l].f_latitude){
+          a5.push({
+            lnglat: [this.problems[l].f_longitude, this.problems[l].f_latitude], //点标记位置
+            name: '正常',
+            id:l,
+            rowstr:this.problems[l]
+          })
+        }
+      }
+      this.problemsMulchs.setData(a5);
+      this.problemsMulchs.setMap(this.map);
+    },
+    enableChange(vname,val){
+      switch(vname){
+        case 'level1':
+          if(val){
+            this.level1Mulchs.show()
+          }else{
+            this.level1Mulchs.hide()
+          }
+          break;
+        case 'level3':
+          if(val){
+            this.level3Mulchs.show()
+          }else{
+            this.level3Mulchs.hide()
+          }
+          break;
+        case 'problems':
+          if(val){
+            this.problemsMulchs.show()
+          }else{
+            this.problemsMulchs.hide()
+          }
+          break;
+        default:
+      }
+    },
+    initMap(){
+      let that=this
+      this.map = new AMap.Map('check_map', {
+        zoom: 17,
+        viewMode: '2D',
+        lang: 'zh_cn',
+        zindex: 99,
+        zooms: [3, 18], // 设置地图缩放范围为3到18级
+        center: [110.121181, 37.088921],
+      });
+      AMap.plugin(
+        ['AMap.ToolBar','AMap.Geolocation'], () => {
+          var geolocation = new AMap.Geolocation({
+            enableHighAccuracy: true,
+            showbutton: true,
+            timeout: 10000,
+            buttonOffset: new AMap.Pixel(10, 20),
+            buttonPosition: 'LB'
+          })
+          that.map.addControl(geolocation)
+          geolocation.getCurrentPosition();
+          that.map.addControl(new AMap.ToolBar())
+        });
+      this.map.setDefaultCursor('move');
+      this.infoWindow = new AMap.InfoWindow({
+        anchor: 'bottom-center',
+        autoMove:true,
+        content: '',
+        offset: new AMap.Pixel(0, -25)
+      })
+
+      this.level1Mulchs=new AMap.MassMarks([], {
+        opacity: 0.8,
+        zIndex: 111,
+        cursor: 'pointer',
+        style: this.styleObject[0]
+      });
+      this.level1Mulchs.on('click',function (e) {
+        let defectContent=that.getDefectContent(e.data.rowstr)
+        that.infoWindow.setContent(defectContent)
+        that.infoWindow.open(that.map, e.data.lnglat);
+      })
+      this.level3Mulchs=new AMap.MassMarks([], {
+        opacity: 0.8,
+        zIndex: 111,
+        cursor: 'pointer',
+        style: this.styleObject[1]
+      });
+      this.level3Mulchs.on('click',function (e) {
+        let defectContent=that.getDefectContent(e.data.rowstr)
+        that.infoWindow.setContent(defectContent)
+        that.infoWindow.open(that.map, e.data.lnglat);
+      })
+      this.problemsMulchs=new AMap.MassMarks([], {
+        opacity: 0.8,
+        zIndex: 111,
+        cursor: 'pointer',
+        style: this.styleObject[2]
+      });
+      this.problemsMulchs.on('click',function (e) {
+        let defectContent=that.getDefectContent(e.data.rowstr)
+        that.infoWindow.setContent(defectContent)
+        that.infoWindow.open(that.map, e.data.lnglat);
+      })
+    },
+    async safeRefresh(){
+      let condition =`f_longitude is not null and f_latitude is not null`
+      if (this.f_check_start){
+        condition += ` and f_offsite_time >=  '${this.f_check_start} 00:00:00'`
+      }
+      if (this.f_check_end){
+        condition += ` and f_offsite_time <=  '${this.f_check_end} 23:59:59'`
+      }
+      await this.getNewData(condition)
+      this.assemblyData()
+    }
+  },
+  destroyed() {
+    window.clearInterval(this.intervalNum)
+  }
+}
+</script>
+
+<style lang="less" scoped>
+
+.time-picker-container {
+  display: flex;
+  align-items: center;
+}
+
+.time-picker-container /deep/ .v-datepicker {
+  width: 100% !important;
+}
+
+.date-separator {
+  padding: 0 5px;
+}
+
+.safe_checkbox_sty{
+  vertical-align:text-bottom;
+  margin-right: 3px;
+
+}
+.safe_ul_sty{
+  list-style-type: none;
+  font-size: 13px;
+  padding-left: 5px;
+}
+.safe_li_sty{
+  font-size: 13px;
+  margin-top: 5px;
+}
+.safe_p{
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  margin: 0 0 0 10px;
+
+  font-size: 12px;
+}
+.safe_list_li{
+  margin-top: 5px;
+  background-color: #ffffff;
+  border: solid 1px #f0f4fa !important;
+  color: #666666 !important;
+  font-size: 1.3rem !important;
+  font-family: PINGFANG-MEDIUM !important;
+  padding: 8px;
+}
+.safe_list_li:hover{
+  background-color: rgb(203,234,241);
+}
+.safe_deimg{
+  vertical-align: text-bottom;
+  width: 15px;
+  margin-right: 3px;
+}
+</style>

package/src/components/pc/CheckBookUser.vue

@@ -304,17 +304,21 @@ export default {
     },
     delOfCheckBook(){
       try {
-        let upAddress = `update t_user_address set f_check_book_id = null where 1 = 2 `
+        let condata = {
+          condition :null,
+          bookAll:'false'
+        }
         if (this.bookAll){
-          upAddress = `update t_user_address set f_check_book_id = null where f_check_book_id = '${this.row.id}'`
+          condata.bookAll = 'true'
+          condata.condition = this.row.id
         }else if (this.bookList.length > 0){
           let codes = this.bookList.map( item => { return `'${item}'` } ).join()
-          upAddress = `update t_user_address set f_check_book_id = null where id in (${codes})`
+          condata.condition = `(${codes})`
         }
         this.$showMessage('确认移出安检册', ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
             let http = new HttpResetClass()
-            http.load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: upAddress}},
+            http.load('POST', 'api/af-safecheck/logic/CheckBookUserRemove', {data:condata},
               {resolveMsg: null, rejectMsg: '移出安检册失败'}).then(resp=>{
               this.$showMessage('移出成功')
               this.$refs.paged.$refs.criteria.search()

package/src/components/planmanage/PlanManage.vue

@@ -771,6 +771,7 @@ export default {
       if(res.data.code==200){
         //Vue.showMessage("下发成功！其中有"+res.data.repet+"个计划己经是下发状态")
         this.$showMessage("下发成功！")
+        this.checkplan.check.checkes = []
       }else{
         this.$showMessage("下发失败！")
       }

package/src/components/querycheckpaper/CheckPaperList.vue

@@ -53,6 +53,7 @@
 import {PagedList} from 'vue-client'
 import Vue from "vue";
 import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
+import {isEmpty} from "../Util";
 
 let asyncReady = async function (self) {
   // 获取配置信息
@@ -86,9 +87,11 @@ export default {
     }
   },
   ready() {
-    //tag
     this.rowdata = this.row
-    var condition = "f_userinfoid = '" + this.row.f_userinfo_id + "'"
+    var condition =' 1=1 '
+    if(!isEmpty(this.row.f_userinfo_id)){
+     condition+= " and f_userinfoid = '" + this.row.f_userinfo_id + "'"
+    }
     if (this.row.filialeCon){
       condition += ` and ${this.row.filialeCon}`
     }
@@ -122,8 +125,7 @@ export default {
       return '正常'
     },
     goDetail(row) {
-      row.f_upload_state = '已传'
-      this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
+      this.$emit('showcheckpaper',row)
     }
   }
 }

package/src/components/querycheckpaper/CheckPaperSearchUser.vue

@@ -1,6 +1,6 @@
 <template>
   <!--安检综合查询主界面-->
-  <div id="unit" class="flex-row" :class="{'binary':showItem}">
+  <div id="unit" class="flex-row" :class="{'binary':showItem}" v-show="showinfo1">
     <div :class="{'basic-main':!showItem,'binary-left':showItem}">
       <!--展示查询界面-->
       <check-search-user class="flex" :tempval="hidden" :style="style" :style2="style2" @select-changed="selected"
@@ -9,11 +9,12 @@
     </div>
     <div class="binary-right" v-show="showItem">
       <div class="flex">
-        <check-paper-list style="height: 100%" :row="rowData"></check-paper-list>
+        <check-paper-list style="height: 100%" :row="rowData" v-on:showcheckpaper="checkpapershow"></check-paper-list>
       </div>
     </div>
   </div>
-
+  <new-check-paper v-if="showinfo2" :f_plan_id="shouinfodata.f_check_plan_id" :item="shouinfodata" :role="'view'" v-on:showback="showback1"></new-check-paper>
+  <new-check-paper-temp  v-if="showinfo3" :f_plan_id="shouinfodata.f_check_plan_id" :item="shouinfodata" :role="'view'" v-on:showback="showback2"></new-check-paper-temp>
 </template>
 
 <script>
@@ -29,10 +30,35 @@ export default {
       barwidth: '100%',
       showItem: false,
       rowData: {},
-      filialeCon: ''
+      filialeCon: '',
+      shouinfodata:{},
+      showinfo1:true,
+      showinfo2: false,
+      showinfo3:false
+
     }
   },
   methods: {
+    showback1(){
+      this.showinfo1 = true
+      this.showinfo2 = false
+    },
+    showback2(){
+      this.showinfo1 = true
+      this.showinfo3 = false
+    },
+    checkpapershow(val){
+      val.f_upload_state = '已传'
+      this.shouinfodata = JSON.parse(JSON.stringify(val))
+      this.showinfo1 = false
+      if (val.f_safe_type == '已挂表未办卡安检'){
+        this.showinfo2 = false
+        this.showinfo3 = true
+        return
+      }
+      this.showinfo2 = true
+      this.showinfo3 = false
+    },
     show() {
       this.showItem = this.showItem ? false : true
     },

package/src/components/querycheckpaper/CheckSearchUser.vue

@@ -189,6 +189,11 @@
               <input type="number" class="input_search" v-model="model.f_check_version"
                      style="width: 60%" placeholder="到访不遇次数">
             </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">安检结果</label>
+              <input style="width: 60%" type="text" class="input_search" v-model="model.f_defect_content"
+                     placeholder="安检结果" condition="f_defect_content like '%{}%'">
+            </div>
           </div>
 
           <div class="row" v-show="$parent.$parent.$parent.showItem">

package/src/filiale/jinhong/android/CurrentCreate.vue

@@ -147,24 +147,24 @@
       <criteria partial='criteria' @condition-changed='search' v-ref:cri>
         <div partial>
           <form>
-            <div class="row app-row">
-              <!--小区名称-->
-              <v-select :value.sync="model.f_residential_area" class="input-font clear-select-with"
-                        :options='$parent.$parent.residentialAreaOptions' placeholder='小区名称' :width="'32.5%'"
-                        v-model="model.f_residential_area" condition="ti.f_residential_area = '{}'"
-                        @change="$parent.$parent.getbuilds" close-on-select clear-button>
-              </v-select>
-              <!--楼栋-->
-              <v-select :value.sync="model.f_building" class="input-font" :options='$parent.$parent.buildOptions'
-                        placeholder='楼栋' :width="'32.5%'" v-model="model.f_building" condition="ti.f_building = '{}'"
-                        @change="$parent.$parent.getUnits" close-on-select clear-button>
-              </v-select>
-              <!--单元-->
-              <v-select :value.sync="model.f_unit" class="input-font" :options='$parent.$parent.unitOptions'
-                        placeholder='单元' :width="'32.5%'" v-model="model.f_unit" condition="ti.f_unit = '{}'" close-on-select
-                        clear-button>
-              </v-select>
-            </div>
+            <!--            <div class="row app-row">-->
+            <!--              &lt;!&ndash;小区名称&ndash;&gt;-->
+            <!--              <v-select :value.sync="model.f_residential_area" class="input-font clear-select-with"-->
+            <!--                        :options='$parent.$parent.residentialAreaOptions' placeholder='小区名称' :width="'32.5%'"-->
+            <!--                        v-model="model.f_residential_area" condition="ti.f_residential_area = '{}'"-->
+            <!--                        @change="$parent.$parent.getbuilds" close-on-select clear-button>-->
+            <!--              </v-select>-->
+            <!--              &lt;!&ndash;楼栋&ndash;&gt;-->
+            <!--              <v-select :value.sync="model.f_building" class="input-font" :options='$parent.$parent.buildOptions'-->
+            <!--                        placeholder='楼栋' :width="'32.5%'" v-model="model.f_building" condition="ti.f_building = '{}'"-->
+            <!--                        @change="$parent.$parent.getUnits" close-on-select clear-button>-->
+            <!--              </v-select>-->
+            <!--              &lt;!&ndash;单元&ndash;&gt;-->
+            <!--              <v-select :value.sync="model.f_unit" class="input-font" :options='$parent.$parent.unitOptions'-->
+            <!--                        placeholder='单元' :width="'32.5%'" v-model="model.f_unit" condition="ti.f_unit = '{}'" close-on-select-->
+            <!--                        clear-button>-->
+            <!--              </v-select>-->
+            <!--            </div>-->
             <div class="row app-row">
               <div class="col-xs-4">
                 <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -207,6 +207,18 @@
               </v-select>
             </div>
 
+            <div class="row app-row" v-if="$parent.$parent.criteriaShow">
+              <div class="col-xs-4">
+                <img src="../../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_plan_name" class="font text-left">安检册：</label>
+              </div>
+              <v-select id="f_plan_name" :value.sync="model.f_check_book" class="input-font"
+                        :options='$parent.$parent.checkBooks' placeholder='安检册' :width="'60%'" v-model="model.f_check_book"
+                        @select-search="$parent.$parent.getCheckBook"
+                        condition="f_check_book_id like '%{}%'" align="right" close-on-select clear-button>
+              </v-select>
+            </div>
+
             <div class="row app-row" v-if="$parent.$parent.criteriaShow">
               <div class="col-xs-4">
                 <img src="../../../assets/是否已检.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -645,6 +657,7 @@ export default {
       buildOptions: [],
       unitOptions: [],
       planNameOptions: [],
+      checkBooks: [],
       upcomingCount: 0,
       doneCount: 0,
       tempSaveCount: 0,
@@ -657,6 +670,7 @@ export default {
     }
   },
   ready() {
+    this.getCheckBook()
     this.getAllArea()
     this.getAllPlanName()
     this.selfSearch()
@@ -675,6 +689,29 @@ export default {
     window.removeEventListener('popstate', this.fun, false);//false阻止默认事件
   },
   methods: {
+    getCheckBook(val){
+      this.checkBooks=[]
+      let condition = '1=1'
+      if (val){
+        condition = `f_check_book_name like '%${val}%' `
+      }
+      new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
+        data: {
+          items: 'id,f_check_book_name,f_check_book_type',
+          tablename: 't_check_book',
+          condition: ` ${condition}`,
+          orderitem: 'id desc'
+        }
+      }, {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
+          })
+        })
+      })
+    },
     scan() {
       HostApp.__this__ = this,
         HostApp.scanCode({ callback: "javascript:HostApp.__this__.getCode();" })
@@ -972,7 +1009,7 @@ export default {
       if (this.planName) {
         condition += " and f_plan_name like '%" + this.planName + "%'"
       } else {
-        if (this.$refs.paged.$refs.cri.model.f_plan_name)
+        if (this.$refs.paged.$refs.cri.model.f_plan_name.length > 0)
           condition += " and f_plan_name like '%" + this.$refs.paged.$refs.cri.model.f_plan_name + "%'"
       }
       // if(this.$refs.paged.$refs.cri.model.f_plan_year)
@@ -1000,10 +1037,17 @@ export default {
       }
       if (this.$refs.paged.$refs.cri.model.f_enter_number)
         condition += " and ti.f_enter_number like '%" + this.$refs.paged.$refs.cri.model.f_enter_number + "%'"
+      if (this.$refs.paged.$refs.cri.model.f_check_book.length > 0){
+        if (this.$refs.paged.$refs.cri.model.f_plan_name.length > 0 || this.planName){
+          condition += " and ti.f_check_book_id like '%" + this.$refs.paged.$refs.cri.model.f_check_book + "%'"
+        }else {
+          this.$showMessage("使用安检册筛选项必须选择计划名称")
+          return
+        }
+      }
       if (this.$refs.paged.$refs.cri.model.f_check_version)
-        condition += " and ti.f_check_version <= " + this.$refs.paged.$refs.cri.model.f_check_version
-      //tag
-      this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检') or (f_last_check_state = '到访不遇' or f_last_check_state = '拒检')) and ti.f_no_checkplan = '有计划安检'" + condition)
+        condition += " and ti.f_check_version = " + this.$refs.paged.$refs.cri.model.f_check_version
+      this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检') or (f_last_check_state = '到访不遇' )) and ti.f_no_checkplan = '有计划安检'" + condition)
 
     },
     getNewOrder() {

package/src/filiale/jinhong/pc/CheckBookList.vue

@@ -20,11 +20,10 @@
             <div :class="$parent.$parent.style">
               <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%"
+                        :multiple="true" style="width: 60%"
                         class="select_list select"
                         :options='$parent.$parent.checkBooks' placeholder='安检册名称'
-                        close-on-select
-                        condition="tcb.id ='{}'"></v-select>
+                        condition="tcb.id in {}"></v-select>
             </div>
             <!--            <div :class="$parent.$parent.style">-->
             <!--              <label class="font_normal_body">表册类型</label>-->
@@ -46,6 +45,7 @@
             <!--            </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_search button_spacing" @click="$parent.$parent.clean()">重置</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"
@@ -73,13 +73,12 @@
             </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%"
+                        :multiple="true" style="width: 60%"
                         class="select_list select"
                         :options='$parent.$parent.checkBooks' placeholder='安检册名称'
-                        close-on-select
-                        condition="tcb.id ='{}'"></v-select>
+                        condition="tcb.id in {}"></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>
@@ -257,6 +256,10 @@ export default {
     bus.$off('fresh-main')
   },
   methods: {
+    clean(){
+      this.$refs.paged.$refs.criteria.model.f_checker_id = ''
+      this.$refs.paged.$refs.criteria.model.f_check_book_id = []
+    },
     getchecker(val){
       this.$refs.paged.$refs.criteria.model.f_checker_id = ''
       if(val && val.length > 0){