manage-client 3.2.148 → 3.2.150

package/build/dev-server.js

@@ -13,9 +13,9 @@ var compiler = webpack(config)
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
 var shaoguan='http://119.146.1.106:8300/'
 var qtx='http://36.103.222.144:6300/'
-var bendi = 'http://192.168.50.4:8400'
+var bendi = 'https://qnjtkf.cn:7400'
 // var bendi = 'http://172.168.1.11:9001'
-var fuwu =  'http://192.168.50.4:8400'
+var fuwu = 'https://qnjtkf.cn:7400'
 // var fuwu = 'http://203.57.101.233:9001'
 var system = 'http://192.168.50.4:8400'
 //192.168.
@@ -28,9 +28,6 @@ var proxyTable = {
   '/files': {
     target: fuwu
   },
-  '/rs/sql/chargeQuery': {
-    target: 'http://127.0.0.1:8084/'
-  },
   // 查找资源服务数据
   '/rs/search': {
     target: fuwu

package/package.json

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

package/src/filiale/qianneng/HandplanQuery.vue

@@ -683,48 +683,48 @@
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               气费合计:&emsp;{{sumsmodel.f_oughtfee}}
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              已交金额合计:&emsp;{{sumsmodel.f_debt_money}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              欠费金额合计:&emsp;{{sumsmodel.f_actual_arrears}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              账户支出合计:&emsp;{{sumsmodel.f_newbalance}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              账户存入合计:&emsp;{{sumsmodel.f_newcurbalance}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              一阶气量合计:&emsp;{{sumsmodel.f_stair1amount}}
-            </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_stair2amount}}
-            </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_stair3amount}}
-            </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_surplus_gas}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              扣减气量合计:&emsp;{{sumsmodel.f_haircut_gas}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              应交气量合计:&emsp;{{sumsmodel.f_oughtamount}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              已交气费金额合计:&emsp;{{sumsmodel.alloughtfee}}
-            </td>
+<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
+<!--              已交金额合计:&emsp;{{sumsmodel.f_debt_money}}-->
+<!--            </td>-->
+<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
+<!--              欠费金额合计:&emsp;{{sumsmodel.f_actual_arrears}}-->
+<!--            </td>-->
+<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
+<!--              账户支出合计:&emsp;{{sumsmodel.f_newbalance}}-->
+<!--            </td>-->
+<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
+<!--              账户存入合计:&emsp;{{sumsmodel.f_newcurbalance}}-->
+<!--            </td>-->
+<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
+<!--              一阶气量合计:&emsp;{{sumsmodel.f_stair1amount}}-->
+<!--            </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_stair2amount}}-->
+<!--            </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_stair3amount}}-->
+<!--            </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_surplus_gas}}-->
+<!--            </td>-->
+<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
+<!--              扣减气量合计:&emsp;{{sumsmodel.f_haircut_gas}}-->
+<!--            </td>-->
+<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
+<!--              应交气量合计:&emsp;{{sumsmodel.f_oughtamount}}-->
+<!--            </td>-->
+<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
+<!--              已交气费金额合计:&emsp;{{sumsmodel.alloughtfee}}-->
+<!--            </td>-->
           </tr>
         </table>
       </div>
