manage-client 3.3.96 → 3.3.97

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": "manage-client",
3
- "version": "3.3.96",
3
+ "version": "3.3.97",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -83,7 +83,7 @@
83
83
  <div class="col-sm-2 form-group">
84
84
  <label class="font_normal_body">客户名称</label>
85
85
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
86
- condition="f_user_name = '{}'" placeholder="客户名称">
86
+ condition="f_user_name like '%{}%'" placeholder="客户名称">
87
87
  </div>
88
88
 
89
89
  <!--<div class="col-sm-2 form-group">-->
@@ -34,7 +34,7 @@
34
34
  <div class="col-sm-2 form-group">
35
35
  <label class="font_normal_body">客户名称</label>
36
36
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
37
- condition="f_user_name = '{}'" placeholder="客户名称">
37
+ condition="f_user_name like '%{}%'" placeholder="客户名称">
38
38
  </div>
39
39
 
40
40
  <div class="span" style="float:right;">
@@ -33,7 +33,7 @@
33
33
  <div class="col-sm-2 form-group">
34
34
  <label class="font_normal_body">客户名称</label>
35
35
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
36
- condition="f_user_name = '{}'" placeholder="客户名称">
36
+ condition="f_user_name like '%{}%'" placeholder="客户名称">
37
37
  </div>
38
38
  <div class="span" style="float:right;">
39
39
  <button class="button_search button_spacing" @click="search()">查询</button>
@@ -15,7 +15,7 @@
15
15
  <div class="col-sm-2 form-group">
16
16
  <label class="font_normal_body">客户名称</label>
17
17
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
18
- condition="f_user_name = '{}'" placeholder="客户名称">
18
+ condition="f_user_name like '%{}%'" placeholder="客户名称">
19
19
  </div>
20
20
  <div class="col-sm-2 form-group">
21
21
  <label class="font_normal_body">客户电话</label>
@@ -15,7 +15,7 @@
15
15
  <div class="col-sm-2 form-group" >
16
16
  <label class="font_normal_body">客户名称</label>
17
17
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
18
- condition="f_user_name = '{}'" placeholder="客户名称">
18
+ condition="f_user_name like '%{}%'" placeholder="客户名称">
19
19
  </div>
20
20
  <div class="col-sm-2 form-group" >
21
21
  <label class="font_normal_body">客户状态</label>
@@ -39,7 +39,7 @@
39
39
  <div class="col-sm-2">
40
40
  <label class="font_normal_body">客户名称</label>
41
41
  <input @keyup.enter="search" style="width:60%" type="text" class="input_search" v-model="model.f_username" placeholder='客户名称'
42
- condition="ui.f_user_name = '{}'" v-next-el='userid' v-el:username>
42
+ condition="ui.f_user_name like '%{}%'" v-next-el='userid' v-el:username>
43
43
  </div>
44
44
  <div class="col-sm-2">
45
45
  <label class="font_normal_body">客户地址</label>
@@ -91,10 +91,18 @@
91
91
  value-single="true"
92
92
  :value.sync="model.f_gasproperties2"
93
93
  v-model="model.f_gasproperties2"
94
- :options='$parent.$parent.Gasproperties2'
94
+ :options='this.$appdata.getParam(model.f_gasproperties)?this.$appdata.getParam(model.f_gasproperties):[]'
95
95
  close-on-select condition="f_gasproperties2 {}">
96
96
  </v-select>
97
97
  </div>
98
+ <div class="col-sm-2 form-group">
99
+ <label class="font_normal_body">气价类型</label>
100
+ <v-select :value.sync="model.pricetype" v-model="model.pricetype"
101
+ placeholder='气价类型' :options="$parent.$parent.pricetypes"
102
+ condition="f_price_type = '{}'"
103
+ close-on-select v-ref:type>
104
+ </v-select>
105
+ </div>
98
106
  <div class="col-sm-2 form-group">
99
107
  <label class="font_normal_body">气价名称</label>
100
108
  <v-select :value.sync="model.f_price_name"
@@ -103,12 +111,20 @@
103
111
  condition="f_price_name = '{}'"
104
112
  close-on-select></v-select>
105
113
  </div>
114
+ <div class="col-sm-2 form-group">
115
+ <label class="font_normal_body">&emsp;气表品牌</label>
116
+ <v-select :value.sync="model.f_meter_brand"
117
+ v-model="model.f_meter_brand"
118
+ :options='$parent.$parent.meterbrands' placeholder='请选择'
119
+ condition="f_meter_brand = '{}'"
120
+ close-on-select></v-select>
121
+ </div>
106
122
 
