safecheck-client 3.0.34-gongyi → 3.0.35-gongyi

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. package/package.json +2 -2
  2. package/src/components/android/AreaPlan.vue +503 -503
  3. package/src/components/android/CurrentCreate.vue +972 -970
  4. package/src/components/pc/CheckBookList.vue +29 -22
  5. package/src/components/pc/NewCheckpaper.vue +27 -0
  6. package/src/components/planmanage/PlanManage.vue +1 -1
  7. package/src/components/querycheckpaper/CheckSearchUser.vue +1 -1
  8. package/src/components/report/CheckPlanAreaList.vue +19 -3
  9. package/src/components/report/CheckPlanUserList.vue +217 -216
package/src/components/pc/CheckBookList.vue CHANGED
@@ -47,11 +47,10 @@
47
47
  </datepicker>
48
48
  </div>
49
49
  <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
50
- <!-- <export-excel-safe :data="$parent.$parent.searchData"-->
51
- <!-- :field="$parent.$parent.excelHeaders"-->
52
- <!-- :choose-col="true"-->
53
- <!-- sqlurl="rs/logic/SafeExportExcel" sql-name="根据安检员查询用户档案"-->
54
- <!-- template-name='用户安检情况'></export-excel-safe>-->
50
+ <export-excel-safe :data="$parent.$parent.exportParameter"
51
+ :field="$parent.$parent.excelHeaders"
52
+ sqlurl="rs/logic/SafeExportExcel" sql-name="QueryCheckBook"
53
+ template-name='安检册详情列表'></export-excel-safe>
55
54
  <button type="button" class="button_search button_spacing" @click="search()">查询</button>
56
55
  <div style="float: right" class="button_spacing"
57
56
  :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
@@ -89,10 +88,10 @@
89
88
  placeholder="安检册名" condition="f_check_book_name like '%{}%'">
90
89
  </div>
91
90
  <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
92
- <!-- <export-excel-safe :data="$parent.$parent.searchData"-->
93
- <!-- :field="$parent.$parent.excelHeaders"-->
94
- <!-- sqlurl="rs/logic/SafeExportExcel" sql-name="根据安检员查询用户档案"-->
95
- <!-- template-name='用户安检情况'></export-excel-safe>-->
91
+ <export-excel-safe :data="$parent.$parent.exportParameter"
92
+ :field="$parent.$parent.excelHeaders"
93
+ sqlurl="rs/logic/SafeExportExcel" sql-name="QueryCheckBook"
94
+ template-name='安检册详情列表'></export-excel-safe>
96
95
  <button type="button" class="button_search button_spacing" @click="search()">查询</button>
97
96
  <div style="float: right" class="button_spacing"
98
97
  :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
@@ -166,6 +165,9 @@
166
165
  <th>
167
166
  <nobr>用户数量</nobr>
168
167
  </th>
168
+ <th>
169
+ <nobr>下发时间</nobr>
170
+ </th>
169
171
  <th>
170
172
  <nobr>操作</nobr>
171
173
  </th>
@@ -180,6 +182,7 @@
180
182
  <td style="text-align: center;">{{ row.f_run_date }}</td>
181
183
  <td style="text-align: center;">{{ row.f_around_time }}{{ row.f_around_unit }}</td>
182
184
  <td style="text-align: center;">{{ row.num }}</td>
185
+ <td style="text-align: center;">{{ row.f_issue_time }}</td>
183
186
  <td style="text-align: center;">
184
187
  <button class="button_spacing button_search-1" @click.stop='$parent.$parent.$parent.deleteCheckBook(row)' v-if="$parent.$parent.$parent.permission === 'c1'">删除</button>
185
188
  <button class="button_spacing button_search-1" @click.stop='$parent.$parent.$parent.updateCheckBook(row)'>修改</button>
