sale-client 3.5.219 → 3.5.220
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/build/dev-server.js +1 -1
- package/package.json +1 -1
- package/src/filiale/xiangyun/cardChargeQuery.vue +26 -11
- package/src/filiale/xiangyun/cardChargeQuery1.vue +26 -11
- package/src/filiale/xiangyun/machineChargeQuery.vue +25 -10
- package/src/filiale/xiangyun/machineChargeQuery1.vue +25 -10
- package/src/main.js +2 -0
package/build/dev-server.js
CHANGED
|
@@ -4,7 +4,7 @@ var path = require('path')
|
|
|
4
4
|
var webpackDevServer = require('webpack-dev-server')
|
|
5
5
|
var compiler = webpack(config)
|
|
6
6
|
// 自己改了这里不要提交 来回覆盖挺麻烦的
|
|
7
|
-
const [localUrl, serverRul] = ['http://
|
|
7
|
+
const [localUrl, serverRul] = ['http://121.36.60.63:8800/', 'http://121.36.60.63:8800/']
|
|
8
8
|
const port = 8089
|
|
9
9
|
|
|
10
10
|
// eslint-disable-next-line new-cap
|
package/package.json
CHANGED
|
@@ -46,15 +46,20 @@
|
|
|
46
46
|
<input type="text" class="input_search" style="width: 60%" v-model="model.f_user_name"
|
|
47
47
|
condition="ui.f_user_name like '%{}%'" placeholder='用户姓名'>
|
|
48
48
|
</div>
|
|
49
|
-
<div
|
|
50
|
-
:class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
|
|
51
|
-
class="form-group">
|
|
49
|
+
<div class="col-sm-2 form-group">
|
|
52
50
|
<label class="font_normal_body">客户类型</label>
|
|
53
|
-
<v-select :value.sync="model.f_user_type"
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
51
|
+
<v-select :value.sync="model.f_user_type"
|
|
52
|
+
@change="$parent.$parent.userTypeChange()"
|
|
53
|
+
:options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
|
|
54
|
+
condition="uf.f_user_type = '{}'"
|
|
55
|
+
close-on-select></v-select>
|
|
56
|
+
</div>
|
|
57
|
+
<div class="col-sm-2 form-group">
|
|
58
|
+
<label class="font_normal_body">用气性质</label>
|
|
59
|
+
<v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
|
|
60
|
+
:options='$parent.$parent.gasproperties' placeholder='请选择'
|
|
61
|
+
condition="uf.f_gasproperties = '{}'"
|
|
62
|
+
close-on-select></v-select>
|
|
58
63
|
</div>
|
|
59
64
|
<div
|
|
60
65
|
:class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
|
|
@@ -144,7 +149,7 @@
|
|
|
144
149
|
self.$refs.paged.$refs.criteria.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
|
|
145
150
|
self.$refs.paged.$refs.criteria.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
|
|
146
151
|
await self.$LoadParams.loadParam(self.f_filialeid)
|
|
147
|
-
self.initMeterBrands()
|
|
152
|
+
self.initMeterBrands()
|
|
148
153
|
}
|
|
149
154
|
|
|
150
155
|
export default {
|
|
@@ -160,6 +165,7 @@
|
|
|
160
165
|
initres: {
|
|
161
166
|
org: [this.$login.f.orgid]
|
|
162
167
|
},
|
|
168
|
+
gasproperties: [],
|
|
163
169
|
sumsmodel: 0,
|
|
164
170
|
// 控制样式
|
|
165
171
|
editList: false,
|
|
@@ -196,7 +202,18 @@
|
|
|
196
202
|
ready () {
|
|
197
203
|
loadParamGem(this)
|
|
198
204
|
},
|
|
205
|
+
computed: {
|
|
206
|
+
},
|
|
199
207
|
methods: {
|
|
208
|
+
userTypeChange () {
|
|
209
|
+
this.gasproperties = []
|
|
210
|
+
if (this.$refs.paged.$refs.criteria.model !== null) {
|
|
211
|
+
this.$refs.paged.$refs.criteria.model.f_gasproperties = ''
|
|
212
|
+
this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
|
|
213
|
+
} else {
|
|
214
|
+
this.gasproperties = [{label: '全部', value: ''}]
|
|
215
|
+
}
|
|
216
|
+
},
|
|
200
217
|
hidden () {
|
|
201
218
|
this.criteriaShow = !this.criteriaShow
|
|
202
219
|
},
|
|
@@ -230,8 +247,6 @@
|
|
|
230
247
|
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
231
248
|
}
|
|
232
249
|
},
|
|
233
|
-
computed: {
|
|
234
|
-
},
|
|
235
250
|
watch: {
|
|
236
251
|
}
|
|
237
252
|
}
|
|
@@ -46,15 +46,20 @@
|
|
|
46
46
|
<input type="text" class="input_search" style="width: 60%" v-model="model.f_user_name"
|
|
47
47
|
condition="ui.f_user_name like '%{}%'" placeholder='用户姓名'>
|
|
48
48
|
</div>
|
|
49
|
-
<div
|
|
50
|
-
:class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
|
|
51
|
-
class="form-group">
|
|
49
|
+
<div class="col-sm-2 form-group">
|
|
52
50
|
<label class="font_normal_body">客户类型</label>
|
|
53
|
-
<v-select :value.sync="model.f_user_type"
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
51
|
+
<v-select :value.sync="model.f_user_type"
|
|
52
|
+
@change="$parent.$parent.userTypeChange()"
|
|
53
|
+
:options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
|
|
54
|
+
condition="uf.f_user_type = '{}'"
|
|
55
|
+
close-on-select></v-select>
|
|
56
|
+
</div>
|
|
57
|
+
<div class="col-sm-2 form-group">
|
|
58
|
+
<label class="font_normal_body">用气性质</label>
|
|
59
|
+
<v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
|
|
60
|
+
:options='$parent.$parent.gasproperties' placeholder='请选择'
|
|
61
|
+
condition="uf.f_gasproperties = '{}'"
|
|
62
|
+
close-on-select></v-select>
|
|
58
63
|
</div>
|
|
59
64
|
<div class="form-group" :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}">
|
|
60
65
|
<label class="font_normal_body">气表品牌</label>
|
|
@@ -106,7 +111,7 @@
|
|
|
106
111
|
self.$refs.paged.$refs.criteria.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
|
|
107
112
|
self.$refs.paged.$refs.criteria.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
|
|
108
113
|
await self.$LoadParams.loadParam(self.f_filialeid)
|
|
109
|
-
self.initMeterBrands()
|
|
114
|
+
self.initMeterBrands()
|
|
110
115
|
}
|
|
111
116
|
export default {
|
|
112
117
|
'title': '卡表收费查询',
|
|
@@ -123,6 +128,7 @@
|
|
|
123
128
|
dep: [],
|
|
124
129
|
user: []
|
|
125
130
|
},
|
|
131
|
+
gasproperties: [],
|
|
126
132
|
meterbrands: [],
|
|
127
133
|
// 控制样式
|
|
128
134
|
editList: false,
|
|
@@ -159,7 +165,18 @@
|
|
|
159
165
|
ready () {
|
|
160
166
|
loadParamGem(this)
|
|
161
167
|
},
|
|
168
|
+
computed: {
|
|
169
|
+
},
|
|
162
170
|
methods: {
|
|
171
|
+
userTypeChange () {
|
|
172
|
+
this.gasproperties = []
|
|
173
|
+
if (this.$refs.paged.$refs.criteria.model !== null) {
|
|
174
|
+
this.$refs.paged.$refs.criteria.model.f_gasproperties = ''
|
|
175
|
+
this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
|
|
176
|
+
} else {
|
|
177
|
+
this.gasproperties = [{label: '全部', value: ''}]
|
|
178
|
+
}
|
|
179
|
+
},
|
|
163
180
|
hidden () {
|
|
164
181
|
this.criteriaShow = !this.criteriaShow
|
|
165
182
|
},
|
|
@@ -192,8 +209,6 @@
|
|
|
192
209
|
this.condition = args.condition
|
|
193
210
|
}
|
|
194
211
|
},
|
|
195
|
-
computed: {
|
|
196
|
-
},
|
|
197
212
|
watch: {
|
|
198
213
|
}
|
|
199
214
|
}
|
|
@@ -46,15 +46,20 @@
|
|
|
46
46
|
<input type="text" class="input_search" style="width: 60%" v-model="model.f_user_name"
|
|
47
47
|
condition="ui.f_user_name like '%{}%'" placeholder='用户姓名'>
|
|
48
48
|
</div>
|
|
49
|
-
<div
|
|
50
|
-
:class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
|
|
51
|
-
class="form-group">
|
|
49
|
+
<div class="col-sm-2 form-group">
|
|
52
50
|
<label class="font_normal_body">客户类型</label>
|
|
53
|
-
<v-select :value.sync="model.f_user_type"
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
51
|
+
<v-select :value.sync="model.f_user_type"
|
|
52
|
+
@change="$parent.$parent.userTypeChange()"
|
|
53
|
+
:options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
|
|
54
|
+
condition="uf.f_user_type = '{}'"
|
|
55
|
+
close-on-select></v-select>
|
|
56
|
+
</div>
|
|
57
|
+
<div class="col-sm-2 form-group">
|
|
58
|
+
<label class="font_normal_body">用气性质</label>
|
|
59
|
+
<v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
|
|
60
|
+
:options='$parent.$parent.gasproperties' placeholder='请选择'
|
|
61
|
+
condition="uf.f_gasproperties = '{}'"
|
|
62
|
+
close-on-select></v-select>
|
|
58
63
|
</div>
|
|
59
64
|
<div class="form-group" :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}">
|
|
60
65
|
<label class="font_normal_body">气表品牌</label>
|
|
@@ -160,6 +165,7 @@ let loadParamGem = async function (self) {
|
|
|
160
165
|
initres: {
|
|
161
166
|
org: [this.$login.f.orgid]
|
|
162
167
|
},
|
|
168
|
+
gasproperties: [],
|
|
163
169
|
meterbrands: [],
|
|
164
170
|
sumsmodel: 0,
|
|
165
171
|
// 控制样式
|
|
@@ -196,7 +202,18 @@ let loadParamGem = async function (self) {
|
|
|
196
202
|
ready () {
|
|
197
203
|
loadParamGem(this)
|
|
198
204
|
},
|
|
205
|
+
computed: {
|
|
206
|
+
},
|
|
199
207
|
methods: {
|
|
208
|
+
userTypeChange () {
|
|
209
|
+
this.gasproperties = []
|
|
210
|
+
if (this.$refs.paged.$refs.criteria.model !== null) {
|
|
211
|
+
this.$refs.paged.$refs.criteria.model.f_gasproperties = ''
|
|
212
|
+
this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
|
|
213
|
+
} else {
|
|
214
|
+
this.gasproperties = [{label: '全部', value: ''}]
|
|
215
|
+
}
|
|
216
|
+
},
|
|
200
217
|
hidden () {
|
|
201
218
|
this.criteriaShow = !this.criteriaShow
|
|
202
219
|
},
|
|
@@ -230,8 +247,6 @@ let loadParamGem = async function (self) {
|
|
|
230
247
|
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
231
248
|
}
|
|
232
249
|
},
|
|
233
|
-
computed: {
|
|
234
|
-
},
|
|
235
250
|
watch: {
|
|
236
251
|
}
|
|
237
252
|
}
|
|
@@ -46,15 +46,20 @@
|
|
|
46
46
|
<input type="text" class="input_search" style="width: 60%" v-model="model.f_user_name"
|
|
47
47
|
condition="ui.f_user_name like '%{}%'" placeholder='用户姓名'>
|
|
48
48
|
</div>
|
|
49
|
-
<div
|
|
50
|
-
:class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
|
|
51
|
-
class="form-group">
|
|
49
|
+
<div class="col-sm-2 form-group">
|
|
52
50
|
<label class="font_normal_body">客户类型</label>
|
|
53
|
-
<v-select :value.sync="model.f_user_type"
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
51
|
+
<v-select :value.sync="model.f_user_type"
|
|
52
|
+
@change="$parent.$parent.userTypeChange()"
|
|
53
|
+
:options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
|
|
54
|
+
condition="uf.f_user_type = '{}'"
|
|
55
|
+
close-on-select></v-select>
|
|
56
|
+
</div>
|
|
57
|
+
<div class="col-sm-2 form-group">
|
|
58
|
+
<label class="font_normal_body">用气性质</label>
|
|
59
|
+
<v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
|
|
60
|
+
:options='$parent.$parent.gasproperties' placeholder='请选择'
|
|
61
|
+
condition="uf.f_gasproperties = '{}'"
|
|
62
|
+
close-on-select></v-select>
|
|
58
63
|
</div>
|
|
59
64
|
<div
|
|
60
65
|
:class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
|
|
@@ -119,6 +124,7 @@
|
|
|
119
124
|
searchshow: true,
|
|
120
125
|
criteriaShow: false,
|
|
121
126
|
meterbrands: [],
|
|
127
|
+
gasproperties: [],
|
|
122
128
|
initres: {
|
|
123
129
|
org: [this.$login.f.orgid],
|
|
124
130
|
dep: [],
|
|
@@ -159,7 +165,18 @@
|
|
|
159
165
|
ready () {
|
|
160
166
|
loadParamGem(this)
|
|
161
167
|
},
|
|
168
|
+
computed: {
|
|
169
|
+
},
|
|
162
170
|
methods: {
|
|
171
|
+
userTypeChange () {
|
|
172
|
+
this.gasproperties = []
|
|
173
|
+
if (this.$refs.paged.$refs.criteria.model !== null) {
|
|
174
|
+
this.$refs.paged.$refs.criteria.model.f_gasproperties = ''
|
|
175
|
+
this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
|
|
176
|
+
} else {
|
|
177
|
+
this.gasproperties = [{label: '全部', value: ''}]
|
|
178
|
+
}
|
|
179
|
+
},
|
|
163
180
|
hidden () {
|
|
164
181
|
this.criteriaShow = !this.criteriaShow
|
|
165
182
|
},
|
|
@@ -192,8 +209,6 @@
|
|
|
192
209
|
this.condition = args.condition
|
|
193
210
|
}
|
|
194
211
|
},
|
|
195
|
-
computed: {
|
|
196
|
-
},
|
|
197
212
|
watch: {
|
|
198
213
|
}
|
|
199
214
|
}
|
package/src/main.js
CHANGED
|
@@ -3,6 +3,7 @@ import all from 'vue-client/src/all'
|
|
|
3
3
|
import App from './App'
|
|
4
4
|
import system from 'system-clients/src/system'
|
|
5
5
|
import sale from './sale'
|
|
6
|
+
import FilialeSale from './filiale/xiangyun/sale'
|
|
6
7
|
import address from 'address-client/src/address'
|
|
7
8
|
import ldap from 'ldap-clients/src/ldap'
|
|
8
9
|
import VueClipboard from 'vue-clipboard2'
|
|
@@ -12,6 +13,7 @@ Vue.config.silent = true
|
|
|
12
13
|
all()
|
|
13
14
|
system(false)
|
|
14
15
|
sale()
|
|
16
|
+
FilialeSale()
|
|
15
17
|
address()
|
|
16
18
|
ldap()
|
|
17
19
|
require('system-clients/src/styles/less/bootstrap.less')
|