sale-client 3.5.215 → 3.5.216

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 (7) hide show
  1. package/package.json +1 -1
  2. package/src/components/charge/saletabbut.vue +1 -1
  3. package/src/filiale/gaomi/sale.js +0 -15
  4. package/src/filiale/xiangyun/cardChargeQuery.vue +0 -9
  5. package/src/filiale/xiangyun/cardChargeQuery1.vue +208 -199
  6. package/src/filiale/xiangyun/machineChargeQuery.vue +0 -9
  7. package/src/filiale/xiangyun/machineChargeQuery1.vue +9 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.5.215",
3
+ "version": "3.5.216",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/charge/saletabbut.vue CHANGED
@@ -1,7 +1,7 @@
1
1
  <template>
2
2
  <div class='flex foot_tabset1'>
3
3
  <!-- Nav tabs -->
4
- <ul class="nav span nav-{{navStyle}}" role="tablist" style="margin-left: 1%">
4
+ <ul class="nav span nav-{{navStyle}}" role="tablist" style="margin-left: 1%;height:auto">
5
5
  <li style="margin-right: 10px"
6
6
  :id="'vc-tabset-li-'+attach +'-'+$index"
7
7
  v-for="r in renderData"
package/src/filiale/gaomi/sale.js CHANGED
@@ -24,18 +24,3 @@ export default function () {
24
24
  // 物联网表
25
25
  Vue.component('iot-meter-center', (resolve) => { require(['./components/IOTMeterCenter'], resolve) })
26
26
  }
27
- // 分公司特殊组件页面注册
28
- import Vue from 'vue'
29
-
30
- export default function () {
31
- // 机表抄表 (别改这个了, 用新的抄表界面)
32
- Vue.component('hand-manager', (resolve) => { require(['./HandManager'], resolve) })
33
-
34
- }
35
- // 分公司特殊组件页面注册
36
- import Vue from 'vue'
37
-
38
- export default function () {
39
-
40
- }
41
-
package/src/filiale/xiangyun/cardChargeQuery.vue CHANGED
@@ -180,15 +180,6 @@
180
180
  'f_realamount': '应收金额',
181
181
  'f_preprice': '应收气价',
182
182
  'f_price': '预收气价',
183
- 'f_stair_gas1': '一阶气量',
184
- 'f_stair_price1': '一阶气价',
185
- 'f_stair_money1': '一阶气费',
186
- 'f_stair_gas2': '二阶气量',
187
- 'f_stair_price2': '二阶气价',
188
- 'f_stair_money2': '二阶气费',
189
- 'f_stair_gas3': '三阶气量',
190
- 'f_stair_price3': '三阶气价',
191
- 'f_stair_money3': '三阶气费',
192
183
  'f_refund': '是否退费',
193
184
  'f_refundfee': '退费金额',
194
185
  'f_refund_date': '退费日期',
