manage-client 4.1.130 → 4.1.132
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/7.4/checksums/checksums.lock +0 -0
- package/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock +0 -0
- package/.gradle/7.4/dependencies-accessors/gc.properties +0 -0
- package/.gradle/7.4/executionHistory/executionHistory.lock +0 -0
- package/.gradle/7.4/fileChanges/last-build.bin +0 -0
- package/.gradle/7.4/fileHashes/fileHashes.lock +0 -0
- package/.gradle/7.4/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/sale/filesquery/RecordInfoQuery.vue +1 -1
- package/src/filiale/hantou/RecordInfoQuery.vue +3 -6
- package/src/filiale/liaoyuan/HandplanRatioQuery.vue +1 -1
- package/src/filiale/liaoyuan/WebHandplanRatioQuery.vue +1 -1
- package/src/filiale/tongchuan/RecordInfoQuery.vue +1 -1
- package/src/filiale/xinjiangdexin/RecordInfoQuery.vue +1 -1
- package/src/filiale/jinbin/exportConfig.js +0 -1110
- package/src/filiale/jinbin/sale/businessquery/ChargeQuery.vue +0 -1372
- package/src/filiale/jinbin/sale.js +0 -7
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
File without changes
|
package/package.json
CHANGED
|
@@ -1197,7 +1197,7 @@
|
|
|
1197
1197
|
},
|
|
1198
1198
|
userTypeChange () {
|
|
1199
1199
|
this.gasproperties=[]
|
|
1200
|
-
if(this.$refs.paged.$refs.cri.model.f_user_type !== null) {
|
|
1200
|
+
if(this.$refs.paged.$refs.cri.model !== null && this.$refs.paged.$refs.cri.model.f_user_type !== null && this.$refs.paged.$refs.cri.model.f_user_type !== undefined) {
|
|
1201
1201
|
this.$refs.paged.$refs.cri.model.f_gasproperties=''
|
|
1202
1202
|
this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
|
|
1203
1203
|
// this.gasproperties.push({label: '全部', value: ''})
|
|
@@ -1224,12 +1224,9 @@ export default {
|
|
|
1224
1224
|
},
|
|
1225
1225
|
userTypeChange () {
|
|
1226
1226
|
this.gasproperties=[]
|
|
1227
|
-
if
|
|
1228
|
-
|
|
1229
|
-
|
|
1230
|
-
this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
|
|
1231
|
-
// this.gasproperties.push({label: '全部', value: ''})
|
|
1232
|
-
}
|
|
1227
|
+
if(this.$refs.paged.$refs.cri.model !== null && this.$refs.paged.$refs.cri.model.f_user_type !== null && this.$refs.paged.$refs.cri.model.f_user_type !== undefined) {
|
|
1228
|
+
this.$refs.paged.$refs.cri.model.f_gasproperties=''
|
|
1229
|
+
this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
|
|
1233
1230
|
}
|
|
1234
1231
|
else{
|
|
1235
1232
|
this.gasproperties = [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
|
|
@@ -433,7 +433,7 @@
|
|
|
433
433
|
}
|
|
434
434
|
let ratio1 = this.ratio-0
|
|
435
435
|
let ratio2 = 0-this.ratio
|
|
436
|
-
let condition = `${args.condition} ` + this.orgCondtionStr + ` and amount_ratio>=${ratio1}
|
|
436
|
+
let condition = `${args.condition} ` + this.orgCondtionStr + ` and (amount_ratio>=${ratio1} or amount_ratio<=${ratio2})`
|
|
437
437
|
this.model.search(condition, args.model)
|
|
438
438
|
},
|
|
439
439
|
clear() {
|
|
@@ -444,7 +444,7 @@ export default {
|
|
|
444
444
|
}
|
|
445
445
|
let ratio1 = this.ratio-0
|
|
446
446
|
let ratio2 = 0-this.ratio
|
|
447
|
-
let condition = `${args.condition} ` + this.orgCondtionStr + ` and amount_ratio>=${ratio1}
|
|
447
|
+
let condition = `${args.condition} ` + this.orgCondtionStr + ` and ( amount_ratio>=${ratio1} or amount_ratio<=${ratio2})`
|
|
448
448
|
this.model.search(condition, args.model)
|
|
449
449
|
},
|
|
450
450
|
clear () {
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
<div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
|
|
9
9
|
<div class="row">
|
|
10
10
|
<div class="col-sm-2 form-group" >
|
|
11
|
-
<label class="font_normal_body"
|
|
11
|
+
<label class="font_normal_body">客户编号</label>
|
|
12
12
|
<input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
|
|
13
13
|
condition="f_userinfo_code = '{}' " placeholder="客户编号">
|
|
14
14
|
</div>
|
|
@@ -1221,7 +1221,7 @@
|
|
|
1221
1221
|
},
|
|
1222
1222
|
userTypeChange () {
|
|
1223
1223
|
this.gasproperties=[]
|
|
1224
|
-
if(this.$refs.paged.$refs.cri.model !== null) {
|
|
1224
|
+
if(this.$refs.paged.$refs.cri.model !== null && this.$refs.paged.$refs.cri.model.f_user_type !== null && this.$refs.paged.$refs.cri.model.f_user_type !== undefined) {
|
|
1225
1225
|
this.$refs.paged.$refs.cri.model.f_gasproperties=''
|
|
1226
1226
|
this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0] || '')
|
|
1227
1227
|
// this.gasproperties.push({label: '全部', value: ''})
|