manage-client 3.2.4 → 3.2.8

package/src/components/webmeter/report/ReportList.vue

@@ -41,6 +41,18 @@
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_username" placeholder='客户名称'
                          condition="ui.f_user_name like '%{}%'" v-next-el='userid' v-el:username>
                 </div>
+
+                <div class="span" style="float:right;margin-top:10px">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
+                  <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
+                                :field="$parent.$parent.getfield"
+                                sqlurl="rs/logic/exportfile" sql-name="manage_getReportList" template-name='上报查询'
+                                :choose-col="true"></export-excel>
+                  <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>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
                 <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='客户地址'
@@ -77,18 +89,7 @@
                             close-on-select></v-select>
                 </div>
 
-                <div class="span" style="float:right;margin-top:10px">
-                  <button class="button_search button_spacing" @click="search()">查询</button>
-                  <button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
-                  <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
-                                :field="$parent.$parent.getfield"
-                                sqlurl="rs/logic/exportfile" sql-name="manage_getReportList" template-name='上报查询'
-                                :choose-col="true"></export-excel>
-                  <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>
-              <div class="row" v-show="$parent.$parent.criteriaShow">
-                <div class="col-sm-2 " >
+                <div class="col-sm-2 form-group" >
                   <label class="font_normal_body" >开始时间</label>
                   <datepicker style="width: 60%" placeholder="大于等于"
                               :value.sync="model.f_start_date"
@@ -97,7 +98,7 @@
                               condition="m.f_hand_date >= '{}'"
                   ></datepicker>
                 </div>
-                <div class="col-sm-2 " >
+                <div class="col-sm-2 form-group" >
                   <label class="font_normal_body">结束时间</label>
                   <datepicker style="width: 60%" placeholder="小于等于"
                               :value.sync="model.f_end_date"

package/src/filiale/WEINAN/EchartsBox.vue