@@ -818,20 +818,21 @@
         data: {},
         model: new PagedList('rs/sql/handplanQuery', 20, {startDate: 'this.model.handStartDate', endDate: 'this.model.handEndDate'}, {
           f_oughtamount: 0,
-          f_oughtfee: 0,
-          f_debt_money: 0,
-          f_newbalance:0,
-          f_newcurbalance: 0,
-          f_actual_arrears: 0,
-          f_stair1amount: 0,
-          f_stair1fee: 0,
-          f_stair2amount: 0,
-          f_stair2fee: 0,
-          f_stair3amount: 0,
-          f_stair3fee: 0,
-          f_surplus_gas: 0,
-          f_haircut_gas: 0,
-          alloughtfee:0
+          f_oughtfee: 0
+          // ,
+          // f_debt_money: 0,
+          // f_newbalance:0,
+          // f_newcurbalance: 0,
+          // f_actual_arrears: 0,
+          // f_stair1amount: 0,
+          // f_stair1fee: 0,
+          // f_stair2amount: 0,
+          // f_stair2fee: 0,
+          // f_stair3amount: 0,
+          // f_stair3fee: 0,
+          // f_surplus_gas: 0,
+          // f_haircut_gas: 0,
+          // alloughtfee:0
         }),
         initres: {
           org:[this.$login.f.orgid],

package/src/filiale/rizhao/InspectListUser.vue

@@ -0,0 +1,451 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main">
+      <div class="flex" v-if="!show">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+          <div class="row">
+            <div class="col-sm-2">
+              <label class="font_normal_body">&emsp;&emsp;公司</label>
+              <right-tree @re-res="$parent.$parent.getorg"
+                          :initresid='$parent.$parent.org'></right-tree>
+            </div>
+            <div class="col-sm-2 ">
+              <label for="f_gasproperties"class="font_normal_body">用气性质</label>
+              <v-select id="f_gasproperties"
+                        style="width:60%"
+                        v-model="model.f_gasproperties"
+                        placeholder='用气性质'
+                        :value.sync="model.f_gasproperties"
+                        :options='$parent.$parent.gasproperties'
+                        condition="f_gasproperties = '{}'"
+                        close-on-select >
+              </v-select>
+            </div>
+            <div class="col-sm-2" >
+              <label  for="f_user_state" class="font_normal_body">客户状态</label>
+              <v-select :value.sync="model.f_user_state"
+                        v-model="model.f_user_state"
+                        :options='$parent.$parent.userstate' placeholder='请选择'
+                        condition="f_user_state = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-2 flex-row" style="white-space: nowrap">
+              <label class="font_normal_body" v-if="['卡表','物联网表'].includes($parent.$parent.meter_classify)" >未购天数</label>
+              <label class="font_normal_body" v-else>未抄天数</label>
+              <div class="row">
+                <input type="text" style="width:30%" class="input_search" v-model="model.diffdaymin"
+                       condition="diffday >= {} " placeholder="">
+                <label   class="font_normal_body">  ≤ x ≤ </label>
+                <input type="text" style="width:30%" class="input_search" v-model="model.diffdaymax"
+                       condition="diffday <= {} " placeholder="">
+              </div>
+
+            </div>
+
+            <div class="span" style="float:right;">
+              <button class="btn button_search" @click="search()">查询</button>
+              <button class="btn button_clear" @click="$parent.$parent.clear()">清空</button>
+              <export-excel :data="$parent.$parent.getCondition"
+                            :field="$parent.$parent.getfield"
+                            :footer="$parent.$parent.footer"
+                            :header="$parent.$parent.other"
+                            sqlurl="rs/logic/exportfile"
+                            :sql-name="$parent.$parent.sqlName"
+                            template-name='用户稽查导出'  :choose-col="true"></export-excel>
+              <print-data :model="$parent.model" :field="$parent.$parent.getfield" :defaultfield="$parent.$parent.defaultfield" print-name="稽查查询打印" :sumsmodel="$parent.$parent.sumsmodel" ></print-data>
+              <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="col-sm-2 ">
+              <label class="font_normal_body">起始时间</label>
+              <datepicker id="startDate" placeholder="起始时间"
+                          v-model="model.startDate"
+                          style="width:60%"
+                          :value.sync="model.startDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 ">
+              <label class="font_normal_body">截止时间</label>
+              <datepicker id="endDate" placeholder="截止时间"
+                          v-model="model.endDate"
+                          style="width:60%"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 ">
+              <label for="f_meter_classify"class="font_normal_body">气表类型</label>
+              <v-select id="f_meter_classify"
+                        v-model="$parent.$parent.meter_classify"
+                        placeholder='气表类型'
+                        style="width:70%"
+                        :value.sync="$parent.$parent.meter_classify"
+                        :options='$parent.$parent.f_meter_classify'
+                        :value-single="true"
+                        close-on-select >
+              </v-select>
+            </div>
+            <div class="col-sm-2 ">
+              <label for="f_table_state" class="font_normal_body">&emsp;表状态</label>
+              <v-select id="f_table_state"
+                        style="width:60%"
+                        v-model="model.f_table_state"
+                        placeholder='表状态'
+                        :value.sync="model.f_table_state"
+                        :options='$parent.$parent.tablestate'
+                        condition="f_table_state = '{}'"
+                        close-on-select >
+              </v-select>
+            </div>
+            <div class="col-sm-2" >
+              <label class="font_normal_body" v-if="['卡表','物联网表'].includes($parent.$parent.meter_classify)">总购次数</label>
+              <label class="font_normal_body" v-else>抄表次数</label>
+                <input type="text" style="width:25%" class="input_search" v-model="model.cishumin"
+                       condition="cishu >= {} " placeholder="">
+                <label   class="font_normal_body">  ≤ x ≤ </label>
+                <input type="text" style="width:25%" class="input_search" v-model="model.cishumax"
+                       condition="cishu <= {} " placeholder="">
+            </div>
+            <div class="col-sm-2">
+              <label class="font_normal_body" v-if="$parent.$parent.meter_classify === '卡表'">总购气量</label>
+              <label class="font_normal_body" v-if="$parent.$parent.meter_classify === '机表'">总用气量</label>
+              <label class="font_normal_body" v-if="$parent.$parent.meter_classify === '物联网表'">总购金额</label>
+                <input type="text" style="width:25%" class="input_search" v-model="model.pregasmin"
+                       condition="pregas >= {} " placeholder="">
+                <label   class="font_normal_body">  ≤ x ≤ </label>
+                <input type="text" style="width:25%" class="input_search" v-model="model.pregasmax"
+                       condition="pregas <= {} " placeholder="">
+            </div>
+
+            <div class="col-sm-2">
+              <label class="font_normal_body">&emsp;&emsp;表号</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                     condition="f_meternumber = '{}'" placeholder='表号'>
+            </div>
+            <div class="col-sm-2 ">
+              <label class="font_normal_body">用户类型</label>
+              <v-select :value.sync="model.f_user_type"
+                        @change="$parent.$parent.userTypeChange()"
+                        :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
+                        condition="f_user_type = '{}'"
+                        close-on-select></v-select>
+            </div>
+
+            <div class="col-sm-2">
+              <label class="font_normal_body">客户名称</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                     condition="f_user_name like '%{}%'" placeholder="客户名称">
+            </div>
+            <div class="col-sm-2">
+              <label class="font_normal_body">客户编号</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                     condition="f_userinfo_code = '{}' " placeholder="客户编号">
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body" title="旧客户编号">档案编号</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
+                     condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
+            </div>
+            <div class="col-sm-2  form-group">
+              <label class="font_normal_body">客户地址</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
+                     condition="f_address like '%{}%'" placeholder='客户地址'>
+            </div>
+            <div class="col-sm-2  form-group">
+              <label class="font_normal_body">客户电话</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
+                     condition="f_user_phone like '%{}%'" placeholder="客户电话">
+            </div>
+
+
+          </div>
+
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' class="list_area table_sy"  v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <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>
+            <th><nobr>最后购气日期</nobr></th>
+            <th v-show="['卡表','物联网表'].includes($parent.$parent.$parent.meter_classify)"><nobr>总购气次数</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>总抄表次数</nobr></th>
+
+            <th v-show="$parent.$parent.$parent.meter_classify === '卡表'"><nobr>总购气量</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify === '物联网表'"><nobr>总购金额</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>总用气量</nobr></th>
+
+            <th v-show="['卡表','物联网表'].includes($parent.$parent.$parent.meter_classify)"><nobr>累计未购气天数</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>累计未抄表天数</nobr></th>
+            <th><nobr>组织机构</nobr></th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td style="text-align: center;"><nobr>{{$index+1}}</nobr></td>
+          <td style="text-align: center;"><nobr>
+            <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
+          </nobr> </td>
+          <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_olduserinfo_code}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
+          <th style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_user_state}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_address}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_residential_area}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_createfile_date}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_user_type}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_gasproperties}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_table_state}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_price_name}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.delivery_date}}</nobr></th>
+
+          <th style="text-align: center;"><nobr>{{row.cishu}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.pregas}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.diffday}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></th>
+        </template>
+      </data-grid>
+    </criteria-paged>
+        <table class="table-hover">
+          <tr style="position: relative" class="table-bordered">
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">汇总信息</td>
+            <td v-if="meter_classify === '卡表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总购气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
+            <td v-if="meter_classify === '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总抄表气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
+            <td v-if="meter_classify === '物联网表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总购金额合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
+          </tr>
+        </table>
+  </div>
+      <div class="flex" v-if="show">
+        <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+      </div>
+    </div></div>
+</template>
+<script>
+  /**
+   *用户档案查询列表以及添加操作组件
+   */
+  import { PagedList } from 'vue-client'
+  import Vue from 'vue'
+  import plugin from 'system-clients/src/plugins/GetLoginInfoService'
+
+  let readySomething = async function (self) {
+
+    self.$refs.paged.$refs.cri.model.endDate =  self.$login.toStandardDateString()
+
+    // await self.$refs.paged.$refs.cri.search()
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  }
+  export default {
+    title: '用户稽查',
+    data () {
+      return {
+        other:[],
+        footer:[],
+        org:[this.$login.f.orgid],
+        criteriaShow: false,
+        meter_classify:'卡表',
+        filialeNameStr: null,
+        filialeCodeStr: `and f_orgid = ${this.$login.f.orgid}`,
+        userid: this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
+        getfield:{"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号","f_user_name":"客户名称",
+          "f_user_state":"客户状态","f_user_phone":"客户电话","f_address":"地址","f_residential_area":"小区","f_createfile_date":"建档日期","f_user_type":"用户类型",
+          "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
+          "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购气量",
+          "diffday":"未购气总天数"},
+        model: new PagedList('rs/sql/inspectList', 50,{startDate:'this.model.startDate',endDate:'this.model.endDate'},{pregas: 0}),
+        rows: null,
+        //orgid:'',
+        show:false,
+        sqlName:'inspectList',
+        rowdata:{},
+        sumsmodel: {},
+        config: {
+          defaultPrint: ['f_userinfo_code','f_user_id']
+        },
+        defaultfield: [],
+      }
+    },
+    watch:{
+      meter_classify(val){
+        if (val === '卡表') {
+          this.model.url = this.url = 'rs/sql/inspectList'
+          this.sqlName = 'inspectList'
+          this.getfield = {"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号",
+            "f_user_name":"客户名称","f_user_state":"客户状态","f_user_phone":"客户电话","f_address":"地址","f_residential_area":"小区",
+            "f_createfile_date":"建档日期","f_user_type":"用户类型",
+            "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
+            "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购气量",
+            "diffday":"累计未购气天数"}
+        }else if (val === '机表') {
+          this.model.url = this.url = 'rs/sql/handinspectList'
+          this.sqlName = 'handinspectList'
+          this.getfield = {"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号",
+            "f_user_name":"客户名称","f_user_state":"客户状态","f_user_phone":"客户电话","f_address":"地址","f_residential_area":"小区",
+            "f_createfile_date":"建档日期","f_user_type":"用户类型",
+            "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
+            "delivery_date":"最后抄表日期","cishu":"总抄表次数","pregas":"抄表气量",
+            "diffday":"累计未抄表天数"}
+        } else if (val === '物联网表') {
+          this.model.url = this.url = 'rs/sql/getWebMeterList'
+          this.sqlName = 'getWebMeterList'
+          this.getfield = {"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号",
+            "f_user_name":"客户名称","f_user_state":"客户状态","f_user_phone":"客户电话","f_address":"地址","f_residential_area":"小区",
+            "f_createfile_date":"建档日期", "f_user_type":"用户类型",
+            "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
+            "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购金额",
+            "diffday":"累计未购气天数"}
+        }
+        this.clear()
+        this.model.rows = []
+        for(let key in this.model.sums){
+          this.model.sums[key] = 0
+        }
+
+      },
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      }
+    },
+    ready () {
+
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+        getotherfooter(){
+          // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
+          // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
+          this.other=[];
+          this.footer=[];
+          let exportdata = this.getCondition;
+          let otherInData=[];
+          otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+          let footerData=[],exportfield=this.getfield;
+          footerData.push("合计");
+          let self = this;
+          for(var field in self.sumsmodel){
+            footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
+          }
+          this.footer.push(footerData);
+          this.other.push(otherInData);
+        },
+      getorg (obj) {
+        if(obj.resids.length>0){
+          this.filialeCodeStr =" and f_orgid in " + plugin.convertToIn(obj.resids)
+        }
+        else{
+          this.filialeCodeStr= " and f_orgid = " + this.$login.f.orgid
+        }
+      },
+      userTypeChange () {
+        this.gasproperties=[]
+        if(this.$refs.paged.$refs.cri.model !==null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties=''
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+        }
+        else{
+          this.gasproperties =[{label: '全部', value: ''}]
+        }
+      },
+
+      cancel() {
+        this.show = false
+      },
+      showmsg(obj){
+        this.rowdata=obj
+        this.show=true
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+      selfSearch (args) {
+        if (!this.meter_classify) {
+          this.$showMessage('请选择气表类型。。。')
+          return
+        }
+        args.condition = args.condition+ ` ${this.filialeCodeStr}`
+        this.model.search(args.condition, args.model)
+      },
+      hidden(){
+        this.criteriaShow = !this.criteriaShow
+      },
+      clear(){
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          if(key != 'startDate' && key != 'endDate')
+            this.$refs.paged.$refs.cri.model[key] = []
+        })
+        this.$refs.paged.$refs.cri.model.startDate =  this.$login.toStandardDateString()
+        this.$refs.paged.$refs.cri.model.endDate =  this.$login.toStandardDateString()
+      }
+    },
+    computed: {
+      gasproperties() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用气性质')]
+      },
+      usertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
+      userstate() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('客户状态')]
+      },
+      tablestate () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
+      },
+      f_meter_classify(){
+        return [{label: '机表', value: '机表'},{label: '卡表', value: '卡表'},{label: '物联网表', value: '物联网表'}]
+        // return [{label: '卡表', value: '卡表'}]
+      },
+
+      getCondition () {
+        let result = {
+          condition: '',
+          diffDay:' 1=1 ',
+          startDate: this.$refs.paged.$refs.cri.model.startDate,
+          endDate: this.$refs.paged.$refs.cri.model.endDate
+        }
+        result.condition = this.$refs.paged.$refs.cri.condition + this.filialeCodeStr
+
+        return result
+      }
+    }
+  }
+</script>
+<style media="screen">
+  .divtext {
+    min-width: 50px;
+    max-width: 200px;
+    border: 1px solid green;
+    display: inline-block;
+  }
+</style>
+

