manage-client 3.2.208 → 3.2.209

package/src/filiale/shanxian/InspectListGas.vue

@@ -189,6 +189,27 @@
                            condition="sellpregas <= {} " placeholder="">
                   </div>
                 </div>
+                <div class="col-sm-2 ">
+                  <label for="startDate" class="font_normal_body">&emsp;建档开始</label>
+                  <datepicker id="createFileStartDate" placeholder="建档开始日期"
+                              v-model="model.createFileStartDate"
+                              style="width:60%"
+                              :value.sync="model.createFileStartDate"
+                              :format="'yyyy-MM-dd'"
+                              :show-reset-button="true"
+                              condition="f_createfile_date >= '{} 00:00:00'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 ">
+                  <label for="startDate" class="font_normal_body">&emsp;建档结束</label>
+                  <datepicker id="createFileEndDate" placeholder="建档结束日期" style="width:60%"
+                              v-model="model.createFileEndDate"
+                              :value.sync="model.createFileEndDate"
+                              :format="'yyyy-MM-dd'"
+                              :show-reset-button="true"
+                              condition="f_createfile_date <= '{} 23:59:59'">
+                  </datepicker>
+                </div>
               </div>
             </div>
           </criteria>
@@ -296,7 +317,7 @@
         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_address":"客户地址","f_user_type":"用户类型",
+          "f_user_name":"客户名称","f_user_state":"客户状态","f_address":"地址","f_user_type":"用户类型",
           "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
           "delivery_date":"最后购气日期",
           "sellcishu":"期间购气次数","sellpregas":"期间购气量","f_orgname":"组织机构"},

package/src/filiale/shanxian/Paymentpie.vue

@@ -0,0 +1,205 @@
+<template lang="html">
+  <div id="charts" style="display: flex">
+    <div id="ps" :style="{width:'50%',height:'98%'}"></div>
+    <div id="pp" :style="{width:'50%',height:'98%'}"></div>
+  </div>
+</template>
+
+<script>
+import * as Util from '../../Util'
+import co from 'co'
+import echarts from 'echarts'
+import { HttpResetClass } from 'vue-client'
+
+let getData = function * (self) {
+  let load = new HttpResetClass()
+  load.load('POST','rs/sql/sellinggasvalue',
+    {data: {startDate: self.startdate, endDate: self.enddate,key:'f_user_type',f_orgid:self.orgid}},
+    {resolveMsg: null, rejectMsg: null})
+    .then((res) => {
+      let arrparams = []
+      let gasdata = []
+      for (var i = 0; i < res.data.length; i++) {
+        let item = {}
+        arrparams[i] = res.data[i].name
+        item.name = res.data[i].name
+        item.value = res.data[i].gas_value
+        gasdata.push(item)
+      }
+      console.log("加载echars组件")
+      self.setGas(arrparams,gasdata)
+    })
+  let load1 = new HttpResetClass()
+  load1.load('POST','rs/sql/sellinggasvalue',
+  {data: {startDate: self.startdate, endDate: self.enddate,key:'f_payment',f_orgid:self.orgid}},
+  {resolveMsg: null, rejectMsg: null})
+  .then((res) => {
+    let arrparams = []
+    let moneydata = []
+    for (var i = 0; i < res.data.length; i++) {
+        let item1={}
+        arrparams[i] = res.data[i].name
+        item1.name = res.data[i].name
+        item1.value = res.data[i].money_value
+        moneydata.push(item1)
+    }
+    console.log("加载echars组件")
+    self.setMoney(arrparams,moneydata)
+  })
+}
+export default {
+  props: {
+    startdate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    enddate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    orgid: {
+      type: String
+    }
+},
+ data () {
+   return {
+     xc: '',
+     xd: ''
+   }
+ },
+ methods: {
+
+   setGas (arrparams,gasdata) {
+     console.log("进入组件")
+     let option1 = {
+       title: [
+         {
+           text: '收费来源气量金额饼状图',
+           x: '0%',
+           y: '0%',
+           textStyle: {
+             color: '#010606',
+             fontSize: 18,
+           }
+         },   {
+           text: '气量分布',
+           x: '40%',
+           y: '18%',
+           textStyle: {
+             color: '#010606',
+             fontSize: 16,
+           }
+         }],
+       tooltip: {
+         trigger: 'item',
+         formatter: '{a} <br/>{b}: {c} ({d}%)'
+       },
+       legend: {
+         orient: 'horizontal',
+         icon: 'circle',
+         x: 'center',
+         y: '80%',
+
+         textStyle: {
+           padding: [0, 0, 0, 4],
+           color: '#010606'
+         },
+         data: arrparams
+       },
+       series : [
+         {
+           name: '气量',
+           type: 'pie',
+           radius: ['0%', '40%'],
+           center: ['50%', '50%'],
+           hoverAnimation: true,
+           minAngle: 15,//最小角度
+           startAngle: 60, //起始角度
+           label: {normal: {show:true,}},
+           labelLine: { normal: {show:true,}},
+           data: gasdata
+         },
+       ]
+
+     }
+     this.xd = echarts.init(document.getElementById('ps'))
+     this.xd.setOption(option1,true)
+},
+   setMoney (arrparams,moneydata) {
+     console.log("进入组件")
+     let option = {
+       title: [
+         {
+           text: '',
+           x: '0%',
+           y: '0%',
+           textStyle: {
+             color: '#010606',
+             fontSize: 18,
+           }
+         }, {
+           text: '金额分布',
+           x: '40%',
+           y: '18%',
+           textStyle: {
+             color: '#010606',
+             fontSize: 16,
+           }
+         }],
+       tooltip: {
+         trigger: 'item',
+         formatter: '{a} <br/>{b}: {c} ({d}%)'
+       },
+       legend: {
+         orient: 'horizontal',
+         icon: 'circle',
+         x: 'center',
+         y: '80%',
+
+         textStyle: {
+           padding: [0, 0, 0, 4],
+           color: '#010606'
+         },
+         data: arrparams
+       },
+       series : [
+         {
+           name: '金额',
+           type: 'pie',
+           radius: ['0%', '40%'],
+           center: ['50%', '50%'],
+           hoverAnimation: true,
+           minAngle: 15,//最小角度
+           startAngle: 60, //起始角度
+           label: {normal: {show:true,}},
+           labelLine: { normal: {show:true,}},
+           data: moneydata
+         }
+       ]
+
+     }
+     this.xc = echarts.init(document.getElementById('pp'))
+     this.xc.setOption(option,true)
+   },
+   searchdata () {
+     let getGen =getData(this);
+     co(getGen);
+   }
+ },
+ ready () {
+   this.searchdata()
+ },
+  watch: {
+    'startdate' (val) {
+      this.searchdata()
+    },
+    'enddate' (val) {
+      this.searchdata()
+    },
+    'orgid' (val) {
+      this.searchdata()
+    }
+  }
+
+}
+</script>

