sale-client 4.1.4 → 4.1.5

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.
Files changed (31) hide show
  1. package/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
  2. package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
  3. package/.gradle/buildOutputCleanup/cache.properties +1 -1
  4. package/build/dev-server.js +11 -12
  5. package/package.json +1 -1
  6. package/src/components/common/userinfo_detail/UserInfoDetailManage.vue +0 -3
  7. package/src/components/common/userinfo_detail/UserInfoDetailManageNew.vue +8 -10
  8. package/src/components/webMeter/common/NewWatchMsg.vue +0 -1
  9. package/src/filiale/bayan/UserInfoDetailManageNew.vue +10 -9
  10. package/src/filiale/dongguan/components/common/userinfo_detail/UserInfoDetailManageNew.vue +11 -7
  11. package/src/filiale/fugou/UserInfoDetailManageNew.vue +8 -10
  12. package/src/filiale/gehua/userinfo_detail/UserInfoDetailManageNew.vue +10 -9
  13. package/src/filiale/jiaxian/UserInfoDetailManageNew.vue +8 -11
  14. package/src/filiale/jingyang/UserInfoDetailManageNew.vue +10 -9
  15. package/src/filiale/liuan/UserInfoDetailManageNew.vue +10 -9
  16. package/src/filiale/lixianV3/UserInfoDetailManageNew.vue +10 -9
  17. package/src/filiale/macheng/UserInfoDetailManageNew.vue +10 -9
  18. package/src/filiale/meihekou/common/userinfo_detail/UserInfoDetailManageNew.vue +11 -7
  19. package/src/filiale/ningjin/UserInfoDetailManageNew.vue +10 -10
  20. package/src/filiale/qianneng/revenue/common/UserInfoDetailManageNew.vue +11 -9
  21. package/src/filiale/qingjian/UserInfoDetailManageNew.vue +10 -9
  22. package/src/filiale/rizhao/UserInfoDetailManageNew.vue +10 -9
  23. package/src/filiale/ronghao/UserInfoDetailManageNew.vue +8 -10
  24. package/src/filiale/shexian/UserInfoDetailManageNew.vue +10 -9
  25. package/src/filiale/taizhoukesi/UserInfoDetailManageNew.vue +10 -9
  26. package/src/filiale/tongchuan/common/userinfo_detail/UserInfoDetailManageNew.vue +11 -9
  27. package/src/filiale/wuhai/UserInfoDetailManageNew.vue +8 -10
  28. package/src/filiale/xihu/UserInfoDetailManageNew.vue +8 -10
  29. package/src/filiale/yuansheng/UserInfoDetailManageNew.vue +10 -9
  30. package/src/filiale/zhongyi/UserInfoDetailManageNew.vue +10 -9
  31. package/src/main.js +3 -3
@@ -1,2 +1,2 @@
1
- #Thu Mar 13 17:10:29 CST 2025
1
+ #Thu Feb 27 12:01:45 CST 2025
2
2
  gradle.version=5.2.1
@@ -1,8 +1,7 @@
1
1
  var path = require('path')
2
2
  var checkVersion = require('./versionCheck.js')
3
3
  checkVersion()
4
- // const [ serverRul, localUrl ] = ['http://218.93.226.210:31467/', 'http://218.93.226.210:31467/']
5
- const [ serverRul, localUrl ] = ['http://192.168.50.67:31467/', 'http://127.0.0.1:9026/']
4
+ const [ serverRul, localUrl ] = ['http://192.168.50.67:31467/', 'http://localhost:9026/']
6
5
  var merge = require('webpack-merge')
7
6
  var baseConfig = require('./webpack.dev.conf')
