safecheck-client 3.0.33-22 → 3.0.33-24

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.
@@ -28,7 +28,7 @@
28
28
  :timeout="500"
29
29
  @select-search="$parent.$parent.select_search"
30
30
  placeholder='安检册筛选'
31
- condition="ua.f_check_book_id ='{}'"
31
+ condition="f_check_book_id ='{}'"
32
32
  close-on-select
33
33
  value-single
34
34
  >
@@ -0,0 +1,59 @@
1
+ <template>
2
+ <div id="unit" class="flex-row" :class="{'binary':showItem}">
3
+ <!-- <section>-->
4
+
5
+ <div :class="{'basic-main':!showItem,'binary-left':showItem}" >
6
+ <select-check-plan @select-changed="selected" :style="style" :style2="style2" @checkstatus-changed="checkstatusChange" v-ref:check></select-check-plan>
7
+ </div>
8
+ <div class="binary-right" v-show="showItem">
9
+ <div class="flex">
10
+ <check-detail v-if='$refs.check && $refs.check.selected' :check='$refs.check.selected' :checkstatus="checkstatus" :checkstart="$refs.check.f_check_start" :checkend="$refs.check.f_check_end"
11
+ v-ref:detail></check-detail>
12
+ </div>
13
+ </div>
14
+
15
+ <!-- </section>-->
16
+ </div>
17
+ </template>
18
+
19
+ <script>
20
+ import SelectCheckPlan from './SelectCheckPlan'
21
+ import CheckDetail from './../../../components/checkplan/CheckDetail'
22
+
23
+ export default {
24
+ title: '安检员考核',
25
+ props: ['f'],
26
+ components: {SelectCheckPlan, CheckDetail},
27
+ data() {
28
+ return {
29
+ showItem: false,
30
+ checkstatus: null,
31
+ style:'col-sm-2 form-group',
32
+ style2:'col-sm-4 form-group'
33
+ }
34
+ },
35
+ methods: {
36
+ selected(row) {
37
+ // //tag
38
+ this.showItem = true
39
+ },
40
+ checkstatusChange(val){
41
+ this.checkstatus = val
42
+ }
43
+ }
44
+ }
45
+ </script>
46
+ <style>
47
+ .form-input-group label {
48
+ text-align: right;
49
+ width: auto;
50
+ }
51
+
52
+ .datapanel {
53
+ color: #333;
54
+ background-color: white;
55
+ box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
56
+ padding: 5px 7px 5px 7px;
57
+ border-radius: 10px;
58
+ }
59
+ </style>
@@ -82,7 +82,7 @@
82
82
  :field="$parent.$parent.excelHeaders"
83
83
  progress="safeGetExportProgress"
84
84
  sqlurl="rs/logic/SafeExportExcel" sql-name="planCount" template-name='安检计划明细' ></export-excel-safe>
85
- <button type="button" class="button_search button_spacing" @click="search()">查询</button>
85
+ <button id="btnaaa" type="button" class="button_search button_spacing" @click="search()">查询</button>
86
86
  <!--<div class="button_spacing"-->
87
87
  <!--:class="{'button_shrink_top':$parent.criteriaShow,'button_shrink_bottom':!$parent.criteriaShow}"-->
88
88
  <!--@click="$parent.$parent.hidden()">-->
@@ -92,47 +92,70 @@
92
92
  @click="$parent.$parent.hiddenr()"></div>
93
93
  </div>
94
94
  </div>
95
+ <div class="row">
96
+ <div class="col-sm-12">
97
+ <label class="control-label" style="color: #c7254e">汇 总 项</label>
98
+ <input type="checkbox" id="f_residential_area" value="f_residential_area" v-model="$parent.$parent.nameForSql"/>
99
+ <label for="f_residential_area">小区名称</label>
100
+ </div>
101
+ </div>
95
102
  </div>
96
103
  </criteria>
97
104
  <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
98
105
  <template partial='head'>
99
106
  <tr>
107
+ <th>
108
+ <nobr>序号</nobr>
109
+ </th>
110
+ <th v-if="$parent.$parent.$parent.nameForSql.includes('f_residential_area')"><nobr>小区名称</nobr></th>
100
111
  <th>安检员</th>
101
- <th>计划安检总户数</th>
102
- <th>未检户数</th>
103
- <th>已检户数</th>
104
- <th>入户户数</th>
105
- <th>到访不遇户数</th>
106
- <th>拒检户数</th>
107
- <th>安检率</th>
108
- <th>申请安检户数</th>
109
- <th>总入户数</th>
112
+ <th>总入户量</th>
113
+ <th>总到访不遇量</th>
114
+ <th>总拒检量</th>
115
+ <th>安检总量</th>
116
+ <th>计划总数</th>
117
+ <th>入户</th>
118
+ <th>到访不遇</th>
119
+ <th>拒检</th>
120
+ <th>无计划总数</th>
121
+ <th>无计划入户</th>
122
+ <th>无计划到访不遇</th>
123
+ <th>无计划拒检</th>
110
124
  </tr>
