safecheck-client 4.0.0-6 → 4.0.0-61

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.
Files changed (99) hide show
  1. package/package.json +1 -1
  2. package/src/components/Util/ImgSelfSafePlus.vue +13 -3
  3. package/src/components/android/AndroidDefectDeal.vue +1 -1
  4. package/src/components/android/AndroidDefectDealBeforeSafe.vue +1 -1
  5. package/src/components/android/AndroidDefectDetails.vue +725 -0
  6. package/src/components/android/BlackUserOnLine.vue +2 -2
  7. package/src/components/android/Insurance/PhoneInsurancePurchase.vue +1 -1
  8. package/src/components/android/PaperFeedback.vue +14 -12
  9. package/src/components/android/PaperFeedbackTemp.vue +2 -2
  10. package/src/components/android/PhoneUpUserinfo.vue +20 -0
  11. package/src/components/android/RelieveRestrict.vue +1 -1
  12. package/src/components/android/Restriction.vue +1 -1
  13. package/src/components/android/SafecheckDevices.vue +47 -2
  14. package/src/components/android/SafecheckOrderV.vue +2 -2
  15. package/src/components/android/SealBind.vue +392 -0
  16. package/src/components/android/SealManage.vue +250 -0
  17. package/src/components/inspections/inspectionFeedback.vue +2 -2
  18. package/src/components/paper/PaperList.vue +34 -6
  19. package/src/components/pc/AddToCheckBook.vue +100 -23
  20. package/src/components/pc/CheckBook.vue +2 -0
  21. package/src/components/pc/CheckBookDetails.vue +6 -39
  22. package/src/components/pc/CheckBookEntry.vue +6 -7
  23. package/src/components/pc/CheckBookList.vue +60 -71
  24. package/src/components/pc/CheckBookSearchArea.vue +20 -24
  25. package/src/components/pc/CheckBookSearchUser.vue +139 -84
  26. package/src/components/pc/CheckBookSearchUserList.vue +1 -2
  27. package/src/components/pc/CheckBookUser.vue +276 -44
  28. package/src/components/pc/NewCheckpaper.vue +14 -8
  29. package/src/components/pc/NewCheckpaperTemp.vue +5 -5
  30. package/src/components/pc/PaperDefectMain.vue +1 -0
  31. package/src/components/planmanage/PlanManage.vue +6 -8
  32. package/src/components/rongcheng/AspPaperFeedback.vue +1 -1
  33. package/src/components/rongcheng/PaperFeedback.vue +2 -2
  34. package/src/components/safecheck/queryManage/CheckBookAll.vue +2 -2
  35. package/src/filiale/ancheng/android/PaperFeedback.vue +2 -2
  36. package/src/filiale/ankangyihua/android/AndroidDefectDeal.vue +1 -1
  37. package/src/filiale/baiyin/android/AndroidDefectDeal.vue +1 -1
  38. package/src/filiale/bayan/android/PaperFeedback.vue +2 -2
  39. package/src/filiale/fugou/pc/PaperDefectMain.vue +1 -1
  40. package/src/filiale/hanzhong/android/PaperFeedback.vue +2 -2
  41. package/src/filiale/huatong/android/PaperFeedback.vue +2 -2
  42. package/src/filiale/huayin/android/PaperFeedback.vue +2 -2
  43. package/src/filiale/huayin/android/SafecheckOrderV.vue +1 -1
  44. package/src/filiale/jiaocheng/android/PaperFeedback.vue +2 -2
  45. package/src/filiale/jingyang/android/PaperFeedback.vue +2 -2
  46. package/src/filiale/jinhong/android/PhoneInsurancePurchaseDetail.vue +437 -366
  47. package/src/filiale/jinhong/android/PhoneInsuranceRecordList.vue +346 -0
  48. package/src/filiale/jinhong/android.js +1 -0
  49. package/src/filiale/kelai/android/AndroidDefectDeal.vue +2 -2
  50. package/src/filiale/kelai/android/PaperFeedback.vue +2 -2
  51. package/src/filiale/kelai/android/RelieveRestrict.vue +1 -1
  52. package/src/filiale/kelai/android/SafecheckOrderV.vue +1 -1
  53. package/src/filiale/kelai/pc/FaultLimitGas/FaultLimitGasPaper.vue +1 -1
  54. package/src/filiale/meihekou/android/AreaPlan.vue +569 -0
  55. package/src/filiale/meihekou/android/CheckPlanList.vue +198 -0
  56. package/src/filiale/meihekou/android/CheckPlanListArea.vue +190 -0
  57. package/src/filiale/meihekou/android/CurrentCreate.vue +1087 -0
  58. package/src/filiale/meihekou/android/MeterReading.vue +106 -0
  59. package/src/filiale/meihekou/android/PhoneUpUserinfo.vue +1276 -0
  60. package/src/filiale/meihekou/android/SafecheckOrderV.vue +2400 -0
  61. package/src/filiale/meihekou/android/SafecheckUserInfo.vue +787 -0
  62. package/src/filiale/meihekou/android.js +19 -0
  63. package/src/filiale/meihekou/pc.js +12 -0
  64. package/src/filiale/pingxiang/android/PaperFeedback.vue +2 -2
  65. package/src/filiale/qianneng/android/PaperFeedback.vue +2 -2
  66. package/src/filiale/rizhao/android/PaperFeedback.vue +2 -2
  67. package/src/filiale/rongchuang/android/PaperFeedback.vue +2 -2
  68. package/src/filiale/shanggao/android/PaperFeedback.vue +2 -2
  69. package/src/filiale/shanxian/android/AndroidDefectDeal.vue +1 -1
  70. package/src/filiale/shanxian/android/PaperFeedback.vue +2 -2
  71. package/src/filiale/shexian/android/AndroidDefectDeal.vue +1 -1
  72. package/src/filiale/shexian/android/PaperFeedback.vue +2 -2
  73. package/src/filiale/shimen/android/PaperFeedback.vue +2 -2
  74. package/src/filiale/tongchuan/android/AndroidDefectDeal.vue +1 -1
  75. package/src/filiale/tongchuan/android/PaperFeedback.vue +2 -2
  76. package/src/filiale/weinan/android/SafecheckOrderV.vue +3 -3
  77. package/src/filiale/wenxi/android/PaperFeedback.vue +3 -3
  78. package/src/filiale/wuan/android/PaperFeedback.vue +2 -2
  79. package/src/filiale/wuhai/android/PaperFeedback.vue +2 -2
  80. package/src/filiale/xiangyuanzhongai/android/SafecheckDevices.vue +20 -1
  81. package/src/filiale/xiangyuanzhongai/android/SafecheckOrderV.vue +2282 -0
  82. package/src/filiale/xiangyuanzhongai/android/SafecheckUserInfo.vue +786 -0
  83. package/src/filiale/xiangyuanzhongai/android.js +2 -0
  84. package/src/filiale/xiangyuanzhongai/pc/DefectListNew.vue +663 -0
  85. package/src/filiale/xiangyuanzhongai/pc/PaperList.vue +795 -0
  86. package/src/filiale/xiangyuanzhongai/pc.js +2 -0
  87. package/src/filiale/yangchunboneng/android/PaperFeedback.vue +2 -2
  88. package/src/filiale/yongzhou/android/PaperFeedback.vue +2 -2
  89. package/src/filiale/yuansheng/android/AndroidDefectDeal.vue +1 -1
  90. package/src/filiale/yuansheng/android/PaperFeedback.vue +2 -2
  91. package/src/filiale/yunchengminsheng/android/DailyworkloadQuery.vue +2 -2
  92. package/src/filiale/yunchengminsheng/android/PhoneSellInfo.vue +113 -0
  93. package/src/filiale/yunchengminsheng/android/SafecheckOrderV.vue +2 -0
  94. package/src/filiale/yunchengminsheng/android/SafecheckUserInfo.vue +1 -1
  95. package/src/filiale/yunchengminsheng/android.js +1 -0
  96. package/src/filiale/yunchengminsheng/pc/NewCheckpaper.vue +16 -5
  97. package/src/filiale/zhongsheng/android/PaperFeedback.vue +2 -2
  98. package/src/filiale/zhoukou/android/PaperFeedback.vue +2 -2
  99. package/src/safecheck-android.js +3 -0
