manage-client 3.3.67 → 3.3.69

package/package.json

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

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

@@ -450,6 +450,16 @@
         if(this.meter_classify == '物联网表'){
           this.model.url= 'rs/sql/getwulw_listgas'
         }
+        if (this.meter_classify == '卡表') {
+          if (!this.$refs.paged.$refs.cri.model.sellcishumin && !this.$refs.paged.$refs.cri.model.sellcishumax) {
+            args.condition = args.condition + "and sellcishu > 0"
+          }
+        }
+        if (this.meter_classify == '机表') {
+          if (!this.$refs.paged.$refs.cri.model.handsellcishumax && !this.$refs.paged.$refs.cri.model.handsellcishumax) {
+            args.condition = args.condition + "and sellcishu > 0"
+          }
+        }
         console.log(this.$login.f)
         if(this.$refs.paged.$refs.cri.model.startDate){
           this.model.params.startDate = `'${this.$refs.paged.$refs.cri.model.startDate} 00:00:00' `

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

@@ -314,7 +314,7 @@ export default{
     'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_oughtamount': '用气量', 'overdue': '违约金', 'f_oughtfee': '用气金额', 'f_debt_money': '已交金额',
     'f_actual_arrears': '欠费金额', 'f_balance': '上期余额', 'f_curbalance': '本期余额',
     'f_accounts_state': '下账状态', 'f_operate_date': '收费时间', 'f_inputtor': '抄表员', 'f_book_slice_area': '表册片区',
-    'f_hand_date': '下发日期', 'f_input_date': '录入日期', 'f_audit_date': '审核日期','f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
+    'f_hand_date': '下发日期', 'f_input_person': '录入人员', 'f_input_date': '录入日期', 'f_audit_date': '审核日期','f_meter_state': '抄表状态', 'f_hand_state': '记录状态',
     'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司', 'f_surplus_gas': '剩余气量', 'f_haircut_gas': '扣减气量',
     'f_stair1amount': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费',
     'f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费',

package/src/filiale/lixianV3/sale.js

@@ -3,7 +3,7 @@ import Vue from 'vue'
 
 export default function () {
   // 气量年比
-  Vue.component('use-gas-year-ratio', (resolve) => { require(['./GasYearRatioQuery'], resolve) })
+  Vue.component('use-gas-year-ratio', (resolve) => { require(['./useGasYearRatioQuery'], resolve) })
   // 发票查询
   Vue.component('invoice-details-query', (resolve) => { require(['./InvoiceDetailsQuery.vue'], resolve) })
   // 业务查询

package/src/filiale/lixianV3/useGasYearRatioQuery.vue

@@ -0,0 +1,463 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex">
+        <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 class="font_normal_body">客户编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                         condition="f_userinfo_code = '{}' " placeholder="客户编号">
+                </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="model.f_user_name"
+                         condition="f_user_name = '{}'" placeholder="客户名称">
+                </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="model.f_address"
+                         condition="f_address like '%{}%'" placeholder='客户地址'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
+                  <v-select :value.sync="model.f_residential_area"
+                            v-model="model.f_residential_area"
+                            style="width: 60%"
+                            multiple
+                            condition="f_residential_area in {}"
+                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                            close-on-select>
+
+                  </v-select>
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear  button_spacing" @click="$parent.$parent.clear()">清空</button>
+
+                  <button  class="button_clear button_spacing"  style="margin-top: 10px;background-color: #6aa6e2;"  @click="$parent.$parent.downloadFiles()">导出</button>
+                  <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">
+                <res-select-group :show-component="$parent.$parent.resshow" :initres="$parent.$parent.initres"
+                                  :cascade=true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+
+                <div class="col-sm-2 form-group">
+                  <label class="control-label">查询年份</label>
+                  <v-select
+                    placeholder='查询年份'
+                    :value.sync="model.searchyear"
+                    v-model="model.searchyear"
+                    :value-single="true"
+                    :options='$parent.$parent.years'
+                    close-on-select >
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="control-label">对比年份</label>
+                  <v-select
+                    placeholder='查询年份'
+                    :value.sync="model.compareyear"
+                    v-model="model.compareyear"
+                    :value-single="true"
+                    :options='$parent.$parent.years'
+                    close-on-select >
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;表号&nbsp;&nbsp;&nbsp;</label>
+                  <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">
+                  <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="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="f_gasproperties = '{}'"
+                            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"
+                            :options='$parent.$parent.meterbrands' placeholder='请选择'
+                            condition="f_meter_brand = '{}'"
+                            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_type"
+                            :options='$parent.$parent.meterStyle' placeholder='请选择' v-model="model.f_meter_style"
+                            condition="f_meter_type = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">抄&nbsp;&nbsp;表&nbsp;员</label>
+                  <v-select :value.sync="model.f_inputtor"
+                            v-model="model.f_inputtor"
+                            :options='$parent.$parent.inputtores' placeholder='请选择'
+                            condition="f_inputtor = '{}'"
+                            close-on-select>
+                  </v-select>
+                </div>
+              </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy" style="height: 95%" v-ref:grid>
+            <template partial='head'>
+              <tr>
+                <th colspan="10" style="text-align: center;"><nobr>用户信息</nobr></th>
+                <th colspan="12" style="text-align: center;"><nobr>查询年份</nobr></th>
+                <th colspan="12" style="text-align: center;"><nobr>对比年份</nobr></th>
+              </tr>
+              <tr>
+                <th style="text-align: center;">
+                  <nobr>用户编号</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>姓名</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>地址</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>联系方式</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>用户类型</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>用户性质</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>气表品牌</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>气表厂家</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>表号</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>抄表员</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>一月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>二月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>三月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>四月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>五月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>六月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>七月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>八月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>九月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>十月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>十一月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>十二月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>一月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>二月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>三月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>四月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>五月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>六月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>七月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>八月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>九月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>十月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>十一月</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>十二月</nobr>
+                </th>
+
+              </tr>
+            </template>
+            <template partial='body'>
+              <tr style="position: relative" class="table-bordered">
+                <td style="text-align: center;">{{ row.f_userinfo_code }}</td>
+                <td style="text-align: center;">{{ row.f_user_name }}</td>
+                <td style="text-align: center;">{{ row.f_address }}</td>
+                <td style="text-align: center;">{{ row.f_user_phone }}</td>
+                <td style="text-align: center;">{{ row.f_user_type }}</td>
+                <td style="text-align: center;">{{ row.f_gasproperties }}</td>
+                <td style="text-align: center;">{{ row.f_meter_brand }}</td>
+                <td style="text-align: center;">{{ row.f_manufacturers }}</td>
+                <td style="text-align: center;">{{ row.f_meternumber }}</td>
+                <td style="text-align: center;">{{ row.f_inputtor }}</td>
+                <td style="text-align: center;">{{ row.jan }}</td>
+                <td style="text-align: center;">{{ row.feb }}</td>
+                <td style="text-align: center;">{{ row.mar }}</td>
+                <td style="text-align: center;">{{ row.apr }}</td>
+                <td style="text-align: center;">{{ row.may }}</td>
+                <td style="text-align: center;">{{ row.jun }}</td>
+                <td style="text-align: center;">{{ row.jul }}</td>
+                <td style="text-align: center;">{{ row.jug }}</td>
+                <td style="text-align: center;">{{ row.sep }}</td>
+                <td style="text-align: center;">{{ row.oct }}</td>
+                <td style="text-align: center;">{{ row.nov }}</td>
+                <td style="text-align: center;">{{ row.dec }}</td>
+                <td style="text-align: center;">{{ row.jan1 }}</td>
+                <td style="text-align: center;">{{ row.feb1 }}</td>
+                <td style="text-align: center;">{{ row.mar1 }}</td>
+                <td style="text-align: center;">{{ row.apr1 }}</td>
+                <td style="text-align: center;">{{ row.may1 }}</td>
+                <td style="text-align: center;">{{ row.jun1 }}</td>
+                <td style="text-align: center;">{{ row.jul1 }}</td>
+                <td style="text-align: center;">{{ row.jug1 }}</td>
+                <td style="text-align: center;">{{ row.sep1 }}</td>
+                <td style="text-align: center;">{{ row.oct1 }}</td>
+                <td style="text-align: center;">{{ row.nov1 }}</td>
+                <td style="text-align: center;">{{ row.dec1 }}</td>
+              </tr>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+import exportConfig from './config/exportConfig'
+
+let readySomething = async function (self) {
+  await self.$MagLoadParams.loadParam()
+  self.initParams()
+}
+export default {
+  props: ['data'],
+  title: '气量年比查询',
+  data () {
+    return {
+      model: new PagedList('rs/sql/useGasYearRatioQuery', 50, {
+        searchyear: 'this.model.searchyear',
+        compareyear: 'this.model.compareyear'
+      }),
+      years:[],
+      other: [],
+      orgCondtionStr: '',
+      resshow: ['company'],
+      initres: {
+        org: [this.$login.f.orgid]
+      },
+      meterbrands: [],
+      inputtores: [{label: '全部',value: ''}],
+      criteriaShow: false,
+      condition: '',
+      //小区
+      residentialArea: []
+    }
+  },
+  ready () {
+    let year = new Date().getFullYear()
+    this.$refs.paged.$refs.cri.model.searchyear = year
+    this.$refs.paged.$refs.cri.model.compareyear = year-1
+    this.years = [];
+    for (let i = 0; i < 30; i++) {
+      this.years.push({ value: year - i, label: year - i });
+    }
+    // this.$refs.paged.$refs.cri.model.stratDate = `'${searchyear}-01-01 00:00:00'`
+    // this.$refs.paged.$refs.cri.model.endDate = `'${searchyear}-12-31 23:59:59'`
+    // this.$refs.paged.$refs.cri.model.comparestratDate = `'${compareyear}-01-01 00:00:00'`
+    // this.$refs.paged.$refs.cri.model.compareendDate = `'${compareyear}-12-31 23:59:59'`
+    //加载抄表册
+    this.$MagGetSaleParam.initinputtor()
+    this.getinputtores()
+    this.getaddress()
+    readySomething(this).then(() => {
+      this.$emit('ready')
+    }).catch((error) => {
+      this.$emit('error', error)
+    })
+  },
+  methods: {
+    async downloadFiles() {
+      if (this.getCondition) {
+        let data = {
+          sqlName: 'useGasYearRatioQuery',
+          condition: this.getCondition,
+          fileName: '气量年比'
+        }
+        let HttpReset = new HttpResetClass()
+        let res = await HttpReset.load('POST', 'rs/deviceExport/gasDevices', {
+          data: data
+        }, {resolveMsg: null, rejectMsg: null})
+        if (res){
+          let downurl = 'rs/deviceExport/download?filename=气量年比.xlsx';
+          this.$resetget(downurl, {}).then(res => {
+            var link = document.createElement('a');
+            link.target = "_blank"
+            link.href = downurl;
+            link.setAttribute("download", "气量年比.xlsx"); //指定下载后的文件名，防跳转
+            document.body.appendChild(link);
+            link.click();
+          })
+        }
+      } else {
+        this.$showAlert('查询条件为空，请查询后再导出', 'warning', 3000)
+        return
+      }
+    },
+    async getaddress(){
+      let HttpReset = new HttpResetClass()
+      var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
+        data: {
+          condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
+        }
+      }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+      let house = [{label: '全部', value: ''}]
+      for (let row of data.data){
+        house.push({label: row.f_residential_area, value: row.f_residential_area})
+      }
+      this.residentialArea = house
+    },
+    async getinputtores () {
+      // 获取抄表员
+      let rs = []
+      if (this.$login.f.f_gasman.length > 0) {
+        for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
+          let temp = {
+            label: this.$login.f.f_gasman[i].name,
+            value: this.$login.f.f_gasman[i].name
+          }
+          rs.push(temp)
+        }
+      }
+      this.inputtores = [{label: '全部', value: ''}, ...rs]
+    },
+    cancel () {
+      this.show = false
+    },
+    userTypeChange () {
+      this.gasproperties = []
+      if (this.$refs.paged.$refs.cri.model !== null) {
+        this.$refs.paged.$refs.cri.model.f_gasproperties = ''
+        this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+      } else {
+        this.gasproperties = [{label: '全部', value: ''}]
+      }
+    },
+    initParams () {
+      // 初始化气表品牌
+      let brandArr = []
+      this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+        let temp = {}
+        temp.label = item.label
+        temp.value = item.value.f_meter_brand
+        brandArr.push(temp)
+      })
+      this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+      //初始化气表价格
+      this.prices = this.$MagGetSaleParam.getPrices()
+    },
+    search () {
+      this.$refs.paged.$refs.cri.search()
+    },
+    selfSearch (args) {
+      let f_orgstr = this.orgCondtionStr
+      args.condition = `${args.condition} ` + f_orgstr
+      this.condition = args.condition
+      this.model.search(args.condition, args.model)
+    },
+    clear () {
+      Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+        this.$refs.paged.$refs.cri.model[key] = []
+      })
+    },
+    show () {
+      this.criteriaShow = true
+    },
+    hidden () {
+      this.criteriaShow = !this.criteriaShow
+    },
+    async getRes (condition, obj) {
+      this.orgCondtionStr = condition
+      this.orgname = obj.orgnames[0]
+    },
+  },
+  events: {},
+  watch: {},
+  computed: {
+    getfield () {
+      return exportConfig.useGasyearRatioConfig
+    },
+    getCondition () {
+      return {
+        compareyear: this.$refs.paged.$refs.cri.model.compareyear,
+        searchyear: this.$refs.paged.$refs.cri.model.searchyear,
+        condition: this.condition
+      }
+    },
+    usertypes () {
+      return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+    },
+    meterStyle () {
+      return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('燃气表型号')]
+    },
+
+
+  }
+}
+</script>
+