111
125
  </template>
112
126
  <template partial='body'>
127
+ <td style="text-align:center;">{{$index + 1}}</td>
128
+ <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_residential_area')">{{row.f_residential_area}}</td>
113
129
  <td style="text-align: center">{{row.f_checker}}</td>
130
+ <td style="text-align: center">{{row.ruhu_total}}</td>
131
+ <td style="text-align: center">{{row.daofang_total}}</td>
132
+ <td style="text-align: center">{{row.jujian_total}}</td>
133
+ <td style="text-align: center">{{row.total_sum}}</td>
114
134
  <td style="text-align: center">{{row.plannum}}</td>
115
- <td style="text-align: center">{{row.wrj}}</td>
116
- <td style="text-align: center">{{row.yrj}}</td>
117
135
  <td style="text-align: center">{{row.ruhu}}</td>
118
136
  <td style="text-align: center">{{row.daofang}}</td>
119
137
  <td style="text-align: center">{{row.jujian}}</td>
120
- <td style="text-align: center">{{row.aj_lv}}</td>
121
138
  <td style="text-align: center">{{row.no_plan_num}}</td>
122
- <td style="text-align: center">{{row.total_yjnpm}}</td>
139
+ <td style="text-align: center">{{row.noruhu}}</td>
140
+ <td style="text-align: center">{{row.nodaofang}}</td>
141
+ <td style="text-align: center">{{row.nojujian}}</td>
123
142
  </template>
124
143
  <template partial="foot">
125
144
  <td style="text-align: center"><span><b>合计:</b></span></td>
145
+ <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_residential_area')"></td>
146
+ <td style="text-align:center;"></td>
126
147
  <td style="text-align: center">{{model.sums.ruhu_total}}</td>
148
+ <td style="text-align: center">{{model.sums.daofang_total}}</td>
149
+ <td style="text-align: center">{{model.sums.jujian_total}}</td>
150
+ <td style="text-align: center">{{model.sums.total_sum}}</td>
127
151
  <td style="text-align: center">{{model.sums.plannum}}</td>
128
- <td style="text-align: center">{{model.sums.wrj}}</td>
129
- <td style="text-align: center">{{model.sums.yrj}}</td>
130
152
  <td style="text-align: center">{{model.sums.ruhu}}</td>
131
153
  <td style="text-align: center">{{model.sums.daofang}}</td>
132
154
  <td style="text-align: center">{{model.sums.jujian}}</td>
133
- <td style="text-align: center">{{model.sums.yrj/model.sums.total_yjnpm}}%</td>
134
155
  <td style="text-align: center">{{model.sums.no_plan_num}}</td>
135
- <td style="text-align: center">{{model.sums.total_yjnpm}}</td>
156
+ <td style="text-align: center">{{model.sums.noruhu}}</td>
157
+ <td style="text-align: center">{{model.sums.nodaofang}}</td>
158
+ <td style="text-align: center">{{model.sums.nojujian}}</td>
136
159
  </template>
137
160
  </data-grid>
138
161
  </criteria-paged>
