sale-client 3.5.111 → 3.5.113
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/.babelrc +5 -5
- package/package.json +2 -2
- package/src/filiale/alashan/UserDeviceInfoTest.vue +1 -30
- package/src/filiale/chengtou/plugins/FileManageService.js +1 -1
- package/src/filiale/dongguan/components/BasicLiving.vue +1 -1
- package/src/filiale/dongguan/components/meterinfodetail.vue +0 -4
- package/src/filiale/tongchuan/ChargeList.vue +1 -1
- package/src/filiale/tongchuan/common/userinfo_detail/iot_detail/WatchCollection.vue +115 -115
- package/src/filiale/zhongyi/FileUserFiles.vue +1 -1
- package/src/filiale/zhongyi/MeterReadAudit.vue +9 -6
- package/.gradle/3.5.1/file-changes/last-build.bin +0 -0
- package/.gradle/3.5.1/taskHistory/taskHistory.lock +0 -0
- package/.gradle/buildOutputCleanup/built.bin +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +0 -2
- package/.gradle/buildOutputCleanup/cache.properties.lock +0 -1
package/.babelrc
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
{
|
|
2
|
-
"presets": ["es2015", "stage-2"],
|
|
3
|
-
"plugins": ["transform-runtime"],
|
|
4
|
-
"comments": false
|
|
5
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"presets": ["es2015", "stage-2"],
|
|
3
|
+
"plugins": ["transform-runtime"],
|
|
4
|
+
"comments": false
|
|
5
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sale-client",
|
|
3
|
-
"version": "3.5.
|
|
3
|
+
"version": "3.5.113",
|
|
4
4
|
"description": "收费模块前台组件",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -88,7 +88,7 @@
|
|
|
88
88
|
"style-loader": "^0.20.3",
|
|
89
89
|
"system-clients": "3.2.25",
|
|
90
90
|
"url-loader": "^0.5.7",
|
|
91
|
-
"vue-client": "1.24.
|
|
91
|
+
"vue-client": "1.24.73",
|
|
92
92
|
"vue-clipboard2": "0.3.1",
|
|
93
93
|
"vue-hot-reload-api": "^1.2.0",
|
|
94
94
|
"vue-html-loader": "^1.0.0",
|
|
@@ -326,36 +326,7 @@ export default {
|
|
|
326
326
|
})
|
|
327
327
|
},
|
|
328
328
|
closeModal () {
|
|
329
|
-
|
|
330
|
-
let deleteData = []
|
|
331
|
-
for (let [index, row] of this.devicesinfo.entries()) {
|
|
332
|
-
switch (row.f_devices_type) {
|
|
333
|
-
case '壁挂炉':
|
|
334
|
-
if (!(row.f_brand && row.f_input_person && row.f_input_date && row.watchpurchase)) {
|
|
335
|
-
deleteData.push(index)
|
|
336
|
-
cannotclose = true
|
|
337
|
-
}
|
|
338
|
-
break
|
|
339
|
-
case '热水器':
|
|
340
|
-
if (!(row.f_brand)) {
|
|
341
|
-
deleteData.push(index)
|
|
342
|
-
cannotclose = true
|
|
343
|
-
}
|
|
344
|
-
break
|
|
345
|
-
}
|
|
346
|
-
}
|
|
347
|
-
if (cannotclose) {
|
|
348
|
-
this.$showMessage('新增设备有必填项没有填写，如果此时退出当前页面数据会丢失，请确定是否退出？', ['confirm', 'cancel']).then(async (res) => {
|
|
349
|
-
if (res === 'confirm') {
|
|
350
|
-
for (let i = deleteData.length - 1; i >= 0; i--) {
|
|
351
|
-
this.devicesinfo.splice(deleteData[i], 1)
|
|
352
|
-
}
|
|
353
|
-
this.show_devices = false
|
|
354
|
-
}
|
|
355
|
-
})
|
|
356
|
-
} else {
|
|
357
|
-
this.show_devices = false
|
|
358
|
-
}
|
|
329
|
+
this.show_devices = false
|
|
359
330
|
}
|
|
360
331
|
}
|
|
361
332
|
}
|
|
@@ -203,7 +203,7 @@ let FileManageService = {
|
|
|
203
203
|
meter.f_adjustable_id = meter.f_adjustable.length > 0 ? meter.f_adjustable[0].id : null
|
|
204
204
|
meter.f_userfiles_address = meter.f_userfiles_address ? meter.f_userfiles_address : null
|
|
205
205
|
// 气表状态需要根据表型判断是否需要开通操作 目前物联网表需要做开通操作
|
|
206
|
-
meter.f_table_state = result.f_user_state === '预备'
|
|
206
|
+
meter.f_table_state = result.f_user_state === '预备' ? '待开通' : '正常'
|
|
207
207
|
if (!meter.f_userfiles_id) {
|
|
208
208
|
// meter.f_whether_hairpin = !item.gasbrand[0].f_meter_type.includes('机表') ? '未发' : '无卡'
|
|
209
209
|
// 所有表变成未发
|
|
@@ -249,7 +249,7 @@
|
|
|
249
249
|
f_price_id: this.model.f_price_id,
|
|
250
250
|
f_price_name: this.model.f_price_name
|
|
251
251
|
}
|
|
252
|
-
let res =await this.$resetpost('rs/logic/
|
|
252
|
+
let res =await this.$resetpost('rs/logic/stopBasicLiving', {data: data},{resolveMsg: null, rejectMsg: null})
|
|
253
253
|
this.initModel()
|
|
254
254
|
this.$dispatch('success','isBasicLiving')
|
|
255
255
|
}else {
|
|
@@ -37,10 +37,6 @@
|
|
|
37
37
|
<label class = "col-sm-5 " style="color: brown">表上余量</label>
|
|
38
38
|
<span class = "col-sm-7" style="color: brown">{{data?data.f_jval:dafault.f_jval}}</span>
|
|
39
39
|
</div>
|
|
40
|
-
<div class="row">
|
|
41
|
-
<label class = "col-sm-5 " >初始表底数</label>
|
|
42
|
-
<span class = "col-sm-7" >{{data?data.f_initial_base:dafault.f_initial_base}}</span>
|
|
43
|
-
</div>
|
|
44
40
|
<div class="row">
|
|
45
41
|
<label class = "col-sm-5 " >表当前底数</label>
|
|
46
42
|
<span class = "col-sm-7" >{{data?data.f_meter_base:dafault.f_meter_base}}</span>
|
|
@@ -782,7 +782,7 @@
|
|
|
782
782
|
return
|
|
783
783
|
}
|
|
784
784
|
if (this.f_orgid) {
|
|
785
|
-
args.condition = `u.
|
|
785
|
+
args.condition = `u.f_orgid in ${this.f_orgid} and ${args.condition}`
|
|
786
786
|
}
|
|
787
787
|
this.excelCondition = args.condition
|
|
788
788
|
args.condition = `${args.condition}`
|
|
@@ -1,115 +1,115 @@
|
|
|
1
|
-
<template >
|
|
2
|
-
<div id="stand-work-list" >
|
|
3
|
-
<div @keyup.enter="search" class="span">
|
|
4
|
-
<criteria-paged :model="model" v-ref:paged>
|
|
5
|
-
<criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
|
|
6
|
-
<div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
|
|
7
|
-
<div class="row">
|
|
8
|
-
|
|
9
|
-
<div class="col-sm-2 form-group ">
|
|
10
|
-
<label class="font_normal_body">上报时间</label>
|
|
11
|
-
<datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_start_date"
|
|
12
|
-
class="datepicker"
|
|
13
|
-
condition="m.f_hand_date >= '{}'"
|
|
14
|
-
placeholder="大于等于"
|
|
15
|
-
style="width: 60%"
|
|
16
|
-
v-model="model.f_start_date"
|
|
17
|
-
></datepicker>
|
|
18
|
-
</div>
|
|
19
|
-
<div class="col-sm-2 form-group " >
|
|
20
|
-
<label class="font_normal_body"> 至</label>
|
|
21
|
-
<datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_end_date"
|
|
22
|
-
class="datepicker"
|
|
23
|
-
condition="m.f_hand_date <= '{}'"
|
|
24
|
-
placeholder="小于等于"
|
|
25
|
-
style="width: 60%"
|
|
26
|
-
v-model="model.f_end_date"
|
|
27
|
-
></datepicker>
|
|
28
|
-
</div>
|
|
29
|
-
<div style="float: right">
|
|
30
|
-
<button @click="search()" class="button_search" v-el:cba>查询</button>
|
|
31
|
-
</div>
|
|
32
|
-
</div>
|
|
33
|
-
|
|
34
|
-
</div>
|
|
35
|
-
</criteria>
|
|
36
|
-
<data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
|
|
37
|
-
<template partial='head'>
|
|
38
|
-
<tr>
|
|
39
|
-
<th><nobr>上报日期</nobr></th>
|
|
40
|
-
<th><nobr>表内剩余金额</nobr></th>
|
|
41
|
-
<th><nobr>本次抄表底数</nobr></th>
|
|
42
|
-
<th><nobr>阀门状态</nobr></th>
|
|
43
|
-
<th><nobr>上报类型</nobr></th>
|
|
44
|
-
<th><nobr>系统接收时间</nobr></th>
|
|
45
|
-
<th><nobr>表内累计充值金额</nobr></th>
|
|
46
|
-
<th><nobr>噪音强度</nobr></th>
|
|
47
|
-
<th><nobr>信噪比</nobr></th>
|
|
48
|
-
<th><nobr>电压</nobr></th>
|
|
49
|
-
<th><nobr>电压状态</nobr></th>
|
|
50
|
-
<th><nobr>阀门强制状态</nobr></th>
|
|
51
|
-
<!-- <th><nobr>计量类型</nobr></th>-->
|
|
52
|
-
<!-- <th><nobr>金额状态</nobr></th>-->
|
|
53
|
-
|
|
54
|
-
<th><nobr>磁干扰异常</nobr></th>
|
|
55
|
-
<th><nobr>补偿状态</nobr></th>
|
|
56
|
-
</tr>
|
|
57
|
-
</template>
|
|
58
|
-
<template partial='body' partial='list'>
|
|
59
|
-
<tr >
|
|
60
|
-
<td style="text-align:center"><nobr>{{row.f_hand_date}}</nobr></td>
|
|
61
|
-
<th style="text-align:center"><nobr>{{row.f_meterbalanceamt}}</nobr></th>
|
|
62
|
-
<th style="text-align:center"><nobr>{{row.f_tablebase}}</nobr></th>
|
|
63
|
-
<th style="text-align:center"><nobr>{{row.f_valvestate == 0 ? '开阀' : '关阀'}}</nobr></th>
|
|
64
|
-
<th style="text-align:center"><nobr>{{row.f_upload_type}}</nobr></th>
|
|
65
|
-
<th style="text-align:center"><nobr>{{row.f_insert_date}}</nobr></th>
|
|
66
|
-
<th style="text-align:center"><nobr>{{row.f_meterdebitamt}}</nobr></th>
|
|
67
|
-
<th style="text-align:center"><nobr>{{row.f_signal}}</nobr></th>
|
|
68
|
-
<th style="text-align:center"><nobr>{{row.f_snr}}</nobr></th>
|
|
69
|
-
<th style="text-align:center"><nobr>{{row.f_batterylevel}}</nobr></th>
|
|
70
|
-
<th style="text-align:center"><nobr>{{row.f_lowlithiumbattery ? ((row.f_lowlithiumbattery - 0) == 0 ? '正常' : '异常') : '未知'}}</nobr></th>
|
|
71
|
-
<th style="text-align:center"><nobr>{{row.f_networkshutvalve}}</nobr></th>
|
|
72
|
-
<!-- <th style="text-align:center"><nobr>{{row.f_wmprepaytype}}</nobr></th>-->
|
|
73
|
-
<!-- <th style="text-align:center"><nobr>{{row.f_moneystate}}</nobr></th>-->
|
|
74
|
-
<th style="text-align:center"><nobr>{{row.f_magneticInterference}}</nobr></th>
|
|
75
|
-
<th style="text-align:center"><nobr>{{row.f_compensateState}}</nobr></th>
|
|
76
|
-
</tr>
|
|
77
|
-
</template>
|
|
78
|
-
<template partial='foot'></template>
|
|
79
|
-
</data-grid>
|
|
80
|
-
</criteria-paged>
|
|
81
|
-
</div>
|
|
82
|
-
</div>
|
|
83
|
-
</template>
|
|
84
|
-
|
|
85
|
-
<script>
|
|
86
|
-
import {PagedList} from 'vue-client'
|
|
87
|
-
|
|
88
|
-
export default {
|
|
89
|
-
title: 'WatchCollection',
|
|
90
|
-
data () {
|
|
91
|
-
return {
|
|
92
|
-
model: new PagedList('rs/sql/iot_getNewLoseUserQuery', 50)
|
|
93
|
-
}
|
|
94
|
-
},
|
|
95
|
-
props: ['row'],
|
|
96
|
-
ready () {
|
|
97
|
-
this.$refs.paged.$refs.criteria.search()
|
|
98
|
-
},
|
|
99
|
-
methods: {
|
|
100
|
-
search (args) {
|
|
101
|
-
args.condition = `${args.condition} and f_userfiles_id='${this.row.f_userfiles_id}'`
|
|
102
|
-
this.model.search(args.condition, args.model)
|
|
103
|
-
}
|
|
104
|
-
},
|
|
105
|
-
watch: {
|
|
106
|
-
// 监听查询对象
|
|
107
|
-
'row' (val) {
|
|
108
|
-
if (this.row != null) {
|
|
109
|
-
this.$refs.paged.$refs.criteria.search()
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
</script>
|
|
115
|
-
|
|
1
|
+
<template >
|
|
2
|
+
<div id="stand-work-list" >
|
|
3
|
+
<div @keyup.enter="search" class="span">
|
|
4
|
+
<criteria-paged :model="model" v-ref:paged>
|
|
5
|
+
<criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
|
|
6
|
+
<div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
|
|
7
|
+
<div class="row">
|
|
8
|
+
|
|
9
|
+
<div class="col-sm-2 form-group ">
|
|
10
|
+
<label class="font_normal_body">上报时间</label>
|
|
11
|
+
<datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_start_date"
|
|
12
|
+
class="datepicker"
|
|
13
|
+
condition="m.f_hand_date >= '{}'"
|
|
14
|
+
placeholder="大于等于"
|
|
15
|
+
style="width: 60%"
|
|
16
|
+
v-model="model.f_start_date"
|
|
17
|
+
></datepicker>
|
|
18
|
+
</div>
|
|
19
|
+
<div class="col-sm-2 form-group " >
|
|
20
|
+
<label class="font_normal_body"> 至</label>
|
|
21
|
+
<datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_end_date"
|
|
22
|
+
class="datepicker"
|
|
23
|
+
condition="m.f_hand_date <= '{}'"
|
|
24
|
+
placeholder="小于等于"
|
|
25
|
+
style="width: 60%"
|
|
26
|
+
v-model="model.f_end_date"
|
|
27
|
+
></datepicker>
|
|
28
|
+
</div>
|
|
29
|
+
<div style="float: right">
|
|
30
|
+
<button @click="search()" class="button_search" v-el:cba>查询</button>
|
|
31
|
+
</div>
|
|
32
|
+
</div>
|
|
33
|
+
|
|
34
|
+
</div>
|
|
35
|
+
</criteria>
|
|
36
|
+
<data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
|
|
37
|
+
<template partial='head'>
|
|
38
|
+
<tr>
|
|
39
|
+
<th><nobr>上报日期</nobr></th>
|
|
40
|
+
<th><nobr>表内剩余金额</nobr></th>
|
|
41
|
+
<th><nobr>本次抄表底数</nobr></th>
|
|
42
|
+
<th><nobr>阀门状态</nobr></th>
|
|
43
|
+
<th><nobr>上报类型</nobr></th>
|
|
44
|
+
<th><nobr>系统接收时间</nobr></th>
|
|
45
|
+
<th><nobr>表内累计充值金额</nobr></th>
|
|
46
|
+
<th><nobr>噪音强度</nobr></th>
|
|
47
|
+
<th><nobr>信噪比</nobr></th>
|
|
48
|
+
<th><nobr>电压</nobr></th>
|
|
49
|
+
<th><nobr>电压状态</nobr></th>
|
|
50
|
+
<th><nobr>阀门强制状态</nobr></th>
|
|
51
|
+
<!-- <th><nobr>计量类型</nobr></th>-->
|
|
52
|
+
<!-- <th><nobr>金额状态</nobr></th>-->
|
|
53
|
+
|
|
54
|
+
<th><nobr>磁干扰异常</nobr></th>
|
|
55
|
+
<th><nobr>补偿状态</nobr></th>
|
|
56
|
+
</tr>
|
|
57
|
+
</template>
|
|
58
|
+
<template partial='body' partial='list'>
|
|
59
|
+
<tr >
|
|
60
|
+
<td style="text-align:center"><nobr>{{row.f_hand_date}}</nobr></td>
|
|
61
|
+
<th style="text-align:center"><nobr>{{row.f_meterbalanceamt}}</nobr></th>
|
|
62
|
+
<th style="text-align:center"><nobr>{{row.f_tablebase}}</nobr></th>
|
|
63
|
+
<th style="text-align:center"><nobr>{{row.f_valvestate == 0 ? '开阀' : '关阀'}}</nobr></th>
|
|
64
|
+
<th style="text-align:center"><nobr>{{row.f_upload_type}}</nobr></th>
|
|
65
|
+
<th style="text-align:center"><nobr>{{row.f_insert_date}}</nobr></th>
|
|
66
|
+
<th style="text-align:center"><nobr>{{row.f_meterdebitamt}}</nobr></th>
|
|
67
|
+
<th style="text-align:center"><nobr>{{row.f_signal}}</nobr></th>
|
|
68
|
+
<th style="text-align:center"><nobr>{{row.f_snr}}</nobr></th>
|
|
69
|
+
<th style="text-align:center"><nobr>{{row.f_batterylevel}}</nobr></th>
|
|
70
|
+
<th style="text-align:center"><nobr>{{row.f_lowlithiumbattery ? ((row.f_lowlithiumbattery - 0) == 0 ? '正常' : '异常') : '未知'}}</nobr></th>
|
|
71
|
+
<th style="text-align:center"><nobr>{{row.f_networkshutvalve}}</nobr></th>
|
|
72
|
+
<!-- <th style="text-align:center"><nobr>{{row.f_wmprepaytype}}</nobr></th>-->
|
|
73
|
+
<!-- <th style="text-align:center"><nobr>{{row.f_moneystate}}</nobr></th>-->
|
|
74
|
+
<th style="text-align:center"><nobr>{{row.f_magneticInterference}}</nobr></th>
|
|
75
|
+
<th style="text-align:center"><nobr>{{row.f_compensateState}}</nobr></th>
|
|
76
|
+
</tr>
|
|
77
|
+
</template>
|
|
78
|
+
<template partial='foot'></template>
|
|
79
|
+
</data-grid>
|
|
80
|
+
</criteria-paged>
|
|
81
|
+
</div>
|
|
82
|
+
</div>
|
|
83
|
+
</template>
|
|
84
|
+
|
|
85
|
+
<script>
|
|
86
|
+
import {PagedList} from 'vue-client'
|
|
87
|
+
|
|
88
|
+
export default {
|
|
89
|
+
title: 'WatchCollection',
|
|
90
|
+
data () {
|
|
91
|
+
return {
|
|
92
|
+
model: new PagedList('rs/sql/iot_getNewLoseUserQuery', 50)
|
|
93
|
+
}
|
|
94
|
+
},
|
|
95
|
+
props: ['row'],
|
|
96
|
+
ready () {
|
|
97
|
+
this.$refs.paged.$refs.criteria.search()
|
|
98
|
+
},
|
|
99
|
+
methods: {
|
|
100
|
+
search (args) {
|
|
101
|
+
args.condition = `${args.condition} and f_userfiles_id='${this.row.f_userfiles_id}'`
|
|
102
|
+
this.model.search(args.condition, args.model)
|
|
103
|
+
}
|
|
104
|
+
},
|
|
105
|
+
watch: {
|
|
106
|
+
// 监听查询对象
|
|
107
|
+
'row' (val) {
|
|
108
|
+
if (this.row != null) {
|
|
109
|
+
this.$refs.paged.$refs.criteria.search()
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
</script>
|
|
115
|
+
|
|
@@ -954,7 +954,7 @@ let loadParamGem = async function (self) {
|
|
|
954
954
|
await axios.post('rs/business/batchRunExcelDefault/filemanage_fileSave_zhongyi/newSettleFileImport',
|
|
955
955
|
{data: param}, {timeout: 30000}).then((res) => {
|
|
956
956
|
if (res.data) {
|
|
957
|
-
self.$showMessage(
|
|
957
|
+
self.$showMessage(`本次批量建档共上传${res.data.totalCount}条数据,符合条件的共${res.data.totalsum}条,不符合条件的共${res.data.totalCount -res.data.totalsum}条, 建档成功${res.data.successsum}条,建档失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)
|
|
958
958
|
self.iswork = false
|
|
959
959
|
// this.$showAlert('导入成功','success',2000)
|
|
960
960
|
}
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
:value.sync="model.f_hand_state"
|
|
17
17
|
:options='$parent.$parent.states'
|
|
18
18
|
close-on-select
|
|
19
|
-
condition="
|
|
19
|
+
condition=" {} "
|
|
20
20
|
@change="$parent.$parent.search">
|
|
21
21
|
</v-select>
|
|
22
22
|
</div>
|
|
@@ -149,7 +149,7 @@
|
|
|
149
149
|
<td style="text-align:center">{{row.f_meter_source}}</td>
|
|
150
150
|
<td style="text-align:center">{{row.f_audit_person}}</td>
|
|
151
151
|
<td style="text-align:center">{{row.f_audit_date}}</td>
|
|
152
|
-
<td style="text-align: center" v-if="row.
|
|
152
|
+
<td style="text-align: center" v-if="row.f_meter_state === '待审核' && row.f_hand_state === '有效'">
|
|
153
153
|
<button type="button" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.success(row)">通过</button>
|
|
154
154
|
<br>
|
|
155
155
|
<button type="button" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.faild(row)">不通过</button>
|
|
@@ -201,13 +201,16 @@
|
|
|
201
201
|
pushdata: {openid: '', cause: ''},
|
|
202
202
|
row: null,
|
|
203
203
|
model: new PagedList('rs/sql/meterReadAudit', 20),
|
|
204
|
-
states: [{label: '待审核', value: `
|
|
204
|
+
states: [{label: '待审核', value: ` f_meter_state = '待审核' and f_hand_state ='有效'`}, {
|
|
205
|
+
label: '未通过',
|
|
206
|
+
value: ` f_hand_state = '无效'`
|
|
207
|
+
}, {label: '已通过', value: `f_meter_state = '已抄表' and f_hand_state ='有效'`}],
|
|
205
208
|
meterbooks: [{label: '全部', value: ''}]
|
|
206
209
|
}
|
|
207
210
|
},
|
|
208
211
|
ready () {
|
|
209
212
|
readyGen(this)
|
|
210
|
-
this.$refs.paged.$refs.cri.model.f_hand_state[0] =`'待审核'`
|
|
213
|
+
this.$refs.paged.$refs.cri.model.f_hand_state[0] =` f_meter_state = '待审核'`
|
|
211
214
|
},
|
|
212
215
|
methods: {
|
|
213
216
|
loadMeterBooks () {
|
|
@@ -293,7 +296,7 @@
|
|
|
293
296
|
}
|
|
294
297
|
condition = condition.substring(0, condition.length - 1)
|
|
295
298
|
condition += ')'
|
|
296
|
-
let sql = `UPDATE t_handplan SET f_hand_state = '
|
|
299
|
+
let sql = `UPDATE t_handplan SET f_hand_state = '作废',f_audit_person = '${this.$login.f.name}',f_audit_date = getDate() WHERE id in ${condition}`
|
|
297
300
|
await this.$resetpost('rs/logic/runSQL', {sql: sql}, {resolveMsg: '操作成功', rejectMsg: '操作失败'})
|
|
298
301
|
this.search()
|
|
299
302
|
} else {
|
|
@@ -310,7 +313,7 @@
|
|
|
310
313
|
// this.row = row
|
|
311
314
|
// this.pushdata.openid = row.f_open_id
|
|
312
315
|
// this.show = true
|
|
313
|
-
let sql = `UPDATE t_handplan SET f_hand_state = '
|
|
316
|
+
let sql = `UPDATE t_handplan SET f_hand_state = '作废',f_meter_state = '未抄表',f_audit_person = '${this.$login.f.name}',f_audit_date = getDate() WHERE id = ${row.id}`
|
|
314
317
|
await this.$resetpost('rs/logic/runSQL', {sql: sql}, {resolveMsg: '操作成功', rejectMsg: '操作失败'})
|
|
315
318
|
this.search()
|
|
316
319
|
}
|
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
|