sale-client 3.4.101 → 3.4.102

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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.4.101",
3
+ "version": "3.4.102",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -97,7 +97,7 @@ import ChangeRecord from './ic_detail/ChangeRecord'
97
97
  import DeveiceRecord from './ic_detail/DeveiceRecord'
98
98
  export default {
99
99
  title: '用户详细信息',
100
- props: ['f_userfiles_id'],
100
+ props: ['f_userfiles_id', 'f_userinfo_id'],
101
101
  components: {
102
102
  PriceAdjustmentQueryUser,
103
103
  PriceChangeQueryUser,
@@ -142,8 +142,12 @@ export default {
142
142
  },
143
143
  async search () {
144
144
  let http = new HttpResetClass()
145
-
146
- let condition = `f_userfiles_id = '${this.f_userfiles_id}'`
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}'`
150
+ }
147
151
 
148
152
  let getBaseInfo = await http.load('POST', 'rs/sql/iot_getUserBaseData',
149
153
  {data: {condition: condition}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})