manage-client 3.3.131 → 3.3.132

package/package.json

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

package/src/components/sale/businessquery/CardHandplanQuery.vue

@@ -354,7 +354,7 @@
           str = str.replace(/\[/g,``)
           str = str.replace(/\]/g,``)
           //查询多个抄表员时条件
-          args.condition += ` and f_inputtor in  ( ${str} )`
+          this.orgCondtionStr += ` and f_inputtor in  ( ${str} )`
         }
 
         args.condition = `${args.condition} ` + this.orgCondtionStr

package/src/components/sale/config/exportConfig.js

@@ -176,7 +176,7 @@ export default{
     'f_gasproperties': '用气性质', 'f_comments': '备注', 'c': '欠费期数', 'f_hand_date': '欠费区间', 'f_oughtamount': '用气量',
     'f_oughtfee': '用气金额', 'f_debt_money': '已交金额', 'f_oughtfee_new': '应交气费',
     'overdue': '违约金', 'f_garbage_fee': '附加费', 'f_last_tablebase': '上期抄表底数', 'f_tablebase': '本期抄表底数',
-    'f_oughtfee_all': '合计欠费金额','f_oughtfee_col': '实际欠费金额', 'f_cost_type': '缴费方式', 'f_meter_type': '气表类型'
+    'f_oughtfee_all': '合计欠费金额', 'f_cost_type': '缴费方式', 'f_meter_type': '气表类型'
   },
   areaChargeQueryConfig: {
     'f_residential_area': '小区','f_price': '单价','f_gas': '购气方量','f_money': '购气金额'
@@ -450,11 +450,11 @@ export default{
     'f_userinfo_code': '客户编号', 'f_newuser_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_address': '客户地址',
     'f_user_name': '原客户名称', 'f_newuser_phone': '新客户电话', 'f_newidnumber': '新客户身份证', 'f_user_phone': '原客户电话',
     'f_idnumber': '原客户身份证', 'f_transfer_fees': '过户费', 'f_contract_id': '合同编号', 'f_operate_date': '过户日期',
-    'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_meternumber': '表号', 'f_comments': '备注'
+    'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_meternumber': '表号', 'f_comments': '备注', 'hushu': '户数'
   },
   transferRecordConfig: {
     'in_userinfo_code': '转入方编号', 'in_user_name': '转入方名称', 'out_userinfo_code': '转出方编号', 'out_user_name': '转出方名称',
-    'f_operate_date': '转移日期',  'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司'
+    'f_operate_date': '转移日期', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司'
   },
   transferPrintConfig: {
     'f_userinfo_code': '客户编号', 'f_newuser_name': '客户名称', 'f_address': '客户地址',
@@ -464,7 +464,7 @@ export default{
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_olduserinfo_code': '档案编号', 'f_user_type': '客户类型', 'f_user_phone': '客户电话', 'f_address': '客户地址',
     'f_card_id': '卡号', 'f_meter_brand': '气表品牌', 'f_type': '补气类型', 'f_comments': '补气原因',
     'f_pregas': '补气量', 'f_preamount': '补气金额', 'f_operate_date': '补气日期',
-    'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_meternumber': '表号'
+    'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_meternumber': '表号', 'hushu': '户数'
   },
 
   fillcardConfig: {

package/src/components/webmeter/newwebmeter/PriceInstructDetail.vue

@@ -304,7 +304,9 @@ export default {
       this.show = false
     },
     clearmsg() {
-      this.$refs.paged.$refs.cri.model = {}
+      Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+        this.$refs.paged.$refs.cri.model[key] = []
+      })
     },
     wai_search(obj) {
       console.log(obj)

package/src/components/webmeter/newwebmeter/PriceInstructList.vue

@@ -272,8 +272,10 @@ export default {
     close() {
       this.show = false
     },
-    clearmsg() {
-      this.$refs.paged.$refs.cri.model = {}
+    clearmsg () {
+      Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+        this.$refs.paged.$refs.cri.model[key] = []
+      })
     },
     search(args) {
       this.startDate = this.$refs.paged.$refs.cri.model.startDate

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

@@ -0,0 +1,316 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main">
+      <div class="flex" v-if="!show">
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' v-ref:criteria  @condition-changed='$parent.search'>
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+              <div class="row" >
+                <div class="col-sm-2">
+                  <label class="font_normal_body">组织机构</label>
+                  <res-select :initresid="$parent.$parent.org"
+                              style="width:60%"
+                              @res-select="$parent.$parent.getorg"
+                              :is-mul=false
+                              restype='organization'>
+                  </res-select>
+                </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">表&nbsp;钢&nbsp;号&nbsp;</label>
+                  <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_meternumber" placeholder='表钢号'
+                         condition="m.f_meternumber = '{}'" v-next-el='meternumber' v-el:meternumber
+                  >
+                </div>
+                <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="ui.f_userinfo_code = '{}'" v-next-el='f_userinfo_code' v-el:meternumber
+                  >
+                </div>
+                <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_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_getReportDetail" 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='客户地址'
+                         condition="ua.f_address like '%{}%'" v-next-el='userid' v-el:username>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户类型</label>
+                  <v-select :value.sync="model.f_user_type"
+                            @change="$parent.$parent.userTypeChange()"
+                            :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
+                            condition="uf.f_user_type = '{}'"
+                            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_gasproperties" v-model="model.f_gasproperties"
+                            :options='$parent.$parent.gasproperties' placeholder='请选择'
+                            condition="uf.f_gasproperties = '{}'"
+                            closfe-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"
+                            :options="$parent.$parent.meterbrands"
+                            condition="br.f_meter_brand = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group" >
+                  <label class="font_normal_body" >开始时间</label>
+                  <datepicker style="width: 60%" placeholder="大于等于"
+                              :value.sync="model.f_start_date"
+                              v-model="model.f_start_date"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              condition="m.f_hand_date >= '{}'"
+                  ></datepicker>
+                </div>
+                <div class="col-sm-2 form-group" >
+                  <label class="font_normal_body">结束时间</label>
+                  <datepicker style="width: 60%" placeholder="小于等于"
+                              :value.sync="model.f_end_date"
+                              v-model="model.f_end_date"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              condition="m.f_hand_date <= '{}'"
+                  ></datepicker>
+                </div>
+              </div>
+            </div>
+          </criteria>
+          <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
+            <template partial='head'>
+              <tr>
+                <th style="text-align: left;" v-for="(key,value) in $parent.$parent.$parent.ReportDetailListConfig"><nobr>{{value}}</nobr></th>
+              </tr>
+            </template>
+            <template partial='body' partial='list'>
+              <tr >
+                <td style="text-align: left;" v-for="(key,value) in $parent.$parent.$parent.ReportDetailListConfig"><nobr>{{row[key]}}</nobr></td>
+              </tr>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+        <table class="table-hover">
+        </table>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+  import plugins from '../../../plugins/GetLoginInfoService'
+  import * as Util from '../../../Util'
+
+  let readySomething = async function (self) {
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
+  }
+  export default {
+    title: '上报数据明细',
+    data () {
+      return {
+        show:false,
+        detail24: false,
+        org:[this.$login.f.orgid],
+        orgcondition: ' and m.f_orgid = ' + this.$login.f.orgid,
+        detaillist: [],
+        meterbrands: [],
+        prices: [],
+        gasproperties:[],
+        condition:'',
+        rowdata:{},
+        sumsmodel: {},
+        ReportDetailListConfig: {
+          'f_userinfo_code': '客户编号', 'f_meternumber': '表号', 'f_user_name': '客户姓名', 'f_user_phone': '客户电话', 'f_address': '客户地址',
+          'f_hand_date': '上报日期', 'f_meter_brand': '气表品牌', 'f_readData1': '上传协议版本号', 'f_readData2': '通信信号值', 'f_readData3': '铭牌号',
+          'f_readData4': '通信模式', 'f_readData5': 'IC卡编号', 'f_readData6': '购气次数','f_readData7': '剩余金额/量', 'f_readData8': '总累计用气量',
+          'f_readData9': '总累计用气金额','f_readData10': '总累计购气金额/量', 'f_readData11': '计费周期累计用气量', 'f_readData12': '当前透支金额/量', 'f_readData13': '阀门状态',
+          'f_readData14': '主电电压','f_readData15': '备电电压', 'f_readData16': '软件版本', 'f_readData17': '硬件版本', 'f_readData18': '当前RTC时钟'
+        },
+        orgid:[this.$login.f.orgid],
+        criteriaShow:false,
+        orgCondtionStr: '',
+        model: new PagedList('rs/sql/manage_getReportDetail', 50,{startDate: 'this.model.f_start_date', endDate: 'this.model.f_end_date'})
+      }
+    },
+    ready () {
+      // this.$refs.paged.$refs.criteria.search()
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+      this.$refs.paged.$refs.criteria.model.f_start_date = Util.addDate(new Date(),-1).substring(0,10) + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.f_end_date = Util.addDate(new Date(),-1).substring(0,10) + ' 23:59:59'
+    },
+    methods: {
+      initParams() {
+        // 初始化气表品牌
+        let brandArr = []
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          if(item.value.f_meter_type==='物联网表'){
+            temp.label = item.label
+            temp.value = item.value.f_meter_brand
+            brandArr.push(temp )
+          }
+
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+        //初始化气表价格
+        this.prices = this.$MagGetSaleParam.getPrices();
+      },
+      async updateParams() {
+        await this.$MagLoadParams.loadParam(this.f_filialeid)
+        this.initParams()
+      },
+      getorg(obj) {
+        if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
+          this.orgcondition = " and m.f_orgid  in " + plugins.convertToIn(obj)
+        }else{
+          this.orgcondition = " and m.f_orgid  = " + this.$login.f.orgid
+        }
+
+      },
+      userTypeChange () {
+        this.gasproperties=[]
+        if(this.$refs.paged.$refs.criteria.model !==null) {
+          this.$refs.paged.$refs.criteria.model.f_gasproperties=''
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
+        }
+        else{
+          this.gasproperties =[{label: '全部', value: ''}]
+        }
+      },
+      hidden(){
+        this.criteriaShow = !this.criteriaShow
+      },
+      cancel() {
+        this.show = false
+      },
+      clearmsg () {
+        Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
+          this.$refs.paged.$refs.criteria.model[key] = []
+        })
+      },
+      getRes (obj) {
+        this.orgCondtionStr = condition
+        this.orgname = obj.orgnames[0]
+        this.depname = obj.depnames[0]
+      },
+      showmsg(obj){
+        this.rowdata=obj
+        this.show=true
+      },
+
+      search (args) {
+        args.condition =  `${args.condition}`+this.orgcondition
+        console.log(args.condition+"args.condition")
+        this.condition = args.condition
+        this.model.search(args.condition, args.model)
+      }
+    },
+    watch: {
+      'orgCondtionStr'(val) {
+        let res = val.match(/'(.*?)'/)
+        console.log('正则提取:',res && res[1])
+        if (res) {
+          this.f_filialeid = res[1]
+          // this.updateParams()
+        }
+      }
+    },
+    computed: {
+      getPricenames() {
+        let f_user_type = this.$refs.paged.$refs.criteria.model.f_user_type;
+        let f_gasproperties = this.$refs.paged.$refs.criteria.model.f_gasproperties;
+        let pricetype = this.$refs.paged.$refs.criteria.model.pricetype;
+        console.log("打印一下:",f_user_type,f_gasproperties,pricetype,this.f_filialeid,this.prices)
+        console.log("查看f_orgid:",this.$login.f.f_orgid)
+        if(this.$refs.paged.$refs.criteria.model !==null) {
+          let rs = []
+          let priceArr = []
+          if ( pricetype.length >0) {
+            let params = {
+              f_price_type: pricetype[0],
+              filter: this.org[0],
+              prices: this.prices
+            }
+            console.log("打印一下params:",params)
+            this.$MagGetSaleParam.getPrice(params).forEach((item) => {
+              console.log("====================================》")
+              let temp = {}
+              temp.label = item.label
+              temp.value = item.value.f_price_name
+              priceArr.push(temp)
+              console.log("打印一下temp:",temp)
+            })
+
+            rs = [{label: '全部', value: ''}, ...priceArr]
+          }
+          if (rs.length === 0) {
+            console.log('rs读出来是空')
+            this.$refs.paged.$refs.criteria.model.f_price_name = ''
+          }
+          return rs
+        }
+      },
+      getfield () {
+        return this.ReportDetailListConfig
+      },
+      usertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
+      pricetypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
+      },
+      getCondition () {
+        var con = ""
+        if (this.orgCondtionStr) {
+          con = `${this.$refs.paged.$refs.criteria.condition} `+this.orgcondition
+        }
+        else {
+          con = `${this.$refs.paged.$refs.criteria.condition} `+this.orgcondition
+        }
+        return {
+          startDate: this.$refs.paged.$refs.criteria.model.f_start_date,
+          endDate: this.$refs.paged.$refs.criteria.model.f_end_date,
+          condition: con
+        }
+      }
+    }
+  }
+</script>
+
+<style>
+  .mystyle{
+    margin-left:80px;
+  }
+  .datapanel {
+    color: #333;
+    background-color: white;
+    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px ;
+    padding: 10px 10px 10px 10px;
+    border-radius:15px;
+  }
+</style>

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

