manage-client 1.60.12-4 → 1.60.12-7

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.
@@ -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 : 'http://192.168.1.212:8300/system'
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-4",
3
+ "version": "1.60.12-7",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -31,17 +31,17 @@
31
31
  <div class="span" style="float:right;">
32
32
  <button class="btn btn-success" style="border-radius: 2px;margin-right: 10px" @click="search()">查询</button>
33
33
  <button class="btn btn-success" style="border-radius: 2px;margin-right: 10px" @click="$parent.$parent.clear()">清空</button>
34
- <export-excel :data="$parent.$parent.getCondition"
35
- :field="$parent.$parent.getfield"
36
- :footer="$parent.$parent.footer"
37
- :header="$parent.$parent.other"
38
- sqlurl="rs/logic/exportfile"
39
- sql-name="getnogas"
40
- template-name='不用气查询导出'
41
- :choose-col="true"></export-excel>
42
- <print-data :model="$parent.model" :field="$parent.$parent.getfield"
43
- :defaultfield="$parent.$parent.defaultfield" print-name="不用气查询打印"
44
- ></print-data>
34
+ <!-- <export-excel :data="$parent.$parent.getCondition"-->
35
+ <!-- :field="$parent.$parent.getfield"-->
36
+ <!-- :footer="$parent.$parent.footer"-->
37
+ <!-- :header="$parent.$parent.other"-->
38
+ <!-- sqlurl="rs/logic/exportfile"-->
39
+ <!-- sql-name="getnogas"-->
40
+ <!-- template-name='不用气查询导出'-->
41
+ <!-- :choose-col="true"></export-excel>-->
42
+ <!-- <print-data :model="$parent.model" :field="$parent.$parent.getfield"-->
43
+ <!-- :defaultfield="$parent.$parent.defaultfield" print-name="不用气查询打印"-->
44
+ <!-- ></print-data>-->
45
45
 
46
46
  <div style="float: right" class="button_spacing"
47
47
  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
@@ -313,8 +313,8 @@
313
313
  </template>
314
314
  <script>
315
315
  import {HttpResetClass, PagedList} from 'vue-client'
316
- import defaultPrint from '../config/DefaultPrint'
317
- import exportConfig from '../config/exportConfig'
316
+ // import defaultPrint from '../config/DefaultPrint'
317
+ // import exportConfig from '../config/exportConfig'
318
318
 
319
319
 
