manage-client 3.2.23 → 3.2.24

package/src/components/SellReport/userholds.vue

@@ -1,257 +1,257 @@
-<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>
-        <p class="bg-info text-center" style="padding: 8px;">用户用气户数情况统计表</p>
-        <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
-          <div class="row">
-            <div class="col-sm-4" >
-              <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-4" >
-              <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-4">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
-              <right-tree @re-res="$parent.$parent.getRes"></right-tree>
-            </div>
-            <div class="col-sm-4">
-              <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-4">
-              <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>
-          </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"  v-if="!$parent.data.f_files_path">
-          <thead>
-          <tr>
-            <th :colspan='$parent.tablen' style="font-weight: normal; text-align: left;">
-              <h3 style="text-align: center">用户用气户数情况统计表</h3>
-            </th>
-          </tr>
-          <tr>
-            <th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
-              时间区间：{{$refs.criteria.model.startDate}} - {{ $refs.criteria.model.endDate }}<br/>
-              打印时间：{{{$parent.printTime}}}
-            </th>
-          </tr>
-          <tr>
-            <th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
-              <div>
-                <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
-                <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
-                <span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
-              </div>
-            </th>
-          </tr>
-          </thead>
-          <tr>
-            <td :colspan='$parent.tablen'>
-              {{{ model.data.substring(26,model.data.length-8)}}}
-            </td>
-          </tr>
-          <tfoot>
-          <tr style="text-align: left">
-            <th :colspan='$parent.tablen/3'>财务审核：</th>
-            <th :colspan='$parent.tablen/3'>收款审核：</th>
-            <th :colspan='$parent.tablen/3'>收款员：</th>
-          </tr>
-          </tfoot>
-        </table>
-        {{{ $parent.reportStr}}}
-      </div>
-    </criteria-paged>
-    <modal :show.sync="show" v-ref:modal small backdrop="false">
-      <header slot="modal-header" class="modal-header">
-        <h4 class="modal-title">输入文件名称</h4>
-      </header>
-      <article slot="modal-body" class="modal-body">
-        <div class="form-group">
-          <input  type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
-        </div>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
-        <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
-      </footer>
-    </modal>
-  </div>
-</template>
-
-<script>
-import { DataModel } from 'vue-client'
-import co from 'co'
-let saveFile = function * (self) {
-  // 线验证文件是否重名
-  let count = yield self.$resetpost('rs/sql/manageSingleTable',
-    {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
-    {resolveMsg: null, rejectMsg: null})
-  if (count.data.length > 0) {
-    self.$showAlert('无法保存，文件名重名', 'warning', 3000)
-    return
-  }
-  let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
-    f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
-    f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
-    f_outlets: this.$login.f.depname})
-  if (saveBack.data.status === 'succeed') {
-    self.show = false
-    self.filename = ''
-    // 后台保存完成，通知刷新
-    self.$dispatch('save-success', self.filename)
-  }
-}
-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: [],
-      tablen:0,
-      orgname: '',
-      depname: '',
-      operatorname: '',
-      orgCondtionStr: '1=1',
-      model: new DataModel('rs/report/userholds', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-        f_orgid: 'this.model.f_orgid'}),
-      reportStr: null,
-      show: false,
-    }
-  },
-  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 = ' u.f_orgid in (' + this.f_orgid + ')'
-      if (this.f_depid[0]) {
-        orgcondition += ' and u.f_depid in (' + this.f_depid + ')'
-      }
-      if(this.f_operatorid[0]) {
-        orgcondition += ' and u.f_operatorid in (' + this.f_operatorid + ')'
-      }
-      this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
-      this.$refs.paged.search(args)
-    },
-    getRes (obj) {
-      this.orgname = obj.res[0]
-      this.depresid = obj.resids
-      this.f_orgid = obj.resids
-    },
-    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
-    },
-
-    // 根据文件路径获取储存的报表内容
-    getFileContent (path) {
-      this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-        this.reportStr = res.data.filecontent
-        this.model.state = '正确'
-      })
-    },
-    confirm () {
-      if (!this.filename || this.filename === '') {
-        this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
-      }
-      let saveGen = saveFile(this)
-      co(saveGen)
-    },
-    close () {
-      this.show = false
-    },
-    // 将报表保存成文件
-    confirmReport () {
-      this.show = true
-      this.filename = this.data.f_report_name + this.$login.toStandardDateString()
-    }
-  },
-  watch: {
-    'data' (val) {
-      if (val.f_files_path) {
-        this.getFileContent(val.f_files_path)
-      } else {
-        this.reportStr = null
-      }
-    },
-    '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
-        }
-        continue
-      }
-      this.tablen=len
-    }
-  },
-  computed: {
-    operator () {
-      return this.$getParams('操作员查询用', [{label: '全部', value: ''}])
-    },
-    network () {
-      return this.$getParams('网点查询用', [{label: '全部', value: ''}])
-    }
-  }
-}
-</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>
+        <p class="bg-info text-center" style="padding: 8px;">用户用气户数情况统计表</p>
+        <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+          <div class="row">
+            <div class="col-sm-4" >
+              <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-4" >
+              <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-4">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
+              <right-tree @re-res="$parent.$parent.getRes"></right-tree>
+            </div>
+            <div class="col-sm-4">
+              <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-4">
+              <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>
+          </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"  v-if="!$parent.data.f_files_path">
+          <thead>
+          <tr>
+            <th :colspan='$parent.tablen' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">用户用气户数情况统计表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
+              时间区间：{{$refs.criteria.model.startDate}} - {{ $refs.criteria.model.endDate }}<br/>
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
+              <div>
+                <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
+                <span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td :colspan='$parent.tablen'>
+              {{{ model.data.substring(26,model.data.length-8)}}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left">
+            <th :colspan='$parent.tablen/3'>财务审核：</th>
+            <th :colspan='$parent.tablen/3'>收款审核：</th>
+            <th :colspan='$parent.tablen/3'>收款员：</th>
+          </tr>
+          </tfoot>
+        </table>
+        {{{ $parent.reportStr}}}
+      </div>
+    </criteria-paged>
+    <modal :show.sync="show" v-ref:modal small backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h4 class="modal-title">输入文件名称</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="form-group">
+          <input  type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
+        <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+import { DataModel } from 'vue-client'
+import co from 'co'
+let saveFile = function * (self) {
+  // 线验证文件是否重名
+  let count = yield self.$resetpost('rs/sql/manageSingleTable',
+    {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
+    {resolveMsg: null, rejectMsg: null})
+  if (count.data.length > 0) {
+    self.$showAlert('无法保存，文件名重名', 'warning', 3000)
+    return
+  }
+  let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
+    f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
+    f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
+    f_outlets: this.$login.f.depname})
+  if (saveBack.data.status === 'succeed') {
+    self.show = false
+    self.filename = ''
+    // 后台保存完成，通知刷新
+    self.$dispatch('save-success', self.filename)
+  }
+}
+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: [],
+      tablen:0,
+      orgname: '',
+      depname: '',
+      operatorname: '',
+      orgCondtionStr: '1=1',
+      model: new DataModel('rs/report/userholds', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      show: false,
+    }
+  },
+  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 = ' u.f_orgid in (' + this.f_orgid + ')'
+      if (this.f_depid[0]) {
+        orgcondition += ' and u.f_depid in (' + this.f_depid + ')'
+      }
+      if(this.f_operatorid[0]) {
+        orgcondition += ' and u.f_operatorid in (' + this.f_operatorid + ')'
+      }
+      this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+      this.$refs.paged.search(args)
+    },
+    getRes (obj) {
+      this.orgname = obj.res[0]
+      this.depresid = obj.resids
+      this.f_orgid = obj.resids
+    },
+    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
+    },
+
+    // 根据文件路径获取储存的报表内容
+    getFileContent (path) {
+      this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        this.reportStr = res.data.filecontent
+        this.model.state = '正确'
+      })
+    },
+    confirm () {
+      if (!this.filename || this.filename === '') {
+        this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
+      }
+      let saveGen = saveFile(this)
+      co(saveGen)
+    },
+    close () {
+      this.show = false
+    },
+    // 将报表保存成文件
+    confirmReport () {
+      this.show = true
+      this.filename = this.data.f_report_name + this.$login.toStandardDateString()
+    }
+  },
+  watch: {
+    'data' (val) {
+      if (val.f_files_path) {
+        this.getFileContent(val.f_files_path)
+      } else {
+        this.reportStr = null
+      }
+    },
+    '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
+        }
+        continue
+      }
+      this.tablen=len
+    }
+  },
+  computed: {
+    operator () {
+      return this.$getParams('操作员查询用', [{label: '全部', value: ''}])
+    },
+    network () {
+      return this.$getParams('网点查询用', [{label: '全部', value: ''}])
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

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

@@ -44,7 +44,7 @@
                                 :footer="$parent.$parent.footer"
                                 :header="$parent.$parent.other"
                                 sqlurl="rs/logic/exportfile"
-                                sql-name="usergas"
+                                sql-name="usergaszong"
                                 template-name='用户用气费用表'
                                 :choose-col="true"></export-excel>
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
@@ -199,8 +199,6 @@ export default {
     },
     selfSearch(args) {
       args.condition = `${args.condition} ` + this.orgCondtionStr
-      let f_orgstr = 'and  f_orgid = ' + this.f_orgid
-      args.condition = `${args.condition} ` + f_orgstr
       this.model.search(args.condition, args.model)
       this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
     },

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

@@ -548,7 +548,10 @@ export default{
     'f_upload_type': '上报类型', 'f_insert_date': '系统接收时间', 'f_meterDebitAmt': '表内累计充值金额',
     'f_signal': '噪音强度', 'f_snr': '信噪比', 'f_batterylevel': '电压', 'f_lowlithiumbattery': '电压状态', 'f_networkshutvalve': '阀门强制状态',
     'f_wmprepaytype': '计量类型', 'f_moneystate': '金额状态', 'f_magneticInterference': '磁干扰异常', 'f_compensateState': '补偿状态'
-
+  },
+  RechargeInstruct: {
+    'f_userinfo_code': '客户编号', 'f_meternumber': '表号', 'f_user_name': '客户姓名', 'f_user_phone': '客户电话', 'f_address': '客户地址', 'f_type': '收费类型',
+    'f_collection': '实收金额', 'f_instruct_state': '指令状态', 'f_receive_state': '表返回状态', 'f_instruct_date': '生成指令时间'
   },
   ReportDataQueryConfig: {
     'f_userinfo_code': '客户编号', 'f_tablebase': '本次抄表底数', 'f_last_tablebase': '上次抄表底数', 'f_jval': '表计剩余余额', 'f_hand_date': '抄表日期',