safecheck-client 4.0.1-8 → 4.0.1-80

package/src/components/pc/PaperDefectMain.vue

@@ -258,6 +258,9 @@
               <th>
                 <nobr>接收人</nobr>
               </th>
+              <th v-if="$parent.$parent.$parent.canlook">
+                <nobr>材料明细</nobr>
+              </th>
             </tr>
           </template>
           <template partial='body'>
@@ -279,6 +282,9 @@
             <td style="text-align: center">{{row.f_service_id}}</td>
             <td style="text-align: center">{{row.f_handlingtype}}</td>
             <td style="text-align: center">{{row.f_order_man}}</td>
+            <td class="flex-around" v-if="$parent.$parent.$parent.canlook">
+              <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.lookMateril(row)">查看材料</button>
+            </td>
           </template>
         </data-grid>
       </criteria-paged>
@@ -366,6 +372,16 @@
         </div>
         <div slot="modal-footer" class="modal-footer" style="text-align: center" v-show="false"></div>
       </modal>
+      <modal :show.sync="showmaterial"  backdrop="false" style="overflow: scroll;height: 100%">
+        <header slot="modal-header" class="modal-header text-center">
+          <button type="button" class="close" @click="close2"><span>&times;</span></button>
+          <h4 class="modal-title">材料查看</h4>
+        </header>
+        <article slot="modal-body">
+          <defect-material-look v-if="showmaterial"  :selectdata = "selectdata" ></defect-material-look>
+        </article>
+        <footer slot="modal-footer"></footer>
+      </modal>
     </div>
   </div>
 </template>
@@ -423,7 +439,8 @@
       model.f_filialeid = `('${this.$login.f.orgid}')`
       return {
         audioshow:false,
-
+        showmaterial: false,
+        selectdata: {},
         model: model,
         deal_dispose:[{label:'全部',value:''},{label:'报修',value:'报修'},{label:'现场整改',value:'现场整改'},{label:'自行处理',value:'自行处理'},{label:'未处理',value:'未处理'}],
         repairStateOptions: this.getSafeParam('隐患状态'),
@@ -477,6 +494,7 @@
         showModal3: false,
         progressbarWidth:'0',
         canToRepair: this.$appdata.getSingleValue('隐患明细转维修'),
+        canlook: this.$appdata.getSingleValue('隐患明细查看材料')?true:false,
         checkes: []
       }
     },
@@ -486,6 +504,13 @@
       }
     },
     methods: {
+      lookMateril(row){
+        this.selectdata=row
+        this.showmaterial=true
+      },
+      close2(){
+        this.showmaterial=false
+      },
       delConfigKey(obj){
         // 从琉璃中获取的配置中会包含 $开头的一些额外描述新的key。为了兼容v3的代码逻辑在此函数中去掉
         Object.keys(obj).forEach(key =>{

package/src/components/pc/RoleSelectorDep.vue

@@ -2,7 +2,7 @@
   <div style="width: 100%;height: 100%">
     <div class="col-sm-6 form-group" style="margin-bottom: 0px">
       <label class="font_normal_body">所属部门</label>
-      <right-tree-safe-dep :width="leftWidth" @re-res="getRes" :resobjprop.sync="resobjprop"></right-tree-safe-dep>
+      <right-tree-safe-dep  v-ref:selector :width="leftWidth" @re-res="getRes" :resobjprop.sync="resobjprop"></right-tree-safe-dep>
     </div>
     <div class="col-sm-6 form-group" style="margin-bottom: 0px">
       <label class="font_normal_body">{{ roleLable }}</label>
@@ -65,7 +65,8 @@
         selVal: '',
         organizationname:this.$login.f.organizationname,
         resids: [],
-        changeval: ''
+        changeval: '',
+        show: true
       }
     },
     watch: {
@@ -86,6 +87,12 @@
       await this.filterUser(this.resids)
     },
     methods: {
+      async clear() {
+        const emptyValue = this.valueMultiple ? [] : '';
+        this.selVal = emptyValue;
+        this.valuechange(emptyValue);
+        this.$refs.selector.clear()
+      },
       async search() {
         let http = new HttpResetClass()
         const res = await http.load('POST', '/rs/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">
@@ -399,7 +404,7 @@
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_last_check_date }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_last_check_state }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">
-            {{row.f_last_check_state!='入户' ? '': (row.f_last_check_result == '无隐患' ? '无问题' : row.f_last_check_result) }}
+            {{row.f_last_check_state!='入户' ? '': (row.f_last_check_result == '无隐患' ? '正常' : row.f_last_check_result) }}
           </td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_createfile_date }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_gas_date }}</td>

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

