manage-client 3.2.54 → 3.2.59

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.
@@ -15,7 +15,7 @@ var shaoguan='http://119.146.1.106:8300/'
15
15
  var qtx='http://36.103.222.144:6300/'
16
16
  var bendi = 'http://127.0.0.1:8090'
17
17
  // var bendi = 'http://172.168.1.11:9001'
18
- var fuwu = 'http://119.146.1.106:8300/' //'http://192.168.50.4:8400'
18
+ var fuwu = 'http://192.168.50.4:8400' // 'http://119.146.1.106:8300/'
19
19
  // var fuwu = 'http://172.168.1.11:9001'
20
20
  var system = 'http://192.168.50.4:8400'
21
21
  //192.168.
@@ -69,7 +69,7 @@ var proxyTable = {
69
69
  target: fuwu
70
70
  },
71
71
  '/rs/report': {
72
- target: fuwu
72
+ target: bendi
73
73
  },
74
74
  '/rs/vue': {
75
75
  target: fuwu
@@ -80,11 +80,8 @@ var proxyTable = {
80
80
  '/rs/logic/SumSettleFileImport': {
81
81
  target: fuwu
82
82
  },
83
- '/rs/sql': {
84
- target: fuwu
85
- },
86
83
  '/rs': {
87
- target: fuwu
84
+ target: bendi
88
85
  }
89
86
  }
90
87
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.2.54",
3
+ "version": "3.2.59",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/App.vue CHANGED
@@ -8,7 +8,8 @@
8
8
  <!--<route :comp="{name: 'Gasproperties'}"></route>-->
9
9
  <!--<route :comp="{name: 'vender-management'}"></route>-->
10
10
  <!--<route :comp="{name: 'malfunction-home'}"></route>-->
11
- <route :comp="{name: 'manage-main2'}"></route>
11
+ <route :comp="{name: 'login'}"></route>
12
+ <!-- <route :comp="{name: 'manage-main2'}"></route>-->
12
13
  <!-- <route :comp="{name: 'load-data'}"></route> -->
13
14
  <!--<route :comp="{name: 'load-params', props: {componentName: 'login'}}"></route>-->
14
15
  <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
@@ -0,0 +1,180 @@
1
+ <template>
2
+ <div class="basic-main" style="height: 100%">
3
+ <criteria-paged :model="model" :pager='false' v-ref:paged>
4
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
5
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
6
+ <div class="row">
7
+ <div class="col-sm-4" >
8
+ <label class="font_normal_body" for="startDate">开始日期:</label>
9
+ <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
10
+ v-model="model.startDate"
11
+ :value.sync="model.startDate"
12
+ :disabled-days-of-Week="[]"
13
+ :format="'yyyy-MM-dd HH:mm:ss'"
14
+ :show-reset-button="reset">
15
+ </datepicker>
16
+ </div>
17
+ <div class="col-sm-4" >
18
+ <label class="font_normal_body" for="endDate">结束日期:</label>
19
+ <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
20
+ v-model="model.endDate"
21
+ :value.sync="model.endDate"
22
+ :disabled-days-of-Week="[]"
23
+ :format="'yyyy-MM-dd HH:mm:ss'"
24
+ :show-reset-button="reset">
25
+ </datepicker>
26
+ </div>
27
+ <div class="col-sm-4 form-group" >
28
+ <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>
29
+ <right-tree id="org" @re-res="$parent.$parent.getRes" style="width: 60%"></right-tree>
30
+ </div>
31
+ <div class="col-sm-4 form-group">
32
+ <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
33
+ <res-select id="dep" restype='department' style="width: 60%"
34
+ is-mul="false"
35
+ @res-select="$parent.$parent.getdep"
36
+ :parentresid="$parent.$parent.depresid"
37
+ :initresid='$parent.$parent.depid' >
38
+ </res-select>
39
+
40
+ </div>
41
+ <div class="col-sm-4 form-group">
42
+ <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
43
+ <res-select id="oper" restype='user' style="width: 60%"
44
+ is-mul="false"
45
+ @res-select="$parent.$parent.getuser"
46
+ :parentresid="$parent.$parent.userresid"
47
+ :initresid='$parent.$parent.operatorid'>
48
+ </res-select>
49
+ </div>
50
+ </div>
51
+ <div class="span" style = "float:right;">
52
+ <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
53
+ <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
54
+ <report-excel id='gasprice'></report-excel>
55
+ </div>
56
+ </div>
57
+ </criteria>
58
+ <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
59
+ <table class='tableprint' style="margin: 0px auto">
60
+ <thead>
61
+ <tr>
62
+ <th :colspan='$parent.tablen' style="font-weight: normal; text-align: left;">
63
+ <h3 style="text-align: center">{{$parent.data.f_report_name}}</h3>
64
+ </th>
65
+ </tr>
66
+ <tr>
67
+ <th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
68
+ 时间区间:{{$refs.criteria.model.startDate}} - {{ $refs.criteria.model.endDate }}<br/>
69
+ 打印时间:{{$parent.printTime}}
70
+ </th>
71
+ </tr>
72
+ <tr>
73
+ <th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
74
+ <div>
75
+ <span v-show="$parent.orgname.trim()!=''">公司:{{$parent.orgname}}</span>
76
+ <span v-show="$parent.depname.trim()!=''"> 部门:{{$parent.depname}}</span>
77
+ <span v-show="$parent.operatorname.trim()!=''">人员:{{$parent.operatorname}}</span>
78
+ </div>
79
+ </th>
80
+ </tr>
81
+ </thead>
82
+ <tr>
83
+ <td :colspan='$parent.tablen' class="noborder">
84
+ {{{ model.data.substring(26,model.data.length-8) }}}
85
+ </td>
86
+ </tr>
87
+ <tfoot>
88
+ <tr style="text-align: left">
89
+ <th :colspan='Math.floor($parent.tablen/3)'>财务审核:</th>
90
+ <th :colspan='Math.round($parent.tablen/3)'>收款审核:</th>
91
+ <th :colspan='Math.round($parent.tablen/3)'>收款员:</th>
92
+ </tr>
93
+ </tfoot>
94
+ </table>
95
+ </div>
96
+ </criteria-paged>
97
+ </div>
98
+ </template>
99
+
100
+ <script>
101
+ import { DataModel } from 'vue-client'
102
+
103
+ export default {
104
+ title: '报表',
105
+ props: ['data'],
106
+ data () {
107
+ return {
108
+ printTime: this.$login.toStandardTimeString(),
109
+ depresid: [],
110
+ userresid: [],
111
+ f_orgid: this.$login.f.orgid,
112
+ f_depid: this.$login.f.depids,
113
+ f_operatorid: this.$login.f.id,
114
+ operatorid: [],
115
+ depid: [],
116
+ tablen: 0,
117
+ orgname: '',
118
+ depname: '',
119
+ operatorname: '',
120
+ orgCondtionStr: '1=1',
121
+ model: new DataModel('rs/report/wuhai_pricereport', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
122
+ f_orgid: 'this.model.f_orgid'}),
123
+ reportStr: null,
124
+ show: false
125
+ }
126
+ },
127
+ ready () {
128
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
129
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
130
+ console.log(this.$login.f)
131
+ },
132
+ methods: {
133
+ searchData () {
134
+ this.$refs.paged.$refs.criteria.search()
135
+ },
136
+ selfSearch (args) {
137
+ this.printTime = this.$login.toStandardTimeString()
138
+ let orgcondition = '1=1'
139
+ if (this.f_orgid && this.f_orgid[0]) {
140
+ orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
141
+ }
142
+ if (this.f_depid && this.f_depid[0]) {
143
+ orgcondition += ' and f_depid in (' + this.f_depid + ')'
144
+ }
145
+ if (this.f_operatorid && this.f_operatorid[0]) {
146
+ orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
147
+ }
148
+ this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
149
+ this.$refs.paged.search(args)
150
+ },
151
+ getRes (obj) {
152
+ this.orgname = obj.res[0]
153
+ this.depresid = obj.resids
154
+ this.userresid = obj.resids
155
+ this.f_orgid = obj.resids
156
+ },
157
+ getdep (obj, val) {
158
+ this.depname = val[0]
159
+ // this.userresid = obj
160
+ this.f_depid = obj
161
+ },
162
+ getuser (obj, val) {
163
+ this.operatorname = val[0]
164
+ this.f_operatorid = obj
165
+ }
166
+ },
167
+ watch: {
168
+ 'model.data' (val) {
169
+ this.tablen = val.split('</tr>').map(item => item.split('</td>').length - 1).reduce((x, y) => x > y ? x : y)
170
+ }
171
+ },
172
+ computed: {
173
+ }
174
+ }
175
+ </script>
176
+ <style scoped>
177
+ .noborder{
178
+ border: none;
179
+ }
180
+ </style>
@@ -0,0 +1,180 @@
1
+ <template>
2
+ <div class="basic-main" style="height: 100%">
3
+ <criteria-paged :model="model" :pager='false' v-ref:paged>
4
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
5
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
6
+ <div class="row">
7
+ <div class="col-sm-4" >
8
+ <label class="font_normal_body" for="startDate">开始日期:</label>
9
+ <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
10
+ v-model="model.startDate"
11
+ :value.sync="model.startDate"
12
+ :disabled-days-of-Week="[]"
13
+ :format="'yyyy-MM-dd HH:mm:ss'"
14
+ :show-reset-button="reset">
15
+ </datepicker>
16
+ </div>
17
+ <div class="col-sm-4" >
18
+ <label class="font_normal_body" for="endDate">结束日期:</label>
19
+ <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
20
+ v-model="model.endDate"
21
+ :value.sync="model.endDate"
22
+ :disabled-days-of-Week="[]"
23
+ :format="'yyyy-MM-dd HH:mm:ss'"
24
+ :show-reset-button="reset">
25
+ </datepicker>
26
+ </div>
27
+ <div class="col-sm-4 form-group" >
28
+ <label class="font_normal_body" for="org">公&emsp;&emsp;司:</label>
29
+ <right-tree id="org" @re-res="$parent.$parent.getRes" style="width: 60%"></right-tree>
30
+ </div>
31
+ <div class="col-sm-4 form-group">
32
+ <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
33
+ <res-select id="dep" restype='department' style="width: 60%"
34
+ is-mul="false"
35
+ @res-select="$parent.$parent.getdep"
36
+ :parentresid="$parent.$parent.depresid"
37
+ :initresid='$parent.$parent.depid' >
38
+ </res-select>
39
+
40
+ </div>
41
+ <div class="col-sm-4 form-group">
42
+ <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
43
+ <res-select id="oper" restype='user' style="width: 60%"
44
+ is-mul="false"
45
+ @res-select="$parent.$parent.getuser"
46
+ :parentresid="$parent.$parent.userresid"
47
+ :initresid='$parent.$parent.operatorid'>
48
+ </res-select>
49
+ </div>
50
+ </div>
51
+ <div class="span" style = "float:right;">
52
+ <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
53
+ <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
54
+ <report-excel id='gasprice'></report-excel>
55
+ </div>
56
+ </div>
57
+ </criteria>
58
+ <div partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
59
+ <table class='tableprint' style="margin: 0px auto">
60
+ <thead>
61
+ <tr>
62
+ <th :colspan='$parent.tablen' style="font-weight: normal; text-align: left;">
63
+ <h3 style="text-align: center">{{$parent.data.f_report_name}}</h3>
64
+ </th>
65
+ </tr>
66
+ <tr>
67
+ <th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
68
+ 时间区间:{{$refs.criteria.model.startDate}} - {{ $refs.criteria.model.endDate }}<br/>
69
+ 打印时间:{{$parent.printTime}}
70
+ </th>
71
+ </tr>
72
+ <tr>
73
+ <th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
74
+ <div>
75
+ <span v-show="$parent.orgname.trim()!=''">公司:{{$parent.orgname}}</span>
76
+ <span v-show="$parent.depname.trim()!=''"> 部门:{{$parent.depname}}</span>
77
+ <span v-show="$parent.operatorname.trim()!=''">人员:{{$parent.operatorname}}</span>
78
+ </div>
79
+ </th>
80
+ </tr>
81
+ </thead>
82
+ <tr>
83
+ <td :colspan='$parent.tablen' class="noborder">
84
+ {{{ model.data.substring(26,model.data.length-8) }}}
85
+ </td>
86
+ </tr>
87
+ <tfoot>
88
+ <tr style="text-align: left">
89
+ <th :colspan='Math.floor($parent.tablen/3)'>财务审核:</th>
90
+ <th :colspan='Math.round($parent.tablen/3)'>复核人:</th>
91
+ <th :colspan='Math.round($parent.tablen/3)'>汇总人:</th>
92
+ </tr>
93
+ </tfoot>
94
+ </table>
95
+ </div>
96
+ </criteria-paged>
97
+ </div>
98
+ </template>
99
+
100
+ <script>
101
+ import { DataModel } from 'vue-client'
102
+
103
+ export default {
104
+ title: '报表',
105
+ props: ['data'],
106
+ data () {
107
+ return {
108
+ printTime: this.$login.toStandardTimeString(),
109
+ depresid: [],
110
+ userresid: [],
111
+ f_orgid: this.$login.f.orgid,
112
+ f_depid: this.$login.f.depids,
113
+ f_operatorid: this.$login.f.id,
114
+ operatorid: [],
115
+ depid: [],
116
+ tablen: 0,
117
+ orgname: '',
118
+ depname: '',
119
+ operatorname: '',
120
+ orgCondtionStr: '1=1',
121
+ model: new DataModel('rs/report/UserBalanceReport', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
122
+ f_orgid: 'this.model.f_orgid'}),
123
+ reportStr: null,
124
+ show: false
125
+ }
126
+ },
127
+ ready () {
128
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
129
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
130
+ console.log(this.$login.f)
131
+ },
132
+ methods: {
133
+ searchData () {
134
+ this.$refs.paged.$refs.criteria.search()
135
+ },
136
+ selfSearch (args) {
137
+ this.printTime = this.$login.toStandardTimeString()
138
+ let orgcondition = '1=1'
139
+ if (this.f_orgid && this.f_orgid[0]) {
140
+ orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
141
+ }
142
+ if (this.f_depid && this.f_depid[0]) {
143
+ orgcondition += ' and f_depid in (' + this.f_depid + ')'
144
+ }
145
+ if (this.f_operatorid && this.f_operatorid[0]) {
146
+ orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
147
+ }
148
+ this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
149
+ this.$refs.paged.search(args)
150
+ },
151
+ getRes (obj) {
152
+ this.orgname = obj.res[0]
153
+ this.depresid = obj.resids
154
+ this.userresid = obj.resids
155
+ this.f_orgid = obj.resids
156
+ },
157
+ getdep (obj, val) {
158
+ this.depname = val[0]
159
+ // this.userresid = obj
160
+ this.f_depid = obj
161
+ },
162
+ getuser (obj, val) {
163
+ this.operatorname = val[0]
164
+ this.f_operatorid = obj
165
+ }
166
+ },
167
+ watch: {
168
+ 'model.data' (val) {
169
+ this.tablen = val.split('</tr>').map(item => item.split('</td>').length - 1).reduce((x, y) => x > y ? x : y)
170
+ }
171
+ },
172
+ computed: {
173
+ }
174
+ }
175
+ </script>
176
+ <style scoped>
177
+ .noborder{
178
+ border: none;
179
+ }
180
+ </style>
@@ -357,6 +357,12 @@
357
357
  <th>
