diff --git a/components/searchSelect/index.js b/components/searchSelect/index.js index b27bdb6..1e86c61 100644 --- a/components/searchSelect/index.js +++ b/components/searchSelect/index.js @@ -19,6 +19,7 @@ Component({ type: String, show: Boolean, park: String, + building: String, isBack: Boolean, filterBind: Boolean, }, @@ -248,8 +249,8 @@ Component({ }) }, async onSearchMeterBox() { - const { park } = this.data; - const { code, message, data = [] } = await getParkBoxList({park}); + const { park, building } = this.data; + const { code, message, data = [] } = await getParkBoxList({park, building}); if (code !== OK) { alertInfo(message) return diff --git a/pages/workBenchNew/components/installMeter/index.js b/pages/workBenchNew/components/installMeter/index.js index 91f3904..2c02fe7 100644 --- a/pages/workBenchNew/components/installMeter/index.js +++ b/pages/workBenchNew/components/installMeter/index.js @@ -384,7 +384,7 @@ Page({ tenement, sharp, peak, flat, valley, overall, url, sn, collectionARatio, collectionBRatio, collectionCRatio } = this.data; - if (!park || !(meter || sn) || !address || meterType == null || !building || !meterBox) { + if (!park || !(meter || sn) || !address || meterType == null || !building || !meterBox || ratio == null) { alertInfo("请填写必填项后保存") return; } diff --git a/pages/workBenchNew/components/installMeter/index.wxml b/pages/workBenchNew/components/installMeter/index.wxml index e3aafef..3a1be0c 100644 --- a/pages/workBenchNew/components/installMeter/index.wxml +++ b/pages/workBenchNew/components/installMeter/index.wxml @@ -49,6 +49,7 @@ placeholder="请选择电表箱" text="{{meterBoxName}}" bind:search="onMeterBoxFocus" + required="{{true}}" />