safecheck-client 3.0.33-145 → 3.0.33-146

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "safecheck-client",
3
3
  "//": "主分支版本别乱升,测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包,不要频繁升级第三位版本号),别提交版本号。切了分支切记把主分支版本升了,保证主分支始终是最高版本!!!!!",
4
- "version": "3.0.33-145",
4
+ "version": "3.0.33-146",
5
5
  "description": "安检模块 前端组件",
6
6
  "author": "丁新 <417755458@qq.com>",
7
7
  "license": "ISC",
@@ -1,6 +1,6 @@
1
1
  <template>
2
2
  <div>
3
- <img :src="src" :alt="alt" @click="open()" style="width: 100%;height: 100%" title="点击查看图片" :id="'vc-imgself-img-'+attach">
3
+ <img :src="src" :alt="alt" @click="open()" :width="width" :height="height"title="点击查看图片" :id="'vc-imgself-img-'+attach">
4
4
  <div class="full-img" v-if="show">
5
5
  <div @click="on" draggable="false" >
6
6
  <img :src="src" id="image" alt="" style="width: 100%" class="img-state" :alt="alt || ''">
@@ -0,0 +1,617 @@
1
+ <template>
2
+ <div>
3
+ <div :style="{'height':needRepair?'60%':'100%'}">
4
+ <criteria-paged :model="model" :pager="false" v-ref:paged>
5
+ <criteria partial='criteria'>
6
+ <div partial>
7
+ <ul class="nav nav-tabs">
8
+ <li role="presentation" class="active"><a style=" color: #5ac0d9 !important;">隐患明细</a></li>
9
+ </ul>
10
+ </div>
11
+ </criteria>
12
+ <data-grid :model="model" partial='list' class="table_sy">
13
+ <template partial='head'>
14
+ <tr>
15
+ <!-- <th>-->
16
+ <!-- <nobr>隐患设备</nobr>-->
17
+ <!-- </th>-->
18
+ <th>
19
+ <nobr>隐患项</nobr>
20
+ </th>
21
+ <th>
22
+ <nobr>隐患原因</nobr>
23
+ </th>
24
+ <th>
25
+ <nobr>隐患处理方式</nobr>
26
+ </th>
27
+ <th>
28
+ <nobr>处理结果</nobr>
29
+ </th>
30
+ <th v-if="$parent.$parent.$parent.checkDefect=='是'">
31
+ <nobr>审核结果</nobr>
32
+ </th>
33
+ <th>
34
+ <nobr>操作</nobr>
35
+ </th>
36
+ </tr>
37
+ </template>
38
+ <template partial='body'>
39
+ <!-- <td style="text-align: center">-->
40
+ <!-- <nobr>{{row.f_device_type}}</nobr>-->
41
+ <!-- </td>-->
42
+ <td style="text-align: center">
43
+ <nobr>{{row.f_item_name}}</nobr>
44
+ </td>
45
+ <td style="text-align: center">
46
+ <nobr>{{row.f_item_value}}</nobr>
47
+ </td>
48
+ <td style="text-align: center">
49
+ <nobr>{{row.f_repaire_type}}</nobr>
50
+ </td>
51
+ <td style="text-align: center">
52
+ <nobr>{{row.f_repaire_state}}</nobr>
53
+ </td>
54
+ <td style="text-align: center" v-if="$parent.$parent.$parent.checkDefect=='是'">
55
+ <nobr>{{row.f_audit_results?row.f_audit_results:'暂无审核结果'}}</nobr>
56
+ </td>
57
+ <td style="text-align: center">
58
+ <div>
59
+ <!-- <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>-->
60
+ <!-- <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>-->
61
+ <button style="margin-top: 3px" class="button_new-1 button_spacing" @click="$parent.$parent.$parent.solveDefect(row, row.f_repaire_type)">处理详情</button>
62
+ <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>
63
+ </div>
64
+ </td>
65
+ </template>
66
+ </data-grid>
67
+ </criteria-paged>
68
+ </div>
69
+
70
+ <div style="overflow-y: scroll;height: 40%" v-if="needRepair">
71
+ <div class="form-horizontal auto">
72
+ <ul class="nav nav-tabs">
73
+ <li role="presentation" class="active"><a style=" color: #000 !important;font-size: 14px">转维修</a></li>
74
+ </ul>
75
+ <validator name='v' @valid="valid = true" @invalid="valid = false">
76
+ <div class="row">
77
+ <div class="col-sm-4" :class="[$v.dispatchtype.required ? 'select-error' : '']">
78
+ <label for="dispatchtype" class="font_normal_body">派发类型</label>
79
+ <input id="dispatchtype" type="text" v-show="false" v-model="$refs.dispatchtype.selectedItems" v-validate:dispatchtype='{required: true }'>
80
+ <v-select :value.sync="toRepairModal.preData.dispatchType" v-model="toRepairModal.preData.dispatchType"
81
+ :options='toRepairModal.preData.dispatchTypeOptions' placeholder='派发类型'
82
+ close-on-select v-ref:dispatchtype>
83
+ </v-select>
84
+ </div>
85
+ <div class="col-sm-4 " v-if="toRepairModal.preData.dispatchType == '派发给站点'">
86
+ <label class="font_normal_body">站&nbsp;&nbsp;点</label>
87
+ <right-tree
88
+ islist
89
+ :userid="$login.f.id"
90
+ :source="'dep=this.getParentByType($organization$).getSpecialResByType($department$),tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))'"
91
+ @re-res="getSiteRes">
92
+ </right-tree>
93
+ </div>
94
+ <div class="col-sm-4 " v-if="toRepairModal.preData.dispatchType == '派发给维修员'" :class="[$v.f_repairman.required ? 'select-error' : '']">
95
+ <input type="text" v-show="false" v-model="toRepairModal.preData.f_repairman" v-validate:f_repairman='{required: true }'>
96
+ <label class="font_normal_body">维修员</label>
97
+ <v-select
98
+ :value.sync="toRepairModal.preData.f_repairman"
99
+ :value-single="true"
100
+ :options='toRepairModal.preData.repairers'
101
+ placeholder='请选择维修员'
102
+ close-on-select></v-select>
103
+ </div>
104
+ <div class="col-sm-4" :class="[$v.f_repairtype.required ? 'select-error' : '']">
105
+ <input type="text" v-show="false" v-model="toRepairModal.preData.f_repairtype" v-validate:f_repairtype='{required: true }'>
106
+ <label class="font_normal_body">报修类型</label>
107
+ <v-select :value.sync="toRepairModal.preData.f_repairtype" style="width:60%"
108
+ class="select select_list"
109
+ :value-single="true"
110
+ :options='toRepairModal.preData.repairTypeOptions'
111
+ close-on-select>
112
+ </v-select>
113
+ </div>
114
+ </div>
115
+ <div class="row">
116
+ <div class="col-sm-8 form-group">
117
+ <label class="font_normal_body" >备&emsp;&emsp;注</label>
118
+ <input class="input_search" style="width: 60%" type="text" v-model="toRepairModal.preData.f_remarks" placeholder="备注">
119
+
120
+ </div>
121
+ <div class="col-sm-4" style="margin-top: 1%">
122
+ <button class="button_search" :disabled="!valid" @click="confirm">转维修</button>
123
+ </div>
124
+ </div>
125
+ </validator>
126
+ </div>
127
+ </div>
128
+ <modal :show.sync="showSolveModal" v-ref:solveModal>
129
+ <div slot="modal-header" class="modal-header">
130
+ <h4 class="modal-title">
131
+ {{solveModal.preData.type == 'view'?'处理详情':'处理隐患'}}
132
+ </h4>
133
+ </div>
134
+ <div slot="modal-body" class="modal-body">
135
+ <div style="width: 100%;height: 36px;background-color: #f1f8ff;float: left">
136
+ <div style="width: 8px;height: 100%;background-color: #6aa6e2;margin-right: 20px;float: left"></div>
137
+ <div style="width: auto;height:100%;float: left;"><p class="title-font" style="margin-top: 5px">处理前</p></div>
138
+ </div>
139
+
140
+ <div class="col-sm-6" style="margin-top: 10px">
141
+ <label class="font_normal_body">安&nbsp;检&nbsp;员</label>
142
+ <input class="input_search" style="width: 60%" type="text" disabled="true" v-model="check.f_checker_name" placeholder="安检员">
143
+ </div>
144
+ <div class="col-sm-6" style="margin-top: 10px">
145
+ <label class="font_normal_body">安检时间</label>
146
+ <input class="input_search" style="width: 60%" type="text" disabled="true" v-model="check.f_offsite_time" placeholder="安检时间">
147
+ </div>
148
+ <div class="col-sm-12" style="margin-bottom: 10px" v-if="solveModal.preData.defectImg">
149
+ <label class="font_normal_body">隐患图片</label>
150
+ <img-self :width="200" :height="200" :src="solveModal.preData.defectImg"></img-self>
151
+ </div>
152
+ <div class="col-sm-12" style="margin-bottom: 10px" v-show="solveModal.preData.defectImg1">
153
+ <label class="font_normal_body">隐患图片</label>
154
+ <img-self :width="200" :height="200" :src="solveModal.preData.defectImg1"></img-self>
155
+ </div>
156
+ <div class="col-sm-12" style="margin-bottom: 10px" v-show="solveModal.preData.defectImg2">
157
+ <label class="font_normal_body">隐患图片</label>
158
+ <img-self :width="200" :height="200" :src="solveModal.preData.defectImg2"></img-self>
159
+ </div>
160
+ <div class="col-sm-12" style="margin-bottom: 10px" v-show="solveModal.preData.defectImg3">
161
+ <label class="font_normal_body">隐患图片</label>
162
+ <img-self :width="200" :height="200" :src="solveModal.preData.defectImg3"></img-self>
163
+ </div>
164
+
165
+ <div style="width: 100%;height: 36px;background-color: #f1f8ff;float: left" v-show="solveModal.preData.state == '已处理' || solveModal.preData.type != 'solve'">
166
+ <div style="width: 8px;height: 100%;background-color: #6aa6e2;margin-right: 20px;float: left"></div>
167
+ <div style="width: auto;height:100%;float: left;"><p class="title-font" style="margin-top: 5px">处理后</p></div>
168
+ </div>
169
+ <div class="col-sm-6" style="margin-top: 10px" v-show="solveModal.preData.state == '已处理'">
170
+ <label class="font_normal_body">处&nbsp;理&nbsp;人</label>
171
+ <input v-if="solveModal.preData.type != 'solve'" class="input_search" style="width: 60%" disabled="true" type="text" v-model="solveModal.uploadData.f_repairman" placeholder="处理人">
172
+ <v-select
173
+ v-if="solveModal.preData.type == 'solve'"
174
+ :value.sync="solveModal.uploadData.f_repairman"
175
+ :value-single="true"
176
+ :options='toRepairModal.preData.repairers'
177
+ placeholder='请选择维修员'
178
+ close-on-select></v-select>
179
+ </div>
180
+ <div class="col-sm-6" style="margin-top: 10px" v-show="solveModal.preData.state == '已处理'">
181
+ <label class="font_normal_body">处理时间</label>
182
+ <datepicker
183
+ :disabled="solveModal.preData.type == 'view'"
184
+ placeholder='处理时间' style="width:60%"
185
+ :disabled-days-of-week="[]"
186
+ :format="'yyyy-MM-dd'"
187
+ :show-rest-button="reset"
188
+ :value.sync="solveModal.uploadData.f_repair_date">
189
+ </datepicker>
190
+ </div>
191
+ <div v-if="solveModal.preData.type == 'solve'" class="col-sm-12" style="margin-bottom: 10px">
192
+ <label class="font_normal_body">处理后图片</label>
193
+ <avatar-upload :width="200" :height="200" :img-src.sync="solveModal.uploadData.imgSrc" :filename.sync="solveModal.uploadData.filename" v-ref:imginfo></avatar-upload>
194
+ </div>
195
+ <div v-if="solveModal.preData.state == '已处理'" class="col-sm-12" style="margin-bottom: 10px">
196
+ <p> <label class="font_normal_body">处理后图片</label></p>
197
+ <P></P>
198
+ <div class="col-sm-12">
199
+ <div class="col-sm-6" v-if="solveModal.preData.repairedImg">
200
+ <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg" style="margin-left: 10px"></img-self>
201
+ </div>
202
+ <div class="col-sm-6" v-if="solveModal.preData.repairedImg1">
203
+ <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg1" style="margin-left: 10px"></img-self>
204
+ </div>
205
+ <div class="col-sm-6" v-if="solveModal.preData.repairedImg2">
206
+ <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg2" style="margin-left: 10px"></img-self>
207
+ </div>
208
+ <div class="col-sm-6" v-if="solveModal.preData.repairedImg2">
209
+ <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg2" style="margin-left: 10px"></img-self>
210
+ </div>
211
+ <div class="col-sm-6" v-if="solveModal.preData.repairedImg3">
212
+ <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg3" style="margin-left: 10px"></img-self>
213
+ </div>
214
+ <div class="col-sm-6" v-if="solveModal.preData.repairedImg4">
215
+ <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg4" style="margin-left: 10px"></img-self>
216
+ </div>
217
+ <div class="col-sm-6" v-if="solveModal.preData.repairedImg5">
218
+ <img-self :width="200" :height="200" :src="solveModal.preData.repairedImg5" style="margin-left: 10px"></img-self>
219
+ </div>
220
+
221
+ </div>
222
+ </div>
223
+ </div>
224
+ <div slot="modal-footer" class="modal-footer" style="text-align: center">
225
+ <button class="button_search" v-if="checkDefect=='是' && solveModal.preData.type == 'view'" @click="auditsure('通过')" v-if="solveModal.preData.type == 'view' && !solveModal.f_audit_results">审核通过</button>
226
+ <button class="button_search" v-if="checkDefect=='是' && solveModal.preData.type == 'view'" @click="auditsure('不通过')" v-if="solveModal.preData.type == 'view' && !solveModal.f_audit_results">审核不通过</button>
227
+ <button class="button_search" v-if="solveModal.preData.type == 'solve'" @click="ok">确认</button>
228
+ <button class="button_search" @click="cancel">取消</button>
229
+ </div>
230
+ </modal>
231
+
232
+ </div>
233
+ </template>
234
+
235
+ <script>
236
+ import {PagedList, HttpResetClass} from 'vue-client'
237
+ import * as Util from '../../../components/Util'
238
+ import co from 'co'
239
+ import Vue from "vue";
240
+
241
+ const upSolveDefect = function * (self) {
242
+ let uploadData = self.solveModal.uploadData
243
+ //tag)
244
+ self.$resetpost('/rs/logic/pcRepairDefectNew', self.solveModal.uploadData, {resolveMsg: null, rejectMsg: null})
245
+ .then(res => {
246
+ if (res.data.code === 200) {
247
+ self.$showMessage('隐患已处理。')
248
+ self.showSolveModal = false
249
+ self.model.search('f_repaire_type != \'无隐患\'', {})
250
+ self.solveModal.uploadData={
251
+ id: '',
252
+ f_repairman: self.$login.f.name,
253
+ f_repair_date: Util.getNowDate().substr(0, 10),
254
+ f_repair_path: '',
255
+ imgSrc: '',
256
+ filename: '',
257
+ f_defect_remark:''
258
+ }
259
+ }
260
+ })
261
+ }
262
+
263
+ const sendRepair = function* (self) {
264
+ let preData = self.toRepairModal.preData
265
+ let uploadData = self.toRepairModal.uploadData
266
+
267
+ if (preData.dispatchType == '派发给站点') {
268
+ uploadData.model.serviceacitivity[0].f_meetunit = preData.f_meetunit
269
+ uploadData.model.serviceacitivity[0].f_reciever = preData.f_reciever
270
+ uploadData.model.f_meetunit = preData.f_meetunit
271
+ uploadData.model.f_orgstr = preData.f_reciever
272
+ uploadData.model.f_outlets = preData.f_outlets
273
+ uploadData.toRepair = '转站点'
274
+ } else if (preData.dispatchType == '派发给维修员') {
275
+ uploadData.model.serviceacitivity[0].f_reciever = preData.f_repairman
276
+ // uploadData.model.f_meetunit = self.$login.f.orgpathnames
277
+ // uploadData.model.f_orgstr = self.$login.f.orgpathstr
278
+ // uploadData.model.f_outlets = self.$login.f.f_parentname
279
+ uploadData.model.f_meetunit = self.$login.f.deps
280
+ uploadData.model.f_orgid = self.$login.f.orgid
281
+ uploadData.model.f_filiale = self.$login.f.org
282
+ uploadData.model.f_outlets = self.$login.f.deps
283
+ uploadData.model.f_filiale_id = self.$login.f.orgid
284
+ uploadData.toRepair = '一级派单'
285
+ }
286
+ let res = yield self.$resetpost('/rs/sql/GetUserForRepaireNew', {data: {f_userinfo_id: self.check.f_userinfo_id}})
287
+ preData.userInfo = res.data[0]
288
+ uploadData.model = Object.assign(uploadData.model, preData.userInfo)
289
+ uploadData.user.f_userinfo_id = preData.userInfo.f_userinfo_id
290
+ uploadData.model.f_repair_date = Util.getNowDate()
291
+ uploadData.model.f_repairtype = preData.f_repairtype
292
+ uploadData.model.f_remarks = preData.f_remarks
293
+ // 拼接failure
294
+ let failure = []
295
+ self.model.rows.forEach(row => {
296
+ if (row.f_repaire_type == '隐患未处理') {
297
+ failure.push({
298
+ f_failure_type: row.f_item_name,
299
+ failurecase: row.f_item_value?row.f_item_value.split(','):''
300
+ })
301
+ }
302
+ })
303
+ uploadData.model.failure = failure
304
+ // 拼接repairitems
305
+ let rows = JSON.parse(JSON.stringify(self.model.rows))
306
+ let repairitems = {
307
+ data: []
308
+ }
309
+ let safecheckOptions = [{"data": "已处理"}, {"data": "未处理"}]
310
+ // 取隐患未处理的
311
+ rows = rows.filter(row => row.f_repaire_type == '隐患未处理')
312
+ //tag)
313
+ // 开始拼接
314
+ rows.forEach(row => {
315
+ let existIndex = -1
316
+ // 判断该设备是否已经存在
317
+ for (let i = 0; i < repairitems.data.length; i++) {
318
+ if (repairitems.data[i].f_type == row.f_device_type) {
319
+ existIndex = i
320
+ break
321
+ }
322
+ }
323
+ if (existIndex == -1) {
324
+ // 不存在则新建
325
+ let newItem = {
326
+ f_type: row.f_device_type,
327
+ details: [{
328
+ f_defect_id: row.id,
329
+ f_project: `${row.f_item_name}:${row.f_item_value}`,
330
+ type: 'selector',
331
+ options: safecheckOptions
332
+ }]
333
+ }
334
+ repairitems.data.push(newItem)
335
+ } else {
336
+ // 存在则追加
337
+ repairitems.data[existIndex].details.push({
338
+ f_defect_id: row.id,
339
+ f_project: `${row.f_item_name}:${row.f_item_value}`,
340
+ type: 'selector',
341
+ options: safecheckOptions
342
+ })
343
+ }
344
+ })
345
+ uploadData.model.f_repairitems = repairitems
346
+ //tag)
347
+ // 调工单接口
348
+ let result = yield self.$resetpost('/rs/logic/callerSend', uploadData)
349
+ //tag)
350
+ if (result.data.f_service_id) {
351
+ const data = {
352
+ f_paper_id: rows[0].f_paper_id,
353
+ f_service_id: result.data.f_service_id,
354
+ itemsId: self.$login.convertToIn(rows.map(row => row.id))
355
+ }
356
+ //tag
357
+ let updateRes = yield self.$resetpost('/rs/logic/updateDefectStateNew', data)
358
+ if (updateRes.data.code == 200) {
359
+ self.$showMessage('隐患已转维修。')
360
+ self.model.search(`f_repaire_type != '无隐患'`, {})
361
+ }
362
+ }
363
+ }
364
+
365
+ export default {
366
+ title: '隐患项列表',
367
+ data() {
368
+ return {
369
+ model: new PagedList('rs/sql/GetDefectByPaperIdNew', 100, {
370
+ f_paper_id: 'this.f_paper_id',f_item_value: 'this.f_item_value'
371
+ }),
372
+ showSolveModal: false,
373
+ showToRepairModal: false,
374
+ showDefectModal: false,
375
+ valid: false,
376
+ checkDefect:null,
377
+ needRepair: false,
378
+ solveModal: {
379
+ preData: {
380
+ type: '',
381
+ defectImg: '',
382
+ defectImg1:'',
383
+ defectImg2:'',
384
+ defectImg3:'',
385
+ repairedImg: '',
386
+ repairedImg1: '',
387
+ repairedImg2: '',
388
+ repairedImg3: '',
389
+ repairedImg4: '',
390
+ repairedImg5: '',
391
+ state: ''
392
+ },
393
+ uploadData: {
394
+ id: '',
395
+ f_repairman: this.$login.f.name,
396
+ f_repair_date: Util.getNowDate().substr(0, 10),
397
+ f_repair_path: '',
398
+ imgSrc: '',
399
+ filename: ''
400
+ }
401
+ },
402
+ toRepairModal: {
403
+ preData: {
404
+ dispatchTypeOptions: [{label: '派发给站点', value: '派发给站点'}, {label: '派发给维修员', value: '派发给维修员'}],
405
+ repairTypeOptions: this.$appdata.getParam('报修类型'),
406
+ dispatchType: '',
407
+ f_repairman: '',
408
+ f_repairtype: '',
409
+ f_remarks: '',
410
+ f_meetunit: '',
411
+ f_reciever: '',
412
+ f_outlets: '',
413
+ userInfo: {},
414
+ repairers: []
415
+ },
416
+ uploadData: {
417
+ model: {
418
+ serviceacitivity: [{
419
+ f_service_acitivity_type: '派单'
420
+ }],
421
+ f_repairitems: {},
422
+ failure: '',
423
+ f_source: '安检',
424
+ f_service_id: '',
425
+ f_contact_phone: '',
426
+ f_meetunit: '',
427
+ f_phone: '',
428
+ f_user_name: '',
429
+ f_address: '',
430
+ f_repair_date: '',
431
+ f_reciever: '',
432
+ f_remarks: '',
433
+ f_user_type: '',
434
+ f_area: '',
435
+ f_unit_name: '',
436
+ f_street: '',
437
+ f_residential_area: '',
438
+ f_building: '',
439
+ f_unit: '',
440
+ f_floor: '',
441
+ f_room: '',
442
+ aState: '',
443
+ f_repairtype: '',
444
+ f_userinfo_id: '',
445
+ f_userinfo_code: '',
446
+ f_orgstr: '',
447
+ f_outlets: '',
448
+ f_attendant: this.$login.f.name
449
+ },
450
+ loginUser: {
451
+ name: this.$login.f.name,
452
+ ename: this.$login.f.ename
453
+ },
454
+ user: {
455
+ f_userinfo_id: ''
456
+ },
457
+ callObj: null
458
+ }
459
+ },
460
+ showHandleDefectButton: null
461
+ }
462
+ },
463
+ props: ['check'],
464
+ ready() {
465
+ this.checkDefect=Vue.$appdata.getSingleValue('安检隐患维修后审核')
466
+ this.showHandleDefectButton = Vue.$appdata.getSingleValue('隐患查看处理隐患')
467
+ 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,'' ) )`
468
+ if (this.check) {
469
+ this.model.f_paper_id = this.check.id
470
+ this.model.search(`f_repaire_type != '无隐患'`, {})
471
+ }
472
+ this.getEmp()
473
+ },
474
+ methods: {
475
+ //审核通过
476
+ auditsure(info){
477
+ // 拿到t_devices_items 的ID,给f_audit_results中存入通过 如果未通过,需要可以再次派单,对隐患进行处理
478
+ var data = {
479
+ id: this.solveModal.uploadData.id,
480
+ info:info
481
+ }
482
+ let http = new HttpResetClass()
483
+ http.load('POST', 'rs/logic/DefectAuditUpdate', data, {resolveMsg: null, rejectMsg: null}).then((res) => {
484
+ if(res.data.code == 200){
485
+ this.model.search(`f_repaire_type != '无隐患'`, {})
486
+ this.showSolveModal = false
487
+ this.showToRepairModal = false
488
+ this.$showMessage('提交成功')
489
+ }else{
490
+ this.$showMessage('提交失败,请重试')
491
+ }
492
+ })
493
+ },
494
+ solveDefect(row, type) {
495
+ console.log(row)
496
+ this.solveModal.preData.defectImg = ''
497
+ this.solveModal.preData.f_repair_path = ''
498
+ this.solveModal.preData.repairedImg = ''
499
+ this.solveModal.preData.repairedImg1 = ''
500
+ this.solveModal.preData.repairedImg2 = ''
501
+ this.solveModal.preData.repairedImg3 = ''
502
+ this.solveModal.preData.repairedImg4 = ''
503
+ this.solveModal.preData.repairedImg5 = ''
504
+ this.solveModal.preData.defectImg = row.f_path?'/rs/image/file/' + row.f_path:''
505
+ this.solveModal.preData.defectImg1 = row.f_p1_path?'/rs/image/file/' + row.f_p1_path:''
506
+ this.solveModal.preData.defectImg2 = row.f_p2_path?'/rs/image/file/' + row.f_p2_path:''
507
+ this.solveModal.preData.defectImg3 = row.f_p3_path?'/rs/image/file/' + row.f_p3_path:''
508
+ this.solveModal.uploadData.id = row.id
509
+ this.solveModal.preData.type = type
510
+ this.solveModal.preData.state = row.f_repaire_state
511
+ this.solveModal.preData.source = row.f_repair_path_source
512
+ if (row.f_repaire_state === '已处理') {
513
+ if (row.f_repair_path_source === '微信') {
514
+ this.solveModal.preData.f_repair_path = row.f_repair_path
515
+ this.solveModal.preData.repairedImg = row.f_repair_path
516
+ this.solveModal.preData.repairedImg1 = row.f_repair1_path
517
+ } else {
518
+ this.solveModal.preData.f_repair_path = row.f_repair_path? '/rs/image/file/' + row.f_repair_path:null
519
+ this.solveModal.preData.repairedImg = row.f_repair_path? '/rs/image/file/' + row.f_repair_path:null
520
+ this.solveModal.preData.repairedImg1 = row.f_other_dealpath1? '/rs/image/file/' + row.f_other_dealpath1:null
521
+ this.solveModal.preData.repairedImg2 = row.f_other_dealpath2? '/rs/image/file/' + row.f_other_dealpath2:null
522
+ this.solveModal.preData.repairedImg3 = row.f_repair2_path ? ('/rs/image/file/' + row.f_repair2_path) : ''
523
+ this.solveModal.preData.repairedImg4 = row.f_repair3_path ? ('/rs/image/file/' + row.f_repair3_path) : ''
524
+ this.solveModal.preData.repairedImg5 = row.f_repair4_path ? ('/rs/image/file/' + row.f_repair4_path) : ''
525
+ }
526
+ if (type === '现场已处理') {
527
+ this.solveModal.uploadData.f_repairman = this.check.f_checker_name
528
+ this.solveModal.uploadData.f_repair_date = this.check.f_offsite_time
529
+ } else {
530
+ this.solveModal.uploadData.f_repairman = row.f_repairman
531
+ this.solveModal.uploadData.f_repair_date = row.f_repair_date
532
+ this.$set('solveModal.f_audit_results',row.f_audit_results)
533
+ }
534
+ } else {
535
+ this.solveModal.uploadData.f_repairman = this.$login.f.name
536
+ this.solveModal.uploadData.f_repair_date = Util.getNowDate().substr(0, 10)
537
+ }
538
+ this.showSolveModal = !this.showSolveModal
539
+ },
540
+ ok() {
541
+ if (!(this.solveModal.uploadData.filename && this.solveModal.uploadData.filename.length > 0)) {
542
+ this.$showMessage('请录入处理后照片')
543
+ return
544
+ }
545
+ co(upSolveDefect(this))
546
+ },
547
+ cancel() {
548
+ this.showSolveModal = false
549
+ this.showToRepairModal = false
550
+ },
551
+ toRepair() {
552
+ this.showToRepairModal = !this.showToRepairModal
553
+ },
554
+ getSiteRes(obj) {
555
+ //tag
556
+ //tag
557
+ if(obj.resids[0]){
558
+ this.toRepairModal.preData.f_meetunit = obj.res.join('.')
559
+ this.toRepairModal.preData.f_reciever = obj.resids.join('.')
560
+ }else {
561
+ this.toRepairModal.preData.f_meetunit = ''
562
+ this.toRepairModal.preData.f_reciever = ''
563
+ this.toRepairModal.preData.f_outlets = ''
564
+ }
565
+ },
566
+ // 获取维修员
567
+ getEmp() {
568
+ let val = {source: 'this.getParentByType($organization$).getChildByName($维修员$).getUsers()', userid: `${this.$login.f.id}`}
569
+ let http = new HttpResetClass()
570
+ http.load('POST', '/rs/search', {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
571
+ res.data.forEach((item) => {
572
+ let http1 = new HttpResetClass()
573
+ http1.load('POST', 'rs/sql/tel_singleTable_OrderBy', {
574
+ data: {
575
+ items: 'f_user_telephone',
576
+ tablename: 't_user',
577
+ condition: `id = ${item.id}`,
578
+ orderitem: 'id'
579
+ }
580
+ }, {resolveMsg: null, rejectMsg: null}).then((ress) => {
581
+ this.toRepairModal.preData.repairers.push({label: `${item.name}:${ress.data[0].f_user_telephone}`, value: item.name})
582
+ })
583
+ })
584
+ })
585
+ },
586
+ confirm() {
587
+ if (this.toRepairModal.preData.dispatchType == '派发给站点' && !this.toRepairModal.preData.f_meetunit) {
588
+ this.$showMessage('请选择站点。')
589
+ return
590
+ }
591
+ co(sendRepair(this))
592
+ }
593
+ },
594
+ watch: {
595
+ 'check'() {
596
+ this.model.f_paper_id = this.check.id
597
+ this.model.search(`f_repaire_type != '无隐患'`, {})
598
+ },
599
+ 'model.rows'() {
600
+ if (this.model.rows.length > 0) {
601
+ if (this.model.rows[0].f_repaire_type == '隐患未处理') {
602
+ this.needRepair = true
603
+ return
604
+ }
605
+ }
606
+ this.needRepair = false
607
+ }
608
+ }
609
+ }
610
+ </script>
611
+ <style lang="less" scoped>
612
+ .select-error {
613
+ button {
614
+ border-bottom: 1px solid #a94442 !important;
615
+ }
616
+ }
617
+ </style>
@@ -1,63 +1,63 @@
1
- <template>
2
- <div id="unit" class="flex-row" :class="{'binary':showItem}">
3
- <div :class="{'basic-main':!showItem,'binary-left':showItem}">
4
- <defect-paper-new @select-changed="selected" :style="style" :style2="style2" v-ref:check></defect-paper-new>
5
- </div>
6
- <div class="binary-right" v-show="showItem">
7
- <div class="flex">
8
- <defect-list-new v-if='$refs.check && $refs.check.selected' :check='$refs.check.selected'
9
- v-ref:detail></defect-list-new>
10
- </div>
11
- </div>
12
- </div>
13
- </template>
14
-
15
- <script>
16
- import DefectPaperNew from './DefectPaperNew'
17
- import DefectListNew from '../../../components/NewDefectList/DefectListNew'
18
-
19
- export default {
20
- title: '隐患查看',
21
- props: ['f'],
22
- components: {DefectPaperNew, DefectListNew},
23
- data() {
24
- return {
25
- showItem: false,
26
- style: 'col-sm-2 form-group',
27
- style2: 'col-sm-4 form-group'
28
- }
29
- },
30
- methods: {
31
- selected(row) {
32
- this.showItem = true
33
- }
34
- },
35
- watch: {
36
- 'showItem'(val) {
37
- //tag
38
- //tag
39
- if (val) {
40
- this.style = 'col-sm-3 form-group'
41
- this.style2 = 'col-sm-6 form-group'
42
- } else {
43
- this.style = 'col-sm-2 form-group'
44
- this.style2 = 'col-sm-4 form-group'
45
- }
46
- }
47
- }
48
- }
49
- </script>
50
- <style>
51
- .form-input-group label {
52
- text-align: right;
53
- width: auto;
54
- }
55
-
56
- .datapanel {
57
- color: #333;
58
- background-color: white;
59
- box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
60
- padding: 5px 7px 5px 7px;
61
- border-radius: 10px;
62
- }
63
- </style>
1
+ <template>
2
+ <div id="unit" class="flex-row" :class="{'binary':showItem}">
3
+ <div :class="{'basic-main':!showItem,'binary-left':showItem}">
4
+ <defect-paper-new @select-changed="selected" :style="style" :style2="style2" v-ref:check></defect-paper-new>
5
+ </div>
6
+ <div class="binary-right" v-show="showItem">
7
+ <div class="flex">
8
+ <defect-list-new v-if='$refs.check && $refs.check.selected' :check='$refs.check.selected'
9
+ v-ref:detail></defect-list-new>
10
+ </div>
11
+ </div>
12
+ </div>
13
+ </template>
14
+
15
+ <script>
16
+ import DefectPaperNew from './DefectPaperNew'
17
+ import DefectListNew from './DefectListNew'
18
+
19
+ export default {
20
+ title: '隐患查看',
21
+ props: ['f'],
22
+ components: {DefectPaperNew, DefectListNew},
23
+ data() {
24
+ return {
25
+ showItem: false,
26
+ style: 'col-sm-2 form-group',
27
+ style2: 'col-sm-4 form-group'
28
+ }
29
+ },
30
+ methods: {
31
+ selected(row) {
32
+ this.showItem = true
33
+ }
34
+ },
35
+ watch: {
36
+ 'showItem'(val) {
37
+ //tag
38
+ //tag
39
+ if (val) {
40
+ this.style = 'col-sm-3 form-group'
41
+ this.style2 = 'col-sm-6 form-group'
42
+ } else {
43
+ this.style = 'col-sm-2 form-group'
44
+ this.style2 = 'col-sm-4 form-group'
45
+ }
46
+ }
47
+ }
48
+ }
49
+ </script>
50
+ <style>
51
+ .form-input-group label {
52
+ text-align: right;
53
+ width: auto;
54
+ }
55
+
56
+ .datapanel {
57
+ color: #333;
58
+ background-color: white;
59
+ box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
60
+ padding: 5px 7px 5px 7px;
61
+ border-radius: 10px;
62
+ }
63
+ </style>
@@ -1,45 +1,46 @@
1
- // 分公司特殊组件页面注册
2
- import Vue from "vue";
3
-
4
- let specialComp = {
5
- 'select-check-plan': (resolve) => { require(['./pc/SelectCheckPlan'], resolve) },
6
- 'check-noplan': (resolve) => {require(['./pc/CheckNoPlan'], resolve)},
7
- 'select-check-noplan': (resolve) => { require(['./pc/SelectCheckNoPlan'], resolve) },
8
- 'print-material-bill-noplan': (resolve) => { require(['./pc/PrintMaterialBillNoplan'], resolve)},
9
- 'check-nodetail': (resolve) => {require(['./pc/CheckNoDetail'], resolve)},
10
- 'defect-main-new': (resolve) => {require(['./pc/DefectMainNew'], resolve)},
11
- 'check-user-list':(resolve) => {require(['./pc/checkUserList'], resolve)},
12
- 'defect-paper-new': (resolve) => { require(['./pc/DefectPaperNew'], resolve) },
13
- 'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
14
- 'check-book':(resolve) => { require(['./pc/CheckBook'], resolve)},
15
- 'check-book-area':(resolve) => { require(['./pc/CheckBookArea'], resolve)},
16
- 'check-book-company':(resolve) => { require(['./pc/CheckBookCompany'], resolve)},
17
- 'check-book-company-user':(resolve) => { require(['./pc/CheckBookCompanyUser'], resolve)},
18
- 'check-book-user':(resolve) => { require(['./pc/CheckBookUser'], resolve)},
19
- 'new-check-paper':(resolve) => { require(['./pc/NewCheckpaper'], resolve)},
20
- 'check-book-all':(resolve) => { require(['./pc/CheckBookAll'], resolve)},
21
- 'check-book-list':(resolve) => { require(['./pc/CheckBookList'], resolve)},
22
- 'check-book-details':(resolve) => { require(['./pc/CheckBookDetails'], resolve)},
23
- 'check-book-search-user':(resolve) => { require(['./pc/CheckBookSearchUser'], resolve)},
24
- 'check-plan-user-list':(resolve) => { require(['./pc/CheckPlanUserList'], resolve)},
25
- 'plan-manage':(resolve) => { require(['./pc/PlanManage'], resolve)},
26
- 'check_screen':(resolve) => { require(['./pc/checkScreen'], resolve)},
27
- 'hiddensituation':(resolve) => {require(['./pc/HiddenSituation'], resolve)},
28
- 'check-plan-area-list':(resolve) => { require(['./pc/CheckPlanAreaList'], resolve)},
29
- 'paper-defect-main': (resolve) => { require(['./pc/PaperDefectMain'], resolve) },
30
- 'check-plan-list':(resolve) => { require(['./pc/checkPlanList'], resolve)},
31
- 'check-book-search-user-list':(resolve) => { require(['./pc/CheckBookSearchUserList'], resolve)},
32
- 'check-detail':(resolve)=> {require(['./pc/CheckDetail'], resolve)},
33
- 'person-track':(resolve)=> {require(['./pc/PersonTrack'], resolve)},
34
- 'check-plan':(resolve)=> {require(['./pc/CheckPlan'], resolve)},
35
- 'check-plan-area-manage':(resolve)=> {require(['./pc/CheckPlanAreaManage'], resolve)},
36
- 'check-search-user':(resolve)=> {require(['./pc/CheckSearchUser'], resolve)},
37
- 'select-check-plan_outhelp':(resolve)=> {require(['./pc/SelectCheckPlanOutHelp'], resolve)},
38
- 'check-detail_outhelp':(resolve)=> {require(['./pc/CheckDetailOutHelp'], resolve)},
39
- 'check-plan_outhelp':(resolve)=> {require(['./pc/CheckPlanOutHelp'], resolve)},
40
- }
41
- exports.specialComp = specialComp
42
-
43
-
44
-
45
-
1
+ // 分公司特殊组件页面注册
2
+ import Vue from "vue";
3
+
4
+ let specialComp = {
5
+ 'select-check-plan': (resolve) => { require(['./pc/SelectCheckPlan'], resolve) },
6
+ 'check-noplan': (resolve) => {require(['./pc/CheckNoPlan'], resolve)},
7
+ 'select-check-noplan': (resolve) => { require(['./pc/SelectCheckNoPlan'], resolve) },
8
+ 'print-material-bill-noplan': (resolve) => { require(['./pc/PrintMaterialBillNoplan'], resolve)},
9
+ 'check-nodetail': (resolve) => {require(['./pc/CheckNoDetail'], resolve)},
10
+ 'defect-main-new': (resolve) => {require(['./pc/DefectMainNew'], resolve)},
11
+ 'check-user-list':(resolve) => {require(['./pc/checkUserList'], resolve)},
12
+ 'defect-paper-new': (resolve) => { require(['./pc/DefectPaperNew'], resolve) },
13
+ 'defect-list-new': (resolve) => { require(['./pc/DefectListNew'], resolve) },
14
+ 'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
15
+ 'check-book':(resolve) => { require(['./pc/CheckBook'], resolve)},
16
+ 'check-book-area':(resolve) => { require(['./pc/CheckBookArea'], resolve)},
17
+ 'check-book-company':(resolve) => { require(['./pc/CheckBookCompany'], resolve)},
18
+ 'check-book-company-user':(resolve) => { require(['./pc/CheckBookCompanyUser'], resolve)},
19
+ 'check-book-user':(resolve) => { require(['./pc/CheckBookUser'], resolve)},
20
+ 'new-check-paper':(resolve) => { require(['./pc/NewCheckpaper'], resolve)},
21
+ 'check-book-all':(resolve) => { require(['./pc/CheckBookAll'], resolve)},
22
+ 'check-book-list':(resolve) => { require(['./pc/CheckBookList'], resolve)},
23
+ 'check-book-details':(resolve) => { require(['./pc/CheckBookDetails'], resolve)},
24
+ 'check-book-search-user':(resolve) => { require(['./pc/CheckBookSearchUser'], resolve)},
25
+ 'check-plan-user-list':(resolve) => { require(['./pc/CheckPlanUserList'], resolve)},
26
+ 'plan-manage':(resolve) => { require(['./pc/PlanManage'], resolve)},
27
+ 'check_screen':(resolve) => { require(['./pc/checkScreen'], resolve)},
28
+ 'hiddensituation':(resolve) => {require(['./pc/HiddenSituation'], resolve)},
29
+ 'check-plan-area-list':(resolve) => { require(['./pc/CheckPlanAreaList'], resolve)},
30
+ 'paper-defect-main': (resolve) => { require(['./pc/PaperDefectMain'], resolve) },
31
+ 'check-plan-list':(resolve) => { require(['./pc/checkPlanList'], resolve)},
32
+ 'check-book-search-user-list':(resolve) => { require(['./pc/CheckBookSearchUserList'], resolve)},
33
+ 'check-detail':(resolve)=> {require(['./pc/CheckDetail'], resolve)},
34
+ 'person-track':(resolve)=> {require(['./pc/PersonTrack'], resolve)},
35
+ 'check-plan':(resolve)=> {require(['./pc/CheckPlan'], resolve)},
36
+ 'check-plan-area-manage':(resolve)=> {require(['./pc/CheckPlanAreaManage'], resolve)},
37
+ 'check-search-user':(resolve)=> {require(['./pc/CheckSearchUser'], resolve)},
38
+ 'select-check-plan_outhelp':(resolve)=> {require(['./pc/SelectCheckPlanOutHelp'], resolve)},
39
+ 'check-detail_outhelp':(resolve)=> {require(['./pc/CheckDetailOutHelp'], resolve)},
40
+ 'check-plan_outhelp':(resolve)=> {require(['./pc/CheckPlanOutHelp'], resolve)},
41
+ }
42
+ exports.specialComp = specialComp
43
+
44
+
45
+
46
+
@@ -218,8 +218,8 @@ div {
218
218
  <td style="margin: auto;text-align: center">
219
219
  <div class="container" style="max-width: 550px;background: #FFFFFF">
220
220
  <div class="img" v-for="img in paperdata.f_overall_imgs">
221
- <img-self :src="getimg(img.f_overall_path)" style="float: left" width="150"
222
- height="200"></img-self>
221
+ <img-self-android :src="getimg(img.f_overall_path)" style="float: left" width="150"
222
+ height="200"></img-self-android>
223
223
  </div>
224
224
  </div>
225
225
 
@@ -240,8 +240,8 @@ div {
240
240
  <td style="margin: auto;text-align: center">
241
241
  <div class="container" style="max-width: 500px;background: #FFFFFF">
242
242
  <div class="img" style="float: none">
243
- <img-self :src="getimg(paperdata.f_sign_path)" width="150" style="float: left"
244
- height="200"></img-self>
243
+ <img-self-android :src="getimg(paperdata.f_sign_path)" width="150" style="float: left"
244
+ height="200"></img-self-android>
245
245
  </div>
246
246
  </div>
247
247
  </td>
@@ -259,8 +259,8 @@ div {
259
259
  <td style="margin: auto;text-align: center">
260
260
  <div class="container" style="max-width: 500px;background: #FFFFFF">
261
261
  <div class="img" style="float: none">
262
- <img-self :src="getimg(paperdata.f_notified_path)"width="150" style="float: left"
263
- height="200"></img-self>
262
+ <img-self-android :src="getimg(paperdata.f_notified_path)"width="150" style="float: left"
263
+ height="200"></img-self-android>
264
264
  </div>
265
265
  </div>
266
266
  </td>
@@ -324,13 +324,13 @@ div {
324
324
  <div class="from-group">
325
325
  <div class="row">
326
326
  <div class="col-md-6">
327
- <img-self v-if="showimg1" :src="getimg(showimg1)" width="240" height="300"></img-self>
327
+ <img-self-android v-if="showimg1" :src="getimg(showimg1)" width="240" height="300"></img-self-android>
328
328
  </div>
329
329
  <div class="col-md-6">
330
- <img-self v-if="showimg2" :src="getimg(showimg2)" width="240" height="300"></img-self>
330
+ <img-self-android v-if="showimg2" :src="getimg(showimg2)" width="240" height="300"></img-self-android>
331
331
  </div>
332
332
  <div class="col-md-6" v-for="item in otherDarginShowImgs">
333
- <img-self v-if="item.path" :src="getimg(item.path)" width="240" height="300"></img-self>
333
+ <img-self-android v-if="item.path" :src="getimg(item.path)" width="240" height="300"></img-self-android>
334
334
  </div>
335
335
  </div>
336
336
  </div>
@@ -347,27 +347,27 @@ div {
347
347
  <div class="from-group">
348
348
  <div class="row">
349
349
  <div class="col-md-6">
350
- <img-self v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer_path" :src="showimg3" width="282"
351
- height="400"></img-self>
350
+ <img-self-android v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer_path" :src="showimg3" width="282"
351
+ height="400"></img-self-android>
352
352
  </div>
353
353
  <div class="col-md-6">
354
- <img-self v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer1_path" :src="showimg5" width="282"
355
- height="400"></img-self>
354
+ <img-self-android v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer1_path" :src="showimg5" width="282"
355
+ height="400"></img-self-android>
356
356
  </div>
357
357
  <div class="col-md-6">
358
- <img-self v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer2_path" :src="showimg6" width="282"
359
- height="400"></img-self>
358
+ <img-self-android v-if="this.paperdata.f_entry_status=='到访不遇'&& this.paperdata.f_noanswer2_path" :src="showimg6" width="282"
359
+ height="400"></img-self-android>
360
360
  </div>
361
361
  <div class="col-md-6">
362
- <img-self v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck_path" :src="showimg4" width="282"
363
- height="400"></img-self>
362
+ <img-self-android v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck_path" :src="showimg4" width="282"
363
+ height="400"></img-self-android>
364
364
  </div>
365
365
  <div class="col-md-6">
366
- <img-self v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck1_path" :src="showimg7" width="282"
367
- height="400"></img-self>
366
+ <img-self-android v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck1_path" :src="showimg7" width="282"
367
+ height="400"></img-self-android>
368
368
  </div>
369
369
  <div class="col-md-6">
370
- <img-self v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck2_path" :src="showimg8" width="282"
370
+ <img-self-android v-if="this.paperdata.f_entry_status=='拒检' && this.paperdata.f_rejectcheck2_path" :src="showimg8" width="282"
371
371
  height="400"></img-self>
372
372
  </div>
373
373
  </div>
@@ -32,7 +32,7 @@
32
32
  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
33
33
  <div class="col-xs-4 col-sm-3 col-md-2" style="margin-bottom: 35px"
34
34
  v-for="(index, img) in paper.f_overall_imgs">
35
- <img-self :src="img.f_overall_path" alt="总体安检照片" :width="140" :height="170"></img-self>
35
+ <img-self-android :src="img.f_overall_path" alt="总体安检照片" :width="140" :height="170"></img-self-android>
36
36
  <img src="../../../assets/删除.png" @click="delfile('f_overall_path', img.f_overall_path, index)"
37
37
  style="width: 15px;margin-top: -80px" alt="">
38
38
  </div>
@@ -55,7 +55,7 @@
55
55
  style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
56
56
  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
57
57
  <div class="col-xs-4 col-sm-3 col-md-2" style="margin-bottom: 35px" v-for="(index, img) in defectImgs">
58
- <img-self :src="img" alt="总体隐患照片" :width="140" :height="170"></img-self>
58
+ <img-self-android :src="img" alt="总体隐患照片" :width="140" :height="170"></img-self-android>
59
59
  <!-- <img src="../../assets/删除.png" @click="delfile('f_overall_path', img.f_overall_path,index)" style="width: 15px;margin-top: -80px" alt="">-->
60
60
  </div>
61
61
  </div>
@@ -150,7 +150,7 @@
150
150
  style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
151
151
  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
152
152
  <div class="col-sm-4">
153
- <img-self :src="paper.f_notified_path" alt="安检通知书/隐患整改通知书照片" width="150" height="200"></img-self>
153
+ <img-self-android :src="paper.f_notified_path" alt="安检通知书/隐患整改通知书照片" width="150" height="200"></img-self-android>
154
154
  </div>
155
155
  </div>
156
156
  <div class="row text-right div-photo">
@@ -182,7 +182,7 @@
182
182
  <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 100%;height: 260px;position: relative">
183
183
  <div class="row" style="height: 240px;">
184
184
  <div class="col-sm-4">
185
- <img-self :src="f_meterno_path" alt="表号照片" width="150" height="200"></img-self>
185
+ <img-self-android :src="f_meterno_path" alt="表号照片" width="150" height="200"></img-self-android>
186
186
  </div>
187
187
  </div>
188
188
  <div class="row text-right div-photo" :class="style__">
@@ -35,7 +35,7 @@
35
35
  <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 160px;height: 160px;position: relative">
36
36
  <div class="row" style="height: 160px;width:160px;overflow: scroll;top: 1px">
37
37
  <div class="col-sm-4" v-show="row.f_path">
38
- <img-self :src="row.f_path" :alt="row.f_item_name" width="140" height="140"></img-self>
38
+ <img-self-android :src="row.f_path" :alt="row.f_item_name" width="140" height="140"></img-self-android>
39
39
  </div>
40
40
  <div class="col-sm-4" v-show="!row.f_path" @click="takePic(idxs, row.f_item_name)">
41
41
  <img src="../../../assets/tackpic.png" :alt="点击拍摄照片" width="140" height="140"></img>
@@ -147,7 +147,7 @@
147
147
  <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 160px;height: 160px;position: relative">
148
148
  <div class="col-xs-6" style="height: 160px;width:160px;overflow: scroll;top: 1px">
149
149
  <div class="col-sm-4" v-show="row.f_path">
150
- <img-self :src="row.f_path" :alt="row.f_item_name" width="140" height="140"></img-self>
150
+ <img-self-android :src="row.f_path" :alt="row.f_item_name" width="140" height="140"></img-self-android>
151
151
  </div>
152
152
  <div class="col-sm-4" v-show="!row.f_path" @click="takePic(idxs, row.f_item_name)">
153
153
  <img src="../../../assets/tackpic.png" :alt="点击拍摄照片" width="140" height="140"></img>
@@ -163,7 +163,7 @@
163
163
  <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 160px;height: 160px;position: relative">
164
164
  <div class="col-xs-6" style="height: 160px;width:160px;overflow: scroll;top: 1px">
165
165
  <div class="col-sm-4" v-show="row['f_p' + (itemIndex+1) + '_path']">
166
- <img-self :src="row['f_p' + (itemIndex+1) + '_path']" :alt="row.f_item_name" width="140" height="140"></img-self>
166
+ <img-self-android :src="row['f_p' + (itemIndex+1) + '_path']" :alt="row.f_item_name" width="140" height="140"></img-self-android>
167
167
  </div>
168
168
  <div class="col-sm-4" v-show="!row['f_p' + (itemIndex+1) + '_path']" @click="takePic(idxs, row.f_item_name,'f_p' + (itemIndex+1)+ '_path')">
169
169
  <img src="../../../assets/tackpic.png" :alt="点击拍摄照片" width="140" height="140"></img>
@@ -180,7 +180,7 @@
180
180
  <div class="panel-body panel-self" style="background-color: #F8F8F8;width: 160px;height: 160px;position: relative">
181
181
  <div class="col-xs-6" style="height: 160px;width:160px;overflow: scroll;top: 1px">
182
182
  <div class="col-sm-4" v-show="row.f_repair_path">
183
- <img-self :src="row.f_repair_path" :alt="row.f_item_name" width="140" height="140"></img-self>
183
+ <img-self-android :src="row.f_repair_path" :alt="row.f_item_name" width="140" height="140"></img-self-android>
184
184
  </div>
185
185
  <div class="col-sm-4" v-show="!row.f_repair_path" @click="takePic(idxs, row.f_item_name,'f_repair_path',row.f_defect_level)">
186
186
  <img src="../../../assets/tackpic.png" alt="点击拍摄照片" width="140" height="140"></img>
@@ -1987,8 +1987,10 @@ export default {
1987
1987
  this.$set('data.f_unit', this.item.f_unit)
1988
1988
  this.$set('data.f_ins_stop_date', this.item.f_plan_meters[0].f_ins_stop_date)
1989
1989
  this.$set('data.f_zhongdian', this.item.f_plan_meters[0].f_zhongdian)
1990
+ this.$set('data.f_zhongdian_f_remark', this.item.f_plan_meters[0].f_zhongdian_f_remark)
1990
1991
  this.$set('data.f_audit_comments', this.item.f_plan_meters[0].f_audit_comments)
1991
1992
  this.$set('data.f_gas_date', this.item.f_plan_meters[0].f_gas_date)
1993
+ this.$set('data.f_uservent_date', this.item.f_plan_meters[0].f_uservent_date)
1992
1994
  this.$set('data.f_gas_pointsnumber', this.item.f_plan_meters[0].f_gas_pointsnumber)
1993
1995
  //tag
1994
1996
  this.$set('data.f_floor', this.item.f_floor)
@@ -63,6 +63,10 @@
63
63
  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>通气时间:</b></p>
64
64
  <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_gas_date }}</p>
65
65
  </div>
66
+ <div class="col-xs-12" style="padding: 2px 0">
67
+ <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>首次通气时间:</b></p>
68
+ <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_uservent_date }}</p>
69
+ </div>
66
70
  <div class="col-xs-12" style="padding: 2px 0">
67
71
  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用气点数量:</b></p>
68
72
  <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_gas_pointsnumber }}</p>
@@ -75,9 +79,13 @@
75
79
  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left;color: red;"><b>是重点用户</b></p>
76
80
  </div>
77
81
  <div class="col-xs-12" style="padding: 2px 0" v-if="userinfo.f_zhongdian">
78
- <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>移入的原因:</b></p>
82
+ <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>移入原因:</b></p>
79
83
  <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_zhongdian }}</p>
80
84
  </div>
85
+ <div class="col-xs-12" style="padding: 2px 0" v-if="userinfo.f_zhongdian">
86
+ <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>移入备注:</b></p>
87
+ <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_zhongdian_f_remark }}</p>
88
+ </div>
81
89
  <div class="col-xs-12">
82
90
  <button type="button" style="width: 45%;float: left" class="btn btn-primary" v-if="updateuserphone"
83
91
  @click="updatePhone(userinfo.f_user_phone,userinfo.f_userinfoid)">电话修改
@@ -134,7 +142,7 @@
134
142
  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
135
143
  <div class="col-xs-4 col-sm-3 col-md-2" style="margin-bottom: 35px"
136
144
  v-for="(index,img) in f_noanswers_path">
137
- <img-self :src="img.f_noanswer_path" alt="到访不遇照片" :width="130" :height="160"></img-self>
145
+ <img-self-android :src="img.f_noanswer_path" alt="到访不遇照片" :width="130" :height="160"></img-self-android>
138
146
  <img src="../../../assets/删除.png" @click="delfile('f_noanswers_path', img.f_noanswer_path,index)"
139
147
  style="width: 15px;margin-top: -80px" alt="">
140
148
  </div>
@@ -160,7 +168,7 @@
160
168
  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
161
169
  <div class="col-xs-4 col-sm-3 col-md-2" style="margin-bottom: 35px"
162
170
  v-for="(index,img) in f_rejectchecks_path">
163
- <img-self :src="img.f_rejectcheck_path" alt="拒检照片" :width="130" :height="160"></img-self>
171
+ <img-self-android :src="img.f_rejectcheck_path" alt="拒检照片" :width="130" :height="160"></img-self-android>
164
172
  <img src="../../../assets/删除.png" @click="delfile('f_rejectchecks_path', img.f_rejectcheck_path,index)"
165
173
  style="width: 15px;margin-top: -80px" alt="">
166
174
  </div>
@@ -183,7 +191,7 @@
183
191
  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
184
192
  <div class="col-xs-4 col-sm-3 col-md-2" style="margin-bottom: 35px"
185
193
  v-for="(index,img) in f_rejectchecks_path">
186
- <img-self :src="img.f_rejectcheck_path" alt="拆除照片" :width="130" :height="160"></img-self>
194
+ <img-self-android :src="img.f_rejectcheck_path" alt="拆除照片" :width="130" :height="160"></img-self-android>
187
195
  <img src="../../../assets/删除.png" @click="delfile('f_rejectchecks_path', img.f_rejectcheck_path,index)"
188
196
  style="width: 15px;margin-top: -80px" alt="">
189
197
  </div>
@@ -206,7 +214,7 @@
206
214
  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
207
215
  <div class="col-xs-4 col-sm-3 col-md-2" style="margin-bottom: 35px"
208
216
  v-for="(index,img) in f_rejectchecks_path">
209
- <img-self :src="img.f_rejectcheck_path" alt="未通气照片" :width="130" :height="160"></img-self>
217
+ <img-self-android :src="img.f_rejectcheck_path" alt="未通气照片" :width="130" :height="160"></img-self-android>
210
218
  <img src="../../../assets/删除.png" @click="delfile('f_rejectchecks_path', img.f_rejectcheck_path,index)"
211
219
  style="width: 15px;margin-top: -80px" alt="">
212
220
  </div>
@@ -229,7 +237,7 @@
229
237
  <div class="row" style="height: 240px;overflow: scroll;top: 1px">
230
238
  <div class="col-xs-4 col-sm-3 col-md-2" style="margin-bottom: 35px"
231
239
  v-for="(index,img) in f_rejectchecks_path">
232
- <img-self :src="img.f_rejectcheck_path" alt="停用照片" :width="130" :height="160"></img-self>
240
+ <img-self-android :src="img.f_rejectcheck_path" alt="停用照片" :width="130" :height="160"></img-self-android>
233
241
  <img src="../../../assets/删除.png" @click="delfile('f_rejectchecks_path', img.f_rejectcheck_path,index)"
234
242
  style="width: 15px;margin-top: -80px" alt="">
235
243
  </div>
@@ -256,7 +256,8 @@
256
256
  <td style="text-align: center">{{row.f_address}}</td>
257
257
  <td style="text-align: center">{{row.f_offsite_time}}</td>
258
258
  <td style="text-align: center">{{row.f_checker_name}}</td>
259
- <td style="text-align: center">{{row.f_is_repaired}}</td>
259
+ <td style="text-align: center" v-if="row.f_is_repaired == '隐患未处理'" @click="$parent.$parent.$parent.showSolve(row)"><a>{{row.f_is_repaired}}</a></td>
260
+ <td style="text-align: center" v-else>{{row.f_is_repaired}}</td>
260
261
  <td style="text-align: center">{{row.f_repairman}}</td>
261
262
  <td style="text-align: center">{{row.f_deal_dispose}}</td>
262
263
  <td style="text-align: center">{{row.f_repair_date}}</td>
@@ -350,6 +351,40 @@
350
351
  </div>
351
352
  <div slot="modal-footer" class="modal-footer" style="text-align: center" v-show="false"></div>
352
353
  </modal>
354
+ <modal :show.sync="showSolveModal" v-ref:solveModal>
355
+ <div slot="modal-header" class="modal-header">
356
+ <h4 class="modal-title">
357
+ 处理隐患
358
+ </h4>
359
+ </div>
360
+ <div slot="modal-body" class="modal-body">
361
+ <div style="width: 100%;height: 36px;background-color: #f1f8ff;float: left">
362
+ <div style="width: 8px;height: 100%;background-color: #6aa6e2;margin-right: 20px;float: left"></div>
363
+ <div style="width: auto;height:100%;float: left;"><p class="title-font" style="margin-top: 5px">处理前</p></div>
364
+ </div>
365
+
366
+ <div class="col-sm-6" style="margin-top: 10px">
367
+ <label class="font_normal_body">安&nbsp;检&nbsp;员</label>
368
+ <input class="input_search" style="width: 60%" type="text" disabled="true" v-model="solve.model.f_checker_name" placeholder="安检员">
369
+ </div>
370
+ <div class="col-sm-6" style="margin-top: 10px">
371
+ <label class="font_normal_body">安检时间</label>
372
+ <input class="input_search" style="width: 60%" type="text" disabled="true" v-model="solve.model.f_offsite_time" placeholder="安检时间">
373
+ </div>
374
+ <div class="col-sm-12" style="margin-bottom: 10px" v-if="solve.model.defectImg">
375
+ <label class="font_normal_body">隐患图片</label>
376
+ <img-self :width="200" :height="200" :src="solve.model.defectImg"></img-self>
377
+ </div>
378
+ <div class="col-sm-12" style="margin-bottom: 10px">
379
+ <label class="font_normal_body">处理后图片</label>
380
+ <avatar-upload :width="200" :height="200" :img-src.sync="solve.imgSrc" :filename.sync="solve.filename" v-ref:imginfo></avatar-upload>
381
+ </div>
382
+ </div>
383
+ <div slot="modal-footer" class="modal-footer" style="text-align: center">
384
+ <button class="button_search" @click="okDefect">确认</button>
385
+ <button class="button_search" @click="cancelsolveDefect">取消</button>
386
+ </div>
387
+ </modal>
353
388
  </div>
354
389
  </div>
355
390
  </template>
@@ -363,7 +398,27 @@
363
398
  import getNowDate from "../../../utils/getNowDate";
364
399
  import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
365
400
  import BenzAMRRecorder from 'benz-amr-recorder'
366
-
401
+ const upSolveDefect = function * (self) {
402
+ self.solve.f_deal_dispose = self.solve.f_deal_dispose || '已处理'
403
+ self.$resetpost('/rs/logic/pcRepairDefectNew', self.solve, {resolveMsg: null, rejectMsg: null})
404
+ .then(res => {
405
+ if (res.data.code === 200) {
406
+ self.$showMessage('隐患已处理。')
407
+ self.showSolveModal = false
408
+ self.search()
409
+ self.solve={
410
+ model:{},
411
+ id: '',
412
+ f_repairman: self.$login.f.name,
413
+ f_repair_date: Util.getNowDate().substr(0, 10),
414
+ f_repair_path: '',
415
+ imgSrc: '',
416
+ filename: '',
417
+ f_defect_remark:''
418
+ }
419
+ }
420
+ })
421
+ }
367
422
  //获取json配置文件
368
423
  let asyncReady = async function (self) {
369
424
  // 获取配置信息
@@ -460,7 +515,18 @@
460
515
  showModal3: false,
461
516
  progressbarWidth:'0',
462
517
  canToRepair: this.$appdata.getSingleValue('隐患明细转维修'),
463
- checkes: []
518
+ checkes: [],
519
+ solve:{
520
+ model:{},
521
+ id: '',
522
+ f_repairman: this.$login.f.name,
523
+ f_repair_date: Util.getNowDate().substr(0, 10),
524
+ f_repair_path: '',
525
+ imgSrc: '',
526
+ filename: '',
527
+ f_defect_remark:''
528
+ },
529
+ showSolveModal:false
464
530
  }
465
531
  },
466
532
  computed :{
@@ -830,6 +896,32 @@
830
896
  ////tag
831
897
  args.condition += ` and f_filialeid in ${this.model.f_filialeid}`
832
898
  this.model.search(args.condition, args.model, args.condValue)
899
+ },
900
+ cancelsolveDefect() {
901
+ this.showSolveModal = false
902
+ this.solve = {
903
+ model:{},
904
+ id: '',
905
+ f_repairman: this.$login.f.name,
906
+ f_repair_date: Util.getNowDate().substr(0, 10),
907
+ f_repair_path: '',
908
+ imgSrc: '',
909
+ filename: '',
910
+ f_defect_remark:''
911
+ }
912
+ },
913
+ okDefect(){
914
+ if (!(this.solve.filename && this.solve.filename.length > 0)) {
915
+ this.$showMessage('请录入处理后照片')
916
+ return
917
+ }
918
+ co(upSolveDefect(this))
919
+ },
920
+ showSolve(row){
921
+ this.showSolveModal = true
922
+ this.solve.model = row
923
+ this.solve.model.defectImg = row.f_path?'/rs/image/file/' + row.f_path:null
924
+ this.solve.id = row.f_defect_id
833
925
  }
834
926
  },
835
927