sale-client 4.2.1-ronghao → 4.2.2
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/.gradle/5.2.1/fileChanges/last-build.bin +0 -0
- package/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/5.2.1/gc.properties +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +2 -0
- package/.gradle/vcs-1/gc.properties +0 -0
- package/build/dev-server.js +3 -3
- package/package.json +1 -1
- package/src/filiale/yangchun/plugins/LogicService.js +17 -16
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
File without changes
|
package/build/dev-server.js
CHANGED
|
@@ -42,9 +42,9 @@ var devConfig = {
|
|
|
42
42
|
// target: 'http://410663id1ia4.vicp.fun'
|
|
43
43
|
// },
|
|
44
44
|
// '/api/af-revenue/sql': {
|
|
45
|
-
// pathRewrite: {
|
|
46
|
-
//
|
|
47
|
-
// },
|
|
45
|
+
// // pathRewrite: {
|
|
46
|
+
// // '/api/af-revenue/sql': '/sql'
|
|
47
|
+
// // },
|
|
48
48
|
// target: localUrl
|
|
49
49
|
// },
|
|
50
50
|
'/rs/pay': {
|
package/package.json
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import Vue from 'vue'
|
|
2
2
|
import co from 'co'
|
|
3
3
|
|
|
4
|
-
let disableGen = function
|
|
5
|
-
let owe =
|
|
4
|
+
let disableGen = async function (data) {
|
|
5
|
+
let owe = await Vue.resetpost('api/af-revenue/sql/getOverdue', {data: {f_userfiles_id: data.f_userfile_id + ''}}, {resolveMsg: null, rejectMsg: null})
|
|
6
6
|
console.log('表具停用看是否有欠费', owe.data)
|
|
7
|
-
let hasHandplan =
|
|
7
|
+
let hasHandplan = await Vue.resetpost('api/af-revenue/sql/saleSingleTable', {data: {tablename: 't_handplan', condition: `f_meter_state = '未抄表' and f_userfiles_id = '${data.f_userfile_id + ''}'`}}, {resolveMsg: null, rejectMsg: null})
|
|
8
8
|
console.log('是否有未抄表数据', hasHandplan.data)
|
|
9
9
|
if (owe.data.length > 0 && hasHandplan.data.length > 0) {
|
|
10
10
|
Vue.showAlert('该表具还有欠费或者未抄表数据，不能停用！！', 'danger', 0)
|
|
11
11
|
} else {
|
|
12
|
-
|
|
12
|
+
return Vue.resetpost('api/af-revenue/entity/save/t_disable', data, {resolveMsg: '表具停用成功', rejectMsg: '表具停用失败'})
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
15
|
|
|
@@ -32,11 +32,12 @@ let LogicService = {
|
|
|
32
32
|
// 表具启用
|
|
33
33
|
meterEnable (model, row) {
|
|
34
34
|
let data = {
|
|
35
|
-
f_userfiles_id: {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
},
|
|
35
|
+
// f_userfiles_id: {
|
|
36
|
+
// f_userfiles_id: row.f_userfiles_id,
|
|
37
|
+
// f_table_state: '正常',
|
|
38
|
+
// version: row.version
|
|
39
|
+
// },
|
|
40
|
+
f_userfiles_id: row.f_userfiles_id,
|
|
40
41
|
f_userfile_id: row.f_userfiles_id,
|
|
41
42
|
f_user_id: row.f_user_id,
|
|
42
43
|
record_userinfo: row.f_userinfo_id,
|
|
@@ -62,11 +63,12 @@ let LogicService = {
|
|
|
62
63
|
// 表具停用
|
|
63
64
|
meterDisable (model, row) {
|
|
64
65
|
let data = {
|
|
65
|
-
f_userfiles_id: {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
},
|
|
66
|
+
// f_userfiles_id: {
|
|
67
|
+
// f_userfiles_id: row.f_userfiles_id,
|
|
68
|
+
// f_table_state: '停用',
|
|
69
|
+
// version: row.version
|
|
70
|
+
// },
|
|
71
|
+
f_userfiles_id: row.f_userfiles_id,
|
|
70
72
|
f_userfile_id: row.f_userfiles_id,
|
|
71
73
|
f_user_id: row.f_user_id,
|
|
72
74
|
f_userinfo_id: row.f_userinfo_id,
|
|
@@ -85,8 +87,7 @@ let LogicService = {
|
|
|
85
87
|
f_zoneid: Vue.$login.f.zoneid,
|
|
86
88
|
f_zones: Vue.$login.f.zones
|
|
87
89
|
}
|
|
88
|
-
|
|
89
|
-
return co(disable)
|
|
90
|
+
return disableGen(data)
|
|
90
91
|
},
|
|
91
92
|
|
|
92
93
|
// 其他收费
|