358
358
  <nobr>购气次数</nobr>
359
359
  </th>
360
+ <th>
361
+ <nobr>上期表底数</nobr>
362
+ </th>
363
+ <th>
364
+ <nobr>本期表底数</nobr>
365
+ </th>
360
366
  <th>
361
367
  <nobr>气量</nobr>
362
368
  </th>
@@ -498,12 +504,7 @@
498
504
  <th>
499
505
  <nobr>三阶气费</nobr>
500
506
  </th>
501
- <th>
502
- <nobr>上期表底数</nobr>
503
- </th>
504
- <th>
505
- <nobr>本期表底数</nobr>
506
- </th>
507
+
507
508
  <th><nobr>附件</nobr></th>
508
509
  </tr>
509
510
  </template>
@@ -547,6 +548,12 @@
547
548
  <td style="text-align: center;">
548
549
  <nobr>{{row.f_times}}</nobr>
549
550
  </td>
551
+ <td style="text-align: center;">
552
+ <nobr>{{row.f_last_tablebase}}</nobr>
553
+ </td>
554
+ <td style="text-align: center;">
555
+ <nobr>{{row.f_tablebase }}</nobr>
556
+ </td>
550
557
  <td style="text-align: center;">
551
558
  <nobr>{{row.f_pregas}}</nobr>
