manage-client 3.2.238 → 3.2.240

package/src/filiale/qianneng/QnJgqZhdacx.vue

@@ -32,7 +32,7 @@
                   <label class="font_normal_body">用气性质</label>
                   <v-select :value.sync="model.f_gasproperties"
                             :options='$parent.$parent.gasproperties' placeholder='请选择' v-model="model.f_gasproperties"
-                            condition="f_calculation in {}"
+                            condition="f_gasproperties in {}"
                             close-on-select></v-select>
                 </div>
 
@@ -53,38 +53,49 @@
                 </div>
                 <div class="row" v-show="$parent.$parent.criteriaShow">
                   <div class="col-sm-2 form-group">
-                    <label for="startDate" class="font_normal_body">通气日期起</label>
-                    <datepicker id="startDate" placeholder="通气日期起" style="width:60%"
+                    <label for="startDate" class="font_normal_body">开户时间起</label>
+                    <datepicker id="startDate" placeholder="开户日期起" style="width:60%"
                                 v-model="model.startDate"
                                 :value.sync="model.startDate"
                                 :format="'yyyy-MM-dd'"
                                 :show-reset-button="true"
-                                condition="f_gas_date >= '{} 00:00:00'">
+                                condition="f_open_date >= '{} 00:00:00'">
                     </datepicker>
                   </div>
                   <div class="col-sm-2 form-group">
-                    <label for="endDate" class="font_normal_body">通气日期止</label>
-                    <datepicker id="endDate" placeholder="通气日期止" style="width:60%"
+                    <label for="endDate" class="font_normal_body">开户日期止</label>
+                    <datepicker id="endDate" placeholder="开户日期止" style="width:60%"
                                 v-model="model.endDate"
                                 :value.sync="model.endDate"
                                 :format="'yyyy-MM-dd'"
                                 :show-reset-button="true"
-                                condition="f_gas_date <= '{} 23:59:59'">
+                                condition="f_open_date <= '{} 23:59:59'">
                     </datepicker>
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">气表类型</label>
                     <v-select :value.sync="model.f_meter_type"
                               :options='$parent.$parent.metertypes()' placeholder='请选择' v-model="model.f_meter_type"
-                              condition="f_meter_type = '{}'"
+                              condition="f_meter_type in {}"
                               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_meter_brand"
-                              v-model="model.f_meter_brand" multiple
-                              :options='$parent.$parent.meterbrands' placeholder='请选择'
-                              condition="f_meter_brand in {}"
+                    <label class="font_normal_body">客户状态</label>
+                    <v-select :value.sync="model.f_user_state"
+                              v-model="model.f_user_state" multiple
+                              :options='$parent.$parent.yhztArray' placeholder='请选择'
+                              condition="f_user_state in {}"
+                              valueSingle="正常"
+                    ></v-select>
+                  </div>
+
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">表状态</label>
+                    <v-select :value.sync="model.f_table_state"
+                              v-model="model.f_table_state" multiple
+                              :options='$parent.$parent.bjztArray' placeholder='请选择'
+                              condition="f_table_state in {}"
+                              valueSingle="正常"
                     ></v-select>
                   </div>
                   <div class="row">
@@ -95,6 +106,7 @@
                     </div>
                   </div>
                 </div>
+
               </div>
             </criteria>
 
@@ -117,7 +129,7 @@
                     <nobr>客户电话</nobr>
                   </th>
                   <th>
-                    <nobr>通气日期</nobr>
+                    <nobr>开户日期</nobr>
                   </th>
                   <th>
                     <nobr>气价名称</nobr>
@@ -152,6 +164,9 @@
                   <th>
                     <nobr>备注信息</nobr>
                   </th>
+                  <th>
+                    <nobr>通气日期</nobr>
+                  </th>
                 </tr>
               </template>
               <template partial='body'>
@@ -171,7 +186,7 @@
                   <nobr>{{row.f_user_phone}}</nobr>
                 </td>
                 <td style="text-align: center;">
-                  <nobr>{{row.f_gas_date}}</nobr>
+                  <nobr>{{row.f_open_date}}</nobr>
                 </td>
                 <td style="text-align: center;">
                   <nobr>{{row.f_price_name}}</nobr>
@@ -206,6 +221,9 @@
                 <td style="text-align: center;">
                   <nobr>{{row.f_comments}}</nobr>
                 </td>
+                <td style="text-align: center;">
+                  <nobr>{{row.f_gas_date}}</nobr>
+                </td>
               </template>
               <template partial='foot'>
               </template>
