safecheck-client 3.0.33-54 → 3.0.33-57
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/components/rongcheng/AspiratedPaperFeedbackm.vue +1046 -1019
- package/src/components/rongcheng/AspiratedPaperMessage.vue +1378 -1378
- package/src/components/rongcheng/DefectPaper.vue +676 -676
- package/src/components/rongcheng/PaperListNPSQ.vue +448 -420
- package/src/components/rongcheng/PaperListSQ.vue +442 -423
- package/src/components/rongcheng/PhoneUpUserinfo.vue +330 -165
- package/src/components/rongcheng/SafecheckOrderV.vue +2524 -2524
- package/src/filiale/bayan/android/SafecheckOrderV.vue +2 -1
- package/src/filiale/weinan/android/PaperFeedback.vue +1410 -1410
- package/src/filiale/weinan/pc/CheckSearchUser.vue +1078 -1078
- package/src/filiale/weinan/pc/DefectPaperNew.vue +1065 -1065
- package/src/filiale/weinan/pc.js +45 -45
- package/src/main.js +2 -2
|
@@ -8,34 +8,34 @@
|
|
|
8
8
|
<img class="butt3" :src="imgback('基本信息')">
|
|
9
9
|
</span>
|
|
10
10
|
</div>
|
|
11
|
-
<div class="panel-body " id="upuserinfo_sel" v-show="headername
|
|
11
|
+
<div class="panel-body " id="upuserinfo_sel" v-show="headername=='基本信息'">
|
|
12
12
|
<div class="row auto" style="margin: 5px 0">
|
|
13
13
|
<label class="righttxt">用户编号:</label>
|
|
14
|
-
<input type="text" class="form-control rightipt" v-model="userinfo.baseinfo.base.f_userinfo_code" readonly
|
|
14
|
+
<input type="text" class="form-control rightipt" v-model="userinfo.baseinfo.base.f_userinfo_code" readonly/>
|
|
15
15
|
</div>
|
|
16
16
|
<div class="row auto" style="margin: 5px 0">
|
|
17
17
|
<label class="righttxt">用户名称:</label><input type="text" class="form-control rightipt"
|
|
18
|
-
|
|
18
|
+
v-model="userinfo.baseinfo.base.f_user_name" readonly/>
|
|
19
19
|
</div>
|
|
20
20
|
<div class="row auto" style="margin: 5px 0">
|
|
21
21
|
<label class="righttxt">用户状态:</label><input type="text" class="form-control rightipt" readonly
|
|
22
|
-
|
|
22
|
+
v-model="userinfo.baseinfo.base.f_user_state"/>
|
|
23
23
|
</div>
|
|
24
24
|
<div class="row auto" style="margin: 5px 0">
|
|
25
25
|
<label class="righttxt">用户电话:</label><input type="text" class="form-control rightipt"
|
|
26
|
-
|
|
26
|
+
v-model="userinfo.baseinfo.base.f_user_phone"/>
|
|
27
27
|
</div>
|
|
28
28
|
<div class="row auto" style="margin: 5px 0">
|
|
29
29
|
<label class="righttxt">租户姓名:</label><input type="text" class="form-control rightipt"
|
|
30
|
-
|
|
30
|
+
v-model="userinfo.baseinfo.base.f_rent_name"/>
|
|
31
31
|
</div>
|
|
32
32
|
<div class="row auto" style="margin: 5px 0">
|
|
33
33
|
<label class="righttxt">租户电话:</label><input type="text" class="form-control rightipt"
|
|
34
|
-
|
|
34
|
+
v-model="userinfo.baseinfo.base.f_zuhu_phone"/>
|
|
35
35
|
</div>
|
|
36
36
|
<div class="row auto" style="margin: 5px 0">
|
|
37
37
|
<label class="righttxt">建档日期:</label><input type="text" class="form-control rightipt"
|
|
38
|
-
|
|
38
|
+
v-model="userinfo.baseinfo.base.f_createfile_date" readonly/>
|
|
39
39
|
</div>
|
|
40
40
|
<!-- <div class="row auto" style="margin: 5px 0">
|
|
41
41
|
<label class="righttxt">开户日期:</label><input type="text" class="form-control rightipt" v-model="userinfo.baseinfo.base.f_open_date" readonly />
|
|
@@ -44,11 +44,11 @@
|
|
|
44
44
|
<label class="righttxt">地址类型:</label>
|
|
45
45
|
<div class="rightipt" style="display: flex;justify-content: space-around;margin-top: 5px">
|
|
46
46
|
<div><input type="radio" v-model="addressType" name="addressType" @change="changeAddressType"
|
|
47
|
-
id="phone_addressType1" value="普通地址"
|
|
48
|
-
|
|
47
|
+
id="phone_addressType1" value="普通地址"/><label style="font-weight: normal;padding-left: 2px"
|
|
48
|
+
for="phone_addressType1">普通地址</label></div>
|
|
49
49
|
<div><input type="radio" v-model="addressType" name="addressType" @change="changeAddressType"
|
|
50
|
-
id="phone_addressType2" value="特殊地址"
|
|
51
|
-
|
|
50
|
+
id="phone_addressType2" value="特殊地址"/><label style="font-weight: normal;padding-left: 2px"
|
|
51
|
+
for="phone_addressType2">特殊地址</label></div>
|
|
52
52
|
</div>
|
|
53
53
|
<!--<input type="text" style="width: 75%;float:right" class="form-control" v-model="row.f_devices_type" />-->
|
|
54
54
|
<!--<input type="text" class="form-control rightipt" readonly v-model="userinfo.addressinfo.f_pcd" />-->
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
<div class="row auto" style="margin: 5px 0">
|
|
61
61
|
<label class="righttxt">地区类型:</label>
|
|
62
62
|
<!--<input type="text" style="width: 75%;float:right" class="form-control" v-model="row.f_devices_type" />-->
|
|
63
|
-
<input type="text" class="form-control rightipt" readonly v-model="userinfo.addressinfo.f_iscity"
|
|
63
|
+
<input type="text" class="form-control rightipt" readonly v-model="userinfo.addressinfo.f_iscity"/>
|
|
64
64
|
<!--<v-select :value.sync="userinfo.addressinfo.f_iscity" class="input-font" style="margin-left: 5%;"
|
|
65
65
|
:width="'60%'"
|
|
66
66
|
:disabled="true"
|
|
@@ -71,23 +71,31 @@
|
|
|
71
71
|
<label class="righttxt">省 市 区:</label>
|
|
72
72
|
<!--<input type="text" style="width: 75%;float:right" class="form-control" v-model="row.f_devices_type" />-->
|
|
73
73
|
<!--<input type="text" class="form-control rightipt" readonly v-model="userinfo.addressinfo.f_pcd" />-->
|
|
74
|
-
<v-select :value.sync="selectPcd" class="input-font" style="margin-left: 5%;"
|
|
75
|
-
|
|
74
|
+
<v-select :value.sync="selectPcd" class="input-font" style="margin-left: 5%;"
|
|
75
|
+
:width="'60%'"
|
|
76
|
+
v-model="selectPcd"
|
|
77
|
+
:options='pcds' placeholder='请选择省市区' close-on-select clear-button value-single
|
|
76
78
|
@change="pcd_change()"></v-select>
|
|
77
79
|
</div>
|
|
78
80
|
<div class="row auto" style="margin: 5px 0">
|
|
79
81
|
<label class="righttxt">街道名称:</label>
|
|
80
82
|
<!--<input type="text" readonly class="form-control rightipt" v-model="userinfo.addressinfo.f_street" />-->
|
|
81
|
-
<v-select :value.sync="selectStreet" class="input-font" style="margin-left: 5%;"
|
|
82
|
-
|
|
83
|
+
<v-select :value.sync="selectStreet" class="input-font" style="margin-left: 5%;"
|
|
84
|
+
:width="'60%'"
|
|
85
|
+
v-model="selectStreet"
|
|
86
|
+
:options='streets' placeholder='请选择街道' close-on-select clear-button value-single
|
|
83
87
|
@change="street_change()"></v-select>
|
|
84
88
|
</div>
|
|
85
89
|
<div class="row auto" style="margin: 5px 0">
|
|
86
90
|
<label class="righttxt">集收单位:</label>
|
|
87
91
|
<!--<input type="text" readonly class="form-control rightipt" v-model="userinfo.addressinfo.f_residential_area" />-->
|
|
88
|
-
<v-select :value.sync="selectArea" class="input-font" style="margin-left: 5%;"
|
|
89
|
-
|
|
90
|
-
|
|
92
|
+
<v-select :value.sync="selectArea" class="input-font" style="margin-left: 5%;"
|
|
93
|
+
:width="'60%'"
|
|
94
|
+
v-model="selectArea"
|
|
95
|
+
:timeout="500"
|
|
96
|
+
@select-search="select_search"
|
|
97
|
+
:options='area' placeholder='请选择集收单位' close-on-select clear-button value-single
|
|
98
|
+
@change="area_change()"></v-select>
|
|
91
99
|
</div>
|
|
92
100
|
<!--<div class="row auto" style="margin: 5px 0" v-show="addressType=='特殊地址'">
|
|
93
101
|
<label class="righttxt">集收单位:</label>
|
|
@@ -98,30 +106,34 @@
|
|
|
98
106
|
@select-search="select_search"
|
|
99
107
|
:options='area' placeholder='请选择集收单位' close-on-select clear-button value-single @change="area_changeTC()"></v-select>
|
|
100
108
|
</div>-->
|
|
101
|
-
<div class="row auto" style="margin: 5px 0" v-show="addressType
|
|
109
|
+
<div class="row auto" style="margin: 5px 0" v-show="addressType=='普通地址'">
|
|
102
110
|
<label class="righttxt">楼    号:</label><input type="text" @change="changeNewAddress"
|
|
103
|
-
|
|
111
|
+
class="form-control rightipt"
|
|
112
|
+
v-model="userinfo.addressinfo.f_building"/>
|
|
104
113
|
</div>
|
|
105
|
-
<div class="row auto" style="margin: 5px 0" v-show="addressType
|
|
114
|
+
<div class="row auto" style="margin: 5px 0" v-show="addressType=='普通地址'">
|
|
106
115
|
<label class="righttxt">单    元:</label><input type="text" @change="changeNewAddress"
|
|
107
|
-
|
|
116
|
+
class="form-control rightipt"
|
|
117
|
+
v-model="userinfo.addressinfo.f_unit"/>
|
|
108
118
|
</div>
|
|
109
|
-
<div class="row auto" style="margin: 5px 0" v-show="addressType
|
|
119
|
+
<div class="row auto" style="margin: 5px 0" v-show="addressType=='普通地址'">
|
|
110
120
|
<label class="righttxt">楼    层:</label><input type="text" @change="changeNewAddress"
|
|
111
|
-
|
|
121
|
+
class="form-control rightipt"
|
|
122
|
+
v-model="userinfo.addressinfo.f_floor"/>
|
|
112
123
|
</div>
|
|
113
|
-
<div class="row auto" style="margin: 5px 0" v-show="addressType
|
|
124
|
+
<div class="row auto" style="margin: 5px 0" v-show="addressType=='普通地址'">
|
|
114
125
|
<label class="righttxt">门 牌 号:</label><input type="text" @change="changeNewAddress"
|
|
115
|
-
|
|
126
|
+
class="form-control rightipt"
|
|
127
|
+
v-model="userinfo.addressinfo.f_room"/>
|
|
116
128
|
</div>
|
|
117
129
|
<div class="row auto" style="margin: 5px 0">
|
|
118
130
|
<label class="righttxt">详细地址:</label><input type="text" class="form-control rightipt" readonly
|
|
119
|
-
|
|
131
|
+
v-model="userinfo_old.addressinfo.f_address"/>
|
|
120
132
|
</div>
|
|
121
133
|
<div class="row auto" style="margin: 5px 0">
|
|
122
134
|
<label class="righttxt">新 地 址:</label>
|
|
123
135
|
<!--<input type="text" class="form-control rightipt" readonly v-model="getaddress()" />-->
|
|
124
|
-
<textarea :readonly="addressType
|
|
136
|
+
<textarea :readonly="addressType=='普通地址'" class="form-control rightipt" : style="height: 80px"
|
|
125
137
|
v-model="userinfo.addressinfo.f_address"></textarea>
|
|
126
138
|
</div>
|
|
127
139
|
|
|
@@ -132,7 +144,8 @@
|
|
|
132
144
|
|
|
133
145
|
<div class="row auto" style="margin: 5px 0">
|
|
134
146
|
<label class="righttxt">备    注:</label><textarea class="form-control rightipt"
|
|
135
|
-
|
|
147
|
+
style="height: 150px"
|
|
148
|
+
v-model="userinfo.baseinfo.base.f_remark"></textarea>
|
|
136
149
|
<!--<input type="text" class="form-control rightipt" v-model="userinfo.baseinfo.base.f_remark" />-->
|
|
137
150
|
</div>
|
|
138
151
|
</div>
|
|
@@ -144,68 +157,96 @@
|
|
|
144
157
|
<img class="butt3" :src="imgback('表具信息')">
|
|
145
158
|
</span>
|
|
146
159
|
</div>
|
|
147
|
-
<div class="panel-body " v-show="headername
|
|
160
|
+
<div class="panel-body " v-show="headername=='表具信息'">
|
|
148
161
|
<div class="row auto" style="margin: 5px 0">
|
|
149
162
|
<label class="righttxt">表    号:</label>
|
|
150
|
-
<input type="text" :readonly="userinfo.meterinfo[0].f_meter_classify
|
|
151
|
-
style="width: 45%" v-model="userinfo.meterinfo[0].f_meternumber"
|
|
163
|
+
<input type="text" :readonly="userinfo.meterinfo[0].f_meter_classify!='机表'" class="form-control rightipt"
|
|
164
|
+
style="width: 45%" v-model="userinfo.meterinfo[0].f_meternumber"/>
|
|
152
165
|
<button type="button"
|
|
153
|
-
:disabled="!(userinfo.meterinfo[0].f_meter_classify
|
|
166
|
+
:disabled="!(userinfo.meterinfo[0].f_meter_classify=='机表' || userinfo.meterinfo[0].f_meter_classify=='金额卡表' || userinfo.meterinfo[0].f_meter_classify=='气量卡表')"
|
|
154
167
|
name="button" class="btn btn-primary" style="width: 15%" @click="scan">扫码
|
|
155
168
|
</button>
|
|
156
169
|
</div>
|
|
157
170
|
|
|
158
171
|
<div class="row auto" style="margin: 5px 0">
|
|
159
172
|
<label class="righttxt">通 气 人:</label>
|
|
160
|
-
<input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_gas_person"
|
|
173
|
+
<input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_gas_person"/>
|
|
161
174
|
</div>
|
|
162
175
|
<div class="row auto" style="margin: 5px 0">
|
|
163
176
|
<label class="righttxt">通气时间:</label>
|
|
164
|
-
<datepicker class="rightipt"
|
|
165
|
-
|
|
177
|
+
<datepicker class="rightipt"
|
|
178
|
+
:value.sync="userinfo.meterinfo[0].f_gas_date"
|
|
179
|
+
v-model="userinfo.meterinfo[0].f_gas_date"
|
|
180
|
+
:disabled-days-of-Week="[]"
|
|
181
|
+
:format="'yyyy-MM-dd'"
|
|
166
182
|
:show-reset-button="reset">
|
|
167
183
|
</datepicker>
|
|
168
184
|
</div>
|
|
169
185
|
<div class="row auto" style="margin: 5px 0" v-show="showBox">
|
|
170
186
|
<label class="righttxt">调 压 箱:</label>
|
|
171
|
-
<v-select class="rightipt"
|
|
172
|
-
|
|
173
|
-
|
|
187
|
+
<v-select class="rightipt"
|
|
188
|
+
:value.sync="userinfo.meterinfo[0].f_adjustable_id"
|
|
189
|
+
v-model="userinfo.meterinfo[0].f_adjustable_id"
|
|
190
|
+
placeholder='请选择'
|
|
191
|
+
:width='wid'
|
|
192
|
+
readonly
|
|
193
|
+
:options="boxOptions"
|
|
194
|
+
close-on-select value-single></v-select>
|
|
174
195
|
</div>
|
|
175
196
|
<div class="row auto" style="margin: 5px 0">
|
|
176
197
|
<label class="righttxt">是否直通:</label>
|
|
177
|
-
<v-select
|
|
178
|
-
|
|
179
|
-
|
|
198
|
+
<v-select
|
|
199
|
+
:value.sync="userinfo.meterinfo[0].f_if_direct"
|
|
200
|
+
class="input-font"
|
|
201
|
+
style="margin-left: 5%;"
|
|
202
|
+
:width="'60%'"
|
|
203
|
+
v-model="userinfo.meterinfo[0].f_if_direct"
|
|
204
|
+
:options='directOptions'
|
|
205
|
+
placeholder='是否直通'
|
|
206
|
+
close-on-select
|
|
207
|
+
clear-button
|
|
208
|
+
value-single>
|
|
180
209
|
</v-select>
|
|
181
210
|
</div>
|
|
182
211
|
<div class="row auto" style="margin: 5px 0">
|
|
183
212
|
<label class="righttxt">表 封 号:</label>
|
|
184
|
-
<input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_metertitles"
|
|
213
|
+
<input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_metertitles"/>
|
|
185
214
|
</div>
|
|
186
215
|
<div class="row auto" style="margin: 5px 0">
|
|
187
216
|
<label class="righttxt">表 位 置:</label>
|
|
188
217
|
<!--<input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_position" readonly/>-->
|
|
189
218
|
<v-select class="rightipt" :value.sync="userinfo.meterinfo[0].f_position"
|
|
190
|
-
v-model="userinfo.meterinfo[0].f_position"
|
|
219
|
+
v-model="userinfo.meterinfo[0].f_position"
|
|
220
|
+
placeholder='请选择'
|
|
221
|
+
:width='wid'
|
|
222
|
+
readonly
|
|
223
|
+
:options="wz_types"
|
|
191
224
|
close-on-select value-single></v-select>
|
|
192
225
|
</div>
|
|
193
226
|
<div class="row auto" style="margin: 5px 0">
|
|
194
227
|
<label class="righttxt">表    向:</label>
|
|
195
228
|
<!--<input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_position" readonly/>-->
|
|
196
229
|
<v-select class="rightipt" :value.sync="userinfo.meterinfo[0].f_aroundmeter"
|
|
197
|
-
v-model="userinfo.meterinfo[0].f_aroundmeter"
|
|
198
|
-
|
|
230
|
+
v-model="userinfo.meterinfo[0].f_aroundmeter"
|
|
231
|
+
placeholder='请选择'
|
|
232
|
+
:width='wid'
|
|
233
|
+
readonly
|
|
234
|
+
:options="aroundmeters"
|
|
235
|
+
close-on-select value-single></v-select>
|
|
199
236
|
</div>
|
|
200
237
|
<div class="row auto" style="margin: 5px 0">
|
|
201
238
|
<label class="righttxt">气表类型:</label>
|
|
202
|
-
<input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_meter_classify" readonly
|
|
239
|
+
<input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_meter_classify" readonly/>
|
|
203
240
|
</div>
|
|
204
241
|
<div class="row auto" style="margin: 5px 0">
|
|
205
242
|
<label class="righttxt">表前阀状态:</label>
|
|
206
243
|
<!--<input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_position" readonly/>-->
|
|
207
244
|
<v-select class="rightipt" :value.sync="userinfo.meterinfo[0].f_bqf_state"
|
|
208
|
-
v-model="userinfo.meterinfo[0].f_bqf_state"
|
|
245
|
+
v-model="userinfo.meterinfo[0].f_bqf_state"
|
|
246
|
+
placeholder='请选择'
|
|
247
|
+
:width='wid'
|
|
248
|
+
readonly
|
|
249
|
+
:options="bqf_states"
|
|
209
250
|
close-on-select value-single></v-select>
|
|
210
251
|
</div>
|
|
211
252
|
<!-- <div class="row auto" style="margin: 5px 0">
|
|
@@ -216,73 +257,98 @@
|
|
|
216
257
|
</div>
|
|
217
258
|
</div>
|
|
218
259
|
<div class="panel auto">
|
|
219
|
-
<div class="panel-heading" @click="selectVal('
|
|
220
|
-
<span class="spanboder"><img src="../../assets/list.png" style="width: 22px;margin-right: 8px;"
|
|
221
|
-
class="butt3" :src="imgback('
|
|
260
|
+
<div class="panel-heading" @click="selectVal('用气设备信息')" style="background-color: #ffffff">
|
|
261
|
+
<span class="spanboder"><img src="../../assets/list.png" style="width: 22px;margin-right: 8px;">用气设备信息<img
|
|
262
|
+
class="butt3" :src="imgback('用气设备信息')"></span>
|
|
222
263
|
</div>
|
|
223
|
-
<div class="panel-body" v-show="headername
|
|
224
|
-
<div class="row" v-for="(idx,
|
|
264
|
+
<div class="panel-body" v-show="headername=='用气设备信息'">
|
|
265
|
+
<div class="row" v-for="(idx,row) in model"
|
|
225
266
|
style="border:2px solid #A2C2EB; border-top:10px solid #A2C2EB; box-shadow: #00b3ee;margin-bottom: 10px">
|
|
226
267
|
<div class="row auto" style="margin: 5px 0">
|
|
227
268
|
<label class="righttxt">设备类型:</label>
|
|
228
269
|
<!--<input type="text" class="form-control rightipt" readonly v-model="row.f_devices_type" />-->
|
|
229
|
-
<v-select class="rightipt" :value.sync="row.f_devices_type"
|
|
230
|
-
|
|
270
|
+
<v-select class="rightipt" :value.sync="row.f_devices_type"
|
|
271
|
+
v-model="row.f_devices_type"
|
|
272
|
+
placeholder='请选择'
|
|
273
|
+
@change="getServiceLife(idx,row.f_devices_type)"
|
|
274
|
+
:width='wid'
|
|
275
|
+
readonly
|
|
276
|
+
:options="devices_types"
|
|
231
277
|
close-on-select value-single></v-select>
|
|
232
278
|
</div>
|
|
233
279
|
<div class="row auto" style="margin: 5px 0">
|
|
234
280
|
<label class="righttxt">设备品牌:</label>
|
|
235
|
-
<input type="text" class="form-control rightipt"
|
|
281
|
+
<input type="text" class="form-control rightipt"
|
|
282
|
+
v-model="row.f_brand"/>
|
|
236
283
|
</div>
|
|
237
284
|
<div class="row auto" style="margin: 5px 0">
|
|
238
285
|
<label class="righttxt">设备型号:</label><input type="text" class="form-control rightipt"
|
|
239
|
-
|
|
286
|
+
v-model="row.f_devices_model"/>
|
|
240
287
|
</div>
|
|
241
288
|
<div class="row auto" style="margin: 5px 0" v-if="false">
|
|
242
289
|
<label class="righttxt">生产日期:</label>
|
|
243
|
-
<datepicker class="rightipt"
|
|
244
|
-
:
|
|
290
|
+
<datepicker class="rightipt"
|
|
291
|
+
:value.sync="row.f_make_date"
|
|
292
|
+
v-model="row.f_make_date"
|
|
293
|
+
:disabled-days-of-Week="[]"
|
|
294
|
+
:format="'yyyy-MM-dd'"
|
|
295
|
+
:show-reset-button="reset" readonly="readonly">
|
|
245
296
|
</datepicker>
|
|
246
297
|
</div>
|
|
247
298
|
<div class="row auto" style="margin: 5px 0">
|
|
248
299
|
<label class="righttxt">安装日期:</label>
|
|
249
|
-
<datepicker class="rightipt"
|
|
250
|
-
|
|
251
|
-
|
|
300
|
+
<datepicker class="rightipt"
|
|
301
|
+
@change="countExpireFate(idx,row.f_input_date)"
|
|
302
|
+
:value.sync="row.f_input_date"
|
|
303
|
+
v-model="row.f_input_date"
|
|
304
|
+
:disabled-days-of-Week="[]"
|
|
305
|
+
:format="'yyyy-MM-dd'"
|
|
306
|
+
:show-reset-button="reset" readonly="readonly">
|
|
252
307
|
</datepicker>
|
|
253
308
|
</div>
|
|
254
309
|
<div class="row auto" style="margin: 5px 0">
|
|
255
310
|
<label class="righttxt">使用年限:</label><input type="number" class="form-control rightipt"
|
|
256
|
-
|
|
311
|
+
v-model="row.f_service_life" readonly/>
|
|
257
312
|
</div>
|
|
258
313
|
<div class="row auto" style="margin: 5px 0">
|
|
259
314
|
<label class="righttxt">到期日期:</label>
|
|
260
|
-
<input type="text" class="form-control rightipt"
|
|
315
|
+
<input type="text" class="form-control rightipt"
|
|
316
|
+
v-model="row.f_expire_date" readonly/>
|
|
261
317
|
</div>
|
|
262
318
|
<div class="row auto" style="margin: 5px 0">
|
|
263
319
|
<label class="righttxt">安 装 人:</label><input type="text" class="form-control rightipt"
|
|
264
|
-
|
|
320
|
+
v-model="row.f_input_person"/>
|
|
265
321
|
</div>
|
|
266
322
|
<div class="row auto" style="margin: 5px 0">
|
|
267
323
|
<label class="righttxt">设备数量:</label><input type="number" class="form-control rightipt"
|
|
268
|
-
|
|
324
|
+
v-model="row.f_devices_num"/>
|
|
269
325
|
</div>
|
|
270
326
|
<div class="row auto" style="margin: 5px 0">
|
|
271
327
|
<label class="righttxt">管道类型:</label>
|
|
272
328
|
<!--<input type="text" class="form-control rightipt" readonly v-model="row.f_devices_type" />-->
|
|
273
|
-
<v-select class="rightipt" :value.sync="row.f_pipe_type"
|
|
274
|
-
|
|
329
|
+
<v-select class="rightipt" :value.sync="row.f_pipe_type"
|
|
330
|
+
v-model="row.f_pipe_type"
|
|
331
|
+
placeholder='请选择'
|
|
332
|
+
:width='wid'
|
|
333
|
+
readonly
|
|
334
|
+
:options="pipe_types"
|
|
335
|
+
close-on-select value-single></v-select>
|
|
275
336
|
</div>
|
|
276
337
|
<div class="row auto" style="margin: 5px 0">
|
|
277
338
|
<label class="righttxt">安装日期:</label>
|
|
278
|
-
<datepicker class="rightipt"
|
|
279
|
-
|
|
280
|
-
:
|
|
339
|
+
<datepicker class="rightipt"
|
|
340
|
+
@change="countExpireFate_pipe(idx,row.f_pipeinstall_date,row.f_pipe_type)"
|
|
341
|
+
:value.sync="row.f_pipeinstall_date"
|
|
342
|
+
v-model="row.f_pipeinstall_date"
|
|
343
|
+
:disabled-days-of-Week="[]"
|
|
344
|
+
:format="'yyyy-MM-dd'"
|
|
345
|
+
:show-reset-button="reset" readonly="readonly">
|
|
281
346
|
</datepicker>
|
|
282
347
|
</div>
|
|
283
348
|
<div class="row auto" style="margin: 5px 0">
|
|
284
349
|
<label class="righttxt">到期日期:</label>
|
|
285
|
-
<input type="text" class="form-control rightipt"
|
|
350
|
+
<input type="text" class="form-control rightipt"
|
|
351
|
+
v-model="row.f_pipeexpire_date" readonly/>
|
|
286
352
|
</div>
|
|
287
353
|
<!--<div class="row auto" style="margin: 5px 0">
|
|
288
354
|
<label class="righttxt">设备状态:</label><input type="text" class="form-control rightipt" readonly v-model="row.f_userinfodevices_state" />
|
|
@@ -291,7 +357,7 @@
|
|
|
291
357
|
<label class="righttxt">购买方式:</label><input type="text" class="form-control rightipt" readonly v-model="row.watchpurchase" />
|
|
292
358
|
</div>-->
|
|
293
359
|
<div style="display: flex;justify-content: center;margin-bottom: 3px"
|
|
294
|
-
v-if="$index
|
|
360
|
+
v-if="$index>this.userinfo_old.devicesinfo.length-1 || this.userinfo_old.devicesinfo.length==0">
|
|
295
361
|
<button class="btn btn-warning" @click="delDevices($index)">删除设备</button>
|
|
296
362
|
</div>
|
|
297
363
|
</div>
|
|
@@ -300,10 +366,101 @@
|
|
|
300
366
|
</div>
|
|
301
367
|
</div>
|
|
302
368
|
</div>
|
|
369
|
+
<div class="panel auto">
|
|
370
|
+
<div class="panel-heading" @click="selectVal('设备信息')" style="background-color: #ffffff">
|
|
371
|
+
<span class="spanboder"><img src="../../assets/list.png" style="width: 22px;margin-right: 8px;">设备信息<img
|
|
372
|
+
class="butt3" :src="imgback('设备信息')"></span>
|
|
373
|
+
</div>
|
|
374
|
+
<div class="panel-body" v-show="headername == '设备信息'">
|
|
375
|
+
<div class="row" v-for="(idx, row) in devicemodel"
|
|
376
|
+
style="border:2px solid #A2C2EB; border-top:10px solid #A2C2EB; box-shadow: #00b3ee;margin-bottom: 10px">
|
|
377
|
+
<div class="row auto" style="margin: 5px 0">
|
|
378
|
+
<label class="righttxt">设备类型:</label>
|
|
379
|
+
<v-select class="rightipt" :value.sync="row.f_devices_type" v-model="row.f_devices_type" placeholder='请选择'
|
|
380
|
+
:width='wid' readonly :options="device_type"
|
|
381
|
+
close-on-select value-single></v-select>
|
|
382
|
+
</div>
|
|
383
|
+
<div class="row auto" style="margin: 5px 0">
|
|
384
|
+
<label class="righttxt">厂家:</label>
|
|
385
|
+
<input type="text" class="form-control rightipt" v-model="row.f_manufactor" />
|
|
386
|
+
</div>
|
|
387
|
+
<div class="row auto" style="margin: 5px 0">
|
|
388
|
+
<label class="righttxt">设备编号:</label><input type="text" class="form-control rightipt"
|
|
389
|
+
v-model="row.f_devices_model" />
|
|
390
|
+
</div>
|
|
391
|
+
<div class="row auto" style="margin: 5px 0">
|
|
392
|
+
<label class="righttxt">设备型号:</label><input type="text" class="form-control rightipt"
|
|
393
|
+
v-model="row.f_devices_model" />
|
|
394
|
+
</div>
|
|
395
|
+
<div class="row auto" style="margin: 5px 0">
|
|
396
|
+
<label class="righttxt">安 装 人:</label><input type="text" class="form-control rightipt"
|
|
397
|
+
v-model="row.f_instaler_person" />
|
|
398
|
+
</div>
|
|
399
|
+
<div class="row auto" style="margin: 5px 0">
|
|
400
|
+
<label class="righttxt">安装日期:</label>
|
|
401
|
+
<datepicker class="rightipt" :value.sync="row.f_input_date"
|
|
402
|
+
v-model="row.f_input_date" :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset"
|
|
403
|
+
readonly="readonly">
|
|
404
|
+
</datepicker>
|
|
405
|
+
</div>
|
|
406
|
+
<div class="row auto" style="margin: 5px 0" >
|
|
407
|
+
<label class="righttxt">生产日期:</label>
|
|
408
|
+
<datepicker class="rightipt" :value.sync="row.f_make_date" v-model="row.f_make_date"
|
|
409
|
+
:disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset" >
|
|
410
|
+
</datepicker>
|
|
411
|
+
</div>
|
|
412
|
+
<div class="row auto" style="margin: 5px 0">
|
|
413
|
+
<label class="righttxt">设备数量:</label>
|
|
414
|
+
<input type="number" class="form-control rightipt" v-model="row.f_devices_num" />
|
|
415
|
+
</div>
|
|
416
|
+
<div class="row auto" style="margin: 5px 0" v-show="row.f_devices_type == '报警器'">
|
|
417
|
+
<label class="righttxt">首校日期:</label>
|
|
418
|
+
<datepicker class="rightipt" :value.sync="row.f_firstcheck_date" v-model="row.f_firstcheck_date"
|
|
419
|
+
:disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset" >
|
|
420
|
+
</datepicker>
|
|
421
|
+
</div>
|
|
422
|
+
<div class="row auto" style="margin: 5px 0" v-show="row.f_devices_type == '报警器'">
|
|
423
|
+
<label class="righttxt">报废日期:</label>
|
|
424
|
+
<datepicker class="rightipt" :value.sync="row.f_expire_date" v-model="row.f_expire_date"
|
|
425
|
+
:disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset" >
|
|
426
|
+
</datepicker>
|
|
427
|
+
</div>
|
|
428
|
+
<div class="row auto" style="margin: 5px 0" v-show="row.f_devices_type == '报警器'">
|
|
429
|
+
<label class="righttxt">下次校验:</label>
|
|
430
|
+
<datepicker class="rightipt" :value.sync="row.f_nextcheck_date" v-model="row.f_nextcheck_date"
|
|
431
|
+
:disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset" >
|
|
432
|
+
</datepicker>
|
|
433
|
+
</div>
|
|
434
|
+
<div class="row auto" style="margin: 5px 0" v-show="row.f_devices_type == '切断阀'">
|
|
435
|
+
<label class="righttxt">报废日期:</label>
|
|
436
|
+
<datepicker class="rightipt" :value.sync="row.f_expire_date" v-model="row.f_expire_date"
|
|
437
|
+
:disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset" >
|
|
438
|
+
</datepicker>
|
|
439
|
+
</div>
|
|
440
|
+
<div class="row auto" style="margin: 5px 0" v-show="row.f_devices_type == '调压器'">
|
|
441
|
+
<label class="righttxt">流量:</label>
|
|
442
|
+
<input type="number" class="form-control rightipt" v-model="row.f_rate_flow" />
|
|
443
|
+
</div>
|
|
444
|
+
<div class="row auto" style="margin: 5px 0" v-show="row.f_devices_type == '调压器'">
|
|
445
|
+
<label class="righttxt">出口压力:</label>
|
|
446
|
+
<input type="text" class="form-control rightipt" v-model="row.f_pressure_range" />
|
|
447
|
+
</div>
|
|
448
|
+
<div class="row auto" style="margin: 5px 0" v-show="row.f_devices_type == '调压器'">
|
|
449
|
+
<label class="righttxt">进口压力:</label>
|
|
450
|
+
<input type="text" class="form-control rightipt" v-model="row.f_import_pressure" />
|
|
451
|
+
</div>
|
|
452
|
+
<div style="display: flex;justify-content: center;margin-bottom: 3px">
|
|
453
|
+
<button class="btn btn-warning" @click="deleteDevice($index)">删除设备</button>
|
|
454
|
+
</div>
|
|
455
|
+
</div>
|
|
456
|
+
<div style="display: flex;justify-content: space-around;">
|
|
457
|
+
<button class="col-sm-3 btn btn-primary" @click="pushDevices($index)">新增设备</button>
|
|
458
|
+
</div>
|
|
459
|
+
</div>
|
|
460
|
+
</div>
|
|
303
461
|
<div class="panel auto">
|
|
304
462
|
<div class="panel-body">
|
|
305
463
|
<div style="display: flex;justify-content: center;">
|
|
306
|
-
<!-- <button class="col-sm-3 btn btn-primary" :disabled="enable" @click="isNeedAudit ? editUserInfo() : editUserInfoNoAudit()">{{isNeedAudit ? '上传审核' : '上传'}}</button>-->
|
|
307
464
|
<button class="col-sm-3 btn btn-primary" :disabled="enable" @click="editUserInfo()">上传</button>
|
|
308
465
|
</div>
|
|
309
466
|
</div>
|
|
@@ -312,16 +469,16 @@
|
|
|
312
469
|
</template>
|
|
313
470
|
|
|
314
471
|
<script>
|
|
315
|
-
import {
|
|
472
|
+
import {HttpResetClass} from 'vue-client'
|
|
316
473
|
import * as Util from "../Util";
|
|
317
474
|
import Vue from 'vue'
|
|
318
|
-
import { toStandardDateString } from "../Util";
|
|
319
475
|
|
|
320
476
|
export default {
|
|
321
477
|
title: '设备查看',
|
|
322
478
|
data() {
|
|
323
479
|
return {
|
|
324
480
|
model: [],
|
|
481
|
+
devicemodel:[],
|
|
325
482
|
show: false,
|
|
326
483
|
row: Object,
|
|
327
484
|
userinfo: Object,
|
|
@@ -329,21 +486,22 @@
|
|
|
329
486
|
wid: "60%",
|
|
330
487
|
aroundmeters: [],
|
|
331
488
|
devices_types: [],
|
|
332
|
-
|
|
489
|
+
device_type: [{label: '调压器', value: '调压器'}, {label: '报警器', value: '报警器'}, {label: '切断阀', value: '切断阀'}],
|
|
490
|
+
pipe_types: [{label: '包覆管', value: '包覆管'}, {label: '波纹管', value: '波纹管'}],
|
|
333
491
|
wz_types: [],
|
|
334
|
-
cityTypes: [{
|
|
335
|
-
bqf_states: [{
|
|
492
|
+
cityTypes: [{label: '市区', value: '市区'}, {label: '城镇', value: '城镇'}],
|
|
493
|
+
bqf_states: [{label: '开阀', value: '开阀'}, {label: '关阀', value: '关阀'}],
|
|
336
494
|
pcds: [],
|
|
337
495
|
streets: [],
|
|
338
496
|
update: false,
|
|
339
|
-
headername: '
|
|
497
|
+
headername: '用气设备信息',
|
|
340
498
|
excessive: false,
|
|
341
499
|
area: [],
|
|
342
500
|
enable: false,
|
|
343
501
|
f_meterno_path: Vue.nopic,
|
|
344
|
-
selectArea: {
|
|
345
|
-
selectPcd: {
|
|
346
|
-
selectStreet: {
|
|
502
|
+
selectArea: {id: ''},
|
|
503
|
+
selectPcd: {id: ''},
|
|
504
|
+
selectStreet: {id: ''},
|
|
347
505
|
changemeterno: false,//是否修改了机表表号
|
|
348
506
|
approveChange: false,//是否需要进行信息变更审核
|
|
349
507
|
newAddress: '',
|
|
@@ -371,7 +529,7 @@
|
|
|
371
529
|
},
|
|
372
530
|
boxOptions: [],
|
|
373
531
|
showBox: false,
|
|
374
|
-
directOptions: [{
|
|
532
|
+
directOptions: [{label: '是', value: '是'}, {label: '否', value: '否'}],
|
|
375
533
|
deviceBrandOption: {},
|
|
376
534
|
isNeedAudit: this.$appdata.getSingleValue('信息变更是否需要审核') == 'false' ? false : true
|
|
377
535
|
}
|
|
@@ -384,34 +542,64 @@
|
|
|
384
542
|
f_source: ''
|
|
385
543
|
},
|
|
386
544
|
methods: {
|
|
387
|
-
|
|
545
|
+
deleteDevice(idx) {
|
|
546
|
+
//tag
|
|
547
|
+
this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
|
|
548
|
+
if (res === 'confirm') {
|
|
549
|
+
this.devicemodel.splice(idx, 1)
|
|
550
|
+
}
|
|
551
|
+
})
|
|
552
|
+
},
|
|
553
|
+
pushDevices() {
|
|
554
|
+
let obj = {
|
|
555
|
+
"f_operator": Vue.user.name,
|
|
556
|
+
"f_operate_date": Util.toStandardTimeString(),
|
|
557
|
+
"f_operatorid": Vue.user.id,
|
|
558
|
+
"f_devices_type":null,
|
|
559
|
+
"f_manufactor":null,
|
|
560
|
+
"f_devices_no":null,
|
|
561
|
+
"f_devices_model":null,
|
|
562
|
+
"f_instaler_person":null,
|
|
563
|
+
"f_make_date":null,
|
|
564
|
+
"f_input_date":null,
|
|
565
|
+
"f_devices_num":null,
|
|
566
|
+
"f_firstcheck_date":null,
|
|
567
|
+
"f_rate_flow":null,
|
|
568
|
+
"f_expire_date":null,
|
|
569
|
+
"f_nextcheck_date":null,
|
|
570
|
+
"f_pressure_range":null,
|
|
571
|
+
"f_import_pressure":null
|
|
572
|
+
}
|
|
573
|
+
this.devicemodel.push(obj)
|
|
574
|
+
},
|
|
575
|
+
countExpireFate_pipe(index,dateTime,type){
|
|
388
576
|
let old = new Date(dateTime)
|
|
389
|
-
let newYear = old.getFullYear()
|
|
390
|
-
let month = old.getMonth()
|
|
391
|
-
let date
|
|
392
|
-
this.model[index].f_pipeexpire_date = newYear + '-' + (month
|
|
577
|
+
let newYear = old.getFullYear()+Number(this.$appdata.getSingleValue(type+'-年限') || 0)
|
|
578
|
+
let month = old.getMonth()+1
|
|
579
|
+
let date = old.getDate()
|
|
580
|
+
this.model[index].f_pipeexpire_date = newYear + '-' + (month<10? '0'+ month : month) + '-' + (date<10? '0'+ date : date)
|
|
393
581
|
},
|
|
394
|
-
countExpireFate(index,
|
|
582
|
+
countExpireFate(index,dateTime){
|
|
395
583
|
let old = new Date(dateTime)
|
|
396
|
-
let newYear = old.getFullYear()
|
|
397
|
-
let month = old.getMonth()
|
|
398
|
-
let date
|
|
399
|
-
this.model[index].f_expire_date = newYear + '-' + (month
|
|
584
|
+
let newYear = old.getFullYear()+Number(this.model[index].f_service_life)
|
|
585
|
+
let month = old.getMonth()+1
|
|
586
|
+
let date = old.getDate()
|
|
587
|
+
this.model[index].f_expire_date = newYear + '-' + (month<10? '0'+ month : month) + '-' + (date<10? '0'+ date : date)
|
|
400
588
|
},
|
|
401
|
-
getServiceLife(index,
|
|
402
|
-
const year = this.$appdata.getSingleValue(type
|
|
589
|
+
getServiceLife(index,type){
|
|
590
|
+
const year = this.$appdata.getSingleValue(type+'-'+this.userinfo.meterinfo[0].f_user_type+'-年限') || 0
|
|
403
591
|
this.model[index].f_service_life = year
|
|
404
592
|
},
|
|
405
|
-
dateAddYear(dateTime,
|
|
593
|
+
dateAddYear(dateTime,year){
|
|
406
594
|
let old = new Date(dateTime)
|
|
407
|
-
let newYear = old.getFullYear()
|
|
408
|
-
let month = old.getMonth()
|
|
409
|
-
let date
|
|
410
|
-
return newYear + '-' + (month
|
|
595
|
+
let newYear = old.getFullYear()+Number(year)
|
|
596
|
+
let month = old.getMonth()+1
|
|
597
|
+
let date = old.getDate()
|
|
598
|
+
return newYear + '-' + (month<10? '0'+ month : month) + '-' + (date<10? '0'+ date : date)
|
|
411
599
|
},
|
|
412
600
|
scan() {
|
|
413
601
|
HostApp.__this__ = this,
|
|
414
|
-
HostApp.scanCode({
|
|
602
|
+
HostApp.scanCode({callback: "javascript:HostApp.__this__.getCode();"})
|
|
415
603
|
},
|
|
416
604
|
getCode() {
|
|
417
605
|
var datapa = HostApp.getCode().data;
|
|
@@ -423,28 +611,28 @@
|
|
|
423
611
|
//检查一些必要信息是否未填
|
|
424
612
|
this.approveChange = false
|
|
425
613
|
this.changemeterno = false
|
|
426
|
-
let checked = {
|
|
614
|
+
let checked = {ischeck: true, msg: ''}
|
|
427
615
|
//tag
|
|
428
616
|
//tag
|
|
429
617
|
//tag
|
|
430
618
|
if (!this.userinfo.baseinfo.base.f_user_name) {
|
|
431
|
-
checked = {
|
|
619
|
+
checked = {ischeck: false, msg: '请输入用户名称！'}
|
|
432
620
|
}
|
|
433
621
|
if (!this.selectPcd.id) {
|
|
434
|
-
checked = {
|
|
622
|
+
checked = {ischeck: false, msg: '请选择省市区！'}
|
|
435
623
|
}
|
|
436
624
|
if (!this.selectStreet.id) {
|
|
437
|
-
checked = {
|
|
625
|
+
checked = {ischeck: false, msg: '请选择街道！'}
|
|
438
626
|
}
|
|
439
627
|
if (!this.userinfo.addressinfo.f_address) {
|
|
440
|
-
checked = {
|
|
628
|
+
checked = {ischeck: false, msg: '新地址不能为空！'}
|
|
441
629
|
}
|
|
442
630
|
if (this.addressType == '普通地址') {
|
|
443
631
|
if (!this.selectArea.id) {
|
|
444
|
-
checked = {
|
|
632
|
+
checked = {ischeck: false, msg: '请选择集收单位！'}
|
|
445
633
|
}
|
|
446
634
|
if (!this.userinfo.addressinfo.f_room) {
|
|
447
|
-
checked = {
|
|
635
|
+
checked = {ischeck: false, msg: '新输入门牌号！'}
|
|
448
636
|
}
|
|
449
637
|
}
|
|
450
638
|
if (this.userinfo.meterinfo[0].f_meter_classify == '机表' && this.userinfo_old.meterinfo[0].f_meternumber) {
|
|
@@ -454,14 +642,14 @@
|
|
|
454
642
|
if (this.userinfo.meterinfo[0].f_meternumber) {
|
|
455
643
|
if (this.userinfo.meterinfo[0].f_meternumber != this.userinfo_old.meterinfo[0].f_meternumber) {
|
|
456
644
|
if (!this.f_meterno_path || this.f_meterno_path == Vue.nopic) {
|
|
457
|
-
checked = {
|
|
645
|
+
checked = {ischeck: false, msg: '请拍摄表号照片！'}
|
|
458
646
|
} else {
|
|
459
647
|
//用来标识当前有修改机表表号，后台需要进行照片上传
|
|
460
648
|
this.changemeterno = true
|
|
461
649
|
}
|
|
462
650
|
}
|
|
463
651
|
} else {
|
|
464
|
-
checked = {
|
|
652
|
+
checked = {ischeck: false, msg: '请输入表号！'}
|
|
465
653
|
}
|
|
466
654
|
}
|
|
467
655
|
//检查本次修改信息中是否包含需要审核的内容
|
|
@@ -509,12 +697,12 @@
|
|
|
509
697
|
orderitem: "id",
|
|
510
698
|
condition: `f_orgid = '${Vue.user.orgid}' ${pcdText} `
|
|
511
699
|
}
|
|
512
|
-
}, {
|
|
700
|
+
}, {resolveMsg: null, rejectMsg: null}).then((res) => {
|
|
513
701
|
//tag)
|
|
514
702
|
if (res.data.length > 0) {
|
|
515
703
|
this.area = []
|
|
516
704
|
res.data.forEach((result) => {
|
|
517
|
-
this.area.push({
|
|
705
|
+
this.area.push({label: result.f_residential_area, value: result})
|
|
518
706
|
})
|
|
519
707
|
}
|
|
520
708
|
})
|
|
@@ -602,13 +790,13 @@
|
|
|
602
790
|
f_address: this.userinfo_old.addressinfo.f_address ? this.userinfo_old.addressinfo.f_address : this.userinfo.addressinfo.f_address
|
|
603
791
|
}
|
|
604
792
|
}
|
|
605
|
-
}, {
|
|
793
|
+
}, {resolveMsg: null, rejectMsg: null}).then((res1) => {
|
|
606
794
|
if (res1.data.status == 200) {
|
|
607
795
|
let data = this.userinfo.addressinfo
|
|
608
796
|
data.f_address = this.userinfo_old.addressinfo.f_address ? this.userinfo_old.addressinfo.f_address : this.userinfo.addressinfo.f_address
|
|
609
797
|
//
|
|
610
798
|
data.f_operator = Vue.user.name
|
|
611
|
-
new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/address_updateuseraddress`, {
|
|
799
|
+
new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/address_updateuseraddress`, {data: data}).then((res2) => {
|
|
612
800
|
this.$showMessage("修改用户地址信息成功！")
|
|
613
801
|
}).catch(error => {
|
|
614
802
|
this.$showMessage("修改用户地址信息！")
|
|
@@ -653,15 +841,18 @@
|
|
|
653
841
|
this.userinfo_old.meterinfo[0].f_if_direct = this.userinfo.meterinfo[0].f_if_direct
|
|
654
842
|
userinfoms.userfiles = []
|
|
655
843
|
this.userinfo_old.meterinfo[0].devicesinfo = this.model
|
|
844
|
+
for (let i = 0; i < this.devicemodel.length; i++){
|
|
845
|
+
this.userinfo_old.meterinfo[0].devicesinfo.push(this.devicemodel[i])
|
|
846
|
+
}
|
|
656
847
|
userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])
|
|
657
848
|
//tag)
|
|
658
849
|
new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_fileSave`, {
|
|
659
850
|
data: {
|
|
660
851
|
userinfo: userinfoms,
|
|
661
852
|
modifyReason: this.f_source ? `${this.f_source}维护档案信息` : '',
|
|
662
|
-
address: {
|
|
853
|
+
address: {id: this.userinfo_old.addressinfo.id, oldid: this.userinfo_old.addressinfo.id}
|
|
663
854
|
}
|
|
664
|
-
}, {
|
|
855
|
+
}, {resolveMsg: null, rejectMsg: null}).then((res1) => {
|
|
665
856
|
if (res1.data.status == 200) {
|
|
666
857
|
//本次修改信息包含需要审核信息
|
|
667
858
|
// if (this.approveChange) {
|
|
@@ -771,7 +962,7 @@
|
|
|
771
962
|
this.userinfo.addressinfo.f_residential_area = ''
|
|
772
963
|
this.userinfo.addressinfo.f_residential_area_id = ''
|
|
773
964
|
this.userinfo.addressinfo.f_slice_area = ''
|
|
774
|
-
this.selectArea = {
|
|
965
|
+
this.selectArea = {id: ''}
|
|
775
966
|
this.area = []
|
|
776
967
|
let pcdText = ` and f_street_id=${this.selectStreet.id}`
|
|
777
968
|
let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
|
|
@@ -781,10 +972,10 @@
|
|
|
781
972
|
orderitem: "id",
|
|
782
973
|
condition: `f_orgid = '${Vue.user.orgid}' ${pcdText} `
|
|
783
974
|
}
|
|
784
|
-
}, {
|
|
975
|
+
}, {resolveMsg: null, rejectMsg: null})
|
|
785
976
|
////tag)
|
|
786
977
|
res.data.forEach((result) => {
|
|
787
|
-
this.area.push({
|
|
978
|
+
this.area.push({label: result.f_residential_area, value: result})
|
|
788
979
|
})
|
|
789
980
|
} else {
|
|
790
981
|
this.area = []
|
|
@@ -800,11 +991,11 @@
|
|
|
800
991
|
this.userinfo.addressinfo.f_pcd = this.selectPcd.f_pcd
|
|
801
992
|
this.userinfo.addressinfo.f_pcd_id = this.selectPcd.id
|
|
802
993
|
//清空 选中的街道和集收单位
|
|
803
|
-
this.selectStreet = {
|
|
994
|
+
this.selectStreet = {id: ''}
|
|
804
995
|
this.userinfo.addressinfo.f_street = ''
|
|
805
996
|
this.userinfo.addressinfo.f_street_id = ''
|
|
806
997
|
this.userinfo.addressinfo.f_iscity = ''
|
|
807
|
-
this.selectArea = {
|
|
998
|
+
this.selectArea = {id: ''}
|
|
808
999
|
this.userinfo.addressinfo.f_residential_area = ''
|
|
809
1000
|
this.userinfo.addressinfo.f_residential_area_id = ''
|
|
810
1001
|
this.userinfo.addressinfo.f_slice_area = ''
|
|
@@ -817,9 +1008,9 @@
|
|
|
817
1008
|
orderitem: "id",
|
|
818
1009
|
condition: `f_orgid = '${Vue.user.orgid}' ${pcdText}`
|
|
819
1010
|
}
|
|
820
|
-
}, {
|
|
1011
|
+
}, {resolveMsg: null, rejectMsg: null})
|
|
821
1012
|
streetlist.data.forEach((result) => {
|
|
822
|
-
this.streets.push({
|
|
1013
|
+
this.streets.push({label: result.f_street, value: result})
|
|
823
1014
|
})
|
|
824
1015
|
} else {
|
|
825
1016
|
this.streets = []
|
|
@@ -854,7 +1045,7 @@
|
|
|
854
1045
|
f_zones: Vue.user.zones
|
|
855
1046
|
}
|
|
856
1047
|
new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/entity/t_disable`,
|
|
857
|
-
data, {
|
|
1048
|
+
data, {resolveMsg: null, rejectMsg: null}).then((row) => {
|
|
858
1049
|
this.$showMessage('已成功关阀停气！')
|
|
859
1050
|
this.userinfo.meterinfo[0].f_table_state = '停用'
|
|
860
1051
|
})
|
|
@@ -876,7 +1067,7 @@
|
|
|
876
1067
|
"f_comments": null,
|
|
877
1068
|
"f_operate_date": Util.toStandardTimeString(),
|
|
878
1069
|
"f_operatorid": Vue.user.id,
|
|
879
|
-
"f_service_life":
|
|
1070
|
+
"f_service_life":'',
|
|
880
1071
|
"f_devices_num": null,
|
|
881
1072
|
"f_process_id": null,
|
|
882
1073
|
"f_devices_type": null,
|
|
@@ -886,7 +1077,7 @@
|
|
|
886
1077
|
"f_brand": null,
|
|
887
1078
|
"f_devices_model": null,
|
|
888
1079
|
"f_devices_no": null,
|
|
889
|
-
"img": {
|
|
1080
|
+
"img": {"content": null, "filename": null}
|
|
890
1081
|
}
|
|
891
1082
|
this.model.push(obj)
|
|
892
1083
|
},
|
|
@@ -909,10 +1100,10 @@
|
|
|
909
1100
|
orderitem: "id",
|
|
910
1101
|
condition: `f_orgid = '${Vue.user.orgid}' ${pcdText}`
|
|
911
1102
|
}
|
|
912
|
-
}, {
|
|
1103
|
+
}, {resolveMsg: null, rejectMsg: null})
|
|
913
1104
|
////tag)
|
|
914
1105
|
res.data.forEach((result) => {
|
|
915
|
-
this.area.push({
|
|
1106
|
+
this.area.push({label: result.f_residential_area, value: result})
|
|
916
1107
|
})
|
|
917
1108
|
//tag
|
|
918
1109
|
this.area.push({
|
|
@@ -939,14 +1130,14 @@
|
|
|
939
1130
|
orderitem: "id",
|
|
940
1131
|
condition: `f_orgid = '${Vue.user.orgid}' ${pcdText}`
|
|
941
1132
|
}
|
|
942
|
-
}, {
|
|
1133
|
+
}, {resolveMsg: null, rejectMsg: null})
|
|
943
1134
|
streetlist.data.forEach((result) => {
|
|
944
1135
|
//如果第一次进来有地址id 就拿下地址区域
|
|
945
1136
|
if (this.selectStreet.id && this.selectStreet.id == result.id) {
|
|
946
1137
|
//tag)
|
|
947
1138
|
this.userinfo.addressinfo.f_iscity = result.f_iscity
|
|
948
1139
|
}
|
|
949
|
-
this.streets.push({
|
|
1140
|
+
this.streets.push({label: result.f_street, value: result})
|
|
950
1141
|
})
|
|
951
1142
|
} else {
|
|
952
1143
|
this.streets = []
|
|
@@ -1033,47 +1224,21 @@
|
|
|
1033
1224
|
orderitem: "id",
|
|
1034
1225
|
condition: `f_orgid = '${Vue.user.orgid}'`
|
|
1035
1226
|
}
|
|
1036
|
-
}, {
|
|
1227
|
+
}, {resolveMsg: null, rejectMsg: null})
|
|
1037
1228
|
//tag)
|
|
1038
1229
|
pcdlist.data.forEach((result) => {
|
|
1039
|
-
this.pcds.push({
|
|
1230
|
+
this.pcds.push({label: result.f_pcd, value: result})
|
|
1040
1231
|
})
|
|
1041
1232
|
////tag)
|
|
1042
1233
|
let res = await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_getFilesDetail`, {
|
|
1043
1234
|
//f_userinfo_code:'12381344',
|
|
1044
1235
|
f_userinfo_id: this.f_userinfo_id
|
|
1045
|
-
}, {
|
|
1236
|
+
}, {resolveMsg: null, rejectMsg: null})
|
|
1046
1237
|
//tag
|
|
1047
1238
|
//tag
|
|
1048
1239
|
this.userinfo = res.data
|
|
1049
1240
|
this.userinfo_old = JSON.parse(JSON.stringify(res.data))
|
|
1050
1241
|
this.model = this.userinfo.meterinfo[0].devicesinfo.concat(this.userinfo.meterinfo[0].devicesinfonew)
|
|
1051
|
-
//已经超期
|
|
1052
|
-
let now = Util.toStandardDateString()
|
|
1053
|
-
let overdue = this.model.filter(item => item.f_expire_date <= now).map(item => item.f_devices_type).join(',')
|
|
1054
|
-
//临近超期
|
|
1055
|
-
|
|
1056
|
-
const advent_time = (this.$appdata.getSingleValue('设备超期提醒') || 7) * 1000 * 60 * 60 * 24
|
|
1057
|
-
const nowTime = new Date().getTime()
|
|
1058
|
-
const adventTimeLimit = nowTime + advent_time
|
|
1059
|
-
const advent = this.model
|
|
1060
|
-
.filter(item => {
|
|
1061
|
-
const expireTime = new Date(item.f_expire_date).getTime()
|
|
1062
|
-
return expireTime >= nowTime && expireTime <= adventTimeLimit
|
|
1063
|
-
})
|
|
1064
|
-
.map(item => {
|
|
1065
|
-
const expireTime = new Date(item.f_expire_date).getTime()
|
|
1066
|
-
const daysLeft = Math.round((expireTime - nowTime) / (1000 * 60 * 60 * 24))
|
|
1067
|
-
return `${item.f_devices_type}设备还有${daysLeft >= 0 ? daysLeft : 0}天超期`
|
|
1068
|
-
})
|
|
1069
|
-
.join(',')
|
|
1070
|
-
if (overdue && advent) {
|
|
1071
|
-
this.$showMessage(`${overdue}设备已过期，${advent}`)
|
|
1072
|
-
} else if (advent) {
|
|
1073
|
-
this.$showMessage(`${advent}`)
|
|
1074
|
-
} else if (overdue) {
|
|
1075
|
-
this.$showMessage(`${overdue}设备已过期`)
|
|
1076
|
-
}
|
|
1077
1242
|
this.selectArea.id = this.userinfo.addressinfo.f_residential_area_id
|
|
1078
1243
|
this.selectPcd.id = this.userinfo.addressinfo.f_pcd_id
|
|
1079
1244
|
this.selectPcd.f_pcd = this.userinfo.addressinfo.f_pcd
|
|
@@ -1090,7 +1255,7 @@
|
|
|
1090
1255
|
this.enable = true
|
|
1091
1256
|
this.$showMessage('获取用户信息出错,请检查网络状况！')
|
|
1092
1257
|
}
|
|
1093
|
-
new HttpResetClass().load('get', `${this.$androidUtil.getProxyUrl()}/rs/vue/UserAddress.json`, {
|
|
1258
|
+
new HttpResetClass().load('get', `${this.$androidUtil.getProxyUrl()}/rs/vue/UserAddress.json`, {data: {}}, {
|
|
1094
1259
|
resolveMsg: null,
|
|
1095
1260
|
rejectMsg: null
|
|
1096
1261
|
}).then((addressUnit) => {
|
|
@@ -1105,11 +1270,11 @@
|
|
|
1105
1270
|
}).catch((msg) => {
|
|
1106
1271
|
//tag)
|
|
1107
1272
|
})
|
|
1108
|
-
this.showBox = this.$appdata.getSingleValue('档案审核是否显示调压箱') == '是'
|
|
1273
|
+
this.showBox = this.$appdata.getSingleValue('档案审核是否显示调压箱') == '是'? true : false
|
|
1109
1274
|
console.log(this.showBox)
|
|
1110
1275
|
if (this.showBox) {
|
|
1111
1276
|
// 获取调压箱
|
|
1112
|
-
new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/sql/adjustableboxQuery`, {
|
|
1277
|
+
new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/sql/adjustableboxQuery`, {data: {condition: '1 = 1'}}, {
|
|
1113
1278
|
resolveMsg: null,
|
|
1114
1279
|
rejectMsg: null
|
|
1115
1280
|
}).then((res) => {
|