telephone-clients 4.0.0-1-77 → 4.0.0-1-79

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.
@@ -1,129 +1,125 @@
1
- <template >
2
- <div id="pc-finduser-page">
3
- <criteria-paged :model="model" v-ref:paged :simple="true" classname="table table-bordered table-hover">
4
- <!-- <criteria partial='criteria' v-ref:criteria >
5
- </criteria> -->
6
- <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
7
- <template partial='head'>
8
- <tr>
9
- <th><nobr>用户编号</nobr></th>
10
- <th><nobr>用户姓名</nobr></th>
11
- <th><nobr>表号</nobr></th>
12
- <th><nobr>表具</nobr></th>
13
- <th><nobr>上期底数</nobr></th>
14
- <th><nobr>本期底数</nobr></th>
15
- <th><nobr>用气量</nobr></th>
16
- <th><nobr>阶梯使用量</nobr></th>
17
- <th><nobr>阶梯单价</nobr></th>
18
- <th><nobr>用气金额</nobr></th>
19
- <th><nobr>抄表状态</nobr></th>
20
- <th><nobr>抄表员</nobr></th>
21
- <th><nobr>是否缴费</nobr></th>
22
- <th><nobr>抄表日期</nobr></th>
23
- </tr>
24
- </template>
25
- <template partial='body'>
26
- <td><nobr>{{row.f_userinfo_code}}</nobr></td>
27
- <td><nobr>{{row.f_user_name}}</nobr></td>
28
- <td><nobr>{{row.f_meternumber}}</nobr></td>
29
- <td><nobr>{{row.f_meter_brand}}</nobr></td>
30
- <td><nobr>{{row.f_last_tablebase}}</nobr></td>
31
- <td><nobr>{{row.f_tablebase}}</nobr></td>
32
- <td><nobr>{{row.f_oughtamount}}</nobr></td>
33
- <td><nobr>{{$parent.$parent.$parent.getstairGas(row)}}</nobr></td>
34
- <td><nobr>{{$parent.$parent.$parent.getstairPrice(row)}}</nobr></td>
35
- <td><nobr>{{row.f_oughtfee}}</nobr></td>
36
- <td><nobr>{{row.f_meter_state}}</nobr></td>
37
- <td><nobr>{{row.f_inputtor}}</nobr></td>
38
- <td><nobr>{{row.f_whether_pay}}</nobr></td>
39
- <td><nobr>{{row.f_hand_date}}</nobr></td>
40
- </template>
41
- </data-grid>
42
- </criteria-paged>
43
- </div>
44
- </template>
45
-
46
- <script>
47
- import { PagedList } from 'vue-client'
48
- export default {
49
- title: '抄表记录',
50
- data () {
51
- return {
52
- model: new PagedList((this.user && this.user.isphone) ? '${this.$androidUtil.getProxyUrl()}/' : '' + 'af-telephone/rs/sql/tel_singleTable_OrderBy', 8, {items: '"*"', tablename: 'this.tablename', orderitem: '"f_hand_date desc"'}),
53
- show: false,
54
- row: Object
55
- }
56
- },
57
- props: {
58
- user: {
59
- type: Object
60
- },
61
- clearflg:0
62
- },
63
- methods: {
64
- //气量
65
- getstairGas(data) {
66
-
67
- if (data.f_stair_gas1 > 0) {
68
- return data.f_stair_gas1;
69
- }
70
- if (data.f_stair_gas2 > 0) {
71
- return data.f_stair_gas2;
72
- }
73
- if (data.f_stair_gas3 > 0) {
74
- return data.f_stair_gas3;
75
- }
76
- if (data.f_stair_gas4 > 0) {
77
- return data.f_stair_gas4;
78
- }
79
- },
80
- //单价
81
- getstairPrice(data) {
82
-
83
- if (data.f_stair_gas1 > 0) {
84
- return data.f_stair_price1;
85
- }
86
- if (data.f_stair_gas2 > 0) {
87
- return data.f_stair_price2;
88
- }
89
- if (data.f_stair_gas3 > 0) {
90
- return data.f_stair_price3;
91
- }
92
- if (data.f_stair_gas4 > 0) {
93
- return data.f_stair_price4;
94
- }
95
- },
96
- },
97
- watch: {
98
- 'user' (val) {
99
- if(this.user) {
100
- this.model.rows = []
101
- if(val.f_meter_classify == '物联网表'){
102
- this.model.tablename = 't_web_handplan with (nolock)'
103
- }else{
104
- this.model.tablename = 't_handplan with (nolock)'
105
- }
106
- this.model.search(`f_userinfo_id = '${this.user.f_userinfo_id}'`)
107
- }
108
- },
109
- 'clearflg'(){
110
- this.model.rows = []
111
- }
112
- },
113
- /*
114
- 1.12月18 2W
115
- 2.1月18
116
- */
117
- ready () {
118
- if (this.user && this.user.f_userinfo_id) {
119
- if(this.user.f_meter_classify == '物联网表'){
120
-
121
- this.model.tablename = 't_web_handplan with (nolock)'
122
- }else{
123
- this.model.tablename = 't_handplan with (nolock)'
124
- }
125
- this.model.search(`f_userinfo_id = '${this.user.f_userinfo_id}'`)
126
- }
127
- }
128
- }
129
- </script>
1
+ <template >
2
+ <div id="pc-finduser-page">
3
+ <criteria-paged :model="model" v-ref:paged :simple="true" classname="table table-bordered table-hover">
4
+ <!-- <criteria partial='criteria' v-ref:criteria >
5
+ </criteria> -->
6
+ <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
7
+ <template partial='head'>
8
+ <tr>
9
+ <th><nobr>用户编号</nobr></th>
10
+ <th><nobr>用户姓名</nobr></th>
11
+ <th><nobr>表号</nobr></th>
12
+ <th><nobr>表具</nobr></th>
13
+ <th><nobr>上期底数</nobr></th>
14
+ <th><nobr>本期底数</nobr></th>
15
+ <th><nobr>用气量</nobr></th>
16
+ <th><nobr>阶梯使用量</nobr></th>
17
+ <th><nobr>阶梯单价</nobr></th>
18
+ <th><nobr>用气金额</nobr></th>
19
+ <th><nobr>抄表状态</nobr></th>
20
+ <th><nobr>抄表员</nobr></th>
21
+ <th><nobr>是否缴费</nobr></th>
22
+ <th><nobr>抄表日期</nobr></th>
23
+ </tr>
24
+ </template>
25
+ <template partial='body'>
26
+ <td><nobr>{{row.f_userinfo_code}}</nobr></td>
27
+ <td><nobr>{{row.f_user_name}}</nobr></td>
28
+ <td><nobr>{{row.f_meternumber}}</nobr></td>
29
+ <td><nobr>{{row.f_meter_brand}}</nobr></td>
30
+ <td><nobr>{{row.f_last_tablebase}}</nobr></td>
31
+ <td><nobr>{{row.f_tablebase}}</nobr></td>
32
+ <td><nobr>{{row.f_oughtamount}}</nobr></td>
33
+ <td><nobr>{{$parent.$parent.$parent.getstairGas(row)}}</nobr></td>
34
+ <td><nobr>{{$parent.$parent.$parent.getstairPrice(row)}}</nobr></td>
35
+ <td><nobr>{{row.f_oughtfee}}</nobr></td>
36
+ <td><nobr>{{row.f_meter_state}}</nobr></td>
37
+ <td><nobr>{{row.f_inputtor}}</nobr></td>
38
+ <td><nobr>{{row.f_whether_pay}}</nobr></td>
39
+ <td><nobr>{{row.f_hand_date}}</nobr></td>
40
+ </template>
41
+ </data-grid>
42
+ </criteria-paged>
43
+ </div>
44
+ </template>
45
+
46
+ <script>
47
+ import { PagedList } from 'vue-client'
48
+ export default {
49
+ title: '抄表记录',
50
+ data () {
51
+ return {
52
+ model: new PagedList((this.user && this.user.isphone) ? '${this.$androidUtil.getProxyUrl()}/' : '' + 'af-telephone/rs/sql/tel_singleTable_OrderBy', 8, {items: '"*"', tablename: 'this.tablename', orderitem: '"f_hand_date desc"'}),
53
+ show: false,
54
+ row: Object
55
+ }
56
+ },
57
+ props: {
58
+ user: {
59
+ type: Object
60
+ },
61
+ clearflg:0
62
+ },
63
+ methods: {
64
+ //气量
65
+ getstairGas(data) {
66
+
67
+ if (data.f_stair_gas1 > 0) {
68
+ return data.f_stair_gas1;
69
+ }
70
+ if (data.f_stair_gas2 > 0) {
71
+ return data.f_stair_gas2;
72
+ }
73
+ if (data.f_stair_gas3 > 0) {
74
+ return data.f_stair_gas3;
75
+ }
76
+ if (data.f_stair_gas4 > 0) {
77
+ return data.f_stair_gas4;
78
+ }
79
+ },
80
+ //单价
81
+ getstairPrice(data) {
82
+
83
+ if (data.f_stair_gas1 > 0) {
84
+ return data.f_stair_price1;
85
+ }
86
+ if (data.f_stair_gas2 > 0) {
87
+ return data.f_stair_price2;
88
+ }
89
+ if (data.f_stair_gas3 > 0) {
90
+ return data.f_stair_price3;
91
+ }
92
+ if (data.f_stair_gas4 > 0) {
93
+ return data.f_stair_price4;
94
+ }
95
+ },
96
+ },
97
+ watch: {
98
+ 'user' (val) {
99
+ if(this.user) {
100
+ this.model.rows = []
101
+ if(val.f_meter_classify == '物联网表'){
102
+ this.model.tablename = 't_web_handplan with (nolock)'
103
+ }else{
104
+ this.model.tablename = 't_handplan with (nolock)'
105
+ }
106
+ this.model.search(`f_userinfo_id = '${this.user.f_userinfo_id}'`)
107
+ }
108
+ },
109
+ 'clearflg'(){
110
+ this.model.rows = []
111
+ }
112
+ },
113
+ ready () {
114
+ if (this.user && this.user.f_userinfo_id) {
115
+ if(this.user.f_meter_classify == '物联网表'){
116
+
117
+ this.model.tablename = 't_web_handplan with (nolock)'
118
+ }else{
119
+ this.model.tablename = 't_handplan with (nolock)'
120
+ }
121
+ this.model.search(`f_userinfo_id = '${this.user.f_userinfo_id}'`)
122
+ }
123
+ }
124
+ }
125
+ </script>
@@ -1,86 +1,86 @@
1
- <template >
2
- <div id="pc-finduser-page">
3
- <criteria-paged :model="model" v-ref:paged :simple="true">
4
- <!-- <criteria partial='criteria'>
5
- </criteria> -->
6
- <data-grid :model="model" partial='list' v-ref:grid
7
- class="list_area table_sy">
8
- <template partial='head'>
9
- <tr>
10
- <th><nobr>表号</nobr></th>
11
- <!--<th><nobr>气表厂家</nobr></th>-->
12
- <th><nobr>指令类型</nobr></th>
13
- <th><nobr>指令标题</nobr></th>
14
- <th><nobr>指令状态</nobr></th>
15
- <th><nobr>指令结果</nobr></th>
16
- <th><nobr>指令生成时间</nobr></th>
17
- <th><nobr>上表时间</nobr></th>
18
- </tr>
19
- </template>
20
- <template partial='body'>
21
- <td>{{row.f_meternumber}}</td>
22
- <!--<td>{{row.f_manufacturers}}</td>-->
23
- <td>{{row.f_instruct_type}}</td>
24
- <td>{{row.f_instruct_title}}</td>
25
- <td>{{row.f_instruct_state}}</td>
26
- <td>{{row.f_receive_state}}</td>
27
- <td>{{row.f_instruct_date}}</td>
28
- <td>{{row.f_callback_date}}</td>
29
- </template>
30
- </data-grid>
31
- </criteria-paged>
32
- </div>
33
- </template>
34
-
35
- <script>
36
- import { PagedList } from 'vue-client'
37
- import co from 'co'
38
- let getmodelGen = function * (self, val) {
39
- yield self.model.search((`f_userinfo_id = '${self.user.f_userinfo_id}' and f_instruct_type!='结束下发'`))
40
- .then(() => {
41
- // self.getdata()
42
- })
43
- }
44
- export default {
45
- title: '指令查看',
46
- data () {
47
- return {
48
- model: new PagedList('af-telephone/rs/sql/tel_singleTable_OrderBy', 8, {items: '"f_callback_date,f_instruct_date,f_receive_state,f_instruct_state,f_instruct_title,f_meternumber,f_instruct_type,f_manufacturers"', tablename: '"t_instruct with (nolock)"', orderitem: '"f_instruct_date desc"'}),
49
- show: false,
50
- row: Object
51
- }
52
- },
53
- props: {
54
- user: {
55
- type: Object
56
- },
57
- clearflg:0
58
- },
59
- methods: {
60
- getmodel () {
61
- let gen = getmodelGen(this)
62
- co(gen)
63
- }
64
- },
65
- watch: {
66
- 'user' (val) {
67
- // this.model.search(`card_id = ${this.user.card_id}`)
68
- if(this.user){
69
- if (!(this.user.isNuN)) {
70
- this.model.rows = []
71
- this.getmodel()
72
- }
73
- }
74
- },
75
- 'clearflg'(){
76
- this.model.rows = []
77
- }
78
- },
79
- ready () {
80
- if (this.user && this.user.f_userinfo_id) {
81
- // this.model.search(`card_id = ${this.user.card_id}`)
82
- this.getmodel()
83
- }
84
- }
85
- }
86
- </script>
1
+ <template >
2
+ <div id="pc-finduser-page">
3
+ <criteria-paged :model="model" v-ref:paged :simple="true">
4
+ <!-- <criteria partial='criteria'>
5
+ </criteria> -->
6
+ <data-grid :model="model" partial='list' v-ref:grid
7
+ class="list_area table_sy">
8
+ <template partial='head'>
9
+ <tr>
10
+ <th><nobr>表号</nobr></th>
11
+ <!--<th><nobr>气表厂家</nobr></th>-->
12
+ <th><nobr>指令类型</nobr></th>
13
+ <th><nobr>指令标题</nobr></th>
14
+ <th><nobr>指令状态</nobr></th>
15
+ <th><nobr>指令结果</nobr></th>
16
+ <th><nobr>指令生成时间</nobr></th>
17
+ <th><nobr>上表时间</nobr></th>
18
+ </tr>
19
+ </template>
20
+ <template partial='body'>
21
+ <td>{{row.f_meternumber}}</td>
22
+ <!--<td>{{row.f_manufacturers}}</td>-->
23
+ <td>{{row.f_instruct_type}}</td>
24
+ <td>{{row.f_instruct_title}}</td>
25
+ <td>{{row.f_instruct_state}}</td>
26
+ <td>{{row.f_receive_state}}</td>
27
+ <td>{{row.f_instruct_date}}</td>
28
+ <td>{{row.f_callback_date}}</td>
29
+ </template>
30
+ </data-grid>
31
+ </criteria-paged>
32
+ </div>
33
+ </template>
34
+
35
+ <script>
36
+ import { PagedList } from 'vue-client'
37
+ import co from 'co'
38
+ let getmodelGen = function * (self, val) {
39
+ yield self.model.search((`f_userfiles_id = '${self.user.f_userfiles_id}' and f_instruct_type!='结束下发'`))
40
+ .then(() => {
41
+ // self.getdata()
42
+ })
43
+ }
44
+ export default {
45
+ title: '指令查看',
46
+ data () {
47
+ return {
48
+ model: new PagedList('af-telephone/rs/sql/tel_singleTable_OrderBy', 8, {items: '"f_callback_date,f_instruct_date,f_receive_state,f_instruct_state,f_instruct_title,f_meternumber,f_instruct_type,f_manufacturers"', tablename: '"t_instruct with (nolock)"', orderitem: '"f_instruct_date desc"'}),
49
+ show: false,
50
+ row: Object
51
+ }
52
+ },
53
+ props: {
54
+ user: {
55
+ type: Object
56
+ },
57
+ clearflg:0
58
+ },
59
+ methods: {
60
+ getmodel () {
61
+ let gen = getmodelGen(this)
62
+ co(gen)
63
+ }
64
+ },
65
+ watch: {
66
+ 'user' (val) {
67
+ // this.model.search(`card_id = ${this.user.card_id}`)
68
+ if(this.user){
69
+ if (!(this.user.isNuN)) {
70
+ this.model.rows = []
71
+ this.getmodel()
72
+ }
73
+ }
74
+ },
75
+ 'clearflg'(){
76
+ this.model.rows = []
77
+ }
78
+ },
79
+ ready () {
80
+ if (this.user && this.user.f_userinfo_id) {
81
+ // this.model.search(`card_id = ${this.user.card_id}`)
82
+ this.getmodel()
83
+ }
84
+ }
85
+ }
86
+ </script>
@@ -564,8 +564,8 @@ export default {
564
564
  this.$showMessage('网络异常,请稍后再试!')
565
565
  return
566
566
  }
567
- this.model.f_table_path_new=this.f_table_path_new
568
- this.model.f_table_path_old=this.f_table_path_old
567
+ this.model.f_table_path_new=this.extractFileName(this.f_table_path_new)
568
+ this.model.f_table_path_old=this.extractFileName(this.f_table_path_old)
569
569
  this.isBusy = true
570
570
  let _this = this
571
571
  _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/api/af-revenue/logic/third_change_meter`, {data: this.model},{resolveMsg: null, rejectMsg: null}).then((res) => {
@@ -607,6 +607,11 @@ export default {
607
607
  this.isBusy = false
608
608
  })
609
609
  },
610
+ extractFileName(filePath) {
611
+ if (!filePath) return '';
612
+ // 从完整路径中提取文件名
613
+ return filePath.substring(filePath.lastIndexOf('/') + 1);
614
+ },
610
615
  },
611
616
  ready () {
612
617
  // this.getallBrandList()