@@ -306,6 +324,8 @@
         deviceInfo:{},
         condition2:'',
 
+        yhztArray:[],
+        bjztArray:[],
 
         weixinSign:[{label:"全部",value:""},{label:"已绑定",value:"已绑定"},{label:"未绑定",value:"未绑定"}],
         //小区
@@ -326,12 +346,48 @@
       }).catch((error) => {
         this.$emit('error', error)
       })
-      this.initAreas(this.$login.f.orgid)
-      self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
-      self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
-
+      //this.initAreas(this.$login.f.orgid)
+      //self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString()
+      //self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
+      this.getJgqYhzt();
+      this.getJgqBjzt();
     },
     methods: {
+      //-------------------------------------------------------------
+      async getJgqYhzt(){
+        let HttpReset = new HttpResetClass()
+        var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
+          data: {
+            condition: '1=1',
+            tablename: 'qn_jgq_zhdacx',
+            groupitem: 'f_user_state',
+            orderitem: 'f_user_state',
+            items: 'f_user_state'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取失败!'})
+        let nameArr = [{label: '全部', value: ''}]
+        for (let row of data.data){
+          nameArr.push({label: row.f_user_state, value: row.f_user_state})
+        }
+        this.yhztArray = nameArr
+      },
+      async getJgqBjzt(){
+        let HttpReset = new HttpResetClass()
+        var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
+          data: {
+            condition: '1=1',
+            tablename: 'qn_jgq_zhdacx',
+            groupitem: 'f_table_state',
+            orderitem: 'f_table_state',
+            items: 'f_table_state'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取失败!'})
+        let nameArr = [{label: '全部', value: ''}]
+        for (let row of data.data){
+          nameArr.push({label: row.f_table_state, value: row.f_table_state})
+        }
+        this.bjztArray = nameArr
+      },
       async getinputtores () {
         // 获取抄表员
         let rs = []
@@ -655,7 +711,7 @@
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('结算方式')]
       },
       metertypes() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表分类')]
       },
       accountsState() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('下账状态')]

package/src/filiale/qianneng/exportConfig.js

