manage-client 3.2.140 → 3.2.144

package/src/components/sale/filesquery/UserQuery.vue

@@ -320,6 +320,9 @@
                     <data-order field="f_address" name="客户地址"
                                 :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                   </th>
+                  <th>
+                    <nobr>表号</nobr>
+                  </th>
                   <th>
                     <nobr>小区</nobr>
                   </th>
@@ -412,6 +415,9 @@
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_address}}</nobr>
                 </td>
+                <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_meternumber}}</nobr>
+                </td>
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_residential_area}}</nobr>
                 </td>

package/src/components/sale/filesquery/filequerydetail/ChargeQueryDetail.vue

@@ -56,7 +56,7 @@
                 <nobr>金额</nobr>
               </th>
               <th>
-                <nobr>滞纳金</nobr>
+                <nobr>违约金</nobr>
               </th>
               <th>
                 <nobr>收款</nobr>

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

@@ -116,7 +116,7 @@
               <label class="font_normal_body">用户状态</label>
               <v-select
                 placeholder='用户状态'
-                value-single="true"
+                value-single
                 style="width:60%"
                 :value.sync="model.f_user_state"
                 v-model="model.f_user_state"
@@ -354,6 +354,7 @@
     self.$refs.paged.$refs.cri.model.startDate =  year+'-01-01 00:00:00'
     // self.$refs.paged.$refs.cri.model.startDate = Util.toStandardDateString() + ' 00:00:00'
     self.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
