safecheck-client 3.0.34-gongyi → 3.0.35-2

package/src/filiale/tongchuan/pc/PaperDefectMain.vue

@@ -5,122 +5,191 @@
         <criteria partial='criteria' class="search_area" @condition-changed='$parent.selfSearch' v-ref:criteria>
           <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
             <div class="row">
-              <div class="form-group col-sm-2"  >
+              <div class="form-group col-sm-2">
                 <label class="font_normal_body">客户编号</label>
                 <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"  >
+              <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 '%{}%'">
+                <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"  >
+              <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 '%{}%'">
+                <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"  >
+              <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"  >
+              <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 '%{}%'">
+                <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-safe :data="$parent.$parent.searchData"
-                              :field="$parent.$parent.excelHeaders"
-                              progress="safeGetExportProgress"
-                              sqlurl="rs/logic/SafeExportExcel" sql-name="defectDetails" 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">隐藏</button>
+                                   :field="$parent.$parent.excelHeaders" progress="safeGetExportProgress"
+                                   sqlurl="rs/logic/SafeExportExcel" sql-name="defectDetails" template-name='安检隐患明细'
+                                   :choose-col="true"></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">隐藏</button>
+                <button class="button_search" @click="$parent.$parent.toRepair"
+                        v-if="$parent.$parent.canToRepair == '是'">转维修</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}"
+                     :class="{ 'button_shrink_top': $parent.$parent.criteriaShow, 'button_shrink_bottom': !$parent.$parent.criteriaShow }"
                      @click="$parent.$parent.hidden()"></div>
               </div>
 
             </div>
             <div class="row">
-            <div class="col-sm-4 form-group" v-show="$parent.$parent.criteriaShow" style="margin: 0">
-              <role-selector-safe
-                role-name="安检员"
-                role-lable="安&nbsp;检&nbsp;员&nbsp;"
-                @re-res="$parent.$parent.getRes"
-                :value.sync="model.f_checker_id"
-                v-model="model.f_checker_id"
-                condition="f_checker_name = '{}'">
-              </role-selector-safe>
-            </div>
-              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow">
+              <div class="col-sm-4 form-group" v-show="$parent.$parent.criteriaShow" style="margin: 0">
+                <role-selector-safe role-name="安检员" role-lable="安&nbsp;检&nbsp;员&nbsp;"
+                                    @re-res="$parent.$parent.getRes" :value.sync="model.f_checker_id"
+                                    v-model="model.f_checker_id" condition="f_checker_name in {}"
+                                    :value-multiple="true">
+                </role-selector-safe>
+              </div>
+              <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
                 <label class="font_normal_body">检&ensp;查&ensp;项</label>
                 <v-select :value.sync="model.f_device_type" v-model='model.f_device_type'
-                          :value-single="true" style="width: 60%"
-                          class="select_list select"
-                          :options='$parent.$parent.device_types' placeholder='检查项'
-                          close-on-select
+                          :value-single="true" style="width: 60%" class="select_list select"
+                          :options='$parent.$parent.device_types' placeholder='检查项' close-on-select
                           @change="$parent.$parent.changeDefect"
                           condition="f_device_type like '%{}%'"></v-select>
                 <!--<input type="text" class="input_search" v-model="model.f_device_type"-->
                 <!--style="width: 60%" placeholder="检&ensp;查&ensp;项" condition="f_device_type like '%{}%'">-->
               </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 :value.sync="model.f_item_name" v-model='model.f_item_name'
-                          :value-single="true" style="width: 60%"
-                          class="select_list select"
-                          :options='$parent.$parent.DefectConfigs' placeholder='隐患名称'
-                          close-on-select
+                          :value-single="true" style="width: 60%" class="select_list select"
+                          :options='$parent.$parent.DefectConfigs' placeholder='隐患名称' close-on-select
                           condition="f_item_name like '%{}%'"></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>
-                <datepicker
-                  class="select_list select"
-                  :value.sync="model.f_check_start"
-                  placeholder='安检起始时间' style="width: 60%"
-                  :disabled-days-of-week="[]"
-                  :format="'yyyy-MM-dd'"
-                  :show-rest-button="reset"
-                  v-model="model.f_check_start"
-                  condition="f_offsite_time >='{} 00:00:00'">
+                <datepicker :value.sync="model.f_check_start" placeholder='安检起始时间' style="width: 60%"
+                            :disabled-days-of-week="[]" :format="'yyyy-MM-dd'" :show-rest-button="reset"
+                            v-model="model.f_check_start" 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" v-show="$parent.$parent.criteriaShow">
                 <label class="font_normal_body">安检结束</label>
-                <datepicker
-                  class="select_list select"
-                  :value.sync="model.f_check_end"
-                  placeholder='安检结束时间' style="width: 60%"
-                  :disabled-days-of-week="[]"
-                  :format="'yyyy-MM-dd'"
-                  :show-rest-button="reset"
-                  v-model="model.f_check_end"
-                  condition="f_offsite_time <='{} 23:59:59'">
+                <datepicker :value.sync="model.f_check_end" placeholder='安检结束时间' style="width: 60%"
+                            :disabled-days-of-week="[]" :format="'yyyy-MM-dd'" :show-rest-button="reset"
+                            v-model="model.f_check_end" condition="f_offsite_time <='{} 23:59:59'">
                 </datepicker>
               </div>
 
             </div>
             <div class="row">
-              <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%"
+                <v-select class="select_list select" placeholder='维修结果' style="width: 60%"
                           :value.sync="model.f_repaired" v-model="model.f_repaired"
