manage-client 3.2.299 → 3.3.1

package/package.json

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

package/src/components/webmeter/DrillData/UserLostContactAnalysis.vue

@@ -124,6 +124,29 @@
                 close-on-select condition="f_user_state ='{}'">
               </v-select>
             </div>
+
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">开始时间</label>
+                <datepicker style="width:60%" id="startdate" placeholder="开始时间"
+                            v-model="model.startDate"
+                            :value.sync="model.startDate"
+                            :disabled-days-of-Week="[]"
+                            :format="'yyyy-MM-dd HH:mm:ss'"
+
+                            :show-reset-button="reset">
+                </datepicker>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">结束时间</label>
+                <datepicker style="width:60%" id="enddate" placeholder="结束日期"
+                            v-model="model.endDate"
+                            :value.sync="model.endDate"
+                            :disabled-days-of-Week="[]"
+                            :format="'yyyy-MM-dd HH:mm:ss'"
+
+                            :show-reset-button="reset">
+                </datepicker>
+              </div>
             <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
               <label class="font_normal_body">失联天数&nbsp;</label>
               <div class="row">
@@ -308,10 +331,14 @@
   import UserGasEcharts from './UserGasEcharts'
   import plugin from 'system-clients/src/plugins/GetLoginInfoService'
   import {HttpResetClass} from 'vue-client'
+  import * as Util from '../../../Util'
   let readySomething = async function (self) {
 
     await self.$MagLoadParams.loadParam()
     self.initParams()
+    let year = new Date().getFullYear()
+    self.$refs.paged.$refs.cri.model.startDate =  year+'-01-01 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
     self.$refs.paged.$refs.cri.model.notappear='不包含'
     self.$refs.paged.$refs.cri.model.SLday1=10
     self.$refs.paged.$refs.cri.model.f_user_state='正常'
@@ -324,7 +351,10 @@
 
     data() {
       return {
-        model: new PagedList('rs/sql/webmeter_getUserLoseQuery', 20),
+        model: new PagedList('rs/sql/webmeter_getUserLoseQuery', 20 ,{
+          startDate: 'this.model.startDate',
+          endDate: 'this.model.endDate'
+        }),
         getfield:{
           "f_userinfo_code":"客户编号","f_user_name":"客户名称",
           "f_address":"客户地址","f_user_type":"客户类型","f_gasproperties":"用气性质",
@@ -524,7 +554,11 @@
         }
         return {
 
-          condition: condition
+          condition: {
+            condition: condition  ,
+            startDate:`${this.$refs.paged.$refs.cri.model.startDate}`,
+            endDate:`${this.$refs.paged.$refs.cri.model.endDate}`
+          }
         }
       },
       usertypes() {

package/src/components/webmeter/recharge/RechargeList.vue

@@ -165,6 +165,9 @@
         </criteria-paged>
       </div>
     </div>
+    <div  class="flex" style="width:99%;height:98%;margin-bottom:0px" 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>
 </template>
 

package/src/filiale/qianneng/OtherChargeQuery.vue

@@ -37,7 +37,11 @@
                   <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 form-group">
+                  <label class="font_normal_body">安装电话</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_contact_phone"
+                         condition="f_contact_phone like '%{}%'" placeholder="安装联系电话">
+                </div>
                 <div class="span" style="float:right;">
                   <button class="button_search button_spacing" @click="search()">查询</button>
                   <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
@@ -199,6 +203,9 @@
                 <th>
                   <nobr>客户电话</nobr>
                 </th>
+                <th>
+                  <nobr>安装联系电话</nobr>
+                </th>
                 <th>
                   <nobr>气表类型</nobr>
                 </th>
@@ -287,6 +294,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_user_phone}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_contact_phone}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_meter_classify}}</nobr>
               </td>
@@ -455,7 +465,7 @@
         all: false,
         fields: {},
         config: {
-          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_brand_spec', 'f_typename', 'f_typenumber', 'f_unitprice', 'f_number', 'f_money','f_operate_date', 'f_operator']
+          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_contact_phone', 'f_brand_spec', 'f_typename', 'f_typenumber', 'f_unitprice', 'f_number', 'f_money','f_operate_date', 'f_operator']
         },
         //默认打印列
         defaultfield: [],