package/src/filiale/xiangyun/cardChargeQuery1.vue CHANGED
@@ -1,199 +1,208 @@
1
- <template>
2
- <div>
3
- <div class="flex">
4
- <div class="basic-main" :class="{'basic-main':!selectRow,'binary-left':selectRow}" style="height: 98%;">
5
- <criteria-paged :model="model" v-ref:paged>
6
- <criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch"
7
- v-show="$parent.searchshow">
8
- <div novalidate class="form-inline auto" partial>
9
- <div class="row">
10
- <res-select-group :style="$parent.$parent.style" :show-component="['company']" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getorg" v-ref:sel></res-select-group>
11
- <div
12
- :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
13
- class="form-group">
14
- <label class="font_normal_body">用户编号</label>
15
- <input type="text" class="input_search" style="width: 60%" v-model="model.f_userinfo_code"
16
- condition="ui.f_userinfo_code like '%{}%'" placeholder='用户编号'>
17
- </div>
18
- <div style="float:right;margin-top: 8px" class="span">
19
- <button class="button_spacing button_search" @click="search()">查 询</button>
20
- <export-excel v-if="$parent.$parent.excelTable"
21
- class="auto"
22
- :data="{condition: $parent.$parent.condition}"
23
- :field="$parent.$parent.getfield"
24
- sqlurl="rs/logic/saleExport" progress="saleGetExportProgress" sql-name="cardChargeQuery"
25
- template-name='卡表收费查询'
26
- :choose-col="true"></export-excel>
27
- <div
28
- :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
29
- @click="$parent.$parent.hidden()"
30
- class="button_spacing"
31
- style="float: right"></div>
32
- </div>
33
- </div>
34
- <div class="row" v-if="$parent.$parent.criteriaShow">
35
- <div
36
- :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
37
- class="form-group">
38
- <label class="font_normal_body">收费编号</label>
39
- <input type="text" class="input_search" style="width: 60%" v-model="model.id"
40
- condition="sg.id = '{}'" placeholder='用户编号'>
41
- </div>
42
- <div
43
- :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
44
- class="form-group">
45
- <label class="font_normal_body">用户姓名</label>
46
- <input type="text" class="input_search" style="width: 60%" v-model="model.f_user_name"
47
- condition="ui.f_user_name like '%{}%'" placeholder='用户姓名'>
48
- </div>
49
- <div
50
- :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
51
- class="form-group">
52
- <label class="font_normal_body">客户类型</label>
53
- <v-select :value.sync="model.f_user_type" v-model="model.f_user_type"
54
- :options='$parent.$parent.usertypes' placeholder='客户类型'
55
- style="width:60%"
56
- close-on-select
57
- condition="uf.f_user_type = '{}'"></v-select>
58
- </div>
59
- <div class="form-group" :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}">
60
- <label class="font_normal_body">气表品牌</label>
61
- <v-select :value.sync="model.f_meter_brand" multiple
62
- v-model="model.f_meter_brand"
63
- :options='$parent.$parent.meterbrands' placeholder='请选择'
64
- condition="gd.f_meter_brand in {}"
65
- close-on-select></v-select>
66
- </div>
67
- <div
68
- :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
69
- class="form-group">
70
- <label class="font_normal_body">开始日期</label>
71
- <datepicker placeholder="开始日期" v-model="model.startDate" :value.sync="model.startDate" style="width:60%"
72
- :format="'yyyy-MM-dd 00:00:00'" condition="sg.f_operate_date >= '{}'">
73
- </datepicker>
74
- </div>
75
- <div
76
- :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
77
- class="form-group">
78
- <label class="font_normal_body">结束日期</label>
79
- <datepicker placeholder="结束日期" v-model="model.endDate" :value.sync="model.endDate" style="width:60%"
80
- :format="'yyyy-MM-dd 23:59:59'" condition="sg.f_operate_date <= '{}'">
81
- </datepicker>
82
- </div>
83
- </div>
84
- </div>
85
- </criteria>
86
- <data-grid :model="model" v-ref:grid class="list_area table_sy" partial='list'>
87
- <template partial='head'>
88
- <tr>
89
- <th v-for="(key,value ) in $parent.$parent.$parent.getfield" ><nobr>{{value}}</nobr></th>
90
- </tr>
91
- </template>
92
- <template partial='body'>
93
- <td style="text-align: center;" v-for="(key,value ) in $parent.$parent.$parent.getfield"><nobr>{{row[key]}}</nobr></td>
94
- </template>
95
- </data-grid>
96
- </criteria-paged>
97
- </div>
98
- </div>
99
- </div>
100
- </template>
101
-
102
- <script>
103
- import {PagedList} from 'vue-client'
104
-
105
- let loadParamGem = async function (self) {
106
- self.$refs.paged.$refs.criteria.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
107
- self.$refs.paged.$refs.criteria.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
108
- await self.$LoadParams.loadParam(self.f_filialeid)
109
- self.initMeterBrands()()
110
- }
111
- export default {
112
- 'title': '卡表收费查询',
113
- data () {
114
- return {
115
- usertypes: this.$appdata.getParam('客户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('客户类型')] : [],
116
- refunds: [{label: '全部', value: ''}, {label: '是', value: 'is not null'}, {label: '否', value: 'is null'}],
117
- model: new PagedList('rs/sql/cardChargeQuery', 20),
118
- // 控制查询条件显示
119
- searchshow: true,
120
- criteriaShow: false,
121
- initres: {
122
- org: [this.$login.f.orgid],
123
- dep: [],
124
- user: []
125
- },
126
- meterbrands: [],
127
- // 控制样式
128
- editList: false,
129
- excelTable: true,
130
- condition: '',
131
- getfield: {
132
- 'id': '收费编号',
133
- 'f_meternumber': '表号',
134
- 'f_userinfo_code': '用户编号',
135
- 'f_user_name': '用户姓名',
136
- 'f_meter_brand': '气表品牌',
137
- 'f_operate_date': '收费时间',
138
- 'f_pregas': '购气气量',
139
- 'f_address': '地址',
140
- 'f_user_type': '客户类型',
141
- 'f_realamount': '应收金额',
142
- 'f_preprice': '应收气价',
143
- 'f_operator': '操作员',
144
- 'f_depname': '所属部门',
145
- 'f_orgname': '所属公司'
146
- },
147
- f_orgid: ''
148
- }
149
- },
150
- ready () {
151
- loadParamGem(this)
152
- },
153
- methods: {
154
- hidden () {
155
- this.criteriaShow = !this.criteriaShow
156
- },
157
- getorg (val) {
158
- this.f_orgid = val
159
- },
160
- initMeterBrands () {
161
- // 初始化气表品牌
162
- let brandArr = []
163
- this.$GetSaleParam.getGasbrand().forEach((item) => {
164
- let temp = {}
165
- temp.label = item.label
166
- temp.value = item.value.f_meter_brand
167
- brandArr.push(temp)
168
- })
169
- this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
170
- },
171
- search () {
172
- this.$refs.paged.$refs.criteria.search()
173
- },
174
- selfSearch (args) {
175
- if (!this.f_orgid) {
176
- this.getorg([this.$login.f.orgid])
177
- }
178
- if (this.f_orgid) {
179
- args.condition = `${args.condition} ${this.f_orgid}`
180
- }
181
- args.condition = args.condition.replace('f_orgid', 'sg.f_orgid')
182
- this.model.search(args.condition, args.model)
183
- this.condition = args.condition
184
- }
185
- },
186
- computed: {
187
- },
188
- watch: {
189
- }
190
- }
191
- </script>
192
- <style>
193
- .datapanel {
194
- color: #333;
195
- background-color: white;
196
- padding: 10px 20px;
197
- border-radius: 15px;
198
- }
199
- </style>
1
+ <template>
2
+ <div>
3
+ <div class="flex">
4
+ <div class="basic-main" :class="{'basic-main':!selectRow,'binary-left':selectRow}" style="height: 98%;">
5
+ <criteria-paged :model="model" v-ref:paged>
6
+ <criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch"
7
+ v-show="$parent.searchshow">
8
+ <div novalidate class="form-inline auto" partial>
9
+ <div class="row">
10
+ <res-select-group :style="$parent.$parent.style" :show-component="['company']" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getorg" v-ref:sel></res-select-group>
11
+ <div
12
+ :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
13
+ class="form-group">
14
+ <label class="font_normal_body">用户编号</label>
15
+ <input type="text" class="input_search" style="width: 60%" v-model="model.f_userinfo_code"
16
+ condition="ui.f_userinfo_code like '%{}%'" placeholder='用户编号'>
17
+ </div>
18
+ <div style="float:right;margin-top: 8px" class="span">
19
+ <button class="button_spacing button_search" @click="search()">查 询</button>
20
+ <export-excel v-if="$parent.$parent.excelTable"
21
+ class="auto"
22
+ :data="{condition: $parent.$parent.condition}"
23
+ :field="$parent.$parent.getfield"
24
+ sqlurl="rs/logic/saleExport" progress="saleGetExportProgress" sql-name="cardChargeQuery"
25
+ template-name='卡表收费查询'
26
+ :choose-col="true"></export-excel>
27
+ <div
28
+ :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
29
+ @click="$parent.$parent.hidden()"
30
+ class="button_spacing"
31
+ style="float: right"></div>
32
+ </div>
33
+ </div>
34
+ <div class="row" v-if="$parent.$parent.criteriaShow">
35
+ <div
36
+ :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
37
+ class="form-group">
38
+ <label class="font_normal_body">收费编号</label>
39
+ <input type="text" class="input_search" style="width: 60%" v-model="model.id"
40
+ condition="sg.id = '{}'" placeholder='用户编号'>
41
+ </div>
42
+ <div
43
+ :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
44
+ class="form-group">
45
+ <label class="font_normal_body">用户姓名</label>
46
+ <input type="text" class="input_search" style="width: 60%" v-model="model.f_user_name"
47
+ condition="ui.f_user_name like '%{}%'" placeholder='用户姓名'>
48
+ </div>
49
+ <div
50
+ :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
51
+ class="form-group">
52
+ <label class="font_normal_body">客户类型</label>
53
+ <v-select :value.sync="model.f_user_type" v-model="model.f_user_type"
54
+ :options='$parent.$parent.usertypes' placeholder='客户类型'
55
+ style="width:60%"
56
+ close-on-select
57
+ condition="uf.f_user_type = '{}'"></v-select>
58
+ </div>
59
+ <div class="form-group" :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}">
60
+ <label class="font_normal_body">气表品牌</label>
61
+ <v-select :value.sync="model.f_meter_brand" multiple
62
+ v-model="model.f_meter_brand"
63
+ :options='$parent.$parent.meterbrands' placeholder='请选择'
64
+ condition="gd.f_meter_brand in {}"
65
+ close-on-select></v-select>
66
+ </div>
67
+ <div
68
+ :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
69
+ class="form-group">
70
+ <label class="font_normal_body">开始日期</label>
71
+ <datepicker placeholder="开始日期" v-model="model.startDate" :value.sync="model.startDate" style="width:60%"
72
+ :format="'yyyy-MM-dd 00:00:00'" condition="sg.f_operate_date >= '{}'">
73
+ </datepicker>
74
+ </div>
75
+ <div
76
+ :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
77
+ class="form-group">
78
+ <label class="font_normal_body">结束日期</label>
79
+ <datepicker placeholder="结束日期" v-model="model.endDate" :value.sync="model.endDate" style="width:60%"
80
+ :format="'yyyy-MM-dd 23:59:59'" condition="sg.f_operate_date <= '{}'">
81
+ </datepicker>
82
+ </div>
83
+ </div>
84
+ </div>
85
+ </criteria>
86
+ <data-grid :model="model" v-ref:grid class="list_area table_sy" partial='list'>
87
+ <template partial='head'>
88
+ <tr>
89
+ <th v-for="(key,value ) in $parent.$parent.$parent.getfield" ><nobr>{{value}}</nobr></th>
90
+ </tr>
91
+ </template>
92
+ <template partial='body'>
93
+ <td style="text-align: center;" v-for="(key,value ) in $parent.$parent.$parent.getfield"><nobr>{{row[key]}}</nobr></td>
94
+ </template>
95
+ </data-grid>
96
+ </criteria-paged>
97
+ </div>
98
+ </div>
99
+ </div>
100
+ </template>
101
+
102
+ <script>
103
+ import {PagedList} from 'vue-client'
104
+
105
+ let loadParamGem = async function (self) {
106
+ self.$refs.paged.$refs.criteria.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
107
+ self.$refs.paged.$refs.criteria.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
108
+ await self.$LoadParams.loadParam(self.f_filialeid)
109
+ self.initMeterBrands()()
110
+ }
111
+ export default {
112
+ 'title': '卡表收费查询',
113
+ data () {
114
+ return {
115
+ usertypes: this.$appdata.getParam('客户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('客户类型')] : [],
116
+ refunds: [{label: '全部', value: ''}, {label: '是', value: 'is not null'}, {label: '否', value: 'is null'}],
117
+ model: new PagedList('rs/sql/cardChargeQuery', 20),
118
+ // 控制查询条件显示
119
+ searchshow: true,
120
+ criteriaShow: false,
121
+ initres: {
122
+ org: [this.$login.f.orgid],
123
+ dep: [],
124
+ user: []
125
+ },
126
+ meterbrands: [],
127
+ // 控制样式
128
+ editList: false,
129
+ excelTable: true,
130
+ condition: '',
131
+ getfield: {
132
+ 'id': '收费编号',
133
+ 'f_meternumber': '表号',
134
+ 'f_userinfo_code': '用户编号',
135
+ 'f_user_name': '用户姓名',
136
+ 'f_meter_brand': '气表品牌',
137
+ 'f_operate_date': '收费时间',
138
+ 'f_stair_gas1': '一阶气量',
139
+ 'f_stair_price1': '一阶气价',
140
+ 'f_stair_money1': '一阶气费',
141
+ 'f_stair_gas2': '二阶气量',
142
+ 'f_stair_price2': '二阶气价',
143
+ 'f_stair_money2': '二阶气费',
144
+ 'f_stair_gas3': '三阶气量',
145
+ 'f_stair_price3': '三阶气价',
146
+ 'f_stair_money3': '三阶气费',
147
+ 'f_pregas': '购气气量',
148
+ 'f_address': '地址',
149
+ 'f_user_type': '客户类型',
150
+ 'f_realamount': '应收金额',
151
+ 'f_preprice': '应收气价',
152
+ 'f_operator': '操作员',
153
+ 'f_depname': '所属部门',
154
+ 'f_orgname': '所属公司'
155
+ },
156
+ f_orgid: ''
157
+ }
158
+ },
159
+ ready () {
160
+ loadParamGem(this)
161
+ },
162
+ methods: {
163
+ hidden () {
164
+ this.criteriaShow = !this.criteriaShow
165
+ },
166
+ getorg (val) {
167
+ this.f_orgid = val
168
+ },
169
+ initMeterBrands () {
170
+ // 初始化气表品牌
171
+ let brandArr = []
172
+ this.$GetSaleParam.getGasbrand().forEach((item) => {
173
+ let temp = {}
174
+ temp.label = item.label
175
+ temp.value = item.value.f_meter_brand
176
+ brandArr.push(temp)
177
+ })
178
+ this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
179
+ },
180
+ search () {
181
+ this.$refs.paged.$refs.criteria.search()
182
+ },
183
+ selfSearch (args) {
184
+ if (!this.f_orgid) {
185
+ this.getorg([this.$login.f.orgid])
186
+ }
187
+ if (this.f_orgid) {
188
+ args.condition = `${args.condition} ${this.f_orgid}`
189
+ }
190
+ args.condition = args.condition.replace('f_orgid', 'sg.f_orgid')
191
+ this.model.search(args.condition, args.model)
192
+ this.condition = args.condition
193
+ }
194
+ },
195
+ computed: {
196
+ },
197
+ watch: {
198
+ }
199
+ }
200
+ </script>
201
+ <style>
202
+ .datapanel {
203
+ color: #333;
204
+ background-color: white;
205
+ padding: 10px 20px;
206
+ border-radius: 15px;
207
+ }
208
+ </style>
package/src/filiale/xiangyun/machineChargeQuery.vue CHANGED
@@ -180,15 +180,6 @@ let loadParamGem = async function (self) {
180
180
  'f_realamount': '结算气费',
181
181
  'f_preprice': '应收气价',
182
182
  'f_price': '预收气价',
183
- 'f_stair_gas1': '一阶气量',
184
- 'f_stair_price1': '一阶气价',
185
- 'f_stair_money1': '一阶气费',
186
- 'f_stair_gas2': '二阶气量',
187
- 'f_stair_price2': '二阶气价',
188
- 'f_stair_money2': '二阶气费',
189
- 'f_stair_gas3': '三阶气量',
190
- 'f_stair_price3': '三阶气价',
191
- 'f_stair_money3': '三阶气费',
192
183
  'f_refund': '是否退费',
193
184
  'f_refundfee': '退费金额',
194
185
  'f_refund_date': '退费日期',
package/src/filiale/xiangyun/machineChargeQuery1.vue CHANGED
@@ -139,6 +139,15 @@
139
139
  'f_address': '地址',
140
140
  'f_user_type': '客户类型',
141
141
  'f_realamount': '应收金额',
142
+ 'f_stair_gas1': '一阶气量',
143
+ 'f_stair_price1': '一阶气价',
144
+ 'f_stair_money1': '一阶气费',
145
+ 'f_stair_gas2': '二阶气量',
146
+ 'f_stair_price2': '二阶气价',
147
+ 'f_stair_money2': '二阶气费',
148
+ 'f_stair_gas3': '三阶气量',
149
+ 'f_stair_price3': '三阶气价',
150
+ 'f_stair_money3': '三阶气费',
142
151
  'f_preprice': '应收气价',
143
152
  'f_operator': '操作员',
144
153
  'f_depname': '所属部门',