safecheck-client 3.0.33-99 → 3.0.34-1

package/src/filiale/bayan/pc/DefectListNew.vue

@@ -0,0 +1,597 @@
+<template>
+  <div>
+<!--    <div :style="{'height':needRepair?'60%':'100%'}">-->
+    <div :style="{'height': '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>
+                <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_deal_remark ? row.f_deal_remark : ' '}}</nobr>
+            </td>
+<!--            <td style="text-align: center">-->
+<!--              <nobr>{{row.f_audit_results?row.f_audit_results:'暂无审核结果'}}</nobr>-->
+<!--            </td>-->
+            <td style="text-align: center">
+              <button v-if="row.f_repaire_type != '无隐患' && row.f_repaire_type != '已处理' && row.f_path"  class="button_new-1 button_spacing" @click="$parent.$parent.$parent.showimg(row)">隐患图片</button>
+<!--              <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 v-if="row.f_repaire_type == '已处理'" class="button_new-1 button_spacing" @click="$parent.$parent.$parent.solveDefect( row, 'view')">处理详情</button>
+              <button v-if="row.f_repaire_type == '未处理' || !row.f_repaire_type" class="button_spacing button_search-1" @click="$parent.$parent.$parent.solveDefect( row, 'solve')">处理隐患</button>
+            </td>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+
+<!--    <div style="overflow-y: scroll;height: 40%" v-if="needRepair">-->
+<!--      <div class="form-horizontal auto">-->
+<!--        <ul class="nav nav-tabs">-->
+<!--          <li role="presentation" class="active"><a style="	color: #000 !important;font-size: 14px">转维修</a></li>-->
+<!--        </ul>-->
+<!--        <validator name='v' @valid="valid = true" @invalid="valid = false">-->
+<!--          <div class="row">-->
+<!--            <div class="col-sm-4" :class="[$v.dispatchtype.required ? 'select-error' : '']">-->
+<!--              <label for="dispatchtype" class="font_normal_body">派发类型</label>-->
+<!--              <input id="dispatchtype" type="text" v-show="false" v-model="$refs.dispatchtype.selectedItems" v-validate:dispatchtype='{required: true }'>-->
+<!--              <v-select :value.sync="toRepairModal.preData.dispatchType" v-model="toRepairModal.preData.dispatchType"-->
+<!--                        :options='toRepairModal.preData.dispatchTypeOptions' placeholder='派发类型'-->
+<!--                        close-on-select v-ref:dispatchtype>-->
+<!--              </v-select>-->
+<!--            </div>-->
+<!--            <div class="col-sm-4  " v-if="toRepairModal.preData.dispatchType == '派发给站点'">-->
+<!--              <label class="font_normal_body">站&nbsp;&nbsp;点</label>-->
+<!--              <right-tree-->
+<!--                islist-->
+<!--                :userid="$login.f.id"-->
+<!--                :source="'dep=this.getParentByType($organization$).getSpecialResByType($department$),tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))'"-->
+<!--                @re-res="getSiteRes">-->
+<!--              </right-tree>-->
+<!--            </div>-->
+<!--            <div class="col-sm-4   " v-if="toRepairModal.preData.dispatchType == '派发给维修员'" :class="[$v.f_repairman.required ? 'select-error' : '']">-->
+<!--              <input type="text" v-show="false" v-model="toRepairModal.preData.f_repairman" v-validate:f_repairman='{required: true }'>-->
+<!--              <label class="font_normal_body">维修员</label>-->
+<!--              <v-select-->
+<!--                :value.sync="toRepairModal.preData.f_repairman"-->
+<!--                :value-single="true"-->
+<!--                :options='toRepairModal.preData.repairers'-->
+<!--                placeholder='请选择维修员'-->
+<!--                close-on-select></v-select>-->
+<!--            </div>-->
+<!--            <div class="col-sm-4" :class="[$v.f_repairtype.required ? 'select-error' : '']">-->
+<!--              <input type="text" v-show="false" v-model="toRepairModal.preData.f_repairtype" v-validate:f_repairtype='{required: true }'>-->
+<!--              <label class="font_normal_body">报修类型</label>-->
+<!--              <v-select :value.sync="toRepairModal.preData.f_repairtype" style="width:60%"-->
+<!--                        class="select select_list"-->
+<!--                        :value-single="true"-->
+<!--                        :options='toRepairModal.preData.repairTypeOptions'-->
+<!--                        close-on-select>-->
+<!--              </v-select>-->
+<!--            </div>-->
+<!--          </div>-->
+<!--          <div class="row">-->
+<!--            <div class="col-sm-8 form-group">-->
+<!--              <label class="font_normal_body" >备&emsp;&emsp;注</label>-->
+<!--              <input class="input_search" style="width: 60%" type="text" v-model="toRepairModal.preData.f_remarks" placeholder="备注">-->
+
+<!--            </div>-->
+<!--            <div class="col-sm-4" style="margin-top: 1%">-->
+<!--              <button class="button_search" :disabled="!valid" @click="confirm">转维修</button>-->
+<!--            </div>-->
+<!--          </div>-->
+<!--        </validator>-->
+<!--      </div>-->
+<!--    </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-show="solveModal.preData.defectImg">
+          <label class="font_normal_body">隐患图片</label>
+          <img-self :width="200" :height="200" :src="solveModal.preData.defectImg"></img-self>
+        </div>
+        <div class="col-sm-12" style="margin-bottom: 10px"  v-show="solveModal.preData.defectImg1">
+          <label class="font_normal_body">隐患图片</label>
+          <img-self :width="200" :height="200" :src="solveModal.preData.defectImg1"></img-self>
+        </div>
+        <div class="col-sm-12" style="margin-bottom: 10px"  v-show="solveModal.preData.defectImg2">
+          <label class="font_normal_body">隐患图片</label>
+          <img-self :width="200" :height="200" :src="solveModal.preData.defectImg2"></img-self>
+        </div>
+        <div class="col-sm-12" style="margin-bottom: 10px"  v-show="solveModal.preData.defectImg3">
+          <label class="font_normal_body">隐患图片</label>
+          <img-self :width="200" :height="200" :src="solveModal.preData.defectImg3"></img-self>
+        </div>
+
+        <div style="width: 100%;height: 36px;background-color: #f1f8ff;float: left">
+          <div style="width: 8px;height: 100%;background-color: #6aa6e2;margin-right: 20px;float: left"></div>
+          <div style="width: auto;height:100%;float: left;"><p class="title-font" style="margin-top: 5px">处理后</p></div>
+        </div>
+        <div class="col-sm-6" style="margin-top: 10px">
+          <label class="font_normal_body">处&nbsp;理&nbsp;人</label>
+          <input 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">
+          <label class="font_normal_body">处理时间</label>
+          <datepicker
+            :disabled="solveModal.preData.type == 'view'"
+            placeholder='处理时间' style="width:60%"
+            :disabled-days-of-week="[]"
+            :format="'yyyy-MM-dd'"
+            :show-rest-button="reset"
+            :value.sync="solveModal.uploadData.f_repair_date">
+          </datepicker>
+        </div>
+        <div v-if="solveModal.preData.type == 'solve'" class="col-sm-12" style="margin-bottom: 10px">
+          <label class="font_normal_body">处理后图片</label>
+          <avatar-upload :width="200" :height="200" :img-src.sync="solveModal.uploadData.imgSrc" :filename.sync="solveModal.uploadData.filename" v-ref:imginfo></avatar-upload>
+        </div>
+        <div v-if="solveModal.preData.type == 'view'" v-show="solveModal.preData.repairedImg" class="col-sm-12" style="margin-bottom: 10px">
+          <label class="font_normal_body">处理后图片</label>
+          <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg"></img-self>
+        </div>
+        <div v-if="solveModal.preData.type == 'view'" v-show="solveModal.preData.repairedImg2" class="col-sm-12" style="margin-bottom: 10px">
+          <label class="font_normal_body">处理后图片</label>
+          <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg2"></img-self>
+        </div>
+        <div v-if="solveModal.preData.type == 'view'" v-show="solveModal.preData.repairedImg3" class="col-sm-12" style="margin-bottom: 10px">
+          <label class="font_normal_body">处理后图片</label>
+          <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg3"></img-self>
+        </div>
+        <div v-if="solveModal.preData.type == 'view'" v-show="solveModal.preData.repairedImg4" class="col-sm-12" style="margin-bottom: 10px">
+          <label class="font_normal_body">处理后图片</label>
+          <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg4"></img-self>
+        </div>
+      </div>
+      <div slot="modal-footer" class="modal-footer" style="text-align: center">
+<!--        <button class="button_search" @click="auditsure('通过')" v-if="solveModal.preData.type == 'view' && !solveModal.f_audit_results">审核通过</button>-->
+<!--        <button class="button_search" @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>
+    <modal :show.sync="imgshow" v-ref:modal backdrop="true">
+      <header slot="modal-header" class="modal-header">
+       隐患图片
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="from-group">
+          <div class="row">
+            <div class="col-md-6">
+              <img-self-plus v-if="imgs.defectImg" :src="imgs.defectImg" width="240" height="300"></img-self-plus>
+            </div>
+            <div class="col-md-6">
+              <img-self-plus v-if="imgs.defectImg1" :src="imgs.defectImg1" width="240" height="300"></img-self-plus>
+            </div>
+            <div class="col-md-6">
+              <img-self-plus v-if="imgs.defectImg2" :src="imgs.defectImg2" width="240" height="300"></img-self-plus>
+            </div>
+            <div class="col-md-6">
+              <img-self-plus v-if="imgs.defectImg3" :src="imgs.defectImg3" width="240" height="300"></img-self-plus>
+            </div>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer" v-show="false">
+      </footer>
+    </modal>
+
+  </div>
+</template>
+
+<script>
+import {PagedList, HttpResetClass} from 'vue-client'
+import * as Util from '../../../components/Util'
+import co from 'co'
+
+const upSolveDefect = function * (self) {
+  let uploadData = self.solveModal.uploadData
+  //tag)
+  self.$resetpost('/rs/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 != '无隐患' or f_repaire_type is null)`, {})
+      }
+    })
+}
+
+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('/rs/sql/GetUserForRepaireNew2', {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('/rs/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('/rs/logic/updateDefectStateNew', data)
+    if (updateRes.data.code == 200) {
+      self.$showMessage('隐患已转维修。')
+      self.model.search(`(f_repaire_type != '无隐患' or f_repaire_type is null)`, {})
+    }
+  }
+}
+
+export default {
+  title: '隐患项列表',
+  props: ['check'],
+  data() {
+    return {
+      model: new PagedList('rs/sql/GetDefectByPaperIdNew2', 100, {
+        f_paper_id: 'this.f_paper_id', f_item_value: 'this.f_item_value'
+      }),
+      imgshow: false,
+      imgs: {
+        defectImg: '',
+        defectImg1: '',
+        defectImg2: '',
+        defectImg3: '',
+      },
+      showSolveModal: false,
+      showToRepairModal: false,
+      showDefectModal: false,
+      valid: false,
+      needRepair: true,
+      solveModal: {
+        uploadData:{},
+        preData: {
+          type: 'view',
+          defectImg: '',
+          defectImg1: '',
+          defectImg2: '',
+          defectImg3: '',
+          repairedImg: '',
+          repairedImg2: '',
+          repairedImg3: '',
+          repairedImg4: '',
+
+          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: {
+            id:'',
+            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
+          }
+        }
+      }
+    }
+  },
+  ready() {
+    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 != '无隐患' or f_repaire_type is null)`, {})
+    }
+    this.getEmp()
+  },
+  methods: {
+    showimg(val){
+      this.imgs.defectImg = val.f_path?'/rs/image/file/' + val.f_path:''
+      this.imgs.defectImg1 = val.f_p1_path?'/rs/image/file/' + val.f_p1_path:''
+      this.imgs.defectImg2 = val.f_p2_path?'/rs/image/file/' + val.f_p2_path:''
+      this.imgs.defectImg3 = val.f_p3_path?'/rs/image/file/' + val.f_p3_path:''
+      this.imgshow = true
+    },
+    //审核通过
+    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', 'rs/logic/DefectAuditUpdate', data, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        if(res.data.code == 200){
+          this.model.search(`(f_repaire_type != '无隐患' or f_repaire_type is null)`, {})
+          this.showSolveModal = false
+          this.showToRepairModal = false
+          this.$showMessage('提交成功')
+        }else{
+          this.$showMessage('提交失败，请重试')
+        }
+      })
+    },
+    solveDefect(row, type) {
+      this.solveModal.preData.defectImg = row.f_path?'/rs/image/file/' + row.f_path:''
+      this.solveModal.preData.defectImg1 = row.f_p1_path?'/rs/image/file/' + row.f_p1_path:''
+      this.solveModal.preData.defectImg2 = row.f_p2_path?'/rs/image/file/' + row.f_p2_path:''
+      this.solveModal.preData.defectImg3 = row.f_p3_path?'/rs/image/file/' + row.f_p3_path:''
+      this.solveModal.preData.repairedImg = '/rs/image/file/' + row.f_repair_path
+      this.solveModal.preData.repairedImg2 = row.f_repair2_path ? ('/rs/image/file/' + row.f_repair2_path) : ''
+      this.solveModal.preData.repairedImg3 = row.f_repair3_path ? ('/rs/image/file/' + row.f_repair3_path) : ''
+      this.solveModal.preData.repairedImg4 = row.f_repair4_path ? ('/rs/image/file/' + row.f_repair4_path) : ''
+      this.solveModal.uploadData.id = row.id
+      this.solveModal.preData.type = type
+      if (type == 'view') {
+        this.solveModal.preData.f_repair_path = '/rs/image/file/' + row.f_repair_path
+        this.solveModal.uploadData.f_repairman = row.f_repairman
+        this.solveModal.uploadData.f_repair_date = row.f_repair_date
+        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) => {
+          this.toRepairModal.preData.repairers.push({label: item.name, 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 != '无隐患' or f_repaire_type is null)`, {})
+    },
+    '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>