@@ -1,110 +1,110 @@
-<template lang="html">
-  <div :class="classname" v-if="jurisdiction.includes('首页')" :style="{width:width,height:height}">
-    <div class="form-horizontal select-overspread container-fluid auto">
-      <div class="row">
-        <div class="col-sm-3 form-group">
-          <label class="font_normal_body" for="startDate">开始日期:</label>
-          <datepicker id="startDate" placeholder="开始日期"
-                      style="width:60%"
-                      v-model="model.startDate"
-                      :value.sync="model.startDate"
-                      :disabled-days-of-Week="[]"
-                      class="datepicker"
-                      :format="'yyyy-MM-dd'"
-                      :show-reset-button="reset">
-          </datepicker>
-        </div>
-        <div class="col-sm-3 form-group">
-          <label class="font_normal_body" for="endDate">结束日期:</label>
-          <datepicker id="endDate" placeholder="结束日期"
-                      style="width:60%"
-                      class="datepicker"
-                      v-model="model.endDate"
-                      :value.sync="model.endDate"
-                      :disabled-days-of-Week="[]"
-                      :format="'yyyy-MM-dd'"
-                      :show-reset-button="reset">
-          </datepicker>
-        </div>
-        <div class="col-sm-3 form-group">
-          <label class="font_normal_body" for="endDate">使用公司:</label>
-          <res-select restype='organization'
-                      @res-select="getRes"
-                      :initresid="model.id">
-          </res-select>
-        </div>
-      </div>
-    </div>
-    <div style="height: 97%;">
-      <div class="flex-row" style="flex: 1;border-bottom: 1px dashed #888;height: 48%">
-        <div style="flex: 1;border-right: 1px dashed #888;width: 50%">
-          <site-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
-                        v-ref:pay></site-manager>
-        </div>
-        <div style="flex: 1;width: 50%">
-          <bank-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
-                        v-ref:pay></bank-manager>
-        </div>
-      </div>
-      <div class="flex-row" style="flex: 1;height: 48%">
-
-        <div class="flex-row" style="flex: 1;width: 50%;border-right: 1px dashed #888;">
-          <div  style="flex: 1;">
-            <paymentpie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></paymentpie>
-          </div>
-          <!--          <div style="flex: 1;">-->
-          <!--            <usertype-pie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></usertype-pie>-->
-          <!--          </div>-->
-        </div>
-
-        <div style="flex: 1;width: 50%">
-          <bussiness-type :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></bussiness-type>
-        </div>
-      </div>
-    </div>
-  </div>
-
-</template>
-
-<script>
-  import * as Util from '../../Util'
-
-  export default {
-    props: {
-      classname: {
-        type: String,
-        default: 'basic-main'
-      },
-      width: {
-        type: String,
-        default: '98.5%'
-      },
-      height: {
-        type: String,
-        default: '98%'
-      }
-    },
-    data() {
-      return {
-        jurisdiction: this.$login.r,
-        model: {
-          id: [this.$login.f.orgid],
-          orgid: [this.$login.f.orgid],
-          startDate: Util.toStandardDateString(),
-          endDate: Util.toStandardDateString()
-        }
-      }
-    },
-    methods: {
-      searchdata() {
-        this.$refs.pay.searchdata()
-      },
-      getRes(obj) {
-        this.model.orgid = obj
-      },
-    }
-  }
-</script>
-
-<style lang="css">
-</style>
+<template lang="html">
+  <div :class="classname" v-if="jurisdiction.includes('首页')" :style="{width:width,height:height}">
+    <div class="form-horizontal select-overspread container-fluid auto">
+      <div class="row">
+        <div class="col-sm-3 form-group">
+          <label class="font_normal_body" for="startDate">开始日期:</label>
+          <datepicker id="startDate" placeholder="开始日期"
+                      style="width:60%"
+                      v-model="model.startDate"
+                      :value.sync="model.startDate"
+                      :disabled-days-of-Week="[]"
+                      class="datepicker"
+                      :format="'yyyy-MM-dd'"
+                      :show-reset-button="reset">
+          </datepicker>
+        </div>
+        <div class="col-sm-3 form-group">
+          <label class="font_normal_body" for="endDate">结束日期:</label>
+          <datepicker id="endDate" placeholder="结束日期"
+                      style="width:60%"
+                      class="datepicker"
+                      v-model="model.endDate"
+                      :value.sync="model.endDate"
+                      :disabled-days-of-Week="[]"
+                      :format="'yyyy-MM-dd'"
+                      :show-reset-button="reset">
+          </datepicker>
+        </div>
+        <div class="col-sm-3 form-group">
+          <label class="font_normal_body" for="endDate">使用公司:</label>
+          <res-select restype='organization'
+                      @res-select="getRes"
+                      :initresid="model.id">
+          </res-select>
+        </div>
+      </div>
+    </div>
+    <div style="height: 97%;">
+      <div class="flex-row" style="flex: 1;border-bottom: 1px dashed #888;height: 48%">
+        <div style="flex: 1;border-right: 1px dashed #888;width: 50%">
+          <site-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
+                        v-ref:pay></site-manager>
+        </div>
+        <div style="flex: 1;width: 50%">
+          <bank-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
+                        v-ref:pay></bank-manager>
+        </div>
+      </div>
+      <div class="flex-row" style="flex: 1;height: 48%">
+
+        <div class="flex-row" style="flex: 1;width: 50%;border-right: 1px dashed #888;">
+          <div  style="flex: 1;">
+            <paymentpie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></paymentpie>
+          </div>
+          <!--          <div style="flex: 1;">-->
+          <!--            <usertype-pie :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></usertype-pie>-->
+          <!--          </div>-->
+        </div>
+
+        <div style="flex: 1;width: 50%">
+          <bussiness-type :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]' v-ref:pay ></bussiness-type>
+        </div>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import * as Util from '../../Util'
+
+  export default {
+    props: {
+      classname: {
+        type: String,
+        default: 'basic-main'
+      },
+      width: {
+        type: String,
+        default: '98.5%'
+      },
+      height: {
+        type: String,
+        default: '98%'
+      }
+    },
+    data() {
+      return {
+        jurisdiction: this.$login.r,
+        model: {
+          id: [this.$login.f.orgid],
+          orgid: [this.$login.f.orgid],
+          startDate: Util.toStandardDateString(),
+          endDate: Util.toStandardDateString()
+        }
+      }
+    },
+    methods: {
+      searchdata() {
+        this.$refs.pay.searchdata()
+      },
+      getRes(obj) {
+        this.model.orgid = obj
+      },
+    }
+  }
+</script>
+
+<style lang="css">
+</style>

package/src/filiale/WEINAN/SiteManager.vue