@@ -272,18 +275,16 @@ export default {
272
275
  aroundUnit: [{label: '年', value: '年'}, {label: '月', value: '月'}, {label: '日', value: '月'}],
273
276
  showModal:false,
274
277
  excelHeaders: {
275
-
276
- 'f_userinfo_code': '用户编号',
277
- 'f_user_name': '用户名称',
278
- 'f_user_phone': '用户电话',
279
- 'f_meternumber': '用户表号',
280
- 'f_user_type': '用户类型',
281
- 'f_last_checker': '安检员',
282
- 'f_residential_area': '小区名称',
283
- 'f_address': '地址',
284
- 'f_last_check_date': '安检日期',
285
- 'f_last_check_state': '安检状态',
286
- 'f_last_check_result': '安检结果'
278
+ 'f_check_book_name': '安检册名称',
279
+ 'f_create_date': '创建日期',
280
+ 'f_create_person': '创建人',
281
+ 'f_dep': '所属科室',
282
+ 'f_checker_name': '所属安检员',
283
+ 'f_run_date': '执行日期',
284
+ 'f_around_time': '执行周期',
285
+ 'f_around_unit': '周期单位',
286
+ 'num': '用户数量',
287
+ 'f_issue_time': '下发时间'
287
288
  },
288
289
  checkers:[],
289
290
  f_depid:'',
@@ -390,7 +391,7 @@ export default {
390
391
  let month = nextDate.getMonth()+1
391
392
  let date = nextDate.getDate()
392
393
  checkBook.f_run_date = nextDate.getFullYear() + '-' + (month<10? '0'+ month : month) + '-' + (date<10? '0'+ date : date)
393
-
394
+ checkBook.f_issue_time = nextDate.getFullYear() + '-' + (month<10? '0'+ month : month) + '-' + (date<10? '0'+ date : date)
394
395
 
395
396
  let data ={
396
397
  checkBook,
@@ -535,6 +536,12 @@ export default {
535
536
  watch: {
536
537
  },
537
538
  computed: {
539
+ // 导出到Excel的条件构造
540
+ exportParameter() {
541
+ return {
542
+ condition: this.$refs.paged.model.condition
543
+ }
544
+ },
538
545
  selected () {
539
546
  return this.$refs.paged.$refs.grid.selected
540
547
  }
package/src/components/pc/NewCheckpaper.vue CHANGED
@@ -227,6 +227,33 @@ div {
227
227
  </tr>
228
228
  </tbody>
229
229
  </table>
230
+ <table class="table table-striped table-bordered" v-show="paperdata.f_entry_status !='入户'">
231
+ <thead>
232
+ <tr>
233
+ <th style="text-align: center">{{paperdata.f_entry_status}}照片</th>
234
+ </tr>
235
+ </thead>
236
+ <tbody>
237
+ <tr>
238
+ <td style="margin: auto;text-align: center">
239
+ <div class="row">
240
+ <div class="col-md-6">
241
+ <img-self-safe v-if="this.paperdata.f_entry_status=='到访不遇'" :src="showimg3" width="300"
242
+ height="400"></img-self-safe>
243
+ <img-self-safe v-if="this.paperdata.f_entry_status=='到访不遇' && showimg5" :src="showimg5" width="300"
244
+ height="400"></img-self-safe>
245
+ </div>
246
+ <div class="col-md-6">
247
+ <img-self-safe v-if="this.paperdata.f_entry_status=='拒检'" :src="showimg4" width="300"
248
+ height="400"></img-self-safe>
249
+ <img-self-safe v-if="this.paperdata.f_entry_status=='拒检' && showimg6" :src="showimg6" width="300"
250
+ height="400"></img-self-safe>
251
+ </div>
252
+ </div>
253
+ </td>
254
+ </tr>
255
+ </tbody>
256
+ </table>
230
257
  <table class="table table-striped table-bordered" v-show="paperdata.f_entry_status=='入户'">
231
258
  <thead>
232
259
  <tr>
package/src/components/planmanage/PlanManage.vue CHANGED
@@ -59,7 +59,7 @@
59
59
  </div>
60
60
  </div>
61
61
  <!--右侧列表**************************************************************************-->
62
- <div class="binary-right" style="width: 84%;overflow: auto">
62
+ <div class="binary-right" style="width: 84%;overflow: hidden">
63
63
  <div style="height: 5%">
64
64
  <div class="col-sm-4">
65
65
  <label class="font_normal_body">公&emsp;&emsp;司</label>
package/src/components/querycheckpaper/CheckSearchUser.vue CHANGED
@@ -365,7 +365,7 @@
365
365
  :options='$parent.$parent.positions'
366
366
  filer-key="name"
367
367
  close-on-select clear-button
368
- condition="f_position={}"
368
+ condition="f_position='{}'"
369
369
  :value-single="true">
370
370
  </v-select>
371
371
  </div>
package/src/components/report/CheckPlanAreaList.vue CHANGED
@@ -20,7 +20,7 @@
20
20
  @re-res="$parent.$parent.getorg"
21
21
  :value.sync="model.f_checker_id"
22
22
  v-model="model.f_checker_id"
23
- condition="f_checker_name like '%{}%'">
23
+ condition="f_checker_name = '{}'">
24
24
  </role-selector-safe>
25
25
  </div>
26
26
  <div :class="{'col-sm-3 form-group':$parent.$parent.$parent.isdetail,'col-sm-2 form-group':!$parent.$parent.$parent.isdetail}">
@@ -33,6 +33,16 @@
33
33
  <input type="text" class="input_search" style="width:60%" v-model="model.f_residential_area" placeholder='小区名称'
34
34
  condition="f_residential_area like '%{}%'" v-next-el="cx" v-el:qjmc>
35
35
  </div>
36
+ <div :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}">
37
+ <label class="font_normal_body">入户率 > </label>
38
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_rh" placeholder='入户率'
39
+ v-next-el="cx" v-el:qjmc>
40
+ </div>
41
+ <div :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}">
42
+ <label class="font_normal_body">安检率 > </label>
43
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_bv" placeholder='安检率'
44
+ v-next-el="cx" v-el:qjmc>
45
+ </div>
36
46
  <div :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}">
37
47
  <label class="font_normal_body">计划名称</label>
38
48
  <v-select class="select_list select"
@@ -148,6 +158,9 @@
148
158
  <th>
149
159
  <nobr>拒检</nobr>
150
160
  </th>
161
+ <th>
162
+ <nobr>入户率</nobr>
163
+ </th>
151
164
  <th>
152
165
  <nobr>安检率</nobr>
153
166
  </th>
@@ -172,6 +185,7 @@
172
185
  <td style="text-align:center"><nobr>{{row.f_ruhu}}</nobr></td>
173
186
  <td style="text-align:center">{{row.f_buyu}}</td>
174
187
  <td style="text-align:center"><nobr>{{row.f_jujian}}</nobr></td>
188
+ <td style="text-align:center"><nobr>{{row.f_check_rhbv}}</nobr></td>
175
189
  <td style="text-align:center"><nobr>{{row.f_check_bv}}</nobr></td>
176
190
  <!--<td style="text-align: center;">-->
177
191
  <!--<button class="btn btn-link" @click.stop="$parent.$parent.$parent.showhistory(row)">查看</button>-->
@@ -193,7 +207,7 @@
193
207
  export default {
194
208
  data () {
195
209
  return {
196
- model: new PagedList('rs/sql/getCheckPlanAreaList', 99999),
210
+ model: new PagedList('rs/sql/getCheckPlanAreaList',99999),
197
211
  // 公司下拉
198
212
  curorgid: [this.$login.f.orgid],
199
213
  row: {},
@@ -332,13 +346,15 @@
332
346
  if(this.f_dep){
333
347
  args.condition += ` and f_dep = '${this.f_dep}'`
334
348
  }
349
+ this.model.f_bv=this.$refs.paged.$refs.cri.model.f_bv?this.$refs.paged.$refs.cri.model.f_bv:''
350
+ this.model.f_rh=this.$refs.paged.$refs.cri.model.f_rh?this.$refs.paged.$refs.cri.model.f_rh:''
335
351
  this.$refs.paged.$refs.grid.$el.scrollTop = 0
336
352
  if (this.groupNameForSql=='undefined'){
337
353
  console.log("777777777")
338
354
  this.$showMessage("请至少选择一项进行汇总")
339
355
  return
340
356
  }
341
- this.model.paramSource = {groupName: `'${this.groupNameForSql}'`}
357
+ this.model.paramSource = {groupName: `'${this.groupNameForSql}'`,f_rh: 'this.f_rh',f_bv: 'this.f_bv'}
342
358
  this.model.search(args.condition, args.model)
343
359
  },
344
360