safecheck-client 3.0.33-gongyi → 3.0.34-2

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

@@ -1,5 +1,6 @@
 <template>
   <div class="flex-row">
+    <work-busy :is-busy="showbusy"></work-busy>
     <div class="basic-main">
       <criteria-paged :model="model" v-ref:paged @sort="sort">
         <criteria partial='criteria' class="search_area" @condition-changed='$parent.selfSearch' v-ref:criteria>
@@ -25,7 +26,7 @@
                 <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="false">
+              <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 '%{}%'">
@@ -37,7 +38,7 @@
                                    :choose-col="true"
                                    progress="safeGetExportProgress"
                                    sqlurl="rs/logic/SafeExportExcel" sql-name="查找安检单"
-                                   template-name='安检计划明细'></export-excel-safe>
+                                   template-name='安检结果明细'></export-excel-safe>
                 <!--                <button class="button_spacing button_search" @click="$parent.$parent.showaudio()" v-if="!$parent.$parent.audioshow">录音</button>-->
                 <button class="button_spacing button_search" @click="$parent.$parent.showaudio()"
                         v-if="$parent.$parent.audioshow">隐藏
@@ -48,7 +49,7 @@
                      :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" >
+              <div class="form-group col-sm-2" v-if="$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"
@@ -79,20 +80,15 @@
                   condition="f_offsite_time <=  '{} 23:59:59'">
                 </datepicker>
               </div>
-
-
-              <div class="form-group col-sm-2" v-if="$parent.$parent.criteriaShow">
-
-                <label class="font_normal_body">安检类型</label>
-                <v-select :value.sync="model.f_safecheck_type" v-model='model.f_safecheck_type'
-                          :value-single="true" style="width: 60%"
-                          class="select_list select"
-                          :options='$parent.$parent.safetype' placeholder='安检类型'
-                          close-on-select
-                          condition="f_safecheck_type = '{}'"></v-select>
-              </div>
-
-
+              <!--              <div class="form-group col-sm-2" v-if="$parent.$parent.criteriaShow" v-show="false">-->
+              <!--                <label class="font_normal_body" >安检类型</label>-->
+              <!--                <v-select :value.sync="model.f_safecheck_type" v-model='model.f_safecheck_type'-->
+              <!--                          :value-single="true" style="width: 60%"-->
+              <!--                          class="select_list select"-->
+              <!--                          :options='$parent.$parent.safetype' placeholder='安检类型'-->
+              <!--                          close-on-select-->
+              <!--                          condition="f_safecheck_type = '{}'"></v-select>-->
+              <!--              </div>-->
               <div class="form-group col-sm-2" v-if="$parent.$parent.criteriaShow">
                 <label class="font_normal_body">安检状态</label>
                 <v-select id="f_entry"
@@ -106,7 +102,6 @@
                           close-on-select clear-button></v-select>
               </div>
 
-
               <!--            <div class="form-group col-sm-2"   v-if="$parent.$parent.criteriaShow">-->
               <!--              <label class="font_normal_body">安&ensp;检&ensp;员</label>-->
               <!--              <v-select :value.sync="model.f_checker_id" v-model='model.f_checker_id'-->
@@ -121,16 +116,16 @@
               <!--              <right-tree @re-res="$parent.$parent.getRes" :initresid="$parent.$parent.$login.f.orgid">-->
               <!--              </right-tree>-->
               <!--            </div>-->
-                <div class="form-group col-sm-2" v-if="$parent.$parent.criteriaShow">
+              <div class="form-group col-sm-2" v-if="$parent.$parent.criteriaShow">
 
