manage-client 3.2.268 → 3.2.270

package/build/dev-server.js

@@ -19,9 +19,9 @@ var qtx= 'http://36.103.222.144:6300/'
 // var bendi = 'http://203.57.101.233:8400/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://61.240.138.248:8400'
+var bendi = 'http://192.168.50.4:8400'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://61.240.138.248:8400'
+var wode = 'http://127.0.0.1:8084'
 // 192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'

package/package.json

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

package/src/components/sale/businessquery/ChargeQuery.vue

@@ -727,7 +727,7 @@
                     <nobr>{{row.f_stairamount1}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                    <nobr>{{row.conutnum>1?'--':row.f_stair1price}}</nobr>
+                    <nobr>{{row.f_stair1price}}</nobr>
                 </td>
                 <td style="text-align: center;">
                     <nobr>{{(row.f_stair1fee - 0).toFixed(2)}}</nobr>
@@ -736,7 +736,7 @@
                     <nobr>{{row.f_stair2amount}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                    <nobr>{{row.conutnum>1?'--':row.f_stair2price}}</nobr>
+                    <nobr>{{row.f_stair2price}}</nobr>
                 </td>
                 <td style="text-align: center;">
                     <nobr>{{(row.f_stair2fee - 0).toFixed(2)}}</nobr>
@@ -745,7 +745,7 @@
                     <nobr>{{row.f_stair3amount}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                    <nobr>{{row.conutnum>1?'--':row.f_stair3price}}</nobr>
+                    <nobr>{{row.f_stair3price}}</nobr>
                 </td>
                 <td style="text-align: center;">
                     <nobr>{{(row.f_stair3fee - 0).toFixed(2)}}</nobr>

package/src/filiale/wenxi/WebHandQuery.vue

@@ -159,7 +159,8 @@
                 <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>
@@ -201,7 +202,8 @@
                 <th style="text-align:center"><nobr>{{row.f_meter_brand}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_hand_date}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_total_fee}}</nobr></th>
-                <th style="text-align:center"><nobr>{{row.f_total_gas}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_last_tablebase}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_tablebase}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_curbalance}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_jval}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.cyclegas}}</nobr></th>

package/src/filiale/wenxi/config/exportConfig.js

@@ -832,7 +832,8 @@ monthGasConfig: {
     'f_jval': '表内剩余余额',
     'f_hand_date': '抄表日期',
     'f_total_fee': '累计购气金额',
-    'f_total_gas': '累计使用量',
+    'f_last_tablebase': '上期底数',
+    'f_tablebase': '本期底数',
     'f_balance_amount': '系统余额',
     'cyclegas': '当前周期已用气量',
     'cyclefee': '当前周期消费金额',