sale-client 3.6.400 → 3.6.402
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/fileHashes/fileHashes.lock +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +1 -1
- package/package.json +1 -1
- package/src/components/revenue/comprehen/Bill/EticketV4/EticketRecordList.vue +2 -2
- package/src/filiale/meihekou/MessageList.vue +1 -1
- package/src/filiale/tongchuan/plugins/FileManageService.js +1 -1
- package/.gradle/8.5/checksums/checksums.lock +0 -0
- package/.gradle/8.5/dependencies-accessors/dependencies-accessors.lock +0 -0
- package/.gradle/8.5/dependencies-accessors/gc.properties +0 -0
- package/.gradle/8.5/executionHistory/executionHistory.bin +0 -0
- package/.gradle/8.5/executionHistory/executionHistory.lock +0 -0
- package/.gradle/8.5/fileChanges/last-build.bin +0 -0
- package/.gradle/8.5/fileHashes/fileHashes.bin +0 -0
- package/.gradle/8.5/fileHashes/fileHashes.lock +0 -0
- package/.gradle/8.5/gc.properties +0 -0
|
Binary file
|
|
Binary file
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
#
|
|
1
|
+
#Fri Oct 18 14:34:07 CST 2024
|
|
2
2
|
gradle.version=5.2.1
|
package/package.json
CHANGED
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
<div class="form-group col-sm-2">
|
|
92
92
|
<label class="font_normal_body">收款人 </label>
|
|
93
93
|
<input type="text" class="form-control" v-model="model.sell_operator" style="width:60%"
|
|
94
|
-
condition="sell_operator = '{}'" placeholder="收款人"
|
|
94
|
+
condition="(s.sell_operator = '{}' or other.sell_operator = '{}') " placeholder="收款人"
|
|
95
95
|
>
|
|
96
96
|
</div>
|
|
97
97
|
<div class="col-sm-2 form-group">
|
|
@@ -99,7 +99,7 @@
|
|
|
99
99
|
<v-select :value.sync="model.f_user_type"
|
|
100
100
|
:options='$parent.$parent.usertypes'
|
|
101
101
|
placeholder='请选择' v-model="model.f_user_type"
|
|
102
|
-
condition="f_user_type = '{}'"
|
|
102
|
+
condition="(s.f_user_type = '{}' or uf.f_user_type = '{}') "
|
|
103
103
|
close-on-select></v-select>
|
|
104
104
|
</div>
|
|
105
105
|
</div>
|
|
@@ -316,7 +316,7 @@ export default {
|
|
|
316
316
|
},
|
|
317
317
|
computed: {
|
|
318
318
|
getCondition () {
|
|
319
|
-
return {condition
|
|
319
|
+
return {condition:`f_orgid in ${this.f_orgid} and ${this.$refs.paged.$refs.cri.condition}`}
|
|
320
320
|
},
|
|
321
321
|
getfield () {
|
|
322
322
|
let data = {}
|
|
@@ -190,7 +190,7 @@ let FileManageService = {
|
|
|
190
190
|
}
|
|
191
191
|
|
|
192
192
|
meter.f_gasproperties = meter.f_gasproperties.length > 0 ? meter.f_gasproperties[0] : ''
|
|
193
|
-
meter.f_gasproperties_second = meter.f_gasproperties_second.length > 0 ? meter.f_gasproperties_second[0] : ''
|
|
193
|
+
meter.f_gasproperties_second = meter.f_gasproperties_second && meter.f_gasproperties_second.length > 0 ? meter.f_gasproperties_second[0] : ''
|
|
194
194
|
meter.f_adjustable_id = meter.f_adjustable.length > 0 ? meter.f_adjustable[0].id : null
|
|
195
195
|
meter.f_userfiles_address = meter.f_userfiles_address.length > 0 ? meter.f_userfiles_address[0] : null
|
|
196
196
|
if (!meter.f_userfiles_id) {
|
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
File without changes
|