manage-client 1.60.12-2 → 1.60.12-5

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/.eslintrc.js CHANGED
@@ -1,16 +1,16 @@
1
- module.exports = {
2
- root: true,
3
- // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
4
- extends: 'standard',
5
- // required to lint *.vue files
6
- plugins: [
7
- 'eslint-plugin-html'
8
- ],
9
- // add your custom rules here
10
- 'rules': {
11
- // allow paren-less arrow functions
12
- 'arrow-parens': 0,
13
- // allow debugger during development
14
- 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
15
- }
16
- }
1
+ // module.exports = {
2
+ // root: true,
3
+ // // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
4
+ // extends: 'standard',
5
+ // // required to lint *.vue files
6
+ // plugins: [
7
+ // 'eslint-plugin-html'
8
+ // ],
9
+ // // add your custom rules here
10
+ // 'rules': {
11
+ // // allow paren-less arrow functions
12
+ // 'arrow-parens': 0,
13
+ // // allow debugger during development
14
+ // 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
15
+ // }
16
+ // }
@@ -7,53 +7,81 @@ var httpProxy = require('http-proxy')
7
7
  var app = express()
8
8
  var compiler = webpack(config)
9
9
  var proxy = httpProxy.createProxyServer()
10
- let server = 'http://192.168.1.212:8300/'
10
+
11
11
  // Define HTTP proxies to your custom API backend
12
12
  // https://github.com/chimurai/http-proxy-middleware