-                          :options='$parent.$parent.repaireds'
-                          filer-key="name"
-                          close-on-select clear-button
-                          condition="f_repaired='{}'"
-                          :value-single="true">
+                          :options='$parent.$parent.repaireds' filer-key="name" close-on-select clear-button
+                          condition="f_repaired='{}'" :value-single="true">
                 </v-select>
                 <!--<input type="text" class="input_search" v-model="model.f_device_type"-->
                 <!--style="width: 60%" placeholder="检&ensp;查&ensp;项" condition="f_device_type like '%{}%'">-->
               </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_check_type" v-model="model.f_check_type"
+                          :options='$parent.$parent.checktype' filer-key="name" close-on-select clear-button
+                          condition="f_check_type='{}'" :value-single="true">
+                </v-select>
+              </div>
+              <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">片&emsp;&emsp;区</label>
+                <v-select class="select_list select" placeholder='片区' style="width: 60%"
+                          :value.sync="model.f_slice_area" v-model="model.f_slice_area"
+                          :options='$parent.$parent.sliceArea' filer-key="name" close-on-select clear-button
+                          condition="f_slice_area='{}'" :value-single="true">
+                </v-select>
+              </div>
+
+              <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">区&emsp;&emsp;域</label>
+                <v-select class="select_list select" placeholder='请选择' style="width: 60%"
+                          :value.sync="model.f_pcd" v-model="model.f_pcd" :options='$parent.$parent.pcds'
+                          filer-key="name" clear-button condition="f_pcd in {}" :multiple="true">
+                </v-select>
+              </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_repairman" style="width: 60%"
+                       placeholder="处理人" condition="f_repairman like '%{}%'">
+              </div>
+              <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">处理起始</label>
+                <datepicker :value.sync="model.f_repair_start" placeholder='处理起始时间' style="width: 60%"
+                            :disabled-days-of-week="[]" :format="'yyyy-MM-dd'" :show-rest-button="reset"
+                            v-model="model.f_repair_start" condition="f_repair_date >='{} 00:00:00'">
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">处理结束</label>
+                <datepicker :value.sync="model.f_repair_end" placeholder='处理结束时间' style="width: 60%"
+                            :disabled-days-of-week="[]" :format="'yyyy-MM-dd'" :show-rest-button="reset"
+                            v-model="model.f_repair_end" condition="f_repair_date <='{} 23:59:59'">
+                </datepicker>
+              </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_repair_result" v-model="model.f_repair_result"
+                          :options='$parent.$parent.repairresults' filer-key="name" close-on-select
+                          clear-button :value-single="true">
+                </v-select>
+              </div>
+              <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">逾期起始</label>
+                <datepicker :value.sync="model.f_handle_start" placeholder='逾期起始时间' style="width: 60%"
+                            :disabled-days-of-week="[]" :format="'yyyy-MM-dd'" :show-rest-button="reset"
+                            v-model="model.f_handle_start" condition="f_handle_date >='{} 00:00:00'">
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">逾期结束</label>
+                <datepicker :value.sync="model.f_handle_end" placeholder='逾期结束时间' style="width: 60%"
+                            :disabled-days-of-week="[]" :format="'yyyy-MM-dd'" :show-rest-button="reset"
+                            v-model="model.f_handle_end" condition="f_handle_date <='{} 23:59:59'">
+                </datepicker>
+              </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_is_handle" v-model="model.f_is_handle"
+                          :options='$parent.$parent.ishandles' filer-key="name" close-on-select clear-button
+                          condition="f_is_handle='{}'" :value-single="true">
+                </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_is_repaired" v-model="model.f_is_repaired"
+                          :options='$parent.$parent.is_repaired' filer-key="name" close-on-select clear-button
+                          condition="f_is_repaired='{}'" :value-single="true">
+                </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.is_repaired" v-model="model.is_repaired"
+                          :options='$parent.$parent.is_repaireds' filer-key="name" close-on-select
+                          clear-button condition="is_repaired='{}'" :value-single="true">
+                </v-select>
+              </div>
             </div>
             <modal :show.sync="$parent.$parent.showModal" v-ref:modal>
               <div slot="modal-header" class="modal-header">
@@ -141,12 +210,18 @@
         <data-grid class="list_area table_sy" style="overflow: hidden" :model="model" partial='list' v-ref:grid>
           <template partial='head'>
             <tr>
+              <th v-if="$parent.$parent.$parent.canToRepair == '是'">
+                <nobr>选择</nobr>
+              </th>
               <th>
                 <nobr>检查项</nobr>
               </th>
               <th>
                 <nobr>隐患原因</nobr>
               </th>
+              <th>
+                <nobr>隐患别名</nobr>
+              </th>
               <th>
                 <nobr>隐患级别</nobr>
               </th>
@@ -169,11 +244,17 @@
               <th>
                 <data-order field="f_offsite_time" name="安检时间"></data-order>
               </th>
+              <th>
+                <nobr>逾期时间</nobr>
+              </th>
+              <th>
+                <nobr>逾期状态</nobr>
+              </th>
               <th>
                 <nobr>安检员</nobr>
               </th>
               <th>
-                <nobr>隐患状态</nobr>
+                <nobr>处理方式</nobr>
               </th>
               <th>
                 <nobr>处理人</nobr>
@@ -181,44 +262,196 @@
               <th>
                 <nobr>处理时间</nobr>
               </th>
-
+              <th>
+                <nobr>处理结果</nobr>
+              </th>
+              <th>
+                <nobr>操作</nobr>
+              </th>
             </tr>
           </template>
           <template partial='body'>
