manage-client 1.8.23-40 → 1.8.23-41
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/build/dev-server.js
CHANGED
|
@@ -7,8 +7,8 @@ var proxyMiddleware = require('http-proxy-middleware')
|
|
|
7
7
|
var app = express()
|
|
8
8
|
var compiler = webpack(config)
|
|
9
9
|
// var proxy = httpProxy.createProxyServer()
|
|
10
|
-
|
|
11
|
-
var str = 'http://112.35.127.105:8300/', str2 = 'http://112.35.127.105:8300/'
|
|
10
|
+
var str = 'http://112.35.127.105:8305/ ', str2 = 'http://112.35.127.105:8305/'
|
|
11
|
+
// var str = 'http://112.35.127.105:8300/', str2 = 'http://112.35.127.105:8300/'
|
|
12
12
|
var proxyTable = {
|
|
13
13
|
/*'/rs/logic/exportfile': {
|
|
14
14
|
target: str2
|
|
@@ -60,7 +60,8 @@ var proxyTable = {
|
|
|
60
60
|
},*/
|
|
61
61
|
'/rs/report': {
|
|
62
62
|
//target: 'http://127.0.0.1:8080/manage'
|
|
63
|
-
target: 'http://127.0.0.1:8081'
|
|
63
|
+
// target: 'http://127.0.0.1:8081'
|
|
64
|
+
target: str
|
|
64
65
|
},
|
|
65
66
|
'/rs/vue': {
|
|
66
67
|
// target: 'http://127.0.0.1:8089/manage'
|
package/package.json
CHANGED
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "manage-client",
|
|
3
|
-
"version": "1.8.23-
|
|
3
|
+
"version": "1.8.23-41",
|
|
4
4
|
"description": "经营管控模块前台组件",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"directories": {
|
|
7
7
|
"test": "test"
|
|
8
8
|
},
|
|
9
|
-
"dependencies": {},
|
|
10
9
|
"devDependencies": {
|
|
11
10
|
"babel-core": "^6.0.0",
|
|
12
11
|
"babel-loader": "^6.0.0",
|
|
@@ -1,181 +1,241 @@
|
|
|
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
|
-
<
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
<
|
|
64
|
-
<tr
|
|
65
|
-
<th colspan='
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
</
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
</
|
|
90
|
-
<
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
}
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
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
|
+
<button class="btn btn-primary width-100" @click="search()">查询</button>
|
|
26
|
+
<!--<button class="btn btn-success width-100" @click="$parent.$parent.confirmReport()">保存报表</button>-->
|
|
27
|
+
</div>
|
|
28
|
+
<span></span>
|
|
29
|
+
<div class="form-group">
|
|
30
|
+
<report-print id='gasprice' top='1cm' left='2cm' width='100%' height='100%'></report-print>
|
|
31
|
+
<report-excel id='gasprice' ></report-excel>
|
|
32
|
+
</div>
|
|
33
|
+
</div>
|
|
34
|
+
<div class="row">
|
|
35
|
+
<div class="col-sm-4">
|
|
36
|
+
<label class="font_normal_body"> 公司 </label>
|
|
37
|
+
<right-tree @re-res="$parent.$parent.getRes"></right-tree>
|
|
38
|
+
</div>
|
|
39
|
+
<div class="col-sm-4">
|
|
40
|
+
<label class="font_normal_body"> 部门 </label>
|
|
41
|
+
<res-select restype='department'
|
|
42
|
+
is-mul="false"
|
|
43
|
+
@res-select="$parent.$parent.getdep"
|
|
44
|
+
:parentresid="$parent.$parent.depresid"
|
|
45
|
+
:initresid='$parent.$parent.depid'>
|
|
46
|
+
</res-select>
|
|
47
|
+
|
|
48
|
+
</div>
|
|
49
|
+
<div class="col-sm-4">
|
|
50
|
+
<label class="font_normal_body"> 人员 </label>
|
|
51
|
+
<res-select restype='user'
|
|
52
|
+
is-mul="false"
|
|
53
|
+
@res-select="$parent.$parent.getuser"
|
|
54
|
+
:parentresid="$parent.$parent.userresid"
|
|
55
|
+
:initresid='$parent.$parent.operatorid'>
|
|
56
|
+
</res-select>
|
|
57
|
+
</div>
|
|
58
|
+
</div>
|
|
59
|
+
</div>
|
|
60
|
+
</criteria>
|
|
61
|
+
<div partial='list' v-el:handcollect id='gasprice'>
|
|
62
|
+
<table class='tableprint' style="margin: 0px auto" v-if="!$parent.data.f_files_path">
|
|
63
|
+
<thead>
|
|
64
|
+
<tr>
|
|
65
|
+
<th colspan='6' style="font-weight: normal; text-align: left;">
|
|
66
|
+
<h3 style="text-align: center">月用气量汇总表</h3>
|
|
67
|
+
</th>
|
|
68
|
+
</tr>
|
|
69
|
+
<tr>
|
|
70
|
+
<th colspan='6' style="font-weight: normal; text-align: center;">
|
|
71
|
+
开始时间：{{model.model.startDate}}
|
|
72
|
+
结束时间：{{ model.model.endDate }}
|
|
73
|
+
</th>
|
|
74
|
+
</tr>
|
|
75
|
+
<tr>
|
|
76
|
+
<th colspan='9' style="font-weight: normal; text-align: center;">
|
|
77
|
+
<div>
|
|
78
|
+
<span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
|
|
79
|
+
<span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
|
|
80
|
+
<span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
|
|
81
|
+
</div>
|
|
82
|
+
</th>
|
|
83
|
+
</tr>
|
|
84
|
+
</thead>
|
|
85
|
+
<tr>
|
|
86
|
+
<td colspan='6'>
|
|
87
|
+
{{{ model.data.substring(26,model.data.length-8) }}}
|
|
88
|
+
</td>
|
|
89
|
+
</tr>
|
|
90
|
+
<tfoot>
|
|
91
|
+
<tr style="text-align: left">
|
|
92
|
+
<th colspan='3'>财务审核：</th>
|
|
93
|
+
<th colspan='3'>收款审核：</th>
|
|
94
|
+
</tr>
|
|
95
|
+
</tfoot>
|
|
96
|
+
</table>
|
|
97
|
+
{{{ $parent.reportStr }}}
|
|
98
|
+
</div>
|
|
99
|
+
</criteria-paged>
|
|
100
|
+
<modal :show.sync="show" v-ref:modal small backdrop="false">
|
|
101
|
+
<header slot="modal-header" class="modal-header">
|
|
102
|
+
<h4 class="modal-title">输入文件名称</h4>
|
|
103
|
+
</header>
|
|
104
|
+
<article slot="modal-body" class="modal-body">
|
|
105
|
+
<div class="form-group">
|
|
106
|
+
<input type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
|
|
107
|
+
</div>
|
|
108
|
+
</article>
|
|
109
|
+
<footer slot="modal-footer" class="modal-footer">
|
|
110
|
+
<button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
|
|
111
|
+
<button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
|
|
112
|
+
</footer>
|
|
113
|
+
</modal>
|
|
114
|
+
|
|
115
|
+
</div>
|
|
116
|
+
</template>
|
|
117
|
+
<script>
|
|
118
|
+
import { DataModel } from 'vue-client'
|
|
119
|
+
import co from 'co'
|
|
120
|
+
let saveFile = function * (self) {
|
|
121
|
+
// 线验证文件是否重名
|
|
122
|
+
let count = yield self.$resetpost('rs/sql/manageSingleTable',
|
|
123
|
+
{data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
|
|
124
|
+
{resolveMsg: null, rejectMsg: null})
|
|
125
|
+
if (count.data.length > 0) {
|
|
126
|
+
self.$showAlert('无法保存，文件名重名', 'warning', 3000)
|
|
127
|
+
return
|
|
128
|
+
}
|
|
129
|
+
let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
|
|
130
|
+
f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-month-gas',
|
|
131
|
+
f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
|
|
132
|
+
f_outlets: this.$login.f.f_parentname})
|
|
133
|
+
if (saveBack.data.status === 'succeed') {
|
|
134
|
+
self.show = false
|
|
135
|
+
self.filename = ''
|
|
136
|
+
// 后台保存完成，通知刷新
|
|
137
|
+
self.$dispatch('save-success', self.filename)
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
export default {
|
|
141
|
+
title: '月用气量汇总表',
|
|
142
|
+
props: ['data'],
|
|
143
|
+
data () {
|
|
144
|
+
return {
|
|
145
|
+
model: new DataModel('rs/report/manage_day_sellgas', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
|
|
146
|
+
filialeCodeStr: 'this.model.filialeCodeStr'}),
|
|
147
|
+
reportStr: null,
|
|
148
|
+
show: false,
|
|
149
|
+
filename: '',
|
|
150
|
+
depresid: [],
|
|
151
|
+
userresid: [],
|
|
152
|
+
f_orgid: this.$login.f.orgid,
|
|
153
|
+
f_depid: this.$login.f.depids,
|
|
154
|
+
f_operatorid: this.$login.f.id,
|
|
155
|
+
operatorid: [],
|
|
156
|
+
depid: [],
|
|
157
|
+
orgname: '',
|
|
158
|
+
depname: '',
|
|
159
|
+
operatorname: '',
|
|
160
|
+
filialeNameStr: this.$login.f.orgpathnames,
|
|
161
|
+
filialeCodeStr: 'and f_orgid =' + this.$login.f.orgid,
|
|
162
|
+
userid: this.$login.f.id,
|
|
163
|
+
source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`
|
|
164
|
+
}
|
|
165
|
+
},
|
|
166
|
+
ready () {
|
|
167
|
+
if (this.data) {
|
|
168
|
+
this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
|
|
169
|
+
this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
|
|
170
|
+
}
|
|
171
|
+
this.$refs.paged.$refs.criteria.search()
|
|
172
|
+
},
|
|
173
|
+
methods: {
|
|
174
|
+
selfSearch (args) {
|
|
175
|
+
let orgcondition = 'and f_orgid = ' + this.f_orgid
|
|
176
|
+
if (this.f_depid[0]) {
|
|
177
|
+
orgcondition += ' and f_depid = ' + this.f_depid
|
|
178
|
+
}
|
|
179
|
+
if(this.f_operatorid[0]) {
|
|
180
|
+
orgcondition += ' and f_operatorid = ' + this.f_operatorid
|
|
181
|
+
}
|
|
182
|
+
this.$refs.paged.$refs.criteria.model.filialeCodeStr = orgcondition
|
|
183
|
+
this.$refs.paged.search(args)
|
|
184
|
+
},
|
|
185
|
+
// getRes(obj) {
|
|
186
|
+
// console.log(obj, '组织')
|
|
187
|
+
// this.filialeNameStr = obj.res
|
|
188
|
+
// this.filialeCodeStr = obj.resids
|
|
189
|
+
// },
|
|
190
|
+
getRes(obj,val) {
|
|
191
|
+
debugger
|
|
192
|
+
this.filialeCodeStr = obj
|
|
193
|
+
this.orgname = obj.res[0]
|
|
194
|
+
this.depresid = obj.resids
|
|
195
|
+
this.f_orgid = obj.resids
|
|
196
|
+
},
|
|
197
|
+
getdep (obj, val) {
|
|
198
|
+
this.depname = val[0]
|
|
199
|
+
this.userresid = obj
|
|
200
|
+
this.f_depid = obj
|
|
201
|
+
},
|
|
202
|
+
getuser ( obj, val) {
|
|
203
|
+
this.operatorname = val[0]
|
|
204
|
+
this.f_operatorid = obj
|
|
205
|
+
},
|
|
206
|
+
// 根据文件路径获取储存的报表内容
|
|
207
|
+
getFileContent (path) {
|
|
208
|
+
this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
|
|
209
|
+
this.reportStr = res.data.filecontent
|
|
210
|
+
this.model.state = '正确'
|
|
211
|
+
})
|
|
212
|
+
},
|
|
213
|
+
confirm () {
|
|
214
|
+
if (!this.filename || this.filename === '') {
|
|
215
|
+
this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
|
|
216
|
+
}
|
|
217
|
+
let saveGen = saveFile(this)
|
|
218
|
+
co(saveGen)
|
|
219
|
+
},
|
|
220
|
+
close () {
|
|
221
|
+
this.show = false
|
|
222
|
+
},
|
|
223
|
+
// 将报表保存成文件
|
|
224
|
+
confirmReport () {
|
|
225
|
+
this.show = true
|
|
226
|
+
this.filename = this.data.f_report_name + this.$login.toStandardDateString()
|
|
227
|
+
}
|
|
228
|
+
},
|
|
229
|
+
watch: {
|
|
230
|
+
'data' (val) {
|
|
231
|
+
if (val.f_files_path) {
|
|
232
|
+
this.getFileContent(val.f_files_path)
|
|
233
|
+
} else {
|
|
234
|
+
this.reportStr = null
|
|
235
|
+
}
|
|
236
|
+
}
|
|
237
|
+
},
|
|
238
|
+
computed: {
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
</script>
|