safecheck-client 3.0.35-gongyi-1 → 3.0.35-gongyi-4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. package/package.json +1 -1
  2. package/src/components/pc/CheckBookList.vue +3 -4
  3. package/src/components/pc/CheckBookManage.vue +10 -65
  4. package/src/components/querycheckpaper/CheckSearchUser.vue +1 -2
  5. package/src/safecheck.js +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-1",
4
+ "version": "3.0.35-gongyi-4",
5
5
  "description": "安检模块 前端组件",
6
6
  "author": "丁新 <417755458@qq.com>",
7
7
  "license": "ISC",
package/src/components/pc/CheckBookList.vue CHANGED
@@ -60,12 +60,12 @@
60
60
  </datepicker>
61
61
  </div>
62
62
 
63
+
63
64
  <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
64
65
  <export-excel-safe :data="$parent.$parent.exportParameter"
65
66
  :field="$parent.$parent.excelHeaders"
66
67
  sqlurl="rs/logic/SafeExportExcel" sql-name="QueryCheckBook"
67
- template-name='安检册详情列表'>
68
- </export-excel-safe>
68
+ template-name='安检册详情列表'></export-excel-safe>
69
69
  <button type="button" class="button_search button_spacing" @click="search()">查询</button>
70
70
  <div style="float: right" class="button_spacing"
71
71
  :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
@@ -106,8 +106,7 @@
106
106
  <export-excel-safe :data="$parent.$parent.exportParameter"
107
107
  :field="$parent.$parent.excelHeaders"
108
108
  sqlurl="rs/logic/SafeExportExcel" sql-name="QueryCheckBook"
109
- template-name='安检册详情列表'>
110
- </export-excel-safe>
109
+ template-name='安检册详情列表'></export-excel-safe>
111
110
  <button type="button" class="button_search button_spacing" @click="search()">查询</button>
112
111
  <div style="float: right" class="button_spacing"
113
112
  :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
package/src/components/pc/CheckBookManage.vue CHANGED
@@ -124,7 +124,7 @@
124
124
  class="select_list select"
125
125
  :options='$parent.$parent.getgasmodel' placeholder='气表型号'
126
126
  close-on-select
127
- condition="tuf.f_gasmodel_id = {}"></v-select>
127
+ condition="tuf.f_gasmodel_id = '{}'"></v-select>
128
128
 
129
129
  </div>
130
130
  <div class="col-sm-2 form-group" style="margin-top: 0px">
@@ -135,7 +135,7 @@
135
135
  class="select_list select"
136
136
  :options='$parent.$parent.housetypes' placeholder='房屋类型'
137
137
  close-on-select
138
- condition="tui.f_house_type = {}"></v-select>
138
+ condition="tui.f_house_type = '{}'"></v-select>
139
139
 
140
140
  </div>
141
141
  <div class="col-sm-2 form-group" style="margin-top: 0px">
@@ -146,7 +146,7 @@
146
146
  class="select_list select"
147
147
  :options='$parent.$parent.positions' placeholder='安装位置'
148
148
  close-on-select
149
- condition="tuf.f_position = {}"></v-select>
149
+ condition="tuf.f_position = '{}'"></v-select>
150
150
 
151
151
  </div>
152
152
  <div class="col-sm-2 form-group" style="margin-top: 0px">
@@ -157,7 +157,7 @@
157
157
  class="select_list select"
158
158
  :options='$parent.$parent.usetypes' placeholder='使用类型'
159
159
  close-on-select
160
- condition="tuf.f_usetype = {}"></v-select>
160
+ condition="tuf.f_usetype = '{}'"></v-select>
161
161
 
162
162
  </div>
163
163
  <div class="form-group col-sm-2" style="margin-top: 0px">
@@ -266,9 +266,6 @@
266
266
  <th>
267
267
  <nobr><input type="checkbox" v-model="$parent.$parent.$parent.bookAll"></input>全选</nobr>
268
268
  </th>
269
- <th>
270
- <nobr><input type="checkbox" v-model="$parent.$parent.$parent.isallchecked"/>全选本页</nobr>
271
- </th>
272
269
  <th>
273
270
  <nobr>客户姓名</nobr>
274
271
  </th>
@@ -295,12 +292,6 @@
295
292
  @change="$parent.$parent.$parent.checkChange(row, $event)"></input>
296
293
  </nobr>
297
294
  </td>
