safecheck-client 4.0.2-4 → 4.0.2-42

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 (277) hide show
  1. package/.babelrc +5 -5
  2. package/.editorconfig +9 -9
  3. package/android.html +18 -18
  4. package/config/dev.env.js +6 -6
  5. package/config/index.js +38 -38
  6. package/config/prod.env.js +3 -3
  7. package/config/test.env.js +6 -6
  8. package/docs/AppBase.md +22 -22
  9. package/docs/Busy.md +14 -14
  10. package/docs/CriteriaPaged.md +47 -47
  11. package/docs/DataGrid.md +54 -54
  12. package/docs/DataModel.md +22 -22
  13. package/docs/Dynamic.md +42 -42
  14. package/docs/GetParams.md +11 -11
  15. package/docs/HttpBusy.md +13 -13
  16. package/docs/HttpStore.md +29 -29
  17. package/docs/MessageBox.md +28 -28
  18. package/docs/PagedList.md +29 -29
  19. package/docs/Pager.md +21 -21
  20. package/docs/Project.md +23 -23
  21. package/docs/Route.md +105 -105
  22. package/docs/SafetyCheck/AdjustPlan.md +13 -13
  23. package/docs/SafetyCheck/CheckerPlan.md +12 -12
  24. package/docs/Task.md +46 -46
  25. package/docs/TreeList.md +28 -28
  26. package/docs/TreeMixin.md +18 -18
  27. package/docs/all.md +10 -10
  28. package/docs/list.md +42 -42
  29. package/docs/partial.md +75 -75
  30. package/docs/selector.md +82 -82
  31. package/docs//345/274/200/345/217/221/346/226/207/346/241/243/Snippets.md +28 -28
  32. package/docs//345/274/200/345/217/221/346/226/207/346/241/243/vue-strap/345/217/230/346/233/264/350/256/260/345/275/225.md +7 -7
  33. package/docs//345/274/200/345/217/221/346/226/207/346/241/243/vue/345/217/230/346/233/264/350/256/260/345/275/225.md +13 -13
  34. package/docs//345/274/200/345/217/221/346/226/207/346/241/243//345/274/200/345/217/221/347/216/257/345/242/203/350/256/276/347/275/256.md +77 -77
  35. package/docs//347/225/214/351/235/242/345/210/266/344/275/234/350/247/204/350/214/203.md +54 -54
  36. package/examples/AddressList/App.vue +13 -13
  37. package/examples/AddressList/index.html +11 -11
  38. package/examples/DispatchList/App.vue +10 -10
  39. package/examples/DispatchList/BaseTree.vue +13 -13
  40. package/examples/DispatchList/Init.vue +22 -22
  41. package/examples/DispatchList/Test.vue +20 -20
  42. package/examples/DispatchList/index.html +11 -11
  43. package/examples/DispatchList/main.js +18 -18
  44. package/home.html +16 -16
  45. package/package.json +1 -1
  46. package/publish.bat +7 -7
  47. package/release.bat +5 -5
  48. package/src/Widget.vue +13 -13
  49. package/src/android-bootstrap/fonts/glyphicons-halflings-regular.svg +287 -287
  50. package/src/android-bootstrap/less/.csscomb.json +304 -304
  51. package/src/android-bootstrap/less/.csslintrc +19 -19
  52. package/src/android-bootstrap/less/alerts.less +73 -73
  53. package/src/android-bootstrap/less/badges.less +66 -66
  54. package/src/android-bootstrap/less/bootstrap.less +56 -56
  55. package/src/android-bootstrap/less/breadcrumbs.less +26 -26
  56. package/src/android-bootstrap/less/button-groups.less +247 -247
  57. package/src/android-bootstrap/less/buttons.less +173 -173
  58. package/src/android-bootstrap/less/carousel.less +269 -269
  59. package/src/android-bootstrap/less/close.less +34 -34
  60. package/src/android-bootstrap/less/code.less +69 -69
  61. package/src/android-bootstrap/less/component-animations.less +33 -33
  62. package/src/android-bootstrap/less/grid.less +84 -84
  63. package/src/android-bootstrap/less/input-groups.less +167 -167
  64. package/src/android-bootstrap/less/jumbotron.less +52 -52
  65. package/src/android-bootstrap/less/labels.less +64 -64
  66. package/src/android-bootstrap/less/list-group.less +141 -141
  67. package/src/android-bootstrap/less/media.less +66 -66
  68. package/src/android-bootstrap/less/mixins/alerts.less +14 -14
  69. package/src/android-bootstrap/less/mixins/background-variant.less +9 -9
  70. package/src/android-bootstrap/less/mixins/border-radius.less +18 -18
  71. package/src/android-bootstrap/less/mixins/buttons.less +69 -69
  72. package/src/android-bootstrap/less/mixins/center-block.less +7 -7
  73. package/src/android-bootstrap/less/mixins/clearfix.less +22 -22
  74. package/src/android-bootstrap/less/mixins/forms.less +90 -90
  75. package/src/android-bootstrap/less/mixins/gradients.less +59 -59
  76. package/src/android-bootstrap/less/mixins/grid-framework.less +92 -92
  77. package/src/android-bootstrap/less/mixins/grid.less +122 -122
  78. package/src/android-bootstrap/less/mixins/hide-text.less +21 -21
  79. package/src/android-bootstrap/less/mixins/image.less +33 -33
  80. package/src/android-bootstrap/less/mixins/labels.less +12 -12
  81. package/src/android-bootstrap/less/mixins/list-group.less +30 -30
  82. package/src/android-bootstrap/less/mixins/nav-divider.less +10 -10
  83. package/src/android-bootstrap/less/mixins/nav-vertical-align.less +9 -9
  84. package/src/android-bootstrap/less/mixins/opacity.less +8 -8
  85. package/src/android-bootstrap/less/mixins/pagination.less +24 -24
  86. package/src/android-bootstrap/less/mixins/panels.less +24 -24
  87. package/src/android-bootstrap/less/mixins/progress-bar.less +10 -10
  88. package/src/android-bootstrap/less/mixins/reset-filter.less +8 -8
  89. package/src/android-bootstrap/less/mixins/reset-text.less +18 -18
  90. package/src/android-bootstrap/less/mixins/resize.less +6 -6
  91. package/src/android-bootstrap/less/mixins/responsive-visibility.less +15 -15
  92. package/src/android-bootstrap/less/mixins/size.less +10 -10
  93. package/src/android-bootstrap/less/mixins/tab-focus.less +9 -9
  94. package/src/android-bootstrap/less/mixins/table-row.less +44 -44
  95. package/src/android-bootstrap/less/mixins/text-emphasis.less +9 -9
  96. package/src/android-bootstrap/less/mixins/text-overflow.less +8 -8
  97. package/src/android-bootstrap/less/mixins/vendor-prefixes.less +227 -227
  98. package/src/android-bootstrap/less/mixins.less +40 -40
  99. package/src/android-bootstrap/less/modals.less +151 -151
  100. package/src/android-bootstrap/less/navbar.less +660 -660
  101. package/src/android-bootstrap/less/navs.less +290 -290
  102. package/src/android-bootstrap/less/normalize.less +424 -424
  103. package/src/android-bootstrap/less/pager.less +76 -76
  104. package/src/android-bootstrap/less/pagination.less +89 -89
  105. package/src/android-bootstrap/less/panels.less +274 -274
  106. package/src/android-bootstrap/less/popovers.less +131 -131
  107. package/src/android-bootstrap/less/print.less +101 -101
  108. package/src/android-bootstrap/less/progress-bars.less +87 -87
  109. package/src/android-bootstrap/less/responsive-embed.less +35 -35
  110. package/src/android-bootstrap/less/responsive-utilities.less +194 -194
  111. package/src/android-bootstrap/less/scaffolding.less +161 -161
  112. package/src/android-bootstrap/less/tables.less +262 -262
  113. package/src/android-bootstrap/less/theme.less +291 -291
  114. package/src/android-bootstrap/less/thumbnails.less +36 -36
  115. package/src/android-bootstrap/less/tooltip.less +102 -102
  116. package/src/android-bootstrap/less/type.less +303 -303
  117. package/src/android-bootstrap/less/utilities.less +55 -55
  118. package/src/android-bootstrap/less/variables.less +896 -896
  119. package/src/android-bootstrap/less/wells.less +29 -29
  120. package/src/bootstrap/less/.csscomb.json +304 -304
  121. package/src/bootstrap/less/.csslintrc +19 -19
  122. package/src/bootstrap/less/alerts.less +73 -73
  123. package/src/bootstrap/less/badges.less +66 -66
  124. package/src/bootstrap/less/breadcrumbs.less +26 -26
  125. package/src/bootstrap/less/button-groups.less +247 -247
  126. package/src/bootstrap/less/buttons.less +172 -172
  127. package/src/bootstrap/less/carousel.less +269 -269
  128. package/src/bootstrap/less/close.less +34 -34
  129. package/src/bootstrap/less/code.less +69 -69
  130. package/src/bootstrap/less/component-animations.less +33 -33
  131. package/src/bootstrap/less/dropdowns.less +216 -216
  132. package/src/bootstrap/less/grid.less +84 -84
  133. package/src/bootstrap/less/input-groups.less +167 -167
  134. package/src/bootstrap/less/jumbotron.less +52 -52
  135. package/src/bootstrap/less/labels.less +64 -64
  136. package/src/bootstrap/less/list-group.less +141 -141
  137. package/src/bootstrap/less/media.less +66 -66
  138. package/src/bootstrap/less/mixins/alerts.less +14 -14
  139. package/src/bootstrap/less/mixins/background-variant.less +9 -9
  140. package/src/bootstrap/less/mixins/border-radius.less +18 -18
  141. package/src/bootstrap/less/mixins/buttons.less +69 -69
  142. package/src/bootstrap/less/mixins/center-block.less +7 -7
  143. package/src/bootstrap/less/mixins/clearfix.less +22 -22
  144. package/src/bootstrap/less/mixins/forms.less +90 -90
  145. package/src/bootstrap/less/mixins/gradients.less +59 -59
  146. package/src/bootstrap/less/mixins/grid-framework.less +92 -92
  147. package/src/bootstrap/less/mixins/grid.less +122 -122
  148. package/src/bootstrap/less/mixins/hide-text.less +21 -21
  149. package/src/bootstrap/less/mixins/image.less +33 -33
  150. package/src/bootstrap/less/mixins/labels.less +12 -12
  151. package/src/bootstrap/less/mixins/list-group.less +30 -30
  152. package/src/bootstrap/less/mixins/nav-divider.less +10 -10
  153. package/src/bootstrap/less/mixins/nav-vertical-align.less +9 -9
  154. package/src/bootstrap/less/mixins/opacity.less +8 -8
  155. package/src/bootstrap/less/mixins/pagination.less +24 -24
  156. package/src/bootstrap/less/mixins/panels.less +24 -24
  157. package/src/bootstrap/less/mixins/progress-bar.less +10 -10
  158. package/src/bootstrap/less/mixins/reset-filter.less +8 -8
  159. package/src/bootstrap/less/mixins/reset-text.less +18 -18
  160. package/src/bootstrap/less/mixins/resize.less +6 -6
  161. package/src/bootstrap/less/mixins/responsive-visibility.less +15 -15
  162. package/src/bootstrap/less/mixins/size.less +10 -10
  163. package/src/bootstrap/less/mixins/tab-focus.less +9 -9
  164. package/src/bootstrap/less/mixins/table-row.less +44 -44
  165. package/src/bootstrap/less/mixins/text-emphasis.less +9 -9
  166. package/src/bootstrap/less/mixins/text-overflow.less +8 -8
  167. package/src/bootstrap/less/mixins/vendor-prefixes.less +227 -227
  168. package/src/bootstrap/less/mixins.less +40 -40
  169. package/src/bootstrap/less/modals.less +151 -151
  170. package/src/bootstrap/less/navbar.less +660 -660
  171. package/src/bootstrap/less/normalize.less +424 -424
  172. package/src/bootstrap/less/pagination.less +89 -89
  173. package/src/bootstrap/less/panels.less +275 -275
  174. package/src/bootstrap/less/popovers.less +131 -131
  175. package/src/bootstrap/less/print.less +101 -101
  176. package/src/bootstrap/less/progress-bars.less +87 -87
  177. package/src/bootstrap/less/responsive-embed.less +35 -35
  178. package/src/bootstrap/less/responsive-utilities.less +194 -194
  179. package/src/bootstrap/less/scaffolding.less +161 -161
  180. package/src/bootstrap/less/theme.less +291 -291
  181. package/src/bootstrap/less/thumbnails.less +36 -36
  182. package/src/bootstrap/less/tooltip.less +102 -102
  183. package/src/bootstrap/less/type.less +303 -303
  184. package/src/bootstrap/less/utilities.less +55 -55
  185. package/src/bootstrap/less/wells.less +29 -29
  186. package/src/components/FileUpload.vue +696 -696
  187. package/src/components/Hello.vue +39 -39
  188. package/src/components/LeftTree.vue +27 -27
  189. package/src/components/NewDefectList/DefectPaperNew.vue +2 -2
  190. package/src/components/android/AttendanceTally.vue +116 -116
  191. package/src/components/android/Blank.vue +10 -10
  192. package/src/components/android/CheckUnplanPage.vue +56 -56
  193. package/src/components/android/Checker.vue +12 -12
  194. package/src/components/android/CheckerAnnual.vue +81 -81
  195. package/src/components/android/CheckerAvarta.vue +82 -82
  196. package/src/components/android/EquipmentInspection.vue +348 -348
  197. package/src/components/android/FootprintMap.vue +120 -120
  198. package/src/components/android/HiddentroubleInvestigation.vue +192 -192
  199. package/src/components/android/MasterMain.vue +77 -77
  200. package/src/components/android/Menu.vue +132 -132
  201. package/src/components/android/PaperAlarm.vue +85 -85
  202. package/src/components/android/PaperDeviceNoncivil.vue +214 -214
  203. package/src/components/android/PlumberAnnual.vue +83 -83
  204. package/src/components/android/PlumberAnnualDetail.vue +65 -65
  205. package/src/components/android/PlumberMonthly.vue +84 -84
  206. package/src/components/android/PostMap.vue +83 -83
  207. package/src/components/android/QueryCheckHistory.vue +122 -122
  208. package/src/components/android/QueryCheckHistoryItem.vue +62 -62
  209. package/src/components/android/RepairMain.vue +60 -60
  210. package/src/components/android/Repairman.vue +12 -12
  211. package/src/components/android/StationMaster.vue +12 -12
  212. package/src/components/android/week/CheckResultSimple.vue +252 -0
  213. package/src/components/android/week/FirstWeekCheck.vue +242 -0
  214. package/src/components/android/week/StepHeaderBar.vue +404 -0
  215. package/src/components/android/week/WeekCheck.vue +191 -0
  216. package/src/components/android/week/WeekCheckPaper.vue +181 -0
  217. package/src/components/checkplan/SelectCheckPlan.vue +39 -0
  218. package/src/components/defects/DefectModal.vue +101 -101
  219. package/src/components/defects/DevicesAndItem.vue +39 -39
  220. package/src/components/issueplan/IssuePlanMain.vue +23 -23
  221. package/src/components/notice/NoticeForm.vue +100 -100
  222. package/src/components/notice/NoticeIssue.vue +20 -20
  223. package/src/components/paper/PicViewer.vue +18 -18
  224. package/src/components/paper/safetyledger.vue +194 -0
  225. package/src/components/pc/CheckBook.vue +1 -1
  226. package/src/components/phonestate/MonthlyTraffic.vue +66 -66
  227. package/src/components/phonestate/MonthlyTrafficRouter.vue +15 -15
  228. package/src/components/phonestate/PostMap.vue +82 -82
  229. package/src/components/planmanage/checkUserList.vue +1 -1
  230. package/src/components/querycheckpaper/CheckSearchUser.vue +2 -1
  231. package/src/components/querycheckpaper/PaperItem.vue +59 -59
  232. package/src/components/report/CheckByPlan.vue +118 -118
  233. package/src/components/report/CheckPlanAreaList.vue +45 -2
  234. package/src/components/userfile/MeterFile.vue +145 -145
  235. package/src/components/userfile/MeterModify.vue +46 -46
  236. package/src/components/userfileaudit/MeterAuditFile.vue +129 -129
  237. package/src/filiale/jinhong/android/CurrentCreate.vue +6 -3
  238. package/src/filiale/jinhong/android/PhoneInsurancePurchaseDetail.vue +28 -3
  239. package/src/filiale/jinhong/pc/CheckBookList.vue +28 -18
  240. package/src/filiale/jinhong/pc/CheckSearchUser.vue +1120 -1094
  241. package/src/filiale/jinhong/pc/NewCheckpaper.vue +1958 -0
  242. package/src/filiale/jinhong/pc/PaperList.vue +857 -853
  243. package/src/filiale/jinhong/pc/checkPlanList.vue +73 -24
  244. package/src/filiale/jinhong/pc.js +15 -14
  245. package/src/filiale/meihekou/android/CurrentCreate.vue +16 -0
  246. package/src/filiale/meihekou/android/PaperFeedback.vue +3 -0
  247. package/src/filiale/meihekou/android/SafecheckDevices.vue +6 -3
  248. package/src/filiale/meihekou/android/SafecheckOrderV.vue +27 -28
  249. package/src/filiale/meihekou/pc/CheckDetail.vue +217 -0
  250. package/src/filiale/meihekou/pc/CheckPlan.vue +52 -0
  251. package/src/filiale/meihekou/pc/CheckPlanAreaList.vue +505 -0
  252. package/src/filiale/meihekou/pc/NewCheckpaper.vue +2 -1
  253. package/src/filiale/meihekou/pc/NewCheckpaperNew.vue +1 -0
  254. package/src/filiale/meihekou/pc/NewCheckpaperTemp.vue +1 -0
  255. package/src/filiale/meihekou/pc/SelectCheckPlan.vue +262 -0
  256. package/src/filiale/meihekou/pc.js +3 -0
  257. package/src/filiale/qingjian/pc/SecurityCheckCoordinates.vue +2 -2
  258. package/src/filiale/xinkang/android/SafecheckDevices.vue +1 -1
  259. package/src/filiale/xinkang/android/SafecheckOrderV.vue +10 -3
  260. package/src/filiale/xinkang/pc/NewCheckpaper.vue +17 -46
  261. package/src/filiale/xinliansihui/pc/PaperList.vue +814 -0
  262. package/src/filiale/xinliansihui/pc/PaperVisitMain.vue +206 -0
  263. package/src/filiale/xinliansihui/pc.js +13 -0
  264. package/src/plugins/LoadData.js +10 -10
  265. package/src/plugins/LoadParams.js +24 -24
  266. package/src/safecheck-android.js +10 -0
  267. package/src/safecheck.js +3 -0
  268. package/src/stores/wxconfig.js +10 -10
  269. package/src/utils/getNowDate.js +33 -33
  270. package/test/e2e/custom-assertions/elementCount.js +26 -26
  271. package/test/e2e/nightwatch.conf.js +40 -40
  272. package/test/e2e/runner.js +30 -30
  273. package/test/e2e/specs/test.js +13 -13
  274. package/test/unit/.eslintrc +5 -5
  275. package/test/unit/TestUtil.js +62 -62
  276. package/test/unit/context.html +20 -20
  277. package/test/unit/index.js +13 -13