package/src/filiale/shanxian/RecordInfoQuery.vue

@@ -508,7 +508,7 @@
                     <nobr>防盗卡号</nobr>
                   </th>
                   <th>
-                    <nobr>品牌</nobr>
+                    <nobr>表品牌</nobr>
                   </th>
                   <th>
                     <nobr>表号</nobr>

package/src/filiale/shanxian/SiteManager.vue

@@ -21,6 +21,7 @@ let getData = function * (self) {
     let numdata = []
     let gasdata = []
     let pricedata = []
+    console.log("res.data",res.data)
     for (var i = 0; i < res.data.length; i++) {
         arrparams[i] = res.data[i].name
         numdata[i] = res.data[i].num_value
@@ -61,7 +62,7 @@ export default {
          x: 'left'
        },
        tooltip : {
-         trigger: 'axis'
+         trigger: 'item'
        },
        legend: {
          x: 'left',
@@ -94,6 +95,7 @@ export default {
           name:'数量',
           type:'bar',
           data:numdata,
+          barMinHeight: 5,
           markLine : {
             data : [
               {type : 'average', name: '平均值'}

package/src/filiale/shanxian/config/exportConfig.js

@@ -206,10 +206,10 @@ export default{
     'f_meternumber': '表号'
   },
   compreConfig: {
-    'f_user_state': '客户状态', 'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_card_id': '卡号', 'f_user_name': '客户名称',
+    'f_user_state': '客户状态', 'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_card_id': '卡号', 'f_user_name': '户主姓名',
     'f_residential_area': '小区名称', 'f_building': '楼栋', 'f_unit': '单元', 'f_floor': '楼层', 'f_room': '门牌号', 'f_address': '详细地址',
     'f_user_phone': '联系电话', 'f_usetype': '使用类型',
-    'f_gas_date': '通气日期', 'f_price_name': '气价名称', 'f_position': '安装位置', 'f_meter_type': '类型', 'f_meter_brand': '品牌',
+    'f_gas_date': '通气日期', 'f_price_name': '气价名称', 'f_position': '安装位置', 'f_meter_type': '类型', 'f_meter_brand': '气表品牌',
     'f_meternumber': '表号', 'f_metertitles': '表封号', 'f_aroundmeter': '表向', 'f_install_date': '气表安装日期', 'f_meter_base': '气表底数',
     'f_balance': '账户余额', 'f_hand_date': '最后抄表日期', 'f_whether_hairpin': '是否发卡',
     'f_valve_state': '阀门状态', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质', 'value': '气价详情',

package/src/filiale/shanxian/reportManage.js

@@ -2,7 +2,10 @@
 let specialComp = {
   // 收费查询
   'site-manager': (resolve) => { require(['./SiteManager'], resolve) },
-
+  // 付款方式饼图
+  'paymentpie': (resolve) => {
+    require(['./Paymentpie'], resolve)
+  },
 }
 exports.specialComp = specialComp
 

package/src/filiale/shanxian/sale.js

@@ -4,8 +4,10 @@ let specialComp = {
   'inspect-list-user': (resolve) => { require(['./InspectListUser'], resolve) },
   'inspect-list-gas': (resolve) => { require(['./InspectListGas'], resolve) },
   'gas-inspection': (resolve) => { require(['./GasInspection'], resolve) },
-  'record-info-query': (resolve) => { require(['./RecordInfoQuery'], resolve) }
-
+  'record-info-query': (resolve) => { require(['./RecordInfoQuery'], resolve) },
+  'area-general-query': (resolve) => { require(['./AreaGeneralQuery'], resolve) },
+  'my-gas-device-query': (resolve) => { require(['./GasDeviceQuery'], resolve) },
+  'fmy-gas-device-query': (resolve) => { require(['./FmyGasDeviceQuery'], resolve) }
 }
 exports.specialComp = specialComp
 

package/src/filiale/wuhai/ReportList.vue

@@ -191,6 +191,15 @@
           </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 style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              总累购金额:&emsp;{{model.sums.f_total_fee}}
+            </td>
+          </tr>
 <!--          <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">-->
@@ -263,7 +272,7 @@
         orgid:[this.$login.f.orgid],
         criteriaShow:false,
         orgCondtionStr: '',
-        model: new PagedList('rs/sql/manage_getReportList', 50,{},{f_meterbalanceamt: 0,f_tablebase: 0,f_meterdebitamt: 0}),
+        model: new PagedList('rs/sql/manage_getReportList', 50,{},{f_meterbalanceamt: 0,f_tablebase: 0,f_meterdebitamt: 0,f_total_fee}),
         areaList:[]
       }
     },

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("WEINAN")
-webmeterManage("wuhai")
-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("wuhai")
+webmeterManage("wuhai")
+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 }
+})
+

package/src/reportManage.js

@@ -48,8 +48,8 @@ export default function (filiale) {
 
   // /* 通信信息查询 */
   Vue.component('communication', (resolve) => {
-    require(['./components/WebReport/Communication'], resolve)
-  }
+      require(['./components/WebReport/Communication'], resolve)
+    }
   )
   // /*阀门统计 */
   Vue.component('value-info', (resolve) => {
@@ -151,6 +151,10 @@ export default function (filiale) {
   Vue.component('manage-bus-summary', (resolve) => {
     require(['./components/SellReport/ManageBusSummary'], resolve)
   })
+  // 新收费结账报表 多查询条件（用户类型，付款方式，气表类型，气表品牌）
+  Vue.component('manage-bus-summary-new', (resolve) => {
+    require(['./components/SellReport/ManageBusSummaryNew'], resolve)
+  })
   // 报表展示组件（(机表)收费结账报表）
   Vue.component('jimanage-bus-summary', (resolve) => {
     require(['./components/SellReport/JiManageBusSummary'], resolve)
@@ -273,6 +277,10 @@ export default function (filiale) {
   Vue.component('manage-hand-sell-money', (resolve) => {
     require(['./components/SellReport/jingwei/ManageHandSellMoney'], resolve)
   })
+  // 报表展示组件（营业厅售气情况统计表） 经纬
+  Vue.component('manage-hand-sell-money-new', (resolve) => {
+    require(['./components/SellReport/jingwei/ManageHandSellMoneyNew'], resolve)
+  })
   // 报表展示组件（收费统计月报表） 经纬
   Vue.component('manage-month-sell-type', (resolve) => {
     require(['./components/SellReport/jingwei/ManageMonthSellType'], resolve)