sale-client 3.4.119 → 3.4.120

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 (3) hide show
  1. package/package.json +1 -1
  2. package/src/components/revenue/comprehen/ComprehenOperation/FeeDeduction/feeDeduction.vue +15 -4
  3. package/src/filiale/tongchuan/feeDeduction.vue +14 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.4.119",
3
+ "version": "3.4.120",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/revenue/comprehen/ComprehenOperation/FeeDeduction/feeDeduction.vue CHANGED
@@ -14,7 +14,7 @@
14
14
  </div>
15
15
 
16
16
  <div class="col-sm-4 form-group">
17
- <label class="font_normal_body">&nbsp;操作&nbsp;</label>
17
+ <label class="font_normal_body">操&nbsp;&nbsp;作</label>
18
18
  <input v-show="false" v-model="model.f_operat_type"
19
19
  v-validate:f_operat_type='{required: true}'>
20
20
  <v-select v-if="this.data.f_collection_type==='按金额'" :value.sync="model.f_operat_type"
@@ -46,7 +46,7 @@
46
46
 
47
47
  <div class="row">
48
48
  <div class="col-sm-12">
49
- <label for="f_paper_account" class="font_normal_body ">&nbsp;备注&nbsp;</label>
49
+ <label for="f_paper_account" class="font_normal_body ">备&nbsp;&nbsp;注</label>
50
50
  <input class="input_search" style="width:87%" rows="1" v-model="model.f_comments"></input>
51
51
  </div>
52
52
  </div>
@@ -66,13 +66,24 @@
66
66
 
67
67
  <script>
68
68
  import Vue from 'vue'
69
-
69
+ let asyncfeeDeduction = async function (self) {
70
+ await self.$getConfig(self, 'feeDeduction')
71
+ console.log('物联网补费扣费config', self.config)
72
+ if(self.config.addgas){
73
+ self.model.f_add_gas = '计入'
74
+ } else {
75
+ self.model.f_add_gas = '不计入'
76
+ }
77
+ }
70
78
  export default {
71
79
  title: '物联网表补费扣费',
72
80
  data () {
73
81
  return {
74
82
  blodid: '',
75
83
  showupload: false,
84
+ config: {
85
+ addgas: false
86
+ },
76
87
  addGas: [{label: '计入', value: '计入'}, {label: '不计入', value: '不计入'}],
77
88
  operator_type: [{label: '补费', value: '物联网补费'}, {label: '扣费', value: '物联网扣费'}],
78
89
  operator_type2: [{label: '补气', value: '物联网补气'}, {label: '扣气', value: '物联网扣气'}],
@@ -88,13 +99,13 @@ export default {
88
99
  },
89
100
  props: ['data'],
90
101
  ready () {
91
- this.model.f_add_gas = '不计入'
92
102
  // this.blodid = this.row.f_userinfo_id
93
103
  if (this.data.f_collection_type === '按气量') {
94
104
  this.model.f_operat_type = ['物联网补费']
95
105
  } else {
96
106
  this.model.f_operat_type = ['物联网补费']
97
107
  }
108
+ asyncfeeDeduction(this)
98
109
  },
99
110
  methods: {
100
111
  async confirm () {
package/src/filiale/tongchuan/feeDeduction.vue CHANGED
@@ -52,7 +52,7 @@
52
52
 
53
53
  <div class="row">
54
54
  <div class="col-sm-12">
55
- <label for="f_paper_account" class="font_normal_body ">&nbsp;备注&nbsp;</label>
55
+ <label for="f_paper_account" class="font_normal_body ">备&nbsp;&nbsp;注</label>
56
56
  <input class="input_search" style="width:87%" rows="1" v-model="model.f_comments"></input>
57
57
  </div>
58
58
  </div>
@@ -72,13 +72,24 @@
72
72
 
73
73
  <script>
74
74
  import Vue from 'vue'
75
-
75
+ let asyncfeeDeduction = async function (self) {
76
+ await self.$getConfig(self, 'feeDeduction')
77
+ console.log('物联网补费扣费config', self.config)
78
+ if(self.config.addgas){
79
+ self.model.f_add_gas = '计入'
80
+ } else {
81
+ self.model.f_add_gas = '不计入'
82
+ }
83
+ }
76
84
  export default {
77
85
  title: '物联网表补费扣费',
78
86
  data () {
79
87
  return {
80
88
  blodid: '',
81
89
  showupload: false,
90
+ config: {
91
+ addgas: false
92
+ },
82
93
  addGas: [{label: '计入', value: '计入'}, {label: '不计入', value: '不计入'}],
83
94
  operator_type: [{label: '补费', value: '物联网补费'}, {label: '扣费', value: '物联网扣费'}],
84
95
  operator_type2: [{label: '补气', value: '物联网补气'}, {label: '扣气', value: '物联网扣气'}],
@@ -87,7 +98,6 @@ export default {
87
98
  f_operat_type: '',
88
99
  f_pregas: 0,
89
100
  f_preamount: 0,
90
-
91
101
  f_comments: ''
92
102
  }
93
103
 
@@ -96,12 +106,12 @@ export default {
96
106
  props: ['data'],
97
107
  ready () {
98
108
  // this.blodid = this.row.f_userinfo_id
99
- this.model.f_add_gas = '不计入'
100
109
  if (this.data.f_collection_type === '按气量') {
101
110
  this.model.f_operat_type = ['物联网补费']
102
111
  } else {
103
112
  this.model.f_operat_type = ['物联网补费']
104
113
  }
114
+ asyncfeeDeduction(this)
105
115
  },
106
116
  methods: {
107
117
  async confirm () {