Commit 90552ef1 by lichengming

修改了开土制备标签信息

parent 3f50a436
...@@ -558,6 +558,30 @@ export default { ...@@ -558,6 +558,30 @@ export default {
undefined !== row.sampleCode ? row.sampleCode : '' undefined !== row.sampleCode ? row.sampleCode : ''
) )
result = result.replace( result = result.replace(
/\$sampleDepth\$/g,
undefined !== row.sampleDepth ? row.sampleDepth : ''
)
result = result.replace(
/\$siteNo\$/g,
undefined !== row.siteNo ? row.siteNo : ''
)
result = result.replace(
/\$boreholeName\$/g,
undefined !== row.boreholeName ? row.boreholeName : ''
)
result = result.replace(
/\$itemNames\$/g,
undefined !== row.itemNames ? row.itemNames : ''
)
result = result.replace(
/\$itemNamesShort\$/g,
undefined !== row.itemNamesShort ? row.itemNamesShort : ''
)
result = result.replace(
/\$samplePack\$/g,
undefined !== row.samplePack ? row.samplePack : ''
)
result = result.replace(
/\$groupId\$/g, /\$groupId\$/g,
undefined !== row.groupId ? row.groupId : '' undefined !== row.groupId ? row.groupId : ''
) )
......
...@@ -84,7 +84,7 @@ export default { ...@@ -84,7 +84,7 @@ export default {
testerId: '', testerId: '',
pageColumns: [ pageColumns: [
{ title: '钻孔位置', key: 'boreholeLocation', width: 110 }, { title: '钻孔位置', key: 'boreholeLocation', width: 110 },
{ title: '样品数量', key: 'endTotal', width: 110 } { title: '样品数量', key: 'num', width: 110 }
], ],
groupData: [], groupData: [],
getPage: {}, getPage: {},
......
...@@ -90,8 +90,8 @@ export default { ...@@ -90,8 +90,8 @@ export default {
pageColumns: [ pageColumns: [
{ title: '工程类型', key: 'projectType', detail: true, width: 140 }, { title: '工程类型', key: 'projectType', detail: true, width: 140 },
{ title: '工程名称', key: 'projectName', width: 100 }, { title: '工程名称', key: 'projectName', width: 100 },
{ title: '检测项目', key: 'item', width: 110 }, { title: '检测项目', key: 'itemNames', width: 110 },
{ title: '数量', key: 'count', width: 110 } { title: '数量', key: 'num', width: 110 }
], ],
groupData: [], groupData: [],
getPage: {}, getPage: {},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment