safecheck-client 3.0.35-gongyi-18 → 3.0.35-gongyi-20

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/components/defect/DefectPaperWeiXiu.vue +35 -25
  3. package/src/components/planmanage/checkUserList.vue +1 -1
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.35-gongyi-18",
4
+ "version": "3.0.35-gongyi-20",
5
5
  "description": "安检模块 前端组件",
6
6
  "author": "丁新 <417755458@qq.com>",
7
7
  "license": "ISC",
package/src/components/defect/DefectPaperWeiXiu.vue CHANGED
@@ -58,19 +58,24 @@
58
58
  </div>
59
59
  </div>
60
60
  </div>
61
- <div class="row" v-if="$parent.$parent.criteriaShow&&!$parent.$parent.$parent.showItem">
61
+ <div class="row" v-if="$parent.$parent.criteriaShow && !$parent.$parent.$parent.showItem">
62
62
  <div :class="$parent.$parent.style">
63
- <label class="font_normal_body">片&emsp;&emsp;区</label>
64
- <v-select class="select_list select"
65
- placeholder='片区/管理站' style="width: 60%"
66
- :value.sync="model.f_slice_area" v-model="model.f_slice_area"
67
- :options='$parent.$parent.sliceArea'
68
- filer-key="name"
69
- close-on-select clear-button
70
- condition="f_slice_area='{}'"
71
- @change="$parent.$parent.getmeterbook(model.f_slice_area)"
72
- :value-single="true">
73
- </v-select>
63
+ <label class="font_normal_body">用户姓名</label>
64
+ <input type="text" class="input_search" v-model="model.f_user_name"
65
+ condition="f_user_name like '%{}%'"
66
+ style="width: 60%" placeholder="用户姓名">
67
+ </div>
68
+ <div :class="$parent.$parent.style">
69
+ <label class="font_normal_body">用户电话</label>
70
+ <input type="text" class="input_search" v-model="model.f_user_phone"
71
+ condition="f_user_phone like '%{}%'"
72
+ style="width: 60%" placeholder="用户电话">
73
+ </div>
74
+ <div :class="$parent.$parent.style">
75
+ <label class="font_normal_body">用户地址</label>
76
+ <input type="text" class="input_search" v-model="model.f_address"
77
+ condition="f_address like '%{}%'"
78
+ style="width: 60%" placeholder="用户地址">
74
79
  </div>
75
80
  <div :class="$parent.$parent.style2" style="margin: 0">
76
81
  <role-selector-safe
@@ -233,7 +238,7 @@
233
238
 
234
239
 
235
240
  </div>
236
- <div class="row" v-if="$parent.$parent.criteriaShow&&$parent.$parent.$parent.showItem">
241
+ <div class="row" v-if="$parent.$parent.criteriaShow && $parent.$parent.$parent.showItem">
237
242
  <div :class="$parent.$parent.style">
238
243
  <label class="font_normal_body">用户编号</label>
239
244
  <input type="text" class="input_search" v-model="model.f_userinfo_code"
@@ -266,17 +271,22 @@
266
271
  </div>
267
272
  <div class="row" v-if="$parent.$parent.criteriaShow && $parent.$parent.$parent.showItem">
268
273
  <div :class="$parent.$parent.style">
269
- <label class="font_normal_body">片&emsp;&emsp;区</label>
270
- <v-select class="select_list select"
271
- placeholder='片区/管理站' style="width: 60%"
272
- :value.sync="model.f_slice_area" v-model="model.f_slice_area"
273
- :options='$parent.$parent.sliceArea'
274
- filer-key="name"
275
- close-on-select clear-button
276
- condition="f_slice_area='{}'"
277
- @change="$parent.$parent.getmeterbook(model.f_slice_area)"
278
- :value-single="true">
279
- </v-select>
274
+ <label class="font_normal_body">用户姓名</label>
275
+ <input type="text" class="input_search" v-model="model.f_user_name"
276
+ condition="f_user_name like '%{}%'"
277
+ style="width: 60%" placeholder="用户姓名">
278
+ </div>
279
+ <div :class="$parent.$parent.style">
280
+ <label class="font_normal_body">用户电话</label>
281
+ <input type="text" class="input_search" v-model="model.f_user_phone"
282
+ condition="f_user_phone like '%{}%'"
283
+ style="width: 60%" placeholder="用户电话">
284
+ </div>
285
+ <div :class="$parent.$parent.style">
286
+ <label class="font_normal_body">用户地址</label>
287
+ <input type="text" class="input_search" v-model="model.f_address"
288
+ condition="f_address like '%{}%'"
289
+ style="width: 60%" placeholder="用户地址">
280
290
  </div>
281
291
  <div :class="$parent.$parent.style">
282
292
  <label class="font_normal_body">抄&ensp;表&ensp;册</label>
@@ -446,7 +456,7 @@
446
456
  defectLeave:'',
447
457
  defectType:'',
448
458
  defectLeaveList:[],
449
- headData: ['入户状态','用户编号','用户名','用户电话','用户小区','用户地址','安检时间','安检员','计划名','隐患总数','已处理数','未处理数','隐患数','隐患情况','用户类型','安装位置','机表类型','房屋类型'],
459
+ headData: ['入户状态','用户编号','用户名','用户电话','用户小区','用户地址','安检时间','安检员','计划名','隐患总数','已处理数','未处理数','隐患数','隐患项及原因','用户类型','安装位置','机表类型','房屋类型'],
450
460
  bodyData: ['f_entry_status','f_userinfo_code','f_user_name','f_user_phone','f_residential_area','f_address','f_offsite_time','f_checker_name','f_plan_name','f_defect_count','f_repair_count','remainder','f_defect_count','f_defect_content','f_user_type','f_position','F_METER_CLASSIFY','f_house_type']
451
461
  }
452
462
  },
package/src/components/planmanage/checkUserList.vue CHANGED
@@ -419,7 +419,7 @@ export default {
419
419
  title: '计划管理',
420
420
  data() {
421
421
  return {
422
- model: new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 100, {
422
+ model: new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQCheckUserGongyi', 100, {
423
423
  "orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
424
424
  "f_usertype": "''",
425
425
  "month": "''",