manage-client 3.2.21 → 3.2.25

package/src/filiale/tongchuan/ManageBusSummary.vue

@@ -1,240 +1,240 @@
-<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-3 form-group">
-              <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
-              <v-select id="dep" style="width: 60%"
-                        :multiple="true"
-                        @change="$parent.$parent.getDep"
-                        :value.sync="model.f_depid"
-                        v-model="model.f_depid"
-                        :options='$parent.$parent.depresid' placeholder='请选择'
-                        condition="f_depid in {}">
-              </v-select>
-
-            </div>
-            <div class="col-sm-3 form-group">
-              <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
-              <v-select id="oper" style="width: 60%"
-                        :multiple="false"
-                        @change="$parent.$parent.getOpe"
-                        :value.sync="model.f_operatorid"
-                        v-model="model.f_operatorid"
-                        :options='$parent.$parent.userresid' placeholder='请选择'
-                        condition="f_operatorid in {}">
-              </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 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="$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>
-      </div>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-import {DataModel, HttpResetClass} from 'vue-client'
-import co from 'co'
-let getorg = async function (self) {
-  new HttpResetClass().load("POST",'rs/sql/singleTableParam',
-    {
-      data: {
-        items: 'name label,id value',
-        tablename: 't_department',
-        condition: `1=1`
-      }
-    },
-    {resolveMsg: null, rejectMsg: null})
-    .then((res) => {
-      self.depresid = res.data
-    })
-  new HttpResetClass().load("POST",'rs/sql/singleTableParam',
-    {
-      data: {
-        items: 'name label,id value',
-        tablename: 't_user',
-        condition: `state = '在职' and f_department_name is not null`
-      }
-    },
-    {resolveMsg: null, rejectMsg: null})
-    .then((res) => {
-      self.userresid = res.data
-    })
-}
-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/getmoneyall', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-        f_orgid: 'this.model.f_orgid'}),
-      reportStr: null,
-      spans: 0,
-      initres: {
-        org: [this.$login.f.orgid],
-        dep: [],
-        user: []
-      }
-    }
-  },
-  ready () {
-    getorg(this)
-    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 = ''
-      if (this.f_orgid[0]) {
-        orgcondition += ' and f_orgid in(' + this.f_orgid + ')'
-      }
-      if(this.f_state && this.f_state[0]) {
-        orgcondition += ` and f_state in('${this.f_state.toString().replace(/,/g,"','")}')`
-      }
-      this.$refs.paged.$refs.criteria.model.f_orgid = args.condition + orgcondition
-      this.$refs.paged.search(args)
-    },
-
-    hidden() {
-      this.criteriaShow = !this.criteriaShow
-    },
-    getRes (obj) {
-      this.orgname = obj.res[0]
-      this.f_orgid = obj.resids
-    },
-    getDep(val){
-      this.depname = this.depresid.filter(x => val.includes(x.value)).map(x=>x.label).toString()
-      console.log('dep',this.depname )
-    },
-    getOpe(val){
-      this.operatorname = this.userresid.filter(x => val.includes(x.value)).map(x=>x.label).toString()
-      console.log('operatorname',this.operatorname )
-    },
-  },
-  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>
+<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-3 form-group">
+              <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
+              <v-select id="dep" style="width: 60%"
+                        :multiple="true"
+                        @change="$parent.$parent.getDep"
+                        :value.sync="model.f_depid"
+                        v-model="model.f_depid"
+                        :options='$parent.$parent.depresid' placeholder='请选择'
+                        condition="f_depid in {}">
+              </v-select>
+
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
+              <v-select id="oper" style="width: 60%"
+                        :multiple="false"
+                        @change="$parent.$parent.getOpe"
+                        :value.sync="model.f_operatorid"
+                        v-model="model.f_operatorid"
+                        :options='$parent.$parent.userresid' placeholder='请选择'
+                        condition="f_operatorid in {}">
+              </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 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="$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>
+      </div>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import {DataModel, HttpResetClass} from 'vue-client'
+import co from 'co'
+let getorg = async function (self) {
+  new HttpResetClass().load("POST",'rs/sql/singleTableParam',
+    {
+      data: {
+        items: 'name label,id value',
+        tablename: 't_department',
+        condition: `1=1`
+      }
+    },
+    {resolveMsg: null, rejectMsg: null})
+    .then((res) => {
+      self.depresid = res.data
+    })
+  new HttpResetClass().load("POST",'rs/sql/singleTableParam',
+    {
+      data: {
+        items: 'name label,id value',
+        tablename: 't_user',
+        condition: `state = '在职' and f_department_name is not null`
+      }
+    },
+    {resolveMsg: null, rejectMsg: null})
+    .then((res) => {
+      self.userresid = res.data
+    })
+}
+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/getmoneyall', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      spans: 0,
+      initres: {
+        org: [this.$login.f.orgid],
+        dep: [],
+        user: []
+      }
+    }
+  },
+  ready () {
+    getorg(this)
+    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 = ''
+      if (this.f_orgid[0]) {
+        orgcondition += ' and f_orgid in(' + this.f_orgid + ')'
+      }
+      if(this.f_state && this.f_state[0]) {
+        orgcondition += ` and f_state in('${this.f_state.toString().replace(/,/g,"','")}')`
+      }
+      this.$refs.paged.$refs.criteria.model.f_orgid = args.condition + orgcondition
+      this.$refs.paged.search(args)
+    },
+
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    getRes (obj) {
+      this.orgname = obj.res[0]
+      this.f_orgid = obj.resids
+    },
+    getDep(val){
+      this.depname = this.depresid.filter(x => val.includes(x.value)).map(x=>x.label).toString()
+      console.log('dep',this.depname )
+    },
+    getOpe(val){
+      this.operatorname = this.userresid.filter(x => val.includes(x.value)).map(x=>x.label).toString()
+      console.log('operatorname',this.operatorname )
+    },
+  },
+  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/filiale/tongchuan/reportManage.js

