sale-client 3.6.231 → 3.6.232
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
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
<div class="form-group col-sm-3">
|
|
18
18
|
<label class="font_normal_body">客户名称</label>
|
|
19
19
|
<input type="text" class="input_search" style="width:60%" v-model="model.f_user_name" placeholder='客户名称'
|
|
20
|
-
@keyup.enter="$parent.$parent.clean()" >
|
|
20
|
+
@keyup.enter="$parent.$parent.clean()" condition="f_user_name like '%{}%'">
|
|
21
21
|
</div>
|
|
22
22
|
<!--<div class="row" >-->
|
|
23
23
|
<div v-show="$parent.$parent.criteriaShow">
|
|
@@ -597,7 +597,7 @@
|
|
|
597
597
|
curorgid: [this.$login.f.orgid],
|
|
598
598
|
f_orgid: '',
|
|
599
599
|
showCardError2: false,
|
|
600
|
-
model: new PagedList('rs/sql/sale_getUser', 30, {
|
|
600
|
+
model: new PagedList('rs/sql/sale_getUser', 30, { orderitem: '"' + this.orderitem + ' DESC"'}),
|
|
601
601
|
isPager: true,
|
|
602
602
|
rows: null,
|
|
603
603
|
cardInfo: '',
|
|
@@ -750,6 +750,11 @@
|
|
|
750
750
|
if (this.f_orgid) {
|
|
751
751
|
args.condition = `u.f_filialeid in ${this.f_orgid} and ${args.condition}`
|
|
752
752
|
}
|
|
753
|
+
if (this.$refs.paged.$refs.cri.model.f_user_name && this.$refs.paged.$refs.cri.model.f_user_name.length > 0) {
|
|
754
|
+
this.model.params.f_user_name = this.$refs.paged.$refs.cri.model.f_user_name
|
|
755
|
+
} else {
|
|
756
|
+
this.model.params.f_user_name = ''
|
|
757
|
+
}
|
|
753
758
|
this.excelCondition = args.condition
|
|
754
759
|
args.condition = `${args.condition}`
|
|
755
760
|
if (this.defbtn === '发卡售气') {
|