sale-client 4.2.4 → 4.2.6

package/src/components/webMeter/webManage/NewMeterList.vue

@@ -0,0 +1,461 @@
+<template>
+  <div class="flex">
+    <div @keyup.enter="search" class="height:auto">
+        <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">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp;</label>
+                  <right-tree @re-res="$parent.$parent.getorg"
+                              :initresid='$parent.$parent.org'></right-tree>
+                </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">客户编号</label>
+                  <input @keyup.enter="search" type="text" class="input_search" style="width:60%"
+                         v-model="model.f_userinfo_code"
+                         placeholder='客户编号'
+                         condition="t1.f_userinfo_code like '{}%'"
+                  >
+                </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">客户名称</label>
+                  <input @keyup.enter="search" type="text" class="input_search" style="width:60%"
+                         v-model="model.f_user_name"
+                         placeholder='客户名称'
+                         condition="t1.f_user_name like '%{}%'"
+                  >
+                </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">客户地址</label>
+                  <input @keyup.enter="search" type="text" class="input_search" style="width:60%"
+                         v-model="model.f_address"
+                         placeholder='客户地址'
+                         :size="model.f_address ? model.f_address.length : 6"
+                         condition="t2.f_address like '%{}%'"
+                  >
+                </div>
+
+
+                <div style="float:right">
+                  <button class="button_search button_spacing" @click="search()" v-el:cba>查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
+                  <export-excel
+                    :data="{condition: $parent.$parent.condition}"
+                    :field="$parent.$parent.getfield"
+                    sqlurl="rs/logic/saleExport" sql-name="iot_getNewMeterBrandAndModel1" 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">&nbsp;&nbsp;&nbsp;表号&nbsp;&nbsp;&nbsp;</label>
+                  <input @keyup.enter="search" type="text" class="input_search" style="width:60%"
+                         v-model="model.f_meternumber"
+                         placeholder='表号'
+                         condition="t1.f_meternumber like '%{}%'">
+                </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">客户类型</label>
+                  <v-select
+                    placeholder='客户类型'
+                    value-single="true"
+                    style="width:60%"
+                    :value.sync="model.f_user_type"
+                    v-model="model.f_user_type"
+                    :options='$parent.$parent.Gasusertype'
+                    close-on-select condition="t1.f_user_type ='{}'">
+                  </v-select>
+                </div>
+
+                <div class="col-sm-2">
+                  <label class="font_normal_body">用气性质</label>
+                  <v-select
+                    placeholder='用气性质'
+                    value-single="true"
+                    :value.sync="model.f_gasproperties"
+                    style="width:60%"
+                    v-model="model.f_gasproperties"
+                    :options='$parent.$parent.Gasproperties'
+                    close-on-select condition="t1.f_gasproperties ='{}'">
+                  </v-select>
+                </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">气表状态</label>
+                  <v-select
+                    placeholder='气表状态'
+                    :value.sync="model.f_table_state"
+                    style="width:60%"
+                    v-model="model.f_table_state"
+                    :options='$parent.$parent.TableStates'
+                    close-on-select
+                    condition="t1.f_table_state='{}'">
+                  </v-select>
+                </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">阀门状态</label>
+                  <v-select
+                    placeholder='阀门状态'
+                    value-single="true"
+                    style="width:60%"
+                    :value.sync="model.f_valvestate"
+                    v-model="model.f_valvestate"
+                    :options='$parent.$parent.ValveState'
+                    close-on-select condition="t1.f_valvestate ='{}'">
+                  </v-select>
+                </div>
+                <div class="col-sm-2">
+                  <label class="font_normal_body">气表品牌</label>
+                  <v-select
+                    placeholder='气表品牌'
+
+                    :value.sync="model.f_gasbrand"
+                    style="width:60%"
+                    v-model="model.f_gasbrand"
+                    :options='$parent.$parent.meterbrand'
+                    close-on-select
+                    condition="t1.f_meter_brand='{}'">
+                  </v-select>
+                </div>
+                <div class="col-sm-2" >
+                  <label class="font_normal_body" >开始时间</label>
+                  <datepicker style="width:60%" placeholder="通气起始时间"
+                              :value.sync="model.startDate"
+                              v-model="model.startDate"
+                              :format="'yyyy-MM-dd 00:00:00'"
+                              condition="t1.f_gas_date >= '{}'"
+                  ></datepicker>
+                </div>
+                <div class="col-sm-2" >
+                  <label class="font_normal_body" >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;</label>
+                  <datepicker style="width:60%" placeholder="通气结束时间"
+                              :value.sync="model.endDate"
+                              v-model="model.endDate"
+                              :format="'yyyy-MM-dd 23:59:59'"
+                              condition="t1.f_gas_date <= '{}'"
+                  ></datepicker>
+                </div>
+
+              </div>
+
+            </div>
+          </criteria>
+
+          <data-grid  :model="model" partial='list'  class="list_area table_sy" v-ref:grid>
+            <template partial='head'>
+              <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;color:#3c763d">
+                  <nobr>表号</nobr>
+                </th>
+                <th style="text-align:center;color:#3c763d">
+                  <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 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>
+                <td style="text-align:center">
+                  <nobr>{{$index+1}}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{row.f_user_name}}</nobr>
+                </td>
+                <td>
+                  <nobr>{{row.f_address}}</nobr>
+                </td>
+                <td style="text-align:center;color:#3c763d" >
+                  <nobr>
+                    {{row.f_meternumber}}
+                  </nobr>
+                </td>
+                <td style="text-align:center;color:#3c763d" >
+                  <nobr>
+                    {{row.f_gas_date}}
+                  </nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{row.f_meter_brand}}</nobr>
+                </td>
+                <td style="text-align:center">{{row.f_has_stove}}</td>
+                <td style="text-align:center">{{row.f_has_heater}}</td>
+                <td style="text-align:center">
+                  <nobr>{{row.f_meter_base}}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{row.f_total_fee}}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{row.f_balance_amount}}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{row.f_valvestate}}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{row.f_signal}}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{isNaN(parseFloat(row.f_batterylevel))?'':parseFloat(row.f_batterylevel)}}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{row.f_magneticInterference}}</nobr>
+                </td>
+                <td style="text-align:center">
+                  <nobr>{{row.f_orgname}}</nobr>
+                </td>
+              </tr>
+            </template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+</template>
+<script>
+  import {PagedList} from 'vue-client'
+  let readyGen = async function (self) {
+    await self.$LoadParams.loadParam(self.$login.f.orgid)
+    self.initQueryParam()
+    await self.$getConfig(self, 'HandManager')
+    console.log('表具管理config', self.config)
+    self.getfield = self.config.excelHeaders
+    // self.reflash()
+  }
+  export default {
+    title: '表具查询',
+    data() {
+      return {
+        model: new PagedList('rs/sql/iot_getNewMeterBrandAndModel1', 50),
+        row: null,
+        meterbrand: [],
+        searchshow: false,
+        orgcondition:' and f_filialeid = ' + this.$login.f.orgid,
+        getfield: {},
+        org:[this.$login.f.orgid],
+        criteriaShow:false,
+        config: {
+          excelHeaders: {
+            'f_userinfo_code': '客户编号','f_user_name': '客户名称','f_address': '客户地址','f_gas_date': '通气时间',
+            'f_meternumber': '表号','f_meter_brand': '气表品牌','f_has_stove': '壁挂炉','f_has_heater': '热水器','f_meter_base': '气表底数',
+            'f_total_fee': '累购金额','f_balance_amount': '表上余额', 'f_valvestate': '阀门状态',
+            'f_signal': '信号强度','f_batteryLevel': '电压','f_magneticInterference': '磁干扰',
+            'f_orgname': '组织机构'
+          }
+        },
+        condition:'f_filialeid = ' + this.$login.f.orgid,
+        WarningType: [
+          {label: '全部', value: ''}
+        ],
+        Warningstyle: [
+          {label: '全部', value: ''}
+        ],
+
+        Warningstyles: [
+          {label: '全部', value: ''}
+        ],
+        styles: false,
+        softVwareersion: [],
+        Gasusertype: [],
+        Gasproperties:[],
+        // Gasproperties: this.$refs.paged.$refs.criteria.model.f_user_type.length === 1 ? this.$appdata.getParam(this.model.f_user_type[0]) : [],
+        Gasproperties2: [],
+        f_signal_1: '',
+        f_signal_2: '',
+        str: '',
+        isBusy: false,
+        f_batterylevel_1: 0,
+        f_batterylevel_2: 0,
+        f_orgid_new: this.$login.f.orgid
+      }
+    },
+    props: ['searchobj', 'isdeal'],
+    ready() {
+      //初始化气表品牌下拉框
+      //初始化客户类型，用气性质，用气属性，软件版本号下拉框
+      readyGen(this)
+      this.$refs.paged.$refs.criteria.model.f_table_state=['正常']
+      // this.$refs.paged.$refs.criteria.search()
+    },
+    watch: {
+      'searchobj'(val) {
+        if (this.searchobj != null) {
+          this.$refs.paged.$refs.criteria.model.f_meternumber = this.searchobj.f_meternumber
+          this.$refs.paged.$refs.criteria.search()
+        }
+      },
+
+    },
+    methods: {
+      hidden(){
+        this.criteriaShow = !this.criteriaShow
+      },
+      clearmsg() {
+        this.$refs.paged.$refs.criteria.model = {}
+      },
+      clickshow() {
+        this.searchshow = !this.searchshow
+      },
+      dealmsg(val) {
+        val.model = this.model.model
+        this.$emit('deal-msg', val)
+      },
+      async search(args) {
+        this.isBusy = true
+        if(args.condition == null){
+          return;
+        }
+        args.condition = `${args.condition} `+this.orgcondition
+        this.condition=args.condition
+        this.model.search(args.condition, args.model)
+        if(this.f_orgid_new == '' || this.f_orgid_new == null){
+          await this.$LoadParams.loadParam(this.$login.f.orgid)
+        }else{
+          await this.$LoadParams.loadParam(this.f_orgid_new)
+        }
+        this.initQueryParam();
+      },
+      getorg(obj) {
+        if (obj.resids.length>0) {
+          this.orgcondition = " and t1.f_filialeid in " + this.$login.convertToIn(obj.resids)
+          if(obj.resids instanceof  Array){
+            this.f_orgid_new = obj.resids[0]
+          }else{
+            this.f_orgid_new = obj.resids
+          }
+        }else
+        {
+          this.orgcondition = " and t1.f_filialeid = " + this.$login.f.orgid
+        }
+      },
+
+      userTypeChange () {
+        this.gasproperties = []
+        if (this.model.f_user_type.length === 1) {
+          if (this.model.f_user_type[0]) {
+            this.gasproperties = this.$appdata.getParam(this.model.f_user_type[0])
+          } else {
+            this.$refs.paged.$refs.criteria.model.f_gasproperties = ''
+          }
+        }
+      },
+      initQueryParam () {
+        let arr = []
+        this.$GetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          if(item.value.f_meter_type==='物联网表'){
+            temp.label = item.label
+            temp.value = item.value.f_meter_brand
+            arr.push(temp )
+          }
+
+        })
+        this.meterbrand = [{label: '全部', value: ''}, ...arr]
+      }
+    },
+    computed: {
+     /* Warningstyle () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('燃气表型号')]
+      },*/
+      MeterTypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
+      },
+      TableStates() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
+      },
+       Gasproperties() {
+         let rs = []
+         if (this.model.model.f_user_type) {
+           rs = this.$appdata.getParam(this.model.model.f_user_type[0])
+         }
+         return rs
+         // return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+       },
+      ValveState() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('阀门状态')]
+      },
+      Gasusertype() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
+      signtype1() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('标记名称')]
+      },
+      parameterState() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('标记状态')]
+      },
+      userfilesState() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('上报状态')]
+      },
+      /*softVwareersion() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('软件版本号')]
+      },*/
+      valvestate() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('阀门状态')]
+      },
+      meterbrands() {
+        return this.$GetSaleParam.getGasbrand()
+      }
+    }
+  }
+</script>
+<style>
+  /*.form-input-group label {*/
+  /*  text-align: right;*/
+  /*  width: auto;*/
+  /*}*/
+
+  .datapanel {
+    color: #333;
+    background-color: white;
+    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
+    padding: 10px 30px 10px 30px;
+    border-radius: 15px;
+  }
+</style>
+