@@ -22,29 +22,18 @@
22
22
  <input type="text" class="input_search" v-model="model.f_address"
23
23
  style="width: 95%" placeholder="客户地址" condition="i.f_address like '%{}%'">
24
24
  </div>
25
- <div class="form-group col-sm-1" >
26
- <datepicker
27
- placeholder='创建起始'
28
- style="width:100%"
29
- :disabled-days-of-week="[]"
30
- :format="'yyyy-MM-dd'"
31
- :show-rest-button="reset"
32
- :value.sync="model.f_starcreate_time"
33
- v-model="model.f_starcreate_time"
34
- condition="i.f_create_time >='{} 00:00:00'">
35
- </datepicker>
36
- </div>
37
- <div class="form-group col-sm-1" style="margin-left: 6px;margin-right: 6px;">
38
- <datepicker
39
- placeholder='创建结束'
40
- :disabled-days-of-week="[]"
41
- style="width:100%"
42
- :format="'yyyy-MM-dd'"
43
- :show-rest-button="reset"
44
- :value.sync="model.f_endcreate_time"
45
- v-model="model.f_endcreate_time"
46
- condition="i.f_create_time <='{} 00:00:00'">
47
- </datepicker>
25
+ <div class="form-group col-sm-1 upuserinfo_sel" >
26
+ <v-select v-model="model.f_meter_book_num"
27
+ :multiple="true" :options='$parent.$parent.checkBooks'
28
+ :value.sync="model.f_meter_book_num"
29
+ class="select select_list"
30
+ @select-search="$parent.$parent.select_book"
31
+ :width="'95%'"
32
+ :timeout="500"
33
+ placeholder='安检册选择'
34
+ condition="i.f_check_book_id in {}" >
35
+ </v-select>
36
+
48
37
  </div>
