safecheck-client 4.0.2-2 → 4.0.2-21

package/src/filiale/kelai/pc/FaultLimitGas/FaultLimitGasList.vue

@@ -1,518 +1,518 @@
-<template>
-  <div>
-    <div :style="{'height':needRepair?'60%':'100%'}">
-      <criteria-paged :model="model" :pager="false" v-ref:paged>
-        <criteria partial='criteria'>
-          <div partial>
-            <ul class="nav nav-tabs">
-              <li role="presentation" class="active"><a style="	color: #5ac0d9 !important;">隐患明细</a></li>
-            </ul>
-          </div>
-        </criteria>
-        <data-grid :model="model" partial='list' class="table_sy">
-          <template partial='head'>
-            <tr>
-              <!--              <th>-->
-              <!--                <nobr>隐患设备</nobr>-->
-              <!--              </th>-->
-              <th>
-                <nobr>隐患项</nobr>
-              </th>
-              <th>
-                <nobr>隐患原因</nobr>
-              </th>
-              <th>
-                <nobr>隐患处理方式</nobr>
-              </th>
-              <th>
-                <nobr>处理结果</nobr>
-              </th>
-              <th  v-if="$parent.$parent.$parent.checkDefect=='是'">
-                <nobr>审核结果</nobr>
-              </th>
-              <th>
-                <nobr>操作</nobr>
-              </th>
-            </tr>
-          </template>
-          <template partial='body'>
-            <!--            <td style="text-align: center">-->
-            <!--              <nobr>{{row.f_device_type}}</nobr>-->
-            <!--            </td>-->
-            <td style="text-align: center">
-              <nobr>{{row.f_item_name}}</nobr>
-            </td>
-            <td style="text-align: center">
-              <nobr>{{row.f_item_value}}</nobr>
-            </td>
-            <td style="text-align: center">
-              <nobr>{{row.f_repaire_type}}</nobr>
-            </td>
-            <td style="text-align: center">
-              <nobr>{{row.f_repaire_state}}</nobr>
-            </td>
-            <td style="text-align: center"  v-if="$parent.$parent.$parent.checkDefect=='是'">
-              <nobr>{{row.f_audit_results?row.f_audit_results:'暂无审核结果'}}</nobr>
-            </td>
-            <td style="text-align: center">
-              <div>
-<!--                <img-button v-if="row.f_repaire_type != '无隐患' && row.f_repaire_type != '维修已处理' && row.f_path" :src="'/rs/image/file/'+row.f_path" :value="'隐患图片'"></img-button>-->
-<!--                <button style="margin-top: 3px" v-if="row.f_repaire_type == '维修已处理'" class="button_new-1 button_spacing" @click="$parent.$parent.$parent.solveDefect( row, 'view')">处理详情</button>-->
-                <button style="margin-top: 3px" class="button_new-1 button_spacing" @click="$parent.$parent.$parent.solveDefect(row, row.f_repaire_type)">处理详情</button>
-                <button style="margin-top: 3px" v-if="row.f_repaire_type == '隐患未处理' && $parent.$parent.$parent.showHandleDefectButton === '是'" class="button_spacing button_search-1" @click="$parent.$parent.$parent.solveDefect(row, 'solve')">处理隐患</button>
-              </div>
-            </td>
-          </template>
-        </data-grid>
-      </criteria-paged>
-    </div>
-
-    <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" v-if="solveModal.preData.defectImg">
-          <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" v-show="solveModal.preData.state == '已处理' || solveModal.preData.type != 'solve'">
-          <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" v-show="solveModal.preData.state == '已处理'">
-          <label class="font_normal_body">处&nbsp;理&nbsp;人</label>
-          <input v-if="solveModal.preData.type != 'solve'" class="input_search" style="width: 60%" disabled="true" type="text" v-model="solveModal.uploadData.f_repairman" placeholder="处理人">
-          <v-select
-            v-if="solveModal.preData.type == 'solve'"
-            :value.sync="solveModal.uploadData.f_repairman"
-            :value-single="true"
-            :options='toRepairModal.preData.repairers'
-            placeholder='请选择维修员'
-            close-on-select></v-select>
-        </div>
-        <div class="col-sm-6" style="margin-top: 10px" v-show="solveModal.preData.state == '已处理'">
-          <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.state == '已处理' && (solveModal.preData.repairedImg || solveModal.preData.repairedImg1 || solveModal.preData.repairedImg2) " class="col-sm-12" style="margin-bottom: 10px">
-          <p> <label class="font_normal_body">处理后图片</label></p>
-          <P></P>
-          <div class="col-sm-12">
-            <div class="col-sm-6" v-if="solveModal.preData.repairedImg">
-              <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg" style="margin-left: 10px"></img-self>
-            </div>
-            <div class="col-sm-6" v-if="solveModal.preData.repairedImg1">
-              <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg1"  style="margin-left: 10px"></img-self>
-            </div>
-            <div class="col-sm-6" v-if="solveModal.preData.repairedImg2">
-              <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg2"  style="margin-left: 10px"></img-self>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div slot="modal-footer" class="modal-footer" style="text-align: center">
-        <button class="button_search" v-if="checkDefect=='是' && solveModal.preData.type == 'view'" @click="auditsure('通过')" v-if="solveModal.preData.type == 'view' && !solveModal.f_audit_results">审核通过</button>
-        <button class="button_search" v-if="checkDefect=='是' && solveModal.preData.type == 'view'" @click="auditsure('不通过')" v-if="solveModal.preData.type == 'view' && !solveModal.f_audit_results">审核不通过</button>
-        <button class="button_search" v-if="solveModal.preData.type == 'solve'" @click="ok">确认</button>
-        <button class="button_search" @click="cancel">取消</button>
-      </div>
-    </modal>
-
-  </div>
-</template>
-
-<script>
-import {PagedList, HttpResetClass} from 'vue-client'
-import * as Util from '../../../../components/Util'
-import co from 'co'
-import Vue from "vue";
-
-const upSolveDefect = function * (self) {
-  let uploadData = self.solveModal.uploadData
-  //tag)
-  self.$resetpost('/api/af-safecheck/logic/pcRepairDefectNew', self.solveModal.uploadData, {resolveMsg: null, rejectMsg: null})
-    .then(res => {
-      if (res.data.code === 200) {
-        self.$showMessage('隐患已处理。')
-        self.showSolveModal = false
-        self.model.search('f_repaire_type != \'无隐患\'', {})
-        self.solveModal.uploadData={
-          id: '',
-          f_repairman: self.$login.f.name,
-          f_repair_date: Util.getNowDate().substr(0, 10),
-          f_repair_path: '',
-          imgSrc: '',
-          filename: '',
-          f_defect_remark:''
-        }
-      }
-    })
-}
-
-const sendRepair = function* (self) {
-  let preData = self.toRepairModal.preData
-  let uploadData = self.toRepairModal.uploadData
-
-  if (preData.dispatchType == '派发给站点') {
-    uploadData.model.serviceacitivity[0].f_meetunit = preData.f_meetunit
-    uploadData.model.serviceacitivity[0].f_reciever = preData.f_reciever
-    uploadData.model.f_meetunit = preData.f_meetunit
-    uploadData.model.f_orgstr = preData.f_reciever
-    uploadData.model.f_outlets = preData.f_outlets
-  } else if (preData.dispatchType == '派发给维修员') {
-    uploadData.model.serviceacitivity[0].f_reciever = preData.f_repairman
-    // uploadData.model.f_meetunit = self.$login.f.orgpathnames
-    // uploadData.model.f_orgstr = self.$login.f.orgpathstr
-    // uploadData.model.f_outlets = self.$login.f.f_parentname
-    uploadData.model.f_meetunit = self.$login.f.deps
-    uploadData.model.f_orgid = self.$login.f.orgid
-    uploadData.model.f_filiale = self.$login.f.org
-    uploadData.model.f_outlets = self.$login.f.deps
-    uploadData.model.f_filiale_id = self.$login.f.orgid
-    uploadData.toRepair = '一级派单'
-  }
-  let res = yield self.$resetpost('/api/af-safecheck/sql/GetUserForRepaireNew', {data: {f_userinfo_id: self.check.f_userinfo_id}})
-  preData.userInfo = res.data[0]
-  uploadData.model = Object.assign(uploadData.model, preData.userInfo)
-  uploadData.user.f_userinfo_id = preData.userInfo.f_userinfo_id
-  uploadData.model.f_repair_date = Util.getNowDate()
-  uploadData.model.f_repairtype = preData.f_repairtype
-  uploadData.model.f_remarks = preData.f_remarks
-  // 拼接failure
-  let failure = []
-  self.model.rows.forEach(row => {
-    if (row.f_repaire_type == '隐患未处理') {
-      failure.push({
-        f_failure_type: row.f_item_name,
-        failurecase: row.f_item_value?row.f_item_value.split(','):''
-      })
-    }
-  })
-  uploadData.model.failure = failure
-  // 拼接repairitems
-  let rows = JSON.parse(JSON.stringify(self.model.rows))
-  let repairitems = {
-    data: []
-  }
-  let safecheckOptions = [{"data": "已处理"}, {"data": "未处理"}]
-  // 取隐患未处理的
-  rows = rows.filter(row => row.f_repaire_type == '隐患未处理')
-  //tag)
-  // 开始拼接
-  rows.forEach(row => {
-    let existIndex = -1
-    // 判断该设备是否已经存在
-    for (let i = 0; i < repairitems.data.length; i++) {
-      if (repairitems.data[i].f_type == row.f_device_type) {
-        existIndex = i
-        break
-      }
-    }
-    if (existIndex == -1) {
-      // 不存在则新建
-      let newItem = {
-        f_type: row.f_device_type,
-        details: [{
-          f_defect_id: row.id,
-          f_project: `${row.f_item_name}:${row.f_item_value}`,
-          type: 'selector',
-          options: safecheckOptions
-        }]
-      }
-      repairitems.data.push(newItem)
-    } else {
-      // 存在则追加
-      repairitems.data[existIndex].details.push({
-        f_defect_id: row.id,
-        f_project: `${row.f_item_name}:${row.f_item_value}`,
-        type: 'selector',
-        options: safecheckOptions
-      })
-    }
-  })
-  uploadData.model.f_repairitems = repairitems
-  //tag)
-  // 调工单接口
-  let result = yield self.$resetpost('/api/af-safecheck/logic/callerSend', uploadData)
-  //tag)
-  if (result.data.f_service_id) {
-    const data = {
-      f_paper_id: rows[0].f_paper_id,
-      f_service_id: result.data.f_service_id,
-      itemsId: self.$login.convertToIn(rows.map(row => row.id))
-    }
-    //tag
-    let updateRes = yield self.$resetpost('/api/af-safecheck/logic/updateDefectStateNew', data)
-    if (updateRes.data.code == 200) {
-      self.$showMessage('隐患已转维修。')
-      self.model.search(`f_repaire_type != '无隐患'`, {})
-    }
-  }
-}
-
-export default {
-  title: '隐患项列表',
-  data() {
-    return {
-      model: new PagedList('api/af-safecheck/sql/GetDefectByPaperIdNew', 100, {
-        f_paper_id: 'this.f_paper_id',f_item_value: 'this.f_item_value'
-      }),
-      showSolveModal: false,
-      showToRepairModal: false,
-      showDefectModal: false,
-      valid: false,
-      checkDefect:null,
-      needRepair: false,
-      solveModal: {
-        preData: {
-          type: '',
-          defectImg: '',
-          repairedImg: '',
-          repairedImg1: '',
-          repairedImg2: '',
-          state: ''
-        },
-        uploadData: {
-          id: '',
-          f_repairman: this.$login.f.name,
-          f_repair_date: Util.getNowDate().substr(0, 10),
-          f_repair_path: '',
-          imgSrc: '',
-          filename: ''
-        }
-      },
-      toRepairModal: {
-        preData: {
-          dispatchTypeOptions: [{label: '派发给站点', value: '派发给站点'}, {label: '派发给维修员', value: '派发给维修员'}],
-          repairTypeOptions: this.$appdata.getParam('报修类型'),
-          dispatchType: '',
-          f_repairman: '',
-          f_repairtype: '',
-          f_remarks: '',
-          f_meetunit: '',
-          f_reciever: '',
-          f_outlets: '',
-          userInfo: {},
-          repairers: []
-        },
-        uploadData: {
-          model: {
-            serviceacitivity: [{
-              f_service_acitivity_type: '派单'
-            }],
-            f_repairitems: {},
-            failure: '',
-            f_source: '安检',
-            f_service_id: '',
-            f_contact_phone: '',
-            f_meetunit: '',
-            f_phone: '',
-            f_user_name: '',
-            f_address: '',
-            f_repair_date: '',
-            f_reciever: '',
-            f_remarks: '',
-            f_user_type: '',
-            f_area: '',
-            f_unit_name: '',
-            f_street: '',
-            f_residential_area: '',
-            f_building: '',
-            f_unit: '',
-            f_floor: '',
-            f_room: '',
-            aState: '',
-            f_repairtype: '',
-            f_userinfo_id: '',
-            f_userinfo_code: '',
-            f_orgstr: '',
-            f_outlets: '',
-            f_attendant: this.$login.f.name
-          },
-          loginUser: {
-            name: this.$login.f.name,
-            ename: this.$login.f.ename
-          },
-          user: {
-            f_userinfo_id: ''
-          },
-          callObj: null
-        }
-      },
-      showHandleDefectButton: null
-    }
-  },
-  props: ['check'],
-  ready() {
-    this.checkDefect=Vue.$appdata.getSingleValue('安检隐患维修后审核')
-    this.showHandleDefectButton = Vue.$appdata.getSingleValue('隐患查看处理隐患')
-    this.model.f_item_value = `(SELECT stuff(( SELECT ',' + f_item_value FROM t_devices_items_lists WHERE ( f_is_defect = 'true' OR di.f_is_defect = 'true') AND f_item_id = di.id FOR xml path ( '' ) ),1,1,'' ) )`
-    if (this.check) {
-      this.model.f_paper_id = this.check.id
-      this.model.search(`f_repaire_type != '无隐患'`, {})
-    }
-    this.getEmp()
-  },
-  methods: {
-    //审核通过
-    auditsure(info){
-      // 拿到t_devices_items 的ID，给f_audit_results中存入通过   如果未通过，需要可以再次派单，对隐患进行处理
-      var data = {
-        id: this.solveModal.uploadData.id,
-        info:info
-      }
-      let http = new HttpResetClass()
-      http.load('POST', 'api/af-safecheck/logic/DefectAuditUpdate', data, {resolveMsg: null, rejectMsg: null}).then((res) => {
-        if(res.data.code == 200){
-          this.model.search(`f_repaire_type != '无隐患'`, {})
-          this.showSolveModal = false
-          this.showToRepairModal = false
-          this.$showMessage('提交成功')
-        }else{
-          this.$showMessage('提交失败，请重试')
-        }
-      })
-    },
-    solveDefect(row, type) {
-      console.log(row)
-      this.solveModal.preData.defectImg = ''
-      this.solveModal.preData.f_repair_path = ''
-      this.solveModal.preData.repairedImg = ''
-      this.solveModal.preData.repairedImg1 = ''
-      this.solveModal.preData.repairedImg2 = ''
-      this.solveModal.preData.defectImg = row.f_path?'/rs/image/file/' + row.f_path:null
-      this.solveModal.uploadData.id = row.id
-      this.solveModal.preData.type = type
-      this.solveModal.preData.state = row.f_repaire_state
-      this.solveModal.preData.source = row.f_repair_path_source
-      if (row.f_repaire_state === '已处理') {
-        if (row.f_repair_path_source === '微信') {
-          this.solveModal.preData.f_repair_path = row.f_repair_path
-          this.solveModal.preData.repairedImg = row.f_repair_path
-          this.solveModal.preData.repairedImg1 = row.f_repair1_path
-        } else {
-          this.solveModal.preData.f_repair_path = row.f_repair_path? '/rs/image/file/' + row.f_repair_path:null
-          this.solveModal.preData.repairedImg = row.f_repair_path? '/rs/image/file/' + row.f_repair_path:null
-          this.solveModal.preData.repairedImg1 = row.f_other_dealpath1? '/rs/image/file/' + row.f_other_dealpath1:null
-          this.solveModal.preData.repairedImg2 = row.f_other_dealpath2? '/rs/image/file/' + row.f_other_dealpath2:null
-        }
-        if (type === '现场已处理') {
-          this.solveModal.uploadData.f_repairman = this.check.f_checker_name
-          this.solveModal.uploadData.f_repair_date = this.check.f_offsite_time
-        } else {
-          this.solveModal.uploadData.f_repairman = row.f_repairman
-          this.solveModal.uploadData.f_repair_date = row.f_repair_date
-          this.$set('solveModal.f_audit_results',row.f_audit_results)
-        }
-      } 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
-    },
-    ok() {
-      if (!(this.solveModal.uploadData.filename && this.solveModal.uploadData.filename.length > 0)) {
-        this.$showMessage('请录入处理后照片')
-        return
-      }
-      co(upSolveDefect(this))
-    },
-    cancel() {
-      this.showSolveModal = false
-      this.showToRepairModal = false
-    },
-    toRepair() {
-      this.showToRepairModal = !this.showToRepairModal
-    },
-    getSiteRes(obj) {
-      //tag
-      //tag
-      if(obj.resids[0]){
-        this.toRepairModal.preData.f_meetunit = obj.res.join('.')
-        this.toRepairModal.preData.f_reciever = obj.resids.join('.')
-      }else {
-        this.toRepairModal.preData.f_meetunit = ''
-        this.toRepairModal.preData.f_reciever = ''
-        this.toRepairModal.preData.f_outlets = ''
-      }
-    },
-    // 获取维修员
-    getEmp() {
-      let val = {source: 'this.getParentByType($organization$).getChildByName($维修员$).getUsers()', userid: `${this.$login.f.id}`}
-      let http = new HttpResetClass()
-      http.load('POST', '/rs/search', {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-        res.data.forEach((item) => {
-          let http1 = new HttpResetClass()
-          http1.load('POST', 'api/af-safecheck/sql/safe_singleTable_OrderBy', {
-            data: {
-              items: 'f_user_telephone',
-              tablename: 't_user',
-              condition: `id  =  ${item.id}`,
-              orderitem: 'id'
-            }
-          }, {resolveMsg: null, rejectMsg: null}).then((ress) => {
-            this.toRepairModal.preData.repairers.push({label: `${item.name}：${ress.data[0].f_user_telephone}`, value: item.name})
-          })
-        })
-      })
-    },
-    confirm() {
-      if (this.toRepairModal.preData.dispatchType == '派发给站点' && !this.toRepairModal.preData.f_meetunit) {
-        this.$showMessage('请选择站点。')
-        return
-      }
-      co(sendRepair(this))
-    }
-  },
-  watch: {
-    'check'() {
-      this.model.f_paper_id = this.check.id
-      this.model.search(`f_repaire_type != '无隐患'`, {})
-    },
-    /*'model.rows'() {
-      if (this.model.rows.length > 0) {
-        if (this.model.rows[0].f_repaire_type == '隐患未处理') {
-          this.needRepair = true
-          return
-        }
-      }
-      this.needRepair = false
-    }*/
-  }
-}
-</script>
-<style lang="less" scoped>
-.select-error {
-  button {
-    border-bottom: 1px solid #a94442 !important;
-  }
-}
-</style>
+<template>
+  <div>
+    <div :style="{'height':needRepair?'60%':'100%'}">
+      <criteria-paged :model="model" :pager="false" v-ref:paged>
+        <criteria partial='criteria'>
+          <div partial>
+            <ul class="nav nav-tabs">
+              <li role="presentation" class="active"><a style="	color: #5ac0d9 !important;">隐患明细</a></li>
+            </ul>
+          </div>
+        </criteria>
+        <data-grid :model="model" partial='list' class="table_sy">
+          <template partial='head'>
+            <tr>
+              <!--              <th>-->
+              <!--                <nobr>隐患设备</nobr>-->
+              <!--              </th>-->
+              <th>
+                <nobr>隐患项</nobr>
+              </th>
+              <th>
+                <nobr>隐患原因</nobr>
+              </th>
+              <th>
+                <nobr>隐患处理方式</nobr>
+              </th>
+              <th>
+                <nobr>处理结果</nobr>
+              </th>
+              <th  v-if="$parent.$parent.$parent.checkDefect=='是'">
+                <nobr>审核结果</nobr>
+              </th>
+              <th>
+                <nobr>操作</nobr>
+              </th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <!--            <td style="text-align: center">-->
+            <!--              <nobr>{{row.f_device_type}}</nobr>-->
+            <!--            </td>-->
+            <td style="text-align: center">
+              <nobr>{{row.f_item_name}}</nobr>
+            </td>
+            <td style="text-align: center">
+              <nobr>{{row.f_item_value}}</nobr>
+            </td>
+            <td style="text-align: center">
+              <nobr>{{row.f_repaire_type}}</nobr>
+            </td>
+            <td style="text-align: center">
+              <nobr>{{row.f_repaire_state}}</nobr>
+            </td>
+            <td style="text-align: center"  v-if="$parent.$parent.$parent.checkDefect=='是'">
+              <nobr>{{row.f_audit_results?row.f_audit_results:'暂无审核结果'}}</nobr>
+            </td>
+            <td style="text-align: center">
+              <div>
+<!--                <img-button v-if="row.f_repaire_type != '无隐患' && row.f_repaire_type != '维修已处理' && row.f_path" :src="'/rs/image/file/'+row.f_path" :value="'隐患图片'"></img-button>-->
+<!--                <button style="margin-top: 3px" v-if="row.f_repaire_type == '维修已处理'" class="button_new-1 button_spacing" @click="$parent.$parent.$parent.solveDefect( row, 'view')">处理详情</button>-->
+                <button style="margin-top: 3px" class="button_new-1 button_spacing" @click="$parent.$parent.$parent.solveDefect(row, row.f_repaire_type)">处理详情</button>
+                <button style="margin-top: 3px" v-if="row.f_repaire_type == '隐患未处理' && $parent.$parent.$parent.showHandleDefectButton === '是'" class="button_spacing button_search-1" @click="$parent.$parent.$parent.solveDefect(row, 'solve')">处理隐患</button>
+              </div>
+            </td>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+
+    <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" v-if="solveModal.preData.defectImg">
+          <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" v-show="solveModal.preData.state == '已处理' || solveModal.preData.type != 'solve'">
+          <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" v-show="solveModal.preData.state == '已处理'">
+          <label class="font_normal_body">处&nbsp;理&nbsp;人</label>
+          <input v-if="solveModal.preData.type != 'solve'" class="input_search" style="width: 60%" disabled="true" type="text" v-model="solveModal.uploadData.f_repairman" placeholder="处理人">
+          <v-select
+            v-if="solveModal.preData.type == 'solve'"
+            :value.sync="solveModal.uploadData.f_repairman"
+            :value-single="true"
+            :options='toRepairModal.preData.repairers'
+            placeholder='请选择维修员'
+            close-on-select></v-select>
+        </div>
+        <div class="col-sm-6" style="margin-top: 10px" v-show="solveModal.preData.state == '已处理'">
+          <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.state == '已处理' && (solveModal.preData.repairedImg || solveModal.preData.repairedImg1 || solveModal.preData.repairedImg2) " class="col-sm-12" style="margin-bottom: 10px">
+          <p> <label class="font_normal_body">处理后图片</label></p>
+          <P></P>
+          <div class="col-sm-12">
+            <div class="col-sm-6" v-if="solveModal.preData.repairedImg">
+              <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg" style="margin-left: 10px"></img-self>
+            </div>
+            <div class="col-sm-6" v-if="solveModal.preData.repairedImg1">
+              <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg1"  style="margin-left: 10px"></img-self>
+            </div>
+            <div class="col-sm-6" v-if="solveModal.preData.repairedImg2">
+              <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg2"  style="margin-left: 10px"></img-self>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div slot="modal-footer" class="modal-footer" style="text-align: center">
+        <button class="button_search" v-if="checkDefect=='是' && solveModal.preData.type == 'view'" @click="auditsure('通过')" v-if="solveModal.preData.type == 'view' && !solveModal.f_audit_results">审核通过</button>
+        <button class="button_search" v-if="checkDefect=='是' && solveModal.preData.type == 'view'" @click="auditsure('不通过')" v-if="solveModal.preData.type == 'view' && !solveModal.f_audit_results">审核不通过</button>
+        <button class="button_search" v-if="solveModal.preData.type == 'solve'" @click="ok">确认</button>
+        <button class="button_search" @click="cancel">取消</button>
+      </div>
+    </modal>
+
+  </div>
+</template>
+
+<script>
+import {PagedList, HttpResetClass} from 'vue-client'
+import * as Util from '../../../../components/Util'
+import co from 'co'
+import Vue from "vue";
+
+const upSolveDefect = function * (self) {
+  let uploadData = self.solveModal.uploadData
+  //tag)
+  self.$resetpost('/api/af-safecheck/logic/pcRepairDefectNew', self.solveModal.uploadData, {resolveMsg: null, rejectMsg: null})
+    .then(res => {
+      if (res.data.code === 200) {
+        self.$showMessage('隐患已处理。')
+        self.showSolveModal = false
+        self.model.search('f_repaire_type != \'无隐患\'', {})
+        self.solveModal.uploadData={
+          id: '',
+          f_repairman: self.$login.f.name,
+          f_repair_date: Util.getNowDate().substr(0, 10),
+          f_repair_path: '',
+          imgSrc: '',
+          filename: '',
+          f_defect_remark:''
+        }
+      }
+    })
+}
+
+const sendRepair = function* (self) {
+  let preData = self.toRepairModal.preData
+  let uploadData = self.toRepairModal.uploadData
+
+  if (preData.dispatchType == '派发给站点') {
+    uploadData.model.serviceacitivity[0].f_meetunit = preData.f_meetunit
+    uploadData.model.serviceacitivity[0].f_reciever = preData.f_reciever
+    uploadData.model.f_meetunit = preData.f_meetunit
+    uploadData.model.f_orgstr = preData.f_reciever
+    uploadData.model.f_outlets = preData.f_outlets
+  } else if (preData.dispatchType == '派发给维修员') {
+    uploadData.model.serviceacitivity[0].f_reciever = preData.f_repairman
+    // uploadData.model.f_meetunit = self.$login.f.orgpathnames
+    // uploadData.model.f_orgstr = self.$login.f.orgpathstr
+    // uploadData.model.f_outlets = self.$login.f.f_parentname
+    uploadData.model.f_meetunit = self.$login.f.deps
+    uploadData.model.f_orgid = self.$login.f.orgid
+    uploadData.model.f_filiale = self.$login.f.org
+    uploadData.model.f_outlets = self.$login.f.deps
+    uploadData.model.f_filiale_id = self.$login.f.orgid
+    uploadData.toRepair = '一级派单'
+  }
+  let res = yield self.$resetpost('/api/af-safecheck/sql/GetUserForRepaireNew', {data: {f_userinfo_id: self.check.f_userinfo_id}})
+  preData.userInfo = res.data[0]
+  uploadData.model = Object.assign(uploadData.model, preData.userInfo)
+  uploadData.user.f_userinfo_id = preData.userInfo.f_userinfo_id
+  uploadData.model.f_repair_date = Util.getNowDate()
+  uploadData.model.f_repairtype = preData.f_repairtype
+  uploadData.model.f_remarks = preData.f_remarks
+  // 拼接failure
+  let failure = []
+  self.model.rows.forEach(row => {
+    if (row.f_repaire_type == '隐患未处理') {
+      failure.push({
+        f_failure_type: row.f_item_name,
+        failurecase: row.f_item_value?row.f_item_value.split(','):''
+      })
+    }
+  })
+  uploadData.model.failure = failure
+  // 拼接repairitems
+  let rows = JSON.parse(JSON.stringify(self.model.rows))
+  let repairitems = {
+    data: []
+  }
+  let safecheckOptions = [{"data": "已处理"}, {"data": "未处理"}]
+  // 取隐患未处理的
+  rows = rows.filter(row => row.f_repaire_type == '隐患未处理')
+  //tag)
+  // 开始拼接
+  rows.forEach(row => {
+    let existIndex = -1
+    // 判断该设备是否已经存在
+    for (let i = 0; i < repairitems.data.length; i++) {
+      if (repairitems.data[i].f_type == row.f_device_type) {
+        existIndex = i
+        break
+      }
+    }
+    if (existIndex == -1) {
+      // 不存在则新建
+      let newItem = {
+        f_type: row.f_device_type,
+        details: [{
+          f_defect_id: row.id,
+          f_project: `${row.f_item_name}:${row.f_item_value}`,
+          type: 'selector',
+          options: safecheckOptions
+        }]
+      }
+      repairitems.data.push(newItem)
+    } else {
+      // 存在则追加
+      repairitems.data[existIndex].details.push({
+        f_defect_id: row.id,
+        f_project: `${row.f_item_name}:${row.f_item_value}`,
+        type: 'selector',
+        options: safecheckOptions
+      })
+    }
+  })
+  uploadData.model.f_repairitems = repairitems
+  //tag)
+  // 调工单接口
+  let result = yield self.$resetpost('/api/af-safecheck/logic/callerSend', uploadData)
+  //tag)
+  if (result.data.f_service_id) {
+    const data = {
+      f_paper_id: rows[0].f_paper_id,
+      f_service_id: result.data.f_service_id,
+      itemsId: self.$login.convertToIn(rows.map(row => row.id))
+    }
+    //tag
+    let updateRes = yield self.$resetpost('/api/af-safecheck/logic/updateDefectStateNew', data)
+    if (updateRes.data.code == 200) {
+      self.$showMessage('隐患已转维修。')
+      self.model.search(`f_repaire_type != '无隐患'`, {})
+    }
+  }
+}
+
+export default {
+  title: '隐患项列表',
+  data() {
+    return {
+      model: new PagedList('api/af-safecheck/sql/GetDefectByPaperIdNew', 100, {
+        f_paper_id: 'this.f_paper_id',f_item_value: 'this.f_item_value'
+      }),
+      showSolveModal: false,
+      showToRepairModal: false,
+      showDefectModal: false,
+      valid: false,
+      checkDefect:null,
+      needRepair: false,
+      solveModal: {
+        preData: {
+          type: '',
+          defectImg: '',
+          repairedImg: '',
+          repairedImg1: '',
+          repairedImg2: '',
+          state: ''
+        },
+        uploadData: {
+          id: '',
+          f_repairman: this.$login.f.name,
+          f_repair_date: Util.getNowDate().substr(0, 10),
+          f_repair_path: '',
+          imgSrc: '',
+          filename: ''
+        }
+      },
+      toRepairModal: {
+        preData: {
+          dispatchTypeOptions: [{label: '派发给站点', value: '派发给站点'}, {label: '派发给维修员', value: '派发给维修员'}],
+          repairTypeOptions: this.$appdata.getParam('报修类型'),
+          dispatchType: '',
+          f_repairman: '',
+          f_repairtype: '',
+          f_remarks: '',
+          f_meetunit: '',
+          f_reciever: '',
+          f_outlets: '',
+          userInfo: {},
+          repairers: []
+        },
+        uploadData: {
+          model: {
+            serviceacitivity: [{
+              f_service_acitivity_type: '派单'
+            }],
+            f_repairitems: {},
+            failure: '',
+            f_source: '安检',
+            f_service_id: '',
+            f_contact_phone: '',
+            f_meetunit: '',
+            f_phone: '',
+            f_user_name: '',
+            f_address: '',
+            f_repair_date: '',
+            f_reciever: '',
+            f_remarks: '',
+            f_user_type: '',
+            f_area: '',
+            f_unit_name: '',
+            f_street: '',
+            f_residential_area: '',
+            f_building: '',
+            f_unit: '',
+            f_floor: '',
+            f_room: '',
+            aState: '',
+            f_repairtype: '',
+            f_userinfo_id: '',
+            f_userinfo_code: '',
+            f_orgstr: '',
+            f_outlets: '',
+            f_attendant: this.$login.f.name
+          },
+          loginUser: {
+            name: this.$login.f.name,
+            ename: this.$login.f.ename
+          },
+          user: {
+            f_userinfo_id: ''
+          },
+          callObj: null
+        }
+      },
+      showHandleDefectButton: null
+    }
+  },
+  props: ['check'],
+  ready() {
+    this.checkDefect=Vue.$appdata.getSingleValue('安检隐患维修后审核')
+    this.showHandleDefectButton = Vue.$appdata.getSingleValue('隐患查看处理隐患')
+    this.model.f_item_value = `(SELECT stuff(( SELECT ',' + f_item_value FROM t_devices_items_lists WHERE ( f_is_defect = 'true' OR di.f_is_defect = 'true') AND f_item_id = di.id FOR xml path ( '' ) ),1,1,'' ) )`
+    if (this.check) {
+      this.model.f_paper_id = this.check.id
+      this.model.search(`f_repaire_type != '无隐患'`, {})
+    }
+    this.getEmp()
+  },
+  methods: {
+    //审核通过
+    auditsure(info){
+      // 拿到t_devices_items 的ID，给f_audit_results中存入通过   如果未通过，需要可以再次派单，对隐患进行处理
+      var data = {
+        id: this.solveModal.uploadData.id,
+        info:info
+      }
+      let http = new HttpResetClass()
+      http.load('POST', 'api/af-safecheck/logic/DefectAuditUpdate', data, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        if(res.data.code == 200){
+          this.model.search(`f_repaire_type != '无隐患'`, {})
+          this.showSolveModal = false
+          this.showToRepairModal = false
+          this.$showMessage('提交成功')
+        }else{
+          this.$showMessage('提交失败，请重试')
+        }
+      })
+    },
+    solveDefect(row, type) {
+      console.log(row)
+      this.solveModal.preData.defectImg = ''
+      this.solveModal.preData.f_repair_path = ''
+      this.solveModal.preData.repairedImg = ''
+      this.solveModal.preData.repairedImg1 = ''
+      this.solveModal.preData.repairedImg2 = ''
+      this.solveModal.preData.defectImg = row.f_path?'/rs/image/file/' + row.f_path:null
+      this.solveModal.uploadData.id = row.id
+      this.solveModal.preData.type = type
+      this.solveModal.preData.state = row.f_repaire_state
+      this.solveModal.preData.source = row.f_repair_path_source
+      if (row.f_repaire_state === '已处理') {
+        if (row.f_repair_path_source === '微信') {
+          this.solveModal.preData.f_repair_path = row.f_repair_path
+          this.solveModal.preData.repairedImg = row.f_repair_path
+          this.solveModal.preData.repairedImg1 = row.f_repair1_path
+        } else {
+          this.solveModal.preData.f_repair_path = row.f_repair_path? '/rs/image/file/' + row.f_repair_path:null
+          this.solveModal.preData.repairedImg = row.f_repair_path? '/rs/image/file/' + row.f_repair_path:null
+          this.solveModal.preData.repairedImg1 = row.f_other_dealpath1? '/rs/image/file/' + row.f_other_dealpath1:null
+          this.solveModal.preData.repairedImg2 = row.f_other_dealpath2? '/rs/image/file/' + row.f_other_dealpath2:null
+        }
+        if (type === '现场已处理') {
+          this.solveModal.uploadData.f_repairman = this.check.f_checker_name
+          this.solveModal.uploadData.f_repair_date = this.check.f_offsite_time
+        } else {
+          this.solveModal.uploadData.f_repairman = row.f_repairman
+          this.solveModal.uploadData.f_repair_date = row.f_repair_date
+          this.$set('solveModal.f_audit_results',row.f_audit_results)
+        }
+      } 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
+    },
+    ok() {
+      if (!(this.solveModal.uploadData.filename && this.solveModal.uploadData.filename.length > 0)) {
+        this.$showMessage('请录入处理后照片')
+        return
+      }
+      co(upSolveDefect(this))
+    },
+    cancel() {
+      this.showSolveModal = false
+      this.showToRepairModal = false
+    },
+    toRepair() {
+      this.showToRepairModal = !this.showToRepairModal
+    },
+    getSiteRes(obj) {
+      //tag
+      //tag
+      if(obj.resids[0]){
+        this.toRepairModal.preData.f_meetunit = obj.res.join('.')
+        this.toRepairModal.preData.f_reciever = obj.resids.join('.')
+      }else {
+        this.toRepairModal.preData.f_meetunit = ''
+        this.toRepairModal.preData.f_reciever = ''
+        this.toRepairModal.preData.f_outlets = ''
+      }
+    },
+    // 获取维修员
+    getEmp() {
+      let val = {source: 'this.getParentByType($organization$).getChildByName($维修员$).getUsers()', userid: `${this.$login.f.id}`}
+      let http = new HttpResetClass()
+      http.load('POST', '/rs/search', {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        res.data.forEach((item) => {
+          let http1 = new HttpResetClass()
+          http1.load('POST', 'api/af-safecheck/sql/safe_singleTable_OrderBy', {
+            data: {
+              items: 'f_user_telephone',
+              tablename: 't_user',
+              condition: `id  =  ${item.id}`,
+              orderitem: 'id'
+            }
+          }, {resolveMsg: null, rejectMsg: null}).then((ress) => {
+            this.toRepairModal.preData.repairers.push({label: `${item.name}：${ress.data[0].f_user_telephone}`, value: item.name})
+          })
+        })
+      })
+    },
+    confirm() {
+      if (this.toRepairModal.preData.dispatchType == '派发给站点' && !this.toRepairModal.preData.f_meetunit) {
+        this.$showMessage('请选择站点。')
+        return
+      }
+      co(sendRepair(this))
+    }
+  },
+  watch: {
+    'check'() {
+      this.model.f_paper_id = this.check.id
+      this.model.search(`f_repaire_type != '无隐患'`, {})
+    },
+    /*'model.rows'() {
+      if (this.model.rows.length > 0) {
+        if (this.model.rows[0].f_repaire_type == '隐患未处理') {
+          this.needRepair = true
+          return
+        }
+      }
+      this.needRepair = false
+    }*/
+  }
+}
+</script>
+<style lang="less" scoped>
+.select-error {
+  button {
+    border-bottom: 1px solid #a94442 !important;
+  }
+}
+</style>