@@ -253,8 +253,8 @@ export default{
 
   changemeterConfig: {
     'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_address': '客户地址',
-    'f_type': '换表类型', 'f_changemeter_fee': '换表费', 'f_meternumber_old': '旧表号', 'f_meternumber': '新表号',
-    'f_meter_brand_old': '旧气表品牌', 'f_meter_brand': '新气表品牌','f_factory_date':'表具生产日期','newinstall_date':'表具安装日期', 'f_remanent_gas': '补气量', 'f_remanent_money': '补气金额',
+    'f_type': '换表类型', 'f_changemeter_fee': '换表费', 'f_meternumber_old': '旧表号', 'f_meternumber': '新表号', 'hushu': '户数',
+    'f_meter_brand_old': '旧气表品牌', 'f_meter_brand': '新气表品牌','f_factory_date': '表具生产日期', 'newinstall_date': '表具安装日期', 'f_remanent_gas': '补气量', 'f_remanent_money': '补气金额',
     'f_comments': '备注', 'f_change_operator': '换表人', 'f_state': '状态', 'f_operate_date': '操作日期', 'f_payment': '付款方式', 'f_othereason': '换表原因',
     'f_operator': '人员', 'f_depname': '部门', 'f_orgname': '公司'
   },

package/src/filiale/meihekou/CardHandplanQuery.vue

@@ -381,16 +381,11 @@
   let readySomething = async function (self) {
     self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
     self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
-    // 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'
-    // await self.$refs.paged.$refs.cri.search()
     await self.$getConfig(self, 'CardHandplanQuery')
     console.log('抄表查询获取默认配置', self.config)
     self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
     console.log('开始初始化参数', self.defaultfield)
     await self.$MagLoadParams.loadParam()
-    // await self.$MagLoadParams.loadParam()
-    // self.initParams()
     console.log('开始查询')
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
@@ -449,8 +444,7 @@
         this.$refs.paged.$refs.cri.model.f_price_name = []
       },
       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;
@@ -485,9 +479,8 @@
           str = str.replace(/\[/g,``)
           str = str.replace(/\]/g,``)
           //查询多个抄表员时条件
-          args.condition += ` and f_inputtor in  ( ${str} )`
+          this.orgCondtionStr += ` and f_inputtor in  ( ${str} )`
         }
-
         args.condition = `${args.condition} ` + this.orgCondtionStr
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums

package/src/webmeterManage.js

@@ -89,6 +89,8 @@ export default function () {
   Vue.component('planned-security-inspection-analysis', (resolve) => { require(['./components/webmeter/DrillData/LargeScreenAnalysisEcharts'], resolve) })
 // 上报查询
   Vue.component('report-list', (resolve) => { require(['./components/webmeter/report/ReportList'], resolve) })
+  // 上报数据明细
+  Vue.component('report-detail-list', (resolve) => { require(['./components/webmeter/report/ReportDetailList'], resolve) })
   Vue.component('ckh-report-list', (resolve) => { require(['./components/webmeter/report/ckhReportList'], resolve) })
   // =========================================物联网表==========================================================
   // 表具查看