manage-client 3.3.230 → 3.3.232-kl

package/src/components/SellReport/ManageGasGroupSummary.vue

@@ -0,0 +1,208 @@
+<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>
+            <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_gasproperties"
+                        v-model="$parent.$parent.f_gasproperties"
+                        :options='$parent.$parent.Properties'
+                        :value-single="true"
+                        placeholder='请选择'
+                        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'
+
+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_gasproperties: '',
+      model: new DataModel('api/af-revenue/report/getGasSummary',
+        {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_gasproperties) {
+        orgcondition += ` and h.f_gasproperties = '${this.f_gasproperties}'`
+      }
+      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.orgCondtionStr = this.orgCondtionStr.replace('f_orgid', 'h.f_orgid')
+      this.orgCondtionStr = this.orgCondtionStr.replace('f_depid', 'h.f_depid')
+      this.orgCondtionStr = this.orgCondtionStr.replace('f_opertorid', 'h.f_opertorid')
+      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: {
+    Properties () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

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

@@ -309,6 +309,9 @@
             <th style="text-align:center" >
               <nobr>组织机构</nobr>
             </th>
+            <th style="text-align:center" >
+              <nobr>部门</nobr>
+            </th>
 
           </tr>
 
@@ -349,6 +352,9 @@
           <td style="text-align:center">
             <nobr>{{row.f_orgname}}</nobr>
           </td>
+          <td style="text-align:center">
+            <nobr>{{row.f_depname}}</nobr>
+          </td>
 
         </template>
       </data-grid>
@@ -418,7 +424,8 @@
           "sldays":"累计失联天数",
           "new_days":"最新失联天数",
           "f_meter_brand":"气表厂家",
-          "f_orgname":"组织机构"},
+          "f_orgname":"组织机构",
+          "f_depname":"部门"},
         reportStr: null,
         show: false,
         showdetail:false,
@@ -596,13 +603,9 @@
         this.userresid = obj
         this.queryData.f_depid = obj
         console.log(this.queryData.f_depid)
-
         if (obj.length > 0) {
           this.orgCondtionStr += " and f_depid in " + plugin.convertToIn(obj)
-        } else {
-          this.orgCondtionStr += " and f_depid = " + this.$login.f.depid
         }
-
         if (this.depresid && this.depresid.length > 0) {
           this.orgCondtionStr = " and f_orgid in " + plugin.convertToIn(this.depresid) + this.orgCondtionStr
         } else {

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

@@ -271,6 +271,9 @@
               <th style="text-align:center" >
                 <nobr>组织机构</nobr>
               </th>
+              <th style="text-align:center" >
+                <nobr>部门</nobr>
+              </th>
           </tr>
 
           </template>
@@ -312,6 +315,9 @@
             <td style="text-align:center">
               <nobr>{{row.f_orgname}}</nobr>
             </td>
+            <td style="text-align:center">
+              <nobr>{{row.f_depname}}</nobr>
+            </td>
           <!--<td style="text-align:center">{{row.new_days}}</td>-->
           <!--<td style="text-align:center">{{row.f_state}}</td>-->
 
@@ -378,7 +384,7 @@
           "lastinsertdate":"最后上报日期",
           "f_meter_base":"最后表读数",
           "slday":"失联天数",
-          "f_meter_brand":"气表厂家","f_orgname":"组织机构"},
+          "f_meter_brand":"气表厂家","f_orgname":"组织机构","f_depname":"部门"},
         reportStr: null,
         show: false,
         showdetail:false,
@@ -530,13 +536,9 @@
         this.userresid = obj
         this.queryData.f_depid = obj
         console.log(this.queryData.f_depid)
-
         if (obj.length > 0) {
           this.orgCondtionStr += " and f_depid in " + plugin.convertToIn(obj)
-        } else {
-          this.orgCondtionStr += " and f_depid = " + this.$login.f.depid
         }
-
         if (this.depresid && this.depresid.length > 0) {
           this.orgCondtionStr = " and f_orgid in " + plugin.convertToIn(this.depresid) + this.orgCondtionStr
         } else {