Commit 916c5f93 by 夏超

[fix] 修改问题

parent 5adf5f62
......@@ -191,8 +191,9 @@
:min="0" :precision="2"></el-input-number>
</div>
<!-- 搜索按钮 -->
<!-- :disabled="!startedFlag"-->
<el-button type="primary" @click="searchFilter" class="searchBtn"
:disabled="!startedFlag">搜索
>搜索
</el-button>
</el-collapse-item>
......@@ -1383,7 +1384,7 @@
},
//自定义筛选下拉加载
zdy_loadMore(val, item) {
// console.log(val,item);
console.log(val,item);
item.chanpinpageNum += 1;
if (item.zdy_datations !== '到底啦') {
this.zdy_filter(item.chanpinpageNum, item)
......@@ -2989,12 +2990,12 @@ sta = {
});
},
zdy_filter(num, val) {
// console.log(num,val);
console.log(num,val);
//滚动加载
let that = this;
if (!that.checkFlag) {
that.record_filter_data.map((item, index) => {
if (item.ttype === 'many2one' || item.ttype === 'many2many' || item.ttype === 'one2many') {
// that.record_filter_data.map((item, index) => {
// if (item.ttype === 'many2one' || item.ttype === 'many2many' || item.ttype === 'one2many') {
// console.log(item);
axios.request({
url: "/roke/get_general_base_data",
......@@ -3003,19 +3004,22 @@ sta = {
'Content-Type': 'application/json'
},
data: {
"ttype": item.ttype,
"ttype": val.ttype,
"page_no": num,
"page_size": 20,
"model_index": item.relation,
"model_index": val.relation,
"domain_data": '',
"selection_mode": ''
}
}).then((res) => {
// console.log(res);
if (res.data.result.state === 'success') {
if (item.record_list && res.data.result.record_list != []) {
item.record_list = [...item.record_list, ...res.data.result.record_list];
// if (item.record_list && res.data.result.record_list != []) {
// item.record_list = [...item.record_list, ...res.data.result.record_list];
// }
if (val.select_vals && res.data.result.record_list != []) {
val.select_vals = [...val.select_vals, ...res.data.result.record_list];
}
// console.log(item);
if (num === res.data.result.total_page) {
val.zdy_datations = '到底啦';
......@@ -3032,8 +3036,8 @@ sta = {
});
}
});
}
});
// }
// });
} else {
that.jl_record_filter_data.map((item, index) => {
if (item.ttype === 'many2one' || item.ttype === 'many2many' || item.ttype === 'one2many') {
......@@ -3058,6 +3062,9 @@ sta = {
if (item.record_list && res.data.result.record_list != []) {
item.record_list = [...item.record_list, ...res.data.result.record_list];
}
if (val.select_vals && res.data.result.record_list != []) {
val.select_vals = [...val.select_vals, ...res.data.result.record_list];
}
// console.log(item);
if (num === res.data.result.total_page) {
val.zdy_datations = '到底啦';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment