safecheck-client 3.1.1-gaomi-7 → 4.0.1

package/src/components/android/Devices.vue

@@ -5,7 +5,6 @@
         <div class="text-center">
           <label class="control-label" style="font-weight: bold">{{dev.device}}<span  v-if="dev.checkmust">*</span>{{'['+paper['device'+ dev.n].length+']'}}</label>
           <span :class="style__" class="glyphicon glyphicon-plus" @click="addDevice(dev)" v-if="dev.device!='燃气表' && role != 'androidview'"></span>
-        </div>
           <ul class="list-unstyled panel-ul">
             <li
               :id="'vc-list-'+attach+'-'+$index"
@@ -228,7 +227,7 @@
           console.log(val)
           this.model.serviceacitivity[0].f_reciever = val.name
           let http1 = new HttpResetClass()
-          http1.load('POST',`${this.Url}/rs/sql/tel_singleTable_OrderBy`, {data: {
+          http1.load('POST',`${this.Url}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
               items: 'f_user_telephone',
               tablename: 't_user',
               condition: `name  = '${val}'`,

package/src/components/android/DevicesItemm.vue

@@ -11,7 +11,7 @@
           <div v-for="row in f_items">
 
             <div class="row" v-if="row.type == 'picture'" v-show="row.isshow">
-              <label class="control-label font text-left">{{row.f_item_name}}<span  v-if="row.checkmust">*</span></label>
+              <label :class="{'defectfront' :row.f_is_defect != ''}" class="control-label font text-left" >{{row.f_item_name}}<span  v-if="row.checkmust">*</span></label>
               <div class="form-group col-sm-12" >
                 <div class="auto" >
                   <div class="panel">
@@ -28,14 +28,14 @@
             </div>
 
             <div class="row" v-if="row.type == 'string'" style="margin-top: 6px" v-show="row.isshow">
-            <label class="col-xs-4 control-label font text-left">{{row.f_item_name}}<span  v-if="row.checkmust">*</span></label>
+            <label class="col-xs-4 control-label font text-left" :class="{'defectfront' :row.f_is_defect != ''}">{{row.f_item_name}}<span  v-if="row.checkmust">*</span></label>
             <div class="col-xs-8">
               <input type="text"  class="form-control" maxlength="100" v-model="row.f_item_value"  readonly>
             </div>
           </div>
 
             <div class="row" v-if="row.type == 'inputSelector'" style="margin-top: 6px" v-show="row.isshow">
-              <label class="col-xs-4 control-label font text-left">{{row.f_item_name}}<span  v-if="row.checkmust">*</span></label>
+              <label class="col-xs-4 control-label font text-left" :class="{'defectfront' :row.f_is_defect != ''}">{{row.f_item_name}}<span  v-if="row.checkmust">*</span></label>
               <div class="col-xs-8">
                 <input-select class="col-xs-8"
                               :value.sync="row.selected"
@@ -47,14 +47,27 @@
               </div>
             </div>
             <div class="row" v-if="row.type == 'number'" style="margin-top: 6px" v-show="row.isshow">
-              <label class="col-xs-4 control-label font text-left">{{row.f_item_name}}<span  v-if="row.checkmust">*</span></label>
+              <label class="col-xs-4 control-label font text-left" :class="{'defectfront' :row.f_is_defect != ''}">{{row.f_item_name}}<span  v-if="row.checkmust">*</span></label>
               <div class="col-xs-8">
                 <input type="text" class="form-control" v-model="row.f_item_value" maxlength="20" readonly  onkeyup="value=value.replace(/[^\d\.]/g,'')">
               </div>
             </div>
+            <div style="margin-top: 6px" class="row" v-if="row.type == 'radio'" v-show="row.isshow">
+              <label class="col-xs-4 control-label font text-left" :class="{'defectfront' :row.f_is_defect != ''}">{{row.f_item_name}}<span  v-if="row.checkmust">*</span></label>
+              <div class="col-xs-8">
+                <input type="text"  class="form-control" maxlength="100" v-model="row.f_item_value"  readonly>
+              </div>
+            </div>
+            <label v-if="row.type == 'text'" v-show="row.isshow" class="textlabel"  :class="{'defectfront' :row.f_is_defect != ''}">{{row.f_item_name}}<br/>{{row.remark}}</label>
 
+            <div style="margin-top: 6px" class="row" v-if="row.type == 'stringp'" v-show="row.isshow">
+                <label class="col-xs-4 control-label font text-left" :class="{'defectfront' :row.f_is_defect != ''}">{{row.f_item_name}}<span  v-if="row.checkmust">*</span></label>
+                <div class="col-xs-8">
+                  <input type="text"  class="form-control" maxlength="100" v-model="row.f_item_value"  readonly>
+                </div>
+            </div>
             <div class="row select-overspread" v-if="row.type == 'selector'" style="margin-top: 6px;width: 100%" v-show="row.isshow">
-              <label class="col-xs-4 control-label font text-left">{{row.f_item_name}}<span  v-if="row.checkmust">*</span></label>
+              <label class="col-xs-4 control-label font text-left" :class="{'defectfront' :row.f_is_defect != ''}">{{row.f_item_name}}<span  v-if="row.checkmust">*</span></label>
               <div class="col-xs-8 form-input-group" >
                 <v-select   :value.sync="row.selected"
                             v-model="row.selected"
@@ -67,7 +80,7 @@
                             :close-on-select="!row.multiple" clear-button></v-select>
               </div>
             </div>
-            <div class="form-group row select-overspread"  v-if="row.type == 'selector' && row.f_path != '' && (livedispose == 'true' || livedispose == true) " style="margin-top: 6px">
+            <div class="form-group row select-overspread"  v-if="(row.type == 'selector' || row.type == 'radio' || row.type =='checkbox') && row.f_path != '' && (livedispose == 'true' || livedispose == true) " style="margin-top: 6px">
               <label class="col-xs-4 control-label font text-left">现场处理</label>
               <v-select   class="col-xs-8"
                           :value="row.f_live_dispose"
@@ -78,33 +91,33 @@
                           @click="transelation($index)"
                           close-on-select clear-button></v-select>
             </div>
-              <div class="form-group col-sm-12"  v-if="row.type == 'selector' && row.f_path != ''" style="margin-top: 40px">
+              <div class="form-group col-sm-12"  v-if="(row.type == 'selector' || row.type == 'radio' || row.type == 'stringp' || row.type =='checkbox') && row.f_path != ''" style="margin-top: 40px">
                   <div class="auto">
                     <div class="panel">
                       <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px">
                         <div class="row" style="height: 240px;top: 1px">
                           <div class="col-sm-4">
-                            <img-self  :src="row.f_path" :alt="row.f_item_name"  width="150" height="200"></img-self>
+                            <img-self  :src="row.f_path" :alt="row.f_item_name"  width="150" height="160"></img-self>
                           </div>
                         </div>
                       </div>
                     </div>
                   </div>
               </div>
-            <div class="form-group col-sm-12"  v-if="row.type == 'selector' && row.f_second_path != ''" style="margin-top: 40px">
+            <div class="form-group col-sm-12"  v-if="(row.type == 'selector' || row.type == 'radio' || row.type == 'stringp' || row.type =='checkbox') && row.f_second_path != ''" style="margin-top: 40px">
               <div class="auto">
                 <div class="panel">
                   <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px">
                     <div class="row" style="height: 240px;top: 1px">
                       <div class="col-sm-4">
-                        <img-self  :src="row.f_path" :alt="row.f_item_name"  width="150" height="200"></img-self>
+                        <img-self  :src="row.f_second_path" :alt="row.f_item_name"  width="150" height="160"></img-self>
                       </div>
                     </div>
                   </div>
                 </div>
               </div>
             </div>
-            <div class="form-group col-sm-12"   v-if="row.type == 'selector' && row.tooltip != undefined  && row.tooltip != '' "  style="margin-top: 40px">
+            <div class="form-group col-sm-12"   v-if="(row.type == 'selector' || row.type == 'radio' || row.type == 'stringp' || row.type =='checkbox') && row.tooltip != undefined  && row.tooltip != '' "  style="margin-top: 40px">
               <div class="auto">
                 <div class="panel">
                   <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: auto">
@@ -116,7 +129,7 @@
 
 
             <div class="row app-input" v-if="row.type == 'date'" style="margin-top: 6px" v-show="row.isshow">
-              <label class="col-xs-4 control-label font text-left">{{row.f_item_name}}<span  v-if="row.checkmust">*</span></label>
+              <label class="col-xs-4 control-label font text-left" :class="{'defectfront' :row.f_is_defect != ''}">{{row.f_item_name}}<span  v-if="row.checkmust">*</span></label>
               <div class="col-xs-8">
                 <datepicker id="f_making_date" :placeholder= row.f_item_name
                             :value.sync="row.f_item_value"
@@ -441,5 +454,7 @@
     font: 15px PingFang-SC-Bold;
     color: #ffffff;
   }
-
+  .defectfront{
+    color: red;
+  }
 </style>

package/src/components/android/Devicesm.vue

@@ -25,7 +25,7 @@
                         {{items.f_item_name}}:{{items.f_item_value}}   
                       </span>
                       <div class="text-right">
-                        <img style="width: 20px" src="../../assets/remove.png" :class="style__" @click="removeDevice(dev,row)" v-if="dev.device!='燃气表' role != 'androidview'"></img>
+                        <!--<img style="width: 20px" src="../../assets/remove.png" :class="style__" @click="removeDevice(dev,row)" v-if="dev.device!='燃气表'&&role != 'androidview'"></img>-->
                         <img style="width: 20px" src="../../assets/edit.png" @click="editDevice(dev,$index)"></img>
                       </div>
                     </div>
@@ -205,7 +205,7 @@
           console.log(val)
           this.model.serviceacitivity[0].f_reciever = val.name
           let http1 = new HttpResetClass()
-          http1.load('POST',`${this.Url}/rs/sql/tel_singleTable_OrderBy`, {data: {
+          http1.load('POST',`${this.Url}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
               items: 'f_user_telephone',
               tablename: 't_user',
               condition: `name  = '${val}'`,
@@ -237,17 +237,14 @@
               for(let i in this.paper[device][item].f_items){
                 let defects = ''
                 let items = this.paper[device][item].f_items[i]
-                if (items.type === 'selector' && items.f_item_value != null && items.f_item_value instanceof Array){
+                if ((items.type === 'selector' || items.type === 'radio' || items.type === 'checkbox') && items.f_item_value != null && items.f_item_value instanceof Array){
                   for (let i in items.f_item_value) {
                     let f_item_value = items.f_item_value[i]
-                    console.log('bbb => ' + JSON.stringify(items))
+
                     console.log('f_item_value => ' + JSON.stringify(f_item_value))
                     console.log('f_device_type => ' + JSON.stringify(f_device_type))
                     console.log('this.paper[device][item] => ' + JSON.stringify(this.paper[device][item]))
                     console.log('this.config[this.paper[device][item].f_device_type] => ' + JSON.stringify(this.config[this.paper[device][item].f_device_type]))
-                    console.log('aaaa ' + JSON.stringify(this.config[this.paper[device][item].f_device_type].items))
-                    console.log('aaaa ' + JSON.stringify(items.f_item_name))
-                    console.log('aaaa ' + JSON.stringify(this.config[this.paper[device][item].f_device_type].items[items.f_item_name]))
 
                     let options = this.config[this.paper[device][item].f_device_type].items[items.f_item_name].options
                     for (let option in options) {
@@ -255,7 +252,7 @@
                         if (options[option].isdefect == 'true' || options[option].isdefect == true) {
                           checkResult = '有隐患'
                           this.result = '有隐患'
-                          defects=`${defects}${options[option].data}/`
+                          defects=`${defects}:${options[option].data}/`
                           // let level = options[option].level
                         }
                       }
@@ -265,6 +262,30 @@
                   if(defects != ''){
                     deviceInfos.push(`${items.f_item_name}${defects.substring(0, defects.length - 1)}`)
                   }
+                }else if(items.type === 'stringp'){
+                  checkResult = '有隐患'
+                  this.result = '有隐患'
+                  deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)
+                }else if(items.f_item_name == '金额异常差值'){
+                  let deviation = this.$appdata.getSingleValue('金额异常差值允许误差')
+                  console.log(items.f_item_value[0]+'金额异常差值允许误差'+deviation)
+                  if(parseFloat(items.f_item_value[0]).toString() != "NaN" && parseFloat(deviation).toString() != "NaN"){
+                    if(parseFloat(items.f_item_value[0])>parseFloat(deviation)){
+                       checkResult = '有隐患'
+                       this.result = '有隐患'
+                       deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)
+                     }
+                  }
+                }else if(items.f_item_name == '气量异常差值'){
+                  let deviation = this.$appdata.getSingleValue('气量异常差值允许误差')
+                  console.log(items.f_item_value[0]+'气量异常差值允许误差'+deviation)
+                  if(parseFloat(items.f_item_value[0]).toString() != "NaN" && parseFloat(deviation).toString() != "NaN"){
+                    if(parseFloat(items.f_item_value[0])>parseFloat(deviation)){
+                      checkResult = '有隐患'
+                      this.result = '有隐患'
+                      deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)
+                    }
+                  }
                 }
                 console.log('deviceInfos========>'+JSON.stringify(deviceInfos))
                 console.log('items.f_is_defect')

package/src/components/android/DoorService.vue

@@ -269,7 +269,7 @@ export default {
     //厂家改变
     changed(val){
       //根据品牌 获取厂家 气表型号
-      this.$resetpost(Vue.dataUrl + 'rs/sql/singleTable_OrderBy', {
+      this.$resetpost(Vue.dataUrl + 'api/af-safecheck/sql/singleTable_OrderBy', {
         data: {
           items: '*',
           tablename: 't_qbnumber',
@@ -305,7 +305,7 @@ export default {
       }
       this.$showMessage('确认后，所有填写内容将上传保存，请确认信息！', ['confirm', 'cancel']).then((res) => {
         if (res === 'confirm') {
-          this.$resetpost(Vue.dataUrl + 'rs/logic/updataUserInfo', data).then((res) => {
+          this.$resetpost(Vue.dataUrl + 'api/af-safecheck/logic/updataUserInfo', data).then((res) => {
             if(res.data.code === 200){
               this.$showMessage('保存成功')
               this.isbuqi = true
@@ -479,7 +479,7 @@ export default {
 
   ready(){
     //获取厂家，表品牌 下拉参数
-    // this.$resetpost(Vue.dataUrl+ 'rs/sql/singleTable_OrderBy', {
+    // this.$resetpost(Vue.dataUrl+ 'api/af-safecheck/sql/singleTable_OrderBy', {
     //   data: {
     //     items: '*',
     //     tablename: 't_qibiao',

package/src/components/android/ExtractCheckPlan.vue

@@ -221,7 +221,7 @@
         plan:'',
         planid:'',
         goplanid:'',
-        model:new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/预约计划下发`,20,{groupitem:"''",f_filialeids:"'("+Vue.user.orgid+")'",orderitem:"'f_create_time'"}),
+        model:new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/预约计划下发`,20,{groupitem:"''",f_filialeids:"'("+Vue.user.orgid+")'",orderitem:"'f_create_time'"}),
         showModal:false,
         needid:'',
         criteriaShow: true,

package/src/components/android/ExtractPlanItem.vue

@@ -62,7 +62,7 @@
 <template>
   <div class="auto">
     <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
         <div partial>
           <form>
             <div class="row app-row" v-if="$parent.$parent.criteriaShow">
@@ -87,46 +87,8 @@
                        v-model=model.f_userinfo_code condition="f_userinfo_code like '%{}%'" />
               </div>
             </div>
-            <div class="row app-row">
-              <div class="col-xs-4">
-                <img src="../../assets/用户类型.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label class="font text-left">用户类型：</label>
-              </div>
-              <div class="col-xs-8" >
-                <v-select :value.sync="model.f_user_type" class="input-font"
-                          :options='$parent.$parent.user_types' placeholder='请选择用户类型' :value-single="true"
-                          v-model="model.f_user_type"
-                          condition="f_user_type = '{}'"
-                          close-on-select clear-button></v-select>
-              </div>
-            </div>
-            <div class="row app-row">
-              <div class="col-xs-4">
-                <img src="../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label class="font text-left">小区名称：</label>
-              </div>
-              <div class="col-xs-8" >
-                <input style="width: 100%" class="search_input input-font" v-model="model.f_districtname" condition="f_residential_area like '%{}%'" placeholder="请输入用户小区（可模糊查询）">
-              </div>
-            </div>
-            <div class="row app-row">
-              <div class="col-xs-4">
-                <img src="../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label class="font text-left">楼&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号：</label>
-              </div>
-              <div class="col-xs-8" >
-                <input style="width: 100%" class="search_input input-font" v-model="model.f_building" condition="f_building = '{}'" placeholder="请输入用户楼号（可模糊查询）">
-              </div>
-            </div>
-            <div class="row app-row">
-              <div class="col-xs-4">
-                <img src="../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label class="font text-left">单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;元：</label>
-              </div>
-              <div class="col-xs-8" >
-                <input style="width: 100%" class="search_input input-font" v-model="model.f_unit" condition="f_unit = '{}'" placeholder="请输入用户单元（可模糊查询）">
-              </div>
-            </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="">
@@ -134,14 +96,15 @@
               </div>
               <div class="col-xs-8" >
                 <input class="search_input input-font"
-                       v-model="model.f_keyword" condition="f_address like '%{}%'"  />
+                       v-model=model.f_keyword condition="f_address like '%{}%'"  />
               </div>
             </div>
+
             <div class="row text-center" style="margin-top: 20px;">
-              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;" @click="search">查询</button>
+              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;" @click="$parent.$parent.selfSearch">查询</button>
               <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;margin-left: 10px" @click="$parent.$parent.selectplanmany">抽取</button>
-              <!--<div style="float: right;margin-right: 3% " 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;margin-right: 3% " class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"  @click="$parent.$parent.hidden()"></div>
+
             </div>
             <div style="height:30px;"></div>
           </form>
@@ -157,7 +120,7 @@
                   <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户编号:</b></p>
                   <p class="panel-title col-xs-5 text-left input-font" style="width: 74%">{{ row.f_userinfo_code }}</p>
                   <p class="panel-title col-xs-2 text-left input-font" style="width: 5%;float:right">
-                    <input type="checkbox" @click="$parent.$parent.$parent.setPlanParam(row.f_check_item_id, $event)"/>
+                    <input type="checkbox" @click="$parent.$parent.$parent.setPlanParam(row.id, $event)"/>
                   </p>
                 </div>
                 <div class="col-xs-12">
@@ -174,9 +137,9 @@
                   <p class="panel-title col-xs-7 text-left input-font">{{ row.f_plan_name }}</p>
                 </div>
                 <div class="col-xs-12">
-                  <p class="panel-title text-left font" style="width: 21%;float: left"><b>用户电话:</b></p>
-                  <p class="panel-title text-left input-font" style="width: 79%">{{ row.f_user_phone2 ? row.f_user_phone2 : row.f_user_phone }}
-                    <!--<img src="../../assets/phone.png" style="width: 6%" v-on:click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_user_phone2 ? row.f_user_phone2 : row.f_user_phone)'></img>-->
+                  <p class="panel-title text-left font" style="width: 23%;float: left"><b>用户电话:</b></p>
+                  <p class="panel-title text-left input-font" style="width: 77%">{{ row.f_user_phone2 ? row.f_user_phone2 : row.f_user_phone }}
+                    <img src="../../assets/phone.png" style="width: 6%" v-on:click.stop.prevent='$parent.$parent.$parent.makeAPhoneCall(row.f_user_phone2 ? row.f_user_phone2 : row.f_user_phone)'></img>
                   </p>
                 </div>
 
@@ -189,8 +152,8 @@
                   <p class="panel-title col-xs-7 text-left input-font">{{ row.f_state == '已检'?'临时保存':row.f_state }}</p>
                 </div>
                 <div class="col-xs-6">
-                  <p class="panel-title col-xs-5 text-left font"><b>计划所属:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_checker }}</p>
+                  <p class="panel-title col-xs-5 text-left font"><b>上传状态:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_upload_state }}</p>
                 </div>
                 <!--<div class="col-xs-6">-->
                   <!--<button type="button" class="btn btn-default" @click="$parent.$parent.$parent.selectplan(row.id)">转发</button>-->
@@ -252,21 +215,21 @@
         </h4>
       </div>
       <div slot="modal-body" class="modal-body">
-        <!--<div class="col-xs-12">
+        <div class="col-xs-12">
           <div class="col-xs-1">
-            &lt;!&ndash;<label  style="font-size:20px;line-height: 35px">人员 </label>&ndash;&gt;
+            <!--<label  style="font-size:20px;line-height: 35px">人员 </label>-->
           </div>
           <div class="col-xs-4" style="padding-left: 2px">
             <input  class="select-style" placeholder="计划名称" type="text"  v-model="plan"  style="border: 1px solid #93B2D3;height:34px;width: 100%;line-height: 35px"/>
           </div>
           <div class="col-xs-1" >
-            &lt;!&ndash;<label  style="font-size: 20px;line-height: 35px">计划</label>&ndash;&gt;
+            <!--<label  style="font-size: 20px;line-height: 35px">计划</label>-->
           </div>
-          &lt;!&ndash;<input placeholder="安检员" type="text"  v-model="check" style="height:30px;width: 100px"/>&ndash;&gt;
+          <!--<input placeholder="安检员" type="text"  v-model="check" style="height:30px;width: 100px"/>-->
           <div class="col-xs-2" style="float: right">
             <button type="button" class="btn btn-primary" @click="plansearch" style="background-color:#499edf;float: right;margin-right:10px;border: 1px solid #93B2D3;height:34px;width: 100%;line-height: 1px;padding-left: 12px">查询</button>
           </div>
-        </div>-->
+        </div>
 
         <table class="table table_sy">
           <thead>
@@ -319,33 +282,38 @@
         plan:'',
         planid:'',
         goplanid:'',
-        model:new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/planItem`,20,{condition:'this.condition'}),
+        model:new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/androidGetuserinfo`,20,{condition:'this.condition'}),
         showModal:false,
         showModal2:false,
         needid:'',
-        criteriaShow: true,
+        criteriaShow: false,
         planoption:[],
         condition:'',
         checkers:[],
         param: null,
-        user_types: [
-          {label: '请选择用户类型', value: ''},
-          {label: '民用', value: '民用'},
-          {label: '非民用', value: '非民用'},
-        ],
         f_preset_dt : Util.to3339TimeString(),
       }
     },
     ready(){
       console.log('进入安检抽单界面')
      // console.log(this.aaa)
-      this.$refs.paged.$refs.cri.search()
+      this.selfSearch()
     },
     methods: {
+      async selectplan(val){
+        this.planoption=[]
+        await this.checkplan.searchList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/预约计划下发`, {},{condition:"f_checker_id='"+Vue.user.id+"'",groupitem:"",f_filialeids:"("+Vue.user.orgid+")",orderitem:"f_create_time"})
+        let resoult=this.checkplan.list.data
+        for (let i = 0; i < resoult.length; i++) {
+          this.planoption.push({label: resoult[i].f_plan_name,selected:false, value: resoult[i].id})
+        }
+        this.needid=val
+        this.showModal = true
+        console.log(resoult)
+      },
       async selectplanmany(){
         this.planoption=[]
-        await this.checkplan.searchList(`${this.$androidUtil.getProxyUrl()}/rs/sql/预约计划下发`, {},{condition:"f_checker_id='"+Vue.user.id+"' and f_safecheck_type='年度普检' and f_plan_year="+new Date().getFullYear(),groupitem:"",f_filialeids:"("+Vue.user.orgid+")",orderitem:"f_create_time"})
-        //await this.checkplan.searchList(`${this.$androidUtil.getProxyUrl()}/rs/sql/预约计划下发`, {},{condition:"f_checker_id='"+"13116"+"' and f_safecheck_type='年度普检' and f_plan_year="+new Date().getFullYear(),groupitem:"",f_filialeids:"("+"305"+")",orderitem:"f_create_time"})
+        await this.checkplan.searchList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/预约计划下发`, {},{condition:"f_checker_id='"+Vue.user.id+"'",groupitem:"",f_filialeids:"("+Vue.user.orgid+")",orderitem:"f_create_time"})
         let resoult=this.checkplan.list.data
         for (let i = 0; i < resoult.length; i++) {
           this.planoption.push({label: resoult[i].f_plan_name,selected:false, value: resoult[i].id})
@@ -375,7 +343,7 @@
         }
         this.okput()
         this.changenull()
-        this.$refs.paged.$refs.cri.search()
+        this.selfSearch()
       },
       manyisok(){
         if(this.planoption.length==0){
@@ -392,28 +360,9 @@
           this.$showMessage("请选择计划")
           return false
         }
-        let http=new HttpResetClass()
-        http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/ExtractCheckPlanItem`, {data:{
-            columnName:"it.id",
-            condition:"1=1",
-            param:this.planparam,
-            f_plan_id:this.planid,
-            switchCheckAll:true,
-            checkAll:false,
-            f_operator:Vue.user.name
-          }
-        }, {resolveMsg: null, rejectMsg: null}).then((res)=>{
-          if(res.data.code){
-            this.changenull()
-            this.$showMessage("抽单成功，请去代办页面进行刷新！")
-            this.$refs.paged.$refs.cri.search()
-          }else{
-            this.$showMessage("抽单失败！")
-          }
-        }).catch((msg)=>{
-          this.$showMessage("抽单失败，网络异常，请重新操作！")
-        })
-
+        this.manyokput()
+        this.changenull()
+        this.selfSearch()
       },
 
       changenull(){
@@ -424,7 +373,7 @@
       },
       async okput(){
         let http=new HttpResetClass()
-        let res=await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/ExtractCheckPlanItem`, {data:{
+        let res=await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/ExtractCheckPlanItem`, {data:{
             condition:"it.id='"+this.needid+"'",
             f_plan_id:this.planid,
             switchCheckAll:false,
@@ -434,7 +383,17 @@
         }, {resolveMsg: null, rejectMsg: null})
       },
       async manyokput(){
-
+        let http=new HttpResetClass()
+        let res=await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/ExtractCheckPlanItem`, {data:{
+            columnName:"it.id",
+            condition:"1=1",
+            param:this.planparam,
+            f_plan_id:this.planid,
+            switchCheckAll:true,
+            checkAll:false,
+            f_operator:Vue.user.name
+          }
+        }, {resolveMsg: null, rejectMsg: null})
       },
       async plansearch(){
         console.log("8888888888888888888888")
@@ -443,7 +402,7 @@
         this.planoption=[]
         let condition="f_checker_id="+Vue.user.id+" and f_plan_name like '%"+this.plan+"%'"
         let http=new HttpResetClass()
-        let res=await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/预约计划下发`, {data:{
+        let res=await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/预约计划下发`, {data:{
             condition:condition,
             f_filialeids:"("+Vue.user.orgid+")",
             groupitem:'',
@@ -481,14 +440,17 @@
         this.model.rows = []
         this.model.search(args.condition, args.model)
       },
-      selfSearch (args) {
+      selfSearch () {
         //console.log("888888888888888")
-        //let condition = " and ti.f_plan_id='"+this.goid+"'"
-        console.log("args"+JSON.stringify(args))
-        args.condition +=" and i.f_state ='未检' and i.f_safecheck_type='年度普检' and f_plan_year="+new Date().getFullYear()
-        console.log('condition ===> '+ args.condition)
-        this.model.search(args.condition,args.model)
-        this.planparam=[]
+        let condition = " and ti.f_plan_id='"+this.goid+"'"
+       if(this.$refs.paged.$refs.cri.model.f_userinfo_code)
+          condition += " and ti.f_userinfo_code like '%"+this.$refs.paged.$refs.cri.model.f_userinfo_code+"%'"
+        if(this.$refs.paged.$refs.cri.model.f_keyword)
+          condition += " and ti.f_address like '%"+this.$refs.paged.$refs.cri.model.f_keyword+"%'"
+        if(this.$refs.paged.$refs.cri.model.f_user_name)
+          condition += " and ti.f_user_name like '%"+this.$refs.paged.$refs.cri.model.f_user_name+"%'"
+        console.log('condition ===> '+ condition)
+        this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检')) and ti.f_no_checkplan = '有计划安检'" + condition)
       },
       hidden() {
         this.criteriaShow = !this.criteriaShow