manage-client 3.3.195 → 3.3.197

package/src/filiale/taizhoukesi/NewGasStatistics.vue

@@ -7,13 +7,7 @@
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row" >
                 <div class="col-sm-2">
-                  <label class="font_normal_body">组织机构</label>
-                  <res-select :initresid="$parent.$parent.org"
-                              style="width:60%"
-                              @res-select="$parent.$parent.getorg"
-                              :is-mul=false
-                              restype='organization'>
-                  </res-select>
+                  <res-select-group :show-component="['company']" :initres="$parent.$parent.org" @re-res="$parent.$parent.getorg" style="width:60%"></res-select-group>
                 </div>
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户编号</label>
@@ -192,12 +186,15 @@
                 <th><nobr>表描述</nobr></th>
                 <th><nobr>气价名称</nobr></th>
 
-                <th><nobr>一阶气价</nobr></th>
+
                 <th><nobr>一阶气量</nobr></th>
-                <th><nobr>二阶气价</nobr></th>
+                <th><nobr>一阶气费</nobr></th>
+
                 <th><nobr>二阶气量</nobr></th>
-                <th><nobr>三阶气价</nobr></th>
+                <th><nobr>二阶气费</nobr></th>
+
                 <th><nobr>三阶气量</nobr></th>
+                <th><nobr>三阶气费</nobr></th>
 
                 <th><nobr>用气性质</nobr></th>
                 <th><nobr>期初余额</nobr></th>
@@ -229,12 +226,18 @@
                 <th style="text-align:center"><nobr>{{row.f_meter_title}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_price_name}}</nobr></th>
 
-                <th style="text-align:center"><nobr>{{row.f_stair1price}}</nobr></th>
+
                 <th style="text-align:center"><nobr>{{row.f_stairamount1}}</nobr></th>
-                <th style="text-align:center"><nobr>{{row.f_stair2price}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_stair1fee}}</nobr></th>
+
+
                 <th style="text-align:center"><nobr>{{row.f_stairamount2}}</nobr></th>
-                <th style="text-align:center"><nobr>{{row.f_stair3price}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_stair2fee}}</nobr></th>
+
+
                 <th style="text-align:center"><nobr>{{row.f_stairamount3}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_stair3fee}}</nobr></th>
+
                 <th style="text-align:center"><nobr>{{row.f_gasproperties}}</nobr></th>