package/src/filiale/shexian/ChargeQuery.vue

@@ -308,7 +308,7 @@
                   <v-select :value.sync="model.f_terminal_name" multiple
                             v-model="model.f_terminal_name"
                             :options='$parent.$parent.posEquipment' placeholder='请选择'
-                            condition="f_operator in {}"
+                            condition="f_terminal_num in {}"
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -977,14 +977,14 @@
       async getEquipment () {
         let HttpReset = new HttpResetClass()
         let param = {
-          items: 'f_terminal_name',
+          items: 'f_terminal_name,f_terminal_number',
           tablename: 't_equipment',
           condition: `f_equipment_type = 'POS' and f_state = '正常' and f_orgid = '${this.$login.f.orgid}'`,
           orderitem: 'id'
         }
         var data = await HttpReset.load('POST', 'rs/sql/manage_singleTable', {data: param}, {resolveMsg: null, rejectMsg: '获取设备列表失败!'})
         for (let row of data.data) {
-          this.posEquipment.push({label: row.f_terminal_name, value: row.f_terminal_name})
+          this.posEquipment.push({label: row.f_terminal_name, value: row.f_terminal_number})
         }
       },
       openBill(row){

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

@@ -252,7 +252,8 @@ export default {
     'f_stair3fee': '三阶气费',
     'f_inputtor': '抄表员',
     'f_residential_area': '小区',
-    'f_serial_number': '业务单号'
+    'f_serial_number': '业务单号',
+    'f_terminal_num': '终端号'
   },
   loginQueryConfig: {
     'userid': '登录人编号', 'username': '登录人名称', 'logindate': '登录时间', 'type': '类型'