@@ -6,6 +6,7 @@
           <div class="row" v-show="!$parent.$parent.$parent.showItemAll">
             <div :class="$parent.$parent.style2" style="margin: 0px">
               <role-selector-safe-dep
+                v-ref:selector
                 role-name="安检员"
                 role-lable="安&nbsp;检&nbsp;员&nbsp;"
                 @re-res="$parent.$parent.getRes"
@@ -20,11 +21,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 +46,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 +74,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 +257,11 @@ 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 = []
+      this.$refs.paged.$refs.criteria.$refs.selector.clear()
+    },
     getchecker(val){
       this.$refs.paged.$refs.criteria.model.f_checker_id = ''
       if(val && val.length > 0){

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

@@ -331,10 +331,10 @@
             <th><nobr>计划名</nobr></th>
             <th><nobr>是否有隐患</nobr></th>
             <th><nobr>隐患数</nobr></th>
-            <th><nobr>处理数</nobr></th>
-            <th><nobr>完成数</nobr></th>
-            <th><nobr>处理情况</nobr></th>
-            <th><nobr>完成情况</nobr></th>
+<!--            <th><nobr>处理数</nobr></th>-->
+<!--            <th><nobr>完成数</nobr></th>-->
+<!--            <th><nobr>处理情况</nobr></th>-->
+<!--            <th><nobr>完成情况</nobr></th>-->
 <!--            <th><nobr>维修情况</nobr></th>-->
             <th><nobr>维修员</nobr></th>
             <th><nobr>隐患明细</nobr></th>
@@ -353,10 +353,10 @@
           <td style="text-align: center;white-space:nowrap;">{{row.f_plan_name}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_has_defect}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_defect_count}}</td>
-          <td style="text-align: center;white-space:nowrap;">{{row.f_deal_count}}</td>
-          <td style="text-align: center;white-space:nowrap;">{{row.f_repair_count}}</td>
-          <td style="text-align: center;white-space:nowrap;">{{row.f_is_deal}}</td>
-          <td style="text-align: center;white-space:nowrap;">{{row.f_is_repair}}</td>
+<!--          <td style="text-align: center;white-space:nowrap;">{{row.f_deal_count}}</td>-->
+<!--          <td style="text-align: center;white-space:nowrap;">{{row.f_repair_count}}</td>-->
+<!--          <td style="text-align: center;white-space:nowrap;">{{row.f_is_deal}}</td>-->
+<!--          <td style="text-align: center;white-space:nowrap;">{{row.f_is_repair}}</td>-->
 <!--          <td style="text-align: center;white-space:nowrap;">{{row.f_repaired}}</td>-->
           <td style="text-align: center;white-space:nowrap;">{{row.f_repairman}}</td>
           <td style="text-align: center;white-space:nowrap;"><span :title="$parent.$parent.$parent.trouble(row.f_defect_content)" style="display: block;max-width: 300px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{ $parent.$parent.$parent.trouble(row.f_defect_content)}}</span></td>
