manage-client 3.1.11 → 3.1.12-ls

package/src/components/SellReport/jingwei/ManageHandSellMoney.vue

@@ -112,136 +112,136 @@
 </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)
-    }
+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
   }
-  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('rs/report/managehandsellmoney', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-          f_orgid: 'this.model.f_orgid'}),
-        reportStr: null,
-        show: false,
-        spans: ''
-      }
+  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: [],
+      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('rs/report/managehandsellmoney', {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()
     },
-    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()
+    selfSearch (args) {
+      this.printTime = this.$login.toStandardTimeString()
+      let orgstr = this.orgCondtionStr
+      args.condition = `${args.condition} ` + orgstr
+      this.$refs.paged.$refs.criteria.model.f_orgid = orgstr
+      this.$refs.paged.search(args)
     },
-    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 = 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
-      // },
+    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('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()
+    // 根据文件路径获取储存的报表内容
+    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)
     },
-    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').children[0]
-        var tds = tab.getElementsByTagName('td')
-        var num = 0
-        for (let td of tds) {
-          let span = td.getAttribute('colspan')
-          num = num + ((span ? span : 1) - 0)
-        }
-        this.spans = num
+    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: {
+    'model.data' (val) {
+      let tab = document.getElementById('test').children[0]
+      var tds = tab.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;
-  }
+.noborder{
+  border: none;
+}
 </style>

package/src/components/handReport/GeneraHandReport.vue

@@ -0,0 +1,235 @@
+<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" title="分组项一">分组项</label>
+              <v-select :value.sync="model.f_public_group1"
+                        v-model="model.f_public_group1"
+                        v-ref:groupone
+                        :options='$parent.$parent.group1' placeholder='请选择'
+                        close-on-select></v-select>
+            </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"></right-tree>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
+              <res-select restype='department'
+                          @res-select="$parent.$parent.getdep"
+                          :parentresid  ="$parent.$parent.depresid"
+                          :initresid='$parent.$parent.depid'>
+              </res-select>
+
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
+              <res-select restype='user'
+                          @res-select="$parent.$parent.getuser"
+                          :parentresid="$parent.$parent.userresid"
+                          :initresid='$parent.$parent.operatorid'>
+              </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>
+      </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='8' style="font-weight: bold; text-align: left;">
+              <h3 style="text-align: center">机表抄表分项报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='8' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;
+            </th>
+          </tr>
+          <tr>
+            <th colspan='8' style="font-weight: normal; text-align: center;">
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th colspan='8' 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='8' style="font-weight: normal;" id="test">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left">
+            <th colspan='3' style="font-weight: normal; text-align: center;">
+              收款人：
+            </th><th colspan='3' style="font-weight: normal; text-align: center;">
+              审核人：
+            </th><th colspan='2' style="font-weight: normal; text-align: center;">
+              经手人：
+            </th>
+          </tr>
+          </tfoot>
+        </table>
+        {{{ $parent.reportStr}}}
+      </div>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import { DataModel } from 'vue-client'
+  import co from 'co'
+  export default {
+    title: '机表抄表分项报表',
+    props: ['data'],
+    data () {
+      return {
+        printTime: this.$login.toStandardTimeString(),
+        depresid: [],
+        userresid: [],
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[]
+        },
+        f_public_group1: '',
+        f_orgid: this.$login.f.orgid,
+        f_depid: this.$login.f.depids,
+        f_operatorid: this.$login.f.id,
+        operatorid: [],
+        depid: [],
+        orgname: '',
+        group1Name: '',
+        depname: '',
+        operatorname: '',
+        orgCondtionStr: '1=1',
+        model: new DataModel('rs/report/GeneraHandReport',
+          {startDate: 'this.model.startDate',
+                  endDate: 'this.model.endDate',
+                  f_orgid: 'this.model.f_orgid',
+                  f_public_group1: 'this.model.f_public_group1[0]',
+                  group1Name: 'this.model.group1Name'
+          }
+        ),
+        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()
+        this.$refs.paged.$refs.criteria.model.group1Name = this.$refs.paged.$refs.criteria.$refs.groupone.selectedItems
+        let orgcondition = '1 = 1'
+        if (this.f_orgid[0]) {
+          orgcondition += ' and f_orgid in ( ' + this.f_orgid + ')'
+        }
+        if (this.f_depid[0]) {
+          orgcondition += ' and f_depid in ( ' + this.f_depid + ')'
+        }
+        if (this.f_operatorid[0]) {
+          orgcondition += ' and f_operatorid in ( ' + this.f_operatorid + ')'
+        }
+        let name1 = args.model.f_public_group1
+        if (name1 == null || name1 == '') {
+          this.$showMessage('请选择分组项！')
+          return
+        }
+        console.log(args.model.f_public_group1)
+        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
+      }
+    },
+    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').children[0]
+        var tds = tab.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: {
+      group1 () {
+        return [{label: '用户类型', value: 'f_user_type'},
+          {label: '用气性质', value: 'f_gasproperties'},
+          {label: '抄表员', value: 'f_inputtor'},
+          {label: '营业网点', value: 'f_depname'}]
+      }
+    }
+  }
+</script>
+<style scoped>
+  .noborder{
+    border: none;
+  }
+</style>