package/src/filiale/rizhao/sale.js

@@ -1,7 +1,13 @@
 // 分公司特殊组件页面注册
 let specialComp = {
-  // 收费查询
-  'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) }
+    // 收费查询
+    'charge-query': (resolve) => {
+        require(['./ChargeQuery'], resolve)
+    },
+    //用户稽查
+    'inspect-list-user': (resolve) => {
+        require(['./InspectListUser'], resolve)
+    }
 }
 exports.specialComp = specialComp
 

package/src/filiale/shaoguan/ArrearsQuery.vue

@@ -369,46 +369,46 @@
               </td>
 
               <td style="text-align: center;">
-                <nobr>{{row.c}}</nobr>
+                <nobr>{{row.c}}</nobr><!--欠费期数-->
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_hand_date}}</nobr>
+                <nobr>{{row.f_hand_date}}</nobr><!--欠费区间-->
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_last_tablebase}}</nobr>
+                <nobr>{{row.f_last_tablebase}}</nobr><!--上期抄表底数-->
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_tablebase}}</nobr>
+                <nobr>{{row.f_tablebase}}</nobr><!--本期抄表底数-->
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_oughtamount}}</nobr>
+                <nobr>{{row.f_oughtamount}}</nobr><!--用气量-->
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_oughtfee}}</nobr>
+                <nobr>{{row.f_oughtfee}}</nobr><!--用气金额-->
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_operate_date}}</nobr>
+                <nobr>{{row.f_operate_date}}</nobr><!--缴费时间-->
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_debt_money}}</nobr>
+                <nobr>{{row.f_debt_money}}</nobr><!--已交金额-->
               </td>
               <!--<td style="text-align: center;">-->
                 <!--<nobr>{{row.f_hand_bv}}</nobr>-->
               <!--</td>-->
               <td style="text-align: center;">