320
320
  let readySomething = async function (self) {
@@ -336,8 +336,8 @@ export default {
336
336
  other: [],
337
337
  footer: [],
338
338
  model: new PagedList('rs/sql/getnogas', 30, {
339
- startDate: 'this.model.startDate != null && this.model.startDate != "" ? this.model.startDate : this.model.startHandDate',
340
- 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
341
341
  }),
342
342
  initres: {
343
343
  org: [this.$login.f.orgid],
@@ -1,177 +1,182 @@
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
+ <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 HH:mm:ss'"
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 HH:mm:ss'"
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='bussummary' top='1cm' left='2cm' width='100%' height='100%'></report-print>
33
+ <report-excel id='bussummary' ></report-excel>
34
+ </div>
35
+ </div>
36
+ </div>
37
+ </criteria>
38
+ <div partial='list' v-el:handcollect id='bussummary'>
39
+ <table class='tableprint' style="margin: 0px auto" v-if="!$parent.data.f_files_path">
40
+ <thead>
41
+ <tr>
42
+ <th colspan='8' style="font-weight: normal; text-align: left;">
43
+ <h3 style="text-align: center">操作员结账报表</h3>
44
+ </th>
45
+ </tr>
46
+ <tr>
47
+ <th colspan='8' 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='8' style="font-weight: normal; text-align: center;">
54
+ 组织机构:{{$parent.filialeNameStr}}
55
+ </th>
56
+ </tr>
57
+ </thead>
58
+ <tr>
59
+ <td colspan='8'>
60
+ {{{ model.data.substring(26,model.data.length-8) }}}
61
+ </td>
62
+ </tr>
63
+ <tfoot>
64
+ <tr style="text-align: left">
65
+ <th colspan='3'>财务审核:</th>
66
+ <th colspan='3'>收款审核:</th>
67
+ <th colspan='2'>收款员:</th>
68
+ </tr>
69
+ </tfoot>
70
+ </table>
71
+ {{{ $parent.reportStr }}}
72
+ </div>
73
+ </criteria-paged>
74
+ <modal :show.sync="show" v-ref:modal small backdrop="false">
75
+ <header slot="modal-header" class="modal-header">
76
+ <h4 class="modal-title">输入文件名称</h4>
77
+ </header>
78
+ <article slot="modal-body" class="modal-body">
79
+ <div class="form-group">
80
+ <input type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
81
+ </div>
82
+ </article>
83
+ <footer slot="modal-footer" class="modal-footer">
84
+ <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
85
+ <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
86
+ </footer>
87
+ </modal>
88
+
89
+ </div>
90
+ </template>
91
+ <script>
92
+ import { DataModel } from 'vue-client'
93
+ import co from 'co'
94
+ let saveFile = function * (self) {
95
+ // 线验证文件是否重名
96
+ let count = yield self.$resetpost('rs/sql/manageSingleTable',
97
+ {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
98
+ {resolveMsg: null, rejectMsg: null})
99
+ if (count.data.length > 0) {
100
+ self.$showAlert('无法保存,文件名重名', 'warning', 3000)
101
+ return
102
+ }
103
+ let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
104
+ f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'bus-summary',
105
+ f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
106
+ f_outlets: this.$login.f.f_parentname})
107
+ if (saveBack.data.status === 'succeed') {
108
+ self.show = false
109
+ self.filename = ''
110
+ // 后台保存完成,通知刷新
111
+ self.$dispatch('save-success', self.filename)
112
+ }
113
+ }
114
+ export default {
115
+ title: '收费类型报表',
116
+ props: ['data'],
117
+ data () {
118
+ return {
119
+ model: new DataModel('rs/report/otherstatistics', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
120
+ filialeCodeStr: 'this.model.filialeCodeStr'}),
121
+ reportStr: null,
122
+ show: false,
123
+ filename: '',
124
+ filialeNameStr: this.$login.f.orgpathnames,
125
+ filialeCodeStr: this.$login.f.orgpathstr,
126
+ userid: this.$login.f.id,
127
+ source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`
128
+ }
129
+ },
130
+ ready () {
131
+ if (this.data) {
132
+ this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
133
+ this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
134
+ }
135
+ this.$refs.paged.$refs.criteria.search()
136
+ },
137
+ methods: {
138
+ selfSearch (args) {
139
+ this.$refs.paged.$refs.criteria.model.filialeCodeStr = this.filialeCodeStr
140
+ this.$refs.paged.search(args)
141
+ },
142
+ getRes(obj) {
143
+ console.log(obj, '组织')
144
+ this.filialeNameStr = obj.res
145
+ this.filialeCodeStr = obj.resids
146
+ },
147
+ // 根据文件路径获取储存的报表内容
148
+ getFileContent (path) {
149
+ this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
150
+ this.reportStr = res.data.filecontent
151
+ this.model.state = '正确'
152
+ })
153
+ },
154
+ confirm () {
155
+ if (!this.filename || this.filename === '') {
156
+ this.$showAlert('无法保存,文件名不能为空', 'warning', 3000)
157
+ }
158
+ let saveGen = saveFile(this)
159
+ co(saveGen)
160
+ },
161
+ close () {
162
+ this.show = false
163
+ },
164
+ // 将报表保存成文件
165
+ confirmReport () {
166
+ this.show = true
167
+ this.filename = this.data.f_report_name + this.$login.toStandardDateString()
168
+ }
169
+ },
170
+ watch: {
171
+ 'data' (val) {
172
+ if (val.f_files_path) {
173
+ this.getFileContent(val.f_files_path)
174
+ } else {
175
+ this.reportStr = null
176
+ }
177
+ }
178
+ },
179
+ computed: {
180
+ }
181
+ }
182
+ </script>