+    self.$refs.paged.$refs.cri.model.f_user_state='正常'
     self.$refs.paged.$refs.cri.search()
   }
   export default {

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

@@ -153,7 +153,7 @@
         if (this.groupNameForSql&& this.groupNameForSql !== 'undefined') {
           let load = new HttpResetClass()
           let res = await load.load('POST', 'rs/sql/webmeter_getUserGasSum',
-            {data: {condition: this.conditionForSql, groupname: this.groupNameForSql}},
+            {data: {condition: this.conditionForSql, groupname: this.groupNameForSql,startDate: this.startdate, endDate: this.enddate}},
             {resolveMsg: null, rejectMsg: null})
           console.log('res返回', res)
           this.model2 = res.data

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

@@ -116,7 +116,7 @@
               <label class="font_normal_body">用户状态</label>
               <v-select
                 placeholder='用户状态'
-                value-single="true"
+                value-single
                 style="width:60%"
                 :value.sync="model.f_user_state"
                 v-model="model.f_user_state"
@@ -314,6 +314,7 @@
     self.initParams()
     self.$refs.paged.$refs.cri.model.notappear='不包含'
     self.$refs.paged.$refs.cri.model.SLday1=10
+    self.$refs.paged.$refs.cri.model.f_user_state='正常'
     self.$refs.paged.$refs.cri.search()
   }
   export default {

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

@@ -55,7 +55,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_address" placeholder='客户地址'
-                         condition="u.f_address like '%{}%'" v-next-el='userid' v-el:username>
+                         condition="s.f_address like '%{}%'" v-next-el='userid' v-el:username>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户类型</label>

package/src/filiale/WEINAN/manage/ChangeMeterQuery.vue

@@ -47,15 +47,15 @@
                   <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
                   <!--<button class="btn btn-default" @click="$parent.$parent.stamp()">打印</button>-->
 
-                  <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
-                                :field="$parent.$parent.getfield" :header="$parent.$parent.other"
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield" :
                                 sqlurl="rs/logic/exportfile" sql-name="changeMeterQuery" template-name='换表查询导出'
                                 :choose-col="true">
                   </export-excel>
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
                                :defaultfield="$parent.$parent.defaultfield"
                               titletable="换表记录"
-                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+                              ></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>
@@ -383,7 +383,7 @@
     // self.$refs.paged.$refs.cri.search()
     await self.$MagLoadParams.loadParam()
     self.initParams()
-    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+    // self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
   export default {
 
@@ -458,23 +458,23 @@
         this.rowdata=obj
         this.show=true
       },
-      getotherfooter () {
+      // 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);
-      },
+        // 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);
+      // },
       async initParams() {
         // 初始化气表品牌
         let brandArr = []
@@ -494,7 +494,7 @@
         }
         args.condition = `${args.condition}` + this.orgCondtionStr
         this.model.search(args.condition, args.model)
-        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+        // this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
       },
       clear() {
         //清空部门和人员
@@ -571,12 +571,12 @@
       'modelval.length'() {
         this.put()
       },
-      sumsmodel:{
-        handler: function(val) {
-          this.getotherfooter();
-        },
-        deep: true
-      }
+      // sumsmodel:{
+      //   handler: function(val) {
+      //     this.getotherfooter();
+      //   },
+      //   deep: true
+      // }
     },
     computed: {
       // getstart(){

package/src/filiale/dongguan/components/SellReport/BankManager.vue

@@ -0,0 +1,146 @@
+<template lang="html">
+  <div id="charts">
+    <div id="bm" :style="{width:'100%',height:'100%'}"></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/userfilesvalues',
+  {data: {startDate: self.startdate, endDate: self.enddate, f_orgid: self.orgid}},
+  {resolveMsg: null, rejectMsg: null})
+  .then((res) => {
+    self.texttile = '用户类型'
+    // let arrparams = []
+    console.log('获取数据。。', res.data)
+    let org = []
+    //let name = []
+    let minyongvalue=[]
+    let feiminyongvalue=[]
+    for (var i = 0; i < res.data.length; i++) {
+        if (!org.includes(res.data[i].org)) {
+          org.push(res.data[i].org)
+        }
+        if (res.data[i].name === '民用') {
+          minyongvalue[org.indexOf(res.data[i].org)] = res.data[i].number
+        }else{
+          feiminyongvalue[org.indexOf(res.data[i].org)]= res.data[i].number
+        }
+    }
+    self.set(org,minyongvalue,feiminyongvalue)
+  })
+}
+export default {
+  props: {
+    startdate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    enddate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    orgid: {
+      type: String
+    }
+},
+ data () {
+   title: '银行管理'
+   return {
+     texttile: '',
+     xc: '',
+
+     minyongvalue: [],
+     feiminyongvalue: []
+   }
+ },
+ methods: {
+   set (org,minyongvalue,feiminyongvalue) {
+     this.xc = echarts.init(document.getElementById('bm'))
+     this.xc.setOption({
+       title : {
+         text: '新增汇总',
+         subtext: '数据查询来源',
+         x: 'left'
+       },
+       tooltip : {
+         trigger: 'axis'
+       },
+       legend: {
+         x: 'left',
+         y: 'bottom',
+         data: ['民用','非民用']
+       },
+       toolbox: {
+         show : true,
+         feature : {
+           dataView : {show: true, readOnly: false},
+           magicType : {show: true, type: ['line', 'bar']},
+           restore : {show: true},
+           saveAsImage : {show: true}
+         }
+       },
+       calculable : true,
+       xAxis : [
+         {
+           type : 'category',
+           data : org
+         }
+      ],
+      yAxis : [
+        {
+          type : 'value'
+        }
+      ],
+      series : [
+        {
+          name:'民用',
+          type:'bar',
+          data:minyongvalue,
+          markLine : {
+            data : [
+              {type : 'average', name: '平均值'}
+            ]
+          }
+        },
+        {
+          name:'非民用',
+          type:'bar',
+          data:feiminyongvalue,
+          markLine : {
+          data : [
+              {type : 'average', name : '平均值'}
+            ]
+          }
+        }
+      ]
+     })
+   },
+   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/dongguan/components/SellReport/SiteManager.vue

@@ -0,0 +1,147 @@
+<template lang="html">
+  <div id="charts">
+    <div id="gph" :style="{width:'100%',height:'100%'}"></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_depname',f_orgid: self.orgid}},
+  {resolveMsg: null, rejectMsg: null})
+  .then((res) => {
+    self.texttile = '用户类型'
+    let arrparams = []
+    let numdata = []
+    let gasdata = []
+    let pricedata = []
+    for (var i = 0; i < res.data.length; i++) {
+        arrparams[i] = res.data[i].name
+        numdata[i] = res.data[i].num_value
+        gasdata[i] = res.data[i].gas_value
+        pricedata[i] = res.data[i].money_value
+    }
+    self.set(arrparams,numdata,gasdata,pricedata)
+  })
+}
+export default {
+  props: {
+    startdate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    enddate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    orgid: {
+      type: String
+    }
+},
+ data () {
+   title: '站点管理'
+   return {
+     texttile: '',
+     xc: ''
+   }
+ },
+ methods: {
+   set (arrparams,numdata,gasdata,pricedata) {
+     this.xc = echarts.init(document.getElementById('gph'))
+     this.xc.setOption({
+       title : {
+         text: '营收汇总',
+         subtext: '数据查询来源',
+         x: 'left'
+       },
+       tooltip : {
+         trigger: 'axis'
+       },
+       legend: {
+         x: 'left',
+         y: 'bottom',
+         data: ['数量','气量','金额']
+       },
+       toolbox: {
+         show : true,
+         feature : {
+           dataView : {show: true, readOnly: false},
+           magicType : {show: true, type: ['line', 'bar']},
+           restore : {show: true},
+           saveAsImage : {show: true}
+         }
+       },
+       calculable : true,
+       xAxis : [
+         {
+           type : 'category',
+           data : arrparams
+         }
+      ],
+      yAxis : [
+        {
+          type : 'value'
+        }
+      ],
+      series : [
+        {
+          name:'数量',
+          type:'bar',
+          data:numdata,
+          markLine : {
+            data : [
+              {type : 'average', name: '平均值'}
+            ]
+          }
+        },
+        {
+          name:'气量',
+          type:'bar',
+          data:gasdata,
+          markLine : {
+            data : [
+              {type : 'average', name: '平均值'}
+            ]
+          }
+        },
+        {
+          name:'金额',
+          type:'bar',
+          data:pricedata,
+          markLine : {
+          data : [
+              {type : 'average', name : '平均值'}
+            ]
+          }
+        }
+      ]
+     })
+   },
+   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/dongguan/components/WebReport/BussinessType.vue

@@ -0,0 +1,137 @@
+<template lang="html">
+  <div id="charts">
+    <div id="sm" :style="{width:'100%',height:'98%'}"></div>
+  </div>
+</template>
+
+<script>
+  /* eslint-disable indent,key-spacing,no-labels */
+
+  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/BusinessType',
+  {data: {startDate: self.startdate, endDate: self.enddate,f_orgid: self.orgid}},
+  {resolveMsg: null, rejectMsg: null})
+  .then((res) => {
+    self.texttile = '用户类型'
+    let arrparams = []
+    let numdata = []
+    let pricedata = []
+    for (var i = 0; i < res.data.length; i++) {
+        arrparams[i] = res.data[i].name
+        numdata[i] = res.data[i].num
+        pricedata[i] = res.data[i].money
+    }
+    self.set(arrparams,numdata,pricedata)
+  })
+}
+export default {
+  props: {
+    startdate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    enddate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    orgid: {
+      type: String
+    }
+  },
+ data () {
+    title: '业务类型'
+   return {
+     texttile: '',
+     xc: ''
+   }
+ },
+ methods: {
+   set (arrparams,numdata,pricedata) {
+     this.xc = echarts.init(document.getElementById('sm'))
+     this.xc.setOption({
+       title : {
+         text: '非气体营收汇总',
+         subtext: '数据查询来源',
+         x: 'left'
+       },
+        tooltip:{
+          trigger:'axis'
+        },
+       legend: {
+         x: 'left',
+         y: 'bottom',
+         data: ['数量','金额']
+       },
+       toolbox: {
+         show : true,
+         feature : {
+           dataView : {show: true, readOnly: false},
+           magicType : {show: true, type: ['line', 'bar']},
+           restore : {show: true},
+           saveAsImage : {show: true}
+         }
+       },
+       calculable : true,
+       xAxis : [
+         {
+           type : 'category',
+           data : arrparams
+         }
+      ],
+      yAxis : [
+        {
+          type : 'value'
+        }
+      ],
+      series : [
+        {
+          name:'数量',
+          type:'bar',
+          data:numdata,
+          markLine : {
+            data : [
+              {type : 'average', name: '平均值'}
+            ]
+          }
+        },
+        {
+          name:'金额',
+          type:'bar',
+          data:pricedata,
+          markLine : {
+          data : [
+              {type : 'average', name : '平均值'}
+            ]
+          }
+        }
+      ]
+     })
+   },
+   searchdata () {
+     let getGen = getData(this)
+     co(getGen)
+   }
+ },
+ ready () {
+   this.searchdata()
+ },
+ watch: {
+   'startdate' (val) {
+     this.searchdata()
+   },
+   'enddate' (val) {
+     this.searchdata()
+   },
+   'orgid' (val) {
+     this.searchdata()
+   }
+ }
+
+}
+</script>