@@ -1,191 +1,191 @@
-<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/getPregas',
-  {data: {startDate: self.startdate + ' 00:00:00', endDate: self.enddate + ' 23:59:59',f_orgid: `f_orgid = ${self.orgid}`}},
-  {resolveMsg: null, rejectMsg: null})
-  .then((res) => {
-    let data = res.data
-    // let xPro = Array.from(new Set(res.data.map(x => x.f_gasproperties)))
-    // 表型
-    let xPro = data.map(x => x.f_meter_type)
-    // 居民用气
-    let yNumJM = data.map(x => x.f_ptpregas)
-    let yNumBGL = data.map(x => x.f_bglpregas)
-    let yNumJZCN = data.map(x => x.f_cnpregas)
-    let yNumGF = data.map(x => x.f_gfpregas)
-    let yNumFJM = data.map(x => x.f_fjmpregas)
-    // xPro.forEach(item => {
-    //   yNumJB[yNumJB.length] = data.filter(x => x.f_gasproperties === item && x.f_meter_type === '机表').map(x => x.f_pregas).reduce((x, y) => x + y, 0)
-    //   yNumKB[yNumKB.length] = data.filter(x => x.f_gasproperties === item && x.f_meter_type === '卡表').map(x => x.f_pregas).reduce((x, y) => x + y, 0)
-    //   yNumWLWB[yNumWLWB.length] = data.filter(x => x.f_gasproperties === item && x.f_meter_type === '物联网表').map(x => x.f_pregas).reduce((x, y) => x + y, 0)
-    // })
-    console.log('表型', xPro)
-    console.log('居民用气', yNumJM)
-    console.log('壁挂炉用气', yNumBGL)
-    console.log('集中采暖', yNumJZCN)
-    console.log('公福用气', yNumGF)
-    console.log('非居民用气', yNumFJM)
-    // 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(xPro,yNumJM,yNumBGL,yNumJZCN,yNumGF,yNumFJM)
-  })
-}
-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,yNumJM,yNumBGL,yNumJZCN,yNumGF,yNumFJM) {
-     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',
-           axisLabel :{
-             interval:0
-           },
-           data : arrparams
-         }
-      ],
-      yAxis : [
-        {
-          type : 'value'
-        }
-      ],
-      series : [
-        {
-          name:'居民用气',
-          type:'bar',
-          data:yNumJM,
-          markLine : {
-            data : [
-              {type : 'average', name: '平均值'}
-            ]
-          }
-        },
-        {
-          name:'壁挂炉用气',
-          type:'bar',
-          data:yNumBGL,
-          markLine : {
-            data : [
-              {type : 'average', name: '平均值'}
-            ]
-          }
-        },
-        {
-          name:'集中采暖',
-          type:'bar',
-          data:yNumJZCN,
-          markLine : {
-          data : [
-              {type : 'average', name : '平均值'}
-            ]
-          }
-        },
-        {
-          name:'公福用气',
-          type:'bar',
-          data:yNumGF,
-          markLine : {
-          data : [
-              {type : 'average', name : '平均值'}
-            ]
-          }
-        },
-        {
-          name:'非居民用气',
-          type:'bar',
-          data:yNumFJM,
-          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>
+<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/getPregas',
+  {data: {startDate: self.startdate + ' 00:00:00', endDate: self.enddate + ' 23:59:59',f_orgid: `f_orgid = ${self.orgid}`}},
+  {resolveMsg: null, rejectMsg: null})
+  .then((res) => {
+    let data = res.data
+    // let xPro = Array.from(new Set(res.data.map(x => x.f_gasproperties)))
+    // 表型
+    let xPro = data.map(x => x.f_meter_type)
+    // 居民用气
+    let yNumJM = data.map(x => x.f_ptpregas)
+    let yNumBGL = data.map(x => x.f_bglpregas)
+    let yNumJZCN = data.map(x => x.f_cnpregas)
+    let yNumGF = data.map(x => x.f_gfpregas)
+    let yNumFJM = data.map(x => x.f_fjmpregas)
+    // xPro.forEach(item => {
+    //   yNumJB[yNumJB.length] = data.filter(x => x.f_gasproperties === item && x.f_meter_type === '机表').map(x => x.f_pregas).reduce((x, y) => x + y, 0)
+    //   yNumKB[yNumKB.length] = data.filter(x => x.f_gasproperties === item && x.f_meter_type === '卡表').map(x => x.f_pregas).reduce((x, y) => x + y, 0)
+    //   yNumWLWB[yNumWLWB.length] = data.filter(x => x.f_gasproperties === item && x.f_meter_type === '物联网表').map(x => x.f_pregas).reduce((x, y) => x + y, 0)
+    // })
+    console.log('表型', xPro)
+    console.log('居民用气', yNumJM)
+    console.log('壁挂炉用气', yNumBGL)
+    console.log('集中采暖', yNumJZCN)
+    console.log('公福用气', yNumGF)
+    console.log('非居民用气', yNumFJM)
+    // 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(xPro,yNumJM,yNumBGL,yNumJZCN,yNumGF,yNumFJM)
+  })
+}
+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,yNumJM,yNumBGL,yNumJZCN,yNumGF,yNumFJM) {
+     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',
+           axisLabel :{
+             interval:0
+           },
+           data : arrparams
+         }
+      ],
+      yAxis : [
+        {
+          type : 'value'
+        }
+      ],
+      series : [
+        {
+          name:'居民用气',
+          type:'bar',
+          data:yNumJM,
+          markLine : {
+            data : [
+              {type : 'average', name: '平均值'}
+            ]
+          }
+        },
+        {
+          name:'壁挂炉用气',
+          type:'bar',
+          data:yNumBGL,
+          markLine : {
+            data : [
+              {type : 'average', name: '平均值'}
+            ]
+          }
+        },
+        {
+          name:'集中采暖',
+          type:'bar',
+          data:yNumJZCN,
+          markLine : {
+          data : [
+              {type : 'average', name : '平均值'}
+            ]
+          }
+        },
+        {
+          name:'公福用气',
+          type:'bar',
+          data:yNumGF,
+          markLine : {
+          data : [
+              {type : 'average', name : '平均值'}
+            ]
+          }
+        },
+        {
+          name:'非居民用气',
+          type:'bar',
+          data:yNumFJM,
+          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/WEINAN/config/tableConfig.js

@@ -8,7 +8,9 @@ export default{
       "气表编号":"f_meternumber",
       "上次抄表底数":"f_last_tablebase",
       "本次抄表底数":"f_tablebase",
+      "单价":"f_price",
       "用气量":"f_oughtamount",
+      "用气金额":"f_oughtfee",
       "表内剩余余额":"f_jval",
       "抄表日期":"f_insert_date",
       "上次抄表日期":"f_last_insertdate",