manage-client 3.2.281 → 3.2.283

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.281",
+  "version": "3.2.283",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/filiale/wenxi/WebHandQuery.vue

@@ -18,7 +18,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_userinfo_code" placeholder='客户编号'
-                         condition="f_userinfo_code = '{}'" v-next-el='f_userinfo_code' v-el:meternumber
+                         condition="f_userinfo_code = '{}'" v-next-el='f_userinfo_code' v-el:meternumber @change="$parent.$parent.inputChange"
                   >
                 </div>
                 <div class="col-sm-2">
@@ -281,7 +281,7 @@
         orgCondtionStr: '',
         model: new PagedList('rs/sql/manage_webmeterHandQuery', 50,{
           startDate: 'this.model.startDate',
-          endDate: 'this.model.endDate'
+          endDate: 'this.model.endDate',f_userinfo_code: 'this.model.f_userinfo_code'
         }),
         showbottomsum:false  //页面下方是否有合计: 默认为false, 在watch修改
       }
@@ -293,11 +293,20 @@
       }).catch((error) => {
         this.$emit('error', error)
       })
-      // this.$refs.paged.$refs.criteria.model.startDate = Util.addDate(new Date(),0).substring(0,10) + ' 00:00:00'
-      // this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),0).substring(0,10) + ' 23:59:59'
+      this.$refs.paged.$refs.criteria.model.startDate = Util.addDate(new Date(),0).substring(0,10) + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),0).substring(0,10) + ' 23:59:59'
       // this.$refs.paged.$refs.criteria.search()
     },
     methods: {
+      inputChange () {
+        if (this.$refs.paged.$refs.criteria.model.f_userinfo_code){
+          this.$refs.paged.$refs.criteria.model.startDate = ''
+          this.$refs.paged.$refs.criteria.model.endDate = ''
+        }else{
+          this.$refs.paged.$refs.criteria.model.startDate = Util.addDate(new Date(),0).substring(0,10) + ' 00:00:00'
+          this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),0).substring(0,10) + ' 23:59:59'
+        }
+      },
       initParams() {
         // 初始化气表品牌
         let brandArr = []
@@ -354,15 +363,6 @@
       },
 
       search (args) {
-        if (this.$refs.paged.$refs.criteria.model.startDate == '' || this.$refs.paged.$refs.criteria.model.endDate == ''){
-          if (this.$refs.paged.$refs.criteria.model.f_userinfo_code){
-            this.$refs.paged.$refs.criteria.model.startDate = '1990-01-01 00:00:00'
-            this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),1).substring(0,10) + ' 00:00:00'
-          }else{
-            this.$refs.paged.$refs.criteria.model.startDate = Util.addDate(new Date(),0).substring(0,10) + ' 00:00:00'
-            this.$refs.paged.$refs.criteria.model.endDate = Util.addDate(new Date(),0).substring(0,10) + ' 23:59:59'
-          }
-        }
         args.condition =  `${args.condition}`+this.orgcondition
         this.condition = args.condition
         this.model.search(args.condition, args.model)

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