package/src/filiale/jinhong/HandplanQuery.vue

@@ -250,6 +250,14 @@
                             close-on-select
                             condition="f_meter_book_num in {}"></v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">抄表册编号</label>
+                  <v-select :value.sync="model.f_book_code" v-model="model.f_book_code"
+                            :options='$parent.$parent.bookcodes' placeholder='抄表册编号'
+                            style="width:60%"
+                            :multiple="true"
+                            condition="f_book_code in {}"></v-select>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label for="belongmonth" class="font_normal_body">所属年月</label>
                   <datepicker placeholder="所属年月" style="width:60%"
@@ -328,6 +336,9 @@
                 <th>
                   <nobr>表册片区</nobr>
                 </th>
+                <th>
+                  <nobr>抄表册编号</nobr>
+                </th>
                 <th>
                   <nobr>客户地址</nobr>
                 </th>
@@ -483,6 +494,9 @@
               <td style="text-align: center;">
                 <nobr>{{ row.f_book_slice_area }}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{ row.f_book_code }}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{ row.f_address }}</nobr>
               </td>
@@ -750,6 +764,7 @@ let readySomething = async function (self) {
 
   await self.$LoadParams.loadMeterBook(self.f_filialeid)
   self.loadMeterBooks()
+  self.loadBookCodes()
   // await self.$LoadParams.loadMeterBook(self.f_filialeid)
   // self.loadMeterBooks()
   self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
@@ -809,6 +824,7 @@ export default {
       inputtouPerson: [],
       priceNames: [],
       meterbrands: [],
+      bookcodes: [],
       printshow: false,
       f_filialeid: this.$login.f.f_orgid,
       all: false,
@@ -851,6 +867,7 @@ export default {
           'f_sellinggas_operate_date': '收费时间',
           'f_inputtor': '抄表员',
           'f_book_slice_area': '表册片区',
+          'f_book_code': '抄表册编号',
           'f_hand_date': '下发日期',
           'f_input_date': '录入日期',
           'f_meter_state': '抄表状态',
@@ -935,6 +952,9 @@ export default {
     loadMeterBooks () {
       this.meterbooks = [...this.meterbooks, ...this.$GetSaleParam.getMeterBooks()]
     },
+    loadBookCodes () {
+      this.bookcodes = this.$GetSaleParam.getBookCodes()
+    },
     getuuid () {
       let uuidA = ''
       var s = []

package/src/filiale/jinhong/machineDown.vue

@@ -147,6 +147,19 @@
                           :multiple="true"
                           condition="f_meter_book_num in {}"></v-select>
               </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">抄表册编号</label>
+                <v-select :value.sync="model.f_book_code" v-model="model.f_book_code"
+                          :options='$parent.$parent.bookcodes' placeholder='抄表册编号'
+                          style="width:60%"
+                          :multiple="true"
+                          condition="f_book_code in {}"></v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">周&ensp;&ensp;&ensp;&ensp;期</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_period"
+                       condition="f_period = '{}'" placeholder='周期'>
+              </div>
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">调压箱名</label>
                 <v-select :value.sync="model.f_adjustable_name" v-model="model.f_adjustable_name"
@@ -238,14 +251,18 @@
               <th>
                 <nobr>上期底数</nobr>
               </th>
-
               <!--              <th>抄表册</th>-->
               <th>
                 <nobr>
                   <data-order field="f_book_name" name="抄表册"
                               :order.sync="$parent.$parent.$parent.orderFields.f_book_name"></data-order>
                 </nobr>
-
+              </th>
+              <th>
+                <nobr>抄表册编号</nobr>
+              </th>
+              <th>
+                <nobr>周期</nobr>
               </th>
               <th>
                 <nobr>操作</nobr>
@@ -277,6 +294,8 @@
             <td style="text-align: center;">{{row.f_meternumber}}</td>
             <td style="text-align: center;">{{row.f_meter_base}}</td>
             <td style="text-align: center;">{{row.f_book_name}}</td>
+            <td style="text-align: center;">{{row.f_book_code}}</td>
+            <td style="text-align: center;">{{row.f_period}}</td>
             <td style="text-align: center;"><nobr>
               <!--              <button type="button" name="button" class="button_search button_spacing width-60"-->
               <!--                      v-if="$parent.$parent.$parent.config.customCal && row.f_meter_state === '已抄表' && row.states === 1 && row.f_oper_state === '正常' &&  row.f_whether_pay === '否'"-->
@@ -438,8 +457,10 @@
 
   let readyGen = async function (self) {
     await self.$getConfig(self, 'HandManager')
+    await self.$LoadParams.loadParam(self.f_filialeid)
     await self.$LoadParams.loadMeterBook(self.f_filialeid)
     self.loadMeterBooks()
+    self.loadBookCodes()
     self.getfield = self.config.excelHeaders
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
     self.reflash()
@@ -561,6 +582,8 @@
             'f_oughtamount': '应交气量',
             'f_whether_pay': '是否缴费',
             'f_book_name': '抄表册',
+            'f_book_code': '抄表册编号',
+            'f_period': '周期',
             'f_meter_classify': '气表分类',
             'f_price_type': '气价类型',
             'f_price_name': '气价名称',
@@ -621,6 +644,7 @@
         splitdata: '',
         f_filialeid: this.$login.f.orgid,
         meterbooks: [],
+        bookcodes: [],
         upshow: false,
         inputid: 0,
         showfiles: false,
@@ -733,7 +757,9 @@
       loadMeterBooks () {
         this.meterbooks = this.$GetSaleParam.getMeterBooks()
       },
-
+      loadBookCodes () {
+        this.bookcodes = this.$GetSaleParam.getBookCodes()
+      },
       fileterprice (row) {
         this.splitdata = row
         this.priceSplit = true
@@ -1098,7 +1124,9 @@
           'f_balance': '上期结余',
           'f_meternumber': '表号',
           'f_meter_base': '上期底数',
-          'f_book_name': '抄表册'
+          'f_book_name': '抄表册',
+          'f_book_code': '抄表册编号',
+          'f_period': '周期'
         }
       },
       getCondition () {