sale-client 3.6.400 → 3.6.401

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.400",
3
+ "version": "3.6.401",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -91,7 +91,7 @@
91
91
  <div class="form-group col-sm-2">
92
92
  <label class="font_normal_body">收款人&nbsp;&nbsp;</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: this.$refs.paged.$refs.cri.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 = {}
File without changes
File without changes
File without changes
@@ -1,2 +0,0 @@
1
- #Thu Oct 10 18:29:49 CST 2024
2
- gradle.version=5.2.1
File without changes