@@ -150,24 +173,40 @@ export default {
150
173
  for (let i = year - 8; i <= year + 1; i++)
151
174
  options.push({label: i + '', value: i + ''})
152
175
  let model = new PagedList('rs/sql/planCount', 20, {
153
- f_filialeid: `'${this.$login.f.orgid}'`,
154
- }, {plannum: '', wrj: '', yrj: '', ruhu: '',daofang:'',jujian:'',total_yjnpm:'',no_plan_num:'',total_yjnpm:''})
176
+ f_filialeids: 'this.f_filialeids',
177
+ f_start_time: 'this.f_start_time',
178
+ condition1:'this.condition1',
179
+ condition2:'this.condition2',
180
+ condition3:'this.condition3',
181
+ otheritem:'this.otheritem',
182
+ f_end_time: 'this.f_end_time'
183
+ }, {plannum: '', ruhu: '', jujian: '', daofang: '',no_plan_num:'',noruhu:'',nodaofang:'',nojujian:'',ruhu_total:'',daofang_total:'',jujian_total:'',total_sum:''})
184
+ model.f_filialeids = '('+this.$login.f.orgid+')'
155
185
  return {
156
186
  excelHeaders:{
157
187
  'f_checker': '安检员',
158
- 'plannum': '计划安检总户数',
159
- 'wrj': '未检户数',
160
- 'yrj': '已检户数',
161
- 'ruhu': '入户户数',
162
- 'daofang': '到访不遇户数',
163
- 'jujian': '拒检户数',
164
- 'aj_lv': '安检率',
165
- 'no_plan_num': '无计划到访不遇',
166
- 'total_yjnpm': '无计划到访不遇'
188
+ 'plannum': '计划总数',
189
+ // 'yrj': '计划中已入户',
190
+ // 'wrj': '计划中未入户',
191
+ 'ruhu': '入户',
192
+ 'jujian': '拒检',
193
+ 'daofang': '到访不遇',
194
+ 'no_plan_num': '无计划总数',
195
+ 'noruhu': '无计划入户',
196
+ 'nojujian': '无计划拒检',
197
+ 'nodaofang': '无计划到访不遇'
167
198
  },
199
+ nameForSql: [],
200
+ groupNameForSql: '',
168
201
  searchData:{
202
+ condition:"1=1",
203
+ condition1:"1=1",
204
+ condition2:"1=1",
205
+ condition3:"and 1=1",
206
+ otheritem:'',
207
+ f_plan_year:year[0],
169
208
  f_checker:'',
170
- f_filialeid:'('+this.$login.f.orgid+')',
209
+ f_filialeids:'('+this.$login.f.orgid+')',
171
210
  f_start_time:'',
172
211
  f_end_time:''
173
212
  },
@@ -178,6 +217,7 @@ export default {
178
217
  f: this.$login.f,
179
218
  criteriaShow: false,
180
219
  model: model,
220
+ c_year_list: options,
181
221
  f_check_start:'',
182
222
  f_check_end: '',
183
223
  f_start_time:'',
@@ -192,7 +232,39 @@ export default {
192
232
  this.$parent.showItem = !this.$parent.showItem
193
233
  },
194
234
  search(args) {
235
+ if (this.nameForSql.length >0 ){
236
+ this.excelHeaders = {
237
+ 'f_residential_area':'小区名称',
238
+ 'f_checker': '安检员',
239
+ 'plannum': '计划总数',
240
+ 'ruhu': '入户',
241
+ 'jujian': '拒检',
242
+ 'daofang': '到访不遇',
243
+ 'no_plan_num': '无计划总数',
244
+ 'noruhu': '无计划入户',
245
+ 'nojujian': '无计划拒检',
246
+ 'nodaofang': '无计划到访不遇'
247
+ }
248
+ this.groupNameForSql = `,${this.nameForSql.join().trim()}`
249
+ }else {
250
+ this.excelHeaders = {
251
+ 'f_checker': '安检员',
252
+ 'plannum': '计划总数',
253
+ 'ruhu': '入户',
254
+ 'jujian': '拒检',
255
+ 'daofang': '到访不遇',
256
+ 'no_plan_num': '无计划总数',
257
+ 'noruhu': '无计划入户',
258
+ 'nojujian': '无计划拒检',
259
+ 'nodaofang': '无计划到访不遇'
260
+ }
261
+ this.groupNameForSql = ``
262
+ }
263
+ debugger
195
264
  let tempStr = args.condition
265
+ let condition1 =tempStr
266
+ let condition2 =tempStr
267
+ let condition3 = ' and 1=1 '
196
268
  if (this.f_check_start) {
197
269
  condition1 += ` AND f_plan_year >= ${this.f_check_start.substr(0,4)} `
198
270
  condition1 += ` AND f_plan_month >= ${this.f_check_start.substr(5,2)} `
@@ -213,18 +285,33 @@ export default {
213
285
  }
214
286
  this.model.f_start_time=this.f_start_time
215
287
  this.model.f_end_time=this.f_end_time
288
+ this.model.condition1=condition1
289
+ this.model.condition2=condition2
290
+ this.model.condition3=condition3
291
+ this.model.otheritem = this.groupNameForSql
292
+ this.searchData.condition1=condition1
293
+ this.searchData.condition2=condition2
294
+ this.searchData.condition3=condition3
295
+ this.searchData.otheritem = this.groupNameForSql
216
296
  this.model.search(args.condition, args.model)
217
297
  },
218
298
  getRes(obj){
219
299
  this.model.f_filialeids = this.$login.convertToIn(obj.resids);
300
+ //tag
220
301
  }
221
302
  },
222
303
  ready() {
223
304
  this.model.id = this.$login.f.id
305
+ this.model.f_subcompany = this.$login.f.f_fengongsi
224
306
  this.model.f_filialeid = this.$login.f.orgid
225
307
  },
226
308
 
227
309
  watch: {
310
+ 'nameForSql' () {
311
+ var e = document.createEvent("MouseEvents");
312
+ e.initEvent("click", true, true);
313
+ document.getElementById("btnaaa").dispatchEvent(e);
314
+ },
228
315
  'model.condition'(val) {
229
316
  if(val){
230
317
  this.searchData.condition = val
@@ -114,12 +114,6 @@
114
114
  <th>
115
115
  <nobr>安检率</nobr>
116
116
  </th>
117
- <th>
118
- <nobr>申请安检户数</nobr>
119
- </th>
120
- <th>
121
- <nobr>总入户数</nobr>
122
- </th>
123
117
  </tr>
124
118
  </template>
125
119
  <template partial='body'>
@@ -137,8 +131,6 @@
137
131
  <td style="text-align: center">{{ row.unique_dfby_count }}</td>
138
132
  <td style="text-align: center">{{ row.jjcount }}</td>
139
133
  <td style="text-align: center">{{ row.check_bv }}</td>
140
- <td style="text-align: center">{{ row.no_plan_num }}</td>
141
- <td style="text-align: center">{{ row.total_yjnpm }}</td>
142
134
  </template>
143
135
  <template partial="foot">
144
136
  <td style="text-align: center" colspan="2"><span><b>合计:</b></span></td>
@@ -158,8 +150,7 @@
158
150
  <td style="text-align: center">
159
151
  {{ ((model.sums.yjcount / model.sums.totalcount)*100.0).toFixed(2) }}%
160
152
  </td>
161
- <td style="text-align: center">{{ model.sums.no_plan_num }}</td>
162
- <td style="text-align: center">{{ model.sums.total_yjnpm }}</td>
153
+
163
154
  </template>
164
155
  </data-grid>
165
156
  </criteria-paged>
@@ -186,9 +177,7 @@ export default {
186
177
  dfbycount2: '',
187
178
  dfbycount3: '',
188
179
  unique_dfby_count: '',
189
- jjcount: '',
190
- no_plan_num: '',
191
- total_yjnpm: '',
180
+ jjcount: ''
192
181
  }),
193
182
  resids: {},
194
183
  searchData: {
@@ -209,12 +198,10 @@ export default {
209
198
  'dfbycount3': '到访不遇-3次',
210
199
  'unique_dfby_count': '到访不遇小计',
211
200
  'jjcount': '拒检户数',
212
- 'check_bv':'安检率',
213
- 'no_plan_num':'申请安检户数',
214
- 'total_yjnpm':'总入户数'
201
+ 'check_bv':'安检率'
215
202
  },
216
203
  printshow: false,
217
- defaultPrint: ['f_residential_area', 'totalcount', 'sqajcount','wjcount', 'rhcount','dfbycount1','dfbycount2','dfbycount3','unique_dfby_count','jjcount','check_bv','no_plan_num','total_yjnpm'],
204
+ defaultPrint: ['f_residential_area', 'totalcount', 'sqajcount','wjcount', 'rhcount','dfbycount1','dfbycount2','dfbycount3','unique_dfby_count','jjcount','check_bv'],
218
205
  sumsmodel: {},
219
206
  }
220
207
  },
@@ -238,8 +225,7 @@ export default {
238
225
  dfbycount2: this.sumsmodel.dfbycount2,
239
226
  dfbycount3: this.sumsmodel.dfbycount3,
240
227
  unique_dfby_count: this.sumsmodel.unique_dfby_count,
241
- no_plan_num:this.sumsmodel.no_plan_num,
242
- total_yjnpm:this.sumsmodel.total_yjnpm,
228
+ check_bv:`${((this.sumsmodel.yjcount / this.sumsmodel.totalcount)*100.0).toFixed(2)}%`
243
229
  })
244
230
  this.print_model.totalPage = 0
245
231
  },
@@ -5,6 +5,8 @@ import Vue from "vue";
5
5
  let specialComp = {
6
6
  "plan-manage":(resolve) => { require(['./pc/PlanManage'], resolve) },
7
7
  "role-selector-safe":(resolve) => { require(['./pc/RoleSelector'], resolve) },
8
+ "select-check-plan":(resolve) => { require(['./pc/SelectCheckPlan.vue'], resolve) },
9
+ "check-plan":(resolve) => { require(['./pc/CheckPlan.vue'], resolve) },
8
10
  "check-user-list":(resolve) => { require(['./pc/checkUserList'], resolve) },
9
11
  'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
10
12
  "safe-table":(resolve) => { require(['./pc/safeTable'], resolve) },
package/src/main.js CHANGED
@@ -11,7 +11,7 @@ all()
11
11
  var Verificationfalg = false
12
12
  system(Verificationfalg)
13
13
  // system()
14
- safecheck('yongzhou')
14
+ safecheck('fugou')
15
15
  // safecheck('rizhao')
16
16
  require('./bootstrap/less/bootstrap.less')
17
17
  require('./expandcss.less')