manage-client 3.2.237 → 3.2.239

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

@@ -912,6 +912,7 @@
           f_stair2fee:0,
           f_stair3amount:0,
           f_stair3fee:0,
+          f_dkje_z: 0,
         }),
         criteriaShow: false,
         orgCondtionStr: '',

package/src/filiale/wenxi/sale.js

@@ -1,23 +1,6 @@
 // 分公司特殊组件页面注册
 let specialComp = {
-
-  // 客户信息查询
-  'user-query': (resolve) => { require(['./UserQuery'], resolve) },
-  'res-select-group': (resolve) => { require(['./ResSelectGroupNew'], resolve) },
-  'fill-gas-query': (resolve) => { require(['./FillGasQuery'], resolve) },
-  'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
-  'handplan-query': (resolve) => { require(['./HandplanQuery'], resolve) },
-  // 调价记录查询
-   'price-change-query': (resolve) => { require(['./PriceChangeQuery'], resolve) },
-  // 用户设备查询
-  'user-equipment-query': (resolve) => { require(['./UserDeviceQuery'], resolve) },
-  // 表具设备查询
- 'equipment-query': (resolve) => { require(['./DeviceQuery'], resolve) },
-  // 表具查询
-  'meter-query': (resolve) => { require(['./MeterQuery'], resolve) },
-  // 其他业务散列
-  'bussiness-type': (resolve) => { require(['./BussinessType'], resolve) }
-
+  'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) }
 }
 exports.specialComp = specialComp
 

package/src/filiale/xiangyun/ChargeQuery.vue

@@ -802,6 +802,9 @@
               <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_write_money.toFixed(2)}}
+            </td>
           </tr>
         </table>
       </div>
@@ -906,6 +909,7 @@
           f_stair2fee:0,
           f_stair3amount:0,
           f_stair3fee:0,
+          f_write_money:0,
         }),
         criteriaShow: false,
         orgCondtionStr: '',