552
559
  </td>
@@ -687,12 +694,6 @@
687
694
  <td style="text-align: center;">
688
695
  <nobr>{{(row.f_stair3fee - 0).toFixed(2)}}</nobr>
689
696
  </td>
690
- <td style="text-align: center;">
691
- <nobr>{{row.f_last_tablebase}}</nobr>
692
- </td>
693
- <td style="text-align: center;">
694
- <nobr>{{row.f_tablebase }}</nobr>
695
- </td>
696
697
  <td style="text-align: center;"><nobr>
697
698
  <button style=" height: 28px;line-height: 16px;" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
698
699
  </nobr></td>
@@ -67,7 +67,7 @@ export default{
67
67
  chargeConfig: {
68
68
  'id': '收费编号', 'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_user_phone': '客户电话', 'f_address': '客户地址', 'f_zones': '片区', 'f_user_type': '客户类型',
69
69
  'f_gasproperties': '用气性质', 'f_meternumber': '表号', 'f_meter_brand': '气表品牌', 'f_times': '购气次数',
70
- 'f_pregas': '气量', 'fee': '金额', 'f_preamount': '燃气费', 'f_collection': '收款', 'f_privilege_money': '优惠金额', 'f_balance': '上期结余',
70
+ 'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_pregas': '气量', 'fee': '金额', 'f_preamount': '燃气费', 'f_collection': '收款', 'f_privilege_money': '优惠金额', 'f_balance': '上期结余',
71
71
  'f_curbalance': '本期结余', 'f_type': '收费类型', 'f_payment': '付款方式', 'f_bank_type': '支付渠道', 'f_state': '状态', 'f_operate_date': '收费日期',
72
72
  'f_delaypay': '滞纳金', 'f_comments': '备注', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司',
73
73
  'f_yucun': '预存金额', 'f_card_id': '卡号', 'f_stairamount1': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费',