sale-client 4.0.152 → 4.0.153
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/build/dev-server.js +8 -14
- package/package.json +1 -1
- package/src/filiale/yuncheng/FilesManageNew/MeterinfoTest.vue +3 -3
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
File without changes
|
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, localUrl ] = ['http://192.168.50.5:8765/', 'http://
|
|
4
|
+
const [ serverRul, localUrl ] = ['http://192.168.50.5:8765/', 'http://192.168.50.5:8765/']
|
|
5
5
|
var merge = require('webpack-merge')
|
|
6
6
|
var baseConfig = require('./webpack.dev.conf')
|
|
7
7
|
var devConfig = {
|
|
@@ -19,16 +19,10 @@ var devConfig = {
|
|
|
19
19
|
children: false // 不输出子模块构建信息
|
|
20
20
|
},
|
|
21
21
|
proxy: {
|
|
22
|
-
'/api/af-revenue/batchdeduction/all': {
|
|
23
|
-
pathRewrite: {
|
|
24
|
-
'/api/af-revenue/batchdeduction/all': '/batchdeduction/all'
|
|
25
|
-
},
|
|
26
|
-
target: localUrl
|
|
27
|
-
},
|
|
28
22
|
'/api/af-revenue/logic': {
|
|
29
|
-
pathRewrite: {
|
|
30
|
-
|
|
31
|
-
},
|
|
23
|
+
// pathRewrite: {
|
|
24
|
+
// '/api/af-revenue/logic': '/logic'
|
|
25
|
+
// },
|
|
32
26
|
target: localUrl
|
|
33
27
|
},
|
|
34
28
|
'/api/af-revenue/file': {
|
|
@@ -37,14 +31,14 @@ var devConfig = {
|
|
|
37
31
|
// },
|
|
38
32
|
target: localUrl
|
|
39
33
|
},
|
|
40
|
-
'/weixin2/rs':{
|
|
34
|
+
'/weixin2/rs': {
|
|
41
35
|
|
|
42
36
|
target: 'http://410663id1ia4.vicp.fun'
|
|
43
37
|
},
|
|
44
38
|
'/api/af-revenue/sql': {
|
|
45
|
-
pathRewrite: {
|
|
46
|
-
|
|
47
|
-
},
|
|
39
|
+
// pathRewrite: {
|
|
40
|
+
// '/api/af-revenue/sql': '/sql'
|
|
41
|
+
// },
|
|
48
42
|
target: localUrl
|
|
49
43
|
},
|
|
50
44
|
'/api': {
|
package/package.json
CHANGED
|
@@ -196,7 +196,7 @@
|
|
|
196
196
|
</div>
|
|
197
197
|
<div class="col-sm-4 form-group" :class="[$m.f_install_person.required ? 'has-error' : '']"
|
|
198
198
|
v-show="(formconfig && formconfig.f_install_person && formconfig.f_install_person.required) || !onlyshowmust"
|
|
199
|
-
v-if="getConfigShowItem('f_install_person')">
|
|
199
|
+
v-if="getConfigShowItem('f_install_person',false)">
|
|
200
200
|
<label for="f_install_person" class="font_normal_body" style="width: auto;letter-spacing: 0.5em;margin-right: -0.5em;margin-left: -0.5em"> {{getConfigLabelName('f_install_person','安装人')}}</label>
|
|
201
201
|
<input type="text" v-model="row.f_install_person" v-show="false"
|
|
202
202
|
v-validate:f_install_person=getConfigValidate("f_install_person",false)>
|
|
@@ -286,7 +286,7 @@
|
|
|
286
286
|
:show-reset-button="true">
|
|
287
287
|
</datepicker>
|
|
288
288
|
</div>
|
|
289
|
-
<div class="col-sm-4 form-group" v-show="row.f_meter_classify
|
|
289
|
+
<div class="col-sm-4 form-group" v-show="row.f_meter_classify === '物联网表' && (formconfig)" v-if="getConfigShowItem('f_valve_state', true)">
|
|
290
290
|
<label for="gasmodel" class="font_normal_body"> 阀门状态</label>
|
|
291
291
|
<v-select :value.sync="row.f_valve_state" :options='valvestate' placeholder='阀门状态' close-on-select
|
|
292
292
|
v-model='row.f_valve_state'></v-select>
|
|
@@ -517,7 +517,7 @@ export default {
|
|
|
517
517
|
}
|
|
518
518
|
return {}
|
|
519
519
|
},
|
|
520
|
-
getConfigShowItem (name,defaultVal = true) {
|
|
520
|
+
getConfigShowItem (name, defaultVal = true) {
|
|
521
521
|
if (this.formconfig && this.formconfig[name] && this.formconfig[name].hasOwnProperty('showItem')) {
|
|
522
522
|
return this.formconfig[name].showItem
|
|
523
523
|
} else {
|