107
123
  <div class="col-sm-2 form-group">
108
124
  <label class="font_normal_body">气表型号</label>
109
125
  <v-select :value.sync="model.f_meter_style"
110
126
  v-model="model.f_meter_style"
111
- :options='$parent.$parent.metertypes' placeholder='请选择'
127
+ :options='$parent.$parent.meterstyle[model.f_meter_brand]' placeholder='请选择'
112
128
  condition="f_meter_style = '{}'"
113
129
  close-on-select></v-select>
114
130
  </div>
@@ -148,14 +164,6 @@
148
164
  close-on-select >
149
165
  </v-select>
150
166
  </div>
151
- <div class="col-sm-2 form-group">
152
- <label class="font_normal_body">&emsp;气表品牌</label>
153
- <v-select :value.sync="model.f_meter_brand"
154
- v-model="model.f_meter_brand"
155
- :options='$parent.$parent.meterbrands' placeholder='请选择'
156
- condition="f_meter_brand = '{}'"
157
- close-on-select></v-select>
158
- </div>
159
167
  <div class="col-sm-2 form-group">
160
168
  <label class="font_normal_body">&emsp;&emsp;&emsp;表号</label>
161
169
  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
@@ -183,46 +191,6 @@
183
191
  condition="f_user_phone like '%{}%'" placeholder="客户电话">
184
192
  </div>
185
193
 
186
- <div v-if="$parent.$parent.meter_classify == '卡表'" class="col-sm-2 flex-row" style="white-space: nowrap">
187
- <label class="font_normal_body">&emsp;期间次数</label>
188
- <div class="row">
189
- <input type="text" style="width:30%" class="input_search" v-model="model.sellcishumin"
190
- condition="sellcishu >= {} " placeholder="">
191
- <label class="font_normal_body"> ≤ x ≤ </label>
192
- <input type="text" style="width:30%" class="input_search" v-model="model.sellcishumax"
193
- condition="sellcishu <= {} " placeholder="">
194
- </div>
195
- </div>
196
- <div v-if="$parent.$parent.meter_classify == '机表'" class="col-sm-2 flex-row" style="white-space: nowrap">
197
- <label class="font_normal_body">&emsp;期间次数</label>
198
- <div class="row">
199
- <input type="text" style="width:30%" class="input_search" v-model="model.handsellcishumin"
200
- condition="sellcishu >= {} " placeholder="">
201
- <label class="font_normal_body"> ≤ x ≤ </label>
202
- <input type="text" style="width:30%" class="input_search" v-model="model.handsellcishumax"
203
- condition="sellcishu <= {} " placeholder="">
204
- </div>
205
- </div>
206
- <div v-if="$parent.$parent.meter_classify == '卡表'" class="col-sm-2 flex-row" style="white-space: nowrap">
207
- <label class="font_normal_body">期间购气量</label>
208
- <div class="row">
209
- <input type="text" style="width:30%" class="input_search" v-model="model.sellpregasmin"
210
- condition="sellpregas >= {} " placeholder="">
211
- <label class="font_normal_body"> ≤ x ≤ </label>
212
- <input type="text" style="width:30%" class="input_search" v-model="model.sellpregasmax"
213
- condition="sellpregas <= {} " placeholder="">
214
- </div>
215
- </div>
216
- <div v-if="$parent.$parent.meter_classify == '机表'" class="col-sm-2 flex-row" style="white-space: nowrap">
217
- <label class="font_normal_body">期间用气量</label>
218
- <div class="row">
219
- <input type="text" style="width:30%" class="input_search" v-model="model.handsellpregasmin"
220
- condition="sellpregas >= {} " placeholder="">
221
- <label class="font_normal_body"> ≤ x ≤ </label>
222
- <input type="text" style="width:30%" class="input_search" v-model="model.handsellpregasmax"
223
- condition="sellpregas <= {} " placeholder="">
224
- </div>
225
- </div>
226
194
  <div class="col-sm-2 form-group">
227
195
  <label for="startOpenDate" class="font_normal_body" title="开户开始日期">开户时间</label>
228
196
  <datepicker id="startOpenDate" placeholder="开户开始日期" style="width:60%"