package/src/filiale/qianneng/QnJgqCbjbZD.vue

@@ -202,7 +202,7 @@
   }
 
   export default {
-    title: '工商销售明细',
+    title: '机表抄表报表',
     data() {
       return {
         other:[],

package/src/filiale/qianneng/QnJgqCbwlwZD.vue

@@ -69,6 +69,12 @@
                   <th>
                     <nobr>地址</nobr>
                   </th>
+                  <th>
+                    <nobr>起方</nobr>
+                  </th>
+                  <th>
+                    <nobr>止方</nobr>
+                  </th>
                   <th>
                     <nobr>气量</nobr>
                   </th>
@@ -111,6 +117,12 @@
                 <td style="text-align: center;">
                   <nobr>{{row.c_dz}}</nobr>
                 </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.d_qf}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.e_zf}}</nobr>
+                </td>
                 <td style="text-align: center;">
                   <nobr>{{row.g_ql}}</nobr>
                 </td>
@@ -184,7 +196,7 @@ let readySomething = async function (self) {
 }
 
 export default {
-  title: '工商销售明细',
+  title: '物联网抄表报表',
   data() {
     return {
       other:[],

package/src/filiale/qianneng/exportConfig.js

@@ -83,7 +83,7 @@ export default{
     'f_bank_name': '银行名称', 'f_oughtfee': '欠费金额'
   },
   otherchargeConfig: {
-    'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_user_phone': '客户电话', 'f_meter_classify': '气表类型',
+    'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_user_phone': '客户电话', 'f_contact_phone': '安装联系电话', 'f_meter_classify': '气表类型',
     'f_meter_brand': '气表品牌', 'f_bill_number': '收据票号', 'f_brand_spec': '收费类型', 'f_typename': '品名规格',
     'f_typenumber': '型号', 'f_unitprice': '单价', 'f_number': '数量', 'f_money': '应收',
     'f_collection': '收款', 'f_newbalance': '支出', 'f_newcurbalance': '收入', 'f_payment': '付款方式', 'f_state': '状态',
@@ -190,7 +190,7 @@ export default{
     'h_je':'金额','i_yd':'月度','j_bh':'表号','k_yhlx':'用户类型','l_yqxz':'用气性质','m_jgmc':'价格名称','n_cby':'抄表员','o_blx':'表类型','p_jbcb':'机表抄表'
   },
   qnJgqCbwlwZD:{
-    'a_khbm':'客户编码','b_yhmc':'用户名称','c_dz':'地址','g_ql':'气量',
+    'a_khbm':'客户编码','b_yhmc':'用户名称','c_dz':'地址','d_qf':'起方','e_zf':'止方','g_ql':'气量',
     'h_je':'金额','i_yd':'月度','j_bh':'表号','k_yhlx':'用户类型','l_yqxz':'用气性质','m_jgmc':'价格名称','n_cby':'抄表员','o_blx':'表类型','p_jbcb':'物联网抄表'
   },
   qnJgqSfZD:{

package/src/filiale/shanxian/FmyGasDeviceQuery.vue

@@ -93,6 +93,29 @@
                     <input type="number" style="width:60%" class="input_search" v-model="model.diffAllyear2"
                            condition="diffAllyear <= {}" placeholder="最大值">
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <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 form-group">
+                    <label class="font_normal_body">用气性质</label>
+                    <v-select
+                      :value.sync="model.f_gasproperties"
+                      v-model="model.f_gasproperties"
+                      :options="$parent.$parent.gasproperties"
+                      placeholder="请选择"
+                      condition="f_gasproperties = '{}'"
+                      close-on-select
+                    ></v-select>
+                  </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
                     <v-select :value.sync="model.f_residential_area"
@@ -113,26 +136,30 @@
               <template partial='head'>
                 <tr>
                   <th rowspan="2"><nobr>序号</nobr></th>
-                  <th colspan="10"><nobr>用户信息</nobr></th>
+                  <th colspan="12"><nobr>用户信息</nobr></th>
                   <th colspan="8"><nobr>燃气计量装置</nobr></th>
                   <th colspan="6"><nobr>控制器设备</nobr></th>
                   <th colspan="6"><nobr>燃气连接管</nobr></th>
                   <th colspan="7"><nobr>调压设备</nobr></th>
                   <th colspan="11"><nobr>燃气报警器装置</nobr></th>
-                  <th colspan="6"><nobr>建档信息</nobr></th>
+                  <th colspan="5"><nobr>建档信息</nobr></th>
                   <th colspan="6"><nobr>安检信息</nobr></th>
+                  <th colspan="2"><nobr>初次充值信息</nobr></th>
+                  <th colspan="2"><nobr>最新充值信息</nobr></th>
                   <th rowspan="2"><nobr>备注</nobr></th>
                 </tr>
 
                 <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><nobr>变更记录</nobr></th>
 
@@ -183,15 +210,22 @@
                   <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><nobr>充值金额</nobr></th>
+                  <th><nobr>充值日期</nobr></th>
                 </tr>
               </template>
               <template partial='body'>
@@ -202,17 +236,17 @@
                 <!--用户信息-->
                 <td style="text-align: center;">
                   <nobr>
-                    {{row.f_paper_name}}
+                    {{row.f_taxpayer_id}}
                   </nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.f_taxpayer_id}}</nobr>
+                  <nobr>{{row.f_paper_name}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.f_legal_name}}</nobr>
+                  <nobr>{{row.f_user_name}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.f_idnumber}}</nobr>
+                  <nobr>{{row.f_address}}</nobr>
                 </td>
                 <td style="text-align: center;">
                   <nobr>{{row.f_legal_name}}</nobr>
@@ -221,13 +255,19 @@
                   <nobr>{{row.f_user_phone}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.f_user_name}}</nobr>