-                <nobr>{{row.f_oughtfee_new}}</nobr>
+                <nobr>{{row.f_oughtfee_new}}</nobr><!--应交气费-->
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.overdue}}</nobr>
+                <nobr>{{row.overdue}}</nobr><!--滞纳金-->
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_garbage_fee}}</nobr>
+                <nobr>{{row.f_garbage_fee}}</nobr><!--附加费-->
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_balance}}</nobr>
+                <nobr>{{row.f_balance}}</nobr><!--上期余额-->
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_oughtfee_all}}</nobr>
+                <nobr>{{row.f_oughtfee_all}}</nobr> <!--合计欠费-->
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_inputtor}}</nobr>
@@ -420,10 +420,10 @@
                 <nobr>{{row.f_user_type}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_cost_type}}</nobr>
+                <nobr>{{row.f_cost_type}}</nobr><!--缴费类型-->
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_gasproperties}}</nobr>
+                <nobr>{{row.f_gasproperties}}</nobr><!--用气性质-->
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_comments}}</nobr>

package/src/filiale/wuhai/ChargeQuery.vue

@@ -724,19 +724,19 @@
                   一阶气量合计: {{sumsmodel.f_stairamount1.toFixed(2)}}
               </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}}
+                  一阶气费合计:&emsp;{{sumsmodel.f_stair1fee.toFixed(2)}}
               </td>
               <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
                   二阶气量合计:&emsp;{{sumsmodel.f_stair2amount.toFixed(2)}}
               </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}}