@@ -4,97 +4,329 @@
4
4
  <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
5
5
  <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
6
6
  <div class="row">
7
- <div class="form-group col-sm-3" >
7
+ <div class="form-group col-sm-3">
8
8
  <label class="font_normal_body">客户编号</label>
9
- <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" placeholder='客户编号'
9
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code"
10
+ placeholder='客户编号'
10
11
  condition="f_userinfo_code = '{}'" @keyup.enter="search()">
11
12
  </div>
12
- <div class="form-group col-sm-2 button-range" >
13
- <button class="button_search" style="margin-right: 10px" @click="search()" v-el:cba>查询</button>
13
+ <div class="form-group col-sm-2 button-range">
14
+ <button class="button_search" style="margin-right: 10px" @click="search()" v-el:cba>查询</button>
15
+ <button class="button_search" style="margin-right: 10px" @click="$parent.$parent.createAndSend()">下发</button>
16
+ </div>
17
+ <div class="form-group col-sm-2 button-range">
18
+ <button class="button_search" style="margin-right: 10px" @click="$parent.$parent.delOfCheckBook()" v-el:cba>移出</button>
14
19
 
15
20
  </div>
16
21
  </div>
17
22
  </div>
18
23
  </criteria>
19
- <data-grid :model="model" class="table_sy" partial='list' v-ref:grid >
20
- <template partial='head' >
24
+ <data-grid :model="model" class="table_sy" partial='list' v-ref:grid>
25
+ <template partial='head'>
21
26
  <tr>