@@ -1,5 +1,5 @@
-let specialComp = {
-  // 收费查询
-  'manage-bus-summary': (resolve) => { require(['./ManageBusSummary'], resolve) }
-}
-exports.specialComp = specialComp
+let specialComp = {
+  // 收费查询
+  'manage-bus-summary': (resolve) => { require(['./ManageBusSummary'], resolve) }
+}
+exports.specialComp = specialComp

package/src/main.js

@@ -43,7 +43,7 @@ all()
 // sale()
 ldap()
 system(false)
-saleManage('meihekou')
+saleManage('macheng')
 
 webmeterManage()
 ManageHome()

package/src/reportManage.js

@@ -480,6 +480,14 @@ export default function (filiale) {
   Vue.component('uncivil-gas-count', (resolve) => {
     require(['./components/SellReport/UnCivilGasReport'], resolve)
   })
+  //气费通用报表
+  Vue.component('public-sell-report', (resolve) => {
+    require(['./components/SellReport/GasMoneyPublicReport'], resolve)
+  })
+  //其他收费通用报表
+  Vue.component('public-other-report', (resolve) => {
+    require(['./components/SellReport/OtherChargePublicReport'], resolve)
+  })
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/reportManage`).specialComp
     Vue.filialeInfo = Vue.prototype.$filialeInfo = filiale

package/src/webmeterManage.js

@@ -67,6 +67,12 @@ export default function (filiale) {
   Vue.component('user-instruct-list', (resolve) => { require(['./components/webmeter/newwebmeter/UserInstructList'], resolve) })
   // 指令分析图表分析
   Vue.component('user-instruct-echarts-list', (resolve) => { require(['./components/webmeter/newwebmeter/UserInstructEchartsList'], resolve) })
+  // 上报统计分析--指令分析
+  Vue.component('price-instruct-list', (resolve) => { require(['./components/webmeter/newwebmeter/PriceInstructList'], resolve) })
+  // 指令分析图表分析
+  Vue.component('price-instruct-detail', (resolve) => { require(['./components/webmeter/newwebmeter/PriceInstructDetail'], resolve) })
+  // 指令分析图表分析
+  Vue.component('price-instruct-manage', (resolve) => { require(['./components/webmeter/newwebmeter/PriceInstructManage'], resolve) })
   //
   //标记分析主表
   Vue.component('sign-analysis-list-main', (resolve) => { require(['./components/webmeter/newwebmeter/signAnalysisListMain'], resolve) })
@@ -92,6 +98,12 @@ export default function (filiale) {
   Vue.component('new-query-instruct', (resolve) => { require(['./components/webmeter/instruction/NewQueryInstruct'], resolve) })
   // 物联网表上报数据查询
   Vue.component('report-data-query', (resolve) => { require(['./components/webmeter/reportdata/ReportDataQuery'], resolve) })
+  // 充值指令查询
+  Vue.component('recharge-instruct-query', (resolve) => { require(['./components/webmeter/recharge/RechargeList'], resolve) })
+  // 物联网表用气量统计表
+  Vue.component('use-gas-statistics', (resolve) => { require(['./components/webmeter/gasStatistics/GasStatistics'], resolve) })
+  // 物联网表欠费查询
+  Vue.component('arrearage-query', (resolve) => { require(['./components/webmeter/newwebmeter/ArrearageQuery'], resolve) })
 
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/sale`).specialComp