sale-client 3.6.351 → 3.6.353
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/package.json +1 -1
- package/src/filiale/meihekou/MbpeopleList.vue +24 -11
- package/src/filiale/meihekou/batch/batchEditManage.vue +4 -5
- package/src/filiale/meihekou/batch/batchEditOperate.vue +1 -1
- package/src/filiale/meihekou/batch/batchUserList.vue +9 -3
- package/src/filiale/yangchun/BlackList/BlackList.vue +2 -1
- package/src/plugins/LodopFuncs.js +94 -54
- package/.gradle/5.2.1/fileChanges/last-build.bin +0 -0
- package/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/5.2.1/gc.properties +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +0 -2
- package/.gradle/vcs-1/gc.properties +0 -0
package/package.json
CHANGED
|
@@ -14,7 +14,16 @@
|
|
|
14
14
|
<input type="text" class="input_search" style="width:60%" v-model="model.f_user_name"
|
|
15
15
|
condition="f_user_name like '%{}%'" placeholder='用户姓名'>
|
|
16
16
|
</div>
|
|
17
|
-
|
|
17
|
+
<div class="col-sm-3 form-group">
|
|
18
|
+
<label class="font_normal_body">小 区 </label>
|
|
19
|
+
<input type="text" class="input_search" v-model="model.f_residential_area" style="width: 60%"
|
|
20
|
+
condition=" f_residential_area like '{}%'" placeholder="输入小区">
|
|
21
|
+
</div>
|
|
22
|
+
<div class="col-sm-3 form-group">
|
|
23
|
+
<label class="font_normal_body">楼 号 </label>
|
|
24
|
+
<input type="text" class="input_search" style="width:60%" v-model="model.f_building"
|
|
25
|
+
condition="f_building = '{}'" placeholder='楼号'>
|
|
26
|
+
</div>
|
|
18
27
|
<div class="form-group button-range" style="float: right">
|
|
19
28
|
<button class="button_search button_spacing" @click="$parent.$parent.search()">查询</button>
|
|
20
29
|
<button class="button_clear button_spacing" @click="clear">清空</button>
|
|
@@ -109,21 +118,13 @@
|
|
|
109
118
|
condition="f_meter_brand in {}"
|
|
110
119
|
close-on-select></v-select>
|
|
111
120
|
</div>
|
|
112
|
-
|
|
113
|
-
<label class="font_normal_body">小 区 </label>
|
|
114
|
-
<input type="text" class="input_search" v-model="model.f_residential_area" style="width: 60%"
|
|
115
|
-
condition=" f_residential_area like '{}%'" placeholder="输入小区">
|
|
116
|
-
</div>
|
|
121
|
+
|
|
117
122
|
<div class="form-group col-sm-3">
|
|
118
123
|
<label class="font_normal_body">客户地址</label>
|
|
119
124
|
<input type="text" class="input_search" style="width:60%" v-model="model.f_address"
|
|
120
125
|
condition="f_address like '%{}%'" placeholder='客户地址'>
|
|
121
126
|
</div>
|
|
122
|
-
|
|
123
|
-
<label class="font_normal_body">楼 号 </label>
|
|
124
|
-
<input type="text" class="input_search" style="width:60%" v-model="model.f_building"
|
|
125
|
-
condition="f_building = '{}'" placeholder='楼号'>
|
|
126
|
-
</div>
|
|
127
|
+
|
|
127
128
|
<div class="form-group col-sm-3">
|
|
128
129
|
<label class="font_normal_body">组织机构</label>
|
|
129
130
|
<res-select :initresid='$parent.$parent.curorgid'
|
|
@@ -195,6 +196,12 @@
|
|
|
195
196
|
<th>
|
|
196
197
|
<nobr>客户地址</nobr>
|
|
197
198
|
</th>
|
|
199
|
+
<th>
|
|
200
|
+
<nobr>小区</nobr>
|
|
201
|
+
</th>
|
|
202
|
+
<th>
|
|
203
|
+
<nobr>楼号</nobr>
|
|
204
|
+
</th>
|
|
198
205
|
<th>
|
|
199
206
|
<nobr>表号</nobr>
|
|
200
207
|
</th>
|
|
@@ -240,6 +247,12 @@
|
|
|
240
247
|
<td>
|
|
241
248
|
<nobr>{{ row.f_address }}</nobr>
|
|
242
249
|
</td>
|
|
250
|
+
<td>
|
|
251
|
+
<nobr>{{ row.f_residential_area }}</nobr>
|
|
252
|
+
</td>
|
|
253
|
+
<td>
|
|
254
|
+
<nobr>{{ row.f_building }}</nobr>
|
|
255
|
+
</td>
|
|
243
256
|
<td>
|
|
244
257
|
<nobr>{{ row.f_meternumber }}</nobr>
|
|
245
258
|
</td>
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<div class="row
|
|
3
|
-
<
|
|
4
|
-
|
|
5
|
-
</div>
|
|
6
|
-
<div class="binary-right" >
|
|
2
|
+
<div id="unit" class="flex-row">
|
|
3
|
+
<batch-user-list :class="{'basic-main': !isdetail,'binary-left': isdetail}" style="width: auto;" v-ref:userlist @save="save"></batch-user-list>
|
|
4
|
+
<div class="binary-right" style="overflow-y: auto;" v-if="isdetail" style="width: 50%">
|
|
7
5
|
<batch-edit-operate v-ref:editoperate @batchedit="batchedit" :info='pinfo'></batch-edit-operate>
|
|
8
6
|
</div>
|
|
9
7
|
</div>
|
|
@@ -28,6 +26,7 @@
|
|
|
28
26
|
rowsdata: [],
|
|
29
27
|
files: {},
|
|
30
28
|
pinfo: {},
|
|
29
|
+
isdetail: true,
|
|
31
30
|
chinesename: {
|
|
32
31
|
files: {
|
|
33
32
|
'f_inputtor': '抄表员',
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<div class="flex
|
|
3
|
-
<div
|
|
2
|
+
<div style="flex: 1" class="flex" >
|
|
3
|
+
<div>
|
|
4
4
|
<div class="flex">
|
|
5
5
|
<criteria-paged :model="model" v-ref:paged>
|
|
6
6
|
<criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch">
|
|
@@ -134,6 +134,9 @@
|
|
|
134
134
|
<th><nobr>地址信息</nobr></th>
|
|
135
135
|
<th><nobr>客户状态</nobr></th>
|
|
136
136
|
|
|
137
|
+
<th><nobr>小区</nobr></th>
|
|
138
|
+
<th><nobr>楼号</nobr></th>
|
|
139
|
+
|
|
137
140
|
<th><nobr>客户类型</nobr></th>
|
|
138
141
|
<th><nobr>使用状态</nobr></th>
|
|
139
142
|
<th><nobr>气表状态</nobr></th>
|
|
@@ -161,6 +164,9 @@
|
|
|
161
164
|
<td style="text-align: center;">{{row.f_address_detail ? row.f_address + row.f_address_detail : row.f_address}}</td>
|
|
162
165
|
<td style="text-align: center;">{{row.f_user_state}}</td>
|
|
163
166
|
|
|
167
|
+
<td style="text-align: center;">{{row.f_residential_area}}</td>
|
|
168
|
+
<td style="text-align: center;">{{row.f_building}}</td>
|
|
169
|
+
|
|
164
170
|
<td style="text-align: center;">{{row.f_user_type}}</td>
|
|
165
171
|
<td style="text-align: center;">{{row.f_usestate}}</td>
|
|
166
172
|
<td style="text-align: center;">{{row.f_table_state}}</td>
|
|
@@ -219,7 +225,7 @@
|
|
|
219
225
|
all: [],
|
|
220
226
|
// 控制单选
|
|
221
227
|
radio: [],
|
|
222
|
-
criteriaShow:
|
|
228
|
+
criteriaShow: true,
|
|
223
229
|
meters: [{label: '全部', value: ''}, {label: '机表', value: '机表'}, {label: '卡表', value: '卡表'}, {label: '物联网表', value: '物联网表'}],
|
|
224
230
|
adjustables: [],
|
|
225
231
|
bookSliceArea: []
|
|
@@ -178,7 +178,7 @@
|
|
|
178
178
|
self.model.f_userinfo_code = res.data[0].f_userinfo_code
|
|
179
179
|
self.model.f_function = self.model.f_function?self.model.f_function:[]
|
|
180
180
|
if(self.model.f_function && typeof (self.model.f_function)==="string"){
|
|
181
|
-
self.model.f_function = JSON.parse(self.model.f_function
|
|
181
|
+
self.model.f_function = JSON.parse(self.model.f_function)
|
|
182
182
|
}
|
|
183
183
|
self.model.f_meternumber = res.data[0].f_meternumber
|
|
184
184
|
self.model.f_card_id = res.data[0].f_card_id
|
|
@@ -290,6 +290,7 @@
|
|
|
290
290
|
console.log(res.data[0])
|
|
291
291
|
this.model = res.data[0]
|
|
292
292
|
this.$parent.blodid = this.model.f_userinfo_id
|
|
293
|
+
this.model.f_function = this.model.f_function ? JSON.parse(this.model.f_function) : []
|
|
293
294
|
})
|
|
294
295
|
},
|
|
295
296
|
async confirm (type) {
|
|
@@ -1,7 +1,18 @@
|
|
|
1
1
|
var CreatedOKLodop7766 = null
|
|
2
2
|
|
|
3
|
+
function loadScriptAsync(src) {
|
|
4
|
+
return new Promise((resolve, reject) => {
|
|
5
|
+
var script = document.createElement('script')
|
|
6
|
+
script.src = src
|
|
7
|
+
script.async = true
|
|
8
|
+
script.onload = resolve
|
|
9
|
+
script.onerror = reject
|
|
10
|
+
document.head.appendChild(script)
|
|
11
|
+
})
|
|
12
|
+
}
|
|
13
|
+
|
|
3
14
|
// ====判断是否需要安装CLodop云打印服务器:====
|
|
4
|
-
function needCLodop
|
|
15
|
+
function needCLodop() {
|
|
5
16
|
// return false;
|
|
6
17
|
try {
|
|
7
18
|
var ua = navigator.userAgent
|
|
@@ -15,42 +26,44 @@ function needCLodop () {
|
|
|
15
26
|
var verOPR = ua.match(/OPR\D?\d+/i)
|
|
16
27
|
var verFF = ua.match(/Firefox\D?\d+/i)
|
|
17
28
|
var x64 = ua.match(/x64/i)
|
|
18
|
-
if ((verTrident == null) && (verIE == null) && (x64 !== null)) {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
} else
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
}
|
|
29
|
+
if ((verTrident == null) && (verIE == null) && (x64 !== null)) {
|
|
30
|
+
return true
|
|
31
|
+
} else if (verFF !== null) {
|
|
32
|
+
verFF = verFF[0].match(/\d+/)
|
|
33
|
+
if (verFF[0] >= 42) return true
|
|
34
|
+
} else if (verOPR !== null) {
|
|
35
|
+
verOPR = verOPR[0].match(/\d+/)
|
|
36
|
+
if (verOPR[0] >= 32) return true
|
|
37
|
+
} else if ((verTrident == null) && (verIE == null)) {
|
|
38
|
+
var verChrome = ua.match(/Chrome\D?\d+/i)
|
|
39
|
+
if (verChrome !== null) {
|
|
40
|
+
verChrome = verChrome[0].match(/\d+/)
|
|
41
|
+
if (verChrome[0] >= 42) return true
|
|
42
|
+
}
|
|
43
|
+
;
|
|
44
|
+
}
|
|
45
|
+
;
|
|
34
46
|
return false
|
|
35
|
-
} catch (err) {
|
|
47
|
+
} catch (err) {
|
|
48
|
+
return true
|
|
49
|
+
}
|
|
50
|
+
;
|
|
36
51
|
};
|
|
37
52
|
|
|
38
53
|
// ====页面引用CLodop云打印必须的JS文件：====
|
|
39
54
|
if (needCLodop()) {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
// head.insertBefore( oscript,head.firstChild );
|
|
50
|
-
};
|
|
55
|
+
loadScriptAsync('http://localhost:18000/CLodopfuncs.js?priority=1')
|
|
56
|
+
.then(() => {
|
|
57
|
+
console.log('CLodop script loaded successfully.')
|
|
58
|
+
// 这里可以继续执行其他需要在脚本加载完后执行的逻辑
|
|
59
|
+
})
|
|
60
|
+
.catch((error) => {
|
|
61
|
+
console.error('Failed to load CLodop script:', error)
|
|
62
|
+
})
|
|
63
|
+
}
|
|
51
64
|
|
|
52
65
|
// ====获取LODOP对象的主过程：====
|
|
53
|
-
function getLodop
|
|
66
|
+
function getLodop(oOBJECT, oEMBED) {
|
|
54
67
|
var strHtmInstall = "<br><font color='#FF00FF'>打印控件未安装!点击这里<a href='http://113.10.155.131/install_lodop32.zip' target='_self'>执行安装</a>,安装后请刷新页面或重新进入。</font>"
|
|
55
68
|
var strHtmUpdate = "<br><font color='#FF00FF'>打印控件需要升级!点击这里<a href='http://113.10.155.131/install_lodop32.zip' target='_self'>执行升级</a>,升级后请重新进入。</font>"
|
|
56
69
|
var strHtm64_Install = "<br><font color='#FF00FF'>打印控件未安装!点击这里<a href='http://113.10.155.131/install_lodop64.zip' target='_self'>执行安装</a>,安装后请刷新页面或重新进入。</font>"
|
|
@@ -63,21 +76,35 @@ function getLodop (oOBJECT, oEMBED) {
|
|
|
63
76
|
try {
|
|
64
77
|
var isIE = (navigator.userAgent.indexOf('MSIE') >= 0) || (navigator.userAgent.indexOf('Trident') >= 0)
|
|
65
78
|
if (needCLodop()) {
|
|
66
|
-
try {
|
|
67
|
-
|
|
79
|
+
try {
|
|
80
|
+
LODOP = getCLodop()
|
|
81
|
+
} catch (err) {
|
|
82
|
+
}
|
|
83
|
+
;
|
|
84
|
+
if (!LODOP && document.readyState !== 'complete') {
|
|
85
|
+
alert('C-Lodop没准备好，请稍后再试！');
|
|
86
|
+
return
|
|
87
|
+
}
|
|
88
|
+
;
|
|
68
89
|
if (!LODOP) {
|
|
69
|
-
|
|
90
|
+
if (isIE) document.write(strCLodopInstall); else {
|
|
91
|
+
document.documentElement.innerHTML = strCLodopInstall + document.documentElement.innerHTML
|
|
92
|
+
}
|
|
70
93
|
return
|
|
71
94
|
} else {
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
95
|
+
if (CLODOP.CVERSION < '2.0.6.2') {
|
|
96
|
+
if (isIE) document.write(strCLodopUpdate); else {
|
|
97
|
+
document.documentElement.innerHTML = strCLodopUpdate + document.documentElement.innerHTML
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
;
|
|
101
|
+
if (oEMBED && oEMBED.parentNode) oEMBED.parentNode.removeChild(oEMBED)
|
|
102
|
+
if (oOBJECT && oOBJECT.parentNode) oOBJECT.parentNode.removeChild(oOBJECT)
|
|
103
|
+
}
|
|
104
|
+
;
|
|
78
105
|
} else {
|
|
79
106
|
var is64IE = isIE && (navigator.userAgent.indexOf('x64') >= 0)
|
|
80
|
-
|
|
107
|
+
// =====如果页面有Lodop就直接使用，没有则新建:==========
|
|
81
108
|
if (oOBJECT != undefined || oEMBED != undefined) {
|
|
82
109
|
if (isIE) LODOP = oOBJECT; else LODOP = oEMBED
|
|
83
110
|
} else if (CreatedOKLodop7766 == null) {
|
|
@@ -90,26 +117,39 @@ function getLodop (oOBJECT, oEMBED) {
|
|
|
90
117
|
document.documentElement.appendChild(LODOP)
|
|
91
118
|
CreatedOKLodop7766 = LODOP
|
|
92
119
|
} else LODOP = CreatedOKLodop7766
|
|
93
|
-
|
|
120
|
+
// =====Lodop插件未安装时提示下载地址:==========
|
|
94
121
|
if ((LODOP == null) || (typeof (LODOP.VERSION) == 'undefined')) {
|
|
95
|
-
if (navigator.userAgent.indexOf('Chrome') >= 0) {
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
122
|
+
if (navigator.userAgent.indexOf('Chrome') >= 0) {
|
|
123
|
+
document.documentElement.innerHTML = strHtmChrome + document.documentElement.innerHTML
|
|
124
|
+
}
|
|
125
|
+
if (navigator.userAgent.indexOf('Firefox') >= 0) {
|
|
126
|
+
document.documentElement.innerHTML = strHtmFireFox + document.documentElement.innerHTML
|
|
127
|
+
}
|
|
128
|
+
if (is64IE) document.write(strHtm64_Install); else if (isIE) document.write(strHtmInstall); else {
|
|
129
|
+
document.documentElement.innerHTML = strHtmInstall + document.documentElement.innerHTML
|
|
130
|
+
}
|
|
99
131
|
return LODOP
|
|
100
|
-
}
|
|
101
|
-
|
|
132
|
+
}
|
|
133
|
+
;
|
|
134
|
+
}
|
|
135
|
+
;
|
|
102
136
|
if (LODOP.VERSION < '6.2.0.3') {
|
|
103
|
-
if (needCLodop()) {
|
|
104
|
-
|
|
105
|
-
|
|
137
|
+
if (needCLodop()) {
|
|
138
|
+
document.documentElement.innerHTML = strCLodopUpdate + document.documentElement.innerHTML
|
|
139
|
+
} else if (is64IE) document.write(strHtm64_Update); else if (isIE) document.write(strHtmUpdate); else {
|
|
140
|
+
document.documentElement.innerHTML = strHtmUpdate + document.documentElement.innerHTML
|
|
141
|
+
}
|
|
106
142
|
return LODOP
|
|
107
|
-
}
|
|
108
|
-
|
|
143
|
+
}
|
|
144
|
+
;
|
|
145
|
+
// ===如下空白位置适合调用统一功能(如注册语句、语言选择等):===
|
|
109
146
|
LODOP.SET_LICENSES('西安奥枫软件有限公司', '552C41D5AB0D146FCF77D05CD8AA15A1', '', '')
|
|
110
|
-
|
|
147
|
+
// ===========================================================
|
|
111
148
|
return LODOP
|
|
112
|
-
} catch (err) {
|
|
149
|
+
} catch (err) {
|
|
150
|
+
alert('getLodop出错:' + err)
|
|
151
|
+
}
|
|
152
|
+
;
|
|
113
153
|
};
|
|
114
154
|
|
|
115
155
|
export default getLodop
|
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
File without changes
|