22
- <th><nobr>序号</nobr></th>
23
- <th><nobr>用户编号</nobr></th>
24
- <th><nobr>用户姓名</nobr></th>
25
- <th><nobr>用户电话</nobr></th>
26
- <th><nobr>用户地址</nobr></th>
27
+ <th>
28
+ <nobr><input type="checkbox" v-model="$parent.$parent.$parent.bookAll"></input>全选</nobr>
29
+ </th>
30
+ <th>
31
+ <nobr>序号</nobr>
32
+ </th>
33
+ <th>
34
+ <nobr>用户编号</nobr>
35
+ </th>
36
+ <th>
37
+ <nobr>用户姓名</nobr>
38
+ </th>
39
+ <th>
40
+ <nobr>用户电话</nobr>
41
+ </th>
42
+ <th>
43
+ <nobr>用户地址</nobr>
44
+ </th>
27
45
 
28
46
  </tr>
29
47
  </template>
30
- <template partial='body' >
31
- <tr >
32
- <td style="text-align:center;">{{$index+1}}</td>
33
- <td style="text-align:center">{{row.f_userinfo_code}}</td>
34
- <td style="text-align:center">{{row.f_user_name}}</td>
35
- <td style="text-align:center">{{row.f_user_phone}}</td>
36
- <td style="text-align:center">{{row.f_address}}</td>
48
+ <template partial='body'>
49
+ <tr>
50
+ <td style="text-align: center">
51
+ <nobr><input type="checkbox" :checked="$parent.$parent.$parent.checkModel(row)"
52
+ @change="$parent.$parent.$parent.checkChange(row, $event)"></input>
53
+ </nobr>
54
+ </td>
55
+ <td style="text-align:center;">{{ $index + 1 }}</td>
56
+ <td style="text-align:center">{{ row.f_userinfo_code }}</td>
57
+ <td style="text-align:center">{{ row.f_user_name }}</td>
58
+ <td style="text-align:center">{{ row.f_user_phone }}</td>
59
+ <td style="text-align:center">{{ row.f_address }}</td>
37
60
  </tr>
38
61
  </template>
39
62
  <template partial='foot'></template>
40
63
  </data-grid>
41
64
  </criteria-paged>