49
38
  <!--<div class="form-group col-sm-1" >
50
39
  <v-select :width="'95%'"
@@ -137,6 +126,33 @@
137
126
  condition="i.f_last_check_date <='{} 00:00:00'">
138
127
  </datepicker>
139
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="model.f_starcreate_time"
138
+ v-model="model.f_starcreate_time"
139
+ condition="i.f_create_time >='{} 00:00:00'">
140
+ </datepicker>
141
+ </div>
142
+ <div class="form-group col-sm-4" >
143
+ <label class="font_normal_body">创建起始:</label>
144
+ <datepicker
145
+ placeholder='创建起始'
146
+ :disabled-days-of-week="[]"
147
+ style="width:60%"
148
+ :format="'yyyy-MM-dd'"
149
+ :show-rest-button="reset"
150
+ :value.sync="model.f_endcreate_time"
151
+ v-model="model.f_endcreate_time"
152
+ condition="i.f_create_time <='{} 00:00:00'">
153
+ </datepicker>
154
+ </div>
155
+
140
156
  <!-- <div class="form-group col-sm-4" >-->
141
157
  <!-- <label class="font_normal_body">创建起始:</label>-->
142
158
  <!-- <datepicker-->
@@ -235,6 +251,7 @@
235
251
  opt:[{label:"测试",value:"测试"}],
