|
@@ -31,6 +31,7 @@ export default {
|
|
|
return {
|
|
|
visible: false,
|
|
|
loading:false,
|
|
|
+ tabLoading:false,
|
|
|
columns: NewColumns,
|
|
|
rules: initRules(NewColumns),
|
|
|
count:0,
|
|
@@ -533,6 +534,7 @@ export default {
|
|
|
let {code,data} = await orderApi.orderImport(formData);
|
|
|
|
|
|
if(code == 200) {
|
|
|
+ this.tabLoading = true;
|
|
|
// puOrderExecuteList puOrderItemList
|
|
|
|
|
|
let size = 20;
|
|
@@ -543,11 +545,19 @@ export default {
|
|
|
|
|
|
let intervalPush = setInterval(()=>{
|
|
|
|
|
|
- if(num > total) clearInterval(intervalPush);
|
|
|
+ if(num > total){
|
|
|
+
|
|
|
+ clearInterval(intervalPush);
|
|
|
+
|
|
|
+ this.tabLoading = false;
|
|
|
+
|
|
|
+ this.handleGetPrice();
|
|
|
+ }
|
|
|
|
|
|
for (const key in resultData) {
|
|
|
|
|
|
resultData[key].slice(size*(num-1), (size*num) ).forEach(item =>{
|
|
|
+
|
|
|
|
|
|
this.params[key].push(item);
|
|
|
|
|
@@ -559,13 +569,19 @@ export default {
|
|
|
|
|
|
},200);
|
|
|
|
|
|
+ // for (const key in data) {
|
|
|
+
|
|
|
+ // this.params[key].push(...data[key]);
|
|
|
+
|
|
|
+ // }
|
|
|
+
|
|
|
|
|
|
let {setVisible} = this.$refs.batchImport;
|
|
|
|
|
|
setVisible(false);
|
|
|
|
|
|
+
|
|
|
|
|
|
- if(num > total) this.handleGetPrice();
|
|
|
}
|
|
|
|
|
|
} catch (error) {
|
|
@@ -770,7 +786,7 @@ export default {
|
|
|
}"
|
|
|
style="margin: 10px"
|
|
|
>
|
|
|
- <el-tabs v-model="tabName" style="width: 100%">
|
|
|
+ <el-tabs v-model="tabName" style="width: 100%" v-loading="tabLoading">
|
|
|
<el-tab-pane
|
|
|
v-for="(column, index) in tabColumns"
|
|
|
:key="index"
|