diff --git a/components/searchSelect/index.js b/components/searchSelect/index.js index 65f64df..c30dd46 100644 --- a/components/searchSelect/index.js +++ b/components/searchSelect/index.js @@ -156,8 +156,9 @@ Component({ alertInfo(message) return } + console.log("parks", parks) this.setData({ - columns: parks?.map(item => item?.name), + columns: parks?.map(item => `${item.transformerId}-倍率:${item.ratio}-${item.manufacturer}`), list: parks, }) }, diff --git a/components/searchSelectWrapper/index.wxml b/components/searchSelectWrapper/index.wxml index 94888c1..cfcece7 100644 --- a/components/searchSelectWrapper/index.wxml +++ b/components/searchSelectWrapper/index.wxml @@ -8,7 +8,7 @@ - {{ label }} + *{{ label }} 搜索 - {{ label }} + *{{ label }} - {{ label }} + *{{ label }} diff --git a/pages/workBenchNew/components/installMeter/index.js b/pages/workBenchNew/components/installMeter/index.js index 48fc9e5..8118ae9 100644 --- a/pages/workBenchNew/components/installMeter/index.js +++ b/pages/workBenchNew/components/installMeter/index.js @@ -237,19 +237,19 @@ Page({ if (collection === "A") { newData = { collectionA: data.id, - collectionAName: data.name, + collectionAName: `${item.transformerId}-倍率:${item.ratio}-${item.manufacturer}`, } } if (collection === "B") { newData = { collectionB: data.id, - collectionBName: data.name, + collectionBName: `${item.transformerId}-倍率:${item.ratio}-${item.manufacturer}`, } } if (collection === "C") { newData = { collectionC: data.id, - collectionCName: data.name, + collectionCName: `${item.transformerId}-倍率:${item.ratio}-${item.manufacturer}`, } } this.setData(newData); @@ -323,7 +323,7 @@ Page({ ratio, area, card, collectionA, collectionB, collectionC, tenement, sharp, peak, flat, valley, overall, url } = this.data; - if (!park || !meter || !address) { + if (!park || !meter || !address || !meterType) { alertInfo("请填写必填项后保存") return; }