manage-client 4.0.52 → 4.0.55

package/src/filiale/jinbin/sale.js

@@ -0,0 +1,7 @@
+// 分公司特殊组件页面注册
+import Vue from 'vue'
+
+export default function () {
+  // 收费查询
+  Vue.component('charge-query', (resolve) => { require(['./sale/businessquery/ChargeQuery'], resolve) })
+}

package/src/filiale/rongcheng/DefaultPrint.js

@@ -0,0 +1,14 @@
+export default{
+  // 把打印需要默认选中的字段名放在config数组中
+  config: [
+    'f_userinfo_code',
+    'f_user_name',
+    'f_user_phone',
+    'f_pregas',
+    'f_preamount',
+    'f_collection',
+    'f_balance',
+    'f_curbalance',
+    'f_idnumber'
+  ]
+}

package/src/filiale/xinjiangdexin/UserGasEchartsListIndex.vue

@@ -12,7 +12,7 @@ import { HttpResetClass } from 'vue-client'
 
 let getData = function * (self) {
   let load = new HttpResetClass()
-  load.load('POST', 'api/af-revenue/sql/webmeter_getNewHandChanceList', {data: {condition: self.condition, startDate: self.startdate, endDate: self.enddate}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+  load.load('POST', 'api/af-revenue/sql/webmeter_getNewHandChanceList', {data: {condition: self.condition, startDate: self.startdate + ' 00:00:00', endDate: self.enddate + ' 23:59:59'}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
     // eslint-disable-next-line camelcase
     let every_time = res.data.map(x => x.f_insert_date)
     // eslint-disable-next-line camelcase

package/src/filiale/xinkang/GasStatistics.vue

@@ -173,6 +173,36 @@
                             condition="ss.f_gasproperties = '{}'"
                             closfe-on-select></v-select>
                 </div>
+                <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
+                  <label class="font_normal_body">一阶气量</label>
+                  <div class="row">
+                    <input type="text" style="width:27%" class="input_search" v-model="model.f_stairamount1"
+                           condition="ss.f_stairamount1 >= {} " placeholder="">
+                    <label class="font_normal_body"> ≤ x ≤ </label>
+                    <input type="text" style="width:27%" class="input_search" v-model="model.f_stairamount1"
+                           condition="ss.f_stairamount1 <= {} " placeholder="">
+                  </div>
+                </div>
+                <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
+                  <label class="font_normal_body">二阶气量</label>
+                  <div class="row">
+                    <input type="text" style="width:27%" class="input_search" v-model="model.f_stairamount2"
+                           condition="ss.f_stairamount2 >= {} " placeholder="">
+                    <label class="font_normal_body"> ≤ x ≤ </label>
+                    <input type="text" style="width:27%" class="input_search" v-model="model.f_stairamount2"
+                           condition="ss.f_stairamount2 <= {} " placeholder="">
+                  </div>
+                </div>
+                <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
+                  <label class="font_normal_body">三阶气量</label>
+                  <div class="row">
+                    <input type="text" style="width:27%" class="input_search" v-model="model.f_stairamount3"
+                           condition="ss.f_stairamount3 >= {} " placeholder="">
+                    <label class="font_normal_body"> ≤ x ≤ </label>
+                    <input type="text" style="width:27%" class="input_search" v-model="model.f_stairamount3"
+                           condition="ss.f_stairamount3 <= {} " placeholder="">
+                  </div>
+                </div>
               </div>
             </div>
           </criteria>
@@ -191,9 +221,7 @@
                 <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,6 +229,10 @@
                 <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>
@@ -234,6 +266,11 @@
                 <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_oughtamount}}</nobr></th>
+
+                <th style="text-align:center"><nobr>{{row.f_stairamount1}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_stairamount2}}</nobr></th>
+                <th style="text-align:center"><nobr>{{row.f_stairamount3}}</nobr></th>
+
                 <th style="text-align:center"><nobr>{{row.f_oughtfee}}</nobr></th>
 
                 <th style="text-align:center"><nobr>{{row.f_collection}}</nobr></th>
@@ -261,21 +298,21 @@
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               期间充值金额:&emsp;{{sumsmodel.f_collection}}
             </td>
-<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
-<!--              一阶气量合计:&emsp;{{sumsmodel.f_stairamount1}}-->
-<!--            </td>-->
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              一阶气量合计:&emsp;{{sumsmodel.f_stairamount1}}
+            </td>
 <!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
 <!--              一阶气费合计:&emsp;{{sumsmodel.f_stair1fee}}-->
 <!--            </td>-->
-<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
-<!--              二阶气量合计:&emsp;{{sumsmodel.f_stairamount2}}-->
-<!--            </td>-->
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              二阶气量合计:&emsp;{{sumsmodel.f_stairamount2}}
+            </td>
 <!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
 <!--              二阶气费合计:&emsp;{{sumsmodel.f_stair2fee}}-->
 <!--            </td>-->
-<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
-<!--              三阶气量合计:&emsp;{{sumsmodel.f_stairamount3}}-->
-<!--            </td>-->
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              三阶气量合计:&emsp;{{sumsmodel.f_stairamount3}}
+            </td>
 <!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
 <!--              三阶气费合计:&emsp;{{sumsmodel.f_stair3fee}}-->
 <!--            </td>-->
@@ -315,7 +352,7 @@
         getstart:'',
         config: {
           defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_meternumber', 'f_gasproperties', 'f_balance', 'f_last_tablebase','f_tablebase',
-            'f_oughtamount', 'f_oughtfee', 'f_collection', 'f_curbalance', 'f_gas_state', 'f_changetable_state', 'f_input_date']
+            'f_oughtamount', 'f_stairamount1', 'f_stairamount2', 'f_stairamount3', 'f_oughtfee', 'f_collection', 'f_curbalance', 'f_gas_state', 'f_changetable_state', 'f_input_date']
         },
         sumsmodel: {},
         orgid:[this.$login.f.orgid],
@@ -329,7 +366,10 @@
         },{
           f_oughtamount: 0,
           f_oughtfee: 0,
-          f_collection:0
+          f_collection: 0,
+          f_stairamount1: 0,
+          f_stairamount2: 0,
+          f_stairamount3: 0
         }),
         showbottomsum:false  //页面下方是否有合计: 默认为false, 在watch修改
       }

package/src/filiale/xinkang/exportConfig.js

@@ -1391,6 +1391,9 @@ export default {
     'f_last_tablebase': '起方',
     'f_tablebase': '止方',
     'f_oughtamount': '期间用气量',
+    'f_stairamount1': '一阶气量',
+    'f_stairamount2': '二阶气量',
+    'f_stairamount3': '三阶气量',
     'f_oughtfee': '期间用气金额',
     'f_collection': '期末充值金额',
     'f_curbalance': '期末余额',