65
+ <modal :show.sync="showCreatePlan" v-ref:modal1 :width="'50%'" :backdrop="false">
66
+ <div slot="modal-header" class="modal-header">
67
+ <h4 class="modal-title">
68
+ 新建计划
69
+ </h4>
70
+ </div>
71
+ <div slot="modal-body" class="modal-body">
72
+ <div class="row">
73
+ <div class="form-group col-sm-4" >
74
+ <label class="font_normal_body">计划名称:</label>
75
+ <input type="text" class="input_search" v-model="createPlan.f_plan_name"
76
+ style="width: 60%" placeholder="请选择" />
77
+ </div>
78
+ <div class="form-group col-sm-4" >
79
+ <label class="font_normal_body">计划年份:</label>
80
+ <v-select
81
+ class="select select_list"
82
+ :value.sync="createPlan.f_plan_year"
83
+ v-model="createPlan.f_plan_year"
84
+ :search="false"
85
+ :options='yearList'
86
+ close-on-select
87
+ value-single
88
+ >
89
+ </v-select>
90
+ </div>
91
+ <div class="form-group col-sm-4" >
92
+ <label class="font_normal_body">计划月份:</label>
93
+ <v-select
94
+ class="select select_list"
95
+ :value.sync="createPlan.f_plan_month"
96
+ v-model="createPlan.f_plan_month"
97
+ :search="false"
98
+ :options='monthList'
99
+ close-on-select
100
+ value-single>
101
+ </v-select>
102
+ </div>
103
+ <div class="form-group col-sm-4" >
104
+ <label class="font_normal_body">是否共享:</label>
105
+ <v-select
106
+ class="select select_list"
107
+ :search="false"
108
+ :value.sync="createPlan.isShare"
109
+ v-model="createPlan.isShare"
110
+ :options='isAndNot'
111
+ placeholder='请选择'
112
+ close-on-select
113
+ value-single
114
+ >
115
+ </v-select>
116
+ </div>
117
+ <div class="form-group col-sm-4" v-show="createPlan.isShare=='否'">
118
+ <label class="font_normal_body">安&ensp;检&ensp;员:</label>
119
+ <v-select
120
+ class="select select_list"
121
+ :value.sync="createPlan.checker"
122
+ v-model="createPlan.checker"
123
+ :options='checker'
124
+ close-on-select
125
+ value-single
126
+ >
127
+ </v-select>
128
+ </div>
129
+ <div class="form-group col-sm-4" >
130
+ <label class="font_normal_body">计划开始:</label>
131
+ <datepicker
132
+ placeholder='请选择'
133
+ style="width:60%"
134
+ :disabled-days-of-week="[]"
135
+ :format="'yyyy-MM-dd'"
136
+ :show-rest-button="reset"
137
+ :value.sync="createPlan.f_start_time"
138
+ v-model="createPlan.f_start_time">
139
+ </datepicker>
140
+ </div>
141
+ <div class="form-group col-sm-4" >
142
+ <label class="font_normal_body">计划结束:</label>
143
+ <datepicker
144
+ placeholder='请选择'
145
+ style="width:60%"
146
+ :disabled-days-of-week="[]"
147
+ :format="'yyyy-MM-dd'"
148
+ :show-rest-button="reset"
149
+ :value.sync="createPlan.f_end_time"
150
+ v-model="createPlan.f_end_time">
151
+ </datepicker>
152
+ </div>
153
+ </div>
154
+ </div>
155
+ <div slot="modal-footer" class="modal-footer" style="text-align: center">
156
+ <button class="button_search" style="margin-right: 15px" @click="addNewPlan()">创建计划</button>
157
+ <button class="button_search" @click="cancelCreatePlan">取消</button>
158
+ </div>
159
+ </modal>
42
160
  </div>
43
161
  </template>
44
162
 
45
163
  <script>
46
- import {PagedList} from 'vue-client'
164
+ import {HttpResetClass, PagedList} from 'vue-client'
165
+ import Vue from 'vue'
166
+ import * as Util from '../../components/Util'
47
167
 
