manage-client 3.3.122 → 3.3.123

package/src/filiale/taizhoukesi/SellReport/GasMeterBrand.vue

@@ -0,0 +1,227 @@
+<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>
+          <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='7' style="font-weight: normal; text-align: left;">
+            <h3 style="text-align: center">日售气量汇总表</h3>
+          </th>
+        </tr>
+        <tr>
+          <th colspan='7' style="font-weight: normal; text-align: center;">
+            开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+            结束时间：{{ model.model.endDate }}
+          </th>
+        </tr>
+        <tr>
+          <th colspan='7' style="font-weight: normal; text-align: center;">
+            打印时间：{{{$parent.printTime}}}
+          </th>
+        </tr>
+        <tr>
+          <th colspan='7' 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='7'>
+            {{{ model.data.substring(26,model.data.length-8) }}}
+          </td>
+        </tr>
+        <tfoot>
+        <tr style="text-align: left">
+          <th colspan='3'>收款审核：</th>
+          <th colspan='1'>收款员：</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: [],
+        orgname: '',
+        depname: '',
+        operatorname: '',
+        f_inputtor:[],
+        f_user_type:'',
+        orgCondtionStr: '1=1',
+        model: new DataModel('rs/report/gasMeterBrand', {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'
+      this.$refs.paged.$refs.criteria.search()
+      console.log(this.$login.f)
+    },
+    methods: {
+      searchData () {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      selfSearch (args) {
+        let orgcondition = `f_orgid in ('${this.f_orgid}')`
+
+        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
+        }
+      }
+    },
+    computed: {
+      usertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
+      inputtor() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表员')]
+      },
+    }
+  }
+</script>
+<style scoped>
+  .noborder{
+    border: none;
+  }
+</style>

package/src/filiale/taizhoukesi/config/exportConfig.js

