manage-client 4.1.77 → 4.1.79-hyls

package/package.json

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

package/src/components/SellReport/hongya/HyMeterInput.vue

@@ -0,0 +1,188 @@
+<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'"
+                          :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'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label for="f_inputtor">表类型:</label>
+              <v-select :value.sync="model.meterbrand"
+                        v-model='model.meterbrand'
+                        :options='$parent.$parent.meterbrand'
+                        placeholder='表类型'
+                        close-on-select v-el:cc></v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label for="f_inputtor">用气性质:</label>
+              <v-select :value.sync="model.gasproperties" v-model='model.gasproperties'
+                        :options='$parent.$parent.gasproperties' placeholder='用气性质'
+                        close-on-select v-el:cc></v-select>
+            </div>
+          </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>
+        </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.operatorname}}-->
+            </th>
+          </tr>
+          <tr >
+            <th v-if="false" :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.meterbrand}}</span>
+                <span v-show="$parent.depname"> 用气性质：{{$parent.gasproperties}}</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_user_type: '',
+      f_state: ['有效'],
+      model: new DataModel('api/af-revenue/report/hy_meter_input', {startDate: 'this.model.startDate', endDate: 'this.model.endDate', meterbrand: 'this.model.meterbrand[0]', gasproperties: 'this.model.gasproperties[0]'}),
+      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()
+    this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString()
+  },
+  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
+      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]
+      this.operatorname = obj.operatornames[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: {
+    meterbrand () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('表类型1')]
+    },
+    gasproperties () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

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