@@ -867,22 +867,22 @@ export default{
   },
   // 物联网表抄表
   webmeterHandConfig: {
-    'f_userinfo_code': '用户编号',
-    'f_user_name': '用户名称',
+    'f_userinfo_code': '客户编号',
+    'f_user_name': '客户名称',
     'f_residential_area': '小区名称',
     'f_address': '地址',
-    'f_meter_brand': '气表品牌',
     'f_meternumber': '表号',
-    'f_oughtamount': '本期气量',
-    'f_oughtfee': '本期金额',
-    'f_jval': '表内剩余余额',
+    'f_meter_brand': '气表品牌',
     'f_hand_date': '抄表日期',
     'f_total_fee': '累计购气金额',
     'f_last_tablebase': '上期底数',
     'f_tablebase': '本期底数',
-    'f_balance_amount': '系统余额',
+    'f_curbalance': '系统余额',
+    'f_jval': '表上余额',
     'cyclegas': '当前周期已用气量',
     'cyclefee': '当前周期消费金额',
+    'f_oughtamount': '本次气量',
+    'f_oughtfee': '本次金额',
     'f_stair1price': '一阶气价',
     'f_stairamount1': '一阶气量',
     'f_stair1fee': '一阶金额',

package/src/filiale/xinkang/BankManager.vue

@@ -0,0 +1,197 @@
+<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 numgf = []
+      let numjm = []
+      let numsy = []
+      let numbg = []
+      let numgy = []
+      let numjm2 = []
+      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 === '工业用气') {
+          numgy[org.indexOf(res.data[i].org)] = res.data[i].num
+        } else if (res.data[i].name === '工福用气') {
+          numgf[org.indexOf(res.data[i].org)] = res.data[i].num
+        } else if (res.data[i].name === '商业用气') {
+          numsy[org.indexOf(res.data[i].org)] = res.data[i].num
+        } else if (res.data[i].name === '壁挂炉用气') {
+          numbg[org.indexOf(res.data[i].org)] = res.data[i].num
+        } else if (res.data[i].name === '居民用气') {
+          numjm[org.indexOf(res.data[i].org)] = res.data[i].num
+        } else {
+          numjm2[org.indexOf(res.data[i].org)] = res.data[i].num
+        }
+      }
+      self.set(org, numgy, numjm, numbg, numsy, numgf, numjm2)
+    })
+}
+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 (org, numgy, numjm, numbg, numsy, numgf, numjm2) {
+      this.xc = echarts.init(document.getElementById('bm'))
+      this.xc.setOption({
+        title: {
+          text: '新增用户散列图',
+          subtext: '数据查询来源',
+          x: 'left'
+        },
+        tooltip: {
+          trigger: 'item',
+          formatter: function (params) {
+            return params.name + '</br>' + params.seriesName + ': ' + params.value + '户'
+          }
+        },
+        legend: {
+          x: 'left',
+          y: 'bottom',
+          data: ['居民用气', '工福用气', '商业用气', '工业用气', '壁挂炉用气', '居民用气2']
+        },
+        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: numjm,
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
+              ]
+            }
+          },
+          {
+            name: '工福用气',
+            type: 'bar',
+            data: numgf,
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
+              ]
+            }
+          },
+          {
+            name: '商业用气',
+            type: 'bar',
+            data: numsy,
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
+              ]
+            }
+          },
+          {
+            name: '工业用气',
+            type: 'bar',
+            data: numgy,
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
+              ]
+            }
+          },
+          {
+            name: '壁挂炉用气',
+            type: 'bar',
+            data: numbg,
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
+              ]
+            }
+          },
+          {
+            name: '居民用气2',
+            type: 'bar',
+            data: numjm2,
+            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/xinkang/EchartsBox.vue

@@ -39,12 +39,12 @@
     <div style="height: 97%;" v-if="showPage === 1">
       <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%">
-          <households-type :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
+          <households-type :startdate='processedStartDate' :enddate='model.endDate' :orgid='model.orgid[0]'
                         v-ref:pay></households-type>
 <!--        <test></test>-->
         </div>
         <div style="flex: 1;width: 50%">
-          <bank-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
+          <bank-manager :startdate='processedStartDate' :enddate='model.endDate' :orgid='model.orgid[0]'
                         v-ref:pay></bank-manager>
         </div>
       </div>
@@ -52,7 +52,7 @@
 
         <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]'
+            <paymentpie :startdate='processedStartDate' :enddate='model.endDate' :orgid='model.orgid[0]'
                         v-ref:pay></paymentpie>
           </div>
           <!--          <div style="flex: 1;">-->
@@ -61,7 +61,7 @@
         </div>
 
         <div style="flex: 1;width: 50%">
-          <data-acquisition-type :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'
+          <data-acquisition-type :startdate='processedStartDate' :enddate='model.endDate' :orgid='model.orgid[0]'
                           v-ref:pay></data-acquisition-type>
         </div>
       </div>
@@ -69,7 +69,7 @@
     <div style="height: 97%;" v-if="showPage === 2">
       <div class="flex-row" style="flex: 1;height: 96%">
         <div style="flex: 1">
