sale-client 3.6.168 → 3.6.169
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.
package/package.json
CHANGED
|
@@ -306,6 +306,7 @@
|
|
|
306
306
|
v-model="row.f_hand_date"
|
|
307
307
|
:value.sync="row.f_hand_date"
|
|
308
308
|
:format="'yyyy-MM-dd HH:mm:ss'"
|
|
309
|
+
@change="$parent.$parent.$parent.valueChange(row.f_hand_date, row)"
|
|
309
310
|
:show-reset-button="true">
|
|
310
311
|
</datepicker>
|
|
311
312
|
</div>
|
|
@@ -342,6 +343,7 @@
|
|
|
342
343
|
width="100%"
|
|
343
344
|
:value-single="true"
|
|
344
345
|
close-on-select
|
|
346
|
+
@change="$parent.$parent.$parent.valueChange(row.f_result_state, row)"
|
|
345
347
|
condition="f_adjustable_name = '{}'"></v-select>
|
|
346
348
|
<!-- <span id="inputError2Status" class="sr-only">(error)</span> -->
|
|
347
349
|
</div>
|
|
@@ -359,6 +361,7 @@
|
|
|
359
361
|
<input type="text" class="form-control" v-model="row.f_instantaneous_flow"
|
|
360
362
|
v-next-el="{id: $index+1}" :id="$index" style="width: 100px;padding: 6px;"
|
|
361
363
|
:disabled="row.state === '开始'"
|
|
364
|
+
@blur="$parent.$parent.$parent.enter(row)"
|
|
362
365
|
>
|
|
363
366
|
</div>
|
|
364
367
|
<div v-else>
|
|
@@ -372,6 +375,7 @@
|
|
|
372
375
|
<input type="text" class="form-control" v-model="row.f_pressure"
|
|
373
376
|
v-next-el="{id: $index+1}" :id="$index" style="width: 100px;padding: 6px;"
|
|
374
377
|
:disabled="row.state === '开始'"
|
|
378
|
+
@blur="$parent.$parent.$parent.enter(row)"
|
|
375
379
|
>
|
|
376
380
|
</div>
|
|
377
381
|
<div v-else>
|
|
@@ -385,6 +389,7 @@
|
|
|
385
389
|
<input type="text" class="form-control" v-model="row.f_temperature"
|
|
386
390
|
v-next-el="{id: $index+1}" :id="$index" style="width: 100px;padding: 6px;"
|
|
387
391
|
:disabled="row.state === '开始'"
|
|
392
|
+
@blur="$parent.$parent.$parent.enter(row)"
|
|
388
393
|
>
|
|
389
394
|
</div>
|
|
390
395
|
<div v-else>
|
|
@@ -392,7 +397,18 @@
|
|
|
392
397
|
</div>
|
|
393
398
|
</td>
|
|
394
399
|
<td style="text-align: center;">
|
|
395
|
-
<nobr>{{row.
|
|
400
|
+
<!-- <nobr>{{row.f_temperature}}</nobr>-->
|
|
401
|
+
<div class="form-group" style="margin-bottom:0px;"
|
|
402
|
+
v-if="row.f_meter_state === '未抄表' ">
|
|
403
|
+
<input type="text" class="form-control" v-model="row.f_flowmeter_capacity"
|
|
404
|
+
v-next-el="{id: $index+1}" :id="$index" style="width: 100px;padding: 6px;"
|
|
405
|
+
:disabled="row.state === '开始'"
|
|
406
|
+
@blur="$parent.$parent.$parent.enter(row)"
|
|
407
|
+
>
|
|
408
|
+
</div>
|
|
409
|
+
<div v-else>
|
|
410
|
+
<span >{{ row.f_flowmeter_capacity }}</span>
|
|
411
|
+
</div>
|
|
396
412
|
</td>
|
|
397
413
|
<td style="text-align: center;">
|
|
398
414
|
<!-- <nobr>{{row.f_controller_power}}</nobr>-->
|
|
@@ -401,6 +417,7 @@
|
|
|
401
417
|
<input type="text" class="form-control" v-model="row.f_controller_power"
|
|
402
418
|
v-next-el="{id: $index+1}" :id="$index" style="width: 100px;padding: 6px;"
|
|
403
419
|
:disabled="row.state === '开始'"
|
|
420
|
+
@blur="$parent.$parent.$parent.enter(row)"
|
|
404
421
|
>
|
|
405
422
|
</div>
|
|
406
423
|
<div v-else>
|
|
@@ -415,6 +432,7 @@
|
|
|
415
432
|
:options='$parent.$parent.$parent.valve_switch' placeholder='阀门开关'
|
|
416
433
|
width="100%"
|
|
417
434
|
:value-single="true"
|
|
435
|
+
@change="$parent.$parent.$parent.valueChange(row.f_valve_switch, row)"
|
|
418
436
|
close-on-select
|
|
419
437
|
></v-select>
|
|
420
438
|
<!-- <span id="inputError2Status" class="sr-only">(error)</span> -->
|
|
@@ -569,6 +587,12 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
|
569
587
|
loadParamGem(this)
|
|
570
588
|
},
|
|
571
589
|
methods: {
|
|
590
|
+
valueChange (value, row) {
|
|
591
|
+
console.log('value=================>', value)
|
|
592
|
+
if (value) {
|
|
593
|
+
this.enter(row)
|
|
594
|
+
}
|
|
595
|
+
},
|
|
572
596
|
hidden () {
|
|
573
597
|
this.criteriaShow = !this.criteriaShow
|
|
574
598
|
},
|
|
@@ -666,6 +690,11 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
|
666
690
|
this.$refs.paged.$refs.criteria.search()
|
|
667
691
|
},
|
|
668
692
|
enter (row) {
|
|
693
|
+
if (!row.f_result_state || !row.f_valve_switch || !row.f_controller_power ||
|
|
694
|
+
!row.f_flowmeter_capacity || !row.f_temperature || !row.f_pressure ||
|
|
695
|
+
!row.f_instantaneous_flow || !row.f_hand_date || !row.f_tablebase) {
|
|
696
|
+
return
|
|
697
|
+
}
|
|
669
698
|
if (!row.f_tablebase || ((row.f_tablebase - 0) - (row.f_last_tablebase - 0)).toFixed(2) < 0) {
|
|
670
699
|
return
|
|
671
700
|
}
|