manage-client 1.22.35-ca → 1.22.37-ca
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
|
@@ -401,7 +401,6 @@ let readySomething = async function (self) {
|
|
|
401
401
|
self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
|
|
402
402
|
self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
|
|
403
403
|
self.$refs.paged.$refs.cri.model.f_state = ['有效']
|
|
404
|
-
self.$refs.paged.$refs.cri.model.f_second_state = '否'
|
|
405
404
|
await self.$MagLoadParams.loadParam(self.$login.f)
|
|
406
405
|
self.initParams()
|
|
407
406
|
/* await self.$refs.paged.$refs.cri.search()
|
|
@@ -82,7 +82,7 @@
|
|
|
82
82
|
<v-select :value.sync="model.f_second_state"
|
|
83
83
|
v-model="model.f_second_state"
|
|
84
84
|
:search="false"
|
|
85
|
-
|
|
85
|
+
:value-single="true"
|
|
86
86
|
:options='$parent.$parent.second_states' placeholder='请选择'
|
|
87
87
|
></v-select>
|
|
88
88
|
</div>
|
|
@@ -236,7 +236,7 @@ export default {
|
|
|
236
236
|
return {
|
|
237
237
|
model: new PagedList('rs/sql/deviceQuery', 20),
|
|
238
238
|
criteriaShow: true,
|
|
239
|
-
second_states: [{label: '全部', value: ''},{label: '否', value: '
|
|
239
|
+
second_states: [{label: '全部', value: ''},{label: '否', value: '否'}, {label: '是', value: '是'}],
|
|
240
240
|
filialeNameStr: null,
|
|
241
241
|
filialeCodeStr: this.$login.f.f_orgids,
|
|
242
242
|
userid: this.$login.f.id,
|
|
@@ -258,7 +258,6 @@ export default {
|
|
|
258
258
|
}
|
|
259
259
|
},
|
|
260
260
|
ready() {
|
|
261
|
-
this.$refs.paged.$refs.cri.model.f_second_state = ' is null '
|
|
262
261
|
readySomething(this).then(() => {
|
|
263
262
|
this.$emit('ready')
|
|
264
263
|
}).catch((error) => {
|
|
@@ -267,6 +266,13 @@ export default {
|
|
|
267
266
|
},
|
|
268
267
|
methods: {
|
|
269
268
|
selfSearch(args) {
|
|
269
|
+
if(this.$refs.paged.$refs.cri.model.f_second_state){
|
|
270
|
+
if(this.$refs.paged.$refs.cri.model.f_second_state==='是'){
|
|
271
|
+
args.condition = `${args.condition} and f_second_state is not null`
|
|
272
|
+
}else {
|
|
273
|
+
args.condition = `${args.condition} and f_second_state is null`
|
|
274
|
+
}
|
|
275
|
+
}
|
|
270
276
|
this.model.search(args.condition, args.model)
|
|
271
277
|
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|
|
272
278
|
console.log('合计字段', this.sumsmodel)
|
|
@@ -196,26 +196,26 @@
|
|
|
196
196
|
:options='$parent.$parent.inputtores' placeholder='抄表员'
|
|
197
197
|
close-on-select></v-select>
|
|
198
198
|
</div>
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
199
|
+
<div class="col-sm-2 form-group form-fix-width">
|
|
200
|
+
<label class="font_normal_body _zoom4">表具现状</label>
|
|
201
|
+
<v-select
|
|
202
|
+
:value.sync="model.f_meter_state"
|
|
203
|
+
v-model="model.f_meter_state"
|
|
204
|
+
:value-single="true"
|
|
205
|
+
condition=" f_meter_state = '{}' "
|
|
206
|
+
:search="false"
|
|
207
|
+
:options='$parent.$parent.meter_states' placeholder='表具现状'
|
|
208
|
+
close-on-select></v-select>
|
|
209
|
+
</div>
|
|
210
|
+
<div class="col-sm-2 form-group form-fix-width" >
|
|
211
|
+
<label class="font_normal_body _zoom4">是否第二套档案</label>
|
|
212
|
+
<v-select :value.sync="model.f_second_state"
|
|
213
|
+
v-model="model.f_second_state"
|
|
214
|
+
:search="false"
|
|
215
|
+
:value-single="true"
|
|
216
|
+
:options='$parent.$parent.second_states' placeholder='请选择'
|
|
217
|
+
></v-select>
|
|
218
|
+
</div>
|
|
219
219
|
</div>
|
|
220
220
|
</div>
|
|
221
221
|
</criteria>
|
|
@@ -313,7 +313,6 @@ export default {
|
|
|
313
313
|
}
|
|
314
314
|
},
|
|
315
315
|
ready(){
|
|
316
|
-
this.$refs.paged.$refs.cri.model.f_second_state = '否'
|
|
317
316
|
readySomething(this).then(() => {
|
|
318
317
|
this.$emit('ready')
|
|
319
318
|
}).catch((error) => {
|
|
@@ -359,14 +358,13 @@ export default {
|
|
|
359
358
|
args.condition += ` and f_devices_type like '%${item}%' `
|
|
360
359
|
})
|
|
361
360
|
}
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
args.condition = `${args.condition} and f_second_state is null`
|
|
361
|
+
if(this.$refs.paged.$refs.cri.model.f_second_state){
|
|
362
|
+
if(this.$refs.paged.$refs.cri.model.f_second_state==='是'){
|
|
363
|
+
args.condition = `${args.condition} and f_second_state is not null`
|
|
364
|
+
}else {
|
|
365
|
+
args.condition = `${args.condition} and f_second_state is null`
|
|
366
|
+
}
|
|
367
|
+
}
|
|
370
368
|
this.$refs.paged.$refs.cri.condition = args.condition
|
|
371
369
|
this.model.search(args.condition, args.model)
|
|
372
370
|
this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
|