safecheck-client 3.0.32-12 → 3.0.32-14

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.
@@ -118,7 +118,7 @@
118
118
  <input type="text"
119
119
  class="search_input input-font"
120
120
  v-model="model.f_floor"
121
- condition="f_userinfo_code like '%{}%'"
121
+ condition="f_floor like '%{}%'"
122
122
  placeholder="请输入楼层"/>
123
123
  </div>
124
124
  </div>
@@ -105,9 +105,9 @@
105
105
  </v-select>
106
106
  </div>
107
107
  <div :class="$parent.$parent.style">
108
- <label class="font_normal_body">安检起始时间</label>
108
+ <label class="font_normal_body">起始时间</label>
109
109
  <datepicker
110
- placeholder='安检起始时间' style="width:60%"
110
+ placeholder='起始时间' style="width:60%"
111
111
  :disabled-days-of-week="[]"
112
112
  :format="'yyyy-MM-dd'"
113
113
  :show-rest-button="reset"
@@ -117,9 +117,9 @@
117
117
  </datepicker>
118
118
  </div>
119
119
  <div :class="$parent.$parent.style">
120
- <label class="font_normal_body">安检结束时间</label>
120
+ <label class="font_normal_body">结束时间</label>
121
121
  <datepicker
122
- placeholder='安检结束时间' style="width:60%"
122
+ placeholder='结束时间' style="width:60%"
123
123
  :disabled-days-of-week="[]"
124
124
  :format="'yyyy-MM-dd'"
125
125
  :show-rest-button="reset"
@@ -326,9 +326,9 @@
326
326
  </v-select>
327
327
  </div>
328
328
  <div :class="$parent.$parent.style">
329
- <label class="font_normal_body">安检起始时间</label>
329
+ <label class="font_normal_body">起始时间</label>
330
330
  <datepicker
331
- placeholder='安检起始时间' style="width:60%"
331
+ placeholder='起始时间' style="width:60%"
332
332
  :disabled-days-of-week="[]"
333
333
  :format="'yyyy-MM-dd'"
334
334
  :show-rest-button="reset"
@@ -338,9 +338,9 @@
338
338
  </datepicker>
339
339
  </div>
340
340
  <div :class="$parent.$parent.style">
341
- <label class="font_normal_body">安检结束时间</label>
341
+ <label class="font_normal_body">结束时间</label>
342
342
  <datepicker
343
- placeholder='安检结束时间' style="width:60%"
343
+ placeholder='结束时间' style="width:60%"
344
344
  :disabled-days-of-week="[]"
345
345
  :format="'yyyy-MM-dd'"
346
346
  :show-rest-button="reset"
@@ -57,11 +57,11 @@ div {
57
57
  <div @click="back()">
58
58
  <img src="../../../assets/back.png" style="margin: 0px"/>
59
59
  </div>
60
- <div @click="updateSpotCheck('合格')">
61
- 合格
60
+ <div>
61
+ <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;" @click="updateSpotCheck('合格')">合格</button>
62
62
  </div>
63
- <div @click="NoSpotCheck()">
64
- 不合格
63
+ <div @click="NoSpotCheck" style="color:black">
64
+ <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;" @click="NoSpotCheck">不合格</button>
65
65
  </div>
66
66
  </div>
67
67
  <work-busy :is-busy="loading"></work-busy>
@@ -373,6 +373,7 @@ div {
373
373
  <article slot="modal-body" class="modal-body">
374
374
  <div class="from-group">
375
375
  <div class="row">
376
+ <lable>抽检不合格原因</lable>
376
377
  <textarea v-model="spotCheckMessage"></textarea>
377
378
  </div>
378
379
  </div>
@@ -588,7 +589,7 @@ export default {
588
589
  updateSpotCheck(value) {
589
590
  var reqData = {
590
591
  paperId:this.item.id,
591
- userName: Vue.user.name,
592
+ userName: this.$login.f.name,
592
593
  spotCheckState: '已抽检',
593
594
  spotCheckResult: value,
594
595
  spotCheckMessage:this.spotCheckMessage
@@ -101,9 +101,9 @@
101
101
  </v-select>
102
102
  </div>
103
103
  <div :class="$parent.$parent.style">
104
- <label class="font_normal_body">起始时间</label>
104
+ <label class="font_normal_body">安检起始时间</label>
105
105
  <datepicker
106
- placeholder='起始时间' style="width:60%"
106
+ placeholder='安检起始时间' style="width:60%"
107
107
  :disabled-days-of-week="[]"
108
108
  :format="'yyyy-MM-dd'"
109
109
  :show-rest-button="reset"
@@ -113,9 +113,9 @@
113
113
  </datepicker>
114
114
  </div>
115
115
  <div :class="$parent.$parent.style">
116
- <label class="font_normal_body">结束时间</label>
116
+ <label class="font_normal_body">安检结束时间</label>
117
117
  <datepicker
118
- placeholder='结束时间' style="width:60%"
118
+ placeholder='安检结束时间' style="width:60%"
119
119
  :disabled-days-of-week="[]"
120
120
  :format="'yyyy-MM-dd'"
121
121
  :show-rest-button="reset"
@@ -300,9 +300,9 @@
300
300
  </v-select>
301
301
  </div>
302
302
  <div :class="$parent.$parent.style">
303
- <label class="font_normal_body">起始时间</label>
303
+ <label class="font_normal_body">安检起始时间</label>
304
304
  <datepicker
305
- placeholder='起始时间' style="width:60%"
305
+ placeholder='安检起始时间' style="width:60%"
306
306
  :disabled-days-of-week="[]"
307
307
  :format="'yyyy-MM-dd'"
308
308
  :show-rest-button="reset"
@@ -312,9 +312,9 @@
312
312
  </datepicker>
313
313
  </div>
314
314
  <div :class="$parent.$parent.style">
315
- <label class="font_normal_body">结束时间</label>
315
+ <label class="font_normal_body">安检结束时间</label>
316
316
  <datepicker
317
- placeholder='结束时间' style="width:60%"
317
+ placeholder='安检结束时间' style="width:60%"
318
318
  :disabled-days-of-week="[]"
319
319
  :format="'yyyy-MM-dd'"
320
320
  :show-rest-button="reset"