236
252
  showCondtion:false,
237
253
  checkAll:false,
254
+ checkBooks:[],
238
255
  checkes:[],
239
256
  checkResults:[{label:'到访不遇',value:'到访不遇'},{label:'拒检',value:'拒检'},{label:'入户',value:'入户'}],
240
257
  checkState:[{label:'全部',value:''},{label:'未检',value:'未检'},{label:'已检',value:'已检'}],
@@ -253,7 +270,7 @@
253
270
  },
254
271
  props:["selectplan","userlogin"],
255
272
  ready(){
256
-
273
+ this.getCheckBook()
257
274
  },
258
275
  computed:{
259
276
  exportParameter(){
@@ -265,6 +282,38 @@
265
282
  }
266
283
  },
267
284
  methods:{
285
+ select_book(text){
286
+ //tag
287
+ let pcdText=text?` and f_check_book_name like '%${text}%'`:''
288
+ new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_check_book",orderitem:"id",condition:`f_orgid = '${this.userlogin.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
289
+ //tag)
290
+ if(res.data.length>0){
291
+ this.checkBooks = []
292
+ res.data.forEach((result)=>{
293
+ this.checkBooks.push({label:result.f_check_book_name,value:result.id})
294
+ })
295
+ }
296
+ //tag)
297
+ })
298
+ },
299
+ getCheckBook(){
300
+ this.checkBooks=[]
301
+ new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy?pageNo=1&pageSize=1000`, {
302
+ data: {
303
+ items: 'id,f_check_book_name,f_check_book_type',
304
+ tablename: 't_check_book',
305
+ condition: `f_orgid = '${this.userlogin.orgid}'`,
306
+ orderitem: 'id desc'
307
+ }
308
+ }, {resolveMsg: null, rejectMsg: null}).then(res => {
309
+ res.data.forEach(ress => {
310
+ this.checkBooks.push({
311
+ label: ress.f_check_book_name,
312
+ value: ress.id
313
+ })
314
+ })
315
+ })
316
+ },
268
317
  clear(){
269
318
  this.model.f_plan_id = '';
270
319
  this.model.f_userinfo_code = '';
@@ -1,14 +1,15 @@
1
- let specialComp = {
2
- 'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
3
- 'check-plan-area-list': (resolve) => {require(['./pc/CheckPlanAreaList'], resolve)},
4
- 'safe-defect-paper-new': (resolve) => {require(['./pc/DefectPaperNew'], resolve)},
5
- 'check-search-user': (resolve) => {require(['./pc/CheckSearchUser'], resolve)},
6
- 'safe-defect-list-new': (resolve) => {require(['./pc/DefectListNew'], resolve)},
7
- 'check-user-list': (resolve) => {require(['./pc/checkUserList'], resolve)},
8
- 'check-plan-list': (resolve) => {require(['./pc/checkPlanList.vue'], resolve)},
9
- 'plan-manage': (resolve) => {require(['./pc/PlanManage.vue'], resolve)},
10
- 'check-book-list': (resolve) => {require(['./pc/CheckBookList.vue'], resolve)},
11
- 'select-check-plan': (resolve) => {require(['./pc/SelectCheckPlan.vue'], resolve)}
12
-
13
- }
14
- exports.specialComp = specialComp
1
+ let specialComp = {
2
+ 'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
3
+ 'check-plan-area-list': (resolve) => {require(['./pc/CheckPlanAreaList'], resolve)},
4
+ 'safe-defect-paper-new': (resolve) => {require(['./pc/DefectPaperNew'], resolve)},
5
+ 'check-search-user': (resolve) => {require(['./pc/CheckSearchUser'], resolve)},
6
+ 'safe-defect-list-new': (resolve) => {require(['./pc/DefectListNew'], resolve)},
7
+ 'check-user-list': (resolve) => {require(['./pc/checkUserList'], resolve)},
8
+ 'check-plan-list': (resolve) => {require(['./pc/checkPlanList.vue'], resolve)},
9
+ 'plan-manage': (resolve) => {require(['./pc/PlanManage.vue'], resolve)},
10
+ 'check-book-list': (resolve) => {require(['./pc/CheckBookList.vue'], resolve)},
11
+ 'new-check-paper': (resolve) => {require(['./pc/NewCheckpaper'], resolve)},
12
+ 'select-check-plan': (resolve) => {require(['./pc/SelectCheckPlan.vue'], resolve)}
13
+
14
+ }
15
+ exports.specialComp = specialComp
@@ -215,6 +215,17 @@
215
215
  v-model="model.f_last_state"
216
216
  close-on-select clear-button></v-select>
217
217
  </div>
218
+ <div class="row app-row" v-show="$parent.$parent.criteriaShow">
219
+ <div class="col-xs-4">
220
+ <img src="../../../assets/上传状态.png" style="width: 20px;margin-bottom: 5px" alt="">
221
+ <label for="f_upload_state" class="font text-left">上传状态:</label>
222
+ </div>
223
+ <div class="col-xs-8" >
224
+ <v-select id="f_upload_state" :value.sync="model.f_upload_state" class="input-font"
225
+ :options='$parent.$parent.upload_states' placeholder='请选择上传状态'
226
+ v-model="model.f_upload_state" condition="ti.f_upload_state='{}'" close-on-select clear-button></v-select>
227
+ </div>
228
+ </div>
218
229
  <div class="row app-row" v-if="$parent.$parent.criteriaShow">
219
230
  <div class="col-xs-6">
220
231
  <img src="../../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -856,6 +867,11 @@ export default {
856
867
  condition += " and ti.f_enter_number like '%"+this.$refs.paged.$refs.cri.model.f_enter_number+"%'"
857
868
  if(this.$refs.paged.$refs.cri.model.f_check_version)
858
869
  condition += " and ti.f_check_version <= "+this.$refs.paged.$refs.cri.model.f_check_version
870
+
871
+ if(this.$refs.paged.$refs.cri.model.f_upload_state[0])
872
+ condition += ` and ti.f_upload_state = '${this.$refs.paged.$refs.cri.model.f_upload_state[0]}'`
873
+
874
+
859
875
  //tag
860
876
  this.model.search("ti.f_no_checkplan = '有计划安检'" + condition)
861
877
  },
@@ -1320,6 +1320,9 @@ export default {
1320
1320
  },
1321
1321
  },
1322
1322
  async ready() {
1323
+ if (!this.paper.f_client_evaluation){
1324
+ this.paper.f_client_evaluation = '满意'
1325
+ }
1323
1326
  this.isRecodr = this.$appdata.getSingleValue('无限制录音')
1324
1327
  this.isvideo = this.$appdata.getSingleValue('安检录视频')
1325
1328
  if(this.$appdata.getSingleValue('安检时显示拉黑')){
@@ -632,9 +632,12 @@ export default {
632
632
  continue
633
633
  }
634
634
  let type = this.config[this.device.device].items[item].type
635
- let multiple = this.config[this.device.device].items[item].multiple?this.config[this.device.device].items[item].multiple:false
635
+ let multiple = false
636
+ if(this.config[this.device.device].items[item].multiple){
637
+ multiple = this.config[this.device.device].items[item].multiple === 'true' || this.config[this.device.device].items[item].multiple === true
638
+ }
636
639
  let options = this.config[this.device.device].items[item].options
637
- if ((this.config[this.device.device].items[item].type == 'selector' || this.config[this.device.device].items[item].type == 'inputSelector') && item == this.f_items[n].f_item_name) {
640
+ if ((this.config[this.device.device].items[item].type == 'selector' || this.config[this.device.device].items[item].type == 'inputSelector') && this.config[this.device.device].items[item].itemname == this.f_items[n].f_item_name) {
638
641
  for (let i in options) {
639
642
  if(typeof options[i]=='function'){
640
643
  continue
@@ -1043,7 +1046,7 @@ export default {
1043
1046
  verification_text:'',
1044
1047
  verification_state:'',// ai验证是否通过 npass(未通过)/pass(通过)
1045
1048
  f_is_defect: '',
1046
- multiple:this.config[this.device.device].items[item].multiple == true?this.config[this.device.device].items[item].multiple:false,
1049
+ multiple:this.config[this.device.device].items[item].multiple === 'true' || this.config[this.device.device].items[item].multiple == true?this.config[this.device.device].items[item].multiple:false,
1047
1050
  isshow:this.config[this.device.device].items[item].isshow == false?this.config[this.device.device].items[item].isshow:true,
1048
1051
  readonly: this.config[this.device.device].items[item].readonly == true?true:false,
1049
1052
  remark: this.config[this.device.device].items[item].remark ? this.config[this.device.device].items[item].remark : '',
@@ -876,16 +876,12 @@ export default {
876
876
  this.checkResult[f_device_type + '-' + f_item_name] = []
877
877
  }
878
878
  this.checkResult[f_device_type + '-' + f_item_name].push(f_item_value)
879
-
880
879
  }
881
-
882
880
  let f_selected = f_item_value
883
- if (!items.f_selected) {
881
+ if (!items.f_selected || !(items.f_selected instanceof Array)){
884
882
  items.f_selected = []
885
- items.f_selected.push(f_item_value)
886
- } else {
887
- items.f_selected.push(f_item_value)
888
883
  }
884
+ items.f_selected.push(f_item_value)
889
885
  }
890
886
  }
891
887
  }
@@ -994,6 +990,8 @@ export default {
994
990
  if (this.repairDefect.result != '正常') {
995
991
  return this.$showMessage('有隐患的处理方式为转维修,请点击转维修')
996
992
  }
993
+ //先临时保存
994
+ this.save('temp')
997
995
  this.save()
998
996
  },
999
997
  //将数据组装提出
@@ -1328,7 +1326,7 @@ export default {
1328
1326
  }
1329
1327
  if (jo.state == 'ok') {
1330
1328
  let res = JSON.parse(jo.result)
1331
- if (res.code == 200) {
1329
+ if (res.code == 200 || res.code == 310 || res.code == 311) {
1332
1330
  this.$set('data.f_paper_id', res.id)
1333
1331
  this.isStrat = false
1334
1332
  if (url != "") {
@@ -1576,28 +1574,26 @@ export default {
1576
1574
  this.refuseinspection = Vue.config.safecheck.ApproveConfig.refuseinspection
1577
1575
  }
1578
1576
  }
1579
-
1580
- if (this.item.f_security_check_type_id && this.item.f_security_check_type_id != null) {
1581
- try {
1582
- await this.getSecurityCheckType(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getSecurityCheckTypeHistoryById`, {id: this.item.f_security_check_type_id})
1583
- this.f_security_check_type_id = this.serverConfig.data.id
1584
- } catch (e) {
1585
- return this.$showMessage('获取配置文件失败,请返回后重新进入!多次失败请联系管理员')
1577
+ try {
1578
+ if (this.item.f_security_check_type_id && this.item.f_security_check_type_id != null) {
1579
+ await this.getSecurityCheckType(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getSecurityCheckTypeHistoryById`, {id: this.item.f_security_check_type_id})
1580
+ this.f_security_check_type_id = this.serverConfig.data.id
1581
+ this.config = this.extend(JSON.parse(this.serverConfig.data.f_json), this.config)
1582
+ this.initConfig()
1583
+ } else {
1584
+ await this.getSecurityCheckType(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getSecurityCheckTypeByType`, {
1585
+ f_safecheck_type: this.item.f_safecheck_type || '年度普检',
1586
+ f_user_type: this.item.f_user_type
1587
+ })
1588
+ this.f_security_check_type_id = this.serverConfig.data[0].id
1589
+ this.config = this.extend(JSON.parse(this.serverConfig.data[0].f_json), this.config)
1590
+ this.initConfig()
1586
1591
  }
1587
- this.config = this.extend(JSON.parse(this.serverConfig.data.f_json), this.config)
1592
+ }catch (e) {
1593
+ this.config = this.extend(JSON.parse(Vue.newConfig.data[0].f_json), this.config)
1588
1594
  this.initConfig()
1589
- } else {
1590
- try {
1591
- await this.getSecurityCheckType(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getSecurityCheckTypeByType`, {
1592
- f_safecheck_type: this.item.f_safecheck_type || '年度普检',
1593
- f_user_type: this.item.f_user_type
1594
- })
1595
- this.f_security_check_type_id = this.serverConfig.data[0].id
1596
- this.config = this.extend(JSON.parse(this.serverConfig.data[0].f_json), this.config)
1597
- this.initConfig()
1598
- } catch (e) {
1599
- return this.$showMessage('获取配置文件失败,请返回后重新进入!多次失败请联系管理员')
1600
- }
1595
+ console.log(('离线'))
1596
+ console.log(e)
1601
1597
  }
1602
1598
  }
1603
1599
  },
@@ -2186,9 +2182,12 @@ export default {
2186
2182
  }
2187
2183
  }
2188
2184
  }
2189
- if (item.f_items[i].f_item_value instanceof Array) {
2185
+ if (item.f_items[i].f_selected) {
2190
2186
  item.f_items[i].f_item_value = JSON.parse(item.f_items[i].f_selected)
2191
2187
  }
2188
+ if (item.f_items[i].f_item_lists.length > 0){
2189
+ item.f_items[i].f_item_value = item.f_items[i].f_item_lists[0].f_item_value
2190
+ }
2192
2191
  }
2193
2192
  for (let de in that.devices) {
2194
2193
  if (typeof that.devices[de] == 'function') {
@@ -0,0 +1,217 @@
1
+ <template>
2
+ <div>
3
+ <criteria-paged :model="model" v-ref:paged>
4
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
5
+ <div partial>
6
+ <ul class="nav nav-tabs">
7
+ <li role="presentation" class="active"><a style=" color: #5ac0d9 !important;">安检计划项明细</a></li>
8
+ </ul>
9
+ <div class="row">
10
+ <div class="form-group col-sm-4" >
11
+ <label class="font_normal_body">安检状态</label>
12
+ <v-select style="width:60% "
13
+ class="select select_list"
14
+ :value.sync="$parent.$parent.f_state"
15
+ v-model="$parent.$parent.f_state"
16
+ :options='$parent.$parent.checkState'
17
+ placeholder='安检状态'
18
+ close-on-select
19
+ value-single
20
+ >
21
+ </v-select>
22
+ </div>
23
+ <div class="form-group col-sm-4" >
24
+ <label class="font_normal_body">有无计划</label>
25
+ <v-select style="width:60% "
26
+ class="select select_list"
27
+ :value.sync="$parent.$parent.f_no_checkplan"
28
+ v-model="$parent.$parent.f_no_checkplan"
29
+ :options='$parent.$parent.no_checkplans'
30
+ placeholder='有无计划'
31
+ close-on-select
32
+ value-single
33
+ >
34
+ </v-select>
35
+ </div>
36
+ <div class="form-group col-sm-4" >
37
+ <label class="font_normal_body">入户状态</label>
38
+ <v-select style="width:60% "
39
+ class="select select_list"
40
+ :value.sync="$parent.$parent.f_last_check_state"
41
+ v-model="$parent.$parent.f_last_check_state"
42
+ :options='$parent.$parent.entry_status'
43
+ placeholder='入户状态'
44
+ close-on-select
45
+ value-single
46
+ >
47
+ </v-select>
48
+ </div>
49
+ <div class="form-group col-sm-4" >
50
+ <label class="font_normal_body">小区</label>
51
+ <input type="text" class="input_search"
52
+ v-model="$parent.$parent.f_residential_area"
53
+ style="width: 60%" placeholder="小区"
54
+ condition="f_residential_area like '%{}%'">
55
+ </div>
56
+ <div class="form-group col-sm-4" >
57
+ <label class="font_normal_body">楼号</label>
58
+ <input type="text" class="input_search"
59
+ v-model="$parent.$parent.f_building"
60
+ style="width: 60%" placeholder="楼号"
61
+ condition="f_building like '%{}%'">
62
+ </div>
63
+ <div class="form-group col-sm-4 button-range" >
64
+ <button class="button_search" style="margin-right: 10px" @click="search()">查询</button>
65
+ <export-excel :data="$parent.$parent.exportParameter"
66
+ :field="$parent.$parent.excelHeaders"
67
+ sqlurl="api/af-safecheck/logic/exportfile" sql-name="planItem"
68
+ template-name='安检计划明细' :choose-col="true">
69
+ </export-excel>
70
+ <!--<export-excel-->
71
+ <!--:data="{condition: $parent.$parent.condition}"-->
72
+ <!--:field="$parent.$parent.getfield"-->
73
+ <!--sqlurl="api/af-safecheck/logic/saleExport" sql-name="getGasUser" :template-name="$parent.$parent.pricename+'气价使用人'"-->
74
+ <!--:choose-col="true"></export-excel>-->
75
+
76
+ </div>
77
+ </div>
78
+ </div>
79
+ </criteria>
80
+ <data-grid :model="model" partial='list' class="table_sy">
81
+
82
+ <template partial='head'>
83
+ <tr>
84
+ <th><nobr>计划名称</nobr></th>
85
+ <th><nobr>用户编号</nobr></th>
86
+ <th><nobr>用户名称</nobr></th>
87
+ <th><nobr>小区名称</nobr></th>
88
+ <th><nobr>地址</nobr></th>
89
+ <th><nobr>安检状态</nobr></th>
90
+ <th><nobr>是否安检</nobr></th>
91
+ </tr>
92
+ </template>
93
+ <template partial='body'>
94
+ <td style="text-align: center"><nobr>{{row.f_plan_name}}</nobr></td>
95
+ <td style="text-align: center"><nobr>{{row.f_userinfo_code}}</nobr></td>
96
+ <td style="text-align: center"><nobr>{{row.f_user_name}}</nobr></td>
97
+ <td style="text-align: center"><nobr>{{row.f_residential_area}}</nobr></td>
98
+ <td style="text-align: center"><nobr>{{row.f_address}}</nobr></td>
99
+ <td style="text-align: center"><nobr>{{row.f_last_check_state}}</nobr></td>
100
+ <td style="text-align: center"><nobr>{{row.f_state}}</nobr></td>
101
+ </template>
102
+ </data-grid>
103
+ </criteria-paged>
104
+ </div>
105
+ </template>
106
+
107
+ <script>
108
+ import { PagedList } from 'vue-client'
109
+
110
+ export default {
111
+ title: '安检计划项列表',
112
+ data () {
113
+ return {
114
+ model: new PagedList('api/af-safecheck/sql/planItemNew', 20),
115
+ checkState:[{label:'全部',value:''},{label:'已检',value:'已检'},{label:'未检',value:'未检'}],
116
+ entry_status: this.$appdata.getParam('安检状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')]:[{label: '全部', value: ''}],
117
+ no_checkplans: this.$appdata.getParam('有无计划')?[{label: '全部', value: ''}, ...this.$appdata.getParam('有无计划')]:[{label: '全部', value: ''}],
118
+ noChecks:[{label:'未检',value:'未检'},{label:'到访不遇',value:'到访不遇'},{label:'拒检',value:'拒检'}],
119
+ excelHeaders: {
120
+ //用户编号 用户名称 用户电话 安检次数 用户类型 小区名称 地址 安检日期 安检状态 安检结果
121
+
122
+ 'f_userinfo_code': '用户编号',
123
+ 'f_user_name': '用户名称',
124
+ 'f_user_phone': '用户电话',
125
+ //'count_item':'安检次数',
126
+ 'f_user_type': '用户类型',
127
+ 'f_residential_area': '小区名称',
128
+ 'f_address':'地址',
129
+ 'f_last_check_date':'安检日期',
130
+ 'f_last_check_state': '安检状态',
131
+ 'f_state':'是否已检',
132
+ 'f_last_check_result':'安检结果'
133
+ },
134
+ area:[{label:'全部',value:''}],
135
+ f_state:'',
136
+ f_no_checkplan:'',
137
+ f_last_check_state:'',
138
+ f_noruhu:'',
139
+ f_residential_area:'',
140
+ f_building:'',
141
+ }
142
+ },
143
+ props: [ 'check','checkstatus','checkstart','checkend' ],
144
+ watch: {
145
+ 'check' (val) {
146
+ debugger
147
+ let condition
148
+ condition = `f_checker='${this.check.f_checker}'`
149
+ if(this.checkstart){
150
+ condition+= `and f_last_check_date>='${this.checkstart}'`
151
+ }
152
+ if (this.checkend){
153
+ condition += `and f_last_check_date<='${this.f_endcheckend_time}'`
154
+ }
155
+ this.f_noruhu=[]
156
+ this.f_state=''
157
+ this.model.search(condition, {})
158
+
159
+ }
160
+ },
161
+
162
+ ready () {
163
+ if (this.check) {
164
+ let condition
165
+ condition = `f_checker='${this.check.f_checker}'`
166
+ if(this.checkstart){
167
+ condition += `and f_last_check_date>='${this.checkstart}'`
168
+ }
169
+ if (this.checkend){
170
+ condition += ` and f_last_check_date<='${this.f_end_tcheckendime}'`
171
+ }
172
+ this.model.search(condition, {})
173
+ }
174
+ },
175
+ methods:{
176
+ selfSearch(args){
177
+ if (this.check) {
178
+ args.condition = `f_checker='${this.check.f_checker}'`
179
+ if(this.checkstart){
180
+ args.condition+= `and f_last_check_date>='${this.checkstart}'`
181
+ }
182
+ if (this.checkend){
183
+ args.condition += `and f_last_check_date<='${this.checkend}'`
184
+ }
185
+ if (this.f_residential_area){
186
+ args.condition += ` and i.f_residential_area like'%${this.f_residential_area}%'`
187
+ }
188
+ if (this.f_building){
189
+ args.condition += ` and i.f_building='${this.f_building}'`
190
+ }
191
+ if (this.f_state){
192
+ args.condition += ` and i.f_state='${this.f_state}'`
193
+ }
194
+ if (this.f_last_check_state){
195
+ args.condition += ` and i.f_last_check_state='${this.f_last_check_state}'`
196
+ }
197
+ if (this.f_no_checkplan){
198
+ if (this.f_no_checkplan == '有计划安检'){
199
+ args.condition += ` and i.f_plan_name != '无计划' `
200
+ }else {
201
+ args.condition += ` and i.f_plan_name = '无计划' `
202
+ }
203
+ }
204
+ this.model.search(args.condition, args.model)
205
+ }
206
+ }
207
+ },
208
+ computed: {
209
+ // 导出到Excel的条件构造
210
+ exportParameter() {
211
+ return {
212
+ condition: this.$refs.paged.model.condition
213
+ }
214
+ }
215
+ },
216
+ }
217
+ </script>
@@ -0,0 +1,52 @@
1
+ <template>
2
+ <div id="unit" class="flex-row" :class="{'binary':showItem}">
3
+ <div :class="{'basic-main':!showItem,'binary-left':showItem}" >
4
+ <select-check-plan-new @select-changed="selected" :style="style" :style2="style2" v-ref:check></select-check-plan-new>
5
+ </div>
6
+ <div class="binary-right" v-show="showItem">
7
+ <div class="flex">
8
+ <check-detail v-if='$refs.check && $refs.check.selected' :check='$refs.check.selected' :checkstart="$refs.check.f_start_time" :checkend="$refs.check.f_end_time"
9
+ v-ref:detail></check-detail>
10
+ </div>
11
+ </div>
12
+ </div>
13
+ </template>
14
+ <script>
15
+ import SelectCheckPlanNew from '../pc/SelectCheckPlan.vue'
16
+ import CheckDetail from '../pc/CheckDetail.vue'
17
+ export default {
18
+ title: '安检员考核',
19
+ props: ['f'],
20
+ components: {SelectCheckPlanNew, CheckDetail},
21
+ data() {
22
+ return {
23
+ showItem: false,
24
+ checkstatus: null,
25
+ style:'col-sm-2 form-group',
26
+ style2:'col-sm-4 form-group'
27
+ }
28
+ },
29
+ methods: {
30
+ selected(row) {
31
+ this.showItem = true
32
+ },
33
+ checkstatusChange(val){
34
+ this.checkstatus = val
35
+ }
36
+ }
37
+ }
38
+ </script>
39
+ <style>
40
+ .form-input-group label {
41
+ text-align: right;
42
+ width: auto;
43
+ }
44
+
45
+ .datapanel {
46
+ color: #333;
47
+ background-color: white;
48
+ box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
49
+ padding: 5px 7px 5px 7px;
50
+ border-radius: 10px;
51
+ }
52
+ </style>