manage-client 3.2.189 → 3.2.191

package/package.json

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

package/src/components/SellReport/ManageBusSummary.vue

@@ -67,12 +67,12 @@
                         close-on-select></v-select>
             </div>
             <!--<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>-->
+            <!--<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>
@@ -124,114 +124,114 @@
 </template>
 
 <script>
-  import { DataModel } from 'vue-client'
-  import co from 'co'
+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_user_type: '',
-        f_state:['有效'],
-        model: new DataModel('rs/report/getmoneyall', {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: []
-        }
+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_user_type: '',
+      f_state:['有效'],
+      model: new DataModel('rs/report/getmoneyall', {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()
     },
-    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)
+    selfSearch (args) {
+      this.printTime = this.$login.toStandardTimeString()
+      let orgcondition = '1=1'
+      let orgstr = this.orgCondtionStr
+      orgcondition = orgcondition + orgstr
+      console.log('23231312321:',this.f_user_type)
+      if(this.f_user_type && this.f_user_type[0]) {
+        orgcondition += ` and f_user_type = '${ this.f_user_type}  '`
+      }
+      /*        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)
     },
-    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
-        console.log('23231312321:',this.f_user_type)
-        if(this.f_user_type && this.f_user_type[0]) {
-          orgcondition += ` and f_user_type = '${ this.f_user_type}  '`
-        }
-        /*        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
-      }
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    getRes (condition, obj) {
+      this.orgCondtionStr = condition
+      this.orgname = obj.orgnames[0]
+      this.depname = obj.depnames[0]
     },
-    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
-          }
+    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
       }
+      this.spans = len
+    }
+  },
+  computed: {
+    charge_state() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
     },
-    computed: {
-      charge_state() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
-      },
-      user_type () {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
-      }
+    user_type () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
     }
   }
+}
 </script>
 <style scoped>
-  .noborder{
-    border: none;
-  }
+.noborder{
+  border: none;
+}
 </style>

package/src/components/SellReport/ManageBusSummarys.vue

@@ -0,0 +1,290 @@
+<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"  :cascade =true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+          </div>
+          <div class="col-sm-2 form-group">
+            <label class="font_normal_body">用户类型</label>
+            <v-select :value.sync="$parent.$parent.f_user_type"
+                      v-model="$parent.$parent.f_user_type"
+                      :options='$parent.$parent.user_type' placeholder='请选择'
+                      condition="f_user_type in '{}'"
+                      close-on-select></v-select>
+          </div>
+          <div class="col-sm-2 form-group">
+            <label class="font_normal_body" title="参数:付款方式查询">付款方式</label>
+            <v-select :value.sync="model.f_payment" multiple
+                      v-model="model.f_payment"
+                      :options='$parent.$parent.payment' placeholder='请选择'
+                      condition="f_payment in {}"
+                      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" multiple
+                      :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
+                      condition="f_meter_type in {}"
+                      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" multiple
+                      v-model="model.f_meter_brand"
+                      :options='$parent.$parent.meterbrands' placeholder='请选择'
+                      condition="f_meter_brand in {}"
+                      close-on-select></v-select>
+          </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 yle="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="$parent.operatorname">人员：{{$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'
+
+let readySomething = async function (self) {
+  await self.$MagLoadParams.loadParam()
+  self.initParams()
+}
+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_user_type: '',
+      f_state:['有效'],
+      model: new DataModel('rs/report/getmoneyall', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      resshow:['company','department','operator'],
+      spans: 0,
+      user_type:[],
+      meterbrands: [],
+      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)
+    readySomething(this).then(() => {
+      this.$emit('ready')
+    }).catch((error) => {
+      this.$emit('error', error)
+    })
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    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]
+
+    },
+    selfSearch (args) {
+      this.printTime = this.$login.toStandardTimeString()
+      let orgcondition = '1=1'
+      let orgstr = this.orgCondtionStr
+      orgcondition = orgcondition + orgstr
+      console.log('23231312321:',this.f_user_type)
+      if(this.f_user_type && this.f_user_type[0]) {
+        orgcondition += ` and f_user_type = '${ this.f_user_type}  '`
+      }
+      /*        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: {
+    payment() {
+      return [...this.$appdata.getParam('付款方式查询')]
+    },
+    user_type () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    },
+    metertypes() {
+      return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
+    }
+    // meterbrands() {
+    //   return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表品牌')]
+    // }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

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

@@ -106,7 +106,7 @@
                             condition="f_payment in {}"
                             close-on-select></v-select>
                 </div>
-                <div class="col-sm-2 form-group" v-if="titleShow">
+                <div class="col-sm-2 form-group" v-if="$parent.$parent.titleShow">
                   <label class="font_normal_body" title="参数:支付渠道查询">支付渠道</label>
                   <v-select :value.sync="model.f_bank_type" multiple
                             v-model="model.f_bank_type"
@@ -430,7 +430,7 @@
               <th>
                   <nobr>写卡状态</nobr>
               </th>
-                <th v-if="titleShow">
+                <th v-if="$parent.$parent.$parent.titleShow">
                   <nobr>支付渠道</nobr>
                 </th>
                 <th>
@@ -626,7 +626,7 @@
                 <td style="text-align: center;">
                     <nobr>{{row.f_write_card}}</nobr>
                 </td>
-              <td style="text-align: center;" v-if="titleShow">
+              <td style="text-align: center;" v-if="$parent.$parent.$parent.titleShow">
                 <nobr>{{row.f_bank_type}}</nobr>
               </td>
               <td style="text-align: center;">

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

@@ -80,7 +80,7 @@
                             </div>
                             <div class="col-sm-2 form-group">
                                 <label style="width:35%" class="font_normal_body">气表品牌</label>
-                                <v-select :value.sync="model.f_balance_amount"
+                                <v-select :value.sync="model.f_meter_brand"
                                           v-model="model.f_meter_brand"
                                           :options='$parent.$parent.meterbrands' placeholder='请选择'
                                           condition="f_meter_brand = '{}'"

package/src/filiale/gehua/GasStatistics.vue

@@ -31,6 +31,15 @@
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_address" placeholder='客户地址'
                          condition="ss.f_address like '%{}%'" v-next-el='f_address' v-el:f_address>
                 </div>
+
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用户类型</label>
+                  <v-select :value.sync="model.f_user_type" v-model="model.f_user_type"
+                            :options='$parent.$parent.usertypes' placeholder='用户类型'
+                            style="width:60%"
+                            close-on-select
+                            condition="f_user_type = '{}'"></v-select>
+                </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>
@@ -174,6 +183,7 @@
               <tr>
                 <th><nobr>客户编号</nobr></th>
                 <th><nobr>客户名称</nobr></th>
+                <th><nobr>用户类型</nobr></th>
                 <th><nobr>小区</nobr></th>
                 <th><nobr>地址</nobr></th>
                 <th><nobr>电话</nobr></th>
@@ -208,6 +218,7 @@
               <tr >
                 <td style="text-align: left;"><nobr> <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span></nobr></td>
                 <td style="text-align: left;"><nobr>{{row.f_user_name}}</nobr></td>
+                <td style="text-align: left;"><nobr>{{row.f_user_type}}</nobr></td>
                 <td style="text-align: left;"><nobr>{{row.f_residential_area}}</nobr></td>
                 <td style="text-align: left;"><nobr>{{row.f_address}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>

package/src/reportManage.js

@@ -660,6 +660,10 @@ export default function (filiale) {
   Vue.component('monthm-stair-hunum', (resolve) => {
     require(['./components/SellReport/MonthStairHunum'], resolve)
   })
+  // 收费结账报表 多查询条件（用户类型，付款方式，气表类型，气表品牌）
+  Vue.component('manage-bus-summarys', (resolve) => {
+    require(['./components/SellReport/ManageBusSummarys'], resolve)
+  })
   // 物联网日用气报表(户数)
   Vue.component('day-stair-hunum', (resolve) => {
     require(['./components/SellReport/DayStairMoneyHunum'], resolve)