sale-client 4.3.75 → 4.3.77
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/9.3.0/checksums/checksums.lock +0 -0
- package/.gradle/9.3.0/fileChanges/last-build.bin +0 -0
- package/.gradle/9.3.0/fileHashes/fileHashes.lock +0 -0
- package/.gradle/9.3.0/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/build/dev-server.js +15 -9
- package/package.json +1 -1
- package/src/filiale/dexin/AsyncImg.vue +33 -0
- package/src/filiale/dexin/cardsHand.vue +5 -3
- package/src/filiale/dexin/sale.js +2 -1
- package/src/filiale/liaoyuan/ChangeMeter.vue +11 -5
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
File without changes
|
package/build/dev-server.js
CHANGED
|
@@ -50,20 +50,26 @@ var devConfig = {
|
|
|
50
50
|
'/rs/pay': {
|
|
51
51
|
target: 'http://localhost:8080'
|
|
52
52
|
},
|
|
53
|
-
'/api/af-revenue': {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
},
|
|
53
|
+
// '/api/af-revenue': {
|
|
54
|
+
// pathRewrite: {
|
|
55
|
+
// '/api/af-revenue': '/'
|
|
56
|
+
// },
|
|
57
|
+
// target: "http://localhost:9026"
|
|
58
|
+
// },
|
|
59
59
|
'/api': {
|
|
60
|
-
target:
|
|
60
|
+
target: localUrl,
|
|
61
|
+
secure: false,
|
|
62
|
+
changeOrigin: true,
|
|
61
63
|
},
|
|
62
64
|
'/resource': {
|
|
63
|
-
target:
|
|
65
|
+
target: localUrl,
|
|
66
|
+
secure: false,
|
|
67
|
+
changeOrigin: true
|
|
64
68
|
},
|
|
65
69
|
'/rs': {
|
|
66
|
-
target:
|
|
70
|
+
target: localUrl,
|
|
71
|
+
secure: false,
|
|
72
|
+
changeOrigin: true,
|
|
67
73
|
}
|
|
68
74
|
}
|
|
69
75
|
}
|
package/package.json
CHANGED
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<img-self :src="imageUrl" :width="width" :height="height" v-if="imageUrl"></img-self>
|
|
3
|
+
</template>
|
|
4
|
+
|
|
5
|
+
<script>
|
|
6
|
+
export default {
|
|
7
|
+
props: {
|
|
8
|
+
path: {
|
|
9
|
+
type: String,
|
|
10
|
+
required: true
|
|
11
|
+
},
|
|
12
|
+
width: [Number, String],
|
|
13
|
+
height: [Number, String]
|
|
14
|
+
},
|
|
15
|
+
data () {
|
|
16
|
+
return {
|
|
17
|
+
imageUrl: ''
|
|
18
|
+
}
|
|
19
|
+
},
|
|
20
|
+
ready () {
|
|
21
|
+
this.loadImage(this.path)
|
|
22
|
+
},
|
|
23
|
+
methods: {
|
|
24
|
+
loadImage (path) {
|
|
25
|
+
this.$resetpost('api/af-telephone/logic/getImageFileLogic', {
|
|
26
|
+
data: { filename: path }
|
|
27
|
+
},{newly: true}).then((res) => {
|
|
28
|
+
this.imageUrl = res.data.filepath
|
|
29
|
+
})
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
</script>
|
|
@@ -359,15 +359,15 @@
|
|
|
359
359
|
</td>
|
|
360
360
|
<td style="text-align:center">
|
|
361
361
|
<img-self :src="row.f_handplan_image" v-if="row.f_handplan_image" :width="100" :height="100"></img-self>
|
|
362
|
-
<img
|
|
362
|
+
<async-img :path="`${row.f_notified_path}`" v-if="row.f_notified_path" :width="100" :height="100"></async-img>
|
|
363
363
|
</td>
|
|
364
364
|
<td style="text-align:center">
|
|
365
365
|
<img-self :src="row.f_handplan_image" v-if="row.f_handplan_image" :width="100" :height="100"></img-self>
|
|
366
|
-
<img
|
|
366
|
+
<async-img :path="`${row.f_second_notified_path}`" v-if="row.f_second_notified_path" :width="100" :height="100"></async-img>
|
|
367
367
|
</td>
|
|
368
368
|
<td style="text-align:center">
|
|
369
369
|
<img-self :src="row.f_sign_path" v-if="row.f_sign_path.indexOf('http:') > -1" :width="100" :height="100"></img-self>
|
|
370
|
-
<img
|
|
370
|
+
<async-img :path="`${row.f_sign_path}`" v-else :width="100" :height="100"></async-img>
|
|
371
371
|
</td>
|
|
372
372
|
|
|
373
373
|
<td style="text-align: center;">{{ row.f_actualtablebase }}</td>
|
|
@@ -444,6 +444,7 @@ import Vue from 'vue'
|
|
|
444
444
|
import AppData from '../../stores/AppData'
|
|
445
445
|
import * as Util from '../../Util'
|
|
446
446
|
import co from 'co'
|
|
447
|
+
import AsyncImg from './AsyncImg.vue';
|
|
447
448
|
|
|
448
449
|
let loadParamGem = async function (self) {
|
|
449
450
|
await self.$LoadParams.loadParam(self.f_filialeid)
|
|
@@ -468,6 +469,7 @@ let modifyGen = function* (self, row, url) {
|
|
|
468
469
|
}
|
|
469
470
|
|
|
470
471
|
export default {
|
|
472
|
+
components: {AsyncImg},
|
|
471
473
|
title: '卡表抄表',
|
|
472
474
|
data () {
|
|
473
475
|
return {
|
|
@@ -10,7 +10,8 @@ export default function () {
|
|
|
10
10
|
Vue.component('no-card-meter-center', (resolve) => { require(['./NoCardMeterCenter.vue'], resolve) })
|
|
11
11
|
// 换表
|
|
12
12
|
Vue.component('change-meter', (resolve) => { require(['./ChangeMeter.vue'], resolve) })
|
|
13
|
-
|
|
13
|
+
// 换表
|
|
14
|
+
Vue.component('async-img', (resolve) => { require(['./AsyncImg.vue'], resolve) })
|
|
14
15
|
// 无卡收费
|
|
15
16
|
Vue.component('sale-userinfo', (resolve) => { require(['./Userinfo.vue'], resolve) })
|
|
16
17
|
// 待处理报警/已处理报警
|
|
@@ -370,12 +370,18 @@ export default {
|
|
|
370
370
|
}
|
|
371
371
|
},
|
|
372
372
|
async confirm (type) {
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
373
|
+
const today = new Date().toISOString().slice(0, 10); // 获取 YYYY-MM-DD
|
|
374
|
+
|
|
375
|
+
const validFiles = (this.$refs.uploadfile.fileInfoData || []).filter(f => {
|
|
376
|
+
const uploadDate = f.f_uploaddate?f.f_uploaddate.slice(0, 10):null
|
|
377
|
+
const isBusinessInvalid = !f.f_businessid || f.f_businessid === 'undefined';
|
|
378
|
+
return uploadDate === today && isBusinessInvalid;
|
|
379
|
+
});
|
|
380
|
+
|
|
381
|
+
if (validFiles.length >= 2) {
|
|
382
|
+
console.log('有效文件', validFiles);
|
|
376
383
|
} else {
|
|
377
|
-
|
|
378
|
-
return
|
|
384
|
+
return this.$showMessage(`换表请上传新旧表图片`)
|
|
379
385
|
}
|
|
380
386
|
let msg = ''
|
|
381
387
|
if (this.row.f_meter_type.includes('机表') || this.row.f_meter_type.includes('物联网表')) {
|