@@ -124,9 +124,9 @@ export default{
   },
   qnJgqZhdacx:{
     'f_userinfo_code':'客户编号',	'f_user_name':'客户名称',	'f_user_state':'客户状态',	'f_address':'客户地址',	'f_user_phone':'客户电话',
-    'f_gas_date':'通气日期',	'f_price_name':'气价名称',	'f_meter_type':'气表类型',	'f_meter_brand':'气表品牌',	'f_meter_style':'气表型号',
+    'f_open_date':'开户日期',	'f_price_name':'气价名称',	'f_meter_type':'气表类型',	'f_meter_brand':'气表品牌',	'f_meter_style':'气表型号',
     'f_meternumber':'表号',	 'f_user_type':'客户类型',	'f_gasproperties':'用气性质',	'f_credentials':'证件类型',
-    'f_idnumber':'证件号码',	'f_table_state':'表状态',	'f_comments':'备注信息'
+    'f_idnumber':'证件号码',	'f_table_state':'表状态',	'f_comments':'备注信息', 'f_gas_date':'通气日期'
   },
   qnJgqMgqbb:{
     'b_yhh':'用户号','c_yhmc':'用户名','d_yqdz':'地址','e_spmc':'商品名称','g_cbqj':'抄表期间','h_csqf':'起方','i_cszf':'止方',
@@ -139,7 +139,7 @@ export default{
   qnJgqGsxsmx:{
     'b_yhh':'用户号','c_yhmc':'用户名','d_yqdz':'用气地址','e_spmc':'商品名称','g_cbqj':'抄表期间','h_csqf':'起方','i_cszf':'止方',
     'j_ysql':'气量','k_dj':'单价','l_je':'金额','m_znj':'违约金','o_sjje':'金额合计','u_xyqxz':'用气性质','s_jfrq':'日期',
-    't_jfyf':'月份','bjlx':'表具类型','sfyg':'收费员','cbg':'抄表员'
+    't_jfyf':'月份','bjlx':'表具类型','sfyg':'收费员','cbg':'抄表员','tqrq':'通气日期'
   },
   qnJgqMyhzbb:{
     'b_yhh':'用户号','c_yhmc':'用户名','d_yqdz':'地址','khlx':'客户类型','r_yqxzcfl':'用气性质','nyql':'年用气量','nje':'年用气金额'
@@ -147,7 +147,7 @@ export default{
   qnJgqMyxsmx:{
     'b_yhh':'用户号','c_yhmc':'用户名','d_yqdz':'地址','e_spmc':'商品名称','g_cbqj':'抄表期间','h_csqf':'起方','i_cszf':'止方',
     'j_ysql':'气量','k_dj':'单价','l_je':'金额','m_znj':'违约金',/**'n_jc':'价差',**/'o_sjje':'金额合计','r_yqxzcfl':'用气性质',
-    's_jfrq':'日期','t_jfyf':'月份','bjlx':'表具类型','sfyg':'收费员','cbg':'抄表员'
+    's_jfrq':'日期','t_jfyf':'月份','bjlx':'表具类型','sfyg':'收费员','cbg':'抄表员','tqrq':'通气日期'
   },
   qnJgqXsjgbb:{
     'a_yf':'月份','b_hjql':'合计气量','c_hjhs':'合计户数','d_gyql':'工业气量','e_gyhs':'工业户数','f_syql':'商业气量','g_syhs':'商业户数',

package/src/filiale/shanxian/RecordInfoQuery.vue

@@ -125,7 +125,7 @@
                   </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.trim="model.f_meternumber"
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
                            condition="f_meternumber like '%{}%'" placeholder='燃气表号'>
                   </div>
 
@@ -148,7 +148,7 @@
                   </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.trim="model.f_meter_number"
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_meter_number"
                            condition="f_meternumber = '{}'" placeholder='表号'>
                   </div>
                   <div class="col-sm-2 form-group">
@@ -396,7 +396,7 @@
                   </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.trim="model.f_meternumber"
+                    <input  type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
                             condition="f_meternumber like '%{}%'" placeholder='气表表号'>
                   </div>
                   <div class="col-sm-2 form-group">

package/src/filiale/shanxian/SiteManager.vue

@@ -8,28 +8,36 @@
 import * as Util from '../../Util'
 import co from 'co'
 import echarts from 'echarts'
-import {HttpResetClass } from 'vue-client'
+import {HttpResetClass} from 'vue-client'
 
-let getData = function * (self) {
+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) => {
-    self.texttile = '用户类型'
-    let arrparams = []
-    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
-        gasdata[i] = res.data[i].gas_value
-        pricedata[i] = res.data[i].money_value
-    }
-    self.set(arrparams,numdata,gasdata,pricedata)
-  })
+  load.load('POST', 'rs/logic/sellinggasvalue',
+    {data: {startDate: self.startdate, endDate: self.enddate, key: 'f_user_type', f_orgid: self.orgid}},
+    {resolveMsg: null, rejectMsg: null})
+    .then((res) => {
+      console.log(res + 'aaaaaaaaaaaa')
+      self.texttile = '用户类型'
+      let arrparams1 = []
+      let numdata1 = []
+      let gasdata1 = []
+      let pricedata1 = []
+      let arrparams2 = []
+      let numdata2 = []
+      let gasdata2 = []
+      let pricedata2 = []
+      console.log('res.data', res.data)
+      console.log(res.data.name1)
+      arrparams1[0] = res.data.name1
+      numdata1[0] = res.data.num_value1
+      gasdata1[0] = res.data.gas_value1
+      pricedata1[0] = res.data.money_value1
+      arrparams2[0] = res.data.name2
+      numdata2[0] = res.data.num_value2
+      gasdata2[0] = res.data.gas_value2
+      pricedata2[0] = res.data.money_value2
+      self.set(arrparams1, numdata1, gasdata1, pricedata1, arrparams2, numdata2, gasdata2, pricedata2)
+    })
 }
 export default {
   props: {
@@ -44,150 +52,198 @@ export default {
     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',
-         formatter: function (params) {
-           var str = ''
-           str += params[0].name + '</br>'
-           for (var i = 0; i < params.length; i++) {
-             if (i === 0) {
-               str += params[i].marker + params[i].seriesName + ': ' + params[i].data + '笔' + '</br>'
-             } else if (i === 1) {
-               str += params[i].marker + params[i].seriesName + ': ' + params[i].data + 'm³' + '</br>'
-             } else {
-               str += params[i].marker + params[i].seriesName + ': ' + params[i].data + '元' + '</br>'
-             }
-           }
-           return str
-         }
-       },
-       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,
-          barMinHeight: 5,
-          itemStyle: {
-            normal: {
-              color: function (params) {
-                // 给出颜色组
-                var colorList = ['#FE8463', '#9BCA63', '#FAD860', '#F3A43B',
-                  '#60C0DD', '#F4E001', '#F0805A']
-                return colorList[params.dataIndex]
-              }
+  },
+  data () {
+    title: '站点管理'
+    return {
+      texttile: '',
+      xc: ''
+    }
+  },
+  methods: {
+    set (arrparams1, numdata1, gasdata1, pricedata1, arrparams2, numdata2, gasdata2, pricedata2) {
+      this.xc = echarts.init(document.getElementById('gph'))
+      this.xc.setOption({
+        title: {
+          text: '民用及非民用缴费散列图',
+          subtext: '数据查询来源',
+          x: 'left'
+        },
+        tooltip: {
+          trigger: 'item',
+          formatter: function (params) {
+            let str = ''
+            console.log(JSON.stringify(params) + '-----------')
+            if (params.seriesName.includes('气量')) {
+              str += params.seriesName + ': ' + params.value + 'm³'
+            } else if (params.seriesName.includes('数量')) {
+              str += params.seriesName + ': ' + params.value + '笔'
+            } else {
+              str += params.seriesName + ': ' + params.value + '元'
             }
-          },
-          markLine : {
-            data : [
-              {type : 'average', name: '平均值'}
-            ]
+            return str
+          }
+        },
+        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}
           }
         },
-        {
-          name:'气量',
-          type:'bar',
-          data:gasdata,
-          itemStyle: {
-            normal: {
-              color: function (params) {
-                // 给出颜色组
-                var colorList = ['#AF9E22', '#45AC89', '#C2DF99',
-                  '#183467', '#26C0C0']
-                return colorList[params.dataIndex]
+        calculable: true,
+        xAxis: [
+          {
+            type: 'category',
+            data: ['数据']
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value'
+          }
+        ],
+        series: [
+          {
+            name: '民用数量',
+            type: 'bar',
+            data: numdata1,
+            barMinHeight: 5,
+            itemStyle: {
+              normal: {
+                color: function (params) {
+                  // 给出颜色组
+                  var colorList = ['#FE8463']
+                  return colorList[params.dataIndex]
+                }
               }
+            },
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
+              ]
             }
           },
-          markLine : {
-            data : [
-              {type : 'average', name: '平均值'}
-            ]
-          }
-        },
-        {
-          name:'金额',
-          type:'bar',
-          data:pricedata,
-          itemStyle: {
-            normal: {
-              color: function (params) {
-                // 给出颜色组
-                var colorList = ['#C1232B', '#B5C334', '#FCCE10', '#E87C25',
-                  '#27727B', '#D7504B', '#C6E579']
-                return colorList[params.dataIndex]
+          {
+            name: '民用气量',
+            type: 'bar',
+            data: gasdata1,
+            itemStyle: {
+              normal: {
+                color: function (params) {
+                  // 给出颜色组
+                  var colorList = ['#45AC89']
+                  return colorList[params.dataIndex]
+                }
+              }
+            },
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
+              ]
+            }
+          },
+          {
+            name: '民用金额',
+            type: 'bar',
+            data: pricedata1,
+            itemStyle: {
+              normal: {
+                color: function (params) {
+                  // 给出颜色组
+                  var colorList = ['#183467']
+                  return colorList[params.dataIndex]
+                }
+              }
+            }
+          },
+          {
+            name: '非民用数量',
+            type: 'bar',
+            data: numdata2,
+            barMinHeight: 5,
+            itemStyle: {
+              normal: {
+                color: function (params) {
+                  // 给出颜色组
+                  var colorList = ['#9BCA63']
+                  return colorList[params.dataIndex]
+                }
+              }
+            },
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
+              ]
+            }
+          },
+          {
+            name: '非民用气量',
+            type: 'bar',
+            data: gasdata2,
+            itemStyle: {
+              normal: {
+                color: function (params) {
+                  // 给出颜色组
+                  var colorList = ['#26C0C0']
+                  return colorList[params.dataIndex]
+                }
               }
+            },
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
+              ]
             }
           },
-          markLine : {
-          data : [
-              {type : 'average', name : '平均值'}
-            ]
+          {
+            name: '非民用金额',
+            type: 'bar',
+            data: pricedata2,
+            itemStyle: {
+              normal: {
+                color: function (params) {
+                  // 给出颜色组
+                  var colorList = ['#27727B']
+                  return colorList[params.dataIndex]
+                }
+              }
+            },
+            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()
-   }
- }
+        ]
+      })
+    },
+    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/wenxi/ChargeQuery.vue

@@ -911,7 +911,7 @@
           f_stair2amount:0,
           f_stair2fee:0,
           f_stair3amount:0,
-          f_stair3fee:0,
+          f_stair3fee:0
         }),
         criteriaShow: false,
         orgCondtionStr: '',