package/src/filiale/bayan/pc/DefectMainNew.vue

@@ -0,0 +1,63 @@
+<template>
+  <div id="unit" class="flex-row" :class="{'binary':showItem}">
+    <div :class="{'basic-main':!showItem,'binary-left':showItem}">
+      <defect-paper-new @select-changed="selected" :style="style" :style2="style2" v-ref:check></defect-paper-new>
+    </div>
+    <div class="binary-right" v-show="showItem">
+      <div class="flex">
+        <defect-list-new v-if='$refs.check && $refs.check.selected' :check='$refs.check.selected'
+                     v-ref:detail></defect-list-new>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import DefectPaperNew from './DefectPaperNew'
+import DefectListNew from './DefectListNew'
+
+export default {
+  title: '隐患查看',
+  props: ['f'],
+  components: {DefectPaperNew, DefectListNew},
+  data() {
+    return {
+      showItem: false,
+      style: 'col-sm-2 form-group',
+      style2: 'col-sm-4 form-group'
+    }
+  },
+  methods: {
+    selected(row) {
+      this.showItem = true
+    }
+  },
+  watch: {
+    'showItem'(val) {
+      //tag
+      //tag
+      if (val) {
+        this.style = 'col-sm-3 form-group'
+        this.style2 = 'col-sm-6 form-group'
+      } else {
+        this.style = 'col-sm-2 form-group'
+        this.style2 = 'col-sm-4 form-group'
+      }
+    }
+  }
+}
+</script>
+<style>
+.form-input-group label {
+  text-align: right;
+  width: auto;
+}
+
+.datapanel {
+  color: #333;
+  background-color: white;
+  box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
+  padding: 5px 7px 5px 7px;
+  border-radius: 10px;
+}
+</style>