sale-client 4.0.71-preview → 4.0.72-preview
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 +8 -8
- package/package.json +1 -1
- package/src/components/common/userinfo_detail/UserInfoDetailManageNew.vue +10 -0
- package/src/components/common/userinfo_detail/ic_detail/RepairList.vue +109 -0
- package/src/components/common/userinfo_detail/ic_detail/SecuritycheckInfo.vue +155 -0
- package/src/components/revenue/machineHandManage/HandplanQuery.vue +13 -0
package/build/dev-server.js
CHANGED
|
@@ -20,10 +20,10 @@ var devConfig = {
|
|
|
20
20
|
},
|
|
21
21
|
proxy: {
|
|
22
22
|
'/api/af-revenue/logic': {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
target:
|
|
23
|
+
pathRewrite: {
|
|
24
|
+
'/api/af-revenue/logic': '/logic'
|
|
25
|
+
},
|
|
26
|
+
target: localUrl
|
|
27
27
|
},
|
|
28
28
|
'/api/af-revenue/file': {
|
|
29
29
|
// pathRewrite: {
|
|
@@ -32,10 +32,10 @@ var devConfig = {
|
|
|
32
32
|
target: serverRul
|
|
33
33
|
},
|
|
34
34
|
'/api/af-revenue/sql': {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
target:
|
|
35
|
+
pathRewrite: {
|
|
36
|
+
'/api/af-revenue/sql': '/sql'
|
|
37
|
+
},
|
|
38
|
+
target: localUrl
|
|
39
39
|
},
|
|
40
40
|
'/api': {
|
|
41
41
|
target: serverRul
|
package/package.json
CHANGED
|
@@ -95,6 +95,12 @@
|
|
|
95
95
|
<saletab header="用户重点记录" v-if="permission('用户重点记录')">
|
|
96
96
|
<user-key-record :row="row" @deal-msg="dealMsg"></user-key-record>
|
|
97
97
|
</saletab>
|
|
98
|
+
<saletab header="维修记录" v-if="permission('维修记录')">
|
|
99
|
+
<repair-list :row="row" @deal-msg="dealMsg"></repair-list>
|
|
100
|
+
</saletab>
|
|
101
|
+
<saletab header="安检记录" v-if="permission('安检记录')">
|
|
102
|
+
<security-check-info :row="row" @deal-msg="dealMsg"></security-check-info>
|
|
103
|
+
</saletab>
|
|
98
104
|
<!-- <saletab header="报装流转记录" v-if="permission('报装流转记录查看')">-->
|
|
99
105
|
<!-- <supervisory-control :row="row" ></supervisory-control>-->
|
|
100
106
|
<!-- </saletab>-->
|
|
@@ -127,6 +133,8 @@
|
|
|
127
133
|
import UserDeviceQuery from './ic_detail/UserDeviceQuery'
|
|
128
134
|
import contractSigningList from './ic_detail/contractSigningList'
|
|
129
135
|
import UserKeyRecord from './ic_detail/UserKeyRecord'
|
|
136
|
+
import RepairList from "./ic_detail/RepairList";
|
|
137
|
+
import SecurityCheckInfo from './ic_detail/SecuritycheckInfo';
|
|
130
138
|
// import SupervisoryControl from './apply_detail/Supervisory/SupervisoryControl'
|
|
131
139
|
// import ApplyChargeSearch from './apply_detail/applyCharge/ApplyChargeSearch'
|
|
132
140
|
// 导入物联网相关查询
|
|
@@ -144,6 +152,8 @@ export default {
|
|
|
144
152
|
title: '用户详细信息',
|
|
145
153
|
props: ['f_userfiles_id', 'f_userinfo_id', 'f_userinfo_code', 'parentname', 'buttonshow'],
|
|
146
154
|
components: {
|
|
155
|
+
SecurityCheckInfo,
|
|
156
|
+
RepairList,
|
|
147
157
|
PriceAdjustmentQueryUser,
|
|
148
158
|
PriceChangeQueryUser,
|
|
149
159
|
AutomaticPurse,
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div id="pc-finduser-page">
|
|
3
|
+
<criteria-paged :model="model" v-ref:paged :simple="true">
|
|
4
|
+
<!-- <criteria partial='criteria'>
|
|
5
|
+
</criteria> -->
|
|
6
|
+
<data-grid :model="model" partial='list' v-ref:grid
|
|
7
|
+
class="list_area table_sy">
|
|
8
|
+
<template partial='head'>
|
|
9
|
+
<tr>
|
|
10
|
+
<!-- <th><nobr>操作</nobr></th>-->
|
|
11
|
+
<th><nobr>工单状态</nobr></th>
|
|
12
|
+
<th><nobr>工单类型</nobr></th>
|
|
13
|
+
<th><nobr>是否完成</nobr></th>
|
|
14
|
+
<th><nobr>工单编号</nobr></th>
|
|
15
|
+
<th><nobr>报修时间</nobr></th>
|
|
16
|
+
<th><nobr>报修电话</nobr></th>
|
|
17
|
+
<th><nobr>报修内容</nobr></th>
|
|
18
|
+
<th><nobr>用户地址</nobr></th>
|
|
19
|
+
<th><nobr>派单人员</nobr></th>
|
|
20
|
+
<th><nobr>维修人员</nobr></th>
|
|
21
|
+
<th><nobr>完成时间</nobr></th>
|
|
22
|
+
</tr>
|
|
23
|
+
</template>
|
|
24
|
+
<template partial='body'>
|
|
25
|
+
<!-- <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>-->
|
|
26
|
+
<!-- <button class="button_search button_spacing" style="margin-right: 9px"-->
|
|
27
|
+
<!-- @click="$parent.$parent.$parent.showDetail(row)">详情-->
|
|
28
|
+
<!-- </button>-->
|
|
29
|
+
<!-- </nobr></td>-->
|
|
30
|
+
<td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr> {{ row.f_state ?row.f_state:(row.defname ?row.defname:'完成')}}</nobr></td>
|
|
31
|
+
<td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_workorder_type}}</nobr></td>
|
|
32
|
+
<td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_result_status?row.f_result_status:'未完成'}}</nobr></td>
|
|
33
|
+
<td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_service_id}}</nobr></td>
|
|
34
|
+
<td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_created_date}}</nobr></td>
|
|
35
|
+
<td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_phone}}</nobr></td>
|
|
36
|
+
<td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_remarks}}</nobr></td>
|
|
37
|
+
<td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_address}}</nobr></td>
|
|
38
|
+
<td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_single_man}}</nobr></td>
|
|
39
|
+
<td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_order_man}}</nobr></td>
|
|
40
|
+
|
|
41
|
+
<!--<td :style="row.f_result_status=='已完成'?'':'color:red'"><nobr>{{row.f_remarks}}</nobr></td>-->
|
|
42
|
+
<td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_date_leave}}</nobr></td>
|
|
43
|
+
</template>
|
|
44
|
+
</data-grid>
|
|
45
|
+
</criteria-paged>
|
|
46
|
+
</div>
|
|
47
|
+
</template>
|
|
48
|
+
|
|
49
|
+
<script>
|
|
50
|
+
/**
|
|
51
|
+
*用户档案相关信息组件
|
|
52
|
+
*/
|
|
53
|
+
import { PagedList } from 'vue-client'
|
|
54
|
+
export default {
|
|
55
|
+
title: '历史维修记录',
|
|
56
|
+
data () {
|
|
57
|
+
return {
|
|
58
|
+
model: new PagedList('api/af-revenue/sql/serviceDetails', 5),
|
|
59
|
+
row: Object,
|
|
60
|
+
show: false
|
|
61
|
+
}
|
|
62
|
+
},
|
|
63
|
+
|
|
64
|
+
props: {
|
|
65
|
+
user: {
|
|
66
|
+
type: Object
|
|
67
|
+
},
|
|
68
|
+
callObj: {
|
|
69
|
+
type: Object
|
|
70
|
+
},
|
|
71
|
+
clearflg: 0,
|
|
72
|
+
row: {
|
|
73
|
+
type: Object
|
|
74
|
+
}
|
|
75
|
+
},
|
|
76
|
+
methods: {
|
|
77
|
+
showDetail (row) {
|
|
78
|
+
console.log('996', row)
|
|
79
|
+
this.row = row
|
|
80
|
+
this.show = true
|
|
81
|
+
},
|
|
82
|
+
selected (row) {
|
|
83
|
+
if (this.row === row) {
|
|
84
|
+
this.row = null
|
|
85
|
+
} else {
|
|
86
|
+
this.row = row
|
|
87
|
+
}
|
|
88
|
+
},
|
|
89
|
+
isSelected (row) {
|
|
90
|
+
return this.row === row
|
|
91
|
+
}
|
|
92
|
+
},
|
|
93
|
+
watch: {
|
|
94
|
+
'user' (val) {
|
|
95
|
+
this.model.rows = []
|
|
96
|
+
this.model.search(`f_userinfo_id = '${this.row.f_userinfo_id}'`)
|
|
97
|
+
},
|
|
98
|
+
'clearflg' () {
|
|
99
|
+
this.model.rows = []
|
|
100
|
+
}
|
|
101
|
+
},
|
|
102
|
+
ready () {
|
|
103
|
+
console.log('看看row的信息', this.row)
|
|
104
|
+
if (this.row.f_userinfo_id) {
|
|
105
|
+
this.model.search(`f_userinfo_id = '${this.row.f_userinfo_id}'`)
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
</script>
|
|
@@ -0,0 +1,155 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div id="pc-finduser-page">
|
|
3
|
+
<criteria-paged :model="model" v-ref:paged :simple="true">
|
|
4
|
+
|
|
5
|
+
<data-grid :model="model" partial='list' v-ref:grid
|
|
6
|
+
class="list_area table_sy">
|
|
7
|
+
<template partial='head'>
|
|
8
|
+
<tr>
|
|
9
|
+
<!-- <th><nobr>卡号</nobr></th>-->
|
|
10
|
+
<th><nobr>安检日期</nobr></th>
|
|
11
|
+
<th><nobr>入户情况</nobr></th>
|
|
12
|
+
<th><nobr>安检员</nobr></th>
|
|
13
|
+
<th> <nobr>隐患明细</nobr></th>
|
|
14
|
+
<!-- <th> <nobr>操作</nobr></th>-->
|
|
15
|
+
</tr>
|
|
16
|
+
</template>
|
|
17
|
+
<template partial='body'>
|
|
18
|
+
<!-- <td><nobr>{{row.f_card_id}}</nobr></td>-->
|
|
19
|
+
<td style="text-align: center"><nobr>{{row.f_onsite_time.substring(0,11)}}</nobr></td>
|
|
20
|
+
<td style="text-align: center"><nobr>{{row.f_entry_status}}</nobr></td>
|
|
21
|
+
<td style="text-align: center"><nobr>{{row.f_checker_name}}</nobr></td>
|
|
22
|
+
<td style="text-align: center" ><nobr>{{row.f_defect_text?row.f_defect_text:$parent.$parent.$parent.getjsonData(row.f_defect_content)}}</nobr></td>
|
|
23
|
+
<!-- <td style="text-align: center"><nobr><button-link type="button" class="btn btn-link" @click="$parent.$parent.$parent.change(row)">查看</button-link></nobr></td>-->
|
|
24
|
+
</template>
|
|
25
|
+
</data-grid>
|
|
26
|
+
</criteria-paged>
|
|
27
|
+
</div>
|
|
28
|
+
<!-- <modal :show.sync="infoshow" large="true" v-ref:modal backdrop="false" width="1200">-->
|
|
29
|
+
<!-- <header slot="modal-header" class="modal-header">-->
|
|
30
|
+
<!-- 安检详情-->
|
|
31
|
+
<!-- </header>-->
|
|
32
|
+
<!-- <article slot="modal-body" class="modal-body">-->
|
|
33
|
+
<!-- <div class="from-group col-smm-12 col-md-12 col-xs-12" v-if="infoshow">-->
|
|
34
|
+
<!-- <new-check-paper :f_plan_id="onedata.f_check_plan_id" :item="onedata" role="view" >-->
|
|
35
|
+
<!-- </new-check-paper>-->
|
|
36
|
+
<!-- </div>-->
|
|
37
|
+
<!-- </article>-->
|
|
38
|
+
<!-- <footer slot="modal-footer" class="modal-footer">-->
|
|
39
|
+
<!-- <button type="button" class="btn btn-success" @click='close'>确认</button>-->
|
|
40
|
+
<!-- </footer>-->
|
|
41
|
+
<!-- </modal>-->
|
|
42
|
+
</template>
|
|
43
|
+
|
|
44
|
+
<script>
|
|
45
|
+
/**
|
|
46
|
+
*用户档案相关信息组件
|
|
47
|
+
*/
|
|
48
|
+
import { PagedList } from 'vue-client'
|
|
49
|
+
import Vue from 'vue'
|
|
50
|
+
import { isEmpty } from "../../../../Util"
|
|
51
|
+
// import newCheckPaper from "./NewCheckpaper.vue"
|
|
52
|
+
// 获取json配置文件
|
|
53
|
+
let asyncReady = async function (self) {
|
|
54
|
+
// 获取配置信息
|
|
55
|
+
try {
|
|
56
|
+
let res = await Vue.resetget(`/phone/rs/vue`, {data: {}}, {resolveMsg: null, rejectMsg: null})
|
|
57
|
+
Vue.config = res.data
|
|
58
|
+
} catch (error) {
|
|
59
|
+
// 忽略704,文件找不到异常R
|
|
60
|
+
if (error.status !== 704) {
|
|
61
|
+
throw error
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
export default {
|
|
67
|
+
// components: {
|
|
68
|
+
// newCheckPaper
|
|
69
|
+
// },
|
|
70
|
+
title: '用户安检历史',
|
|
71
|
+
data () {
|
|
72
|
+
return {
|
|
73
|
+
model: new PagedList('api/af-revenue/sql/查找安检单', 5, {orderitem: '"f_onsite_time desc"',f_plan_id:'""',f_approved:'""',f_entry_status:'""',f_no_checkplan:'""',f_filialeid:'""'}),
|
|
74
|
+
row: Object,
|
|
75
|
+
infoshow: false,
|
|
76
|
+
onedata: Object
|
|
77
|
+
}
|
|
78
|
+
},
|
|
79
|
+
props: {
|
|
80
|
+
user: {
|
|
81
|
+
type: Object
|
|
82
|
+
},
|
|
83
|
+
clearflg: 0,
|
|
84
|
+
row: {
|
|
85
|
+
type: Object
|
|
86
|
+
}
|
|
87
|
+
},
|
|
88
|
+
methods: {
|
|
89
|
+
close () {
|
|
90
|
+
this.infoshow = false
|
|
91
|
+
},
|
|
92
|
+
change (row) {
|
|
93
|
+
// Vue.$login = {jwt: row.f_checker_id}
|
|
94
|
+
asyncReady(this).then(() => {
|
|
95
|
+
row.f_upload_state = '已传'
|
|
96
|
+
this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
|
|
97
|
+
}).catch(
|
|
98
|
+
(respanse) => {
|
|
99
|
+
alert ('获取配置文件失败')
|
|
100
|
+
})
|
|
101
|
+
},
|
|
102
|
+
// change(val){
|
|
103
|
+
//
|
|
104
|
+
// this.onedata = val
|
|
105
|
+
// this.infoshow = true
|
|
106
|
+
// },
|
|
107
|
+
getjsonData (value) {
|
|
108
|
+
// 将value字符串转换成json对象
|
|
109
|
+
let jsonStr = JSON.parse(value)
|
|
110
|
+
let str = jsonStr.data
|
|
111
|
+
if (jsonStr.result === '正常') {
|
|
112
|
+
return '正常'
|
|
113
|
+
} else {
|
|
114
|
+
let result = ''
|
|
115
|
+
if (str) {
|
|
116
|
+
for (const itemdata of str) {
|
|
117
|
+
const keys = Object.keys(itemdata)
|
|
118
|
+
for (const itm of keys) {
|
|
119
|
+
const value = itemdata[itm]
|
|
120
|
+
result += itm + ':' + value + ' '
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
return result
|
|
125
|
+
}
|
|
126
|
+
},
|
|
127
|
+
selected (row) {
|
|
128
|
+
if (this.row === row) {
|
|
129
|
+
this.row = null
|
|
130
|
+
} else {
|
|
131
|
+
this.row = row
|
|
132
|
+
}
|
|
133
|
+
},
|
|
134
|
+
isSelected (row) {
|
|
135
|
+
return this.row === row
|
|
136
|
+
}
|
|
137
|
+
},
|
|
138
|
+
watch: {
|
|
139
|
+
'user' (val) {
|
|
140
|
+
// tag
|
|
141
|
+
this.model.search(`f_userinfoid = '${this.row.f_userinfo_id}'`)
|
|
142
|
+
},
|
|
143
|
+
'clearflg' () {
|
|
144
|
+
this.model.rows = []
|
|
145
|
+
}
|
|
146
|
+
},
|
|
147
|
+
ready () {
|
|
148
|
+
console.log('看看row的信息', this.row)
|
|
149
|
+
if (this.row.f_userinfo_id) {
|
|
150
|
+
this.model.search(`f_userinfoid = '${this.row.f_userinfo_id}'`)
|
|
151
|
+
}
|
|
152
|
+
// this.model.rows=[{f_onsite_time:'2020-01-01',f_entry_status:'入戶',f_checker_name:'何11'},{f_onsite_time:'2020-01-01',f_entry_status:'入戶',f_checker_name:'何11'},{f_onsite_time:'2020-01-01',f_entry_status:'入戶',f_checker_name:'何11'}]
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
</script>
|
|
@@ -281,6 +281,15 @@
|
|
|
281
281
|
condition="f_sellinggas_operate_date <= '{}'">
|
|
282
282
|
</datepicker>
|
|
283
283
|
</div>
|
|
284
|
+
<div class="col-sm-2 form-group">
|
|
285
|
+
<label class="font_normal_body">有无附件</label>
|
|
286
|
+
<v-select v-model="model.f_notified_path"
|
|
287
|
+
:value.sync="model.f_notified_path"
|
|
288
|
+
:options="$parent.$parent.attachmentOptions"
|
|
289
|
+
placeholder="请选择"
|
|
290
|
+
condition="{}"
|
|
291
|
+
close-on-select></v-select>
|
|
292
|
+
</div>
|
|
284
293
|
</div>
|
|
285
294
|
</div>
|
|
286
295
|
</criteria>
|
|
@@ -728,6 +737,10 @@
|
|
|
728
737
|
title: '机表抄表查询',
|
|
729
738
|
data () {
|
|
730
739
|
return {
|
|
740
|
+
attachmentOptions: [
|
|
741
|
+
{ label: '是', value: 'f_notified_path is not null' },
|
|
742
|
+
{ label: '否', value: 'f_notified_path is null' }
|
|
743
|
+
],
|
|
731
744
|
iswork: false,
|
|
732
745
|
other: [],
|
|
733
746
|
footer: [],
|