-            <td style="text-align: center">{{row.f_device_type}}</td>
-            <td style="text-align: center">{{row.f_item_name}}/{{row.f_item_value}}</td>
-            <td style="text-align: center">{{row.f_defect_level}}</td>
-            <td style="text-align: center">{{row.f_userinfo_code}}</td>
-            <td style="text-align: center">{{row.f_user_name}}</td>
-            <td style="text-align: center">{{row.f_user_phone}}</td>
-            <td style="text-align: center">{{row.f_residential_area}}</td>
-            <td style="text-align: center">{{row.f_address}}</td>
-            <td style="text-align: center">{{row.f_offsite_time}}</td>
-            <td style="text-align: center">{{row.f_checker_name}}</td>
-            <td style="text-align: center">{{row.f_is_repaired}}</td>
-            <td style="text-align: center">{{row.f_repairman}}</td>
-            <td style="text-align: center">{{row.f_repair_date}}</td>
-
+            <td v-if="$parent.$parent.$parent.canToRepair == '是'"
+                style="text-align: center;white-space:nowrap;"><input type="checkbox"
+                                                                      v-if="['现场已处理', '维修已处理', '无隐患', '转维修'].indexOf(row.f_is_repaired) == -1"
+                                                                      @click="$event.cancelBubble = true" :checked="$parent.$parent.$parent.isChecked(row)"
+                                                                      @change="$parent.$parent.$parent.setCheckes(row)"></input></td>
+            <td style="text-align: center">{{ row.f_device_type }}</td>
+            <td style="text-align: center">{{ row.f_item_name }}/{{ row.f_item_value }}</td>
+            <td style="text-align: center">{{ row.f_alias_name }}</td>
+            <td style="text-align: center">{{ row.f_defect_level }}</td>
+            <td style="text-align: center">{{ row.f_userinfo_code }}</td>
+            <td style="text-align: center">{{ row.f_user_name }}</td>
+            <td style="text-align: center">{{ row.f_user_phone }}</td>
+            <td style="text-align: center">{{ row.f_residential_area }}</td>
+            <td style="text-align: center">{{ row.f_address }}</td>
+            <td style="text-align: center">{{ row.f_offsite_time }}</td>
+            <td style="text-align: center">{{ row.f_handle_date }}</td>
+            <td style="text-align: center">{{ row.f_is_handle }}</td>
+            <td style="text-align: center">{{ row.f_checker_name }}</td>
+            <td style="text-align: center">{{ row.f_is_repaired }}</td>
+            <td style="text-align: center">{{ row.f_repairman }}</td>
+            <td style="text-align: center">{{ row.f_repair_date }}</td>
+            <td style="text-align: center">{{ row.f_repair_result }}</td>
+            <td style="text-align: center">
+              <button
+                v-if="row.f_is_repaired == '隐患未处理' || (row.f_is_repaired == '用户自行整改' && row.f_repair_result == '未处理')"
+                class="button_spacing button_search-1"
+                @click="$parent.$parent.$parent.solveDefect(row, 'solve')">处理隐患</button>
+            </td>
           </template>
         </data-grid>
       </criteria-paged>
       <check-msg v-if="showcheckmsg" :show="showcheckmsg" :data="checkInfo"></check-msg>
     </div>