-                  <label class="font_normal_body">用户状态</label>
-                  <v-select :value.sync="model.f_user_state" v-model='model.f_user_state'
-                            :value-single="true" style="width: 60%"
-                            class="select_list select"
-                            :options='$parent.$parent.user_states' placeholder='用户状态'
-                            close-on-select
-                            condition="f_user_state = '{}'"></v-select>
-                </div>
+                <label class="font_normal_body">用户状态</label>
+                <v-select :value.sync="model.f_user_state" v-model='model.f_user_state'
+                          :value-single="true" style="width: 60%"
+                          class="select_list select"
+                          :options='$parent.$parent.user_states' placeholder='用户状态'
+                          close-on-select
+                          condition="f_user_state = '{}'"></v-select>
+              </div>
               <div class="form-group col-sm-2" v-if="$parent.$parent.criteriaShow">
 
                 <label class="font_normal_body">录音照片状态</label>
@@ -176,7 +171,7 @@
                           :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" v-show="$parent.$parent.criteriaShow">
                 <label class="font_normal_body">是否作废</label>
                 <v-select class="select_list select"
                           placeholder='是否作废' style="width: 60%"
@@ -187,7 +182,7 @@
                           :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" v-show="$parent.$parent.criteriaShow">
                 <label class="font_normal_body">维修结果</label>
                 <v-select class="select_list select"
                           placeholder='维修结果' style="width: 60%"
@@ -195,11 +190,11 @@
                           :options='$parent.$parent.repaireds'
                           filer-key="name"
                           close-on-select clear-button
-                          condition="repaired='{}'"
+                          condition="f_repaired = '{}'"
                           :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" v-show="$parent.$parent.criteriaShow">
                 <label class="font_normal_body">安检结果</label>
                 <v-select class="select_list select"
                           placeholder='安检结果' style="width: 60%"
@@ -207,10 +202,80 @@
                           :options='$parent.$parent.checkresults'
                           filer-key="name"
                           close-on-select clear-button
-                          condition="{}"
+                          condition="f_defect_content like'%{}%'"
                           :value-single="true">
                 </v-select>
               </div>
+              <div class="form-group col-sm-2" v-if="$parent.$parent.criteriaShow">
+
+                <label class="font_normal_body">安检类型</label>
+                <v-select :value.sync="model.f_safecheck_type" v-model='model.f_safecheck_type'
+                          :value-single="true" style="width: 60%"
+                          class="select_list select"
+                          :options='$parent.$parent.safecheck_type' placeholder='安检类型'
+                          close-on-select
+                          condition="f_safecheck_type = '{}'"></v-select>
+              </div>
+              <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">是否有改动</label>
+                <v-select class="select_list select"
+                          placeholder='安检结果' style="width: 60%"
+                          :value.sync="model.f_gaodong_flag" v-model="model.f_gaodong_flag"
+                          :options='$parent.$parent.isdels'
+                          filer-key="name"
+                          close-on-select clear-button
+                          condition="f_gaodong_flag = '{}'"
+                          :value-single="true">
+                </v-select>
+              </div>
+              <div class="form-group col-sm-2" v-if="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">气表状态</label>
+                <v-select :value.sync="model.f_table_state" v-model='model.f_table_state'
+                          :value-single="true" style="width: 60%"
+                          class="select_list select"
+                          :options='$parent.$parent.table_state' placeholder='气表状态'
+                          close-on-select
+                          condition="f_table_state = '{}'"></v-select>
+              </div>
+              <div class="form-group col-sm-2" v-if="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">审核状态</label>
+                <v-select :value.sync="model.f_approved" v-model='model.f_approved'
+                          :value-single="true" style="width: 60%"
+                          class="select_list select"
+                          :options='$parent.$parent.review_status' placeholder='审核状态'
+                          close-on-select
+                          condition="f_approved= '{}'"></v-select>
+              </div>
+              <div class="form-group col-sm-2" v-if="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">审核开始</label>
+                <datepicker
+                  class="select_list select"
+                  :value.sync="model.f_checksh_start"
+                  placeholder='审核开始时间' style="width: 60%"
+                  :disabled-days-of-week="[]"
+                  :format="'yyyy-MM-dd'"
+                  :show-rest-button="reset"
+                  v-model="model.f_checksh_start"
+                  condition="f_approved_time > ='{} 00:00:00'">
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-2" v-if="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">审核结束</label>
+                <datepicker
+                  :value.sync="model.f_checksh_end"
+                  placeholder='审核结束时间' style="width: 60%"
+                  :disabled-days-of-week="[]"
+                  :format="'yyyy-MM-dd'"
+                  :show-rest-button="reset"
+                  v-model="model.f_checksh_end"
+                  condition="f_approved_time <=  '{} 23:59:59'">
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-2" v-if="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">审&ensp;核&ensp;人</label>
+                <input type="text" class="input_search" v-model="model.f_approved_by"
+                       style="width: 60%" placeholder="审核人" condition="f_approved_by like '%{}%'">
+              </div>
             </div>
             <modal :show.sync="$parent.$parent.showModal" v-ref:modal>
               <div slot="modal-header" class="modal-header">
