manage-client 3.2.215 → 3.2.216

package/package.json

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

package/src/filiale/wuhai/ReportList.vue

@@ -92,6 +92,7 @@
                   <v-select :value.sync="model.f_meter_brand"
                             v-model="model.f_meter_brand"
                             :options="$parent.$parent.meterbrands"
+                            @change="$parent.$parent.meterBrandChange"
                             condition="br.f_meter_brand = '{}'"
                             close-on-select></v-select>
                 </div>
@@ -143,6 +144,12 @@
                 <th><nobr>表内剩余金额</nobr></th>
                 <th><nobr>表内单价</nobr></th>
                 <th><nobr>本次抄表底数</nobr></th>
+                <th v-show="$parent.$parent.$parent.isShow"><nobr>流量计标况累计量</nobr></th>
+                <th v-show="$parent.$parent.$parent.isShow"><nobr>流量计工况累计量</nobr></th>
+                <th v-show="$parent.$parent.$parent.isShow"><nobr>流量计瞬时用气量(标况)</nobr></th>
+                <th v-show="$parent.$parent.$parent.isShow"><nobr>流量计瞬时用气量(工况)</nobr></th>
+                <th v-show="$parent.$parent.$parent.isShow"><nobr>流量计温度</nobr></th>
+                <th v-show="$parent.$parent.$parent.isShow"><nobr>流量计压力</nobr></th>
                 <th><nobr>阀门状态</nobr></th>
 
                 <th><nobr>上报类型</nobr></th>
@@ -169,6 +176,12 @@
                 <th style="text-align:center"><nobr>{{row.f_jval}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_price}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_tablebase}}</nobr></th>
+                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.standardConditionTotal}}</nobr></th>
+                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.operatingModeTotalForDay}}</nobr></th>
+                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.standardConditionFlow}}</nobr></th>
+                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.operatingModeFlow}}</nobr></th>
+                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.flowmeterTemperatureState}}</nobr></th>
+                <th style="text-align:center" v-show="$parent.$parent.$parent.isShow"><nobr>{{row.flowmeterPressureState}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_valvestate}}</nobr></th>
 
 
@@ -273,7 +286,8 @@
         criteriaShow:false,
         orgCondtionStr: '',
         model: new PagedList('rs/sql/manage_getReportList', 50,{},{f_meterbalanceamt: 0,f_tablebase: 0,f_meterdebitamt: 0,f_total_fee}),
-        areaList:[]
+        areaList:[],
+        isShow:false,
       }
     },
     ready () {
@@ -289,6 +303,16 @@
       this.$refs.paged.$refs.criteria.search()
     },
     methods: {
+      meterBrandChange(val){
+        console.log("气表品牌改变。。。。。" + val)
+        if(val !== undefined){
+          if(val == '真兰表端物联网表' || val == '真兰系统物联网表'){
+            this.isShow = true
+          } else {
+            this.isShow = false
+          }
+        }
+      },
       async initQueryParam () {
         let brr = []
         let http = new HttpResetClass()

package/src/filiale/wuhai/webmeterManage.js

@@ -1,6 +1,6 @@
 // 分公司特殊组件页面注册
 let specialComp = {
   // 上报查询
-  'report-list': (resolve) => { require(['./ReportList'], resolve) }
+  'report-list': (resolve) => { require(['./reportList'], resolve) }
 }
 exports.specialComp = specialComp