298
- <td style="text-align: center">
299
- <nobr>
300
- <input type="checkbox" :checked="$parent.$parent.$parent.pageCheckModel(row)"
301
- @change="$parent.$parent.$parent.pageCheckChange(row, $event)"></input>
302
- </nobr>
303
- </td>
304
295
  <td style="text-align: center">{{ row.f_user_name }}</td>
305
296
  <td style="text-align: center">{{ row.f_userinfo_code }}</td>
306
297
  <td style="text-align: center">{{ row.f_user_type }}</td>
@@ -442,7 +433,6 @@ export default {
442
433
  checkBooks: [],
443
434
  f_orgid: '',
444
435
  bookAll: false,
445
- isallchecked:false,//本页全选
446
436
  bookList: [],
447
437
  selectBook:'',
448
438
  // init:false,
@@ -586,7 +576,7 @@ export default {
586
576
  this.$showMessage('请选择安检册')
587
577
  return
588
578
  }
589
- if (this.isSearch && (this.isallchecked || this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
579
+ if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
590
580
  let userCondition = ''
591
581
  if (this.bookList.length < 1) {
592
582
  console.log('bookCondition', this.bookCondition)
@@ -614,7 +604,6 @@ export default {
614
604
  this.selectBook = ''
615
605
  this.clearBook()
616
606
  this.bookAll = false
617
- this.isallchecked = false
618
607
  this.bookList = []
619
608
  this.showModal2 = false
620
609
  this.$refs.paged.$refs.criteria.search()
@@ -625,7 +614,7 @@ export default {
625
614
  this.$showMessage('请选择安检册')
626
615
  return
627
616
  }
628
- if (this.isSearch && (this.isallchecked || this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
617
+ if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
629
618
  let userCondition = ''
630
619
  if (this.bookList.length < 1) {
631
620
  console.log('bookCondition', this.bookCondition)
@@ -653,7 +642,6 @@ export default {
653
642
  this.selectBook = ''
654
643
  this.clearBook()
655
644
  this.bookAll = false
656
- this.isallchecked = false
657
645
  this.bookList = []
658
646
  this.showModal3 = false
659
647
  this.$refs.paged.$refs.criteria.search()
@@ -663,7 +651,6 @@ export default {
663
651
  this.selectBook = ''
664
652
  this.clearBook()
665
653
  this.bookAll = false
666
- this.isallchecked = false
667
654
  this.bookList = []
668
655
  this.showModal2 = false
669
656
  this.$refs.paged.$refs.criteria.search()
@@ -672,7 +659,6 @@ export default {
672
659
  this.selectBook = ''
673
660
  this.clearBook()
674
661
  this.bookAll = false
675
- this.isallchecked = false
676
662
  this.bookList = []
677
663
  this.showModal3 = false
678
664
  this.$refs.paged.$refs.criteria.search()
@@ -682,7 +668,7 @@ export default {
682
668
  this.$showMessage('请选择查询未划分安检册的用户')
683
669
  return
684
670
  }
685
- if (this.isSearch && (this.isallchecked || this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
671
+ if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
686
672
  this.showModal2 = true
687
673
  this.freshCheckBook()
688
674
  return
@@ -694,7 +680,7 @@ export default {
694
680
  this.$showMessage('请选择查询已划分安检册的用户')
695
681
  return
696
682
  }
697
- if (this.isSearch && (this.isallchecked || this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
683
+ if (this.isSearch && ( this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
698
684
  this.showModal3 = true
699
685
  this.freshCheckBook()
700
686
  return
@@ -706,7 +692,7 @@ export default {
706
692
  this.$showMessage('请选择查询已划分安检册的用户')
707
693
  return
708
694
  }
709
- if (this.isSearch && (this.isallchecked || this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
695
+ if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
710
696
  let userCondition= ''
711
697
  if (this.bookList.length < 1) {
712
698
  console.log('bookCondition', this.bookCondition)
@@ -733,7 +719,6 @@ export default {
733
719
  this.$showMessage('从安检册删除所选用户成功')
734
720
  this.selectBook = ''
735
721
  this.bookAll = false
736
- this.isallchecked = false
737
722
  this.clearBook()
738
723
  this.bookList = []
739
724
  this.showModal3 = false
@@ -747,7 +732,7 @@ export default {
747
732
  this.$showMessage('请选择查询未划分安检册的用户')
748
733
  return
749
734
  }
750
- if (this.isSearch && (this.isallchecked || this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
735
+ if (this.isSearch && (this.bookAll || this.bookList.length > 0) && this.model.rows.length > 0) {
751
736
  this.showModal = true
752
737
  return
753
738
  }
@@ -799,7 +784,6 @@ export default {
799
784
  this.clearBook()
800
785
  this.bookList = []
801
786
  this.bookAll = false
802
- this.isallchecked = false
803
787
  this.freshCheckBook()
804
788
  this.$refs.paged.$refs.criteria.search()
805
789
  }
@@ -809,7 +793,6 @@ export default {
809
793
  console.log('66666666666', val)
810
794
  console.log(this.model.rows)
811
795
  this.bookAll = false
812
- this.isallchecked = false
813
796
  this.bookList = []
814
797
  if (this.$refs.paged.$refs.criteria.model.f_orgid){
815
798
  this.$refs.paged.$refs.criteria.search()
@@ -817,7 +800,6 @@ export default {
817
800
  },
818
801
  cancel () {
819
802
  this.bookAll = false
820
- this.isallchecked = false
821
803
  this.bookList = []
822
804
  this.clearBook()
823
805
  this.showModal = false
@@ -836,20 +818,6 @@ export default {
836
818
  }
837
819
  }
838
820
  },
839
- pageCheckModel (row) {
840
- //全选
841
- if (this.isallchecked) {
842
- console.log('row', this.isallchecked, JSON.stringify(row))
843
- return true
844
- } else {
845
- if (this.bookList.findIndex(res => res === row.f_userinfo_id) !== -1) {
846
- console.log('row1111', JSON.stringify(row))
847
- return true
848
- } else {
849
- return false
850
- }
851
- }
852
- },
853
821
  checkChange (row, e) {
854
822
  console.log('e', e.target.checked)
855
823
  if (e.target.checked) {
@@ -859,14 +827,6 @@ export default {
859
827
  }
860
828
  // console.log('aaaaa', JSON.stringify(this.bookList))
861
829
  },
862
- pageCheckChange (row, e) {
863
- console.log('e', e.target.checked)
864
- if (e.target.checked) {
865
- this.bookList.push(row.f_userinfo_id)
866
- } else {
867
- this.bookList.splice(this.bookList.findIndex(res => res === row.f_userinfo_id), 1)
868
- }
869
- },
870
830
  getRes (obj) {
871
831
  this.checkBook.f_orgid = obj.resids[0]
872
832
  },
@@ -879,7 +839,6 @@ export default {
879
839
  selfSearch (args) {
880
840
  this.isSearch = true
881
841
  this.bookAll = false
882
- this.isallchecked = false
883
842
  this.bookList = []
884
843
  // if (this.$refs.paged.$refs.criteria.model.f_orgid){
885
844
  // args.condition += `f_orgid in ${this.$refs.paged.$refs.criteria.model.f_orgid}`
@@ -922,20 +881,6 @@ export default {
922
881
  })
923
882
  }
924
883
  },
925
- watch: {
926
- "isallchecked"(val){
927
- if (val) {
928
- // 全选
929
- this.$refs.grid.model.rows.forEach((row=>{
930
- this.bookList.push(row.f_userinfo_id)
931
- }))
932
- } else {
933
- // 取消全选
934
- this.isallchecked = false
935
- this.bookList = []
936
- }
937
- }
938
- },
939
884
  ready () {
940
885
  // 获取片区
941
886
  this.getSliceArea()
package/src/components/querycheckpaper/CheckSearchUser.vue CHANGED
@@ -238,8 +238,7 @@
238
238
  <export-excel-safe :data="$parent.$parent.searchData"
239
239
  :field="$parent.$parent.excelHeaders"
240
240
  sqlurl="rs/logic/SafeExportExcel" sql-name="根据安检员查询用户档案"
241
- template-name='用户安检情况'>
242
- </export-excel-safe>
241
+ template-name='用户安检情况'></export-excel-safe>
243
242
  <button type="button" class="button_search button_spacing" @click="search()">查询</button>
244
243
  <div style="float: right" class="button_spacing"
245
244
  :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
package/src/safecheck.js CHANGED
@@ -589,7 +589,7 @@ export default function (filiale) {
589
589
  require(['./components/defect/DefectListWeixiu'], resolve)
590
590
  })
591
591
  // 隐患查看
592
- Vue.component('defect-main-new', (resolve) => {
592
+ Vue.component('defect-main-weixiu', (resolve) => {
593
593
  require(['./components/defect/DefectMainWeixiu'], resolve)
594
594
  })
595
595
  // 隐患详情