@@ -258,6 +323,15 @@
               <th>
                 <nobr>气量差值</nobr>
               </th>
+              <th>
+                <nobr>剩余气量</nobr>
+              </th>
+              <th>
+                <nobr>波纹管数量</nobr>
+              </th>
+              <th>
+                <nobr>自闭阀数量</nobr>
+              </th>
               <th>
                 <nobr>合同日期</nobr>
               </th>
@@ -277,23 +351,29 @@
                 <nobr>表封号</nobr>
               </th>
               <th>
-                <nobr>安检结果</nobr>
+                <nobr>气表状态</nobr>
               </th>
               <th>
-                <nobr>隐患详情</nobr>
+                <nobr>安检类型</nobr>
               </th>
               <th>
-                <nobr>维修状态</nobr>
-              </th>
-              <th>
-                <nobr>维修人</nobr>
-              </th>
-              <th>
-                <nobr>维修时间</nobr>
+                <nobr>安检结果</nobr>
               </th>
               <th>
-                <nobr>维修描述</nobr>
+                <nobr>隐患详情</nobr>
               </th>
+              <!--              <th>-->
+              <!--                <nobr>维修状态</nobr>-->
+              <!--              </th>-->
+              <!--              <th>-->
+              <!--                <nobr>维修人</nobr>-->
+              <!--              </th>-->
+              <!--              <th>-->
+              <!--                <nobr>维修时间</nobr>-->
+              <!--              </th>-->
+              <!--              <th>-->
+              <!--                <nobr>维修描述</nobr>-->
+              <!--              </th>-->
 
               <th>
                 <nobr>备注</nobr>
@@ -316,6 +396,15 @@
               <th>
                 <nobr>安检员</nobr>
               </th>
+              <th>
+                <nobr>审核状态</nobr>
+              </th>
+              <th>
+                <nobr>审核人</nobr>
+              </th>
+              <th>
+                <nobr>审核时间</nobr>
+              </th>
               <th>
                 <nobr>操作</nobr>
               </th>
@@ -333,31 +422,46 @@
             <td style="text-align: center;white-space: nowrap">{{ row.f_residential_area }}</td>
             <td style="text-align: center;white-space: nowrap">{{ row.f_address }}</td>
             <td style="text-align: center;white-space: nowrap">{{ row.f_mapanshu }}</td>
-            <td style="text-align: center;white-space: nowrap" @dblclick.stop="$parent.$parent.$parent.tochangeRemark(row)">{{ row.f_chazhi }}</td>
-            <td style="text-align: center;white-space: nowrap">{{ row.f_htt_date }}</td>
+            <td style="text-align: center;white-space: nowrap"
+                @dblclick.stop="$parent.$parent.$parent.tochangeRemark(row)">{{ row.f_chazhi }}
+            </td>
+            <td style="text-align: center;white-space: nowrap">{{ row.f_shengyu_gas }}</td>
+            <td style="text-align: center;white-space: nowrap">{{ row.f_bowenguan }}</td>
+            <td style="text-align: center;white-space: nowrap">{{ row.f_zibifa }}</td>
+            <td style="text-align: center;white-space: nowrap">{{ row.f_contractdate }}</td>
             <td style="text-align: center;white-space: nowrap">{{ row.f_meternumber }}</td>