13
13
  var proxyTable = {
14
14
  '/images': {
15
- target : server
15
+ // target: 'http://localhost:8086'
16
+ target: 'http://192.168.1.212:8300/ldap'
16
17
  },
17
18
  // 查找资源服务数据
18
19
  '/rs/search': {
19
- target : server
20
+ // target: 'http://192.168.50.202:8099'
21
+ // target: 'http://192.168.20.2:8081'
22
+ target: 'http://192.168.1.212:8300/ldap'
23
+ // target: 'http://192.168.20.191:8011'
20
24
  },
21
25
  // 用户登录服务地址
22
26
  '/rs/user': {
23
- target : server
27
+ // target: 'http://192.168.50.202:8099'
28
+ // target: 'http://192.168.2.77:8081'
29
+ target: 'http://192.168.1.212:8300/'
30
+ // target: 'http://192.168.20.191:8011'
24
31
  },
25
32
  '/rs/path/getParams': {
26
- target : server
33
+ // target: 'http://192.168.50.202:8099'
34
+ //target: 'http://127.0.0.1:8888/product'
35
+ target: 'http://192.168.50.220:8200/system'
36
+ // target: 'http://192.168.20.191:8011'
27
37
  },
28
38
  '/rs/logic/getInitData': {
29
- target : server
39
+ // target: 'http://192.168.50.202:8099'
40
+ //target: 'http://127.0.0.1:8888/product'
41
+ target: 'http://192.168.1.212:8300/system'
42
+ // target: 'http://192.168.20.191:8011'
30
43
  },
31
44
  '/rs/sql/saleSingleTable': {
32
- target : server
45
+ // target: 'http://192.168.50.202:8099'
46
+ //target: 'http://127.0.0.1:8888/product'
47
+ target: 'http://192.168.50.220:8300'
48
+ // target: 'http://192.168.20.191:8011'
33
49
  },
34
50
  '/rs/sql/singleTable_OrderBy': {
35
- target : server
51
+ // target: 'http://192.168.50.202:8099'
52
+ //target: 'http://127.0.0.1:8888/product'
53
+ target: 'http://192.168.1.212:8300/system'
54
+ // target: 'http://192.168.20.191:8011'
36
55
  },
37
56
  '/rs/logic/getLogin': {
38
- target : server
57
+ // target: 'http://192.168.50.202:8099'
58
+ //target: 'http://127.0.0.1:8888/product'
59
+ target: 'http://192.168.1.212:8300/system'
60
+ // target: 'http://192.168.20.191:8011'
39
61
  },
40
62
  '/rs/db': {
41
- target : server
63
+ target: 'http://192.168.1.212:8300/ldap'
64
+ // target: 'http://127.0.0.1:8012'
65
+ // target: 'http://192.168.20.191:s8011'
42
66
  },
43
67
  '/excel': {
44
- target : server
68
+ target: 'http://192.168.1.212:8300/'
69
+ // target: 'http://127.0.0.1:8080/manager'
70
+ // target: 'http://192.168.50.220:8300'
45
71
  },
46
72
  '/rs/file': {
47
- target : server
73
+ target: 'http://192.168.1.212:8300/'
48
74
  },
49
75
  '/rs/logic/getSaleInitData':{
50
- target : server
76
+ target: 'http://192.168.1.212:8300/'
51
77
  },
52
78
  '/rs/vue': {
53
- target : server
79
+ target: 'http://192.168.1.212:8300/system'
54
80
  },
55
- '/rs': {
56
- target : server
81
+ '/rs': {//rs/sql/newsellQuery
82
+ // target: 'http://127.0.0.1:8088/mamage'
83
+ target: 'http://192.168.1.212:8300/'
84
+ // target: 'http://192.168.50.220:8300'
57
85
  }
58
86
  }
59
87
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "1.60.12-2",
3
+ "version": "1.60.12-5",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -0,0 +1,177 @@
1
+ <template>
2
+ <div id='app' >
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-inline auto " partial >
6
+ <p class="bg-info text-center" style="padding: 8px;">其他收费记录表</p>
7
+ <div class="flex-row auto" style="justify-content: space-between">
8
+ <div class="form-group" v-if="!$parent.$parent.data.f_files_path">
9
+ <label for="startDate">开始日期:</label>
10
+ <datepicker id="startDate" placeholder="开始日期"
11
+ v-model="model.startDate"
12
+ :value.sync="model.startDate"
13
+ :disabled-days-of-Week="[]"
14
+ :format="'yyyy-MM-dd'"
15
+ :show-reset-button="reset">
16
+ </datepicker>
17
+ <label for="endDate">结束日期:</label>
18
+ <datepicker id="endDate" placeholder="结束日期"
19
+ v-model="model.endDate"
20
+ :value.sync="model.endDate"
21
+ :disabled-days-of-Week="[]"
22
+ :format="'yyyy-MM-dd'"
23
+ :show-reset-button="reset">
24
+ </datepicker>
25
+ <label for="endDate" class="control-label">组织机构</label>
26
+ <right-tree :userid.sync='$parent.$parent.userid' :source.sync='$parent.$parent.source' @re-res="$parent.$parent.getRes"></right-tree>
27
+ <button class="btn btn-primary width-100" @click="search()">查询</button>
28
+ <!--<button class="btn btn-success width-100" @click="$parent.$parent.confirmReport()">保存报表</button>-->
29
+ </div>
30
+ <span></span>
31
+ <div class="form-group">
32
+ <report-print id='gasprice' top='1cm' left='2cm' width='100%' height='100%'></report-print>
33
+ <report-excel id='gasprice' ></report-excel>
34
+ </div>
35
+ </div>
36
+ </div>
37
+ </criteria>
38
+ <div partial='list' v-el:handcollect id='gasprice'>
39
+ <table class='tableprint' style="margin: 0px auto" v-if="!$parent.data.f_files_path">
40
+ <thead>
41
+ <tr>
42
+ <th colspan='6' style="font-weight: normal; text-align: left;">
43
+ <h3 style="text-align: center">其他收费记录表</h3>
44
+ </th>
45
+ </tr>
46
+ <tr>
47
+ <th colspan='6' style="font-weight: normal; text-align: center;">
48
+ 开始时间:{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
49
+ 结束时间:{{ model.model.endDate }}&nbsp;&nbsp;&nbsp;
50
+ </th>
51
+ </tr>
52
+ <tr>
53
+ <th colspan='6' style="font-weight: normal; text-align: center;">
54
+ 组织机构:{{$parent.filialeNameStr}}
55
+ </th>
56
+ </tr>
57
+ </thead>
58
+ <tr>
59
+ <td colspan='6'>
60
+ {{{ model.data.substring(26,model.data.length-8) }}}
61
+ </td>
62
+ </tr>
63
+
64
+ </table>
65
+ {{{ $parent.reportStr }}}
66
+ </div>
67
+ </criteria-paged>
68
+ <modal :show.sync="show" v-ref:modal small backdrop="false">
69
+ <header slot="modal-header" class="modal-header">
70
+ <h4 class="modal-title">输入文件名称</h4>
71
+ </header>
72
+ <article slot="modal-body" class="modal-body">
73
+ <div class="form-group">
74
+ <input type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
75
+ </div>
76
+ </article>
77
+ <footer slot="modal-footer" class="modal-footer">
78
+ <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
79
+ <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
80
+ </footer>
81
+ </modal>
82
+
83
+ </div>
84
+ </template>
85
+ <script>
86
+ import { DataModel } from 'vue-client'
87
+ import co from 'co'
88
+ let saveFile = function * (self) {
89
+ // 线验证文件是否重名
90
+ let count = yield self.$resetpost('rs/sql/manageSingleTable',
91
+ {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
92
+ {resolveMsg: null, rejectMsg: null})
93
+ if (count.data.length > 0) {
94
+ self.$showAlert('无法保存,文件名重名', 'warning', 3000)
95
+ return
96
+ }
97
+ let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
98
+ f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-user-collect',
99
+ f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
100
+ f_outlets: this.$login.f.f_parentname})
101
+ if (saveBack.data.status === 'succeed') {
102
+ self.show = false
103
+ self.filename = ''
104
+ // 后台保存完成,通知刷新
105
+ self.$dispatch('save-success', self.filename)
106
+ }
107
+ }
108
+ export default {
109
+ title: '其他收费记录表',
110
+ props: ['data'],
111
+ data () {
112
+ return {
113
+ model: new DataModel('rs/report/otherstatistics', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
114
+ filialeCodeStr: 'this.model.filialeCodeStr', filiale: 'this.model.filiale'}),
115
+ reportStr: null,
116
+ show: false,
117
+ filename: '',
118
+ filialeNameStr: this.$login.f.orgpathnames,
119
+ filialeCodeStr: this.$login.f.orgpathstr,
120
+ userid: this.$login.f.id,
121
+ source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`
122
+ }
123
+ },
124
+ ready () {
125
+ if (this.data) {
126
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString()
127
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString()
128
+ this.$refs.paged.$refs.criteria.model.filiale = this.$login.f.f_fengongsi
129
+ }
130
+ this.$refs.paged.$refs.criteria.search()
131
+ },
132
+ methods: {
133
+ selfSearch (args) {
134
+ this.$refs.paged.$refs.criteria.model.filialeCodeStr = this.filialeCodeStr
135
+ this.$refs.paged.search(args)
136
+ },
137
+ getRes(obj) {
138
+ console.log(obj, '组织')
139
+ this.filialeNameStr = obj.res
140
+ this.filialeCodeStr = obj.resids
141
+ },
142
+ // 根据文件路径获取储存的报表内容
143
+ getFileContent (path) {
144
+ this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
145
+ this.reportStr = res.data.filecontent
146
+ this.model.state = '正确'
147
+ })
148
+ },
149
+ confirm () {
150
+ if (!this.filename || this.filename === '') {
151
+ this.$showAlert('无法保存,文件名不能为空', 'warning', 3000)
152
+ }
153
+ let saveGen = saveFile(this)
154
+ co(saveGen)
155
+ },
156
+ close () {
157
+ this.show = false
158
+ },
159
+ // 将报表保存成文件
160
+ confirmReport () {
161
+ this.show = true
162
+ this.filename = this.data.f_report_name + this.$login.toStandardDateString()
163
+ }
164
+ },
165
+ watch: {
166
+ 'data' (val) {
167
+ if (val.f_files_path) {
168
+ this.getFileContent(val.f_files_path)
169
+ } else {
170
+ this.reportStr = null
171
+ }
172
+ }
173
+ },
174
+ computed: {
175
+ }
176
+ }
177
+ </script>
@@ -1,5 +1,5 @@
1
1
  <template>
2
- <div id="unit" class="flex-row">
2
+ <div istyle="flex:1;" class="flex">
3
3
  <div class="basic-main" @keyup.enter="search">
4
4
  <div class="flex" v-if="!show">
5
5
  <criteria-paged :model="model" v-ref:paged>
@@ -12,6 +12,7 @@
12
12
  v-model="model.startDate"
13
13
  :value.sync="model.startDate"
14
14
  :format="'yyyy-MM-dd HH:mm:ss'"
15
+ condition= "f_hand_date >= '{}'"
15
16
  :show-reset-button="true"
16
17
  >
17
18
  </datepicker>
@@ -22,6 +23,7 @@
22
23
  v-model="model.endDate"
23
24
  :value.sync="model.endDate"
24
25
  :format="'yyyy-MM-dd HH:mm:ss'"
26
+ condition= "f_hand_date <= '{}'"
25
27
  :show-reset-button="true"
26
28
  >
27
29
  </datepicker>
@@ -61,24 +63,24 @@
61
63
  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
62
64
  condition="f_user_name like '%{}%'" placeholder="客户名称">
63
65
  </div>
64
- <div class="col-sm-2 form-group">
65
- <label class="font_normal_body" >档案编号</label>
66
- <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
67
- condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
68
- </div>
69
- <div class="col-sm-2 form-group">
70
- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
71
- <v-select :value.sync="model.f_residential_area"
72
- class="select_list select"
73
- v-model="model.f_residential_area"
74
- style="width: 60%"
75
- multiple
76
- condition="f_residential_area in {}"
77
- :options='$parent.$parent.residentialArea' placeholder='选择小区'
78
- close-on-select>
66
+ <!-- <div class="col-sm-2 form-group">-->
67
+ <!-- <label class="font_normal_body" >档案编号</label>-->
68
+ <!-- <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"-->
69
+ <!-- condition="f_olduserinfo_code = '{}' " placeholder="档案编号">-->
70
+ <!-- </div>-->
71
+ <!-- <div class="col-sm-2 form-group">-->
72
+ <!-- <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>-->
73
+ <!-- <v-select :value.sync="model.f_residential_area"-->
74
+ <!-- class="select_list select"-->
75
+ <!-- v-model="model.f_residential_area"-->
76
+ <!-- style="width: 60%"-->
77
+ <!-- multiple-->
78
+ <!-- condition="f_residential_area in {}"-->
79
+ <!-- :options='$parent.$parent.residentialArea' placeholder='选择小区'-->
80
+ <!-- close-on-select>-->
79
81
 
80
- </v-select>
81
- </div>
82
+ <!-- </v-select>-->
83
+ <!-- </div>-->
82
84
  <div class="col-sm-2 form-group">
83
85
  <label class="font_normal_body">客户地址</label>
84
86
  <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
@@ -105,14 +107,14 @@
105
107
  condition="f_meter_brand in {}"
106
108
  close-on-select></v-select>
107
109
  </div>
108
- <div class="col-sm-2 form-group">
109
- <label class="font_normal_body" title="参数名称:用户类型">客户类型</label>
110
- <v-select :value.sync="model.f_user_type"
111
- @change="$parent.$parent.userTypeChange()"
112
- :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
113
- condition="f_user_type = '{}'"
114
- close-on-select></v-select>
115
- </div>
110
+ <!-- <div class="col-sm-2 form-group">-->
111
+ <!-- <label class="font_normal_body" title="参数名称:用户类型">客户类型</label>-->
112
+ <!-- <v-select :value.sync="model.f_user_type"-->
113
+ <!-- @change="$parent.$parent.userTypeChange()"-->
114
+ <!-- :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"-->
115
+ <!-- condition="f_user_type = '{}'"-->
116
+ <!-- close-on-select></v-select>-->
117
+ <!-- </div>-->
116
118
  <div class="col-sm-2 form-group" >
117
119
  <label class="font_normal_body">客户状态</label>
118
120
  <v-select :value.sync="model.f_user_state"
@@ -157,9 +159,9 @@
157
159
  <th>
158
160
  <nobr>客户名称</nobr>
159
161
  </th>
160
- <th>
161
- <nobr>档案编号</nobr>
162
- </th>
162
+ <!-- <th>-->
163
+ <!-- <nobr>档案编号</nobr>-->
164
+ <!-- </th>-->
163
165
  <th>
164
166
  <nobr>客户电话</nobr>
165
167
  </th>
@@ -169,15 +171,15 @@
169
171
  <th>
170
172
  <nobr>证件号码</nobr>
171
173
  </th>
172
- <th>
173
- <nobr>小区</nobr>
174
- </th>
175
- <th>
176
- <nobr>客户地址</nobr>
177
- </th>
178
- <th>
179
- <nobr>客户类型</nobr>
180
- </th>
174
+ <!-- <th>-->
175
+ <!-- <nobr>小区</nobr>-->
176
+ <!-- </th>-->
177
+ <!-- <th>-->
178
+ <!-- <nobr>客户地址</nobr>-->
179
+ <!-- </th>-->
180
+ <!-- <th>-->
181
+ <!-- <nobr>客户类型</nobr>-->
182
+ <!-- </th>-->
181
183
  <th>
182
184
  <nobr>客户状态</nobr>
183
185
  </th>
@@ -232,9 +234,9 @@
232
234
  <td style="text-align: center;">
233
235
  <nobr>{{row.f_user_name}}</nobr>
234
236
  </td>
235
- <td style="text-align: center;">
236
- <nobr>{{row.f_olduserinfo_code}}</nobr>
237
- </td>
237
+ <!-- <td style="text-align: center;">-->
238
+ <!-- <nobr>{{row.f_olduserinfo_code}}</nobr>-->
239
+ <!-- </td>-->
238
240
  <td style="text-align: center;">
239
241
  <nobr>{{row.f_user_phone}}</nobr>
240
242
  </td>
@@ -244,15 +246,15 @@
244
246
  <td style="text-align: center;">
245
247
  <nobr>{{row.f_idnumber}}</nobr>
246
248
  </td>
247
- <td style="text-align: center;">
248
- <nobr>{{row.f_residential_area}}</nobr>
249
- </td>
250
- <td style="text-align: center;">
251
- <nobr>{{row.f_address}}</nobr>
252
- </td>
253
- <td style="text-align: center;">
254
- <nobr>{{row.f_user_type}}</nobr>
255
- </td>
249
+ <!-- <td style="text-align: center;">-->
250
+ <!-- <nobr>{{row.f_residential_area}}</nobr>-->
251
+ <!-- </td>-->
252
+ <!-- <td style="text-align: center;">-->
253
+ <!-- <nobr>{{row.f_address}}</nobr>-->
254
+ <!-- </td>-->
255
+ <!-- <td style="text-align: center;">-->
256
+ <!-- <nobr>{{row.f_user_type}}</nobr>-->
257
+ <!-- </td>-->
256
258
  <td style="text-align: center;">
257
259
  <nobr>{{row.f_user_state}}</nobr>
258
260
  </td>
@@ -334,8 +336,8 @@ export default {
334
336
  other: [],
335
337
  footer: [],
336
338
  model: new PagedList('rs/sql/getnogas', 30, {
337
- startDate: 'this.model.startDate != null && this.model.startDate != "" ? this.model.startDate : this.model.startHandDate',
338
- endDate: 'this.model.endDate != null && this.model.endDate != "" ? this.model.endDate : this.model.endHandDate'
339
+ startDate: this.$refs.paged.$refs.cri.model.startDate,
340
+ endDate: this.$refs.paged.$refs.cri.model.endDate
339
341
  }),
340
342
  initres: {
341
343
  org: [this.$login.f.orgid],