|
|
@@ -410,7 +410,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
|
|
|
function createZaoJHZB(Bid, ZaoJHZB) {
|
|
|
const map_ZC_LB = [
|
|
|
- {reg: /(100章至第700章)|(100章?至700章?)/, zc: '', lb: '1'},
|
|
|
+ {reg: /(第?100章?至第?700章?)/, zc: '', lb: '1'},
|
|
|
{reg: /已包含在清单合计中的材料/, zc: '', lb: '2'},
|
|
|
{reg: /清单合计减去材料/, zc: '', lb: '3'},
|
|
|
{reg: /计日工合计/, zc: '', lb: '4'},
|
|
|
@@ -428,7 +428,8 @@ INTERFACE_EXPORT = (() => {
|
|
|
function getZCLB(name, kind){
|
|
|
let rst = '';
|
|
|
for (let i = 0; i < map_ZC_LB.length; i++){
|
|
|
- if (map_ZC_LB[i].reg.test(name)){
|
|
|
+ const trimName = (name || '').replace(/\s/g, '');
|
|
|
+ if (map_ZC_LB[i].reg.test(trimName)){
|
|
|
if (kind == 1)
|
|
|
rst = map_ZC_LB[i].zc
|
|
|
else if (kind == 2)
|
