manage-client-xy 3.2.4 → 3.2.6
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 +1 -1
- package/src/components/sale/businessquery/ChangeMeterQuery.vue +1 -1
- package/src/components/sale/businessquery/ChargeQuery.vue +2 -2
- package/src/components/sale/businessquery/DisableQuery.vue +1 -1
- package/src/components/sale/businessquery/EnableQuery.vue +1 -1
- package/src/components/sale/businessquery/FillCardQuery.vue +1 -1
- package/src/components/sale/businessquery/FillGasQuery.vue +1 -1
- package/src/components/sale/businessquery/MoveQuery.vue +13 -1
package/package.json
CHANGED
|
@@ -517,7 +517,7 @@ export default {
|
|
|
517
517
|
if(this.f_outlets[0] === '是'){
|
|
518
518
|
args.condition+= ` and f_outlets = '手持设备'`
|
|
519
519
|
} else if (this.f_outlets[0] === '否'){
|
|
520
|
-
args.condition+= ` and f_outlets
|
|
520
|
+
args.condition+= ` and f_outlets is null`
|
|
521
521
|
}
|
|
522
522
|
|
|
523
523
|
args.condition = `${args.condition}` + this.orgCondtionStr
|
|
@@ -271,7 +271,7 @@
|
|
|
271
271
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_serial_id"
|
|
272
272
|
condition=" f_serial_id like '%{}%'" placeholder='表编号'>
|
|
273
273
|
</div>
|
|
274
|
-
|
|
274
|
+
|
|
275
275
|
<div class="col-sm-2 form-group">
|
|
276
276
|
<label class="font_normal_body">是否<br/>手持设备</label>
|
|
277
277
|
<v-select :value.sync="$parent.$parent.f_outlets"
|
|
@@ -863,7 +863,7 @@
|
|
|
863
863
|
if(this.f_outlets[0] === '是'){
|
|
864
864
|
args.condition+= ` and f_outlets = '手持设备'`
|
|
865
865
|
} else if (this.f_outlets[0] === '否'){
|
|
866
|
-
args.condition+= ` and f_outlets
|
|
866
|
+
args.condition+= ` and f_outlets is null`
|
|
867
867
|
}
|
|
868
868
|
this.condition = args.condition
|
|
869
869
|
this.model.search(args.condition, args.model)
|
|
@@ -303,7 +303,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
|
303
303
|
if(this.f_outlets[0] === '是'){
|
|
304
304
|
args.condition+= ` and f_outlets = '手持设备'`
|
|
305
305
|
} else if (this.f_outlets[0] === '否'){
|
|
306
|
-
args.condition+= ` and f_outlets
|
|
306
|
+
args.condition+= ` and f_outlets is null`
|
|
307
307
|
}
|
|
308
308
|
|
|
309
309
|
args.condition = `${args.condition}` + this.orgCondtionStr
|
|
@@ -297,7 +297,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
|
297
297
|
if(this.f_outlets[0] === '是'){
|
|
298
298
|
args.condition+= ` and f_outlets = '手持设备'`
|
|
299
299
|
} else if (this.f_outlets[0] === '否'){
|
|
300
|
-
args.condition+= ` and f_outlets
|
|
300
|
+
args.condition+= ` and f_outlets is null`
|
|
301
301
|
}
|
|
302
302
|
|
|
303
303
|
args.condition = `${args.condition} ` + this.orgCondtionStr
|
|
@@ -352,7 +352,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
|
352
352
|
if(this.f_outlets[0] === '是'){
|
|
353
353
|
args.condition+= ` and f_outlets = '手持设备'`
|
|
354
354
|
} else if (this.f_outlets[0] === '否'){
|
|
355
|
-
args.condition+= ` and f_outlets
|
|
355
|
+
args.condition+= ` and f_outlets is null`
|
|
356
356
|
}
|
|
357
357
|
|
|
358
358
|
args.condition = `${args.condition}` + this.orgCondtionStr
|
|
@@ -358,7 +358,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
|
|
|
358
358
|
if(this.f_outlets[0] === '是'){
|
|
359
359
|
args.condition+= ` and f_outlets = '手持设备'`
|
|
360
360
|
} else if (this.f_outlets[0] === '否'){
|
|
361
|
-
args.condition+= ` and f_outlets
|
|
361
|
+
args.condition+= ` and f_outlets is null`
|
|
362
362
|
}
|
|
363
363
|
|
|
364
364
|
args.condition = `${args.condition}` + this.orgCondtionStr
|
|
@@ -104,6 +104,9 @@
|
|
|
104
104
|
<th>
|
|
105
105
|
<nobr>转出表类型</nobr>
|
|
106
106
|
</th>
|
|
107
|
+
<th>
|
|
108
|
+
<nobr>转出表品牌</nobr>
|
|
109
|
+
</th>
|
|
107
110
|
<th>
|
|
108
111
|
<nobr>转出方气价</nobr>
|
|
109
112
|
</th>
|
|
@@ -116,6 +119,9 @@
|
|
|
116
119
|
<th>
|
|
117
120
|
<nobr>转入表类型</nobr>
|
|
118
121
|
</th>
|
|
122
|
+
<th>
|
|
123
|
+
<nobr>转出表品牌</nobr>
|
|
124
|
+
</th>
|
|
119
125
|
<th>
|
|
120
126
|
<nobr>转入方气价</nobr>
|
|
121
127
|
</th>
|
|
@@ -167,6 +173,9 @@
|
|
|
167
173
|
<td style="text-align: center;">
|
|
168
174
|
<nobr>{{row.f_fromtype}}</nobr>
|
|
169
175
|
</td>
|
|
176
|
+
<td style="text-align: center;">
|
|
177
|
+
<nobr>{{row.f_frombrand}}</nobr>
|
|
178
|
+
</td>
|
|
170
179
|
<td style="text-align: center;">
|
|
171
180
|
<nobr>{{row.f_fromprice}}</nobr>
|
|
172
181
|
</td>
|
|
@@ -179,6 +188,9 @@
|
|
|
179
188
|
<td style="text-align: center;">
|
|
180
189
|
<nobr>{{row.f_totype}}</nobr>
|
|
181
190
|
</td>
|
|
191
|
+
<td style="text-align: center;">
|
|
192
|
+
<nobr>{{row.f_tobrand}}</nobr>
|
|
193
|
+
</td>
|
|
182
194
|
<td style="text-align: center;">
|
|
183
195
|
<nobr>{{row.f_toprice}}</nobr>
|
|
184
196
|
</td>
|
|
@@ -348,7 +360,7 @@ export default {
|
|
|
348
360
|
if(this.f_outlets[0] === '是'){
|
|
349
361
|
args.condition+= ` and info.f_outlets = '手持设备'`
|
|
350
362
|
} else if (this.f_outlets[0] === '否'){
|
|
351
|
-
args.condition+= ` and info.f_outlets
|
|
363
|
+
args.condition+= ` and info.f_outlets is null`
|
|
352
364
|
}
|
|
353
365
|
|
|
354
366
|
args.condition = `${args.condition}` + this.orgCondtionStr
|