8
7
  var devConfig = {
@@ -20,12 +19,12 @@ var devConfig = {
20
19
  children: false // 不输出子模块构建信息
21
20
  },
22
21
  proxy: {
23
- // '/api/af-revenue/logic/changeMeterCardHand': {
24
- // pathRewrite: {
25
- // '/api/af-revenue/logic': '/logic'
26
- // },
27
- // target: 'http://127.0.0.1:9026'
28
- // },
22
+ '/api/af-revenue/batchdeduction/all': {
23
+ pathRewrite: {
24
+ '/api/af-revenue/batchdeduction/all': '/batchdeduction/all'
25
+ },
26
+ target: localUrl
27
+ },
29
28
  '/api/af-revenue/logic': {
30
29
  pathRewrite: {
31
30
  '/api/af-revenue/logic': '/logic'
@@ -33,12 +32,12 @@ var devConfig = {
33
32
  target: localUrl
34
33
  },
35
34
  '/api/af-revenue/file': {
36
- pathRewrite: {
37
- '/api/af-revenue/file': '/file'
38
- },
35
+ // pathRewrite: {
36
+ // '/api/af-revenue/file': '/file'
37
+ // },
39
38
  target: localUrl
40
39
  },
41
- '/weixin2/rs': {
40
+ '/weixin2/rs':{
42
41
 
43
42
  target: 'http://410663id1ia4.vicp.fun'
44
43
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "4.1.4",
3
+ "version": "4.1.5",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -118,9 +118,6 @@ export default {
118
118
  },
119
119
  async search () {
120
120
  let http = new HttpResetClass()
121
-
122
- let condition = `f_userinfo_id = '${this.f_userinfo_id}'`
123
-
124
121
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
125
122
  {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
126
123
  this.row = getBaseInfo.data
@@ -212,20 +212,18 @@ export default {
212
212
  },
213
213
  async search () {
214
214
  let http = new HttpResetClass()
215
- let condition = ' 1 = 1'
216
- if (this.f_userfiles_id) {
217
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
218
- } else if (this.f_userinfo_id) {
219
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
220
- } else if (this.f_userinfo_code) {
221
- condition = `f_userinfo_code = '${this.f_userinfo_code}'`
222
- }else{
215
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
223
216
  this.$showMessage('用户信息缺失,查询详情信息失败')
224
217
  return
225
218
  }
226
-
227
219
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
228
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
220
+ {
221
+ data: {
222
+ f_userfiles_id: this.f_userfiles_id,
223
+ f_userinfo_id: this.f_userinfo_id,
224
+ f_userinfo_code: this.f_userinfo_code
225
+ }
226
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
229
227
  this.row = getBaseInfo.data
230
228
  this.row.parentname = this.parentname || ''
231
229
  },
@@ -397,7 +397,6 @@
397
397
  // 发送请求去数据
398
398
  search () {
399
399
  let http = new HttpResetClass()
400
- console.log('iot_getUserBaseData=======')
401
400
  http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
402
401
  {data: {f_userfiles_id: this.watchmsg.f_userfiles_id}},
403
402
  {resolveMsg: null, rejectMsg: null}).then((res) => {
@@ -200,17 +200,18 @@ export default {
200
200
  },
201
201
  async search () {
202
202
  let http = new HttpResetClass()
203
- let condition = ' 1 = 1'
204
- if (this.f_userfiles_id) {
205
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
206
- } else if (this.f_userinfo_id) {
207
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
208
- } else if (this.f_userinfo_code) {
209
- condition = `f_userinfo_code = '${this.f_userinfo_code}'`
203
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
204
+ this.$showMessage('用户信息缺失,查询详情信息失败')
205
+ return
210
206
  }
211
-
212
207
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
213
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
208
+ {
209
+ data: {
210
+ f_userfiles_id: this.f_userfiles_id,
211
+ f_userinfo_id: this.f_userinfo_id,
212
+ f_userinfo_code: this.f_userinfo_code
213
+ }
214
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
214
215
  this.row = getBaseInfo.data
215
216
  this.row.parentname = this.parentname || ''
216
217
  },
@@ -157,16 +157,20 @@ export default {
157
157
  },
158
158
  async search () {
159
159
  let http = new HttpResetClass()
160
- let condition = ' 1 = 1'
161
- if (this.f_userfiles_id) {
162
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
163
- } else if (this.f_userinfo_id) {
164
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
160
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
161
+ this.$showMessage('用户信息缺失,查询详情信息失败')
162
+ return
165
163
  }
166
-
167
164
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
168
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
165
+ {
166
+ data: {
167
+ f_userfiles_id: this.f_userfiles_id,
168
+ f_userinfo_id: this.f_userinfo_id,
169
+ f_userinfo_code: this.f_userinfo_code
170
+ }
171
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
169
172
  this.row = getBaseInfo.data
173
+ this.row.parentname = this.parentname || ''
170
174
  },
171
175
 
172
176
  cancel (val) {
@@ -194,20 +194,18 @@ export default {
194
194
  },
195
195
  async search () {
196
196
  let http = new HttpResetClass()
197
- let condition = ' 1 = 1'
198
- if (this.f_userfiles_id) {
199
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
200
- } else if (this.f_userinfo_id) {
201
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
202
- } else if (this.f_userinfo_code) {
203
- condition = `f_userinfo_code = '${this.f_userinfo_code}'`
204
- }else{
197
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
205
198
  this.$showMessage('用户信息缺失,查询详情信息失败')
206
199
  return
207
200
  }
208
-
209
201
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
210
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
202
+ {
203
+ data: {
204
+ f_userfiles_id: this.f_userfiles_id,
205
+ f_userinfo_id: this.f_userinfo_id,
206
+ f_userinfo_code: this.f_userinfo_code
207
+ }
208
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
211
209
  this.row = getBaseInfo.data
212
210
  this.row.parentname = this.parentname || ''
213
211
  },
@@ -167,17 +167,18 @@ export default {
167
167
  },
168
168
  async search () {
169
169
  let http = new HttpResetClass()
170
- let condition = ' 1 = 1'
171
- if (this.f_userfiles_id) {
172
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
173
- } else if (this.f_userinfo_id) {
174
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
175
- } else if (this.f_userinfo_code) {
176
- condition = `f_userinfo_code = '${this.f_userinfo_code}'`
170
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
171
+ this.$showMessage('用户信息缺失,查询详情信息失败')
172
+ return
177
173
  }
178
-
179
174
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
180
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
175
+ {
176
+ data: {
177
+ f_userfiles_id: this.f_userfiles_id,
178
+ f_userinfo_id: this.f_userinfo_id,
179
+ f_userinfo_code: this.f_userinfo_code
180
+ }
181
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
181
182
  this.row = getBaseInfo.data
182
183
  this.row.parentname = this.parentname || ''
183
184
  },
@@ -212,24 +212,21 @@ export default {
212
212
  },
213
213
  async search () {
214
214
  let http = new HttpResetClass()
215
- let condition = ' 1 = 1'
216
- if (this.f_userfiles_id) {
217
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
218
- } else if (this.f_userinfo_id) {
219
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
220
- } else if (this.f_userinfo_code) {
221
- condition = `f_userinfo_code = '${this.f_userinfo_code}'`
222
- }else{
215
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
223
216
  this.$showMessage('用户信息缺失,查询详情信息失败')
224
217
  return
225
218
  }
226
-
227
219
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
228
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
220
+ {
221
+ data: {
222
+ f_userfiles_id: this.f_userfiles_id,
223
+ f_userinfo_id: this.f_userinfo_id,
224
+ f_userinfo_code: this.f_userinfo_code
225
+ }
226
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
229
227
  this.row = getBaseInfo.data
230
228
  this.row.parentname = this.parentname || ''
231
229
  },
232
-
233
230
  cancel (val) {
234
231
  // 判断当前是否在 iframe 环境中
235
232
  this.$emit('cancel-main', val)
@@ -197,17 +197,18 @@ export default {
197
197
  },
198
198
  async search () {
199
199
  let http = new HttpResetClass()
200
- let condition = ' 1 = 1'
201
- if (this.f_userfiles_id) {
202
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
203
- } else if (this.f_userinfo_id) {
204
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
205
- } else if (this.f_userinfo_code) {
206
- condition = `f_userinfo_code = '${this.f_userinfo_code}'`
200
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
201
+ this.$showMessage('用户信息缺失,查询详情信息失败')
202
+ return
207
203
  }
208
-
209
204
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
210
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
205
+ {
206
+ data: {
207
+ f_userfiles_id: this.f_userfiles_id,
208
+ f_userinfo_id: this.f_userinfo_id,
209
+ f_userinfo_code: this.f_userinfo_code
210
+ }
211
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
211
212
  this.row = getBaseInfo.data
212
213
  this.row.parentname = this.parentname || ''
213
214
  },
@@ -186,17 +186,18 @@ export default {
186
186
  },
187
187
  async search () {
188
188
  let http = new HttpResetClass()
189
- let condition = ' 1 = 1'
190
- if (this.f_userfiles_id) {
191
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
192
- } else if (this.f_userinfo_id) {
193
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
194
- } else if (this.f_userinfo_code) {
195
- condition = `f_userinfo_code = '${this.f_userinfo_code}'`
189
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
190
+ this.$showMessage('用户信息缺失,查询详情信息失败')
191
+ return
196
192
  }
197
-
198
193
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
199
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
194
+ {
195
+ data: {
196
+ f_userfiles_id: this.f_userfiles_id,
197
+ f_userinfo_id: this.f_userinfo_id,
198
+ f_userinfo_code: this.f_userinfo_code
199
+ }
200
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
200
201
  this.row = getBaseInfo.data
201
202
  this.row.parentname = this.parentname || ''
202
203
  },
@@ -169,17 +169,18 @@ export default {
169
169
  },
170
170
  async search () {
171
171
  let http = new HttpResetClass()
172
- let condition = ' 1 = 1'
173
- if (this.f_userfiles_id) {
174
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
175
- } else if (this.f_userinfo_id) {
176
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
177
- } else if (this.f_userinfo_code) {
178
- condition = `f_userinfo_code = '${this.f_userinfo_code}'`
172
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
173
+ this.$showMessage('用户信息缺失,查询详情信息失败')
174
+ return
179
175
  }
180
-
181
176
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
182
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
177
+ {
178
+ data: {
179
+ f_userfiles_id: this.f_userfiles_id,
180
+ f_userinfo_id: this.f_userinfo_id,
181
+ f_userinfo_code: this.f_userinfo_code
182
+ }
183
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
183
184
  this.row = getBaseInfo.data
184
185
  this.row.parentname = this.parentname || ''
185
186
  },
@@ -167,17 +167,18 @@ export default {
167
167
  },
168
168
  async search () {
169
169
  let http = new HttpResetClass()
170
- let condition = ' 1 = 1'
171
- if (this.f_userfiles_id) {
172
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
173
- } else if (this.f_userinfo_id) {
174
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
175
- } else if (this.f_userinfo_code) {
176
- condition = `f_userinfo_code = '${this.f_userinfo_code}'`
170
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
171
+ this.$showMessage('用户信息缺失,查询详情信息失败')
172
+ return
177
173
  }
178
-
179
174
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
180
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
175
+ {
176
+ data: {
177
+ f_userfiles_id: this.f_userfiles_id,
178
+ f_userinfo_id: this.f_userinfo_id,
179
+ f_userinfo_code: this.f_userinfo_code
180
+ }
181
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
181
182
  this.row = getBaseInfo.data
182
183
  this.row.parentname = this.parentname || ''
183
184
  },
@@ -142,16 +142,20 @@ export default {
142
142
  },
143
143
  async search () {
144
144
  let http = new HttpResetClass()
145
- let condition = ' 1 = 1'
146
- if (this.f_userfiles_id) {
147
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
148
- } else if (this.f_userinfo_id) {
149
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
145
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
146
+ this.$showMessage('用户信息缺失,查询详情信息失败')
147
+ return
150
148
  }
151
-
152
149
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
153
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
150
+ {
151
+ data: {
152
+ f_userfiles_id: this.f_userfiles_id,
153
+ f_userinfo_id: this.f_userinfo_id,
154
+ f_userinfo_code: this.f_userinfo_code
155
+ }
156
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
154
157
  this.row = getBaseInfo.data
158
+ this.row.parentname = this.parentname || ''
155
159
  },
156
160
 
157
161
  cancel (val) {
@@ -197,21 +197,21 @@ export default {
197
197
  },
198
198
  async search () {
199
199
  let http = new HttpResetClass()
200
- let condition = ' 1 = 1'
201
- if (this.f_userfiles_id) {
202
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
203
- } else if (this.f_userinfo_id) {
204
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
205
- } else if (this.f_userinfo_code) {
206
- condition = `f_userinfo_code = '${this.f_userinfo_code}'`
200
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
201
+ this.$showMessage('用户信息缺失,查询详情信息失败')
202
+ return
207
203
  }
208
-
209
204
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
210
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
205
+ {
206
+ data: {
207
+ f_userfiles_id: this.f_userfiles_id,
208
+ f_userinfo_id: this.f_userinfo_id,
209
+ f_userinfo_code: this.f_userinfo_code
210
+ }
211
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
211
212
  this.row = getBaseInfo.data
212
213
  this.row.parentname = this.parentname || ''
213
214
  },
214
-
215
215
  cancel (val) {
216
216
  this.$emit('cancel-main', val)
217
217
  },
@@ -148,18 +148,20 @@ export default {
148
148
  },
149
149
  async search () {
150
150
  let http = new HttpResetClass()
151
- let condition = ' 1 = 1'
152
- if (this.f_userfiles_id) {
153
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
154
- } else if (this.f_userinfo_id) {
155
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
156
- }else if (this.f_userinfo_code){
157
- condition = `f_userinfo_code = '${this.f_userinfo_code}'`
151
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
152
+ this.$showMessage('用户信息缺失,查询详情信息失败')
153
+ return
158
154
  }
159
-
160
155
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
161
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
156
+ {
157
+ data: {
158
+ f_userfiles_id: this.f_userfiles_id,
159
+ f_userinfo_id: this.f_userinfo_id,
160
+ f_userinfo_code: this.f_userinfo_code
161
+ }
162
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
162
163
  this.row = getBaseInfo.data
164
+ this.row.parentname = this.parentname || ''
163
165
  },
164
166
 
165
167
  cancel (val) {
@@ -188,17 +188,18 @@ export default {
188
188
  },
189
189
  async search () {
190
190
  let http = new HttpResetClass()
191
- let condition = ' 1 = 1'
192
- if (this.f_userfiles_id) {
193
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
194
- } else if (this.f_userinfo_id) {
195
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
196
- } else if (this.f_userinfo_code) {
197
- condition = `f_userinfo_code = '${this.f_userinfo_code}'`
191
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
192
+ this.$showMessage('用户信息缺失,查询详情信息失败')
193
+ return
198
194
  }
199
-
200
195
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
201
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
196
+ {
197
+ data: {
198
+ f_userfiles_id: this.f_userfiles_id,
199
+ f_userinfo_id: this.f_userinfo_id,
200
+ f_userinfo_code: this.f_userinfo_code
201
+ }
202
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
202
203
  this.row = getBaseInfo.data
203
204
  this.row.parentname = this.parentname || ''
204
205
  },
@@ -182,17 +182,18 @@ export default {
182
182
  },
183
183
  async search () {
184
184
  let http = new HttpResetClass()
185
- let condition = ' 1 = 1'
186
- if (this.f_userfiles_id) {
187
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
188
- } else if (this.f_userinfo_id) {
189
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
190
- } else if (this.f_userinfo_code) {
191
- condition = `f_userinfo_code = '${this.f_userinfo_code}'`
185
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
186
+ this.$showMessage('用户信息缺失,查询详情信息失败')
187
+ return
192
188
  }
193
-
194
189
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
195
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
190
+ {
191
+ data: {
192
+ f_userfiles_id: this.f_userfiles_id,
193
+ f_userinfo_id: this.f_userinfo_id,
194
+ f_userinfo_code: this.f_userinfo_code
195
+ }
196
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
196
197
  this.row = getBaseInfo.data
197
198
  this.row.parentname = this.parentname || ''
198
199
  },
@@ -212,20 +212,18 @@ export default {
212
212
  },
213
213
  async search () {
214
214
  let http = new HttpResetClass()
215
- let condition = ' 1 = 1'
216
- if (this.f_userfiles_id) {
217
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
218
- } else if (this.f_userinfo_id) {
219
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
220
- } else if (this.f_userinfo_code) {
221
- condition = `f_userinfo_code = '${this.f_userinfo_code}'`
222
- }else{
215
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
223
216
  this.$showMessage('用户信息缺失,查询详情信息失败')
224
217
  return
225
218
  }
226
-
227
219
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
228
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
220
+ {
221
+ data: {
222
+ f_userfiles_id: this.f_userfiles_id,
223
+ f_userinfo_id: this.f_userinfo_id,
224
+ f_userinfo_code: this.f_userinfo_code
225
+ }
226
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
229
227
  this.row = getBaseInfo.data
230
228
  this.row.parentname = this.parentname || ''
231
229
  },
@@ -172,17 +172,18 @@ export default {
172
172
  },
173
173
  async search () {
174
174
  let http = new HttpResetClass()
175
- let condition = ' 1 = 1'
176
- if (this.f_userfiles_id) {
177
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
178
- } else if (this.f_userinfo_id) {
179
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
180
- } else if (this.f_userinfo_code) {
181
- condition = `f_userinfo_code = '${this.f_userinfo_code}'`
175
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
176
+ this.$showMessage('用户信息缺失,查询详情信息失败')
177
+ return
182
178
  }
183
-
184
179
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
185
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
180
+ {
181
+ data: {
182
+ f_userfiles_id: this.f_userfiles_id,
183
+ f_userinfo_id: this.f_userinfo_id,
184
+ f_userinfo_code: this.f_userinfo_code
185
+ }
186
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
186
187
  this.row = getBaseInfo.data
187
188
  this.row.parentname = this.parentname || ''
188
189
  },
@@ -178,17 +178,18 @@ export default {
178
178
  },
179
179
  async search () {
180
180
  let http = new HttpResetClass()
181
- let condition = ' 1 = 1'
182
- if (this.f_userfiles_id) {
183
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
184
- } else if (this.f_userinfo_id) {
185
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
186
- } else if (this.f_userinfo_code) {
187
- condition = `f_userinfo_code = '${this.f_userinfo_code}'`
181
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
182
+ this.$showMessage('用户信息缺失,查询详情信息失败')
183
+ return
188
184
  }
189
-
190
185
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
191
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
186
+ {
187
+ data: {
188
+ f_userfiles_id: this.f_userfiles_id,
189
+ f_userinfo_id: this.f_userinfo_id,
190
+ f_userinfo_code: this.f_userinfo_code
191
+ }
192
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
192
193
  this.row = getBaseInfo.data
193
194
  this.row.parentname = this.parentname || ''
194
195
  },
@@ -150,18 +150,20 @@ export default {
150
150
  },
151
151
  async search () {
152
152
  let http = new HttpResetClass()
153
- let condition = ' 1 = 1'
154
- if (this.f_userfiles_id) {
155
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
156
- } else if (this.f_userinfo_id) {
157
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
158
- } else if (this.f_userinfo_code){
159
- condition = `f_userinfo_code = '${this.f_userinfo_code}'`
153
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
154
+ this.$showMessage('用户信息缺失,查询详情信息失败')
155
+ return
160
156
  }
161
-
162
157
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
163
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
158
+ {
159
+ data: {
160
+ f_userfiles_id: this.f_userfiles_id,
161
+ f_userinfo_id: this.f_userinfo_id,
162
+ f_userinfo_code: this.f_userinfo_code
163
+ }
164
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
164
165
  this.row = getBaseInfo.data
166
+ this.row.parentname = this.parentname || ''
165
167
  },
166
168
 
167
169
  cancel (val) {
@@ -181,20 +181,18 @@ export default {
181
181
  },
182
182
  async search () {
183
183
  let http = new HttpResetClass()
184
- let condition = ' 1 = 1'
185
- if (this.f_userfiles_id) {
186
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
187
- } else if (this.f_userinfo_id) {
188
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
189
- } else if (this.f_userinfo_code) {
190
- condition = `f_userinfo_code = '${this.f_userinfo_code}'`
191
- }else{
184
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
192
185
  this.$showMessage('用户信息缺失,查询详情信息失败')
193
186
  return
194
187
  }
195
-
196
188
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
197
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
189
+ {
190
+ data: {
191
+ f_userfiles_id: this.f_userfiles_id,
192
+ f_userinfo_id: this.f_userinfo_id,
193
+ f_userinfo_code: this.f_userinfo_code
194
+ }
195
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
198
196
  this.row = getBaseInfo.data
199
197
  this.row.parentname = this.parentname || ''
200
198
  },
@@ -197,20 +197,18 @@ export default {
197
197
  },
198
198
  async search () {
199
199
  let http = new HttpResetClass()
200
- let condition = ' 1 = 1'
201
- if (this.f_userfiles_id) {
202
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
203
- } else if (this.f_userinfo_id) {
204
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
205
- } else if (this.f_userinfo_code) {
206
- condition = `f_userinfo_code = '${this.f_userinfo_code}'`
207
- } else{
200
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
208
201
  this.$showMessage('用户信息缺失,查询详情信息失败')
209
202
  return
210
203
  }
211
-
212
204
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
213
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
205
+ {
206
+ data: {
207
+ f_userfiles_id: this.f_userfiles_id,
208
+ f_userinfo_id: this.f_userinfo_id,
209
+ f_userinfo_code: this.f_userinfo_code
210
+ }
211
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
214
212
  this.row = getBaseInfo.data
215
213
  this.row.parentname = this.parentname || ''
216
214
  },
@@ -196,17 +196,18 @@ export default {
196
196
  },
197
197
  async search () {
198
198
  let http = new HttpResetClass()
199
- let condition = ' 1 = 1'
200
- if (this.f_userfiles_id) {
201
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
202
- } else if (this.f_userinfo_id) {
203
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
204
- } else if (this.f_userinfo_code) {
205
- condition = `f_userinfo_code = '${this.f_userinfo_code}'`
199
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
200
+ this.$showMessage('用户信息缺失,查询详情信息失败')
201
+ return
206
202
  }
207
-
208
203
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
209
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
204
+ {
205
+ data: {
206
+ f_userfiles_id: this.f_userfiles_id,
207
+ f_userinfo_id: this.f_userinfo_id,
208
+ f_userinfo_code: this.f_userinfo_code
209
+ }
210
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
210
211
  this.row = getBaseInfo.data
211
212
  this.row.parentname = this.parentname || ''
212
213
  },
@@ -182,17 +182,18 @@ export default {
182
182
  },
183
183
  async search () {
184
184
  let http = new HttpResetClass()
185
- let condition = ' 1 = 1'
186
- if (this.f_userfiles_id) {
187
- condition = `f_userfiles_id = '${this.f_userfiles_id}'`
188
- } else if (this.f_userinfo_id) {
189
- condition = `f_userinfo_id = '${this.f_userinfo_id}'`
190
- } else if (this.f_userinfo_code) {
191
- condition = `f_userinfo_code = '${this.f_userinfo_code}'`
185
+ if (!this.f_userfiles_id && !this.f_userinfo_id && !this.f_userinfo_code) {
186
+ this.$showMessage('用户信息缺失,查询详情信息失败')
187
+ return
192
188
  }
193
-
194
189
  let getBaseInfo = await http.load('POST', 'api/af-revenue/logic/iot_getUserBaseData',
195
- {data: {f_userfiles_id: this.f_userfiles_id}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
190
+ {
191
+ data: {
192
+ f_userfiles_id: this.f_userfiles_id,
193
+ f_userinfo_id: this.f_userinfo_id,
194
+ f_userinfo_code: this.f_userinfo_code
195
+ }
196
+ }, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
196
197
  this.row = getBaseInfo.data
197
198
  this.row.parentname = this.parentname || ''
198
199
  },
package/src/main.js CHANGED
@@ -2,9 +2,9 @@ import Vue from 'vue'
2
2
  import all from 'vue-client/src/all'
3
3
  import App from './App'
4
4
  import system from 'system-clients/src/system'
5
+ import FilialeSale from './filiale/fugu/sale'
5
6
  import sale from './sale'
6
- import FilialeSale from './filiale/ronghao/sale'
7
- // import address from 'address-client/src/address'
7
+ import address from 'address-client/src/address'
8
8
  import ldap from 'ldap-clients/src/ldap'
9
9
  import VueClipboard from 'vue-clipboard2'
10
10
 
@@ -22,7 +22,7 @@ Vue.config.silent = true
22
22
  all()
23
23
  system(false)
24
24
  sale()
25
- // address()
25
+ address()
26
26
  ldap()
27
27
  FilialeSale()
28
28
  require('system-clients/src/styles/less/bootstrap.less')