48
168
  export default {
49
169
  title: '安检记录列表',
50
170
  props: ['row'],
51
- data () {
171
+ data() {
52
172
  return {
173
+ createPlan:{
174
+ f_safecheck_type:"年度普检",
175
+ checker:{},
176
+ isShare:"否",
177
+ f_usertype:"",
178
+ f_issued:'是',
179
+ f_end_time:Util.toStandardDateString().replace(new Date().getFullYear().toString(),(new Date().getFullYear()+1).toString()),
180
+ f_start_time:Util.toStandardDateString(),
181
+ f_plan_month:(new Date().getMonth()+1).toString(),
182
+ f_plan_year:new Date().getFullYear().toString(),
183
+ f_plan_name:""
184
+ },
185
+ checker:[],
186
+ isAndNot:[{label:'是',value:'是'},{label:'否',value:'否'}],
187
+ yearList:[{label:"2020",value:"2020"},{label:"2021",value:"2021"},{label:"2022",value:"2022"},{label:"2023",value:"2023"},{label:"2024",value:"2024"},{label:"2025",value:"2025"},{label:"2026",value:"2026"},{label:"2027",value:"2027"},{label:"2028",value:"2028"},{label:"2029",value:"2029"},{label:"2030",value:"2030"}],
188
+ monthList:[{label:"1",value:"1"},{label:"2",value:"2"},{label:"3",value:"3"},{label:"4",value:"4"},{label:"5",value:"5"},{label:"6",value:"6"},{label:"7",value:"7"},{label:"8",value:"8"},{label:"9",value:"9"},{label:"10",value:"10"},{label:"11",value:"11"},{label:"12",value:"12"}],
53
189
  rowdata: this.row,
54
- model: new PagedList('api/af-safecheck/sql/getUserByCheckBook', 50)
190
+ bookAll: false,
191
+ bookList:[],
192
+ showCreatePlan: false,
193
+ model: new PagedList('api/af-safecheck/sql/safe_singleTable_OrderBy', 50,
194
+ {
195
+ items: '"ua.id,ua.f_address,tui.f_userinfo_code,tui.f_user_name,tui.f_user_phone,tui.f_userinfo_id"',
196
+ tablename: '"t_user_address ua left join t_userinfo tui on ua.f_userinfo_id = tui.f_userinfo_id"',
197
+ orderitem: '"ua.id desc"'
198
+ }
199
+ )
55
200
  }
56
201
  },
57
- ready(){
58
- if(this.row){
59
- let condition=''
60
- if(this.row.f_check_book_type1=='小区'){
61
- this.model.url = 'api/af-safecheck/sql/getUserByCheckBook'
62
- condition = `ta.f_check_book_id =${this.row.f_check_book_id} and ta.id=${this.row.id}`
63
- }else{
64
- this.model.url = 'api/af-safecheck/sql/getUserByCheckBookCompany'
65
- condition = `tc.f_check_book_id =${this.row.f_check_book_id} and tc.id=${this.row.id}`
66
- }
202
+ ready() {
203
+ if (this.row) {
204
+ let condition = ''
205
+ condition = `ua.f_check_book_id =${this.row.id}`
67
206
  this.model.search(condition)
68
207
  //只显示用户页面
69
- this.row.f_check_book_type='用户'
208
+ this.row.f_check_book_type = '用户'
70
209
  }
210
+ this.searchChecker()
71
211
  },
72
212
  watch: {
73
- 'row' (val) {
213
+ 'row'(val) {
74
214
  if (val) {
75
215
  this.rowdata = val
76
- let condition=''
77
- if(this.row.f_check_book_type1=='小区'){
78
- condition = `ta.f_check_book_id =${val.f_check_book_id} and ta.id=${val.id}`
79
- }else{
80
- condition = `tc.f_check_book_id =${val.f_check_book_id} and tc.id=${val.id}`
81
- }
216
+ let condition = ''
217
+ condition = `ua.f_check_book_id =${val.id} `
82
218
  this.model.search(condition)
83
219
  }
84
220
  }
85
221
  },
86
222
  methods: {
87
- selfSearch (args) {
88
- if (this.rowdata.id) {
89
- if(this.rowdata.f_check_book_type1=='小区'){
90
- args.condition += `and ta.f_check_book_id =${this.rowdata.f_check_book_id} and ta.id=${this.rowdata.id}`
223
+ async searchChecker(){
224
+ console.log(this.$login.f.orgid)
225
+ let res=await new HttpResetClass().load('POST', '/rs/search', {
226
+ data:{
227
+ source: `root.getResourceById($${this.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
228
+ userid: this.$login.f.id
229
+ }
230
+ }, {resolveMsg: null, rejectMsg: null})
231
+ res.data.forEach((resRow) => {
232
+ this.checker.push({label:resRow.name,value:resRow})
233
+ })
234
+ },
235
+ async addNewPlan(){
236
+ this.createPlan.f_plan_type='预约计划'
237
+ this.createPlan.f_subcompany=this.$login.f.orgstr
238
+ this.createPlan.f_filialeid=this.$login.f.orgid
239
+ this.createPlan.f_create_operator=this.$login.f.name
240
+ this.createPlan.f_create_time=Util.toStandardTimeString()
241
+ this.createPlan.f_book_id = this.row.id
242
+ console.log(this.createPlan)
243
+ const addPlan = {
244
+ f_operator:this.$login.f.name,
245
+ f_filialeid:this.$login.f.orgid,
246
+ f_subscribe_date:'',
247
+ condition:this.model.condition,
248
+ switchCheckAll:true,
249
+ checkAll:this.bookAll,
250
+ param:this.bookList,
251
+ columnName: "ua.id"
252
+ }
253
+ if(this.createPlan.isShare=="是"){
254
+ this.createPlan.f_checker_id=null
255
+ this.createPlan.f_checker=null
256
+ }else{
257
+ this.createPlan.f_checker_id=this.createPlan.checker.id
258
+ this.createPlan.f_checker=this.createPlan.checker.name
259
+ }
260
+ new HttpResetClass().load("POST",'/api/af-safecheck/logic/createAndAddPlan',{createPlan:this.createPlan,addPlan}).then(res=>{
261
+ if(res.data.code==200){
262
+ this.$showMessage("计划下发成功!"+(res.data.result.length>0?"有"+res.data.result.length+"条用户地址已经存在于其他计划中":""))
263
+ this.cancelCreatePlan()
91
264
  }else{
92
- args.condition += `and tc.f_check_book_id =${this.rowdata.f_check_book_id} and tc.id=${this.rowdata.id}`
265
+ this.$showMessage("计划下发失败!")
93
266
  }
267
+ })
268
+ },
269
+ createAndSend(){
270
+ if(this.model.rows.length==0){
271
+ Vue.showMessage("未检测到列表中有用户!")
272
+ return
273
+ }
274
+ if(!this.bookAll && this.bookList.length==0){
275
+ Vue.showMessage("请先勾选你要添入到上方计划中的用户!")
276
+ return
277
+ }
278
+ this.showCreatePlan = true
279
+ },
280
+ cancelCreatePlan(){
281
+ this.showCreatePlan = false
282
+ },
283
+ selfSearch(args) {
284
+ if (this.rowdata.id) {
285
+ args.condition += `and ua.f_check_book_id =${this.rowdata.id}`
94
286
  this.model.search(args.condition)
95
287
  } else {
96
288
  this.$showMessage('请选择片区')
97
289
  }
290
+ },
291
+ checkModel (row) {
292
+ if (this.bookAll) {
293
+ return true
294
+ } else {
295
+ return this.bookList.findIndex(res => res === row.id) !== -1;
296
+ }
297
+ },
298
+ checkChange (row, e) {
299
+ if (e.target.checked) {
300
+ this.bookList.push(row.id)
301
+ } else {
302
+ this.bookList.splice(this.bookList.findIndex(res => res === row.id), 1)
303
+ }
304
+ },
305
+ delOfCheckBook(){
306
+ try {
307
+ let upAddress = `update t_user_address set f_check_book_id = null where 1 = 2 `
308
+ if (this.bookAll){
309
+ upAddress = `update t_user_address set f_check_book_id = null where f_check_book_id = '${this.row.id}'`
310
+ }else if (this.bookList.length > 0){
311
+ let codes = this.bookList.map( item => { return `'${item}'` } ).join()
312
+ upAddress = `update t_user_address set f_check_book_id = null where id in (${codes})`
313
+ }
314
+ this.$showMessage('确认移出安检册', ['confirm', 'cancel']).then((res) => {
315
+ if (res === 'confirm') {
316
+ let http = new HttpResetClass()
317
+ http.load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: upAddress}},
318
+ {resolveMsg: null, rejectMsg: '移出安检册失败'}).then(resp=>{
319
+ this.$showMessage('移出成功')
320
+ this.$refs.paged.$refs.criteria.search()
321
+ }).catch(error=>{
322
+ this.$showMessage('移出失败',error)
323
+
324
+ })
325
+ }
326
+ })
327
+ }catch (e) {
328
+ this.$showMessage('移出失败',e)
329
+ }
98
330
  }
99
331
  }
100
332
  }
@@ -959,7 +959,7 @@ let asyncReady = async function (self) {
959
959
  }
960
960
  export default {
961
961
  title: '安检单',
962
- props: ['f_plan_id', 'item', 'role'],
962
+ props: ['f_plan_id', 'item', 'role','gotoitem'],
963
963
  data() {
964
964
  return {
965
965
  f_user_path:'',
@@ -1132,7 +1132,7 @@ export default {
1132
1132
  }).then((res) => {
1133
1133
  if (res.data.code == 200) {
1134
1134
  this.loading = false;
1135
- this.$back()
1135
+ this.$emit('showback')
1136
1136
  }
1137
1137
  })
1138
1138
  },
@@ -1159,7 +1159,7 @@ export default {
1159
1159
  this.loading = false;
1160
1160
  this.message = '';
1161
1161
  this.showModel = false;
1162
- this.$back()
1162
+ this.$emit('showback')
1163
1163
  }
1164
1164
  })
1165
1165
  },
@@ -1351,9 +1351,11 @@ export default {
1351
1351
  }
1352
1352
  //tag
1353
1353
  //tag)
1354
- if (!this.item.f_safecheck_type && Vue.config.safecheck.SafecheckType) {
1354
+ if (!this.item.f_safecheck_type && Vue.config.safecheck.SafecheckType && Vue.config.safecheck.SafecheckType['年度普检']) {
1355
1355
  this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType['年度普检'][this.item.f_check_type]])
1356
- } else if (Vue.config.safecheck.SafecheckType){
1356
+ }else if (!this.item.f_safecheck_type && Vue.config.safecheck.SafecheckType && Vue.config.safecheck.SafecheckType['年度安检']){
1357
+ this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType['年度安检'][this.item.f_check_type]])
1358
+ }else if (Vue.config.safecheck.SafecheckType && Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type]]){
1357
1359
  this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_check_type]])
1358
1360
  }else {
1359
1361
  if(this.item.f_check_type == '民用'){
@@ -1512,16 +1514,20 @@ export default {
1512
1514
  back() {
1513
1515
  if (this.role == 'inspect') {
1514
1516
  if (!this.isStrat) {
1515
- this.$back()
1517
+ this.$emit('showback')
1516
1518
  return
1517
1519
  } else {
1518
1520
  this.savePaper(true).then(() => {
1519
- this.$back()
1521
+ this.$emit('showback')
1520
1522
  this.isStrat = false
1521
1523
  })
1522
1524
  }
1523
1525
  } else {
1524
- this.$back()
1526
+ if(this.gotoitem){
1527
+ this.$back()
1528
+ return
1529
+ }
1530
+ this.$emit('showback')
1525
1531
  }
1526
1532
  },
1527
1533
  checkIsStart() {
@@ -572,7 +572,7 @@
572
572
  }).then((res) => {
573
573
  if (res.data.code == 200) {
574
574
  this.loading = false;
575
- this.$back()
575
+ this.$emit('showback')
576
576
  }
577
577
  })
578
578
  },
@@ -599,7 +599,7 @@
599
599
  this.loading = false;
600
600
  this.message = '';
601
601
  this.showModel = false;
602
- this.$back()
602
+ this.$emit('showback')
603
603
  }
604
604
  })
605
605
  },
@@ -938,16 +938,16 @@
938
938
  back() {
939
939
  if (this.role == 'inspect') {
940
940
  if (!this.isStrat) {
941
- this.$back()
941
+ this.$emit('showback')
942
942
  return
943
943
  } else {
944
944
  this.savePaper(true).then(() => {
945
- this.$back()
945
+ this.$emit('showback')
946
946
  this.isStrat = false
947
947
  })
948
948
  }
949
949
  } else {
950
- this.$back()
950
+ this.$emit('showback')
951
951
  }
952
952
  },
953
953
  checkIsStart() {
@@ -642,6 +642,7 @@
642
642
  f_outlets: this.$login.f.deps,
643
643
  f_remarks: this.selectData.f_remarks,
644
644
  f_repairtype: this.selectData.f_repairtype,
645
+ dispatchType: this.selectData.dispatchType,
645
646
  toRepair: toRepair,
646
647
  activity:act
647
648
  }
@@ -618,19 +618,17 @@
618
618
  return true
619
619
  },
620
620
  //查询安检员selectChanged
621
- async searchChecker(id){
621
+ async searchChecker(){
622
+ console.log(this.$login.f.orgid)
623
+ debugger
622
624
  let res=await new HttpResetClass().load('POST', '/rs/search', {
623
625
  data:{
624
- source: `this.getSpecialResByType($user$).where(row.getAttributes().get($rolestr$)!=null ).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
625
- userid: this.userlogin.orgid
626
+ source: `root.getResourceById($${this.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
627
+ userid: this.$login.f.id
626
628
  }
627
629
  }, {resolveMsg: null, rejectMsg: null})
628
- let arr = []
629
630
  res.data.forEach((resRow) => {
630
- if (!arr.includes(resRow.name) && resRow.state == '在职'){
631
- arr.push(resRow.name)
632
- this.checker.push({label:resRow.name,value:resRow})
633
- }
631
+ this.checker.push({label:resRow.name,value:resRow})
634
632
  })
635
633
  },
636
634
  //设置属性值
@@ -992,7 +992,7 @@
992
992
  },{resolveMsg:null, rejectMsg: null})
993
993
  //tag)
994
994
  //tag
995
- let res2= await http.load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
995
+ let res2= await http.load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
996
996
  data: {
997
997
  "f_operat_type": "拉黑",
998
998
  "f_state": "有效",
@@ -1061,7 +1061,7 @@
1061
1061
  }, {resolveMsg: null, rejectMsg: null})
1062
1062
  //tag)
1063
1063
  //tag
1064
- let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
1064
+ let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
1065
1065
  data: {
1066
1066
  "f_operat_type": "取消拉黑",
1067
1067
  "f_state": "有效",
@@ -1111,7 +1111,7 @@
1111
1111
  }, {resolveMsg: null, rejectMsg: null})
1112
1112
  //tag)
1113
1113
  //tag
1114
- let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
1114
+ let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
1115
1115
  data: {
1116
1116
  "f_operat_type": "拉黑",
1117
1117
  "f_state": "有效",
@@ -14,8 +14,8 @@
14
14
  </template>
15
15
 
16
16
  <script>
17
- import TabButton from '../../safecheck/common/TabButton'
18
- import Tabs from '../../safecheck/common/Tabs'
17
+ import TabButton from '../../../components/safecheck/common/TabButton'
18
+ import Tabs from '../../../components/safecheck/common/Tabs'
19
19
  // import { HttpResetClass } from 'vue-client'
20
20
 
21
21
  export default {
@@ -1134,7 +1134,7 @@ export default {
1134
1134
  orderitem: "f_userinfo_id"
1135
1135
  }
1136
1136
  }, {resolveMsg: null, rejectMsg: null})
1137
- let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
1137
+ let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
1138
1138
  data: {
1139
1139
  "f_operat_type": "取消拉黑",
1140
1140
  "f_state": "有效",
@@ -1188,7 +1188,7 @@ export default {
1188
1188
  limit_times = Vue.config.safecheck.ApproveConfig.limit_times
1189
1189
  limit_value = Vue.config.safecheck.ApproveConfig.limit_value
1190
1190
  }
1191
- let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
1191
+ let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
1192
1192
  data: {
1193
1193
  data:this.$parent.$parent.data,
1194
1194
  item:this.$parent.$parent.data.item,
@@ -426,7 +426,7 @@
426
426
  }, {resolveMsg: null, rejectMsg: null})
427
427
  ////tag)
428
428
  ////tag
429
- let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
429
+ let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
430
430
  data: {
431
431
  "f_operat_type": "取消拉黑",
432
432
  "f_state": "有效",
@@ -421,7 +421,7 @@
421
421
  }, {resolveMsg: null, rejectMsg: null})
422
422
  ////tag)
423
423
  ////tag
424
- let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
424
+ let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
425
425
  data: {
426
426
  "f_operat_type": "取消拉黑",
427
427
  "f_state": "有效",
@@ -1296,7 +1296,7 @@ export default {
1296
1296
  }, {resolveMsg: null, rejectMsg: null})
1297
1297
  ////tag)
1298
1298
  ////tag
1299
- let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
1299
+ let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
1300
1300
  data: {
1301
1301
  "f_operat_type": "取消拉黑",
1302
1302
  "f_state": "有效",
@@ -1384,7 +1384,7 @@ export default {
1384
1384
  }
1385
1385
  }
1386
1386
 
1387
- let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
1387
+ let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
1388
1388
  data: {
1389
1389
  data:this.$parent.$parent.data,
1390
1390
  item:this.$parent.$parent.data.item,
@@ -103,7 +103,7 @@
103
103
  </datepicker>
104
104
  </div>
105
105
  <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
106
- <label class="font_normal_body">用户类型</label>
106
+ <label class="font_normal_body">客户类型</label>
107
107
  <v-select :value.sync="model.f_check_type" v-model='model.f_check_type'
108
108
  :value-single="true" style="width: 60%"
109
109
  class="select_list select"
@@ -1141,7 +1141,7 @@ export default {
1141
1141
  }, {resolveMsg: null, rejectMsg: null})
1142
1142
  ////tag)
1143
1143
  ////tag
1144
- let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
1144
+ let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
1145
1145
  data: {
1146
1146
  "f_operat_type": "取消拉黑",
1147
1147
  "f_state": "有效",
@@ -1199,7 +1199,7 @@ export default {
1199
1199
  limit_times = Vue.config.safecheck.ApproveConfig.limit_times
1200
1200
  limit_value = Vue.config.safecheck.ApproveConfig.limit_value
1201
1201
  }
1202
- let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
1202
+ let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/backlistOperate`, {
1203
1203
  data: {
1204
1204
  data:this.$parent.$parent.data,
1205
1205
  item:this.$parent.$parent.data.item,