sale-client 3.5.213 → 3.5.214
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 +108 -108
- package/package.json +1 -1
- package/src/components/revenue/base/leftview/Userinfo.vue +120 -109
- package/src/components/revenue/base/leftview/meterinfodetail.vue +1 -1
- package/src/components/revenue/comprehen/gasbrand/GasBrandList.vue +18 -4
- package/src/components/revenue/comprehen/gasbrand/GasBrandManage.vue +2 -1
- package/src/components/revenue/comprehen/gasbrand/GasBrandUser.vue +4 -1
- package/src/filiale/huayin/base/meterinfodetail.vue +1 -1
- package/src/filiale/kelai/meterinfodetail.vue +12 -0
- package/src/filiale/wenxi/HandplanQuery.vue +1300 -0
- package/src/filiale/wenxi/sale.js +2 -1
- package/src/filiale/xiangyun/cardChargeQuery.vue +9 -0
- package/src/filiale/xiangyun/cardChargeQuery1.vue +199 -199
- package/src/filiale/xiangyun/machineChargeQuery.vue +9 -0
- package/src/main.js +22 -22
- package/src/sale.js +1151 -1151
package/build/dev-server.js
CHANGED
|
@@ -1,108 +1,108 @@
|
|
|
1
|
-
const express = require('express')
|
|
2
|
-
const webpack = require('webpack')
|
|
3
|
-
const config = require('./webpack.dev.conf')
|
|
4
|
-
const proxyMiddleware = require('http-proxy-middleware')
|
|
5
|
-
const app = express()
|
|
6
|
-
const compiler = webpack(config)
|
|
7
|
-
|
|
8
|
-
// 自己改了这里不要提交 来回覆盖挺麻烦的
|
|
9
|
-
const [local, server] = ['http://121.36.60.63:8800/#', 'http://121.36.60.63:8800/#']
|
|
10
|
-
const port = 8089
|
|
11
|
-
|
|
12
|
-
const proxyTable = {
|
|
13
|
-
'/rs/file': {
|
|
14
|
-
target: server
|
|
15
|
-
},
|
|
16
|
-
// 查找资源服务数据
|
|
17
|
-
'/rs/search': {
|
|
18
|
-
target: server
|
|
19
|
-
},
|
|
20
|
-
// 查找资源服务数据
|
|
21
|
-
'/rs/logic/getLogin': {
|
|
22
|
-
target: server
|
|
23
|
-
},
|
|
24
|
-
// 查找资源服务数据
|
|
25
|
-
'/rs/logic/getInitData': {
|
|
26
|
-
target: server
|
|
27
|
-
},
|
|
28
|
-
'/rs/logic/getSaleInitData': {
|
|
29
|
-
target: server
|
|
30
|
-
},
|
|
31
|
-
// 用户登录服务地址
|
|
32
|
-
'/rs/user': {
|
|
33
|
-
target: server
|
|
34
|
-
},
|
|
35
|
-
'/rs/path': {
|
|
36
|
-
target: server
|
|
37
|
-
},
|
|
38
|
-
'/rs/data': {
|
|
39
|
-
target: server
|
|
40
|
-
},
|
|
41
|
-
'/rs/license': {
|
|
42
|
-
target: server
|
|
43
|
-
},
|
|
44
|
-
'/rs/db': {
|
|
45
|
-
target: server
|
|
46
|
-
},
|
|
47
|
-
'/excel': {
|
|
48
|
-
target: server
|
|
49
|
-
},
|
|
50
|
-
'/rs/config': {
|
|
51
|
-
target: server
|
|
52
|
-
},
|
|
53
|
-
'/rs/report': {
|
|
54
|
-
target: server
|
|
55
|
-
},
|
|
56
|
-
'/rs/vue': {
|
|
57
|
-
target: server
|
|
58
|
-
},
|
|
59
|
-
'/rs/logic': {
|
|
60
|
-
target: local
|
|
61
|
-
},
|
|
62
|
-
'/rs/sql': {
|
|
63
|
-
target: local
|
|
64
|
-
},
|
|
65
|
-
'/webmeter': {
|
|
66
|
-
target: server
|
|
67
|
-
},
|
|
68
|
-
'/rs': {
|
|
69
|
-
target: server,
|
|
70
|
-
// changeOrigin: true
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
|
|
74
|
-
const devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
75
|
-
publicPath: config.output.publicPath,
|
|
76
|
-
stats: {
|
|
77
|
-
colors: true,
|
|
78
|
-
chunks: false
|
|
79
|
-
}
|
|
80
|
-
})
|
|
81
|
-
|
|
82
|
-
const hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
83
|
-
compiler.plugin('compilation', function (compilation) {
|
|
84
|
-
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
85
|
-
hotMiddleware.publish({action: 'reload'})
|
|
86
|
-
cb()
|
|
87
|
-
})
|
|
88
|
-
})
|
|
89
|
-
|
|
90
|
-
Object.keys(proxyTable).forEach(function (context) {
|
|
91
|
-
let options = proxyTable[context]
|
|
92
|
-
if (typeof options === 'string') {
|
|
93
|
-
options = {target: options}
|
|
94
|
-
}
|
|
95
|
-
app.use(proxyMiddleware(context, options))
|
|
96
|
-
})
|
|
97
|
-
app.use(require('connect-history-api-fallback')())
|
|
98
|
-
app.use(devMiddleware)
|
|
99
|
-
app.use(hotMiddleware)
|
|
100
|
-
app.use('/static', express.static('./static'))
|
|
101
|
-
|
|
102
|
-
module.exports = app.listen(port, function (err) {
|
|
103
|
-
if (err) {
|
|
104
|
-
console.log(err)
|
|
105
|
-
return
|
|
106
|
-
}
|
|
107
|
-
console.log('Listening at http://localhost:' + port)
|
|
108
|
-
})
|
|
1
|
+
const express = require('express')
|
|
2
|
+
const webpack = require('webpack')
|
|
3
|
+
const config = require('./webpack.dev.conf')
|
|
4
|
+
const proxyMiddleware = require('http-proxy-middleware')
|
|
5
|
+
const app = express()
|
|
6
|
+
const compiler = webpack(config)
|
|
7
|
+
|
|
8
|
+
// 自己改了这里不要提交 来回覆盖挺麻烦的
|
|
9
|
+
const [local, server] = ['http://121.36.60.63:8800/#', 'http://121.36.60.63:8800/#']
|
|
10
|
+
const port = 8089
|
|
11
|
+
|
|
12
|
+
const proxyTable = {
|
|
13
|
+
'/rs/file': {
|
|
14
|
+
target: server
|
|
15
|
+
},
|
|
16
|
+
// 查找资源服务数据
|
|
17
|
+
'/rs/search': {
|
|
18
|
+
target: server
|
|
19
|
+
},
|
|
20
|
+
// 查找资源服务数据
|
|
21
|
+
'/rs/logic/getLogin': {
|
|
22
|
+
target: server
|
|
23
|
+
},
|
|
24
|
+
// 查找资源服务数据
|
|
25
|
+
'/rs/logic/getInitData': {
|
|
26
|
+
target: server
|
|
27
|
+
},
|
|
28
|
+
'/rs/logic/getSaleInitData': {
|
|
29
|
+
target: server
|
|
30
|
+
},
|
|
31
|
+
// 用户登录服务地址
|
|
32
|
+
'/rs/user': {
|
|
33
|
+
target: server
|
|
34
|
+
},
|
|
35
|
+
'/rs/path': {
|
|
36
|
+
target: server
|
|
37
|
+
},
|
|
38
|
+
'/rs/data': {
|
|
39
|
+
target: server
|
|
40
|
+
},
|
|
41
|
+
'/rs/license': {
|
|
42
|
+
target: server
|
|
43
|
+
},
|
|
44
|
+
'/rs/db': {
|
|
45
|
+
target: server
|
|
46
|
+
},
|
|
47
|
+
'/excel': {
|
|
48
|
+
target: server
|
|
49
|
+
},
|
|
50
|
+
'/rs/config': {
|
|
51
|
+
target: server
|
|
52
|
+
},
|
|
53
|
+
'/rs/report': {
|
|
54
|
+
target: server
|
|
55
|
+
},
|
|
56
|
+
'/rs/vue': {
|
|
57
|
+
target: server
|
|
58
|
+
},
|
|
59
|
+
'/rs/logic': {
|
|
60
|
+
target: local
|
|
61
|
+
},
|
|
62
|
+
'/rs/sql': {
|
|
63
|
+
target: local
|
|
64
|
+
},
|
|
65
|
+
'/webmeter': {
|
|
66
|
+
target: server
|
|
67
|
+
},
|
|
68
|
+
'/rs': {
|
|
69
|
+
target: server,
|
|
70
|
+
// changeOrigin: true
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
const devMiddleware = require('webpack-dev-middleware')(compiler, {
|
|
75
|
+
publicPath: config.output.publicPath,
|
|
76
|
+
stats: {
|
|
77
|
+
colors: true,
|
|
78
|
+
chunks: false
|
|
79
|
+
}
|
|
80
|
+
})
|
|
81
|
+
|
|
82
|
+
const hotMiddleware = require('webpack-hot-middleware')(compiler)
|
|
83
|
+
compiler.plugin('compilation', function (compilation) {
|
|
84
|
+
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
|
|
85
|
+
hotMiddleware.publish({action: 'reload'})
|
|
86
|
+
cb()
|
|
87
|
+
})
|
|
88
|
+
})
|
|
89
|
+
|
|
90
|
+
Object.keys(proxyTable).forEach(function (context) {
|
|
91
|
+
let options = proxyTable[context]
|
|
92
|
+
if (typeof options === 'string') {
|
|
93
|
+
options = {target: options}
|
|
94
|
+
}
|
|
95
|
+
app.use(proxyMiddleware(context, options))
|
|
96
|
+
})
|
|
97
|
+
app.use(require('connect-history-api-fallback')())
|
|
98
|
+
app.use(devMiddleware)
|
|
99
|
+
app.use(hotMiddleware)
|
|
100
|
+
app.use('/static', express.static('./static'))
|
|
101
|
+
|
|
102
|
+
module.exports = app.listen(port, function (err) {
|
|
103
|
+
if (err) {
|
|
104
|
+
console.log(err)
|
|
105
|
+
return
|
|
106
|
+
}
|
|
107
|
+
console.log('Listening at http://localhost:' + port)
|
|
108
|
+
})
|
package/package.json
CHANGED
|
@@ -1,93 +1,104 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<partial-view v-ref:pv>
|
|
3
|
-
<div class="panel panel-info auto" >
|
|
4
|
-
<div class="panel-heading"
|
|
3
|
+
<div class="panel panel-info auto" style="margin-top: auto">
|
|
4
|
+
<div class="panel-heading" style="height: 35px">
|
|
5
5
|
<h4 style="display:inline-block;margin-top: auto">档案信息</h4>
|
|
6
6
|
</div>
|
|
7
7
|
<div class="auto info-content">
|
|
8
8
|
<div class="row" v-if="warninginfo.data.insMsg">
|
|
9
|
-
<p align="center"><font color="red" style="font-weight: bold">{{warninginfo.data.insMsg}}</font></p>
|
|
9
|
+
<p align="center"><font color="red" style="font-weight: bold">{{ warninginfo.data.insMsg }}</font></p>
|
|
10
10
|
</div>
|
|
11
11
|
|
|
12
12
|
<div class="row">
|
|
13
|
-
<label class
|
|
14
|
-
<span class
|
|
13
|
+
<label class="col-sm-5">客户编号</label>
|
|
14
|
+
<span class="col-sm-7"><a
|
|
15
|
+
@click="dealmsg(data)">{{ data ? data.f_userinfo_code : dafault.f_userinfo_code }}</a></span>
|
|
15
16
|
</div>
|
|
16
17
|
<div class="row">
|
|
17
|
-
<label class
|
|
18
|
-
<span class
|
|
18
|
+
<label class="col-sm-5">客户名称</label>
|
|
19
|
+
<span class="col-sm-7">{{ data ? data.f_user_name : dafault.f_user_name }}</span>
|
|
20
|
+
</div>
|
|
21
|
+
<div class="row" v-if="data.f_name_pinyin">
|
|
22
|
+
<label class="col-sm-5">名称首拼</label>
|
|
23
|
+
<span class="col-sm-7">{{ data ? data.f_name_pinyin : dafault.f_name_pinyin }}</span>
|
|
19
24
|
</div>
|
|
20
25
|
<div class="row">
|
|
21
|
-
<label class
|
|
22
|
-
<span class
|
|
26
|
+
<label class="col-sm-5">客户类型</label>
|
|
27
|
+
<span class="col-sm-7">{{ data ? data.f_user_type : dafault.f_user_type }}</span>
|
|
23
28
|
</div>
|
|
24
29
|
<div class="row">
|
|
25
|
-
<label class
|
|
26
|
-
<span class
|
|
30
|
+
<label class="col-sm-5">账户余额</label>
|
|
31
|
+
<span class="col-sm-7">{{ data ? data.f_balance : dafault.f_user_type }}</span>
|
|
27
32
|
</div>
|
|
28
33
|
<div class="row" v-show="data && data.f_sys_balance !== 0">
|
|
29
|
-
<label class
|
|
30
|
-
<span class
|
|
34
|
+
<label class="col-sm-5">系统余额</label>
|
|
35
|
+
<span class="col-sm-7">{{ data.f_sys_balance ? data.f_sys_balance : dafault.f_user_type }}</span>
|
|
31
36
|
</div>
|
|
32
37
|
<div class="row">
|
|
33
|
-
<label class
|
|
34
|
-
<span class
|
|
38
|
+
<label class="col-sm-5">证件号码</label>
|
|
39
|
+
<span class="col-sm-7" style="word-break: break-all">{{ data ? data.f_idnumber : dafault.f_idnumber }}</span>
|
|
35
40
|
</div>
|
|
36
41
|
<div class="row">
|
|
37
|
-
<label class
|
|
38
|
-
<span class
|
|
39
|
-
<span v-if="data && data.f_user_phone" @click.stop="changeuserphone"
|
|
42
|
+
<label class="col-sm-5">客户电话</label>
|
|
43
|
+
<span class="col-sm-7">{{ data ? data.f_user_phone : dafault.f_user_phone }}
|
|
44
|
+
<span v-if="data && data.f_user_phone" @click.stop="changeuserphone"
|
|
45
|
+
class="glyphicon glyphicon-pencil clickchange" title="修正客户电话"></span>
|
|
40
46
|
</span>
|
|
41
47
|
</div>
|
|
42
48
|
<div class="row">
|
|
43
|
-
<label class
|
|
44
|
-
<span class
|
|
49
|
+
<label class="col-sm-5">备用电话</label>
|
|
50
|
+
<span class="col-sm-7">{{ data ? data.f_rent_phone : dafault.f_rent_phone }}</span>
|
|
45
51
|
</div>
|
|
46
52
|
<div class="row">
|
|
47
|
-
<label class
|
|
48
|
-
<span class
|
|
53
|
+
<label class="col-sm-5">客户状态</label>
|
|
54
|
+
<span class="col-sm-7">{{ data ? data.f_user_state : dafault.f_user_state }}</span>
|
|
49
55
|
</div>
|
|
50
56
|
<div class="row">
|
|
51
|
-
<label class
|
|
52
|
-
<span class
|
|
57
|
+
<label class="col-sm-5">备注信息</label>
|
|
58
|
+
<span class="col-sm-7">{{ data ? data.f_comments : dafault.f_comments }}</span>
|
|
53
59
|
</div>
|
|
54
60
|
<div class="row">
|
|
55
|
-
<label class
|
|
56
|
-
<span class
|
|
61
|
+
<label class="col-sm-5">客户地址</label>
|
|
62
|
+
<span class="col-sm-7">{{ data ? data.f_address : dafault.f_address }}</span>
|
|
57
63
|
</div>
|
|
58
64
|
<div class="row">
|
|
59
|
-
<label class
|
|
60
|
-
<span class
|
|
65
|
+
<label class="col-sm-5">开户时间</label>
|
|
66
|
+
<span class="col-sm-7">{{ data ? data.f_open_date.substr(0, 10) : dafault.f_open_date }}</span>
|
|
61
67
|
</div>
|
|
62
68
|
<div class="row">
|
|
63
|
-
<label class
|
|
64
|
-
<span class
|
|
69
|
+
<label class="col-sm-5">安装时间</label>
|
|
70
|
+
<span class="col-sm-7">{{ data ? data.f_install_date.substr(0, 10) : dafault.f_input_date }}</span>
|
|
65
71
|
</div>
|
|
66
72
|
<div class="row">
|
|
67
|
-
<label class
|
|
68
|
-
<span class
|
|
73
|
+
<label class="col-sm-5"> 人 口 数</label>
|
|
74
|
+
<span class="col-sm-7"
|
|
75
|
+
style="word-break: break-all">{{ data ? data.f_people_num : dafault.f_people_num }}</span>
|
|
69
76
|
</div>
|
|
70
77
|
<div class="row">
|
|
71
|
-
<label class
|
|
72
|
-
<span class
|
|
78
|
+
<label class="col-sm-5">客户等级</label>
|
|
79
|
+
<span class="col-sm-7"
|
|
80
|
+
style="word-break: break-all">{{ data ? data.f_user_level : dafault.f_people_num }}</span>
|
|
73
81
|
</div>
|
|
74
82
|
<div class="row">
|
|
75
|
-
<label class
|
|
76
|
-
<span class
|
|
83
|
+
<label class="col-sm-5">旧客户编号</label>
|
|
84
|
+
<span class="col-sm-7">{{ data ? data.f_olduserinfo_code : dafault.f_userinfo_code }}</span>
|
|
77
85
|
</div>
|
|
78
|
-
<modal v-if="showselectncuserinfo" :show.sync="showselectncuserinfo" width="40%" title="修正客户电话号码"
|
|
86
|
+
<modal v-if="showselectncuserinfo" :show.sync="showselectncuserinfo" width="40%" title="修正客户电话号码"
|
|
87
|
+
v-ref:modal large backdrop="false">
|
|
79
88
|
<article slot="modal-body" class="modal-body">
|
|
80
|
-
<div class="form-horizontal"
|
|
89
|
+
<div class="form-horizontal">
|
|
81
90
|
<div class="row">
|
|
82
91
|
<div class="col-sm-12 form-group">
|
|
83
92
|
<label class="font_normal_body">旧客户电话</label>
|
|
84
|
-
<input disabled readonly type="text" style="width:80%" class="input_search"
|
|
93
|
+
<input disabled readonly type="text" style="width:80%" class="input_search"
|
|
94
|
+
v-model="data.f_user_phone" placeholder='旧客户电话'>
|
|
85
95
|
</div>
|
|
86
96
|
</div>
|
|
87
97
|
<div class="row">
|
|
88
98
|
<div class="col-sm-12 form-group">
|
|
89
99
|
<label class="font_normal_body">新客户电话</label>
|
|
90
|
-
<input type="text" style="width:80%" class="input_search" v-model="newuserphone"
|
|
100
|
+
<input type="text" style="width:80%" class="input_search" v-model="newuserphone"
|
|
101
|
+
placeholder='新客户电话'>
|
|
91
102
|
</div>
|
|
92
103
|
</div>
|
|
93
104
|
</div>
|
|
@@ -103,83 +114,83 @@
|
|
|
103
114
|
</template>
|
|
104
115
|
|
|
105
116
|
<script>
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
117
|
+
/**
|
|
118
|
+
*用户档案相关信息组件
|
|
119
|
+
*/
|
|
109
120
|
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
},
|
|
132
|
-
model: null,
|
|
133
|
-
showselectncuserinfo: false,
|
|
134
|
-
newuserphone: ''
|
|
135
|
-
}
|
|
136
|
-
},
|
|
137
|
-
props: ['data', 'warninginfo'],
|
|
138
|
-
methods: {
|
|
139
|
-
dealmsg (val) {
|
|
140
|
-
if (val.f_userinfo_code !== '********') {
|
|
141
|
-
this.$dispatch('deal-msg', val)
|
|
142
|
-
}
|
|
143
|
-
},
|
|
144
|
-
changeuserphone () {
|
|
145
|
-
// 修正客户电话
|
|
146
|
-
this.showselectncuserinfo = true
|
|
147
|
-
this.newuserphone = ''
|
|
148
|
-
},
|
|
149
|
-
async modifyUser () {
|
|
150
|
-
let param = {
|
|
151
|
-
new_userphone: this.newuserphone,
|
|
152
|
-
f_userinfo_id: this.data.f_userinfo_id,
|
|
153
|
-
f_user_id: this.data.f_user_id,
|
|
154
|
-
f_operator: this.$login.f.name,
|
|
155
|
-
f_operatorid: this.$login.f.id,
|
|
156
|
-
f_orgid: this.$login.f.orgid,
|
|
157
|
-
f_orgname: this.$login.f.orgs,
|
|
158
|
-
f_depid: this.$login.f.depids,
|
|
159
|
-
f_depname: this.$login.f.deps
|
|
160
|
-
}
|
|
161
|
-
await this.$resetpost('/rs/logic/changeuserinfo', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
|
|
162
|
-
this.data.f_user_phone = this.newuserphone
|
|
163
|
-
this.$parent.$parent.close()
|
|
164
|
-
this.$parent.$parent.clean()
|
|
165
|
-
this.$parent.$parent.$refs.list.searchNoData()
|
|
166
|
-
this.close()
|
|
121
|
+
export default {
|
|
122
|
+
ready() {
|
|
123
|
+
console.log('看看userinfo里面接收的data数据：', this.data)
|
|
124
|
+
},
|
|
125
|
+
title: '客户基本信息',
|
|
126
|
+
data() {
|
|
127
|
+
return {
|
|
128
|
+
dafault: {
|
|
129
|
+
f_user_name: '***',
|
|
130
|
+
f_userinfo_code: '********',
|
|
131
|
+
f_people_num: '**',
|
|
132
|
+
f_idnumber: '****',
|
|
133
|
+
f_user_phone: '************',
|
|
134
|
+
f_address: '*****',
|
|
135
|
+
f_user_type: '***',
|
|
136
|
+
f_open_date: '****年**月**日',
|
|
137
|
+
f_input_date: '****年**月**日',
|
|
138
|
+
f_hand_date: '****年**月**日',
|
|
139
|
+
f_rent_phone: '************',
|
|
140
|
+
f_comments: '**',
|
|
141
|
+
f_user_state: '****'
|
|
167
142
|
},
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
143
|
+
model: null,
|
|
144
|
+
showselectncuserinfo: false,
|
|
145
|
+
newuserphone: ''
|
|
146
|
+
}
|
|
147
|
+
},
|
|
148
|
+
props: ['data', 'warninginfo'],
|
|
149
|
+
methods: {
|
|
150
|
+
dealmsg(val) {
|
|
151
|
+
if (val.f_userinfo_code !== '********') {
|
|
152
|
+
this.$dispatch('deal-msg', val)
|
|
171
153
|
}
|
|
172
154
|
},
|
|
173
|
-
|
|
174
|
-
|
|
155
|
+
changeuserphone() {
|
|
156
|
+
// 修正客户电话
|
|
157
|
+
this.showselectncuserinfo = true
|
|
158
|
+
this.newuserphone = ''
|
|
159
|
+
},
|
|
160
|
+
async modifyUser() {
|
|
161
|
+
let param = {
|
|
162
|
+
new_userphone: this.newuserphone,
|
|
163
|
+
f_userinfo_id: this.data.f_userinfo_id,
|
|
164
|
+
f_user_id: this.data.f_user_id,
|
|
165
|
+
f_operator: this.$login.f.name,
|
|
166
|
+
f_operatorid: this.$login.f.id,
|
|
167
|
+
f_orgid: this.$login.f.orgid,
|
|
168
|
+
f_orgname: this.$login.f.orgs,
|
|
169
|
+
f_depid: this.$login.f.depids,
|
|
170
|
+
f_depname: this.$login.f.deps
|
|
175
171
|
}
|
|
172
|
+
await this.$resetpost('/rs/logic/changeuserinfo', {data: param}, {resolveMsg: '修正成功', rejectMsg: null})
|
|
173
|
+
this.data.f_user_phone = this.newuserphone
|
|
174
|
+
this.$parent.$parent.close()
|
|
175
|
+
this.$parent.$parent.clean()
|
|
176
|
+
this.$parent.$parent.$refs.list.searchNoData()
|
|
177
|
+
this.close()
|
|
178
|
+
},
|
|
179
|
+
close() {
|
|
180
|
+
this.showselectncuserinfo = false
|
|
181
|
+
this.newuserphone = ''
|
|
182
|
+
}
|
|
183
|
+
},
|
|
184
|
+
watch: {
|
|
185
|
+
'data'(val) {
|
|
176
186
|
}
|
|
177
187
|
}
|
|
188
|
+
}
|
|
178
189
|
</script>
|
|
179
190
|
<style scoped>
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
191
|
+
.clickchange:hover {
|
|
192
|
+
color: #3592ef;
|
|
193
|
+
cursor: pointer;
|
|
194
|
+
}
|
|
184
195
|
|
|
185
196
|
</style>
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
<h4 style="display:inline-block;margin-top: auto">表具信息</h4>
|
|
6
6
|
</div>
|
|
7
7
|
<div class="auto ">
|
|
8
|
-
<div class="row">
|
|
8
|
+
<div class="row" v-if="data.f_customer">
|
|
9
9
|
<label class = "col-sm-5 " style="color: brown">团缴编号</label>
|
|
10
10
|
<span class = "col-sm-7" style="color: brown">{{data.f_customer?data.f_customer:'无'}}</span>
|
|
11
11
|
</div>
|
|
@@ -4,6 +4,15 @@
|
|
|
4
4
|
<criteria @condition-changed='$parent.selfSearch' partial='criteria' v-ref:cri>
|
|
5
5
|
<div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
|
|
6
6
|
<div class="row">
|
|
7
|
+
<div class="form-group col-sm-3" >
|
|
8
|
+
<label class="font_normal_body">组织机构</label>
|
|
9
|
+
<res-select :initresid='$parent.$parent.curorgid'
|
|
10
|
+
@res-select="$parent.$parent.getorg"
|
|
11
|
+
class="select select_list"
|
|
12
|
+
restype='organization'
|
|
13
|
+
style="width: 60%">
|
|
14
|
+
</res-select>
|
|
15
|
+
</div>
|
|
7
16
|
<div class="col-sm-3 form-group">
|
|
8
17
|
<label class="font_normal_body" for="f_meter_type">气表类型</label>
|
|
9
18
|
<v-select :options='$parent.$parent.meterType'
|
|
@@ -162,6 +171,12 @@ export default {
|
|
|
162
171
|
// if (!this.f_orgid) {
|
|
163
172
|
// this.getorg([this.$login.f.orgid])h
|
|
164
173
|
// }
|
|
174
|
+
if (!this.f_orgid) {
|
|
175
|
+
this.getorg([this.$login.f.orgid])
|
|
176
|
+
}
|
|
177
|
+
if (this.f_orgid) {
|
|
178
|
+
this.model.params.orgcondition = ` and f_orgid in ${this.f_orgid} `
|
|
179
|
+
}
|
|
165
180
|
args.condition = `${args.condition}`
|
|
166
181
|
this.model.search(args.condition, args.model)
|
|
167
182
|
this.gasmodelbrand.search(args.condition, args.gasmodelbrand)
|
|
@@ -169,10 +184,9 @@ export default {
|
|
|
169
184
|
search () {
|
|
170
185
|
this.$dispatch('search')
|
|
171
186
|
},
|
|
172
|
-
getorg (
|
|
173
|
-
this.f_orgid = this.$login.convertToIn(
|
|
174
|
-
this.
|
|
175
|
-
this.f_filialeid = orgid ? orgid[0] : ''
|
|
187
|
+
getorg (val) {
|
|
188
|
+
this.f_orgid = this.$login.convertToIn(val)
|
|
189
|
+
this.$parent.f_orgid = this.f_orgid
|
|
176
190
|
},
|
|
177
191
|
selected () {},
|
|
178
192
|
success () {
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
</div>
|
|
18
18
|
|
|
19
19
|
<div class="binary-right" v-if="usershow" :style="{width: usershow ? '50%' : 'auto'}">
|
|
20
|
-
<gas-brand-user :brandid="brand_id" :meterbrand="meter_brand"></gas-brand-user>
|
|
20
|
+
<gas-brand-user :brandid="brand_id" :meterbrand="meter_brand" :orgcondition="f_orgid"></gas-brand-user>
|
|
21
21
|
</div>
|
|
22
22
|
|
|
23
23
|
</div>
|
|
@@ -34,6 +34,7 @@
|
|
|
34
34
|
data () {
|
|
35
35
|
return {
|
|
36
36
|
f_userinfo_id: '',
|
|
37
|
+
f_orgid: '',
|
|
37
38
|
meter_brand: '',
|
|
38
39
|
brand_id: '',
|
|
39
40
|
usershow: false,
|
|
@@ -104,7 +104,7 @@
|
|
|
104
104
|
map: new Map()
|
|
105
105
|
}
|
|
106
106
|
},
|
|
107
|
-
props: ['brandid', 'meterbrand'],
|
|
107
|
+
props: ['brandid', 'meterbrand', 'orgcondition'],
|
|
108
108
|
ready () {
|
|
109
109
|
this.search()
|
|
110
110
|
this.getfield = this.config.excelHeaders
|
|
@@ -116,6 +116,9 @@
|
|
|
116
116
|
this.$refs.paged.$refs.criteria.search()
|
|
117
117
|
},
|
|
118
118
|
selfSearch (args) {
|
|
119
|
+
if (this.orgcondition) {
|
|
120
|
+
args.condition = `${args.condition} and f_orgid in ${this.orgcondition} `
|
|
121
|
+
}
|
|
119
122
|
args.condition = `${args.condition} and f_gasbrand_id = '${this.brandid}'`
|
|
120
123
|
this.condition = args.condition
|
|
121
124
|
this.model.search(args.condition, args.model)
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
<span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas:dafault.f_total_gas}}</span>
|
|
23
23
|
</div>
|
|
24
24
|
|
|
25
|
-
<div class="row">
|
|
25
|
+
<div class="row" v-if="data.f_customer">
|
|
26
26
|
<label class = "col-sm-5 " style="color: brown">团缴编号</label>
|
|
27
27
|
<span class = "col-sm-7" style="color: brown">{{data.f_customer?data.f_customer:'无'}}</span>
|
|
28
28
|
</div>
|
|
@@ -89,6 +89,18 @@
|
|
|
89
89
|
<label class = "col-sm-5 " style="color: brown">表上余量</label>
|
|
90
90
|
<span class = "col-sm-7" style="color: brown">{{data?data.f_jval:dafault.f_jval}}</span>
|
|
91
91
|
</div>
|
|
92
|
+
<div class="row" v-if="data.f_meter_type.includes('卡表') && data.f_last_gas">
|
|
93
|
+
<label class = "col-sm-5 " style="color: brown">上次购气量</label>
|
|
94
|
+
<span class = "col-sm-7" style="color: brown">{{data?data.f_last_gas:dafault.f_last_gas}}</span>
|
|
95
|
+
</div>
|
|
96
|
+
<div class="row" v-if="data.f_meter_type.includes('物联网') && data.f_last_fee">
|
|
97
|
+
<label class = "col-sm-5 " style="color: brown">上次购气金额</label>
|
|
98
|
+
<span class = "col-sm-7" style="color: brown">{{data?data.f_last_fee:dafault.f_last_fee}}</span>
|
|
99
|
+
</div>
|
|
100
|
+
<div class="row" v-if="data.f_last_gas_date">
|
|
101
|
+
<label class = "col-sm-5 " style="color: brown">上次购气时间</label>
|
|
102
|
+
<span class = "col-sm-7" style="color: brown">{{data?data.f_last_gas_date:dafault.f_last_gas_date}}</span>
|
|
103
|
+
</div>
|
|
92
104
|
<div class="row">
|
|
93
105
|
<label class = "col-sm-5 " >初始表底数</label>
|
|
94
106
|
<span class = "col-sm-7" >{{data?data.f_initial_base:dafault.f_initial_base}}</span>
|