manage-client 3.3.103 → 3.3.105
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
|
@@ -194,6 +194,9 @@
|
|
|
194
194
|
<th v-show="$parent.$parent.$parent.isAreaShow || $parent.$parent.$parent.isCompanyShow">
|
|
195
195
|
<nobr>表具数量</nobr>
|
|
196
196
|
</th>
|
|
197
|
+
<th v-show="$parent.$parent.$parent.isAreaShow || $parent.$parent.$parent.isCompanyShow">
|
|
198
|
+
<nobr>期间购气表具数</nobr>
|
|
199
|
+
</th>
|
|
197
200
|
<th>
|
|
198
201
|
<nobr>购气（充值）数量</nobr>
|
|
199
202
|
</th>
|
|
@@ -248,6 +251,9 @@
|
|
|
248
251
|
<td style="text-align: center;" v-show="$parent.$parent.$parent.isAreaShow || $parent.$parent.$parent.isCompanyShow">
|
|
249
252
|
<nobr>{{ row.f_table_num }}</nobr>
|
|
250
253
|
</td>
|
|
254
|
+
<td style="text-align: center;" v-show="$parent.$parent.$parent.isAreaShow || $parent.$parent.$parent.isCompanyShow">
|
|
255
|
+
<nobr>{{ row.f_sell_num }}</nobr>
|
|
256
|
+
</td>
|
|
251
257
|
<td style="text-align: center;">
|
|
252
258
|
<nobr>{{ row.f_pregas }}</nobr>
|
|
253
259
|
</td>
|
|
@@ -295,6 +301,14 @@
|
|
|
295
301
|
style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
296
302
|
收款合计: {{ sumsmodel.f_collection.toFixed(2) }}元
|
|
297
303
|
</td>
|
|
304
|
+
<td v-if="isAreaShow || isCompanyShow"
|
|
305
|
+
style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
306
|
+
表具数: {{ sumsmodel.f_table_num }}
|
|
307
|
+
</td>
|
|
308
|
+
<td v-if="isAreaShow || isCompanyShow"
|
|
309
|
+
style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
|
|
310
|
+
期间购气表具数: {{ sumsmodel.f_sell_num }}
|
|
311
|
+
</td>
|
|
298
312
|
</tr>
|
|
299
313
|
</table>
|
|
300
314
|
</div>
|
|
@@ -460,7 +474,7 @@ export default {
|
|
|
460
474
|
startDate: 'this.model.startDate',
|
|
461
475
|
endDate: 'this.model.endDate',
|
|
462
476
|
condition2: 'this.model.condition2'
|
|
463
|
-
}, {f_collection: 0, f_gas: 0, f_money: 0,f_card_money:0})
|
|
477
|
+
}, {f_collection: 0, f_gas: 0, f_money: 0,f_card_money:0,f_sell_num:0,f_table_num:0})
|
|
464
478
|
} else {
|
|
465
479
|
this.isCompanyShow = false
|
|
466
480
|
this.model = new PagedList('rs/sql/manage_chargeSummary', 20, {
|
|
@@ -478,7 +492,7 @@ export default {
|
|
|
478
492
|
startDate: 'this.model.startDate',
|
|
479
493
|
endDate: 'this.model.endDate',
|
|
480
494
|
condition2: 'this.model.condition2'
|
|
481
|
-
}, {f_collection: 0, f_gas: 0, f_money: 0,f_card_money:0,})
|
|
495
|
+
}, {f_collection: 0, f_gas: 0, f_money: 0,f_card_money:0,f_sell_num:0,f_table_num:0})
|
|
482
496
|
} else {
|
|
483
497
|
this.isAreaShow = false
|
|
484
498
|
this.model = new PagedList('rs/sql/manage_chargeSummary', 20, {
|
|
@@ -842,6 +842,7 @@ monthGasConfig: {
|
|
|
842
842
|
'f_card_money': '卡表购气金额',
|
|
843
843
|
'f_money': '物联网表购气金额',
|
|
844
844
|
'f_table_num': '表具数量',
|
|
845
|
+
'f_sell_num': '期间购气表具数',
|
|
845
846
|
'f_stairamount1': '一阶气量',
|
|
846
847
|
'f_collection': '实收款'
|
|
847
848
|
},
|
|
@@ -852,6 +853,7 @@ monthGasConfig: {
|
|
|
852
853
|
'f_card_money': '卡表购气金额',
|
|
853
854
|
'f_money': '物联网表购气金额',
|
|
854
855
|
'f_table_num': '表具数量',
|
|
856
|
+
'f_sell_num': '期间购气表具数',
|
|
855
857
|
'f_stairamount1': '一阶气量',
|
|
856
858
|
'f_stairamount2': '二阶气量',
|
|
857
859
|
'f_stairamount3': '三阶气量',
|
|
@@ -405,6 +405,9 @@
|
|
|
405
405
|
<data-order field="f_operate_date" name="收费日期"
|
|
406
406
|
:order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
|
|
407
407
|
</th>
|
|
408
|
+
<th>
|
|
409
|
+
<nobr>用户档案备注</nobr>
|
|
410
|
+
</th>
|
|
408
411
|
<th>
|
|
409
412
|
<nobr>优惠金额</nobr>
|
|
410
413
|
</th>
|
|
@@ -550,9 +553,6 @@
|
|
|
550
553
|
<th>
|
|
551
554
|
<nobr>三阶气费</nobr>
|
|
552
555
|
</th>
|
|
553
|
-
<th>
|
|
554
|
-
<nobr>用户档案备注</nobr>
|
|
555
|
-
</th>
|
|
556
556
|
|
|
557
557
|
<th><nobr>附件</nobr></th>
|
|
558
558
|
</tr>
|
|
@@ -619,6 +619,9 @@
|
|
|
619
619
|
<td style="text-align: center;">
|
|
620
620
|
<nobr>{{row.f_operate_date}}</nobr>
|
|
621
621
|
</td>
|
|
622
|
+
<td style="text-align: center;">
|
|
623
|
+
<nobr>{{row.f_user_comments}}</nobr>
|
|
624
|
+
</td>
|
|
622
625
|
<td style="text-align: center;">
|
|
623
626
|
<nobr>{{row.f_privilege_money}}</nobr>
|
|
624
627
|
</td>
|
|
@@ -767,9 +770,6 @@
|
|
|
767
770
|
<td style="text-align: center;">
|
|
768
771
|
<nobr>{{(row.f_stair3fee - 0).toFixed(2)}}</nobr>
|
|
769
772
|
</td>
|
|
770
|
-
<td style="text-align: center;">
|
|
771
|
-
<nobr>{{row.f_user_comments}}</nobr>
|
|
772
|
-
</td>
|
|
773
773
|
<td style="text-align: center;"><nobr>
|
|
774
774
|
<button style=" height: 28px;line-height: 16px;" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
|
|
775
775
|
</nobr></td>
|