manage-client 3.2.225 → 3.2.230

package/src/components/SellReport/shangyenum.vue

@@ -0,0 +1,221 @@
+<template>
+  <div class="basic-main" style="height: 100%">
+    <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 form-group" >
+              <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 form-group" >
+              <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 form-group">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
+              <right-tree @re-res="$parent.$parent.getRes" style="width: 60%"></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'
+                          is-mul="false"
+                          @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>
+-->
+            <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+          </div>
+          <div class="span" style = "float:right;">
+            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+            <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+            <report-excel id='gasprice'></report-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 class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">收费状态</label>
+              <v-select :value.sync="$parent.$parent.f_state" multiple
+                        v-model="$parent.$parent.f_state"
+                        :options='$parent.$parent.charge_state' placeholder='请选择'
+                        condition="f_state in {}"
+                        close-on-select></v-select>
+            </div>
+          </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;<br/>
+              <!--打印时间：{{{$parent.printTime}}}-->
+              打印时间：{{$parent.printTime}}
+              <!--收费员：{{// $parent.operatorname}}-->
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              <div>
+                <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
+                <!--                <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$refs.criteria.$refs.res.obj.operatornames[0]">人员：{{$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>
+        {{{ $parent.reportStr}}}
+      </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: '',
+      criteriaShow: false,
+      operatorname: '',
+      orgCondtionStr: '1=1',
+      f_state:['有效'],
+      model: new DataModel('rs/report/shangyenum', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      resshow:['company','department','operator'],
+      spans: 0,
+      initres: {
+        org: [this.$login.f.orgid],
+        dep: [],
+        user: []
+      }
+    }
+  },
+  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'
+    console.log(this.$login.f)
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      this.printTime = this.$login.toStandardTimeString()
+      let orgcondition = '1=1'
+      let orgstr = this.orgCondtionStr
+      orgcondition = orgcondition + orgstr
+      /*        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)
+    },
+
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    getRes (condition, obj) {
+      this.orgCondtionStr = condition
+      this.orgname = obj.orgnames[0]
+      this.depname = obj.depnames[0]
+    },
+    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) {
+      let len=0
+      let a=val.split('</tr>')
+      for(let i=0;i<a.length;i++){
+        if(a[i].split('</td>').length-1>len){
+          len=a[i].split('</td>').length-1
+        }
+      }
+      this.spans = len
+    }
+  },
+  computed: {
+    charge_state() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

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

@@ -325,6 +325,15 @@
                   <input type="text" style="width:30%" class="input_search" title="小于等于" v-model="model.f_pregas_big"
                          condition="f_pregas <= '{}' " placeholder="小于等于">
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;阶数</label>
+                  <v-select placeholder='请选择'
+                            :value.sync="model.jietilevel"
+                            v-model="model.jietilevel"
+                            :options='$parent.$parent.jieshu'
+                            condition="jietilevel = '{}'"
+                            close-on-select></v-select>
+                </div>
               </div>
             </div>
           </criteria>
@@ -852,6 +861,7 @@
     title: '收费查询',
      data() {
       return {
+        // jietilevel:'',
         IdCardInfo:'',
         titleShow : true,
         card:'',
@@ -929,7 +939,12 @@
         lastorgstr:'',
         // pos设备列表
         posEquipment: [{label: '全部',value: ''}],
-        showbottomsum:false  //页面下方是否有合计: 默认为false, 在watch修改
+        showbottomsum:false, //页面下方是否有合计: 默认为false, 在watch修改
+        jieshu: [
+          {label: '一阶', value: '一阶'},
+          {label: '二阶', value: '二阶'},
+          {label: '三阶', value: '三阶'}
+        ]
       }
     },
     ready() {
@@ -1051,7 +1066,6 @@
       },
 
       search(){
-
         this.$refs.paged.$refs.cri.search()
       },
       cancel() {

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

@@ -373,7 +373,7 @@
               收款合计: {{sumsmodel.f_money}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              户数合计:&emsp;{{sumsmodel.hushu}}
+              总户数合计:&emsp;{{sumsmodel.hushu}}
             </td>
           </tr>
         </table>
@@ -523,8 +523,10 @@
         args.condition = `${args.condition}` + this.orgCondtionStr
       await this.model.search(args.condition, args.model)
       this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
-      this.sumsmodel.hushu=[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
-
+      this.sumsmodel.hushu =[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
+      if(this.sumsmodel.hushu===null){
+        this.sumsmodel.hushu = 0
+      }
     },
       clear() {
         //清空部门和人员

package/src/components/webmeter/WebmeterQuery.vue

@@ -24,15 +24,21 @@
     <tabs header="失联查询" v-if="permission('失联查询')">
       <lost-contact-analysis-list v-if="show.includes('失联查询')"></lost-contact-analysis-list>
     </tabs>
-    <tabs header="用气查询" v-if="permission('用气查询')">
+    <tabs header="用气查询" v-if="!newWebHand && permission('用气查询')">
       <use-gas-statistics v-if="show.includes('用气查询')"></use-gas-statistics>
     </tabs>
+    <tabs header="用气查询" v-if="newWebHand && permission('用气查询')">
+      <new-use-gas-statistics v-if="show.includes('用气查询')"></new-use-gas-statistics>
+    </tabs>
     <tabs header="未用气查询" v-if="permission('未用气查询')">
       <get-no-meteread-query v-if="show.includes('未用气查询')"></get-no-meteread-query>
     </tabs>
-    <tabs header="物联网表结算分析" v-if="permission('物联网表结算分析')">
+    <tabs header="物联网表结算分析" v-if="!newWebHand && permission('物联网表结算分析')">
       <webmeter-settlement-analysis v-if="show.includes('物联网表结算分析')"></webmeter-settlement-analysis>
     </tabs>
+    <tabs header="物联网表结算分析" v-if="newWebHand &&permission('物联网表结算分析')">
+      <new-webmeter-settlement-analysis v-if="show.includes('物联网表结算分析')"></new-webmeter-settlement-analysis>
+    </tabs>
   </tab-button>
 
 </template>
@@ -45,6 +51,7 @@
     title: '物联查询',
     data () {
       return {
+        newWebHand: this.$appdata.getSingleValue('新抄表'),
         show: []
       }
     },