vue2-client 1.14.37 → 1.14.38

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 (9) hide show
  1. package/package.json +1 -1
  2. package/src/pages/userInfoDetailManage/FillCardRecordQuery/index.vue +12 -6
  3. package/src/pages/userInfoDetailManage/FillGasRecordQuery/index.vue +12 -6
  4. package/src/pages/userInfoDetailManage/MachineRecordQuery/index.vue +11 -5
  5. package/src/pages/userInfoDetailManage/OtherChargeRecordQuery/index.vue +12 -6
  6. package/src/pages/userInfoDetailManage/UserChargeRecordQuery/index.vue +12 -7
  7. package/src/pages/userInfoDetailManage/UserHandRecordQuery/index.vue +6 -5
  8. package/src/pages/userInfoDetailManage/UserRecordQuery/index.vue +11 -5
  9. package/src/pages/userInfoDetailManage/index.vue +3 -3
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vue2-client",
3
- "version": "1.14.37",
3
+ "version": "1.14.38",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
package/src/pages/userInfoDetailManage/FillCardRecordQuery/index.vue CHANGED
@@ -13,6 +13,7 @@
13
13
 
14
14
  <script>
15
15
  import { mapState } from 'vuex'
16
+ import { getConfigByName } from '@vue2-client/services/api/common'
16
17
 
17
18
  export default {
18
19
  name: 'FillCardRecordQuery',
@@ -38,12 +39,17 @@ export default {
38
39
  }
39
40
  },
40
41
  created () {
41
- this.fixedQueryForm = {
42
- f_f_userfiles_id: this.currUserInfo.f_userfiles_id,
43
- f_f_userinfo_id: this.currUserInfo.f_userinfo_id,
44
- f_f_user_id: this.currUserInfo.f_user_id
45
- }
46
- this.$refs.xFormTable.refresh(true)
42
+ getConfigByName('revenueConfig', 'af-revenue', (res) => {
43
+ const queryCondition = res.fillCardQueryCondition ? res.fillCardQueryCondition : res.queryCondition
44
+ if (queryCondition === 'f_userfiles_id') {
45
+ this.fixedQueryForm = { f_f_userfiles_id: this.currUserInfo.f_userfiles_id }
46
+ } else if (queryCondition === 'f_userinfo_id') {
47
+ this.fixedQueryForm = { f_f_userinfo_id: this.currUserInfo.f_userinfo_id }
48
+ } else if (queryCondition === 'f_user_id') {
49
+ this.fixedQueryForm = { f_f_user_id: this.currUserInfo.f_user_id }
50
+ }
51
+ this.$refs.xFormTable.refresh(true)
52
+ })
47
53
  },
48
54
  mounted () {
49
55
  },
package/src/pages/userInfoDetailManage/FillGasRecordQuery/index.vue CHANGED
@@ -13,6 +13,7 @@
13
13
 
14
14
  <script>
15
15
  import { mapState } from 'vuex'
16
+ import { getConfigByName } from '@vue2-client/services/api/common'
16
17
 
17
18
  export default {
18
19
  name: 'FillGasRecordQuery',
@@ -38,12 +39,17 @@ export default {
38
39
  }
39
40
  },
40
41
  mounted () {
41
- this.fixedQueryForm = {
42
- f_f_userfiles_id: this.currUserInfo.f_userfiles_id,
43
- f_f_userinfo_id: this.currUserInfo.f_userinfo_id,
44
- f_f_user_id: this.currUserInfo.f_user_id
45
- }
46
- this.$refs.xFormTable.refresh(true)
42
+ getConfigByName('revenueConfig', 'af-revenue', (res) => {
43
+ const queryCondition = res.fillGasQueryCondition ? res.fillGasQueryCondition : res.queryCondition
44
+ if (queryCondition === 'f_userfiles_id') {
45
+ this.fixedQueryForm = { f_f_userfiles_id: this.currUserInfo.f_userfiles_id }
46
+ } else if (queryCondition === 'f_userinfo_id') {
47
+ this.fixedQueryForm = { f_f_userinfo_id: this.currUserInfo.f_userinfo_id }
48
+ } else if (queryCondition === 'f_user_id') {
49
+ this.fixedQueryForm = { f_f_user_id: this.currUserInfo.f_user_id }
50
+ }
51
+ this.$refs.xFormTable.refresh(true)
52
+ })
47
53
  },
