manage-client 3.2.300 → 3.3.1

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':'地址','d_qf':'起方','e_zf':'止方','f_dj':'单价','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/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/main.js

@@ -1,72 +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 FilialeSaleManage from './filiale/qianneng/sale'
-import FilialeWebmeterManage from './filiale/qianneng/webmeterManage'
-import FilialeReportManage from './filiale/qianneng/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()
-webmeterManage()
-ManageHome()
-newmanage()
-reportManage()
-FilialeSaleManage()
-FilialeWebmeterManage()
-FilialeReportManage()
-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()
+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 }
+})
+