|
@@ -612,18 +612,14 @@ export default {
|
|
|
let { code, data } = await orderApi.getPrice({ ...this.params,action: 'insert' });
|
|
|
|
|
|
if (code == 200) {
|
|
|
-
|
|
|
- this.params = {
|
|
|
- ...this.params,
|
|
|
- ...data
|
|
|
- };
|
|
|
-
|
|
|
+ // console.log(data,'data*----------******');
|
|
|
+
|
|
|
+ this.params = {...data};
|
|
|
+ // console.log(this.params,'this.params----------------------');
|
|
|
}
|
|
|
|
|
|
} catch (error) {}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
},
|
|
|
|
|
|
async handelImport(fileList){
|
|
@@ -727,7 +723,6 @@ export default {
|
|
|
// const = param;
|
|
|
const sums = [];
|
|
|
let { tabColumns, tabName } = this;
|
|
|
- console.log(columns,'columns-----------------------');
|
|
|
|
|
|
columns.forEach((column, index) => {
|
|
|
|
|
@@ -736,14 +731,10 @@ export default {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- // console.log(column,'column---------------------------');
|
|
|
-
|
|
|
const values = data.map(item => Number(item[column.property]));
|
|
|
|
|
|
let sumColumn = tabColumns.find(tab => tab.key === tabName).tableColumns.filter(({key,isSummary}) => {
|
|
|
|
|
|
- // console.log(key,'key',isSummary,'isSummary',column.property);
|
|
|
- // console.log(isSummary && key === column.property);
|
|
|
if(isSummary && key === column.property){
|
|
|
|
|
|
return {key,isSummary}
|
|
@@ -759,7 +750,7 @@ export default {
|
|
|
return '';
|
|
|
}
|
|
|
}, 0);
|
|
|
- sums[index];
|
|
|
+ sums[index] = sums[index] && sums[index].toFixed(2); // 保留2位小数,解决小数合计列
|
|
|
}
|
|
|
});
|
|
|
return sums;
|
|
@@ -1138,6 +1129,7 @@ export default {
|
|
|
ref="batchImport"
|
|
|
@import="handelImport"
|
|
|
@temDownload="handleTemDownload"
|
|
|
+ :fileSize="2"
|
|
|
></BatchImport>
|
|
|
</el-row>
|
|
|
</el-card>
|