sale-client 3.6.455 → 3.6.457
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/.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 +2 -0
- package/.gradle/vcs-1/gc.properties +0 -0
- package/package.json +1 -1
- package/src/components/revenue/comprehen/Bill/Eticket/EticketRecordList.vue +3 -0
- package/src/components/revenue/comprehen/Bill/EticketV4/EticketRecordList.vue +3 -0
- package/src/filiale/qingjian/SafeCheck.vue +39 -23
- package/src/filiale/yangchun/BlackList/BlackListList.vue +3 -3
- package/src/filiale/yangchun/BlackList/BlackRecordQuery.vue +14 -1
- package/src/filiale/yangchun/ChangeMeter.vue +5 -1
- package/src/filiale/yuncheng/machineHandAudit.vue +15 -10
- package/src/main.js +1 -1
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
File without changes
|
package/package.json
CHANGED
|
@@ -119,34 +119,42 @@
|
|
|
119
119
|
<tr >
|
|
120
120
|
<td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">用户满意度:</td>
|
|
121
121
|
<td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">{{ model.f_client_evaluation }}</td>
|
|
122
|
-
<td
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
<td
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
<td
|
|
129
|
-
|
|
130
|
-
<span v-for="deviceCollect in model.deviceCollects">
|
|
131
|
-
<span class="li-font">
|
|
132
|
-
{{deviceCollect.name}}:{{deviceCollect.value}}
|
|
133
|
-
</span>
|
|
134
|
-
<br>
|
|
135
|
-
</span>
|
|
122
|
+
<td colspan="1" v-if="inspectionResult === '正常'" style="text-align: center; border: #E9E9E9 solid 1px;">
|
|
123
|
+
安检结果:
|
|
124
|
+
</td>
|
|
125
|
+
<td colspan="1" v-if="inspectionResult === '正常'" style="text-align: center; border: #E9E9E9 solid 1px;">
|
|
126
|
+
正常
|
|
127
|
+
</td>
|
|
128
|
+
<td colspan="1" v-if="inspectionResult === '有隐患'" style="text-align: center; border: #E9E9E9 solid 1px; color: red;">
|
|
129
|
+
安检结果:
|
|
136
130
|
</td>
|
|
137
|
-
<td
|
|
138
|
-
|
|
139
|
-
<span v-for="deviceCollect in model.deviceCollects">
|
|
140
|
-
<span class="li-font">
|
|
141
|
-
{{deviceCollect.name}}:{{deviceCollect.value}}
|
|
142
|
-
</span>
|
|
143
|
-
<br>
|
|
144
|
-
</span>
|
|
131
|
+
<td colspan="1" v-if="inspectionResult === '有隐患'" style="text-align: center; border: #E9E9E9 solid 1px; color: red;">
|
|
132
|
+
有隐患
|
|
145
133
|
</td>
|
|
146
134
|
</tr>
|
|
135
|
+
<!-- <tr v-if="model.ajresult && model.ajresult.indexOf('有隐患') >= 0">-->
|
|
136
|
+
<!-- <td colspan="1" v-if="model.ajresult && (model.ajresult.indexOf('有隐患') >= 0)" style="text-align: center;border: #E9E9E9 solid 1px;color:red;">隐患详情:</td>-->
|
|
137
|
+
<!-- <td colspan="3" v-if="model.ajresult && (model.ajresult.indexOf('有隐患') >= 0)" style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%;color:red;">-->
|
|
138
|
+
<!-- <span v-for="deviceCollect in model.deviceCollects" v-if="deviceCollect.value === '有隐患'">-->
|
|
139
|
+
<!-- <span class="li-font">-->
|
|
140
|
+
<!-- {{deviceCollect.name}}:{{deviceCollect.value}} -->
|
|
141
|
+
<!-- </span>-->
|
|
142
|
+
<!-- <br>-->
|
|
143
|
+
<!-- </span>-->
|
|
144
|
+
<!-- </td>-->
|
|
145
|
+
<!-- <td colspan="1" v-if="!(model.ajresult && (model.ajresult.indexOf('有隐患') >=0))" style="text-align: center;border: #E9E9E9 solid 1px;">隐患详情:</td>-->
|
|
146
|
+
<!-- <td colspan="3" v-if="!(model.ajresult && (model.ajresult.indexOf('有隐患') >=0))" style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">-->
|
|
147
|
+
<!-- <span v-for="deviceCollect in model.deviceCollects">-->
|
|
148
|
+
<!-- <span class="li-font">-->
|
|
149
|
+
<!-- {{deviceCollect.name}}:{{deviceCollect.value}} -->
|
|
150
|
+
<!-- </span>-->
|
|
151
|
+
<!-- <br>-->
|
|
152
|
+
<!-- </span>-->
|
|
153
|
+
<!-- </td>-->
|
|
154
|
+
<!-- </tr>-->
|
|
147
155
|
<tr>
|
|
148
156
|
<td colspan="1">安检备注</td>
|
|
149
|
-
<td colspan="3">{{model.
|
|
157
|
+
<td colspan="3">{{model.f_repair_approved_note}}</td>
|
|
150
158
|
</tr>
|
|
151
159
|
</tbody>
|
|
152
160
|
</table>
|
|
@@ -280,6 +288,14 @@
|
|
|
280
288
|
this.imgshow2 = true
|
|
281
289
|
}
|
|
282
290
|
},
|
|
291
|
+
computed: {
|
|
292
|
+
inspectionResult() {
|
|
293
|
+
if (this.model.safecheckitem == null || this.model.safecheckitem.every(item => item.f_repaire_state === '已处理')) {
|
|
294
|
+
return '正常';
|
|
295
|
+
}
|
|
296
|
+
return '有隐患';
|
|
297
|
+
}
|
|
298
|
+
},
|
|
283
299
|
watch: {
|
|
284
300
|
'data' () {
|
|
285
301
|
if (this.data == null) {
|
|
@@ -129,11 +129,11 @@
|
|
|
129
129
|
<div class="col-sm-2 form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}" >
|
|
130
130
|
<label class=" font_normal_body">移入原因</label>
|
|
131
131
|
<v-select
|
|
132
|
-
:value.sync="model.
|
|
133
|
-
v-model="model.
|
|
132
|
+
:value.sync="model.f_comments"
|
|
133
|
+
v-model="model.f_comments"
|
|
134
134
|
:options="$parent.$parent.fcomments"
|
|
135
135
|
placeholder='请选择'
|
|
136
|
-
condition="
|
|
136
|
+
condition="f_comments = '{}'"
|
|
137
137
|
close-on-select
|
|
138
138
|
>
|
|
139
139
|
</v-select>
|
|
@@ -112,7 +112,19 @@
|
|
|
112
112
|
v-model="model.f_black_comments"
|
|
113
113
|
:options="$parent.$parent.fcomments"
|
|
114
114
|
placeholder='请选择'
|
|
115
|
-
condition="
|
|
115
|
+
condition="f_comments = '{}'"
|
|
116
|
+
close-on-select
|
|
117
|
+
>
|
|
118
|
+
</v-select>
|
|
119
|
+
</div>
|
|
120
|
+
<div class="col-sm-2 form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}" >
|
|
121
|
+
<label class=" font_normal_body">移出原因</label>
|
|
122
|
+
<v-select
|
|
123
|
+
:value.sync="model.f_black_comments1"
|
|
124
|
+
v-model="model.f_black_comments1"
|
|
125
|
+
:options="$parent.$parent.fcomments1"
|
|
126
|
+
placeholder='请选择'
|
|
127
|
+
condition="f_comments = '{}'"
|
|
116
128
|
close-on-select
|
|
117
129
|
>
|
|
118
130
|
</v-select>
|
|
@@ -243,6 +255,7 @@
|
|
|
243
255
|
data () {
|
|
244
256
|
return {
|
|
245
257
|
fcomments: this.$appdata.getParam('移入原因') ? [ ...this.$appdata.getParam('移入原因')] : [],
|
|
258
|
+
fcomments1: this.$appdata.getParam('移出原因') ? [ ...this.$appdata.getParam('移出原因')] : [],
|
|
246
259
|
KeyModel: {
|
|
247
260
|
f_opr_state: '移入',
|
|
248
261
|
f_comments: '',
|
|
@@ -1196,7 +1196,11 @@ export default {
|
|
|
1196
1196
|
'model.f_remanent_money' (val) {
|
|
1197
1197
|
console.log('观察补气金额', val)
|
|
1198
1198
|
if (!this.isGas) {
|
|
1199
|
-
|
|
1199
|
+
if (this.model.f_remanent_price) {
|
|
1200
|
+
this.model.f_remanent_gas = (val / this.model.f_remanent_price).toFixed(4)
|
|
1201
|
+
} else {
|
|
1202
|
+
this.model.f_remanent_gas = 0
|
|
1203
|
+
}
|
|
1200
1204
|
}
|
|
1201
1205
|
if (this.model.f_using_base_old) {
|
|
1202
1206
|
this.commitflag = true
|
|
@@ -232,8 +232,9 @@
|
|
|
232
232
|
</nobr>
|
|
233
233
|
</th>
|
|
234
234
|
<th>
|
|
235
|
-
<nobr
|
|
235
|
+
<nobr>表前阀状态</nobr>
|
|
236
236
|
</th>
|
|
237
|
+
|
|
237
238
|
<!--<th><nobr><data-order field="f_building" name="楼号"-->
|
|
238
239
|
<!--:order.sync="$parent.$parent.$parent.orderFields.f_building"></data-order></nobr>-->
|
|
239
240
|
<!--</th>-->
|
|
@@ -243,9 +244,7 @@
|
|
|
243
244
|
<!--<th><nobr><data-order field="f_room" name="房号"-->
|
|
244
245
|
<!--:order.sync="$parent.$parent.$parent.orderFields.f_room"></data-order></nobr>-->
|
|
245
246
|
<!--</th>-->
|
|
246
|
-
|
|
247
|
-
<nobr>上期结余</nobr>
|
|
248
|
-
</th>
|
|
247
|
+
|
|
249
248
|
<!-- <th>-->
|
|
250
249
|
<!-- <nobr>平均用气量</nobr>-->
|
|
251
250
|
<!-- </th>-->
|
|
@@ -279,6 +278,12 @@
|
|
|
279
278
|
<th>
|
|
280
279
|
<nobr>抄表结果状态</nobr>
|
|
281
280
|
</th>
|
|
281
|
+
<th>
|
|
282
|
+
<nobr>用户等级</nobr>
|
|
283
|
+
</th>
|
|
284
|
+
<th>
|
|
285
|
+
<nobr>上期结余</nobr>
|
|
286
|
+
</th>
|
|
282
287
|
<!-- <th>上次抄表日期</th>-->
|
|
283
288
|
<th>
|
|
284
289
|
<nobr>
|
|
@@ -327,9 +332,7 @@
|
|
|
327
332
|
<th>
|
|
328
333
|
<nobr>抄表员</nobr>
|
|
329
334
|
</th>
|
|
330
|
-
|
|
331
|
-
<nobr>表前阀状态</nobr>
|
|
332
|
-
</th>
|
|
335
|
+
|
|
333
336
|
<th>
|
|
334
337
|
<nobr>防盗卡号</nobr>
|
|
335
338
|
</th>
|
|
@@ -361,11 +364,12 @@
|
|
|
361
364
|
<td><nobr>{{row.f_userinfo_code}}</nobr></td>
|
|
362
365
|
<!-- <td>{{row.f_user_id}}</td>-->
|
|
363
366
|
<td> <nobr>{{row.f_user_name}} {{row.f_address}} </nobr></td>
|
|
364
|
-
<td><nobr>{{row.
|
|
367
|
+
<td><nobr>{{row.f_bqf_state}}</nobr></td>
|
|
368
|
+
|
|
365
369
|
<!--<td>{{row.f_building}}</td>-->
|
|
366
370
|
<!--<td>{{row.f_unit}}</td>-->
|
|
367
371
|
<!--<td>{{row.f_room}}</td>-->
|
|
368
|
-
|
|
372
|
+
|
|
369
373
|
<!-- <td style="text-align: center;">{{Math.round(row.avggas)}}</td>-->
|
|
370
374
|
<td><nobr>{{row.f_meternumber}}</nobr></td>
|
|
371
375
|
<td style="text-align: center;"><nobr>
|
|
@@ -390,6 +394,8 @@
|
|
|
390
394
|
<td style="text-align: center;"><nobr>{{row.f_oughtfee}}</nobr></td>
|
|
391
395
|
<td style="text-align: center;"><nobr>{{row.f_isarrears}}</nobr></td>
|
|
392
396
|
<td><nobr>{{row.f_result_state}}</nobr></td>
|
|
397
|
+
<td><nobr>{{row.f_user_level}}</nobr></td>
|
|
398
|
+
<td><nobr>{{row.f_userbalance}}</nobr></td>
|
|
393
399
|
<td><nobr>{{row.f_last_input_date}}</nobr></td>
|
|
394
400
|
<td><nobr>{{row.f_hand_date}}</nobr></td>
|
|
395
401
|
<td><nobr>{{row.f_input_date}}</nobr></td>
|
|
@@ -399,7 +405,6 @@
|
|
|
399
405
|
<td><nobr>{{row.f_meter_book_sort}} </nobr></td>
|
|
400
406
|
<td><nobr>{{row.f_adjustable_name}}</nobr></td>
|
|
401
407
|
<td><nobr>{{row.f_inputtor}}</nobr></td>
|
|
402
|
-
<td><nobr>{{row.f_bqf_state}}</nobr></td>
|
|
403
408
|
<td><nobr>{{row.f_defendcard}}</nobr></td>
|
|
404
409
|
|
|
405
410
|
|
package/src/main.js
CHANGED
|
@@ -2,7 +2,7 @@ import Vue from 'vue'
|
|
|
2
2
|
import all from 'vue-client/src/all'
|
|
3
3
|
import App from './App'
|
|
4
4
|
import system from 'system-clients/src/system'
|
|
5
|
-
import FilialeSale from './filiale/
|
|
5
|
+
import FilialeSale from './filiale/bayan/sale'
|
|
6
6
|
import sale from './sale'
|
|
7
7
|
import address from 'address-client/src/address'
|
|
8
8
|
import ldap from 'ldap-clients/src/ldap'
|