-          <gas-properties-manager :startdate='model.startDate' :enddate='model.endDate' :orgid='model.orgid[0]'></gas-properties-manager>
+          <gas-properties-manager :startdate='processedStartDate' :enddate='model.endDate' :orgid='model.orgid[0]'></gas-properties-manager>
         </div>
       </div>
     </div>
@@ -106,7 +106,7 @@ export default {
       model: {
         id: [this.$login.f.orgid],
         orgid: [this.$login.f.orgid],
-        startDate: Util.toStandardDateString(),
+        startDate: '',
         endDate: Util.toStandardDateString()
       }
     }
@@ -126,6 +126,11 @@ export default {
     getRes (obj) {
       this.model.orgid = obj
     }
+  },
+  computed: {
+    processedStartDate () {
+      return this.model.startDate || Util.toStandardDateString() // 手动处理 startDate
+    }
   }
 }
 </script>

package/src/filiale/xinkang/ManageBrandHouseCount.vue

@@ -0,0 +1,297 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex" v-if="!show">
+        <criteria-paged :model="model"  v-ref:paged>
+          <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+              <div class="row">
+                <div class="col-sm-2 form-group">
+                  <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 00:00:00'"
+                              :show-reset-button="true">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <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 23:59:59'"
+                              :show-reset-button="true">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
+                  <right-tree @re-res="$parent.$parent.getRes"></right-tree>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
+                  <res-select restype='department'
+                              @res-select="$parent.$parent.getdep"
+                              :parentresid="$parent.$parent.depresid"
+                              :initresid='$parent.$parent.depid'>
+                  </res-select>
+
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
+                  <res-select restype='user'
+                              is-mul="false"
+                              @res-select="$parent.$parent.getuser"
+                              :parentresid="$parent.$parent.userresid"
+                              :initresid='$parent.$parent.operatorid'>
+                  </res-select>
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="feimin_style"
+                                template-name='用户查询报表'
+                                :choose-col="true"></export-excel>
+                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
+                              titletable="用户查询" :starthead="$parent.$parent.startDate" :defaultfield="$parent.$parent.defaultfield"
+                              ></print-data>
+                </div>
+              </div>
+            </div>
+          </criteria>
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid :classname="$parent.classname">
+            <template partial='head'>
+              <tr>
+                <th>
+                  <nobr>气表品牌</nobr>
+                </th>
+                <th>
+                  <nobr>总用户数</nobr>
+                </th>
+                <th>
+                  <nobr>民用户数</nobr>
+                </th>
+                <th>
+                  <nobr>非民用户数</nobr>
+                </th>
+                <th>
+                  <nobr>机表户数</nobr>
+                </th>
+                <th>
+                  <nobr>卡表户数</nobr>
+                </th>
+                <th>
+                  <nobr>物联网表户数</nobr>
+                </th>
+
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align:center">
+                <nobr>{{row.f_meter_brand}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_total_users}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_civilian_users}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_non_civilian_users}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_mechanical_meter_users}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_card_meter_users}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_iot_meter_users}}</nobr>
+              </td>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import {PagedList, HttpResetClass} from 'vue-client'
+import defaultPrint from '../../components/sale/config/DefaultPrint'
+import exportConfig from './exportConfig'
+import PrintDataSelf from '../../components/sale/common/PrintDataSelf'
+
+let readySomething = async function (self) {
+  self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
+  self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+}
+export default {
+  title: '用户查询',
+  data() {
+    return {
+      depresid: [],
+      userresid: [],
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      f_operatorid: this.$login.f.id,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+      depname: [],
+      operatorname: '',
+      orgCondtionStr: '1=1',
+      data: {},
+      other:[],
+      footer:[],
+      model: new PagedList('rs/sql/manageBrandHouseCount', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', f_orgid: 'this.model.f_orgid'},),
+      gasproperties:[],
+      show:false,
+      rowdata:{},
+      residentialArea: [],
+      modelval: [],
+      startDate:"",
+      endDate:"",
+      inputtouPerson: [],
+      printshow: false,
+      all: false,
+      fields: {},
+      thead: '',
+      tfoot: '',
+      defaultfield: []
+    }
+  },
+  ready() {
+    readySomething(this).then(() => {
+      this.$emit('ready')
+    }).catch((error) => {
+      this.$emit('error', error)
+    })
+  },
+  methods: {
+    getotherfooter(){
+      this.other=[];
+      this.footer=[];
+      let exportdata = this.getCondition;
+      let otherInData=[];
+      otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+      this.other.push(otherInData);
+    },
+    search(){
+      this.$refs.paged.$refs.cri.search()
+    },
+    selfSearch(args) {
+      let orgcondition = ' uf.f_orgid in (' + this.f_orgid + ')'
+      if (this.f_depid[0]) {
+        orgcondition += " and uf.f_depid in("+this.f_depid.toString()+')'
+      }
+      if(this.f_operatorid[0]) {
+        orgcondition += ' and uf.f_operatorid in (' + this.f_operatorid + ')'
+      }
+      this.startDate=this.$refs.paged.$refs.cri.model.startDate.substring(0,10)
+      this.endDate=this.$refs.paged.$refs.cri.model.endDate.substring(0,10)
+      this.orgCondtionStr=orgcondition
+      this.$refs.paged.$refs.cri.model.f_orgid = orgcondition
+      this.model.search(args.f_orgid, args.model)
+    },
+    getRes (obj) {
+      this.orgname = obj.res[0]
+      this.depresid = obj.resids
+      this.f_orgid = obj.resids
+    },
+    getdep (obj, val) {
+      this.depname = val
+      this.userresid = obj
+      this.f_depid = obj
+    },
+    getuser ( obj, val) {
+      this.operatorname = val[0]
+      this.f_operatorid = obj
+    },
+    stamp() {
+      this.all = false
+      //默认选择要打印的列
+      this.modelval = defaultPrint.config
+      this.fields = this.getfield
+      console.log('所有打印字段', this.fields)
+      this.printshow = true
+      this.put()
+    },
+    put() {
+      // 对Modelval进行排序
+      this.sortModelval()
+      this.thead = `<tr><th colspan=${this.modelval.length}>用户查询</th></tr><tr>`
+      for (let key of this.modelval) {
+        this.thead += '<th>' + this.fields[key] + '</th>'
+      }
+      this.thead += '</tr>'
+    },
+    print() {
+      this.$refs.print.PrintAsFile()
+      this.printshow = false
+    },
+    dealmsg(val) {
+      console.log('---------------dealmsg')
+      this.rowdata=val
+      this.show=true
+      val.model = this.model.model
+      this.$dispatch('deal-msg', val)
+    },
+    close() {
+      this.printshow = false
+      this.all = false
+    },
+    // 对选择的列进行排序
+    sortModelval() {
+      let sortModel = []
+      Object.keys(this.fields).forEach((key) => {
+        if (this.modelval.includes(key)) {
+          sortModel.push(key)
+        }
+      })
+      this.modelval = sortModel
+      console.log('选择的打印的字段', this.modelval)
+    }
+  },
+  watch: {
+    'all'(val) {
+      if (val) {
+        this.modelval = this.bodyData
+      } else {
+        this.modelval = defaultPrint.config
+        this.put()
+      }
+    },
+    'modelval.length'() {
+      this.put()
+    }
+  },
+  computed: {
+    getCondition() {
+      return {
+        startDate: this.$refs.paged.$refs.cri.model.startDate,
+        endDate: this.$refs.paged.$refs.cri.model.endDate,
+        f_orgid: this.orgCondtionStr
+      }
+    },
+    getfield() {
+      return exportConfig.brandHouseCount
+    },
+    whetherpaies () {
+      return [
+        {label: '全部', value: ''},
+        {label: '已缴费', value: '是'},
+        {label: '未缴费', value: '否'}
+      ]
+    },
+    usertypes() {
+      return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+    }
+
+  }
+}
+</script>