manage-client 4.1.76 → 4.1.77

package/package.json

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

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

@@ -153,7 +153,6 @@ export default {
     'value': '气价详情',
     'f_meter_brand': '气表品牌',
     'f_meter_style': '气表型号',
-    'f_xc_meter_style': '现场表具型号',
     'f_inputtor': '户管员',
     'f_gas_person': '通气人',
     'f_gas_date': '通气时间',

package/src/filiale/meihekou/ManageReceivable.vue

@@ -0,0 +1,257 @@
+<template>
+  <div class="basic-main" style="height: 98%">
+    <work-busy :is-busy="model.state === '查询'" v-show="model.state === '查询'"></work-busy>
+    <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-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 :initres="$parent.$parent.initres"  :show-component="['company','department','operator']"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+            <!--<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  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>
+          <!--<div class="span" style = "float:right;">-->
+
+          <!--</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='15' style="font-weight: bold; text-align: center;">
+              <h3 style="text-align: center">应收实收月报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='15' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;
+            </th>
+          </tr>
+          <tr>
+            <th colspan='15' style="font-weight: normal; text-align: center;">
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th colspan='15' 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>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td colspan='15' style="font-weight: normal;" id="test">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left">
+            <th colspan='5' style="font-weight: normal; text-align: left;">
+              收款人：
+            </th>
+            <th colspan='5' style="font-weight: normal; text-align: left;">
+              审核人：
+            </th>
+            <th colspan='5' style="font-weight: normal; text-align: left;">
+              经手人：
+            </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('api/af-revenue/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('api/af-revenue/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: [],
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[]
+        },
+        f_orgid: this.$login.f.orgid,
+        f_depid: this.$login.f.depids,
+        f_operatorid: this.$login.f.id,
+        operatorid: [],
+        depid: [],
+        orgname: '',
+        depname: '',
+        operatorname: '',
+        orgCondtionStr: '1=1',
+        model: new DataModel('api/af-revenue/report/gatReceivabl', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+          f_orgid: 'this.model.f_orgid'}),
+        reportStr: null,
+        show: false,
+        spans: ''
+      }
+    },
+    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()
+    },
+    methods: {
+      searchData () {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      selfSearch (args) {
+        this.printTime = this.$login.toStandardTimeString()
+        let orgstr = this.orgCondtionStr
+        args.condition = `${args.condition} ` + orgstr
+        this.$refs.paged.$refs.criteria.model.f_orgid = '1=1 '+orgstr
+        this.$refs.paged.search(args)
+      },
+      getRes (condition, obj) {
+        this.orgCondtionStr = condition
+        this.orgname = obj.orgnames[0]
+        this.depname = obj.depnames[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
+      // },
+
+      // 根据文件路径获取储存的报表内容
+      getFileContent (path) {
+        this.$resetpost('api/af-revenue/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 tab = document.getElementById('test')
+        if (tab && tab.children && tab.children[0]) {
+          var tds = tab.children[0].getElementsByTagName('td')
+          var num = 0
+          for (let td of tds) {
+            let span = td.getAttribute('colspan')
+            num = num + ((span ? span : 1) - 0)
+          }
+          this.spans = num
+        }
+      }
+    },
+    computed: {
+    }
+  }
+</script>
+<style scoped>
+  .noborder{
+    border: none;
+  }
+</style>

package/src/filiale/meihekou/reportManage.js

@@ -0,0 +1,16 @@
+import Vue from 'vue'
+import echarts from 'echarts'
+import MagLoadParams from '../../stores/MagLoadParams'
+import MagGetSaleParam from '../../stores/MagGetSaleParams'
+
+/** **************************收费组件注册******************************/
+
+export default function () {
+  Vue.prototype.$echarts = echarts
+  Vue.use(MagLoadParams)
+  Vue.use(MagGetSaleParam)
+  // 应收实收月报表
+  Vue.component('manage-receivable', (resolve) => {
+    require(['./ManageReceivable'], resolve)
+  })
+}