-            <td style="text-align: center;white-space: nowrap">{{ row.f_gaswatchbrand }}</td>
+            <td style="text-align: center;white-space: nowrap">{{ row.f_meter_classify }}</td>
             <td style="text-align: center;white-space: nowrap">{{ row.f_position }}</td>
             <td style="text-align: center;white-space: nowrap">{{ row.f_aroundmeter }}</td>
             <td style="text-align: center;white-space: nowrap">{{ row.f_metertitles }}</td>
-            <td style="text-align: center;white-space: nowrap">{{ row.defect_content=='无隐患'?'正常':'有隐患' }}</td>
-            <td style="text-align: center;white-space: nowrap">{{ row.defect_content}}</td>
-            <td style="text-align: center;white-space: nowrap">{{ row.repaired}}</td>
-            <td style="text-align: center;white-space: nowrap">{{ row.f_repairman}}</td>
-            <td style="text-align: center;white-space: nowrap">{{ row.f_repair_date}}</td>
-            <td style="text-align: center;white-space: nowrap">{{ row.f_ratification_des}}</td>
-            <td style="text-align: center;white-space: nowrap"  >{{ row.f_repair_approved_note }}</td>
+            <td style="text-align: center;white-space: nowrap">{{ row.f_table_state }}</td>
+            <td style="text-align: center;white-space: nowrap">{{ row.f_safecheck_type }}</td>
+            <td style="text-align: center;white-space: nowrap">{{ row.defect_content == '无隐患' ? '正常' : '有隐患' }}</td>
+            <td style="text-align: center;white-space: nowrap">{{ row.defect_content }}</td>
+            <!--            <td style="text-align: center;white-space: nowrap">{{ row.repaired}}</td>-->
+            <!--            <td style="text-align: center;white-space: nowrap">{{ row.f_repairman}}</td>-->
+            <!--            <td style="text-align: center;white-space: nowrap">{{ row.f_repair_date}}</td>-->
+            <!--            <td style="text-align: center;white-space: nowrap">{{ row.f_ratification_des}}</td>-->
+            <td style="text-align: center;white-space: nowrap">{{ row.f_repair_approved_note }}</td>
             <td style="text-align: center;white-space: nowrap">{{ row.f_entry_status }}</td>
             <td style="text-align: center;white-space: nowrap">{{ row.f_plan_name }}</td>
             <!--整改通知书别名-->
             <td style="text-align: center;white-space: nowrap">{{ row.f_rectification_notice }}</td>
-            <td style="text-align: center;white-space: nowrap" v-if="row.f_entry_status=='到访不遇'">{{ row.f_downloadpath }}</td>
+            <td style="text-align: center;white-space: nowrap"
+                v-if="row.f_entry_status=='到访不遇'|| row.f_entry_status=='拒检'">{{ row.f_downloadpath }}
+            </td>
             <td style="text-align: center;white-space: nowrap" v-else></td>
             <td style="text-align: center;white-space: nowrap">{{ row.f_offsite_time }}</td>
             <td style="text-align: center;white-space: nowrap">{{ row.f_checker_name }}</td>
+            <td style="text-align: center;white-space: nowrap">{{ row.f_approved }}</td>
+            <td style="text-align: center;white-space: nowrap">{{ row.f_approved_by }}</td>
+            <td style="text-align: center;white-space: nowrap">{{ row.f_approved_time }}</td>
             <td style="text-align: center;white-space: nowrap">
               <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.change(row)'>查看</button>
-              <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.del(row)' v-show="$parent.$parent.$parent.isdel=='否'">作废</button>
+              <!--              <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.del(row)' v-show="$parent.$parent.$parent.isdel=='否'">作废</button>-->
+              <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.pass(row)'
+                      v-show ="row.f_approved == '未审核'">通过
+              </button>
               <button type="button" class="button_new-1 button_spacing" data-toggle="dropdown"
                       @click="$parent.$parent.$parent.print(row)">
                 打印
