manage-client 3.1.45 → 3.1.46

package/src/components/webmeter/reportdata/ReportDataQuery.vue

@@ -52,27 +52,18 @@
                     placeholder='气表品牌'
                     :value.sync="model.f_meter_brand"
                     v-model="model.f_meter_brand"
-                    :options='$parent.$parent.WarningType'
-                    @change="$parent.$parent.getMeterType"
+                    :options='$parent.$parent.meterbrands'
                     close-on-select
                     condition="f_meter_brand='{}'">
                   </v-select>
                 </div>
                 <div class="col-sm-2 form-group" >
                   <label class="font_normal_body">气表型号</label>
-                  <v-select v-if="$parent.$parent.styles"
-                            placeholder='气表型号'
-                            :value.sync="model.f_meter_style"
-                            v-model="model.f_meter_style"
-                            :options='$parent.$parent.Warningstyle'
-                            close-on-select
-                            condition="f_meter_style='{}'">
-                  </v-select>
-                  <v-select v-if="!$parent.$parent.styles"
+                  <v-select
                             placeholder='气表型号'
                             :value.sync="model.f_meter_style"
                             v-model="model.f_meter_style"
-                            :options='$parent.$parent.Warningstyles'
+                            :options='$parent.$parent.metertypes'
                             close-on-select
                             condition="f_meter_style='{}'">
                   </v-select>
@@ -132,6 +123,8 @@
   import plugin from 'system-clients/src/plugins/GetLoginInfoService'
 
   let readySomething = async function (self) {
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
     // self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
   }
   export default {
@@ -158,7 +151,7 @@
         orgCondtionStr: " and f_filialeid in (" + this.$login.f.orgid+")",
         resshow:['company'],
         org:[this.$login.f.orgid],
-
+        meterbrands:[]
       }
     },
     created () {
@@ -176,49 +169,25 @@
     },
     ready() {
       this.$refs.paged.$refs.cri.search()
-      this.getMeterTypeAndBrand('f_meter_brand', '1=1')
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
     },
     methods: {
-      getMeterType() {
-        this.Warningstyle = [{label: '全部', value: ''}]
-        this.styles = false
-        let f_meter_brand = this.$refs.paged.$refs.cri.model.f_meter_brand
-        this.getMeterTypeAndBrand('f_meter_style', `f_meter_brand='${f_meter_brand}'`)
-      },
-      getMeterTypeAndBrand(groupname, condition) {
-        condition = `${condition} and ui.f_orgid like '${this.$login.f.orgid}%'`
-        let self = this
-        let load = new HttpResetClass()
-        load.load('POST', 'rs/sql/getMeterStyleAndBrand1', {
-          data: {
-            condition: condition,
-            groupname: groupname
-          }
-        }, {warnMsg: null, resolveMsg: null}).then((res) => {
-          let dr = {label: '', value: ''}
-          let i = 0
-          for (i = 0; i < res.data.length; i++) {
-            dr = {label: '', value: ''}
-            if (groupname == 'f_meter_brand') {
-              dr.label = res.data[i].f_meter_brand
-              dr.value = res.data[i].f_meter_brand
-              //气表品牌
-              self.WarningType[i + 1] = dr
-              console.log('气表品牌~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~')
-              console.log(dr)
-              console.log( self.WarningType)
-            } else if (groupname == 'f_meter_style') {
-              dr.label = res.data[i].f_meter_style
-              dr.value = res.data[i].f_meter_style
-              //气表类型
-              self.Warningstyle[i + 1] = dr
-            }
-          }
-          if (self.Warningstyle.length > 1) {
-            self.showMeterStyle()
-          }
+      initParams() {
+        // 初始化气表品牌
+        let brandArr = []
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          temp.label = item.label
+          temp.value = item.value.f_meter_brand
+          brandArr.push(temp)
         })
-
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+        //初始化气表价格
+        this.prices = this.$MagGetSaleParam.getPrices();
       },
       showMeterStyle() {
         this.styles = true
@@ -272,6 +241,9 @@
     watch: {
     },
     computed: {
+      metertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
+      },
     }
   }
 </script>