manage-client 3.3.230 → 3.3.231
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
|
@@ -309,6 +309,9 @@
|
|
|
309
309
|
<th style="text-align:center" >
|
|
310
310
|
<nobr>组织机构</nobr>
|
|
311
311
|
</th>
|
|
312
|
+
<th style="text-align:center" >
|
|
313
|
+
<nobr>部门</nobr>
|
|
314
|
+
</th>
|
|
312
315
|
|
|
313
316
|
</tr>
|
|
314
317
|
|
|
@@ -349,6 +352,9 @@
|
|
|
349
352
|
<td style="text-align:center">
|
|
350
353
|
<nobr>{{row.f_orgname}}</nobr>
|
|
351
354
|
</td>
|
|
355
|
+
<td style="text-align:center">
|
|
356
|
+
<nobr>{{row.f_depname}}</nobr>
|
|
357
|
+
</td>
|
|
352
358
|
|
|
353
359
|
</template>
|
|
354
360
|
</data-grid>
|
|
@@ -418,7 +424,8 @@
|
|
|
418
424
|
"sldays":"累计失联天数",
|
|
419
425
|
"new_days":"最新失联天数",
|
|
420
426
|
"f_meter_brand":"气表厂家",
|
|
421
|
-
"f_orgname":"组织机构"
|
|
427
|
+
"f_orgname":"组织机构",
|
|
428
|
+
"f_depname":"部门"},
|
|
422
429
|
reportStr: null,
|
|
423
430
|
show: false,
|
|
424
431
|
showdetail:false,
|
|
@@ -596,13 +603,9 @@
|
|
|
596
603
|
this.userresid = obj
|
|
597
604
|
this.queryData.f_depid = obj
|
|
598
605
|
console.log(this.queryData.f_depid)
|
|
599
|
-
|
|
600
606
|
if (obj.length > 0) {
|
|
601
607
|
this.orgCondtionStr += " and f_depid in " + plugin.convertToIn(obj)
|
|
602
|
-
} else {
|
|
603
|
-
this.orgCondtionStr += " and f_depid = " + this.$login.f.depid
|
|
604
608
|
}
|
|
605
|
-
|
|
606
609
|
if (this.depresid && this.depresid.length > 0) {
|
|
607
610
|
this.orgCondtionStr = " and f_orgid in " + plugin.convertToIn(this.depresid) + this.orgCondtionStr
|
|
608
611
|
} else {
|
|
@@ -271,6 +271,9 @@
|
|
|
271
271
|
<th style="text-align:center" >
|
|
272
272
|
<nobr>组织机构</nobr>
|
|
273
273
|
</th>
|
|
274
|
+
<th style="text-align:center" >
|
|
275
|
+
<nobr>部门</nobr>
|
|
276
|
+
</th>
|
|
274
277
|
</tr>
|
|
275
278
|
|
|
276
279
|
</template>
|
|
@@ -312,6 +315,9 @@
|
|
|
312
315
|
<td style="text-align:center">
|
|
313
316
|
<nobr>{{row.f_orgname}}</nobr>
|
|
314
317
|
</td>
|
|
318
|
+
<td style="text-align:center">
|
|
319
|
+
<nobr>{{row.f_depname}}</nobr>
|
|
320
|
+
</td>
|
|
315
321
|
<!--<td style="text-align:center">{{row.new_days}}</td>-->
|
|
316
322
|
<!--<td style="text-align:center">{{row.f_state}}</td>-->
|
|
317
323
|
|
|
@@ -378,7 +384,7 @@
|
|
|
378
384
|
"lastinsertdate":"最后上报日期",
|
|
379
385
|
"f_meter_base":"最后表读数",
|
|
380
386
|
"slday":"失联天数",
|
|
381
|
-
"f_meter_brand":"气表厂家","f_orgname":"组织机构"},
|
|
387
|
+
"f_meter_brand":"气表厂家","f_orgname":"组织机构","f_depname":"部门"},
|
|
382
388
|
reportStr: null,
|
|
383
389
|
show: false,
|
|
384
390
|
showdetail:false,
|
|
@@ -530,13 +536,9 @@
|
|
|
530
536
|
this.userresid = obj
|
|
531
537
|
this.queryData.f_depid = obj
|
|
532
538
|
console.log(this.queryData.f_depid)
|
|
533
|
-
|
|
534
539
|
if (obj.length > 0) {
|
|
535
540
|
this.orgCondtionStr += " and f_depid in " + plugin.convertToIn(obj)
|
|
536
|
-
} else {
|
|
537
|
-
this.orgCondtionStr += " and f_depid = " + this.$login.f.depid
|
|
538
541
|
}
|
|
539
|
-
|
|
540
542
|
if (this.depresid && this.depresid.length > 0) {
|
|
541
543
|
this.orgCondtionStr = " and f_orgid in " + plugin.convertToIn(this.depresid) + this.orgCondtionStr
|
|
542
544
|
} else {
|