manage-client 4.0.61 → 4.0.62-2

package/package.json

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

package/src/components/SellReport/siyang/SYGasSaleFee.vue

@@ -0,0 +1,178 @@
+<template>
+  <div class="basic-main" style="height: 98%">
+    <criteria-paged :model="model" :pager='false' v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+          <div class="row">
+            <div class="col-sm-2" >
+              <label class="font_normal_body" for="startDate">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2" >
+              <label  class="font_normal_body" for="endDate">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2">
+              <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">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
+              <res-select restype='department'
+                          is-mul="false"
+                          @res-select="$parent.$parent.getdep"
+                          :parentresid="$parent.$parent.depresid"
+                          :initresid='$parent.$parent.depid'>
+              </res-select>
+
+            </div>
+            <div class="col-sm-2">
+              <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>
+          <div class="span" style = "float:right;">
+            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+            <report-print id='gasprice' top='1cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+            <report-excel id='gasprice'></report-excel>
+          </div>
+        </div>
+      </criteria>
+      <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">售气收费报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              <div>
+                <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
+                <span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td :colspan='$parent.spans' class="noborder">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left">
+            <th :colspan='Math.floor($parent.spans/3)'>财务审核：</th>
+            <th :colspan='Math.floor($parent.spans/3)'>收款审核：</th>
+            <th :colspan='Math.floor($parent.spans/3)'>收款员：</th>
+          </tr>
+          </tfoot>
+        </table>
+      </div>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { DataModel } from 'vue-client'
+import co from 'co'
+export default {
+  title: '售气收费报表',
+  props: ['data'],
+  data () {
+    return {
+      printTime: this.$login.toStandardTimeString(),
+      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',
+      model: new DataModel('api/af-revenue/report/sy_GasSaleFee', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      spans: 0
+    }
+  },
+  ready () {
+    this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+    this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      this.printTime = this.$login.toStandardTimeString()
+      let orgcondition = '1=1'
+      if (this.f_orgid && this.f_orgid[0]) {
+        orgcondition += ` and f_orgid in ('${this.f_orgid}')`
+      }
+      if (this.f_depid && this.f_depid[0]) {
+        orgcondition += ` and f_depid in ('${this.f_depid}')`
+      }
+      if(this.f_operatorid && this.f_operatorid[0]) {
+        orgcondition += ` and f_operatorid in ('${this.f_operatorid}')`
+      }
+      this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+      this.$refs.paged.search(args)
+    },
+    getRes (obj) {
+      this.orgname = obj.res[0]
+      this.depresid = obj.resids
+      this.f_orgid = obj.resids
+    },
+    getdep (obj, val) {
+      this.depname = val[0]
+      this.userresid = obj
+      this.f_depid = obj
+    },
+    getuser ( obj, val) {
+      this.operatorname = val[0]
+      this.f_operatorid = obj
+    }
+  },
+  watch: {
+    'model.data' (val) {
+      this.spans = val.split('</tr>').map(item => item.split('</td>').length-1).reduce((x, y) => x > y ? x : y)
+    }
+  },
+  computed: {
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

package/src/components/webmeter/DrillData/LostContactAnalysisList.vue

@@ -281,7 +281,9 @@
             <th style="text-align:center">
               <nobr>启用日期</nobr>
             </th>
-
+            <th style="text-align:center">
+              <nobr>最后通讯时间</nobr>
+            </th>
             <th style="text-align:center">
               <nobr>应报天数</nobr>
             </th>
@@ -329,6 +331,7 @@
           <td style="text-align:center"><nobr>{{row.f_meternumber}}</nobr></td>
           <td style="text-align:center"><nobr>{{row.f_startuse_date}}</nobr></td>
 
+          <td style="text-align:center"><nobr>{{row.f_meteread_date}}</nobr></td>
           <td style="text-align:center">{{row.ybdays}}</td>
           <td style="text-align:center">{{row.sbdays}}</td>
           <td style="text-align:center">
@@ -418,6 +421,7 @@
           "f_gasproperties":"用气性质",
           "f_meternumber":"表号",
           "f_startuse_date":"启用日期",
+          "f_meteread_date": "最后通讯时间",
           "ybdays":"应报天数",
           "sbdays":"实报天数",
           "max_interval_day":"最长失联天数",

package/src/components/webmeter/newwebmeter/NewException/MeterExceptionList.vue

@@ -61,6 +61,24 @@
                                 <right-tree @re-res="$parent.$parent.getorg"
                                             :initresid='$parent.$parent.org'></right-tree>
                             </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">&nbsp;&nbsp;&nbsp;余额&nbsp;&nbsp;&nbsp;</label>
                             <input type="number" style="width:30%" class="input_search" title="大于等于" v-model="model.f_balance_amount_small"
@@ -181,6 +199,12 @@
                             <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>
@@ -245,6 +269,9 @@
                         <td>
                             <nobr>{{row.address}}</nobr>
                         </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_balance_amount}}</td>
                         <td style="text-align:center">{{row.f_user_phone}}</td>
                         <td style="text-align:center"><nobr>{{row.f_meternumber}}</nobr></td>
@@ -360,13 +387,14 @@
                     {label: '日', value: 'day'}
                 ],
                 getfield:{
-                    "f_userinfo_code":"客户编号", "f_user_name":"客户名称","f_residential_area":"小区", "address":"客户地址","f_balance_amount":"账户余额","f_user_phone":"联系电话",
+                    "f_userinfo_code":"客户编号", "f_user_name":"客户名称","f_residential_area":"小区", "address":"客户地址","f_user_type":"客户类型","f_gasproperties":"用气性质","f_balance_amount":"账户余额","f_user_phone":"联系电话",
                     "f_meternumber":"表号","f_meter_brand":"气表品牌","f_hand_date":"抄表日期","f_insert_date":"最后一次通讯时间","f_electricity":"电池电量","f_batterylevel":"电池电压",
                     "f_signal":"信号强度","f_magneticInterference":"磁干扰异常","f_valvestate":"阀门状态","f_error_type":"异常类型","f_error_level":"异常级别","f_is_read":"处理状态","f_error_reason":"备注信息","f_orgname":"分公司"
                 },
                 outlets: [],
                 operator: [],
                 showdetail:false,
+                gasproperties:[],
                 rowdata:{},
                 filename: '',
                 criteriaShow: false,
@@ -404,6 +432,16 @@
                     this.orgCondtionStr = " and f_orgid = " + this.$login.f.orgid + " and f_error_type IS NOT NULL and f_error_level  IS NOT NULL "
                 }
             },
+            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 arr = []
                 this.$MagGetSaleParam.getGasbrand().forEach((item) => {
@@ -558,9 +596,6 @@
             usertypes() {
                 return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
             },
-            Gasproperties() {
-                return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
-            },
             isread() {
                 return [{label: '全部', value: ''}, ...this.$appdata.getParam('处理状态')]
             },