safecheck-client 4.0.0-108 → 4.0.0-109

package/src/components/android/AndroidDefectDetails.vue

@@ -1,769 +1,769 @@
-<style scoped>
-.bg {
-  background-color: blue;
-  height: 1px;
-  border: 0;
-}
-
-.app-row {
-  background-color: white;
-  padding: 10px 10px 0 10px;
-  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
-}
-
-.search_input {
-  border: 0;
-  outline: none;
-}
-
-.font {
-  font: 15px PingFang-SC-Medium;
-  color: #666666;
-}
-
-.input-font {
-  font: 15px PingFang-SC-Medium;
-  color: #333333;
-}
-
-.btn-font {
-  font: 600 16px PingFang-SC-Bold;
-  color: #499EDF;
-}
-
-.btn-color {
-  background-color: #FFFFFF;
-  border-radius: 10px;
-  border: 1px solid #499EDF;
-}
-
-.app-text {
-  font-size: 12px;
-}
-
-.panel-self {
-  border-radius: 10px;
-  border: 1px solid #499EDF;
-  background-color: #F8F8F8;
-}
-
-.yybtn-color {
-  background-color: #499edf;
-  border-radius: 4px;
-  border: 1px solid #499EDF;
-  color: #FFFFFF;
-  font: 14px PingFang-SC-Bold;
-}
-
-.qxbtn-color {
-  background-color: #FFFFFF;
-  border-radius: 4px;
-  color: #499edf;
-  font: 14px PingFang-SC-Bold;
-  border: 1px solid #499EDF;
-}
-
-.button_shrink_top {
-  width: 35px;
-  height: 35px;
-  background-size: 100%;
-  background-image: url("../../../static/newStyle/stretch_top.png")
-}
-
-.button_shrink_bottom {
-  width: 35px;
-  height: 35px;
-  background-size: 100%;
-  background-image: url("../../../static/newStyle/stretch_bottom.png")
-}
-
-.button_shrink_left {
-  width: 35px;
-  height: 35px;
-  background-size: 100%;
-  background-image: url("../../../static/newStyle/stretch_left.png")
-}
-
-.button_shrink_right {
-  width: 35px;
-  height: 35px;
-  background-size: 100%;
-  background-image: url("../../../static/newStyle/stretch_right.png")
-}
-</style>
-<template>
-  <div style="height: auto;width: 100%">
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
-        <div partial>
-          <form>
-            <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 class="search_input input-font" v-model=model.f_user_name
-                       condition="tcp.f_user_name like '%{}%'"/>
-              </div>
-            </div>
-            <div class="row app-row">
-              <div class="col-xs-4">
-                <img src="../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label for="f_userinfo_code" class="font text-left">用户编号：</label>
-              </div>
-              <div class="col-xs-8">
-                <input id="f_userinfo_code" class="search_input input-font"
-                       v-model=model.f_userinfo_code condition="tcp.f_userinfo_code like '%{}%'"/>
-              </div>
-            </div>
-            <div class="row app-row">
-              <div class="col-xs-4">
-                <img src="../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label for="f_userinfo_code" class="font text-left">安检人员：</label>
-              </div>
-              <div class="col-xs-8">
-                <input id="f_userinfo_code" class="search_input input-font"
-                       v-model=model.f_checker_name condition="tcp.f_checker_name 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">
-                <input class="search_input input-font"
-                       v-model=model.f_address condition="tcp.f_address 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>
-              <v-select id="f_user_type" :value.sync="model.f_item_name" class="input-font"
-                        :width="'60%'"
-                        :options='$parent.$parent.item_types' placeholder='隐患项'
-                        v-model="model.f_item_name" condition="f_item_name = '{}'" close-on-select
-                        clear-button></v-select>
-            </div>
-            <div class="row app-row">
-              <div class="col-xs-4">
-                <img src="../../assets/是否已检.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label for="f_state" class="font text-left">起始时间：</label>
-              </div>
-              <datepicker id="f_start_date"
-                          placeholder='起始时间'
-                          :value.sync="model.f_start_date"
-                          :disabled-days-of-Week="[]"
-                          v-model="model.f_start_date"
-                          class="input-font col-xs-8"
-                          :format="'yyyy-MM-dd 00:00:00'"
-                          :show-reset-button="reset" readonly="readonly">
-              </datepicker>
-            </div>
-            <div class="row app-row">
-              <div class="col-xs-4">
-                <img src="../../assets/是否已检.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label for="f_state" class="font text-left">结束时间：</label>
-              </div>
-              <datepicker id="f_end_date"
-                          placeholder='结束时间'
-                          :value.sync="model.f_end_date"
-                          :disabled-days-of-Week="[]"
-                          v-model="model.f_end_date"
-                          class="input-font col-xs-8"
-                          :format="'yyyy-MM-dd 23:59:00'"
-                          :show-reset-button="reset" readonly="readonly">
-              </datepicker>
-            </div>
-            <div class="row app-row">
-              <div class="col-xs-4">
-                <img src="../../assets/用户类型.png" style="width: 20px;margin-bottom: 5px" alt="">
-                <label for="f_user_type" class="font text-left">用户类型：</label>
-              </div>
-              <v-select id="f_user_type" :value.sync="model.f_user_type" class="input-font"
-                        :width="'60%'"
-                        :options='$parent.$parent.user_types' placeholder='请选择用户类型'
-                        v-model="model.f_user_type" condition="f_user_type = '{}'" close-on-select
-                        clear-button></v-select>
-            </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 class="search_input input-font"
-                       v-model=model.f_repairman condition="f_repairman 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">
-                <datepicker id="startDate" placeholder="处理开始日期"
-                            style="width: 60%!important;"
-                            v-model="model.sq_startDate"
-                            :value.sync="model.sq_startDate"
-                            :format="'yyyy-MM-dd 00:00:00'"
-                            :show-reset-button="true"
-                            condition="f_repair_date >= '{}'">
-                </datepicker>
-              </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">
-                <datepicker id="endDate" placeholder="处理结束日期"
-                            style="width: 60%!important;"
-                            v-model="model.sq_endDate"
-                            :value.sync="model.sq_endDate"
-                            :format="'yyyy-MM-dd 23:59:59'"
-                            :show-reset-button="true"
-                            condition="f_repair_date<= '{}'">
-                </datepicker>
-              </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.is_repair" class="input-font"
-                          :options='$parent.$parent.is_repairs' placeholder='处理状态' :value-single="true"
-                          v-model="is_repair" close-on-select clear-button></v-select>
-              </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="$parent.$parent.selfSearch">查询
-              </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>
-            <div style="height:30px;"></div>
-          </form>
-        </div>
-      </criteria>
-      <list :model="model" partial='list'>
-        <div partial>
-          <div class="auto app-text" style="margin-top: 5px;">
-            <div class="panel" style="padding: 10px 10px 5px 10px;">
-              <div class="panel-body panel-self">
-                <div class="col-xs-12">
-                  <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>
-                </div>
-                <div class="col-xs-12">
-                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户名称:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{ row.f_user_name }}</p>
-                </div>
-                <div class="col-xs-12">
-                  <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_phone }}</p>
-                </div>
-                <div class="col-xs-12">
-                  <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_offsite_time }}</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_address }}</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_checker_name }}</p>
-                </div>
-                <div class="col-xs-12">
-                  <p class="panel-title col-xs-5 text-left font"><b>检&ensp;查&ensp;项:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_device_type }}</p>
-                </div>
-                <div class="col-xs-12">
-                  <p class="panel-title col-xs-5 text-left font"><b>隐&ensp;患&ensp;项:</b></p>
-                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_item_name }}</p>
-                </div>
-                <div class="col-xs-12">
-                  <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_item_value }}</p>
-                </div>
-                <div class="col-xs-12">
-                  <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_repairman }}</p>
-                </div>
-                <div class="col-xs-12">
-                  <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_repair_date }}</p>
-                </div>
-                <div class="col-xs-12">
-                  <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_repair_date == '****-**-** **:**:**' ? '未处理' : '已处理' }}</p>
-                </div>
-                <div class="col-xs-12">
-                  <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_comments }}</p>
-                </div>
-                <!--                <div class="col-xs-12">-->
-                <!--                  <button type="button" name="button" class="btn btn-primary"-->
-                <!--                          style="background-color:#499edf;float: right"-->
-                <!--                          @click="$parent.$parent.$parent.openshowModal(row)">查看-->
-                <!--                  </button>-->
-                <!--                  <button type="button" name="button" class="btn btn-primary"-->
-                <!--                          style="background-color:#499edf;float: right;margin-right:10px;"-->
-                <!--                          @click="$parent.$parent.$parent.openshowModal1(row)">处理-->
-                <!--                  </button>-->
-                <!--<button type="button" class="btn btn-default" @click="$parent.$parent.$parent.ceshi">确认2</button>-->
-                <!--                </div>-->
-              </div>
-            </div>
-          </div>
-        </div>
-      </list>
-    </criteria-paged>
-  </div>
-  <modal :show.sync="showModal">
-    <div slot="modal-header" class="modal-header">
-      <h4 class="modal-title">
-        隐患照片
-      </h4>
-    </div>
-    <div slot="modal-body" class="modal-body">
-      <div class="from-group">
-        <div class="row">
-          <div class="col-md-6">
-            <img-self v-if="row.f_path" :src="`${this.$androidUtil.getProxyUrl()}/rs/image/file/`+row.f_path" width="300" height="400"></img-self>
-            <img-self v-if="row.f_p1_path" :src="`${this.$androidUtil.getProxyUrl()}/rs/image/file/`+row.f_p1_path" width="300" height="400"></img-self>
-            <img-self v-if="row.f_p2_path" :src="`${this.$androidUtil.getProxyUrl()}/rs/image/file/`+row.f_p2_path" width="300" height="400"></img-self>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div slot="modal-footer" class="modal-footer">
-      <button type="button" class="btn btn-default" @click="closeshowModal">确认</button>
-    </div>
-  </modal>
-  <modal :show.sync="showModal1">
-    <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-bottom: 10px">
-        <p class="panel-title col-xs-3 text-left font"><b>隐&ensp;患&ensp;项:</b></p>
-        <p class="panel-title col-xs-9 text-left input-font">{{ deal.result.f_item_name }}</p>
-      </div>
-      <div class="row" style="margin-bottom: 10px">
-        <p class="panel-title col-xs-3 text-left font"><b>隐患原因:</b></p>
-        <p class="panel-title col-xs-9 text-left input-font">{{ deal.result.f_item_value }}</p>
-      </div>
-      <div class="form-group col-sm-12">
-        <div class="auto">
-          <div class="panel" style="padding: 10px 10px 5px 10px;">
-            <div class="panel-body panel-self"
-                 style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
-              <img-self :src="deal.f_deal_path" alt="整改照片" :width="140" :height="170" capture="camera"
-                        type="file"></img-self>
-              <div class="row text-right div-photo" style="height: 50px;margin-top: -30px">
-                <img src="../../assets/remove.png" @click="delfile('f_deal_path', deal.f_deal_path)"></img>
-                <button type="button" name="button" class="btn btn-primary btn-photo"
-                        @click="takePic('f_deal_path','整改照片')">拍照
-                </button>
-              </div>
-            </div>
-            <div class="panel-body panel-self"
-                 style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
-              <img-self :src="deal.f_other_dealpath1" alt="整改照片" :width="140" :height="170" capture="camera"
-                        type="file"></img-self>
-              <div class="row text-right div-photo" style="height: 50px;margin-top: -30px">
-                <img src="../../assets/remove.png" @click="delfile('f_other_dealpath1', deal.f_other_dealpath1)"></img>
-                <button type="button" name="button" class="btn btn-primary btn-photo"
-                        @click="takePic('f_other_dealpath1','整改照片')">拍照
-                </button>
-              </div>
-            </div>
-            <div class="panel-body panel-self"
-                 style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
-              <img-self :src="deal.f_other_dealpath2" alt="整改照片" :width="140" :height="170" capture="camera"
-                        type="file"></img-self>
-              <div class="row text-right div-photo" style="height: 50px;margin-top: -30px">
-                <img src="../../assets/remove.png" @click="delfile('f_other_dealpath2', deal.f_other_dealpath2)"></img>
-                <button type="button" name="button" class="btn btn-primary btn-photo"
-                        @click="takePic('f_other_dealpath2','整改照片')">拍照
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="form-group col-sm-12" v-if="isNeedDealSign">
-        <p class="panel-title  text-left font" style="text-align: center">用户签名:</p>
-        <div class="auto">
-          <div class="panel" style="padding: 10px 10px 5px 10px;">
-            <div class="panel-body panel-self"
-                 style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
-              <img :src="deal.f_dealsign_path" :width="200" :height="150"/>
-              <div class="row text-right div-photo" style="height: 50px;margin-top: 60px">
-                <button type="button" name="button" class="btn btn-primary btn-photo" @click="sign">签名</button>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-xs-2">
-          <p class="panel-title  text-left font" style="text-align: center">处理结果</p>
-        </div>
-        <div class="col-xs-9">
-          <textarea class="input-font " v-model=deal.f_deal_remark style="width: 100%"></textarea>
-        </div>
-      </div>
-      <div v-if="isCancelLimitGas" style="display: flex;align-items: end;height: 30px;gap: 10px;padding-left: 16px;">
-        <input type="checkbox" v-model="deletebacklistisselect"/>
-        <div style="height: 18px">取消限制该用户购气</div>
-      </div>
-    </div>
-    <div slot="modal-footer" class="modal-footer">
-      <button type="button" class="btn btn-default" @click="commitDealDefect">确认</button>
-      <button type="button" class="btn btn-default" @click="closeshowModal1">取消</button>
-    </div>
-  </modal>
-</template>
-
-<script>
-import Vue from 'vue'
-import {HttpResetClass, PagedList} from 'vue-client'
-import * as Util from '../Util'
-
-export default {
-  title: '隐患明细',
-  data() {
-    return {
-      row:{},
-      is_repairs:[{label: '请选择', value: ''},
-        {label: '已处理', value: '已处理'},
-        {label: '未处理', value: '未处理'}],
-      showModal: false,
-      showModal1: false,
-      showimg: '',
-      deal: {
-        result: {},
-        f_deal_path: '',
-        f_other_dealpath1: '',
-        f_other_dealpath2: '',
-        f_deal_remark: '',
-        f_dealsign_path: '', //签名
-        f_dealer: Vue.user.name,
-        f_dealer_id: Vue.user.id
-      },
-      user_types: [
-        {label: '请选择用户类型', value: ''},
-        {label: '民用', value: '民用'},
-        {label: '非民用', value: '非民用'}
-      ],
-      item_types: [{label: '全部', value: ''}],
-      f_filialeids: '',
-      model: new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/defectDetails`, 20, {
-        condition: 'this.condition',
-        f_filialeids: `('${Vue.user.orgid}')`,
-        f_checker_id: `'${Vue.user.id}'`
-      }),
-      criteriaShow: false,
-      isNeedDealSign: this.$appdata.getSingleValue('隐患处理是否需要签名') == 'true',
-      isCancelLimitGas: this.$appdata.getSingleValue('隐患处理-取消限制购气') == '是',
-      deletebacklistisselect: false
-    }
-  },
-  ready() {
-    this.selfSearch()
-    this.getDefectItemConfig()
-  },
-  methods: {
-    async getDefectItemConfig() {
-      const uniqueMap = new Map(); // 去重容器
-      const result = [];
-      if (Vue.config2 && Vue.config2.safecheck && Vue.config2.safecheck.DevicesConfig) {
-        const devicesConfig = Vue.config2.safecheck.DevicesConfig;
-        for (const key in devicesConfig) {
-          if (!uniqueMap.has(key)) {
-            uniqueMap.set(key, true);
-            result.push({ label: key, value: key });
-          }
-        }
-      }
-      if (Vue.config2 && Vue.config2.safecheck && Vue.config2.safecheck.DevicesSetConfig) {
-        const devicesSetConfig = Vue.config2.safecheck.DevicesSetConfig;
-        for (const key in devicesSetConfig) {
-          if (!uniqueMap.has(key)) {
-            uniqueMap.set(key, true);
-            result.push({ label: key, value: key });
-          }
-        }
-      }
-      this.item_types = [
-        { label: '全部', value: '' },
-        ...result
-      ];
-    },
-    async deletebacklist() {
-      ////tag)
-      let http = new HttpResetClass()
-      ////tag
-      let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
-        data: {
-          items: "*",
-          tablename: "t_userinfo",
-          condition: `f_userinfo_code = ${this.deal.result.f_userinfo_code}`,
-          orderitem: "f_userinfo_code"
-        }
-      }, {resolveMsg: null, rejectMsg: null})
-      ////tag)
-      ////tag
-      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
-        data: {
-          "f_operat_type": "取消拉黑",
-          "f_state": "有效",
-          "f_user_name": this.deal.result.f_user_name,
-          "f_comments": '',
-          "f_operator": Vue.user.name,
-          "f_operatorid": Vue.user.id,
-          "f_orgid": Vue.user.orgid,
-          "f_orgname": Vue.user.orgs,
-          "f_depid": Vue.user.depids,
-          "f_depname": Vue.user.deps,
-          "f_describe": `${Vue.user.name}对用户${this.deal.result.f_user_name}进行取消拉黑`,
-          "f_userinfo_id": {
-            "f_userinfo_id": res1.data[0].f_userinfo_id,
-            "f_user_state": "正常",
-            "version": res1.data[0].version
-          },
-          "f_limit_times":"",
-          "f_limit_value":""
-        }
-      }, {resolveMsg: null, rejectMsg: null})
-    },
-    // 签名回调
-    signCallback(prop, fileName) {
-      console.log("签名回调地址" + fileName)
-      // HostApp.alert('绑定属性:' + prop + ' 文件全路径如file:///storage/sdcard0/safecheck/abc.jpg：' + fullFileName)
-      HostApp.__this__.$set('deal.f_dealsign_path', fileName)
-      HostApp.__callback__ = null
-      HostApp.__this__ = null
-    },
-    // 用户签名
-    sign() {
-      if (!this.deal.f_deal_path) {
-        this.$showMessage('请先拍摄处理后照片!!!')
-        return
-      }
-      this.delAudioFile('f_dealsign_path', this.deal.f_dealsign_path)
-      let prop = 'f_dealsign_path'
-      let idx = 'aofeng'
-      let fileName
-      if (!this.deal.f_dealsign_path) {
-        fileName = Util.guid() + '-valve-' + idx + '-' + prop + '.jpg'
-      } else {
-        fileName = Util.getFileName(this.deal.f_dealsign_path)
-      }
-      HostApp.__callback__ = this.signCallback
-      HostApp.__this__ = this
-      HostApp.getSignature({
-        file: fileName,
-        requestCode: 111,
-        callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");'
-      })
-    },
-    delAudioFile(prop, fileName) {
-      if (!fileName)
-        return
-      else {
-        HostApp.delfile(fileName)
-        this.deal[prop] = null
-      }
-    },
-    commitDealDefect() {
-      //tag
-      //tag)
-      // if (!this.deal.f_deal_path) {
-      //   this.$showMessage('处理后照片必须上传')
-      //   return
-      // }
-      if (this.isNeedDealSign && !this.deal.f_dealsign_path) {
-        this.$showMessage('签名必须上传')
-        return
-      }
-      if (this.deletebacklistisselect){
-        this.deletebacklist()
-      }
-      this.deal.f_other_dealpath = this.deal.f_deal_path
-      HostApp.__this__ = this
-      HostApp.logicWithHint({
-        'logic': 'safe_dealWithDefect', 'callback': 'javascript: HostApp.__this__.commitCallBack()',
-        'data': this.deal, 'backresult': 1
-      })
-    },
-    commitCallBack(jo) {
-      //tag
-      //tag)
-      if (jo.state == 'ok') {
-        let ress = JSON.parse(jo.result)
-        if (ress.code == 200) {
-          this.$showMessage(ress.msg)
-          this.closeshowModal1()
-        } else {
-          this.$showMessage(ress.msg)
-        }
-      } else {
-        this.$showMessage('本地服务调用失败')
-      }
-    },
-    delfile(prop, fileName) {
-      if (fileName == Vue.nopic)
-        return
-      else {
-        HostApp.delfile(fileName)
-        this.deal[prop] = Vue.nopic
-      }
-    },
-    openshowModal(val) {
-      this.row = val
-      this.showModal = true
-    },
-    closeshowModal() {
-      this.showimg = ''
-      this.showModal = false
-    },
-    openshowModal1(val) {
-      this.deal.result = val
-      //tag
-      //tag
-      this.deletebacklistisselect = false
-      this.showModal1 = true
-    },
-    closeshowModal1() {
-      this.deal = {
-        result: {},
-        f_deal_path: '',
-        f_other_dealpath1: '',
-        f_other_dealpath2: '',
-        f_deal_remark: '',
-        f_dealsign_path: '', //签名
-        f_dealer: Vue.user.name,
-        f_dealer_id: Vue.user.id
-      }
-      this.showModal1 = false
-      this.selfSearch()
-    },
-    cameraCallBack(prop, fileName) {
-      HostApp.__this__.$set( 'deal.'+prop+'', fileName)
-      HostApp.__callback__ = null
-      HostApp.__this__ = null
-    },
-    takePic(prop, title) {
-      HostApp.__callback__ = this.cameraCallBack
-      HostApp.__this__ = this
-      let fileName
-      if (!this.deal[prop] || this.deal[prop].includes("nopic.png")) {
-        fileName = Util.guid() + '-' + prop + '.jpg'
-      } else {
-        fileName = Util.getFileName(this.deal[prop])
-      }
-      //tag
-      //tag
-      HostApp._open_a_page({
-        type: 'boomerang',
-        page: 'com.aofeng.hybrid.android.peripheral.CameraActivity',
-        param: {
-          file: fileName,
-          requestCode: 111,
-          callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");',
-          watermark: title + '\t时间：' + Util.toStandardTimeString() + '\t' + Vue.user.name
-        }
-      })
-    },
-    selfSearch() {
-
-      let condition = "1=1 "
-      if (this.$refs.paged.$refs.cri.model.f_user_name) {
-        if (this.$refs.paged.$refs.cri.model.f_user_name.toString().trim()) {
-          condition += " and f_user_name like '" + this.$refs.paged.$refs.cri.model.f_user_name + "%'"
-        }
-      }
-      if (this.$refs.paged.$refs.cri.model.f_userinfo_code) {
-        if (this.$refs.paged.$refs.cri.model.f_userinfo_code.toString().trim()) {
-          condition += " and f_userinfo_code = '" + this.$refs.paged.$refs.cri.model.f_userinfo_code + "'"
-        }
-      }
-      if (this.$refs.paged.$refs.cri.model.f_item_name) {
-        if (this.$refs.paged.$refs.cri.model.f_item_name.toString().trim()) {
-          condition += " and f_item_name like '" + this.$refs.paged.$refs.cri.model.f_item_name + "%'"
-        }
-      }
-      if (this.$refs.paged.$refs.cri.model.f_checker_name) {
-        if (this.$refs.paged.$refs.cri.model.f_checker_name.toString().trim()) {
-          condition += " and f_checker_name = '" + this.$refs.paged.$refs.cri.model.f_checker_name + "'"
-        }
-      }
-      if (this.$refs.paged.$refs.cri.model.f_address) {
-        if (this.$refs.paged.$refs.cri.model.f_address.toString().trim()) {
-          condition += " and f_address like '%" + this.$refs.paged.$refs.cri.model.f_address + "%'"
-        }
-      }
-      if (this.$refs.paged.$refs.cri.model.f_start_date) {
-        if (this.$refs.paged.$refs.cri.model.f_start_date.toString().trim()) {
-          condition += " and f_offsite_time > '" + this.$refs.paged.$refs.cri.model.f_start_date + "'"
-        }
-      }
-      if (this.$refs.paged.$refs.cri.model.f_end_date) {
-        if (this.$refs.paged.$refs.cri.model.f_end_date.toString().trim()) {
-          condition += " and f_offsite_time < '" + this.$refs.paged.$refs.cri.model.f_end_date + "'"
-        }
-      }
-      if (this.$refs.paged.$refs.cri.model.f_user_type) {
-        if (this.$refs.paged.$refs.cri.model.f_user_type.toString().trim()) {
-          condition += " and f_check_type = '" + this.$refs.paged.$refs.cri.model.f_user_type + "'"
-        }
-      }
-      if (this.$refs.paged.$refs.cri.model.f_repairman) {
-        if (this.$refs.paged.$refs.cri.model.f_repairman.toString().trim()) {
-          condition += " and f_repairman like '%" + this.$refs.paged.$refs.cri.model.f_repairman + "%'"
-        }
-      }
-      if (this.$refs.paged.$refs.cri.model.sq_endDate) {
-        if (this.$refs.paged.$refs.cri.model.sq_endDate.toString().trim()) {
-          condition += " and f_repair_date <= '" + this.$refs.paged.$refs.cri.model.sq_endDate + "'"
-        }
-      }
-      if (this.$refs.paged.$refs.cri.model.sq_startDate) {
-        if (this.$refs.paged.$refs.cri.model.sq_startDate.toString().trim()) {
-          condition += " and f_repair_date >= '" + this.$refs.paged.$refs.cri.model.sq_startDate + "'"
-        }
-      }
-      if (this.$refs.paged.$refs.cri.model.is_repair) {
-        if (this.$refs.paged.$refs.cri.model.is_repair == '已处理') {
-          condition += " and f_repair_date != '****-**-** **:**:**'"
-        }else if (this.$refs.paged.$refs.cri.model.is_repair == '未处理'){
-          condition += " and f_repair_date = '****-**-** **:**:**'"
-        }
-      }
-
-
-      //tag
-      this.model.search(condition)
-    },
-
-    hidden() {
-      this.criteriaShow = !this.criteriaShow
-    }
-  }
-}
-</script>
+<style scoped>
+.bg {
+  background-color: blue;
+  height: 1px;
+  border: 0;
+}
+
+.app-row {
+  background-color: white;
+  padding: 10px 10px 0 10px;
+  border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+}
+
+.search_input {
+  border: 0;
+  outline: none;
+}
+
+.font {
+  font: 15px PingFang-SC-Medium;
+  color: #666666;
+}
+
+.input-font {
+  font: 15px PingFang-SC-Medium;
+  color: #333333;
+}
+
+.btn-font {
+  font: 600 16px PingFang-SC-Bold;
+  color: #499EDF;
+}
+
+.btn-color {
+  background-color: #FFFFFF;
+  border-radius: 10px;
+  border: 1px solid #499EDF;
+}
+
+.app-text {
+  font-size: 12px;
+}
+
+.panel-self {
+  border-radius: 10px;
+  border: 1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+
+.yybtn-color {
+  background-color: #499edf;
+  border-radius: 4px;
+  border: 1px solid #499EDF;
+  color: #FFFFFF;
+  font: 14px PingFang-SC-Bold;
+}
+
+.qxbtn-color {
+  background-color: #FFFFFF;
+  border-radius: 4px;
+  color: #499edf;
+  font: 14px PingFang-SC-Bold;
+  border: 1px solid #499EDF;
+}
+
+.button_shrink_top {
+  width: 35px;
+  height: 35px;
+  background-size: 100%;
+  background-image: url("../../../static/newStyle/stretch_top.png")
+}
+
+.button_shrink_bottom {
+  width: 35px;
+  height: 35px;
+  background-size: 100%;
+  background-image: url("../../../static/newStyle/stretch_bottom.png")
+}
+
+.button_shrink_left {
+  width: 35px;
+  height: 35px;
+  background-size: 100%;
+  background-image: url("../../../static/newStyle/stretch_left.png")
+}
+
+.button_shrink_right {
+  width: 35px;
+  height: 35px;
+  background-size: 100%;
+  background-image: url("../../../static/newStyle/stretch_right.png")
+}
+</style>
+<template>
+  <div style="height: auto;width: 100%">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+        <div partial>
+          <form>
+            <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 class="search_input input-font" v-model=model.f_user_name
+                       condition="tcp.f_user_name like '%{}%'"/>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_userinfo_code" class="font text-left">用户编号：</label>
+              </div>
+              <div class="col-xs-8">
+                <input id="f_userinfo_code" class="search_input input-font"
+                       v-model=model.f_userinfo_code condition="tcp.f_userinfo_code like '%{}%'"/>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_userinfo_code" class="font text-left">安检人员：</label>
+              </div>
+              <div class="col-xs-8">
+                <input id="f_userinfo_code" class="search_input input-font"
+                       v-model=model.f_checker_name condition="tcp.f_checker_name 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">
+                <input class="search_input input-font"
+                       v-model=model.f_address condition="tcp.f_address 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>
+              <v-select id="f_user_type" :value.sync="model.f_item_name" class="input-font"
+                        :width="'60%'"
+                        :options='$parent.$parent.item_types' placeholder='隐患项'
+                        v-model="model.f_item_name" condition="f_item_name = '{}'" close-on-select
+                        clear-button></v-select>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/是否已检.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_state" class="font text-left">起始时间：</label>
+              </div>
+              <datepicker id="f_start_date"
+                          placeholder='起始时间'
+                          :value.sync="model.f_start_date"
+                          :disabled-days-of-Week="[]"
+                          v-model="model.f_start_date"
+                          class="input-font col-xs-8"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          :show-reset-button="reset" readonly="readonly">
+              </datepicker>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/是否已检.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_state" class="font text-left">结束时间：</label>
+              </div>
+              <datepicker id="f_end_date"
+                          placeholder='结束时间'
+                          :value.sync="model.f_end_date"
+                          :disabled-days-of-Week="[]"
+                          v-model="model.f_end_date"
+                          class="input-font col-xs-8"
+                          :format="'yyyy-MM-dd 23:59:00'"
+                          :show-reset-button="reset" readonly="readonly">
+              </datepicker>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/用户类型.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_user_type" class="font text-left">用户类型：</label>
+              </div>
+              <v-select id="f_user_type" :value.sync="model.f_user_type" class="input-font"
+                        :width="'60%'"
+                        :options='$parent.$parent.user_types' placeholder='请选择用户类型'
+                        v-model="model.f_user_type" condition="f_user_type = '{}'" close-on-select
+                        clear-button></v-select>
+            </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 class="search_input input-font"
+                       v-model=model.f_repairman condition="f_repairman 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">
+                <datepicker id="startDate" placeholder="处理开始日期"
+                            style="width: 60%!important;"
+                            v-model="model.sq_startDate"
+                            :value.sync="model.sq_startDate"
+                            :format="'yyyy-MM-dd 00:00:00'"
+                            :show-reset-button="true"
+                            condition="f_repair_date >= '{}'">
+                </datepicker>
+              </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">
+                <datepicker id="endDate" placeholder="处理结束日期"
+                            style="width: 60%!important;"
+                            v-model="model.sq_endDate"
+                            :value.sync="model.sq_endDate"
+                            :format="'yyyy-MM-dd 23:59:59'"
+                            :show-reset-button="true"
+                            condition="f_repair_date<= '{}'">
+                </datepicker>
+              </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.is_repair" class="input-font"
+                          :options='$parent.$parent.is_repairs' placeholder='处理状态' :value-single="true"
+                          v-model="is_repair" close-on-select clear-button></v-select>
+              </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="$parent.$parent.selfSearch">查询
+              </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>
+            <div style="height:30px;"></div>
+          </form>
+        </div>
+      </criteria>
+      <list :model="model" partial='list'>
+        <div partial>
+          <div class="auto app-text" style="margin-top: 5px;">
+            <div class="panel" style="padding: 10px 10px 5px 10px;">
+              <div class="panel-body panel-self">
+                <div class="col-xs-12">
+                  <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>
+                </div>
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户名称:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{ row.f_user_name }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <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_phone }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <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_offsite_time }}</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_address }}</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_checker_name }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font"><b>检&ensp;查&ensp;项:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_device_type }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font"><b>隐&ensp;患&ensp;项:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_item_name }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <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_item_value }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <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_repairman }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <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_repair_date }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <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_repair_date == '****-**-** **:**:**' ? '未处理' : '已处理' }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <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_comments }}</p>
+                </div>
+                <!--                <div class="col-xs-12">-->
+                <!--                  <button type="button" name="button" class="btn btn-primary"-->
+                <!--                          style="background-color:#499edf;float: right"-->
+                <!--                          @click="$parent.$parent.$parent.openshowModal(row)">查看-->
+                <!--                  </button>-->
+                <!--                  <button type="button" name="button" class="btn btn-primary"-->
+                <!--                          style="background-color:#499edf;float: right;margin-right:10px;"-->
+                <!--                          @click="$parent.$parent.$parent.openshowModal1(row)">处理-->
+                <!--                  </button>-->
+                <!--<button type="button" class="btn btn-default" @click="$parent.$parent.$parent.ceshi">确认2</button>-->
+                <!--                </div>-->
+              </div>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+  </div>
+  <modal :show.sync="showModal">
+    <div slot="modal-header" class="modal-header">
+      <h4 class="modal-title">
+        隐患照片
+      </h4>
+    </div>
+    <div slot="modal-body" class="modal-body">
+      <div class="from-group">
+        <div class="row">
+          <div class="col-md-6">
+            <img-self v-if="row.f_path" :src="`${this.$androidUtil.getProxyUrl()}/rs/image/file/`+row.f_path" width="300" height="400"></img-self>
+            <img-self v-if="row.f_p1_path" :src="`${this.$androidUtil.getProxyUrl()}/rs/image/file/`+row.f_p1_path" width="300" height="400"></img-self>
+            <img-self v-if="row.f_p2_path" :src="`${this.$androidUtil.getProxyUrl()}/rs/image/file/`+row.f_p2_path" width="300" height="400"></img-self>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-default" @click="closeshowModal">确认</button>
+    </div>
+  </modal>
+  <modal :show.sync="showModal1">
+    <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-bottom: 10px">
+        <p class="panel-title col-xs-3 text-left font"><b>隐&ensp;患&ensp;项:</b></p>
+        <p class="panel-title col-xs-9 text-left input-font">{{ deal.result.f_item_name }}</p>
+      </div>
+      <div class="row" style="margin-bottom: 10px">
+        <p class="panel-title col-xs-3 text-left font"><b>隐患原因:</b></p>
+        <p class="panel-title col-xs-9 text-left input-font">{{ deal.result.f_item_value }}</p>
+      </div>
+      <div class="form-group col-sm-12">
+        <div class="auto">
+          <div class="panel" style="padding: 10px 10px 5px 10px;">
+            <div class="panel-body panel-self"
+                 style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+              <img-self :src="deal.f_deal_path" alt="整改照片" :width="140" :height="170" capture="camera"
+                        type="file"></img-self>
+              <div class="row text-right div-photo" style="height: 50px;margin-top: -30px">
+                <img src="../../assets/remove.png" @click="delfile('f_deal_path', deal.f_deal_path)"></img>
+                <button type="button" name="button" class="btn btn-primary btn-photo"
+                        @click="takePic('f_deal_path','整改照片')">拍照
+                </button>
+              </div>
+            </div>
+            <div class="panel-body panel-self"
+                 style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+              <img-self :src="deal.f_other_dealpath1" alt="整改照片" :width="140" :height="170" capture="camera"
+                        type="file"></img-self>
+              <div class="row text-right div-photo" style="height: 50px;margin-top: -30px">
+                <img src="../../assets/remove.png" @click="delfile('f_other_dealpath1', deal.f_other_dealpath1)"></img>
+                <button type="button" name="button" class="btn btn-primary btn-photo"
+                        @click="takePic('f_other_dealpath1','整改照片')">拍照
+                </button>
+              </div>
+            </div>
+            <div class="panel-body panel-self"
+                 style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+              <img-self :src="deal.f_other_dealpath2" alt="整改照片" :width="140" :height="170" capture="camera"
+                        type="file"></img-self>
+              <div class="row text-right div-photo" style="height: 50px;margin-top: -30px">
+                <img src="../../assets/remove.png" @click="delfile('f_other_dealpath2', deal.f_other_dealpath2)"></img>
+                <button type="button" name="button" class="btn btn-primary btn-photo"
+                        @click="takePic('f_other_dealpath2','整改照片')">拍照
+                </button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="form-group col-sm-12" v-if="isNeedDealSign">
+        <p class="panel-title  text-left font" style="text-align: center">用户签名:</p>
+        <div class="auto">
+          <div class="panel" style="padding: 10px 10px 5px 10px;">
+            <div class="panel-body panel-self"
+                 style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
+              <img :src="deal.f_dealsign_path" :width="200" :height="150"/>
+              <div class="row text-right div-photo" style="height: 50px;margin-top: 60px">
+                <button type="button" name="button" class="btn btn-primary btn-photo" @click="sign">签名</button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-xs-2">
+          <p class="panel-title  text-left font" style="text-align: center">处理结果</p>
+        </div>
+        <div class="col-xs-9">
+          <textarea class="input-font " v-model=deal.f_deal_remark style="width: 100%"></textarea>
+        </div>
+      </div>
+      <div v-if="isCancelLimitGas" style="display: flex;align-items: end;height: 30px;gap: 10px;padding-left: 16px;">
+        <input type="checkbox" v-model="deletebacklistisselect"/>
+        <div style="height: 18px">取消限制该用户购气</div>
+      </div>
+    </div>
+    <div slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-default" @click="commitDealDefect">确认</button>
+      <button type="button" class="btn btn-default" @click="closeshowModal1">取消</button>
+    </div>
+  </modal>
+</template>
+
+<script>
+import Vue from 'vue'
+import {HttpResetClass, PagedList} from 'vue-client'
+import * as Util from '../Util'
+
+export default {
+  title: '隐患明细',
+  data() {
+    return {
+      row:{},
+      is_repairs:[{label: '请选择', value: ''},
+        {label: '已处理', value: '已处理'},
+        {label: '未处理', value: '未处理'}],
+      showModal: false,
+      showModal1: false,
+      showimg: '',
+      deal: {
+        result: {},
+        f_deal_path: '',
+        f_other_dealpath1: '',
+        f_other_dealpath2: '',
+        f_deal_remark: '',
+        f_dealsign_path: '', //签名
+        f_dealer: Vue.user.name,
+        f_dealer_id: Vue.user.id
+      },
+      user_types: [
+        {label: '请选择用户类型', value: ''},
+        {label: '民用', value: '民用'},
+        {label: '非民用', value: '非民用'}
+      ],
+      item_types: [{label: '全部', value: ''}],
+      f_filialeids: '',
+      model: new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/defectDetails`, 20, {
+        condition: 'this.condition',
+        f_filialeids: `('${Vue.user.orgid}')`,
+        f_checker_id: `'${Vue.user.id}'`
+      }),
+      criteriaShow: false,
+      isNeedDealSign: this.$appdata.getSingleValue('隐患处理是否需要签名') == 'true',
+      isCancelLimitGas: this.$appdata.getSingleValue('隐患处理-取消限制购气') == '是',
+      deletebacklistisselect: false
+    }
+  },
+  ready() {
+    this.selfSearch()
+    this.getDefectItemConfig()
+  },
+  methods: {
+    async getDefectItemConfig() {
+      const uniqueMap = new Map(); // 去重容器
+      const result = [];
+      if (Vue.config2 && Vue.config2.safecheck && Vue.config2.safecheck.DevicesConfig) {
+        const devicesConfig = Vue.config2.safecheck.DevicesConfig;
+        for (const key in devicesConfig) {
+          if (!uniqueMap.has(key)) {
+            uniqueMap.set(key, true);
+            result.push({ label: key, value: key });
+          }
+        }
+      }
+      if (Vue.config2 && Vue.config2.safecheck && Vue.config2.safecheck.DevicesSetConfig) {
+        const devicesSetConfig = Vue.config2.safecheck.DevicesSetConfig;
+        for (const key in devicesSetConfig) {
+          if (!uniqueMap.has(key)) {
+            uniqueMap.set(key, true);
+            result.push({ label: key, value: key });
+          }
+        }
+      }
+      this.item_types = [
+        { label: '全部', value: '' },
+        ...result
+      ];
+    },
+    async deletebacklist() {
+      ////tag)
+      let http = new HttpResetClass()
+      ////tag
+      let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
+        data: {
+          items: "*",
+          tablename: "t_userinfo",
+          condition: `f_userinfo_code = ${this.deal.result.f_userinfo_code}`,
+          orderitem: "f_userinfo_code"
+        }
+      }, {resolveMsg: null, rejectMsg: null})
+      ////tag)
+      ////tag
+      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
+        data: {
+          "f_operat_type": "取消拉黑",
+          "f_state": "有效",
+          "f_user_name": this.deal.result.f_user_name,
+          "f_comments": '',
+          "f_operator": Vue.user.name,
+          "f_operatorid": Vue.user.id,
+          "f_orgid": Vue.user.orgid,
+          "f_orgname": Vue.user.orgs,
+          "f_depid": Vue.user.depids,
+          "f_depname": Vue.user.deps,
+          "f_describe": `${Vue.user.name}对用户${this.deal.result.f_user_name}进行取消拉黑`,
+          "f_userinfo_id": {
+            "f_userinfo_id": res1.data[0].f_userinfo_id,
+            "f_user_state": "正常",
+            "version": res1.data[0].version
+          },
+          "f_limit_times":"",
+          "f_limit_value":""
+        }
+      }, {resolveMsg: null, rejectMsg: null})
+    },
+    // 签名回调
+    signCallback(prop, fileName) {
+      console.log("签名回调地址" + fileName)
+      // HostApp.alert('绑定属性:' + prop + ' 文件全路径如file:///storage/sdcard0/safecheck/abc.jpg：' + fullFileName)
+      HostApp.__this__.$set('deal.f_dealsign_path', fileName)
+      HostApp.__callback__ = null
+      HostApp.__this__ = null
+    },
+    // 用户签名
+    sign() {
+      if (!this.deal.f_deal_path) {
+        this.$showMessage('请先拍摄处理后照片!!!')
+        return
+      }
+      this.delAudioFile('f_dealsign_path', this.deal.f_dealsign_path)
+      let prop = 'f_dealsign_path'
+      let idx = 'aofeng'
+      let fileName
+      if (!this.deal.f_dealsign_path) {
+        fileName = Util.guid() + '-valve-' + idx + '-' + prop + '.jpg'
+      } else {
+        fileName = Util.getFileName(this.deal.f_dealsign_path)
+      }
+      HostApp.__callback__ = this.signCallback
+      HostApp.__this__ = this
+      HostApp.getSignature({
+        file: fileName,
+        requestCode: 111,
+        callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");'
+      })
+    },
+    delAudioFile(prop, fileName) {
+      if (!fileName)
+        return
+      else {
+        HostApp.delfile(fileName)
+        this.deal[prop] = null
+      }
+    },
+    commitDealDefect() {
+      //tag
+      //tag)
+      // if (!this.deal.f_deal_path) {
+      //   this.$showMessage('处理后照片必须上传')
+      //   return
+      // }
+      if (this.isNeedDealSign && !this.deal.f_dealsign_path) {
+        this.$showMessage('签名必须上传')
+        return
+      }
+      if (this.deletebacklistisselect){
+        this.deletebacklist()
+      }
+      this.deal.f_other_dealpath = this.deal.f_deal_path
+      HostApp.__this__ = this
+      HostApp.logicWithHint({
+        'logic': 'safe_dealWithDefect', 'callback': 'javascript: HostApp.__this__.commitCallBack()',
+        'data': this.deal, 'backresult': 1
+      })
+    },
+    commitCallBack(jo) {
+      //tag
+      //tag)
+      if (jo.state == 'ok') {
+        let ress = JSON.parse(jo.result)
+        if (ress.code == 200) {
+          this.$showMessage(ress.msg)
+          this.closeshowModal1()
+        } else {
+          this.$showMessage(ress.msg)
+        }
+      } else {
+        this.$showMessage('本地服务调用失败')
+      }
+    },
+    delfile(prop, fileName) {
+      if (fileName == Vue.nopic)
+        return
+      else {
+        HostApp.delfile(fileName)
+        this.deal[prop] = Vue.nopic
+      }
+    },
+    openshowModal(val) {
+      this.row = val
+      this.showModal = true
+    },
+    closeshowModal() {
+      this.showimg = ''
+      this.showModal = false
+    },
+    openshowModal1(val) {
+      this.deal.result = val
+      //tag
+      //tag
+      this.deletebacklistisselect = false
+      this.showModal1 = true
+    },
+    closeshowModal1() {
+      this.deal = {
+        result: {},
+        f_deal_path: '',
+        f_other_dealpath1: '',
+        f_other_dealpath2: '',
+        f_deal_remark: '',
+        f_dealsign_path: '', //签名
+        f_dealer: Vue.user.name,
+        f_dealer_id: Vue.user.id
+      }
+      this.showModal1 = false
+      this.selfSearch()
+    },
+    cameraCallBack(prop, fileName) {
+      HostApp.__this__.$set( 'deal.'+prop+'', fileName)
+      HostApp.__callback__ = null
+      HostApp.__this__ = null
+    },
+    takePic(prop, title) {
+      HostApp.__callback__ = this.cameraCallBack
+      HostApp.__this__ = this
+      let fileName
+      if (!this.deal[prop] || this.deal[prop].includes("nopic.png")) {
+        fileName = Util.guid() + '-' + prop + '.jpg'
+      } else {
+        fileName = Util.getFileName(this.deal[prop])
+      }
+      //tag
+      //tag
+      HostApp._open_a_page({
+        type: 'boomerang',
+        page: 'com.aofeng.hybrid.android.peripheral.CameraActivity',
+        param: {
+          file: fileName,
+          requestCode: 111,
+          callback: 'javascript:HostApp.__callback__("' + prop + '", "%s");',
+          watermark: title + '\t时间：' + Util.toStandardTimeString() + '\t' + Vue.user.name
+        }
+      })
+    },
+    selfSearch() {
+
+      let condition = "1=1 "
+      if (this.$refs.paged.$refs.cri.model.f_user_name) {
+        if (this.$refs.paged.$refs.cri.model.f_user_name.toString().trim()) {
+          condition += " and f_user_name like '" + this.$refs.paged.$refs.cri.model.f_user_name + "%'"
+        }
+      }
+      if (this.$refs.paged.$refs.cri.model.f_userinfo_code) {
+        if (this.$refs.paged.$refs.cri.model.f_userinfo_code.toString().trim()) {
+          condition += " and f_userinfo_code = '" + this.$refs.paged.$refs.cri.model.f_userinfo_code + "'"
+        }
+      }
+      if (this.$refs.paged.$refs.cri.model.f_item_name) {
+        if (this.$refs.paged.$refs.cri.model.f_item_name.toString().trim()) {
+          condition += " and f_item_name like '" + this.$refs.paged.$refs.cri.model.f_item_name + "%'"
+        }
+      }
+      if (this.$refs.paged.$refs.cri.model.f_checker_name) {
+        if (this.$refs.paged.$refs.cri.model.f_checker_name.toString().trim()) {
+          condition += " and f_checker_name = '" + this.$refs.paged.$refs.cri.model.f_checker_name + "'"
+        }
+      }
+      if (this.$refs.paged.$refs.cri.model.f_address) {
+        if (this.$refs.paged.$refs.cri.model.f_address.toString().trim()) {
+          condition += " and f_address like '%" + this.$refs.paged.$refs.cri.model.f_address + "%'"
+        }
+      }
+      if (this.$refs.paged.$refs.cri.model.f_start_date) {
+        if (this.$refs.paged.$refs.cri.model.f_start_date.toString().trim()) {
+          condition += " and f_offsite_time > '" + this.$refs.paged.$refs.cri.model.f_start_date + "'"
+        }
+      }
+      if (this.$refs.paged.$refs.cri.model.f_end_date) {
+        if (this.$refs.paged.$refs.cri.model.f_end_date.toString().trim()) {
+          condition += " and f_offsite_time < '" + this.$refs.paged.$refs.cri.model.f_end_date + "'"
+        }
+      }
+      if (this.$refs.paged.$refs.cri.model.f_user_type) {
+        if (this.$refs.paged.$refs.cri.model.f_user_type.toString().trim()) {
+          condition += " and f_check_type = '" + this.$refs.paged.$refs.cri.model.f_user_type + "'"
+        }
+      }
+      if (this.$refs.paged.$refs.cri.model.f_repairman) {
+        if (this.$refs.paged.$refs.cri.model.f_repairman.toString().trim()) {
+          condition += " and f_repairman like '%" + this.$refs.paged.$refs.cri.model.f_repairman + "%'"
+        }
+      }
+      if (this.$refs.paged.$refs.cri.model.sq_endDate) {
+        if (this.$refs.paged.$refs.cri.model.sq_endDate.toString().trim()) {
+          condition += " and f_repair_date <= '" + this.$refs.paged.$refs.cri.model.sq_endDate + "'"
+        }
+      }
+      if (this.$refs.paged.$refs.cri.model.sq_startDate) {
+        if (this.$refs.paged.$refs.cri.model.sq_startDate.toString().trim()) {
+          condition += " and f_repair_date >= '" + this.$refs.paged.$refs.cri.model.sq_startDate + "'"
+        }
+      }
+      if (this.$refs.paged.$refs.cri.model.is_repair) {
+        if (this.$refs.paged.$refs.cri.model.is_repair == '已处理') {
+          condition += " and f_repair_date != '****-**-** **:**:**'"
+        }else if (this.$refs.paged.$refs.cri.model.is_repair == '未处理'){
+          condition += " and f_repair_date = '****-**-** **:**:**'"
+        }
+      }
+
+
+      //tag
+      this.model.search(condition)
+    },
+
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    }
+  }
+}
+</script>