+    <modal :show.sync="showModal2" :backdrop="false">
+      <div slot="modal-header" class="modal-header">
+        <h4 class="modal-title">
+          转维修
+        </h4>
+      </div>
+      <div slot="modal-body" class="modal-body">
+        <div class="row" style="margin-top: 10px">
+          <label class="control-label font text-left"
+                 style="float:left;margin-left:20%;margin-top:5px">派发类型</label>
+          <div class="col-xs-8 col-md-8">
+            <v-select :value.sync="selectData.dispatchType" :value-single="true"
+                      v-model="selectData.dispatchType" :options='dispatchTypeOptions' placeholder='派发类型'
+                      close-on-select>
+            </v-select>
+          </div>
+        </div>
+        <div class="row" style="margin-top: 10px" v-if="selectData.dispatchType == '派发给维修员'">
+          <label class="control-label font text-left"
+                 style="float:left;margin-left:20%;margin-top:5px">维&ensp;修&ensp;员</label>
+          <div class="col-xs-8 col-md-8">
+            <v-select :value.sync="selectData.f_repairman" :value-single="true" :options='repairers'
+                      placeholder='请选择维修员' close-on-select></v-select>
+          </div>
+        </div>
+        <div class="row" style="margin-top: 10px" v-if="selectData.dispatchType == '派发给站点'">
+          <label class="control-label font text-left"
+                 style="float:left;margin-left:20%;margin-top:5px">站&ensp;&ensp;&ensp;&ensp;点</label>
+          <div class="col-xs-8 col-md-8">
+            <right-tree islist :userid="userid"
+                        :source="'dep=this.getParentByType($organization$).getSpecialResByType($department$),tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))'"
+                        @re-res="getSiteRes"></right-tree>
+          </div>
+        </div>
+        <div class="row" style="margin-top: 10px"
+             v-if="selectData.dispatchType == '派发给站点' || selectData.dispatchType == '派发给维修员'">
+          <label class="control-label font text-left"
+                 style="float:left;margin-left:20%;margin-top:5px">报修类型</label>
+          <div class="col-xs-8 col-md-8">
+            <v-select :value.sync="selectData.f_repairtype" style="width:60%" class="select select_list"
+                      :value-single="true" :options='repairTypeOptions' close-on-select>
+            </v-select>
+          </div>
+        </div>
+        <div class="row" style="margin-top: 10px" v-if="selectData.dispatchType == '派发给站点' || selectData.dispatchType == '派发给维修员'">
+          <label class="control-label font text-left"
+                 style="float:left;margin-left:20%;margin-top:5px">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注</label>
+          <div class="col-xs-8 col-md-8">
+            <textarea style="width: 60%; height: 100px" v-model="selectData.f_remarks"></textarea>
+          </div>
+        </div>
+      </div>
+      <div slot="modal-footer" class="modal-footer" style="text-align: center">
+        <button class="button_search" @click="rectification">处理</button>
+        <button class="button_search" @click="cancel1">取消</button>
+      </div>
+    </modal>
+    <modal :show.sync="showSolveModal" v-ref:solveModal>
+      <div slot="modal-header" class="modal-header">
+        <h4 class="modal-title">
+          {{ solveModal.preData.type == 'view' ? '处理详情' : '处理隐患' }}
+        </h4>
+      </div>
+      <div slot="modal-body" class="modal-body">
+        <div style="width: 100%;height: 36px;background-color: #f1f8ff;float: left">
+          <div style="width: 8px;height: 100%;background-color: #6aa6e2;margin-right: 20px;float: left"></div>
+          <div style="width: auto;height:100%;float: left;">
+            <p class="title-font" style="margin-top: 5px">处理前</p>
+          </div>
+        </div>
+
+        <div class="col-sm-6" style="margin-top: 10px">
+          <label class="font_normal_body">安&nbsp;检&nbsp;员</label>
+          <input class="input_search" style="width: 60%" type="text" disabled="true"
+                 v-model="check.f_checker_name" placeholder="安检员">
+        </div>
+        <div class="col-sm-6" style="margin-top: 10px">
+          <label class="font_normal_body">安检时间</label>
+          <input class="input_search" style="width: 60%" type="text" disabled="true"
+                 v-model="check.f_offsite_time" placeholder="安检时间">
+        </div>
+        <div class="col-sm-12" style="margin-bottom: 10px">
+          <label class="font_normal_body">隐患图片</label>
+          <img-self :width="200" :height="200" :src="solveModal.preData.defectImg"></img-self>
+        </div>
+
+        <div style="width: 100%;height: 36px;background-color: #f1f8ff;float: left">
+          <div style="width: 8px;height: 100%;background-color: #6aa6e2;margin-right: 20px;float: left"></div>
+          <div style="width: auto;height:100%;float: left;">
+            <p class="title-font" style="margin-top: 5px">处理后</p>
+          </div>
+        </div>
+        <div class="col-sm-6" style="margin-top: 10px">
+          <label class="font_normal_body">处&nbsp;理&nbsp;人</label>
+          <input class="input_search" style="width: 60%" disabled="true" type="text"
+                 v-model="solveModal.uploadData.f_repairman" placeholder="处理人">
+        </div>
+        <div class="col-sm-6" style="margin-top: 10px">
+          <label class="font_normal_body">处理时间</label>
+          <datepicker :disabled="solveModal.preData.type == 'view'" placeholder='处理时间' style="width:60%"
+                      :disabled-days-of-week="[]" :format="'yyyy-MM-dd'" :show-rest-button="reset"
+                      :value.sync="solveModal.uploadData.f_repair_date">
+          </datepicker>
+        </div>
+        <div v-if="solveModal.preData.type == 'solve'" class="col-sm-12" style="margin-bottom: 10px">
+          <label class="font_normal_body">处理后图片</label>
+          <avatar-upload :width="200" :height="200" :img-src.sync="solveModal.uploadData.imgSrc"
+                         :filename.sync="solveModal.uploadData.filename" v-ref:imginfo></avatar-upload>
+        </div>
+        <div v-if="solveModal.preData.type == 'view'" class="col-sm-12" style="margin-bottom: 10px">
+          <label class="font_normal_body">处理后图片</label>
+          <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg"></img-self>
+        </div>
+      </div>
+      <div slot="modal-footer" class="modal-footer" style="text-align: center">
+        <button class="button_search" v-if="solveModal.preData.type == 'solve'" @click="ok2">确认</button>
+        <button class="button_search" @click="cancel2">取消</button>
+      </div>
+    </modal>
   </div>
 </template>
 
 <script>
-  import {PagedList} from 'vue-client'
+  import { PagedList } from 'vue-client'
   import Vue from 'vue'
   import co from 'co'
   import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
   import BenzAMRRecorder from 'benz-amr-recorder'
+  import * as Util from "../../Util";
+
+  const upSolveDefect = function* (self) {
+    let uploadData = self.solveModal.uploadData
+    //tag)
+    self.$resetpost('/rs/logic/pcRepairDefect', self.solveModal.uploadData, { resolveMsg: null, rejectMsg: null })
+      .then(res => {
+        if (res.data.code == 200) {
+          self.$showMessage('隐患已处理。')
+          self.showSolveModal = false
+          self.$refs.paged.$refs.criteria.search()
+        }
+      })
+  }
 
   //获取json配置文件
   let asyncReady = async function (self) {
     // 获取配置信息
     try {
-      let res = await Vue.resetget(`/phone/rs/vue`, {data: {}}, {resolveMsg: null, rejectMsg: null})
+      let res = await Vue.resetget(`/phone/rs/vue`, { data: {} }, { resolveMsg: null, rejectMsg: null })
       Vue.config = res.data
       self.getDefectInfoConfig(res.data)
     } catch (error) {
@@ -234,11 +467,10 @@
     let getGasman = yield http.load('POST', '/rs/search', {
       source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
       userid: self.$login.f.id
-    }, {resolveMsg: null, rejectMsg: null})
-    //console.log('获取安检员', getGasman)
-    self.checkersid.push({label: '全部', value: ''})
+    }, { resolveMsg: null, rejectMsg: null })
+    self.checkersid.push({ label: '全部', value: '' })
     getGasman.data.forEach((checker) => {
-      self.checkersid.push({label: checker.name, value: checker.id})
+      self.checkersid.push({ label: checker.name, value: checker.id })
     })
   }
 