+                  <nobr>{{row.f_idnumber}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.f_address}}</nobr>
+                  <nobr>{{row.f_agent_name}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_agent_credentials}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_agent_phone}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.f_meter_brand}}</nobr>
+                  <nobr></nobr>
                 </td>
                 <td style="text-align: center;">
                   <nobr>
@@ -384,9 +424,9 @@
                 <td style="text-align: center;">
                   <nobr>{{row.f_gas_person}}</nobr>
                 </td>
-                <td style="text-align: center;" :style="$parent.$parent.$parent.ventilationYear(row.diffallyear)">
-                  <nobr>{{row.ventilation_years}}</nobr>
-                </td>
+<!--                <td style="text-align: center;" :style="$parent.$parent.$parent.ventilationYear(row.diffallyear)">-->
+<!--                  <nobr>{{row.ventilation_years}}</nobr>-->
+<!--                </td>-->
                 <td style="text-align: center;">
                   <nobr>
                     <span @click="$parent.$parent.$parent.dealmsg(row,'','建档信息')"><a><b>变更记录</b></a></span>
@@ -403,9 +443,9 @@
                 <td style="text-align: center;">
                   <nobr>{{row.f_total_gas}}</nobr>
                 </td>
-                <td style="text-align: center;">
-                  <nobr>{{row.f_balance_gas}}</nobr>
-                </td>
+<!--                <td style="text-align: center;">-->
+<!--                  <nobr>{{row.f_balance_gas}}</nobr>-->
+<!--                </td>-->
                 <td style="text-align: center;">
                   <nobr>{{row.f_defect_content}}</nobr>
                 </td>
@@ -413,6 +453,20 @@
                   <nobr>{{row.f_repair_date}}</nobr>
                 </td>
 
+                <td style="text-align: center;">
+                  <nobr>{{row.f_collection}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_operate_date}}</nobr>
+                </td>
+
+                <td style="text-align: center;">
+                  <nobr>{{row.f_collection1}}</nobr>
+                </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_operate_date1}}</nobr>
+                </td>
+
                 <!--备注-->
                 <td style="text-align: center;">
                   <nobr>{{row.f_comments}}</nobr>
@@ -472,6 +526,7 @@
         titles:'',
         other:[],
         footer:[],
