|
@@ -254,6 +254,12 @@ class ControlPrice extends TreeService {
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
+ clearParentingData(data) {
|
|
|
+ data.unit_price = 0;
|
|
|
+ data.quantity = 0;
|
|
|
+ data.total_price = 0;
|
|
|
+ }
|
|
|
+
|
|
|
_filterUpdateInvalidField(id, data) {
|
|
|
const result = { id };
|
|
|
for (const prop in data) {
|
|
@@ -418,12 +424,12 @@ class ControlPrice extends TreeService {
|
|
|
return { create: pasteBillsData, update: updateData };
|
|
|
}
|
|
|
|
|
|
- async importExcel(templateId, excelData, needGcl, filter) {
|
|
|
+ async importExcel(templateId, excelData, filter) {
|
|
|
const AnalysisExcel = require('../lib/analysis_excel').AnalysisExcelTree;
|
|
|
- const analysisExcel = new AnalysisExcel(this.ctx, this.setting, needGcl ? ['code', 'b_code'] : ['code']);
|
|
|
+ const analysisExcel = new AnalysisExcel(this.ctx, this.setting, ['code', 'b_code']);
|
|
|
const tempData = await this.ctx.service.tenderNodeTemplate.getData(templateId, true);
|
|
|
const cacheTree = analysisExcel.analysisData(excelData, tempData, {
|
|
|
- filterZeroGcl: filter, filterPos: true, filterGcl: !needGcl, filterCalc: true,
|
|
|
+ filterZeroGcl: filter, filterPos: true, filterGcl: false, filterCalc: true,
|
|
|
});
|
|
|
const orgMaxId = await this._getMaxLid(this.ctx.tender.id);
|
|
|
const conn = await this.db.beginTransaction();
|