@@ -272,6 +240,48 @@
272
240
  </div>
273
241
 
274
242
 
243
+ <div v-if="$parent.$parent.meter_classify == '卡表'" class="col-sm-2 flex-row" style="white-space: nowrap">
244
+ <label class="font_normal_body">&emsp;期间次数</label>
245
+ <div class="row">
246
+ <input type="text" style="width:30%" class="input_search" v-model="model.sellcishumin"
247
+ condition="sellcishu >= {} " placeholder="">
248
+ <label class="font_normal_body"> ≤ x ≤ </label>
249
+ <input type="text" style="width:30%" class="input_search" v-model="model.sellcishumax"
250
+ condition="sellcishu <= {} " placeholder="">
251
+ </div>
252
+ </div>
253
+ <div v-if="$parent.$parent.meter_classify == '机表'" class="col-sm-2 flex-row" style="white-space: nowrap">
254
+ <label class="font_normal_body">&emsp;期间次数</label>
255
+ <div class="row">
256
+ <input type="text" style="width:30%" class="input_search" v-model="model.handsellcishumin"
257
+ condition="sellcishu >= {} " placeholder="">
258
+ <label class="font_normal_body"> ≤ x ≤ </label>
259
+ <input type="text" style="width:30%" class="input_search" v-model="model.handsellcishumax"
260
+ condition="sellcishu <= {} " placeholder="">
261
+ </div>
262
+ </div>
263
+ <div v-if="$parent.$parent.meter_classify == '卡表'" class="col-sm-2 flex-row" style="white-space: nowrap">
264
+ <label class="font_normal_body">期间购气量</label>
265
+ <div class="row">
266
+ <input type="text" style="width:30%" class="input_search" v-model="model.sellpregasmin"
267
+ condition="sellpregas >= {} " placeholder="">
268
+ <label class="font_normal_body"> ≤ x ≤ </label>
269
+ <input type="text" style="width:30%" class="input_search" v-model="model.sellpregasmax"
270
+ condition="sellpregas <= {} " placeholder="">
271
+ </div>
272
+ </div>
273
+ <div v-if="$parent.$parent.meter_classify == '机表'" class="col-sm-2 flex-row" style="white-space: nowrap">
274
+ <label class="font_normal_body">期间用气量</label>
275
+ <div class="row">
276
+ <input type="text" style="width:30%" class="input_search" v-model="model.handsellpregasmin"
277
+ condition="sellpregas >= {} " placeholder="">
278
+ <label class="font_normal_body"> ≤ x ≤ </label>
279
+ <input type="text" style="width:30%" class="input_search" v-model="model.handsellpregasmax"
280
+ condition="sellpregas <= {} " placeholder="">
281
+ </div>
282
+ </div>
283
+
284
+
275
285
  </div>
276
286
  </div>
277
287
  </criteria>
@@ -391,6 +401,9 @@
391
401
  filialeNameStr: null,
392
402
  filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
393
403
  userid: this.$login.f.id,
404
+ // 气表型号
405
+ meterstyle: {},
406
+ prices:[],
394
407
  source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
395
408
  getfield:{"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号",
396
409
  "f_user_name":"客户名称","f_user_state":"客户状态","f_address":"地址","f_user_type":"用户类型",
@@ -473,9 +486,17 @@
473
486
  temp.label = item.label
474
487
  temp.value = item.value.f_meter_brand
475
488
  brandArr.push(temp)
489
+ // 取出对应气表型号
490
+ let styleArr = []
491
+ for (let row of item.value.gasmodel) {
492
+ styleArr.push({label: row.label,value: row.value.f_meter_style})
493
+ }
494
+ this.meterstyle[temp.value] = styleArr
476
495
  })
477
496
  this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
478
497
  console.log('气表品牌---------->',this.meterbrands)
498
+ //初始化气表价格
499
+ this.prices = this.$MagGetSaleParam.getPrices();
479
500
  },
480
501
  getotherfooter(){
481
502
  // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
@@ -614,7 +635,10 @@
614
635
  return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
615
636
  },
616
637
  metertypes(){
617
- return this.$getParams('气表型号', [{label: '全部', value: ''}])
638
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表型号')]
639
+ },
640
+ pricetypes() {
641
+ return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
618
642
  },
619
643
  getPricenames() {
620
644
  let f_user_type = this.$refs.paged.$refs.cri.model.f_user_type;