+        gasproperties: [],
         model: new PagedList('rs/sql/fmyGasDeviceQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_userinfo_code desc'`}),
         criteriaShow: false,
         orgCondtionStr: '',
@@ -671,6 +726,20 @@
           return
         }
       },
+      userTypeChange() {
+        this.gasproperties = [];
+        if (this.$refs.paged.$refs.cri.model !== null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties = "";
+
+          // console.log("查看客户类型",this.$refs.paged.$refs.cri.model.f_user_type[0])
+          this.gasproperties = this.$appdata.getParam(
+            this.$refs.paged.$refs.cri.model.f_user_type[0]
+          );
+          // this.gasproperties.push({label: '全部', value: ''})
+        } else {
+          this.gasproperties = [{ label: "全部", value: "" }];
+        }
+      },
       //把数据库查询数据转换为下拉数据
       calculate(rows){
         let data = []
@@ -833,6 +902,12 @@
       getExportField() {
         return exportConfig.userConfig
       },
+      usertypes() {
+        return [
+          { label: " 全部 ", value: "" },
+          ...this.$appdata.getParam("用户类型"),
+        ];
+      },
       addressstate() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')]
       }

package/src/filiale/shanxian/GasDeviceQuery.vue

@@ -457,10 +457,10 @@
 
                 <!--每年充值-->
                 <td style="text-align: center;">
-                  <nobr>{{row.yeartimes}}</nobr>
+                  <nobr>{{row.f_max_operate_date}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.f_preamount_all}}</nobr>
+                  <nobr>{{row.f_max_preamount}}</nobr>
                 </td>
 
                 <!--安检信息-->
@@ -483,7 +483,7 @@
                   <!--<nobr>{{row.f_balance_gas}}</nobr>-->
                 <!--</td>-->
                 <td style="text-align: center;">
-                  <nobr>{{row.f_defect_content}}</nobr>
+                  <nobr>{{$parent.$parent.$parent.trouble(row.f_defect_content)}}</nobr>
                 </td>
                 <td style="text-align: center;">
                   <nobr>{{row.f_complete}}</nobr>
@@ -633,6 +633,22 @@
       })
     },
     methods: {
+      //转换json数值
+      trouble(val) {
+        const defect_content = JSON.parse(val)
+        let result = ''
+        if (defect_content.data) {
+          const jsonData = defect_content.data
+          for (const itemdata of jsonData) {
+            const keys = Object.keys(itemdata)
+            for (const itm of keys) {
+              const value = itemdata[itm]
+              result += itm + ':' + value
+            }
+          }
+        }
+        return result
+      },
       async dealmsg(row,id,type){
         this.titles = type+'变更记录'
         this.filechangeHistorys.rows = []

package/src/filiale/shanxian/InspectListUserNew.vue

@@ -7,7 +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">&emsp;&emsp;公司</label>
+              <label class="font_normal_body">组织机构</label>
               <right-tree @re-res="$parent.$parent.getorg"
                           :initresid='$parent.$parent.org'></right-tree>
             </div>
@@ -56,6 +56,7 @@
                           style="width:60%"
                           :value.sync="model.startDate"
                           :disabled-days-of-Week="[]"
+                          condition="delivery_date >= '{} 00:00:00'"
                           :format="'yyyy-MM-dd'"
                           :show-reset-button="reset">
               </datepicker>
@@ -66,6 +67,7 @@
                           v-model="model.endDate"
                           style="width:60%"
                           :value.sync="model.endDate"
+                          condition="delivery_date <= '{} 23:59:59'"
                           :disabled-days-of-Week="[]"
                           :format="'yyyy-MM-dd'"
                           :show-reset-button="reset">
@@ -136,11 +138,11 @@
                        condition="collection <= {} " placeholder="">
             </div>
 
-            <div class="col-sm-2 form-group">
-              <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 form-group">-->
+              <!--<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 form-group">
               <label class="font_normal_body">用户类型</label>
               <v-select :value.sync="model.f_user_type"
@@ -156,16 +158,16 @@
               <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_user_phone"
-                     condition="f_user_phone like '%{}%'" 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_user_phone"-->
+                     <!--condition="f_user_phone like '%{}%'" placeholder="用户电话">-->
+            <!--</div>-->
             <div class="col-sm-2 form-group">
               <label for="startDate" class="font_normal_body">建档开始</label>
               <datepicker id="createFileStartDate" placeholder="建档开始日期"
@@ -196,11 +198,13 @@
         <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>
@@ -210,6 +214,7 @@
             <th><nobr>气表品牌</nobr></th>
             <th><nobr>气价名称</nobr></th>
             <th><nobr>最后购气日期</nobr></th>
+            <th><nobr>未购气天数</nobr></th>
             <th><nobr>总购气次数</nobr></th>
 <!--            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>总抄表次数</nobr></th>-->
 
@@ -219,18 +224,20 @@
 
             <th><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>
+          <th style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></th>
+          <th style="text-align: center;"><nobr>{{row.f_residential_area}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_address}}</nobr></th>
           <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_olduserinfo_code}}</nobr></td>-->
           <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
           <th style="text-align: center;"><nobr>{{row.f_user_state}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_createfile_date}}</nobr></th>
@@ -240,12 +247,12 @@
           <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.diffday}}</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.collection}}</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>
@@ -291,11 +298,11 @@
         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_createfile_date":"建档日期","f_user_type":"用户类型",
+        getfield:{"f_orgname":"组织机构","f_residential_area":"小区名称","f_user_name":"用户名称","f_userinfo_code":"用户编号","f_address":"详细地址",
+          "f_meternumber":"表号", "f_user_state":"用户状态","f_user_phone":"用户电话","f_createfile_date":"建档日期","f_user_type":"用户类型",
           "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
-          "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购气量","collection":"总购金额",
-          "diffday":"未购气总天数"},
+          "delivery_date":"最后购气日期","diffday":"未购气总天数","cishu":"总购气次数","pregas":"总购气量","collection":"总购金额"
+          },
         model: new PagedList('rs/sql/inspectListNew', 50,{startDate:'this.model.startDate',endDate:'this.model.endDate'},{pregas: 0,collection: 0}),
         rows: null,
         //orgid:'',

package/src/filiale/tongchuan/ChargeQuery.vue

@@ -333,6 +333,14 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_terminal_num"
                          condition="f_terminal_num like '{}'" placeholder='终端号'>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&ensp;壁挂炉&ensp;</label>
+                  <v-select :value.sync="model.isbgl"
+                            v-model="model.isbgl"
+                            :options='$parent.$parent.bgl' placeholder='请选择'
+                            condition="isbgl = '{}'"
+                            close-on-select></v-select>
+                </div>
               </div>
             </div>
           </criteria>
@@ -912,7 +920,8 @@
         lastorgstr:'',
         // pos设备列表
         posEquipment: [{label: '全部',value: ''}],
-        showbottomsum:false  //页面下方是否有合计: 默认为false, 在watch修改
+        showbottomsum:false,  //页面下方是否有合计: 默认为false, 在watch修改
+        bgl:[{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}]
       }
     },
     ready() {

package/src/filiale/tongchuan/HandplanQuery.vue

@@ -131,10 +131,10 @@
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">&ensp;壁挂炉&ensp;</label>
-                  <v-select :value.sync="model.f_bgl"
-                            v-model="model.f_bgl"
+                  <v-select :value.sync="model.isbgl"
+                            v-model="model.isbgl"
                             :options='$parent.$parent.bgl' placeholder='请选择'
-                            condition="f_bgl = '{}'"
+                            condition="isbgl = '{}'"
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -777,7 +777,7 @@
         },
         batchmoneyShow:false,
         prices: [],
-        bgl:[{label: '全部', value: ''},{label: '有', value: '1'},{label: '无', value: '0'}],
+        bgl:[{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}],
         meterbooks:[{label: '全部',value: ''}],  //抄表册
         tempfalg :false,
         lastorgstr:'',

package/src/filiale/wenxi/GasStatistics.vue

@@ -274,6 +274,9 @@
           </tr>
         </table>
       </div>
+      <div  class="flex" style="width:99%;height:98%;margin-bottom:0px" 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>

package/src/filiale/wenxi/NewGasStatistics.vue

@@ -274,6 +274,9 @@
           </tr>
         </table>
       </div>
+      <div  class="flex" style="width:99%;height:98%;margin-bottom:0px" 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>
@@ -402,7 +405,6 @@
         this.rowdata=obj
         this.show=true
       },
-
       search (args) {
         args.condition =  `${args.condition}`+this.orgcondition
         this.condition = args.condition

package/src/filiale/wenxi/WebHandQuery.vue

@@ -18,7 +18,7 @@
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户编号</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_userinfo_code" placeholder='客户编号'
-                         condition="f_userinfo_code = '{}'" v-next-el='f_userinfo_code' v-el:meternumber @change="$parent.$parent.inputChange"
+                         condition="f_userinfo_code = '{}'" v-next-el='f_userinfo_code' v-el:meternumber
                   >
                 </div>
                 <div class="col-sm-2">
@@ -238,6 +238,9 @@
           </data-grid>
         </criteria-paged>
       </div>
+      <div  class="flex" style="width:99%;height:98%;margin-bottom:0px" 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>
@@ -281,7 +284,7 @@
         orgCondtionStr: '',
         model: new PagedList('rs/sql/manage_webmeterHandQuery', 50,{
           startDate: 'this.model.startDate',
-          endDate: 'this.model.endDate',f_userinfo_code: 'this.model.f_userinfo_code'
+          endDate: 'this.model.endDate'
         }),
         showbottomsum:false  //页面下方是否有合计: 默认为false, 在watch修改
       }
@@ -298,15 +301,15 @@
       // this.$refs.paged.$refs.criteria.search()
     },
     methods: {
-      inputChange () {
-        if (this.$refs.paged.$refs.criteria.model.f_userinfo_code){
-          this.$refs.paged.$refs.criteria.model.startDate = ''
-          this.$refs.paged.$refs.criteria.model.endDate = ''
-        }else{
-          this.$refs.paged.$refs.criteria.model.startDate = Util.addDate(new Date(),0).substring(0,10) + ' 00:00:00'
-          this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),0).substring(0,10) + ' 23:59:59'
-        }
-      },
+      // inputChange () {
+      //   if (this.$refs.paged.$refs.criteria.model.f_userinfo_code){
+      //     this.$refs.paged.$refs.criteria.model.startDate = ''
+      //     this.$refs.paged.$refs.criteria.model.endDate = ''
+      //   }else{
+      //     this.$refs.paged.$refs.criteria.model.startDate = Util.addDate(new Date(),0).substring(0,10) + ' 00:00:00'
+      //     this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),0).substring(0,10) + ' 23:59:59'
+      //   }
+      // },
       initParams() {
         // 初始化气表品牌
         let brandArr = []
@@ -401,8 +404,7 @@
         return {
           condition: this.condition,
           startDate:`${this.$refs.paged.$refs.criteria.model.startDate}`,
-          endDate:`${this.$refs.paged.$refs.criteria.model.endDate}`,
-          f_userinfo_code:`${this.$refs.paged.$refs.criteria.model.f_userinfo_code}`
+          endDate:`${this.$refs.paged.$refs.criteria.model.endDate}`
         }
       },
       getstart(){

package/src/filiale/xinkang/GasStatistics.vue

@@ -189,11 +189,11 @@
                 <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>
@@ -221,11 +221,11 @@
                 <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_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_gasproperties}}</nobr></th>
 
@@ -261,24 +261,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>
@@ -329,13 +329,7 @@
         },{
           f_oughtamount: 0,
           f_oughtfee: 0,
-          f_collection:0,
-          f_stairamount1:0,
-          f_stair1fee:0,
-          f_stairamount2:0,
-          f_stair2fee:0,
-          f_stairamount3:0,
-          f_stair3fee:0
+          f_collection:0
         }),
         showbottomsum:false  //页面下方是否有合计: 默认为false, 在watch修改
       }