sale-client 4.3.76 → 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/build/dev-server.js +4 -4
- package/package.json +1 -1
- package/src/filiale/liaoyuan/ChangeMeter.vue +11 -5
- package/src/main.js +1 -1
package/build/dev-server.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
var path = require('path')
|
|
2
2
|
var checkVersion = require('./versionCheck.js')
|
|
3
3
|
checkVersion()
|
|
4
|
-
const [ serverRul,
|
|
4
|
+
const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
|
|
5
5
|
var merge = require('webpack-merge')
|
|
6
6
|
var baseConfig = require('./webpack.dev.conf')
|
|
7
7
|
var devConfig = {
|
|
@@ -57,17 +57,17 @@ var devConfig = {
|
|
|
57
57
|
// target: "http://localhost:9026"
|
|
58
58
|
// },
|
|
59
59
|
'/api': {
|
|
60
|
-
target:
|
|
60
|
+
target: localUrl,
|
|
61
61
|
secure: false,
|
|
62
62
|
changeOrigin: true,
|
|
63
63
|
},
|
|
64
64
|
'/resource': {
|
|
65
|
-
target:
|
|
65
|
+
target: localUrl,
|
|
66
66
|
secure: false,
|
|
67
67
|
changeOrigin: true
|
|
68
68
|
},
|
|
69
69
|
'/rs': {
|
|
70
|
-
target:
|
|
70
|
+
target: localUrl,
|
|
71
71
|
secure: false,
|
|
72
72
|
changeOrigin: true,
|
|
73
73
|
}
|
package/package.json
CHANGED
|
@@ -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('物联网表')) {
|
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/liaoyuan/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'
|