manage-client 3.3.222 → 3.3.223

package/src/filiale/zhongyi/GasStatistics.vue

@@ -165,6 +165,14 @@
                             condition="ss.f_gasproperties = '{}'"
                             close-on-select></v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" title="参数名称:是否煤改气">煤&ensp;改&ensp;气 </label>
+                  <v-select :value.sync="model.f_is_mgq" v-model="model.f_is_mgq"
+                            :options='$parent.$parent.mgq' placeholder='是否煤改气'
+                            style="width:60%"
+                            close-on-select
+                            condition="f_is_mgq = '{}'"></v-select>
+                </div>
               </div>
             </div>
           </criteria>
@@ -178,14 +186,16 @@
                 <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>-->
 
                 <th><nobr>用气类型</nobr></th>
                 <th><nobr>用气性质</nobr></th>
@@ -211,14 +221,16 @@
                 <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
 
                 <td style="text-align:center"><nobr>{{row.f_gascode}}</nobr></td>
+                <td style="text-align:center"><nobr>{{row.f_is_mgq}}</nobr></td>
+
                 <th style="text-align:center"><nobr>{{row.f_meternumber}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_meter_classify}}</nobr></th>
                 <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_stair2price}}</nobr></th>
-                <th style="text-align:center"><nobr>{{row.f_stair3price}}</nobr></th>
+<!--                <th style="text-align:center"><nobr>{{row.f_stair1price}}</nobr></th>-->
+<!--                <th style="text-align:center"><nobr>{{row.f_stair2price}}</nobr></th>-->
+<!--                <th style="text-align:center"><nobr>{{row.f_stair3price}}</nobr></th>-->
 
                 <th style="text-align:center"><nobr>{{row.f_user_nature}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_gasproperties}}</nobr></th>
@@ -254,24 +266,24 @@
             <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_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_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_stair3fee}}
-            </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_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_stair3fee}}-->
+<!--            </td>-->
           </tr>
         </table>
       </div>
@@ -281,7 +293,7 @@
 
 <script>
   import {HttpResetClass, PagedList} from 'vue-client'
-  import exportConfig from '../../components/sale/config/exportConfig'
+  import exportConfig from './exportConfig'
   import * as Util from '../../Util'
   import plugins from '../../plugins/GetLoginInfoService'
 
@@ -483,6 +495,9 @@
       usernatures(){
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
       },
+      mgq(){
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('是否煤改气')]
+      },
       gasProperties(){
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
       },

package/src/filiale/zhongyi/exportConfig.js

@@ -233,6 +233,7 @@ export default {
     'f_user_phone': '客户电话',
     'f_address': '客户地址',
     'f_zones': '片区',
+    'f_is_mgq': '是否煤改气',
     'f_user_type': '客户类型',
     'f_gasproperties': '用气性质',
     'f_meternumber': '表号',
@@ -1824,6 +1825,7 @@ export default {
     'f_address': '地址',
     'f_user_phone': '电话',
     'f_gascode': '燃气证号',
+    'f_is_mgq': '是否煤改气',
     'f_meternumber': '表号',
     'f_meter_classify': '表具类型',
     'f_meter_title': '表描述',

package/src/filiale/zhongyi/sale.js

@@ -27,4 +27,8 @@ export default function () {
   Vue.component('drop-down-box', (resolve) => { require(['./CallReport/DropDownBox'], resolve) })
   // 补卡查询
   Vue.component('fill-card-query', (resolve) => { require(['./FillCardQuery'], resolve) })
+  // 收费查询
+  Vue.component('charge-query', (resolve) => {
+    require(['./ChargeQuery'], resolve)
+  })
 }