@@ -18,8 +18,7 @@ export default {
     'f_user_state': '客户状态',
     'f_createfile_date': '建档日期',
     'f_createfile_person': '建档人',
-    'f_comments': '备注'
-    ,
+    'f_comments': '备注',
     'f_bank_accopen': '银行户名',
     'f_bank_name': '银行名称',
     'f_bank_account': '银行账号',
@@ -60,7 +59,7 @@ export default {
     'f_operator': '操作人',
     'f_meternumber': '表号'
   },
-  //收据查询
+  // 收据查询
   receiptConfig: {
     'f_userinfo_code': '用户编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_meternumber': '表号',
     'f_olduserinfo_code': '档案编号', 'f_total_money': '余额', 'f_tax_money': '税金', 'f_bill_number': '发票号码',
@@ -70,7 +69,7 @@ export default {
     'f_orgname': '公司名称', 'f_depid': '部门编号', 'f_depname': '部门名称', 'f_operatorid': '人员编号', 'sf': '收费员',
     'f_preamount': '预收款', 'f_pregas': '应收气量', 'f_collection': '实收款'
   },
-  //收据查询默认选择
+  // 收据查询默认选择
   receiptexportConfig: {
     'f_userinfo_code': '用户编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_meternumber': '表号'
   },
@@ -639,8 +638,7 @@ export default {
     'f_fillcard_times': '补卡次数',
     'f_sendsuccess': '表同步状态',
     'f_isband': '微信绑定',
-    'f_cost_type': '缴费类型'
-    ,
+    'f_cost_type': '缴费类型',
     'f_bank_accopen': '银行户名',
     'f_bank_name': '银行名称',
     'f_bank_account': '银行账号',
@@ -856,8 +854,7 @@ export default {
     'f_bill_style': '打印格式',
     'f_serial_id': '流水号',
     'f_pay_id': '支付单号',
-    'detail': '详情'
-    ,
+    'detail': '详情',
     'f_charge_date': '缴费日期',
     'f_operator': '操作人',
     'f_depname': '部门',
@@ -1011,34 +1008,37 @@ export default {
     'f_version': '版本号', 'f_state': '状态', 'detailvalue': '气价信息'
   },
   fmygasConfig: {
-    "f_userinfo_code": "客户编号",
-    "f_user_name": "客户名称",
-    "f_olduserinfo_code": "档案编号",
-    "f_user_phone": "客户电话",
-    "f_credentials": "证件类型",
-    "f_idnumber": "证件号码",
-    "f_residential_area": "小区",
-    "f_address": "客户地址",
-    "f_user_type": "客户类型",
-    "f_gasproperties": "用气性质",
-    "f_meternumber": "表号",
-    "f_meter_brand": "气表品牌",
-    "f_meter_classify": "气表类型",
-    "f_price_value": "气价详情",
-    "f_balance": "账户余额",
-    "f_pregas": "预购气量",
-    "f_preamount": "预购金额",
-    "f_collection": "实交金额",
-    "f_inputtor": "抄表员",
-    "f_book_slice_area": "表册片区",
-    "f_hand_number": "抄表次数",
-    "f_date": "抄表区间",
-    "f_input_day": "天数",
-    "f_oughtamount": "用气量",
-    "f_oughtfee": "用气金额",
-    "f_last_tablebase": "期初底数",
-    "f_tablebase": "期末底数",
-    "f_createfile_date": "建档日期"
+    'f_userinfo_code': '客户编号',
+    'f_user_name': '客户名称',
+    'f_olduserinfo_code': '档案编号',
+    'f_user_phone': '客户电话',
+    'f_credentials': '证件类型',
+    'f_idnumber': '证件号码',
+    'f_residential_area': '小区',
+    'f_address': '客户地址',
+    'f_user_type': '客户类型',
+    'f_gasproperties': '用气性质',
+    'f_meternumber': '表号',
+    'f_meter_brand': '气表品牌',
+    'f_meter_classify': '气表类型',
+    'f_price_value': '气价详情',
+    'f_balance': '账户余额',
+    'f_pregas': '预购气量',
+    'f_preamount': '预购金额',
+    'f_collection': '实交金额',
+    'f_inputtor': '抄表员',
+    'f_book_slice_area': '表册片区',
+    'f_hand_number': '抄表次数',
+    'f_date': '抄表区间',
+    'f_input_day': '天数',
+    'f_oughtamount': '用气量',
+    'f_stair1amount': '一阶气量',
+    'f_stair1fee': '一阶气费',
+    'f_stair2amount': '二阶气量',
+    'f_stair2fee': '二阶气费',
+    'f_stair3amount': '三阶气量',
+    'f_stair3fee': '三阶气费',
+    'f_createfile_date': '建档日期'
   },
   notgasConfig: {
     'f_userinfo_code': '客户编号',
@@ -1813,8 +1813,7 @@ export default {
     'f_meter_style': '气表型号',
     'f_operator': '人员',
     'f_depname': '部门',
-    'f_operate_date': '操作日期'
-    ,
+    'f_operate_date': '操作日期',
     'f_meternumber': '表号'
   },
   InfoOperateRecordConfig: {

package/src/filiale/taizhoukesi/reportManage.js

@@ -0,0 +1,9 @@
+// 分公司特殊组件页面注册
+import Vue from 'vue'
+
+export default function () {
+  // 气表品牌汇总表
+  Vue.component('gas-meter-brand', (resolve) => {
+    require(['./SellReport/GasMeterBrand'], resolve)
+  })
+}

package/src/filiale/taizhoukesi/sale.js

@@ -2,5 +2,6 @@
 import Vue from 'vue'
 
 export default function () {
-
+  // 用气查询
+  Vue.component('fmygas-query', (resolve) => { require(['./FMYGasQuery'], resolve) })
 }

package/src/reportManage.js

@@ -745,4 +745,16 @@ export default function () {
   Vue.component('public-gas-price-report', (resolve) => {
     require(['./components/SellReport/PublicGasPriceReport'], resolve)
   })
+  // 运城 居民用户各项数据统计表（月报）
+  Vue.component('yc-month-summary', (resolve) => {
+    require(['./components/SellReport/YCMonthSummary'], resolve)
+  })
+  // 运城 居民用户各项数据统计表
+  Vue.component('yc-gas-summary', (resolve) => {
+    require(['./components/SellReport/YCGasSummary'], resolve)
+  })
+  // 泰州 收费结账报表
+  Vue.component('tz-bus-summary', (resolve) => {
+    require(['./components/SellReport/taizhou/ManageBusSummary'], resolve)
+  })
 }