+                  二阶气费合计:&emsp;{{sumsmodel.f_stair2fee.toFixed(2)}}
               </td>
               <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
                   三阶气量合计:&emsp;{{sumsmodel.f_stair3amount.toFixed(2)}}
               </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}}
+                  三阶气费合计:&emsp;{{sumsmodel.f_stair3fee.toFixed(2)}}
               </td>
           </tr>
         </table>

package/src/main.js

@@ -1,66 +1,66 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-
-// import { sale } from 'sale-client'
-import { system } from 'system-clients'
-import { ldap } from 'ldap-clients'
-import saleManage from './saleManage'
-import webmeterManage from './webmeterManage'
-import reportManage from './reportManage'
-import newmanage from './newmanage'
-import ManageHome from './ManageHome'
-import echarts from 'echarts'
-import AMap from 'vue-amap'
-
-Vue.config.silent = true
-// Vue.mmType = 'AES'
-
-Vue.use(AMap);
-
-// 初始化vue-amap
-AMap.initAMapApiLoader({
-  // 高德key
-  key: '3cec9ae8e2349207f7ac29279e3f4abe',
-  // 插件集合 （插件按需引入）
-  plugin: [
-    "AMap.Autocomplete", //输入提示插件
-    "AMap.PlaceSearch", //POI搜索插件
-    "AMap.Scale", //右下角缩略图插件 比例尺
-    "AMap.OverView", //地图鹰眼插件
-    "AMap.ToolBar", //地图工具条0
-    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
-    "AMap.PolyEditor", //编辑 折线多，边形
-    "AMap.CircleEditor", //圆形编辑器插件
-    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
-  ],
-  uiVersion: "1.0"
-});
-/** **************************通用组件******************************/
-
-Vue.prototype.$echarts = echarts
-all()
-// sale()
-ldap()
-system(false)
-
-saleManage("qianneng")
-webmeterManage()
-ManageHome()
-newmanage()
-reportManage()
-require('system-clients/src/styles/less/bootstrap.less')
-require('./components/qinhua/Style/qinhuaStyle.less')
-// require('./bootstrap/less/manageStyle/manageChile.less')
-// require('./bootstrap/less/manageStyle/safeStyle.less')
-
-//大屏展示要放开的样式
-// require('system-clients/src/styles/less/manageStyle/manageChile.less')
-// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
-// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
-
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+
+// import { sale } from 'sale-client'
+import { system } from 'system-clients'
+import { ldap } from 'ldap-clients'
+import saleManage from './saleManage'
+import webmeterManage from './webmeterManage'
+import reportManage from './reportManage'
+import newmanage from './newmanage'
+import ManageHome from './ManageHome'
+import echarts from 'echarts'
+import AMap from 'vue-amap'
+
+Vue.config.silent = true
+// Vue.mmType = 'AES'
+
+Vue.use(AMap);
+
+// 初始化vue-amap
+AMap.initAMapApiLoader({
+  // 高德key
+  key: '3cec9ae8e2349207f7ac29279e3f4abe',
+  // 插件集合 （插件按需引入）
+  plugin: [
+    "AMap.Autocomplete", //输入提示插件
+    "AMap.PlaceSearch", //POI搜索插件
+    "AMap.Scale", //右下角缩略图插件 比例尺
+    "AMap.OverView", //地图鹰眼插件
+    "AMap.ToolBar", //地图工具条0
+    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
+    "AMap.PolyEditor", //编辑 折线多，边形
+    "AMap.CircleEditor", //圆形编辑器插件
+    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
+  ],
+  uiVersion: "1.0"
+});
+/** **************************通用组件******************************/
+
+Vue.prototype.$echarts = echarts
+all()
+// sale()
+ldap()
+system(false)
+
+saleManage("zhongyi")
+webmeterManage()
+ManageHome()
+newmanage()
+reportManage()
+require('system-clients/src/styles/less/bootstrap.less')
+require('./components/qinhua/Style/qinhuaStyle.less')
+// require('./bootstrap/less/manageStyle/manageChile.less')
+// require('./bootstrap/less/manageStyle/safeStyle.less')
+
+//大屏展示要放开的样式
+// require('system-clients/src/styles/less/manageStyle/manageChile.less')
+// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
+// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})
+