@@ -643,7 +643,6 @@ export default {
     'f_is_mgq': '是否煤改气',
     'f_send_usegas_card': '是否发放天然气使用证',
     'f_meter_style': '型号',
-    'f_xc_meter_style': '现场表具型号',
     'f_table_state': '表具状态',
     'f_initial_base': '初始气表底数',
     'f_total_usegas_amount': '累计用气金额',
@@ -674,10 +673,7 @@ export default {
     'f_devices_type': '灶具信息',
     'f_network_valve': '自动阀控',
     'f_defendcard': '防盗卡号',
-    'f_factory_date': '生产年月',
-    'f_meteread_date': '最后通讯时间',
-    'f_xiaohushijian': '销户时间',
-    'f_xiaohuyuanyin': '销户原因'
+    'f_factory_date': '生产年月'
     // 'latest_f_pregas' : '最后购气量',
     // 'latest_f_collection':'最后购气金额',
     // 'f_max_operate_date': '最后购气日期'
@@ -1941,7 +1937,7 @@ export default {
   },
   GasStatistics: {
     'f_userinfo_code': '客户编号',
-    'f_user_name': '客户名称',
+    'f_user_name': '客户姓名',
     'f_residential_area': '小区',
     'f_address': '地址',
     'f_user_phone': '电话',
@@ -1952,33 +1948,15 @@ export default {
     'f_meter_classify': '表具类型',
     'f_meter_title': '表描述',
     'f_price_name': '气价名称',
-    'f_detailprice': '气价详情',
     'f_gasproperties': '用气性质',
-    'f_last_gas': '期初余量',
-    'f_last_balance': '期初余额',
+    'f_balance': '期初余额',
     'f_last_tablebase': '起方',
-    'f_last_shengyu_gas': '起方（液晶）',
     'f_tablebase': '止方',
-    'f_shengyu_gas': '止方（液晶）',
-    'f_shengyu_gas_gongshi': '止方（液晶）【公式】',
-    'f_actualtablebase': '期间用气量',
-    'f_real_fee': '期间用气金额',
-    'f_pregas': '期间充值气量',
-    'f_during_price': '期间充值单价',
-    'f_collection': '期间充值金额',
-    'f_bq_f_pregas': '期间补气量',
+    'f_oughtamount': '期间用气量',
+    'f_oughtfee': '期间用气金额',
+    'f_collection': '期末充值金额',
     'f_bq_preamount': '期间补气金额',
-    'f_remain_gas': '期末余量',
-    'f_remain_curbalance': '期末余额',
-    'f_remain_stair1price': '一阶剩余单价',
-    'f_remain_stair1amount': '一阶剩余气量',
-    'f_remain_stair1fee': '一阶剩余金额',
-    'f_remain_stair2price': '二阶剩余单价',
-    'f_remain_stair2amount': '二阶剩余气量',
-    'f_remain_stair2fee': '二阶剩余金额',
-    'f_remain_stair3price': '三阶剩余单价',
-    'f_remain_stair3amount': '三阶剩余气量',
-    'f_remain_stair3fee': '三阶剩余金额',
+    'f_curbalance': '期末余额',
     'f_gas_state': '用气状态',
     'f_changetable_state': '是否换表',
     'f_first_input_date': '首次抄表时间',

package/src/filiale/liaoyuan/HandplanRatioQuery.vue

@@ -40,7 +40,7 @@
                 </div>
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
-                <res-select-group :show-component="['company','department']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <res-select-group :show-component="['company','department','slicearea']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">小区名称</label>
                   <v-select :value.sync="model.f_residential_area"
@@ -351,10 +351,10 @@
         this.inputtores.push({label: "微信公众号", value: "微信公众号"})
       },
       async updateParams() {
-        await this.$MagLoadParams.loadParam(this.f_filialeid)
-        this.inputtores = [];
-        this.inputtores.push({label: "全部", value: ""})
-        await this.initSlice(this.f_filialeid)
+        // await this.$MagLoadParams.loadParam(this.f_filialeid)
+        // this.inputtores = [];
+        // this.inputtores.push({label: "全部", value: ""})
+        // await this.initSlice(this.f_filialeid)
         if(this.allorgid!=null){
           this.allorgid.forEach((res)=>{
             this.inputtores = this.inputtores.concat(this.$MagGetSaleParam.getresinputtor(res));
@@ -431,8 +431,10 @@
           //查询多个抄表员时条件
           args.condition += ` and f_inputtor in  ( ${str} )`
         }
-        args.condition = `${args.condition} ` + this.orgCondtionStr
-        this.model.search(args.condition, args.model)
+        let ratio1 = this.ratio-0
+        let ratio2 = 0-this.ratio
+        let condition = `${args.condition} ` + this.orgCondtionStr + ` and amount_ratio>=${ratio1} and amount_ratio<=${ratio2}`
+        this.model.search(condition, args.model)
       },
       clear() {
         //清空部门和人员

package/src/filiale/liaoyuan/WebHandplanRatioQuery.vue

@@ -40,7 +40,7 @@
                 </div>
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
-                <res-select-group :show-component="['company','department']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <res-select-group :show-component="['company','department','slicearea']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">小区名称</label>
                   <v-select :value.sync="model.f_residential_area"
@@ -364,10 +364,8 @@ export default {
       this.inputtores.push({label: "微信公众号", value: "微信公众号"})
     },
     async updateParams () {
-      await this.$MagLoadParams.loadParam(this.f_filialeid)
       this.inputtores = [];
       this.inputtores.push({label: "全部", value: ""})
-      await this.initSlice(this.f_filialeid)
       if (this.allorgid != null) {
         this.allorgid.forEach((res) => {
           this.inputtores = this.inputtores.concat(this.$MagGetSaleParam.getresinputtor(res));
@@ -444,8 +442,10 @@ export default {
         //查询多个抄表员时条件
         args.condition += ` and f_inputtor in  ( ${str} )`
       }
-      args.condition = `${args.condition} ` + this.orgCondtionStr
-      this.model.search(args.condition, args.model)
+      let ratio1 = this.ratio-0
+      let ratio2 = 0-this.ratio
+      let condition = `${args.condition} ` + this.orgCondtionStr + ` and amount_ratio>=${ratio1} and amount_ratio<=${ratio2}`
+      this.model.search(condition, args.model)
     },
     clear () {
       //清空部门和人员

package/src/filiale/liaoyuan/sale.js

@@ -14,7 +14,7 @@ export default function () {
   // 机表抄表环比查询
   Vue.component('handplan-ratio-query', (resolve) => { require(['./HandplanRatioQuery.vue'], resolve) })
   // 机表抄表查询
-  Vue.component('webhandplan--ratio-query', (resolve) => { require(['./WebHandplanRatioQuery.vue'], resolve) })
+  Vue.component('webhandplan-ratio-query', (resolve) => { require(['./WebHandplanRatioQuery.vue'], resolve) })
   // 换表查询
   Vue.component('change-meter-query', (resolve) => {
     require(['./ChangeMeterQuery'], resolve)