safecheck-client 4.0.0-85 → 4.0.0-86

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 (5) hide show
  1. package/package.json +1 -1
  2. package/src/filiale/meihekou/android/AreaPlan.vue +10 -4
  3. package/src/filiale/meihekou/android/CurrentCreate.vue +10 -5
  4. package/src/filiale/meihekou/android/SafecheckOrderV.vue +1 -1
  5. package/src/filiale/meihekou/android/SafecheckUserInfo.vue +1 -3
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "safecheck-client",
3
3
  "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
4
- "version": "4.0.0-85",
4
+ "version": "4.0.0-86",
5
5
  "description": "安检模块 前端组件",
6
6
  "author": "丁新 <417755458@qq.com>",
7
7
  "license": "ISC",
package/src/filiale/meihekou/android/AreaPlan.vue CHANGED
@@ -310,7 +310,7 @@
310
310
  <div partial>
311
311
  <div @click="$parent.$parent.$parent.inspect(row)" class="auto app-text" style="margin-top: 5px;">
312
312
  <div class="panel" style="padding: 10px 10px 5px 10px;">
313
- <div class="panel-body panel-self">
313
+ <div class="panel-body panel-self" :style="{ backgroundColor: $parent.$parent.$parent.getLastCheckStateStyle(row.f_last_check_state) }">
314
314
  <div class="col-xs-12">
315
315
  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户编号:</b></p>
316
316
  <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{ row.f_userinfo_code }}</p>
@@ -340,9 +340,7 @@
340
340
  </div>
341
341
  <div class="col-xs-6">
342
342
  <p class="panel-title col-xs-5 text-left font"><b>安检状态:</b></p>
343
- <p class="panel-title col-xs-8 text-left input-font" v-if="row.f_last_check_state=='入户'" style="color: orange">{{ row.f_last_check_state }}</p>
344
- <p class="panel-title col-xs-8 text-left input-font" v-if="row.f_last_check_state=='拒检'" style="color:red">{{ row.f_last_check_state }}</p>
345
- <p class="panel-title col-xs-8 text-left input-font" v-if="row.f_last_check_state=='到访不遇'" style="color:lightpink">{{ row.f_last_check_state }}</p>
343
+ <p class="panel-title col-xs-8 text-left input-font" >{{ row.f_last_check_state }}</p>
346
344
  </div>
347
345
  <div class="col-xs-6">
348
346
  <p class="panel-title col-xs-5 text-left font"><b>上传状态:</b></p>
@@ -461,6 +459,14 @@
461
459
  this.$refs.paged.$refs.cri.model.f_approved = '不通过'
462
460
  },
463
461
  methods: {
462
+ getLastCheckStateStyle(state){
463
+ switch(state) {
464
+ case '入户': return '#00ff71'
465
+ case '拒检': return '#00f3ff'
466
+ case '到访不遇': return '#fff600'
467
+ default: return 'transparent'
468
+ }
469
+ },
464
470
  refresh() {
465
471
  //tag
466
472
  // hard code relationship
package/src/filiale/meihekou/android/CurrentCreate.vue CHANGED
@@ -250,8 +250,7 @@
250
250
  <div partial>
251
251
  <div class="auto app-text" style="margin-top: 5px;">
252
252
  <div class="panel" style="padding: 10px 10px 5px 10px;">
253
- <div class="panel-body panel-self">
254
-
253
+ <div class="panel-body panel-self" :style="{ backgroundColor: $parent.$parent.$parent.getLastCheckStateStyle(row.f_last_check_state) }">
255
254
  <div class="col-xs-12">
256
255
  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户编号:</b></p>
257
256
  <p class="panel-title col-xs-5 text-left input-font" style="width: 74%">{{ row.f_userinfo_code }}</p>
@@ -317,9 +316,7 @@
317
316
  <!-- </div>-->
318
317
  <div class="row">
319
318
  <p class="panel-title col-xs-4 text-left font"><b>上次安检状态:</b></p>
320
- <p class="panel-title col-xs-8 text-left input-font" v-if="row.f_last_check_state=='入户'" style="color: orange">{{ row.f_last_check_state }}</p>
321
- <p class="panel-title col-xs-8 text-left input-font" v-if="row.f_last_check_state=='拒检'" style="color:red">{{ row.f_last_check_state }}</p>
322
- <p class="panel-title col-xs-8 text-left input-font" v-if="row.f_last_check_state=='到访不遇'" style="color:lightpink">{{ row.f_last_check_state }}</p>
319
+ <p class="panel-title col-xs-8 text-left input-font" v-if="row.f_last_check_state=='入户'" >{{ row.f_last_check_state }}</p>
323
320
  </div>
324
321
  <div class="col-xs-6">
325
322
  <p class="panel-title col-xs-5 text-left font"><b>安检状态:</b></p>
@@ -603,6 +600,14 @@ export default {
603
600
  window.removeEventListener('popstate', this.fun, false);//false阻止默认事件
604
601
  },
605
602
  methods: {
603
+ getLastCheckStateStyle(state){
604
+ switch(state) {
605
+ case '入户': return '#00ff71'
606
+ case '拒检': return '#00f3ff'
607
+ case '到访不遇': return '#fff600'
608
+ default: return 'transparent'
609
+ }
610
+ },
606
611
  scan(){
607
612
  HostApp.__this__=this,
608
613
  HostApp.scanCode({callback:"javascript:HostApp.__this__.getCode();"})
package/src/filiale/meihekou/android/SafecheckOrderV.vue CHANGED
@@ -1406,7 +1406,7 @@ export default {
1406
1406
  })
1407
1407
  }
1408
1408
  })
1409
- }{
1409
+ }else{
1410
1410
  this.$dispatch('tijiao')
1411
1411
  }
1412
1412
  }
package/src/filiale/meihekou/android/SafecheckUserInfo.vue CHANGED
@@ -198,9 +198,7 @@
198
198
  </div>
199
199
  <div class="row">
200
200
  <p class="panel-title col-xs-4 text-left font">上次安检状态</p>
201
- <p class="panel-title col-xs-8 text-left input-font" v-if="last_check_date != null && last_check_date != '' && last_check_state=='入户'" style="color: orange">{{ last_check_state }}</p>
202
- <p class="panel-title col-xs-8 text-left input-font" v-if="last_check_date != null && last_check_date != '' && last_check_state=='拒检'" style="color:red">{{ last_check_state }}</p>
203
- <p class="panel-title col-xs-8 text-left input-font" v-if="last_check_date != null && last_check_date != '' && last_check_state=='到访不遇'" style="color:lightpink">{{ last_check_state }}</p>
201
+ <p class="panel-title col-xs-8 text-left input-font" v-if="last_check_date != null && last_check_date != ''" >{{ last_check_state }}</p>
204
202
  <p class="panel-title col-xs-8 text-left input-font" v-if="last_check_date == null || last_check_date == ''">未安检</p>
205
203
  </div>
206
204
  <div class="row" v-if="last_check_date != null && last_check_date != ''">