manage-client 3.2.20 → 3.2.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.20",
+  "version": "3.2.21",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/webmeter/report/ReportList.vue

@@ -229,8 +229,8 @@
 
   let readySomething = async function (self) {
     await self.$MagLoadParams.loadParam()
-    // self.initParams()
-    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
+    self.initParams()
+    // self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
   }
   export default {
     title: '上报查询',
@@ -239,9 +239,10 @@
         show:false,
         detail24: false,
         org:[this.$login.f.orgid],
-        orgcondition: '',           //' and f_filialeid = ' + this.$login.f.orgid,
+        orgcondition: ' and m.f_orgid = ' + this.$login.f.orgid,
         //f_filialeid: this.$login.f.f_orgid,
         detaillist: [],
+        meterbrands: [],
         prices: [],
         gasproperties:[],
         condition:'',
@@ -265,23 +266,23 @@
       this.$refs.paged.$refs.criteria.search()
     },
     methods: {
-      // 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();
-      // },
-      // async updateParams() {
-      //   await this.$MagLoadParams.loadParam(this.f_filialeid)
-      //   this.initParams()
-      // },
+      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();
+      },
+      async updateParams() {
+        await this.$MagLoadParams.loadParam(this.f_filialeid)
+        this.initParams()
+      },
       getorg(obj) {
         if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
           this.orgcondition = " and m.f_orgid  in " + plugins.convertToIn(obj)
@@ -403,9 +404,6 @@
       pricetypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
       },
-      meterbrands() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表品牌')]
-      },
       getCondition () {
         var con = ""
         if (this.orgCondtionStr) {