@@ -526,8 +526,8 @@ export default {
       repairers:[],
       cbcs:[],
       thead: '',
-      headData: ['入户状态','用户编号','用户名','用户电话','用户小区','用户地址','安检时间','安检员','计划名','是否有隐患','隐患数','隐患明细','处理数','完成数','处理情况','完成情况','维修员'],
-      bodyData: ['f_entry_status','f_userinfo_code','f_user_name','f_user_phone','f_residential_area','f_address','f_offsite_time','f_checker_name','f_plan_name','f_has_defect','f_defect_count','defecttext','f_deal_count','f_repair_count','f_is_deal','f_is_repair','f_repairman'],
+      headData: ['入户状态','用户编号','用户名','用户电话','用户小区','用户地址','安检时间','安检员','计划名','是否有隐患','隐患数','隐患明细','维修员'],
+      bodyData: ['f_entry_status','f_userinfo_code','f_user_name','f_user_phone','f_residential_area','f_address','f_offsite_time','f_checker_name','f_plan_name','f_has_defect','f_defect_count','defecttext','f_repairman'],
     }
   },
   props:{

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

@@ -10,51 +10,29 @@
                 <input type="text" class="input_search" v-model="model.f_userinfo_code"
                        style="width: 60%" placeholder="客户编号" condition="f_userinfo_code='{}'">
               </div>
-              <div class="form-group col-sm-2"  >
-                <label class="font_normal_body">客户名称</label>
-                <input type="text" class="input_search" v-model="model.f_user_name"
-                       style="width: 60%" placeholder="客户名称" condition="f_user_name like '%{}%'">
-              </div>
-              <div class="form-group col-sm-2"  >
-                <label class="font_normal_body">客户电话</label>
-                <input type="text" class="input_search" v-model="model.f_user_phone"
-                       style="width: 60%" placeholder="客户电话" condition="f_user_phone like '%{}%'">
-              </div>
               <div class="form-group col-sm-2"  >
                 <label class="font_normal_body">客户表号</label>
                 <input type="text" class="input_search" v-model="model.f_meternumber"
                        style="width: 60%" placeholder="客户表号" condition="f_meternumber like '%{}%'">
               </div>
-              <div class="form-group col-sm-2"  >
-                <label class="font_normal_body">小&emsp;&emsp;区</label>
-                <input type="text" class="input_search" v-model="model.f_residential_area"
-                       style="width: 60%" placeholder="小区" condition="f_residential_area like '%{}%'">
-              </div>
               <div class="form-group col-sm-2"  >
                 <label class="font_normal_body">详细地址</label>
                 <input type="text" class="input_search" v-model="model.f_address"
                        style="width: 60%" placeholder="详细地址" condition="f_address like '%{}%'">
               </div>
-              <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
-
-                <export-excel :data="$parent.$parent.searchData"
-                              :field="$parent.$parent.excelHeaders"
-                              :choose-col="true"
-                              sqlurl="api/af-safecheck/logic/exportfile" sql-name="查找安检单" template-name='安检记录明细'></export-excel>
-                <button class="button_spacing button_search" @click="$parent.$parent.showaudio()" v-if="$parent.$parent.audioshow">隐藏</button>
-
-                <button class="button_spacing button_search" @click="search()">查询</button>
-                <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 class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow" >
-                <label class="font_normal_body">安检计划</label>
-                <input type="text" class="input_search" v-model="$parent.$parent.model.f_check_plan.f_plan_name"
-                       @click="$parent.$parent.showChooser"
-                       style="width: 60%" placeholder="安检计划" readonly="readonly">
+              <div class="form-group col-sm-2"  >
+                <label class="font_normal_body">安&ensp;检&ensp;册</label>
+                <v-select class="select_list select"
+                          placeholder='安检册' style="width: 60%"
+                          :value.sync="model.f_meter_book_num" v-model="model.f_meter_book_num"
+                          :options='$parent.$parent.checkBooks'
+                          filer-key="name"
+                          close-on-select clear-button
+                          condition="f_check_book_name = '{}'"
+                          :value-single="true">
+                </v-select>
               </div>
-              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
+              <div class="form-group col-sm-2"  >
                 <label class="font_normal_body">开始时间</label>
                 <datepicker
                   :value.sync="model.f_check_start"
@@ -66,7 +44,7 @@
                   condition="f_offsite_time > ='{} 00:00:00'">
                 </datepicker>
               </div>
-              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
+              <div class="form-group col-sm-2"   >
                 <label class="font_normal_body">结束时间</label>
                 <datepicker
                   :value.sync="model.f_check_end"
@@ -78,7 +56,46 @@
                   condition="f_offsite_time <=  '{} 23:59:59'">
                 </datepicker>
               </div>
+              <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
 
+                <export-excel :data="$parent.$parent.searchData"
+                              :field="$parent.$parent.excelHeaders"
+                              :choose-col="true"
+                              sqlurl="api/af-safecheck/logic/exportfile" sql-name="查找安检单" template-name='安检记录明细'></export-excel>
+                <button class="button_spacing button_search" @click="$parent.$parent.showaudio()" v-if="$parent.$parent.audioshow">隐藏</button>
+
+                <button class="button_spacing button_search" @click="search()">查询</button>
+                <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 class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow"  >
+                <label class="font_normal_body">到访不遇数</label>
+                <input type="text" class="input_search" v-model="model.f_check_version"
+                       style="width: 60%" placeholder="到访不遇次数" >
+              </div>
+              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow"  >
+                <label class="font_normal_body">客户名称</label>
+                <input type="text" class="input_search" v-model="model.f_user_name"
+                       style="width: 60%" placeholder="客户名称" condition="f_user_name like '%{}%'">
+              </div>
+              <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow"  >
+                <label class="font_normal_body">客户电话</label>
+                <input type="text" class="input_search" v-model="model.f_user_phone"
+                       style="width: 60%" placeholder="客户电话" condition="f_user_phone like '%{}%'">
+              </div>
+
+              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
+                <label class="font_normal_body">小&emsp;&emsp;区</label>
+                <input type="text" class="input_search" v-model="model.f_residential_area"
+                       style="width: 60%" placeholder="小区" condition="f_residential_area like '%{}%'">
+              </div>
+              <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow" >
+                <label class="font_normal_body">安检计划</label>
+                <input type="text" class="input_search" v-model="$parent.$parent.model.f_check_plan.f_plan_name"
+                       @click="$parent.$parent.showChooser"
+                       style="width: 60%" placeholder="安检计划" readonly="readonly">
+              </div>
 
               <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow"  >
 
@@ -140,18 +157,7 @@
                         :value-single="true">
               </v-select>
             </div>
-            <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">安&ensp;检&ensp;册</label>
-              <v-select class="select_list select"
-                        placeholder='安检册' style="width: 60%"
-                        :value.sync="model.f_meter_book_num" v-model="model.f_meter_book_num"
-                        :options='$parent.$parent.checkBooks'
-                        filer-key="name"
-                        close-on-select clear-button
-                        condition="f_check_book_name = '{}'"
-                        :value-single="true">
-              </v-select>
-            </div>
+
               <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">
                 <label class="font_normal_body">省&ensp;市&ensp;区</label>
                 <v-select class="select_list select"
@@ -782,6 +788,9 @@ export default {
         if(this.checker_name){
           args.condition += ` and f_checker_name in (${this.checker_name}) `
         }
+        if(args.model.f_check_version){
+          args.condition += ` and f_check_version = '${args.model.f_check_version}'  and  f_entry_status='到访不遇'  `
+        }
         this.model.search(args.condition, args.model, args.condValue)
       }
     },

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

@@ -571,6 +571,8 @@
         },
         showcCreatePlan(){
           this.showCreatePlan=true
+          this.createPlan.f_plan_year=new Date().getFullYear()
+          this.createPlan.f_safecheck_type='年度普检'
         },
         cancel(){
           this.showCondtion=false