|
|
@@ -450,7 +450,7 @@ module.exports = app => {
|
|
|
cb.value = sum.qc_tp;
|
|
|
break;
|
|
|
case 'ybbqwc':
|
|
|
- const sumGcl = await this.ctx.service.stageBills.getSumTotalPriceGcl(stage, '^[\\D]*1[0-9]{2}-');
|
|
|
+ const sumGcl = await this.ctx.service.stageBills.getSumTotalPriceGcl(stage, '^[^0-9]*1[0-9]{2}-');
|
|
|
cb.value = this.ctx.helper.add(sumGcl.contract_tp, sumGcl.qc_tp);
|
|
|
break;
|
|
|
default:
|
|
|
@@ -572,7 +572,7 @@ module.exports = app => {
|
|
|
cb.value = sum.qc_tp;
|
|
|
break;
|
|
|
case 'ybbqwc':
|
|
|
- const sumGcl = await this.ctx.service.stageBills.getSumTotalPriceGclByMaterial(stage_list, '^[\\D]*1[0-9]{2}-');
|
|
|
+ const sumGcl = await this.ctx.service.stageBills.getSumTotalPriceGclByMaterial(stage_list, '^[^0-9]*1[0-9]{2}-');
|
|
|
cb.value = this.ctx.helper.add(sumGcl.contract_tp, sumGcl.qc_tp);
|
|
|
break;
|
|
|
default:
|