@@ -377,7 +481,7 @@
     <modal :show.sync="showModal2" :backdrop="false">
       <div slot="modal-header" class="modal-header">
         <h4 class="modal-title">
-          用户{{this.paperrow.f_user_name}}备注修改
+          用户{{ this.paperrow.f_user_name }}备注修改
         </h4>
       </div>
       <div slot="modal-body" class="modal-body">
@@ -426,7 +530,7 @@ let select = function* (self) {
     source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
     userid: self.$login.f.id
   }, {resolveMsg: null, rejectMsg: null})
-  //console.log('获取安检员', getGasman)
+  ////tag
   self.checkersid.push({label: '全部', value: ''})
   getGasman.data.forEach((checker) => {
     self.checkersid.push({label: checker.name, value: checker.id})
@@ -452,6 +556,7 @@ export default {
     model.f_filialeid = `('${this.$login.f.orgid}')`
     model.f_defect_content="CASE WHEN CHARINDEX( '\"result\":\"正常\"', f_defect_content ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( f_defect_content, len( f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END"
     return {
+      showbusy:false,
       audioshow: false,
       paperRemark:'',
       searchData: {
@@ -476,24 +581,31 @@ export default {
         'f_address': '地址',
         'f_mapanshu': '码盘数',
         'f_chazhi': '气量差值',
-        'f_htt_date': '合同日期',
+        'f_shengyu_gas':'剩余气量',
+        'f_bowenguan':'波纹管数量',
+        'f_zibifa':'自闭阀数量',
+        'f_contractdate': '合同日期',
+        'f_table_state': '气表状态',
         'f_meternumber': '表号',
-        'f_gaswatchbrand': '表品牌',
+        'f_meter_classify': '表品牌',
         'f_position': '表位置',
         'f_aroundmeter': '左右表',
         'f_metertitles': '表封号',
         'defect_content': '安检结果',
-        'repaired': '维修状态',
-        'f_repairman': '维修人',
-        'f_repair_date': '维修时间',
-        'f_ratification_des': '维修描述',
+        // 'repaired': '维修状态',
+        // 'f_repairman': '维修人',
+        // 'f_repair_date': '维修时间',
+        // 'f_ratification_des': '维修描述',
         'f_repair_approved_note': '备注',
-        'f_plan_name':'安检计划',
+        'f_plan_name':'计划名称',
         'f_rectification_notice':'整改通知书',
         'f_downloadpath':'录音/照片',
         'f_entry_status': '安检状态',
         'f_offsite_time': '安检时间',
-        'f_checker_name': '安检员'
+        'f_checker_name': '安检员',
+         'f_approved' : '审核状态',
+        'f_approved_by' : '审核人',
+        'f_approved_time':'审核时间'
       },
       fun: this.$login.f,
       showModal2:false,
@@ -504,9 +616,11 @@ export default {
       downloadpaths: [{label: '全部', value: ''},{label: '已上传', value: '已上传'},{label: '未上传', value: '未上传'}],
       criteriaShow: false,
       showModal: false,
+      table_state: [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')],
       f_approval_states: this.$appdata.getParam('安检单审核状态'),
       f_entry_status: [{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')],
       user_states:[{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')],
+      safecheck_type:[{label: '全部', value: ''}, ...this.$appdata.getParam('安检类型')],
       f_checkplans: this.$appdata.getParam('有无计划'),
       showcheckmsg: false,
       checkInfo: {},
@@ -515,16 +629,17 @@ export default {
         f_offsite_time: 'no'
       },
       sliceArea: [],
-      isdels: [{label: '是', value: '是'},{label: '否', value: '否'}],
+      review_status:[{label: '全部', value: ''},{label: '待审核', value: '未审核'},{label: '正常', value: '通过'}],
+      isdels: [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
       repaireds: [{label: '全部', value: ''},{label: '已修', value: '已修'},{label: '未修', value: '未修'}],
-      checkresults: [{label: '全部', value: ''},{label: '正常', value: `repaired=''`},{label: '有隐患', value: "repaired!=''"}],
+      checkresults: [{label: '全部', value: ''},{label: '正常', value: '正常'},{label: '有隐患', value: '有隐患'}],
       isdel: '否',
       cbc: []
     }
   },
   methods: {
     tochangeRemark(row){
-      console.log("88888")
+      //tag
       this.paperRemark=row.f_chazhi
       this.paperrow=row
       this.showModal2=true
@@ -532,7 +647,7 @@ export default {
     },
     okshow(){
       let sql=`update t_check_paper set f_chazhi='${this.paperRemark}' where id='${this.paperrow.id}'`
-      console.log(sql)
+      //tag
       new  HttpResetClass().load('post','rs/logic/runSQL',{data:{sql:sql}},{resolveMsg:'修改成功',rejectMsg:'修改失败'}).then(res=>{
         // this.$showMessage("修改成功")
         let e = document.createEvent("MouseEvents");
@@ -545,12 +660,45 @@ export default {
     cancelshow(){
       this.showModal2=false
     },
+    pass(row) {
+      //判断当前登录人是否有审核权限
+      if(this.$appdata.getSingleValue('开启安检审核权限')=='是'){
+        if(!this.$login.r.includes('安检结果审核')){
+          //提示无审核权限
+          this.$showMessage('您无审核权限')
+          return
+        }
+      }
+      var reqdata = {
+        audit_result: '通过',
+        operator: "success",
+        audit_time: Util.getNowDate(),
+        user_name: this.$login.f.name,
+        id: row.id,
+        f_check_item_id: row.f_check_item_id
+      }
+      this.$showMessage('确认通过当前安检单吗？', ['confirm', 'cancel']).then((res) => {
+        if (res === 'confirm') {
+          this.$resetpost('/rs/logic/updateAafeAudit', {data: reqdata}).then((res) => {
+            //tag
+            if (res.data.code == 200) {
+              this.$showMessage('通过成功')
+              this.search()
+            } else {
+              this.$showMessage('通过失败！')
+            }
+          }).catch((e) => {
+            this.$showMessage(JSON.stringify(e) + '通过失败！')
+          })
+        }
+      })
+    },
     del(row) {
-      console.log('作废',row)
+      //tag
       this.$showMessage('确认作废当前安检单吗？', ['confirm', 'cancel']).then((res) => {
         if (res === 'confirm') {
           this.$resetpost('rs/logic/DelCheckPaper', {id:row.id}).then((res) => {
-            console.log('作废返回',res)
+            //tag
             if(res.data.code == 200){
               this.$showMessage('作废成功')
               this.search()
@@ -564,9 +712,9 @@ export default {
       })
     },
     showaudio() {
-      console.log("999999999")
+      //tag
       this.audioshow = !this.audioshow
-      console.log(this.audioshow)
+      //tag
     },
     getmeterbook(val) {
       this.cbc = []
@@ -594,8 +742,8 @@ export default {
       }
     },
     Mreadibook(val) {
-      //console.log("999999999")
-      //console.log(val)
+      ////tag
+      ////tag
       this.sliceArea = []
       if (val) {
         new HttpResetClass().load('POST', `/rs/sql/tel_singleTable_OrderBy`, {
@@ -621,8 +769,8 @@ export default {
       }
     },
     getAllMeterBook(val) {
-      //console.log("999999999")
-      //console.log(val)
+      ////tag
+      ////tag
       this.cbcs = []
       if (val) {
         new HttpResetClass().load('POST', `/rs/sql/tel_singleTable_OrderBy`, {
@@ -665,9 +813,14 @@ export default {
     change(row) {
       // Vue.$login = {jwt: row.f_checker_id}
       asyncReady(this).then(() => {
-        //console.log("开始进入单子"+JSON.stringify(Vue.config))
+        ////tag)
         row.f_upload_state = '已传'
-        this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view',isdel: this.isdel}, 'self')
+        this.$goto('new-check-paper', {
+          f_plan_id: row.f_check_plan_id,
+          item: row,
+          role: 'view',
+          isdel: this.isdel
+        }, 'self')
       }).catch(
         (respanse) => {
           alert('获取配置文件失败')
@@ -702,73 +855,6 @@ export default {
       this.showcheckmsg = true
       this.checkInfo = row
     },
-    remind() {
-      this.$resetpost('rs/sql/getRemind', {data: {condition: ` 1 = 1 and f_filialeid = '${this.$login.f.orgid}'`}}, {
-        resolveMsg: null,
-        rejectMsg: null
-      }).then((res) => {
-
-        if (res.data.length > 0) {
-          let a = 0
-          let b = 0
-          let c = 0
-
-          for (let row of res.data) {
-            let bb = JSON.parse(row.f_last_check_result)
-            if (!bb.result) {
-              bb.result = ''
-            }
-            row.danger = bb
-            if (row.f_last_check_result.indexOf('A')) {
-              a = a + 1
-              //console.log('包含A')
-              if (row.nocheckday > 5 && row.nocheckday <= 7) {
-                b = b + 1
-                row.color = 'yellow'
-              } else if (row.nocheckday > 7) {
-                c = c + 1
-                row.color = 'red'
-              }
-              continue
-            }
-            if (row.f_last_check_result.indexOf('B')) {
-              a = a + 1
-              //console.log('包含B')
-              if (row.nocheckday > 12 && row.nocheckday <= 14) {
-                b = b + 1
-                row.color = 'yellow'
-              } else if (row.nocheckday > 14) {
-                c = c + 1
-                row.color = 'red'
-              }
-              continue
-            }
-            if (row.f_last_check_result.indexOf('C')) {
-              a = a + 1
-              //console.log('包含C')
-              if (row.nocheckday > 28 && row.nocheckday <= 30) {
-                b = b + 1
-                row.color = 'yellow'
-              } else if (row.nocheckday > 30) {
-                c = c + 1
-                row.color = 'red'
-              }
-              continue
-            }
-          }
-          this.$showMessage('目前有' + res.data.length + '户存在隐患需要及时安检，其中' + b + '户需要在两天内安检，'
-            + c + '户已超时，未在规定时间内安检，是否立刻前往计划生成页面生成计划？', ['confirm', 'cancel']).then((res1) => {
-            if (res1 === 'confirm') {
-              //console.log('查询到的数据', res)
-              this.$goto('create-plan', {rowsdata: res.data}, 'self', null)
-            }
-          })
-
-        }
-
-
-      })
-    },
     sort(field, rule) {
       // 将所有排序方式设为不排序，实现相互排斥
       for (let key in this.orderFields) {
@@ -790,29 +876,32 @@ export default {
       this.$refs.paged.$refs.criteria.search()
     },
     selfSearch(args) {
-      //console.log("9999999999999999")
+      ////tag
       //args.condition+=" and f_check_type='民用'"
-      console.log('是否作废2222',this.$refs.paged.$refs.criteria.model.f_is_delete)
-      // console.log('this.model',this.model)
+      //tag
+      // //tag
       if (this.$refs.paged.$refs.criteria.model.f_is_delete == '是') {
-        console.log('作废')
+        //tag
         this.isdel = '是'
         this.model.url = 'rs/sql/QueryDelCheckPaper'
 
-      }else {
-        console.log('不作废')
+      } else {
+        //tag
         this.isdel = '否'
         this.model.url = 'rs/sql/查找安检单'
       }
+      // if (args.condition.indexOf('f_table_state') == -1){
+      //   args.condition += " and f_table_state = '正常'"
+      // }
       this.model.search(args.condition, args.model, args.condValue)
     }
   },
 
   ready() {
-    //console.log('这里是PaperList', this.$login.f)
+    ////tag
     this.function = this.f
-    //console.log(this.f)
-    //this.remind()
+    ////tag
+
     let gen = select(this)
     //this.pianqu()
     this.Mreadibook(`('${this.$login.f.orgid}')`)