manage-client 1.22.21-ca → 1.22.24-ca
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 +93 -93
- package/package.json +1 -1
- package/src/components/sale/businessquery/TransferQuery.vue +11 -42
- package/src/components/sale/filesquery/DeviceQuery.vue +371 -372
- package/src/components/sale/filesquery/MeterQuery.vue +514 -515
- package/src/components/webmeter/DrillData/UserGasAll.vue +309 -231
package/build/dev-server.js
CHANGED
|
@@ -1,93 +1,93 @@
|
|
|
1
|
-
var express = require('express')
|
|
2
|
-
var webpack = require('webpack')
|
|
3
|
-
var config = require('./webpack.dev.conf')
|
|
4
|
-
var proxyMiddleware = require('http-proxy-middleware')
|
|
5
|
-
// var httpProxy = require('http-proxy')
|
|
6
|
-
|
|
7
|
-
var app = express()
|
|
8
|
-
var compiler = webpack(config)
|
|
9
|
-
// var proxy = httpProxy.createProxyServer()
|
|
10
|
-
|
|
11
|
-
var bendi = 'http://
|
|
12
|
-
var proxyTable = {
|
|
13
|
-
// 查找资源服务数据
|
|
14
|
-
'/rs/sql/manageSingleTable': {
|
|
15
|
-
target:changan
|
|
16
|
-
},
|
|
17
|
-
'/rs/search': {
|
|
18
|
-
target: changan
|
|
19
|
-
},
|
|
20
|
-
'/rs/logic/getLogin': {
|
|
21
|
-
target: changan
|
|
22
|
-
},
|
|
23
|
-
'/rs/logic/getInitData': {
|
|
24
|
-
target: changan
|
|
25
|
-
},
|
|
26
|
-
'/rs/logic/getSaleInitData': {
|
|
27
|
-
target: changan
|
|
28
|
-
},
|
|
29
|
-
// 用户登录服务地址
|
|
30
|
-
'/rs/user': {
|
|
31
|
-
target: changan
|
|
32
|
-
},
|
|
33
|
-
'/rs/data': {
|
|
34
|
-
target: changan
|
|
35
|
-
},
|
|
36
|
-
'/rs/license': {
|
|
37
|
-
target: changan
|
|
38
|
-
},
|
|
39
|
-
'/xyhf/rs/xyhf': {
|
|
40
|
-
target: changan
|
|
41
|
-
},
|
|
42
|
-
'/rs': {
|
|
43
|
-
//target: changan
|
|
44
|
-
target: changan
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
48
|
-
publicPath: config.output.publicPath,
|
|
49
|
-
stats: {
|
|
50
|
-
colors: true,
|
|
51
|
-
chunks: false
|
|
52
|
-
}
|
|
53
|
-
})
|
|
54
|
-
|
|
55
|
-
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
56
|
-
// force page reload when html-webpack-plugin template changes
|
|
57
|
-
compiler.plugin('compilation', function (compilation) {
|
|
58
|
-
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
59
|
-
hotMiddleware.publish({ action: 'reload' })
|
|
60
|
-
cb()
|
|
61
|
-
})
|
|
62
|
-
})
|
|
63
|
-
|
|
64
|
-
// proxy api requests
|
|
65
|
-
Object.keys(proxyTable).forEach(function (context) {
|
|
66
|
-
var options = proxyTable[context]
|
|
67
|
-
if (typeof options === 'string') {
|
|
68
|
-
options = { target: options }
|
|
69
|
-
}
|
|
70
|
-
app.use(proxyMiddleware(context, options))
|
|
71
|
-
})
|
|
72
|
-
|
|
73
|
-
// handle fallback for HTML5 history API
|
|
74
|
-
app.use(require('connect-history-api-fallback')())
|
|
75
|
-
|
|
76
|
-
// serve webpack bundle output
|
|
77
|
-
app.use(devMiddleware)
|
|
78
|
-
|
|
79
|
-
// enable hot-reload and state-preserving
|
|
80
|
-
// compilation error display
|
|
81
|
-
app.use(hotMiddleware)
|
|
82
|
-
|
|
83
|
-
// serve pure static assets
|
|
84
|
-
app.use('/static', express.static('./static'))
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
module.exports = app.listen(8085, function (err) {
|
|
88
|
-
if (err) {
|
|
89
|
-
console.log(err)
|
|
90
|
-
return
|
|
91
|
-
}
|
|
92
|
-
console.log('Listening at http://localhost:8085')
|
|
93
|
-
})
|
|
1
|
+
var express = require('express')
|
|
2
|
+
var webpack = require('webpack')
|
|
3
|
+
var config = require('./webpack.dev.conf')
|
|
4
|
+
var proxyMiddleware = require('http-proxy-middleware')
|
|
5
|
+
// var httpProxy = require('http-proxy')
|
|
6
|
+
|
|
7
|
+
var app = express()
|
|
8
|
+
var compiler = webpack(config)
|
|
9
|
+
// var proxy = httpProxy.createProxyServer()
|
|
10
|
+
|
|
11
|
+
var bendi = 'http://192.168.2.84:7003/', changan = 'http://192.168.2.84:7003/'
|
|
12
|
+
var proxyTable = {
|
|
13
|
+
// 查找资源服务数据
|
|
14
|
+
'/rs/sql/manageSingleTable': {
|
|
15
|
+
target:changan
|
|
16
|
+
},
|
|
17
|
+
'/rs/search': {
|
|
18
|
+
target: changan
|
|
19
|
+
},
|
|
20
|
+
'/rs/logic/getLogin': {
|
|
21
|
+
target: changan
|
|
22
|
+
},
|
|
23
|
+
'/rs/logic/getInitData': {
|
|
24
|
+
target: changan
|
|
25
|
+
},
|
|
26
|
+
'/rs/logic/getSaleInitData': {
|
|
27
|
+
target: changan
|
|
28
|
+
},
|
|
29
|
+
// 用户登录服务地址
|
|
30
|
+
'/rs/user': {
|
|
31
|
+
target: changan
|
|
32
|
+
},
|
|
33
|
+
'/rs/data': {
|
|
34
|
+
target: changan
|
|
35
|
+
},
|
|
36
|
+
'/rs/license': {
|
|
37
|
+
target: changan
|
|
38
|
+
},
|
|
39
|
+
'/xyhf/rs/xyhf': {
|
|
40
|
+
target: changan
|
|
41
|
+
},
|
|
42
|
+
'/rs': {
|
|
43
|
+
//target: changan
|
|
44
|
+
target: changan
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
var devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
48
|
+
publicPath: config.output.publicPath,
|
|
49
|
+
stats: {
|
|
50
|
+
colors: true,
|
|
51
|
+
chunks: false
|
|
52
|
+
}
|
|
53
|
+
})
|
|
54
|
+
|
|
55
|
+
var hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
56
|
+
// force page reload when html-webpack-plugin template changes
|
|
57
|
+
compiler.plugin('compilation', function (compilation) {
|
|
58
|
+
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
59
|
+
hotMiddleware.publish({ action: 'reload' })
|
|
60
|
+
cb()
|
|
61
|
+
})
|
|
62
|
+
})
|
|
63
|
+
|
|
64
|
+
// proxy api requests
|
|
65
|
+
Object.keys(proxyTable).forEach(function (context) {
|
|
66
|
+
var options = proxyTable[context]
|
|
67
|
+
if (typeof options === 'string') {
|
|
68
|
+
options = { target: options }
|
|
69
|
+
}
|
|
70
|
+
app.use(proxyMiddleware(context, options))
|
|
71
|
+
})
|
|
72
|
+
|
|
73
|
+
// handle fallback for HTML5 history API
|
|
74
|
+
app.use(require('connect-history-api-fallback')())
|
|
75
|
+
|
|
76
|
+
// serve webpack bundle output
|
|
77
|
+
app.use(devMiddleware)
|
|
78
|
+
|
|
79
|
+
// enable hot-reload and state-preserving
|
|
80
|
+
// compilation error display
|
|
81
|
+
app.use(hotMiddleware)
|
|
82
|
+
|
|
83
|
+
// serve pure static assets
|
|
84
|
+
app.use('/static', express.static('./static'))
|
|
85
|
+
|
|
86
|
+
|
|
87
|
+
module.exports = app.listen(8085, function (err) {
|
|
88
|
+
if (err) {
|
|
89
|
+
console.log(err)
|
|
90
|
+
return
|
|
91
|
+
}
|
|
92
|
+
console.log('Listening at http://localhost:8085')
|
|
93
|
+
})
|
package/package.json
CHANGED
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
<th><nobr>原用户姓名</nobr></th>
|
|
92
92
|
<th><nobr>新用户电话</nobr></th>
|
|
93
93
|
<th><nobr>原用户电话</nobr></th>
|
|
94
|
-
<th><nobr>过户费</nobr></th
|
|
94
|
+
<!-- <th><nobr>过户费</nobr></th>-->
|
|
95
95
|
<th><nobr>过户日期</nobr></th>
|
|
96
96
|
<th><nobr>操作员</nobr></th>
|
|
97
97
|
<th><nobr>营业网点</nobr></th>
|
|
@@ -106,7 +106,7 @@
|
|
|
106
106
|
<td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>
|
|
107
107
|
<td style="text-align: center;"><nobr>{{row.f_newuser_phone}}</nobr></td>
|
|
108
108
|
<td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
|
|
109
|
-
<td style="text-align: center;"><nobr>{{row.f_transfer_fees}}</nobr></td
|
|
109
|
+
<!-- <td style="text-align: center;"><nobr>{{row.f_transfer_fees}}</nobr></td>-->
|
|
110
110
|
<td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
|
|
111
111
|
<td style="text-align: center;"><nobr>{{row.f_operator}}</nobr></td>
|
|
112
112
|
<td style="text-align: center;"><nobr>{{row.f_outlets}}</nobr></td>
|
|
@@ -116,39 +116,12 @@
|
|
|
116
116
|
</data-grid>
|
|
117
117
|
</criteria-paged>
|
|
118
118
|
|
|
119
|
-
<table class="table-hover"
|
|
120
|
-
<tr class="table-bordered"
|
|
121
|
-
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">汇总信息</td
|
|
122
|
-
<td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">过户费合计: {{sumsmodel.f_transfer_fees}}</td
|
|
123
|
-
</tr
|
|
124
|
-
</table
|
|
125
|
-
<!--<colligate-details :showinfo="showinfo" :businesstype="businesstype" :data="data" @close-info="showinfo=false"></colligate-details>-->
|
|
126
|
-
<!--<modal :show.sync="printshow" v-ref:modal backdrop="false">-->
|
|
127
|
-
<!--<header slot="modal-header" class="modal-header text-center">-->
|
|
128
|
-
<!--<h4 class="modal-title">打印列选择</h4>-->
|
|
129
|
-
<!--<input type="checkbox" class="" id="f_generations" v-model="all">-->
|
|
130
|
-
<!--<label for="f_generations" class="font-size">全选</label>-->
|
|
131
|
-
<!--</header>-->
|
|
132
|
-
<!--<article slot="modal-body">-->
|
|
133
|
-
<!--<div class="auto col-sm-11 col-md-offset-1" style="margin-top: 10px;">-->
|
|
134
|
-
<!--<div class="col-sm-3" v-for="f in fields">-->
|
|
135
|
-
<!--<input type="checkbox" class="" :id="'water-owe-details-'+$index" v-model="modelval" :value="$key">-->
|
|
136
|
-
<!--<label :for="'water-owe-details-'+$index" class="font-size">{{f}}</label>-->
|
|
137
|
-
<!--</div>-->
|
|
138
|
-
<!--</div>-->
|
|
139
|
-
<!--</article>-->
|
|
140
|
-
<!--<footer slot="modal-footer" class="modal-footer">-->
|
|
141
|
-
<!--<center>-->
|
|
142
|
-
<!--<button v-show="printshow" type="button" class="btn btn-default" @click='close()'>取消</button>-->
|
|
143
|
-
<!--<button v-show="printshow" type="button" class="btn btn-success" @click='print()'>打印</button>-->
|
|
144
|
-
<!--<print-table :model='model' v-show="false" v-ref:print-->
|
|
145
|
-
<!--:top='40' :left='60' :right='40' :bottom='60'-->
|
|
146
|
-
<!--:thead="thead" :tfoot='tfoot' :attach="yangsen"-->
|
|
147
|
-
<!--:fields="modelval" :printpage="true">-->
|
|
148
|
-
<!--</print-table>-->
|
|
149
|
-
<!--</center>-->
|
|
150
|
-
<!--</footer>-->
|
|
151
|
-
<!--</modal>-->
|
|
119
|
+
<!-- <table class="table-hover" >-->
|
|
120
|
+
<!-- <tr class="table-bordered">-->
|
|
121
|
+
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">汇总信息</td>-->
|
|
122
|
+
<!-- <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">过户费合计: {{sumsmodel.f_transfer_fees}}</td>-->
|
|
123
|
+
<!-- </tr>-->
|
|
124
|
+
<!-- </table>-->
|
|
152
125
|
</div>
|
|
153
126
|
</template>
|
|
154
127
|
|
|
@@ -160,7 +133,7 @@
|
|
|
160
133
|
let readySomething = async function (self) {
|
|
161
134
|
self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
|
|
162
135
|
self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
|
|
163
|
-
self.$refs.paged.$refs.cri.model.f_state = ['有效']
|
|
136
|
+
// self.$refs.paged.$refs.cri.model.f_state = ['有效']
|
|
164
137
|
/* await self.$refs.paged.$refs.cri.search()
|
|
165
138
|
self.sumsmodel = self.$refs.paged.$refs.grid.model.sums*/
|
|
166
139
|
}
|
|
@@ -170,22 +143,18 @@
|
|
|
170
143
|
data: {},
|
|
171
144
|
model: new PagedList('rs/sql/transferQuery', 20,{},{f_transfer_fees: 0}),
|
|
172
145
|
criteriaShow: true,
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
bodyData: ["f_userinfo_code", "f_newuser_name", "f_newuser_phone", "address", "f_state", "f_user_name", "f_user_phone", "f_user_type", "f_gasproperties", "f_price_name", "f_transfer_fees", "f_operate_date","f_operator","f_outlets","f_filiale"],
|
|
176
|
-
|
|
146
|
+
headData: ["用户编号","新户姓名","新户电话","用户地址","过户状态","原户姓名","原户电话","操作时间","操作员","营业网点","分公司"],
|
|
147
|
+
bodyData: ["f_userinfo_code", "f_newuser_name", "f_newuser_phone", "address", "f_state", "f_user_name", "f_user_phone", "f_operate_date","f_operator","f_outlets","f_filiale"],
|
|
177
148
|
filialeNameStr: null,
|
|
178
149
|
filialeCodeStr: this.$login.f.f_orgids,
|
|
179
150
|
userid: this.$login.f.id,
|
|
180
151
|
source:`tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() != $role$))`,
|
|
181
|
-
|
|
182
152
|
modelval: [],
|
|
183
153
|
printshow: false,
|
|
184
154
|
all: false,
|
|
185
155
|
fields: {},
|
|
186
156
|
thead: '',
|
|
187
157
|
tfoot: '',
|
|
188
|
-
|
|
189
158
|
transferstate: this.$appdata.getParam('过户状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('过户状态')] : [],
|
|
190
159
|
//合计数据
|
|
191
160
|
sumsmodel: {}
|