manage-client 4.0.79 → 4.0.80

package/package.json

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

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

@@ -61,6 +61,21 @@
              <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
              <report-excel id='gasprice'></report-excel>
           </div>
+          <div class="col-sm-2">
+            <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" >
+            <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>
     </criteria>
     <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
@@ -138,6 +153,7 @@
         f_operatorid: this.$login.f.id,
         operatorid: [],
         depid: [],
+        gasproperties: [],
         orgname: '',
         depname: '',
         operatorname: '',
@@ -155,6 +171,16 @@
       console.log(this.$login.f)
     },
     methods: {
+      userTypeChange () {
+        this.gasproperties = []
+        if (this.$refs.paged.$refs.criteria.model !== null) {
+          this.$refs.paged.$refs.criteria.model.f_gasproperties = ''
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
+        }
+        else {
+          this.gasproperties = [{label: '全部', value: ''}]
+        }
+      },
       searchData () {
         this.$refs.paged.$refs.criteria.search()
       },
@@ -203,8 +229,11 @@
       }
     },
     computed: {
-      metertype() {
+      metertype () {
         return [...this.$appdata.getParam('气表类型查询')]
+      },
+      usertypes () {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
       }
     }
   }

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

@@ -0,0 +1,239 @@
+<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="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_user_type"
+                        v-model="$parent.$parent.f_user_type"
+                        :options='$parent.$parent.user_type' placeholder='请选择'
+                        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="$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="$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'
+
+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/sy_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()
+    },
+    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]
+      console.log(obj,"========")
+      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: {
+    charge_state() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
+    },
+    user_type () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

package/src/filiale/xinjiangdexin/LostContactAnalysisListIndex.vue

@@ -157,39 +157,6 @@
               </datepicker>
             </div>
 
-
-            <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
-              <label class="font_normal_body">最长失联</label>
-              <div class="row">
-                <input type="text" style="width:27%" class="input_search" v-model="model.max_interval_day1"
-                       condition="max_interval_day >= {} " placeholder="">
-                <label class="font_normal_body"> &nbsp;≤ x ≤ </label>
-                <input type="text" style="width:27%" class="input_search" v-model="model.max_interval_day2"
-                       condition="max_interval_day <= {} " placeholder="">
-              </div>
-            </div>
-
-
-            <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
-              <label class="font_normal_body">合计失联</label>
-              <div class="row">
-                <input type="text" style="width:27%" class="input_search" v-model="model.SLdays1"
-                       condition="SLdays >= {} " placeholder="">
-                <label class="font_normal_body">&nbsp; ≤ x ≤ </label>
-                <input type="text" style="width:27%" class="input_search" v-model="model.SLdays2"
-                       condition="SLdays <= {} " placeholder="">
-              </div>
-            </div>
-            <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
-              <label class="font_normal_body">最新失联</label>
-              <div class="row">
-                <input type="text" style="width:27%" class="input_search" v-model="model.new_days1"
-                       condition="new_days >= {} " placeholder="">
-                <label class="font_normal_body">&nbsp; ≤ x ≤ </label>
-                <input type="text" style="width:27%" class="input_search" v-model="model.new_days2"
-                       condition="new_days <= {} " placeholder="">
-              </div>
-            </div>
             <div class="col-sm-2 form-group">
               <label class="font_normal_body">是否通气</label>
               <v-select
@@ -231,21 +198,23 @@
             <th style="text-align:center">
               <nobr>启用日期</nobr>
             </th>
-
             <th style="text-align:center">
-              <nobr>应报天数</nobr>
+              <nobr>失联开始时间</nobr>
+            </th>
+            <th style="text-align:center">
+              <nobr>失联结束时间</nobr>
             </th>
             <th style="text-align:center">
-              <nobr>实报天数</nobr>
+              <nobr>失联天数</nobr>
             </th>
             <th style="text-align:center">
-              <nobr>最长失联天数</nobr>
+              <nobr>失联备注</nobr>
             </th>
             <th style="text-align:center">
-              <nobr>累计失联天数</nobr>
+              <nobr>失联原因</nobr>
             </th>
             <th style="text-align:center">
-              <nobr>最新失联天数</nobr>
+              <nobr>失联措施</nobr>
             </th>
             <th style="text-align:center">
               <nobr>气表厂家</nobr>
@@ -277,18 +246,25 @@
           <td style="text-align:center">{{row.f_gasproperties}}</td>
           <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">{{row.ybdays}}</td>
-          <td style="text-align:center">{{row.sbdays}}</td>
           <td style="text-align:center">
-            <nobr>{{row.max_interval_day}}</nobr>
+            <nobr>{{row.f_lost_begin_date}}</nobr>
+          </td>
+          <td style="text-align:center">
+            <nobr>{{row.f_lost_end_date}}</nobr>
+          </td>
+          <td style="text-align:center">
+            <nobr>{{row.f_lost_contact_days}}</nobr>
           </td>
           <td style="text-align:center">
-            <nobr>{{row.sldays}}</nobr>
+            <nobr>{{row.f_remark}}</nobr>
           </td>
           <td style="text-align:center">
-            <nobr>{{row.new_days}}</nobr>
+            <nobr>{{row.f_reason}}</nobr>
           </td>
+          <td style="text-align:center">
+            <nobr>{{row.f_measures}}</nobr>
+          </td>
+
           <td style="text-align:center">
             <nobr>{{row.f_meter_brand}}</nobr>
           </td>
@@ -363,14 +339,17 @@
           "f_gasproperties":"用气性质",
           "f_meternumber":"表号",
           "f_startuse_date":"启用日期",
-          "ybdays":"应报天数",
-          "sbdays":"实报天数",
-          "max_interval_day":"最长失联天数",
-          "sldays":"累计失联天数",
-          "new_days":"最新失联天数",
           "f_meter_brand":"气表厂家",
           "f_orgname":"组织机构",
-          "f_depname":"部门"},
+          "f_depname":"部门",
+          "f_lost_contact_days":"失联天数",
+          "f_lost_begin_date":"失联开始时间",
+          "f_lost_end_date":"失联结束时间",
+          "f_remark":"失联备注",
+          "f_reason":"失联原因",
+          "f_measures":"失联措施"
+
+        },
         reportStr: null,
         show: false,
         showdetail:false,

package/src/reportManage.js

@@ -862,6 +862,10 @@ export default function () {
   Vue.component('sy_non-resident-gas', (resolve) => {
     require(['./components/SellReport/siyang/NonResidentGas'], resolve)
   })
+  // 收费结账报表
+  Vue.component('sy_manage-bus-summary', (resolve) => {
+    require(['./components/SellReport/siyang/SYManageBusSummary'], resolve)
+  })
   // 用户数量统计报表
   Vue.component('manage-metertype-number', (resolve) => {
     require(['./components/SellReport/ManageMetertypeNumber'], resolve)