@@ -263,7 +495,8 @@
       // }
       // model.f_subcompany = this.$login.f.f_fengongsi
       return {
-        audioshow:false,
+        audioshow: false,
+        showSolveModal: false,
         searchData: {
           condition: "1=1",
         },
@@ -272,168 +505,412 @@
         excelHeaders: {
           'f_device_type': '检查项',
           'f_item_name': '隐患名称',
+          'f_item_value': '隐患原因',
+          'f_alias_name': '隐患别名',
           'f_userinfo_code': '客户编号',
           'f_user_name': '客户姓名',
           'f_user_phone': '客户电话',
           'f_residential_area': '小区',
           'f_address': '客户地址',
           'f_offsite_time': '安检时间',
-          'f_checker_name': '安检员'
+          'f_handle_date': '逾期时间',
+          'f_is_handle': '逾期状态',
+          'f_checker_name': '安检员',
+          'f_is_repaired': '处理方式',
+          'f_repairman': '处理人',
+          'f_repair_date': '处理时间',
+          'f_repair_result': '处理结果'
         },
         fun: this.$login.f,
         checkersid: [],
         safetype: this.getSafeParam('安检类型'),
         criteriaShow: false,
-        repaireds: [{label: '全部', value: ''},{label: '已修', value: '已修'},{label: '未修', value: '未修'}],
+        repaireds: [{ label: '全部', value: '' }, { label: '已修', value: '已修' }, { label: '未修', value: '未修' }],
+        checktype: [{ label: '全部', value: '' }, { label: '民用', value: '民用' }, { label: '非民用', value: '非民用' }],
         showModal: false,
+        pcds: [],
         f_approval_states: this.getSafeParam('安检单审核状态'),
-        f_entry_status:this.getSafeParam('安检状态'),
+        f_entry_status: this.getSafeParam('安检状态'),
         f_checkplans: this.getSafeParam('有无计划'),
+        is_repaired: this.getSafeParam('安检患隐处理方式'),
+        is_repaireds: [{ label: '全部', value: '' }, { label: '已处理未消除隐患', value: '已处理未消除隐患' }, { label: '已处理已消除隐患', value: '已处理已消除隐患' }],
         showcheckmsg: false,
         checkInfo: {},
+        repairers: [],
+        dispatchTypeOptions: [{ label: '派发给站点', value: '派发给站点' }, { label: '派发给维修员', value: '派发给维修员' }, { label: '用户自行整改', value: '用户自行整改' }],
+        canToRepair: this.$appdata.getSingleValue('隐患明细转维修') || '是',
+        repairTypeOptions: this.$appdata.getParam('报修类型'),
+        selectData: {
+          dispatchType: '',
+          f_repairman: '',
+          f_remarks: '',
+          f_repairtype: ''
+        },
+        checkes: [],
+        showModal2: false,
+        solveModal: {
+          preData: {
+            type: 'view',
+            defectImg: '',
+            repairedImg: ''
+          },
+          uploadData: {
+            id: '',
+            f_repairman: this.$login.f.name,
+            f_repair_date: Util.getNowDate().substr(0, 10),
+            f_repair_path: '',
+            imgSrc: '',
+            filename: ''
+          }
+        },
         orderDefault: "'f_offsite_time'",
         orderFields: {
           f_offsite_time: 'no'
         },
         sliceArea: [],
-        cbc:[],
-        DefectConfig:'' ,
-        DefectConfigs:[{label:'全部',value:''},{label:'气量异常差值',value:'气量异常差值'}],
-        device_types:[{label:'全部',value:''}],
+        cbc: [],
+        DefectConfig: '',
+        DefectConfigs: [{ label: '全部', value: '' }, { label: '气量异常差值', value: '气量异常差值' }],
+        ishandles: [{ label: '全部', value: '' }, { label: '未逾期', value: '未逾期' }, { label: '已逾期', value: '已逾期' }],
+        repairresults: [{ label: '全部', value: '' }, { label: '已处理', value: '已处理' }, { label: '未处理', value: '未处理' }],
+        device_types: [{ label: '全部', value: '' }],
       }
     },
     methods: {
-      changeDefect(val){
+      ok2() {
+        if (!(this.solveModal.uploadData.filename && this.solveModal.uploadData.filename.length > 0)) {
+          this.$showMessage('请录入处理后照片')
+          return
+        }
+        co(upSolveDefect(this))
+      },
+      cancel2() {
+        this.showSolveModal = false
+        this.showToRepairModal = false
+      },
+      solveDefect(row, type) {
+        if (row.f_repair_path && row.f_repair_path.startsWith('http')) {
+          this.solveModal.preData.repairedImg = row.f_repair_path
+        } else {
+          this.solveModal.preData.repairedImg = '/rs/image/file/' + row.f_repair_path
+        }
+        this.solveModal.preData.defectImg = '/rs/image/file/' + row.f_path
+        this.solveModal.uploadData.id = row.id
+        this.solveModal.preData.type = type
+        if (type == 'view') {
+          this.solveModal.preData.f_repair_path = '/rs/image/file/' + row.f_repair_path
+          this.solveModal.uploadData.f_repairman = row.f_repairman
+          this.solveModal.uploadData.f_repair_date = row.f_repair_date
+        } else {
+          this.solveModal.uploadData.f_repairman = this.$login.f.name
+          this.solveModal.uploadData.f_repair_date = Util.getNowDate().substr(0, 10)
+        }
+        this.showSolveModal = !this.showSolveModal
+      },
+      getEmp() {
+        let val = { source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($维修员$) != -1 ))', userid: `${this.$login.f.id}` }
+        let http = new HttpResetClass()
+        http.load('POST', '/rs/search', { data: val }, { resolveMsg: null, rejectMsg: null }).then((res) => {
+          if (res.data.length == 0) {
+            this.repairers = []
+            return
+          }
+          res.data.forEach((user) => {
+            this.repairers.push({ label: user.name, value: user.name })
+          })
+        })
+      },
+      getSiteRes(obj) {
+        console.log('siteRes ---> ')
+        console.log(obj)
+        if (obj.resids[0]) {
+          this.selectData.f_meetunit = obj.res.join('.')
+          this.selectData.f_reciever = obj.resids.join('.')
+          this.selectData.f_outlets = obj.res[obj.res.length - 1]
+        } else {
+          this.selectData.f_meetunit = ''
+          this.selectData.f_reciever = ''
+          this.selectData.f_outlets = ''
+        }
+      },
+      cancel1() {
+        this.showModal2 = false
+        this.selectData = {
+          dispatchType: '',
+          f_repairman: '',
+          f_remarks: '',
+          f_repairtype: ''
+        }
+      },
+      async rectification() {
+        if (this.selectData.dispatchType == '用户自行整改') {
+          let defectIdStr = ''
+          let defectIds = []
+          for (let i = 0; i < this.dangerGroups.length; i++) {
+            for (let j = 0; j < this.dangerGroups[i].dangers.length; j++) {
+              defectIds.push(`'${this.dangerGroups[i].dangers[j].f_defect_id}'`)
+            }
+          }
+          defectIdStr = `(${defectIds.join(',')})`
+          let http = new HttpResetClass()
+          let sql = `update t_devices_items set f_deal_dispose = '自行整改' where id in ${defectIdStr}`
+          http.load('POST', 'rs/logic/runSQL', { data: { sql: sql } },
+            { resolveMsg: null, rejectMsg: null }).then(()=>{
+            this.showModal3 = false
+            this.checkes = []
+            this.cancel1()
+            this.$showMessage('修改成功')
+          }).catch(()=>{
+            this.showModal3 = false
+            this.checkes = []
+            this.cancel1()
+            this.$showMessage('修改异常，请检查网络状况后重新尝试。')
+          })
+        } else {
+          await this.repair()
+        }
+      },
+      async repair() {
+        if (this.selectData.dispatchType) {
+          if (this.selectData.dispatchType == '派发给站点') {
+            if (!this.selectData.f_reciever) {
+              this.$showMessage('请选择部门！')
+              return
+            }
+          } else {
+            if (!this.selectData.f_repairman) {
+              this.$showMessage('请选择维修员！')
+              return
+            }
+          }
+        } else {
+          this.$showMessage('请选择派发类型！')
+          return
+        }
+
+        if (!this.selectData.f_repairtype) {
+          this.$showMessage('请选择报修类型！')
+          return
+        }
+        this.showModal3 = true
+        let act = {}
+        let toRepair = ''
+        let successCount = 0
+        if (this.selectData.dispatchType == '派发给站点') {
+          act = { f_meetunit: this.selectData.f_meetunit, f_reciever: this.selectData.f_reciever, f_service_acitivity_type: '派单' }
+          toRepair = null
+        } else {
+          console.log('派发给维修员---------' + this.selectData.f_repairman)
+          act = { f_meetunit: '', f_reciever: this.selectData.f_repairman, f_service_acitivity_type: '派单' }
+          toRepair = '一级派单'
+        }
+        let rep = {
+          loginUser: {
+            name: this.$login.f.name,
+            ename: this.$login.f.ename
+          },
+          f_meetunit: this.$login.f.deps,
+          f_attendant: this.$login.f.name,
+          f_outlets: this.$login.f.deps,
+          f_remarks: this.selectData.f_remarks,
+          f_repairtype: this.selectData.f_repairtype,
+          toRepair: toRepair,
+          activity: act
+        }
+        for (let i = 0; i < this.dangerGroups.length; i++) {
+          let defectIdStr = ''
+          const defectIds = []
+          for (let j = 0; j < this.dangerGroups[i].dangers.length; j++) {
+            defectIds.push(`'${this.dangerGroups[i].dangers[j].f_defect_id}'`)
+          }
+          defectIdStr = `(${defectIds.join(',')})`
+          const data = {
+            id: this.dangerGroups[i].dangers[0].f_paper_id,
+            repData: rep,
+            source: 'pc',
+            defectIdStr: defectIdStr
+          }
+          console.log('data=', JSON.stringify(data))
+          try {
+            let result = await new HttpResetClass().load('post', '/rs/logic/phoneUploadRectification', data, { resolveMsg: null, rejectMsg: null })
+            if (result.data.code == 200) {
+              successCount += result.data.successcon
+              this.progressbarWidth = Math.ceil((i + 1) * 100 / (this.dangerGroups.length))
+            }
+          } catch (e) {
+            this.showModal3 = false
+            this.$showMessage('网络异常，请稍后再试！')
+            return
+          }
+        }
+        this.showModal3 = false
+        this.cancel1()
+        this.$showMessage('本次转维修成功' + successCount + '单')
+      },
+      isChecked(row) {
+        return this.checkes.findIndex(item => item.f_defect_id == row.f_defect_id) != -1
+      },
+      setCheckes(row) {
+        let index = this.checkes.findIndex(item => item.f_defect_id == row.f_defect_id)
+        if (index < 0) {
+          this.checkes.push(row)
+        } else {
+          this.checkes.splice(index, 1)
+        }
+        console.log('this.checkes=', JSON.stringify(this.checkes))
+      },
+      toRepair() {
+        console.log('this.checkes=', JSON.stringify(this.checkes))
+        if (this.checkes.length == 0) {
+          return this.$showMessage('请先选择需要转维修的隐患！')
+        }
+
+        const dangerGroups = []
+        for (const danger of this.checkes) {
+          let i = dangerGroups.findIndex(dangerGroup => dangerGroup.f_userinfo_code === danger.f_userinfo_code)
+          if (i == -1) {
+            dangerGroups.push({
+              f_userinfo_code: danger.f_userinfo_code,
+              dangers: []
+            })
+            i = dangerGroups.length - 1
+          }
+          dangerGroups[i].dangers.push(danger)
+        }
+        this.dangerGroups = dangerGroups
+        console.log('this.dangerGroups=', JSON.stringify(this.dangerGroups))
+        this.showModal2 = true
+      },
+      changeDefect(val) {
         try {
-          if(val){
-            for (var Key1 in this.DefectConfig){
-              if(Key1 == val){
-                this.DefectConfigs = [{label:'全部',value:''}]
-                for(var Key2 in this.DefectConfig[Key1].items){
-                  this.DefectConfigs.push({label:Key2,value:Key2})
+          if (val) {
+            for (var Key1 in this.DefectConfig) {
+              if (Key1 == val) {
+                this.DefectConfigs = [{ label: '全部', value: '' }]
+                for (var Key2 in this.DefectConfig[Key1].items) {
+                  this.DefectConfigs.push({ label: Key2, value: Key2 })
                 }
                 return
               }
             }
-          }else if(val == ''){
-            this.DefectConfigs = [{label:'全部',value:''}]
-            for (var Key1 in this.DefectConfig){
-              for(var Key2 in this.DefectConfig[Key1].items){
-                this.DefectConfigs.push({label:Key2,value:Key2})
+          } else if (val == '') {
+            this.DefectConfigs = [{ label: '全部', value: '' }]
+            for (var Key1 in this.DefectConfig) {
+              for (var Key2 in this.DefectConfig[Key1].items) {
+                this.DefectConfigs.push({ label: Key2, value: Key2 })
               }
             }
           }
-        }catch (e) {
-          console.log(e)
+        } catch (e) {
+          //tag
         }
       },
-      getDefectInfoConfig(val){
+      getDefectInfoConfig(val) {
         try {
           if (val.safecheck.DevicesSetConfig != undefined) {
             this.DefectConfig = val.safecheck.DevicesConfig
             // 获取到配置项，进行遍历，获取每个隐患项
-            for (var Key1 in this.DefectConfig){
-              this.device_types.push({label:Key1,value:Key1})
-              for(var Key2 in this.DefectConfig[Key1].items){
-                this.DefectConfigs.push({label:Key2,value:Key2})
+            for (var Key1 in this.DefectConfig) {
+              this.device_types.push({ label: Key1, value: Key1 })
+              for (var Key2 in this.DefectConfig[Key1].items) {
+                this.DefectConfigs.push({ label: Key2, value: Key2 })
               }
             }
             // 非民用或其他配置项加入，在进行遍历
           }
-        }catch (e) {
-          console.log(e)
+        } catch (e) {
+          //tag
         }
       },
-      showaudio(){
-        console.log("999999999")
-        this.audioshow=!this.audioshow
-        console.log(this.audioshow)
+      showaudio() {
+        //tag
+        this.audioshow = !this.audioshow
+        //tag
       },
-      getmeterbook(val){
-        this.cbc=[]
+      getmeterbook(val) {
+        this.cbc = []
         this.cbc.push({
-          label:'全部',
-          value:''
+          label: '全部',
+          value: ''
         })
-        if (val==''){
+        if (val == '') {
 
-          this.cbcs.forEach(res=>{
+          this.cbcs.forEach(res => {
             this.cbc.push({
-              label:res.f_book_name,
-              value:res.id
+              label: res.f_book_name,
+              value: res.id
             })
           })
-        }else{
-          this.cbcs.forEach(res=>{
-            if (res.f_book_slice_area==val){
+        } else {
+          this.cbcs.forEach(res => {
+            if (res.f_book_slice_area == val) {
               this.cbc.push({
-                label:res.f_book_name,
-                value:res.id
+                label: res.f_book_name,
+                value: res.id
               })
             }
           })
         }
       },
-      getSafeParam(val){
-        if(this.$appdata.getParam(val)){
-          return [{label: '全部', value: ''}, ...this.$appdata.getParam(val)]
-        }else{
-          return [{label: '全部', value: ''}]
+      getSafeParam(val) {
+        if (this.$appdata.getParam(val)) {
+          return [{ label: '全部', value: '' }, ...this.$appdata.getParam(val)]
+        } else {
+          return [{ label: '全部', value: '' }]
         }
 
       },
-      Mreadibook(val){
-        //console.log("999999999")
-        //console.log(val)
-        this.sliceArea=[]
-        if (val){
-          new HttpResetClass().load('POST',`/rs/sql/safe_singleTable_OrderBy`, {data: {
+      Mreadibook(val) {
+        if (val) {
+          new HttpResetClass().load('POST', `/rs/sql/safe_singleTable_OrderBy`, {
+            data: {
               items: 'name',
               tablename: 't_zone',
               condition: `parentid  in ${val}`,
               orderitem: 'id'
-            }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-            this.sliceArea.push({
-              label:'全部',
-              value:''
-            })
-            res.data.forEach(ress=>{
+            }
+          }, { resolveMsg: null, rejectMsg: null }).then((res) => {
+            this.sliceArea = [{
+              label: '全部',
+              value: ''
+            }]
+            res.data.forEach(ress => {
               this.sliceArea.push({
-                label:ress.name,
-                value:ress.name
+                label: ress.name,
+                value: ress.name
               })
             })
 
           })
         }
       },
-      getAllMeterBook(val){
-        //console.log("999999999")
-        //console.log(val)
-        this.cbcs=[]
-        if (val){
-          new HttpResetClass().load('POST',`/rs/sql/safe_singleTable_OrderBy`, {data: {
+      getAllMeterBook(val) {
+        this.cbcs = []
+        if (val) {
+          new HttpResetClass().load('POST', `/rs/sql/safe_singleTable_OrderBy`, {
+            data: {
               items: 'f_book_name,f_book_slice_area,id',
               tablename: 't_meter_book',
               condition: `f_filiale_id  in ${val}`,
               orderitem: 'id'
-            }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-            res.data.forEach(ress=>{
+            }
+          }, { resolveMsg: null, rejectMsg: null }).then((res) => {
+            res.data.forEach(ress => {
               this.cbcs.push({
-                id:ress.id,
-                f_book_name:ress.f_book_name,
-                f_book_slice_area:ress.f_book_slice_area
+                id: ress.id,
+                f_book_name: ress.f_book_name,
+                f_book_slice_area: ress.f_book_slice_area
               })
             })
-            this.cbc=[]
+            this.cbc = []
             this.cbc.push({
-              label:'全部',
-              value:''
+              label: '全部',
+              value: ''
             })
-            this.cbcs.forEach(res=>{
+            this.cbcs.forEach(res => {
               this.cbc.push({
-                label:res.f_book_name,
-                value:res.id
+                label: res.f_book_name,
+                value: res.id
               })
             })
           })
@@ -443,16 +920,16 @@
         this.model.f_filialeid = this.$login.convertToIn(obj.resids);
         this.searchData.f_filialeid = this.$login.convertToIn(obj.resids);
         this.Mreadibook(this.model.f_filialeid)
-        this.getAllMeterBook(this.model.f_filialeid)
+        // this.getAllMeterBook(this.model.f_filialeid)
         //this.$refs.paged.$refs.criteria.search()
       },
 
       change(row) {
         // Vue.$login = {jwt: row.f_checker_id}
         asyncReady(this).then(() => {
-            //console.log("开始进入单子"+JSON.stringify(Vue.config))
-            row.f_upload_state = '已传'
-            this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
+          ////tag)
+          row.f_upload_state = '已传'
+          this.$goto('new-check-paper', { f_plan_id: row.f_check_plan_id, item: row, role: 'view' }, 'self')
         }).catch(
           (respanse) => {
             alert('获取配置文件失败')
@@ -475,85 +952,19 @@
         this.showModal = false
         if (this.$refs.paged.$refs.criteria.$refs.modal.$children[0].selectedRow.id) {
           this.model.f_plan_id = this.$refs.paged.$refs.criteria.$refs.modal.$children[0].selectedRow.id
-          this.model.f_check_plan=this.$refs.paged.$refs.criteria.$refs.modal.$children[0].selectedRow
+          this.model.f_check_plan = this.$refs.paged.$refs.criteria.$refs.modal.$children[0].selectedRow
         }
       },
       cancel() {
         this.showModal = false
-        this.model.f_check_plan = {f_plan_name: '', id: ''}
-        this.model.f_plan_id=''
+        this.model.f_check_plan = { f_plan_name: '', id: '' }
+        this.model.f_plan_id = ''
       },
       print(row) {
         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) {
@@ -575,25 +986,40 @@
         this.$refs.paged.$refs.criteria.search()
       },
       selfSearch(args) {
-        //console.log("9999999999999999")
+        ////tag
+        if (args.model.f_repair_result == '已处理') {
+          args.condition += ` and f_repair_date != '****-**-** **:**:**' `
+        }
+        if (args.model.f_repair_result == '未处理') {
+          args.condition += ` and f_repair_date = '****-**-** **:**:**' `
+        }
+        args.condition += ` and f_filialeid in ${this.model.f_filialeid} `
         this.model.search(args.condition, args.model, args.condValue)
-      }
+      },
+      getPcds(val) {
+        this.pcds = [{ label: '全部', value: '' }]
+        new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_OrderBy`,
+          { data: { items: "*", tablename: "t_pcd", orderitem: "id", condition: `f_orgid in ${val}` } },
+          { resolveMsg: null, rejectMsg: null }).then((pcdlist) => {
+          pcdlist.data.forEach((result) => {
+            this.pcds.push({ label: result.f_pcd, value: result.f_pcd })
+          })
+        })
+      },
     },
 
     ready() {
+      this.getEmp()
       this.readConfig()
-      //console.log('这里是PaperList', this.$login.f)
       this.function = this.f
-      //console.log(this.f)
-      //this.remind()
+      this.getPcds(`('${this.$login.f.orgid}')`)
       let gen = select(this)
-      //this.pianqu()
-      this.Mreadibook(`('${this.$login.f.orgid}')`)
+      // this.Mreadibook(`('${this.$login.f.orgid}')`)
       co(gen)
     },
     watch: {
       'model.f_no_checkplan'(val) {
-        if (this.model.f_no_checkplan){
+        if (this.model.f_no_checkplan) {
           this.searchData.f_no_checkplan = val
         }
         if (this.model.f_no_checkplan == '有计划安检') {