48
54
  methods: {
49
55
  action (record, id, actionType) {
package/src/pages/userInfoDetailManage/MachineRecordQuery/index.vue CHANGED
@@ -13,6 +13,7 @@
13
13
 
14
14
  <script>
15
15
  import { mapState } from 'vuex'
16
+ import { getConfigByName } from '@vue2-client/services/api/common'
16
17
 
17
18
  export default {
18
19
  name: 'MachineUserRecordQuery',
@@ -38,11 +39,16 @@ export default {
38
39
  }
39
40
  },
40
41
  mounted () {
41
- this.fixedQueryForm = {
42
- mr_f_userfiles_id: this.currUserInfo.f_userfiles_id,
43
- mr_f_userinfo_id: this.currUserInfo.f_userinfo_id,
44
- mr_f_user_id: this.currUserInfo.f_user_id
45
- }
42
+ getConfigByName('revenueConfig', 'af-revenue', (res) => {
43
+ const queryCondition = res.machineRecordQueryCondition ? res.machineRecordQueryCondition : res.queryCondition
44
+ if (queryCondition === 'f_userfiles_id') {
45
+ this.fixedQueryForm = { mr_f_userfiles_id: this.currUserInfo.f_userfiles_id }
46
+ } else if (queryCondition === 'f_userinfo_id') {
47
+ this.fixedQueryForm = { mr_f_userinfo_id: this.currUserInfo.f_userinfo_id }
48
+ } else if (queryCondition === 'f_user_id') {
49
+ this.fixedQueryForm = { mr_f_user_id: this.currUserInfo.f_user_id }
50
+ }
51
+ })
46
52
  this.$refs.xFormTable.refresh(true)
47
53
  },
48
54
  methods: {
package/src/pages/userInfoDetailManage/OtherChargeRecordQuery/index.vue CHANGED
@@ -13,6 +13,7 @@
13
13
 
14
14
  <script>
15
15
  import { mapState } from 'vuex'
16
+ import { getConfigByName } from '@vue2-client/services/api/common'
16
17
 
17
18
  export default {
18
19
  name: 'OtherChargeRecordQuery',
@@ -38,12 +39,17 @@ export default {
38
39
  }
39
40
  },
40
41
  mounted () {
41
- this.fixedQueryForm = {
42
- o_f_userfiles_id: this.currUserInfo.f_userfiles_id,
43
- o_f_userinfo_id: this.currUserInfo.f_userinfo_id,
44
- o_f_user_id: this.currUserInfo.f_user_id
45
- }
46
- this.$refs.xFormTable.refresh(true)
42
+ getConfigByName('revenueConfig', 'af-revenue', (res) => {
43
+ const queryCondition = res.otherChargeQueryCondition ? res.otherChargeQueryCondition : res.queryCondition
44
+ if (queryCondition === 'f_userfiles_id') {
45
+ this.fixedQueryForm = { o_f_userfiles_id: this.currUserInfo.f_userfiles_id }
46
+ } else if (queryCondition === 'f_userinfo_id') {
47
+ this.fixedQueryForm = { o_f_userinfo_id: this.currUserInfo.f_userinfo_id }
48
+ } else if (queryCondition === 'f_user_id') {
49
+ this.fixedQueryForm = { o_f_user_id: this.currUserInfo.f_user_id }
50
+ }
51
+ this.$refs.xFormTable.refresh(true)
52
+ })
47
53
  },
48
54
  methods: {
49
55
  action (record, id, actionType) {
package/src/pages/userInfoDetailManage/UserChargeRecordQuery/index.vue CHANGED
@@ -14,7 +14,7 @@
14
14
 
15
15
  <script>
16
16
  import { mapState } from 'vuex'
17
- import { getConfigByNameAsync } from '@vue2-client/services/api/common'
17
+ import { getConfigByName, getConfigByNameAsync } from '@vue2-client/services/api/common'
18
18
 
19
19
  export default {
20
20
  name: 'UserChargeRecordQuery',
@@ -46,12 +46,17 @@ export default {
46
46
  } else {
47
47
  this.queryParamsName = 'UserChargeRecordQueryCRUD'
48
48
  }
49
- this.fixedQueryForm = {
50
- uc_f_userfiles_id: this.currUserInfo.f_userfiles_id,
51
- uc_f_userinfo_id: this.currUserInfo.f_userinfo_id,
52
- uc_f_user_id: this.currUserInfo.f_user_id
53
- }
54
- this.$refs.xFormTable.refresh(true)
49
+ getConfigByName('revenueConfig', 'af-revenue', (res) => {
50
+ const queryCondition = res.chargeQueryCondition ? res.chargeQueryCondition : res.queryCondition
51
+ if (queryCondition === 'f_userfiles_id') {
52
+ this.fixedQueryForm = { uc_f_userfiles_id: this.currUserInfo.f_userfiles_id }
53
+ } else if (queryCondition === 'f_userinfo_id') {
54
+ this.fixedQueryForm = { uc_f_userinfo_id: this.currUserInfo.f_userinfo_id }
55
+ } else if (queryCondition === 'f_user_id') {
56
+ this.fixedQueryForm = { uc_f_user_id: this.currUserInfo.f_user_id }
57
+ }
58
+ this.$refs.xFormTable.refresh(true)
59
+ })
55
60
  },
56
61
  methods: {
57
62
  async getBillUrl (type) {
package/src/pages/userInfoDetailManage/UserHandRecordQuery/index.vue CHANGED
@@ -53,11 +53,12 @@ export default {
53
53
  } else {
54
54
  this.queryParamsName = 'HandRecordQueryCRUD'
55
55
  }
56
-
57
- this.fixedQueryForm = {
58
- h_f_userfiles_id: this.currUserInfo.f_userfiles_id,
59
- h_f_userinfo_id: this.currUserInfo.f_userinfo_id,
60
- h_f_user_id: this.currUserInfo.f_user_id
56
+ if (queryCondition === 'f_userfiles_id') {
57
+ this.fixedQueryForm = { h_f_userfiles_id: this.currUserInfo.f_userfiles_id }
58
+ } else if (queryCondition === 'f_userinfo_id') {
59
+ this.fixedQueryForm = { h_f_userinfo_id: this.currUserInfo.f_userinfo_id }
60
+ } else if (queryCondition === 'f_user_id') {
61
+ this.fixedQueryForm = { h_f_user_id: this.currUserInfo.f_user_id }
61
62
  }
62
63
  this.$refs.xFormTable.refresh(true)
63
64
  })
package/src/pages/userInfoDetailManage/UserRecordQuery/index.vue CHANGED
@@ -13,6 +13,7 @@
13
13
 
14
14
  <script>
15
15
  import { mapState } from 'vuex'
16
+ import { getConfigByNameAsync } from '@vue2-client/services/api/common'
16
17
 
17
18
  export default {
18
19
  name: 'UserRecordQuery',
@@ -38,11 +39,16 @@ export default {
38
39
  }
39
40
  },
40
41
  async mounted () {
41
- this.fixedQueryForm = {
42
- uc_f_userfiles_id: this.currUserInfo.f_userfiles_id,
43
- uc_f_userinfo_id: this.currUserInfo.f_userinfo_id,
44
- uc_f_user_id: this.currUserInfo.f_user_id
45
- }
42
+ await getConfigByNameAsync('revenueConfig', 'af-revenue').then((res) => {
43
+ const queryCondition = res.recordQueryCondition ? res.recordQueryCondition : res.queryCondition
44
+ if (queryCondition === 'f_userfiles_id') {
45
+ this.fixedQueryForm = { uc_f_userfiles_id: this.currUserInfo.f_userfiles_id }
46
+ } else if (queryCondition === 'f_userinfo_id') {
47
+ this.fixedQueryForm = { uc_f_userinfo_id: this.currUserInfo.f_userinfo_id }
48
+ } else if (queryCondition === 'f_user_id') {
49
+ this.fixedQueryForm = { uc_f_user_id: this.currUserInfo.f_user_id }
50
+ }
51
+ })
46
52
  this.$refs.xFormTable.refresh(true)
47
53
  },
48
54
  methods: {
package/src/pages/userInfoDetailManage/index.vue CHANGED
@@ -143,8 +143,8 @@ export default {
143
143
  handler () {
144
144
  if (this.userInfo) {
145
145
  console.log('userinfo', this.userInfo)
146
- this.openUserBtnShow = this.userInfo.f_meter_type.includes('物联网表') && this.login?.r.includes('开户权限')
147
- this.valveBtnShow = this.userInfo.f_meter_type.includes('物联网表') && this.userInfo.f_user_state !== '停用' && this.login?.r.includes('开关阀权限')
146
+ this.openUserBtnShow = this.userInfo.f_meter_type.includes('物联网表')
147
+ this.valveBtnShow = this.userInfo.f_meter_type.includes('物联网表') && this.userInfo.f_user_state !== '停用'
148
148
  }
149
149
  },
150
150
  deep: true
@@ -277,7 +277,7 @@ export default {
277
277
  },
278
278
  mounted () {},
279
279
  computed: {
280
- ...mapState('account', { currUser: 'user',login: 'login' }),
280
+ ...mapState('account', { currUser: 'user' }),
281
281
  ...mapState('setting', { isMobile: 'isMobile' })
282
282
  }
283
283
  }