manage-client 3.3.122 → 3.3.123

package/build/dev-server.js

@@ -19,9 +19,9 @@ var qtx= 'http://36.103.222.144:6300/'
 // var bendi = 'http://203.57.101.233:8400/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://192.168.50.67:31785'
+var bendi = 'http://121.36.106.17:8400'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://192.168.50.67:31785'
+var wode = 'http://121.36.106.17:8400'
 // 192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
@@ -91,7 +91,7 @@ var proxyTable = {
     target: bendi
   },
   '/rs/sql': {
-    target: 'http://localhost:8084/'
+    target: bendi
   },
   '/rs': {
     target: wode

package/package.json

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

package/src/components/SellReport/YCGasSummary.vue

@@ -0,0 +1,250 @@
+<template>
+  <div class="basic-main" style="height: 98%">
+    <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>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">&nbsp;&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;&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-2 form-group">
+              <label class="font_normal_body">&nbsp;&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;">
+          <thead>
+          <tr>
+            <th colspan='18' style="font-weight: normal; text-align: left;">
+              <h2 style="text-align: center">{{$parent.orgname}}</h2>
+              <h3 style="text-align: center">用气量统计汇总</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='18' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;<br/>
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th colspan='18' style="font-weight: normal; text-align: center;">
+              <div>
+                <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='18'>
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left">
+            <th colspan='6'>财务审核：</th>
+            <th colspan='6'>收款审核：</th>
+            <th colspan='6'>收款员：</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: '',
+      meterbrands: [],
+      orgCondtionStr: '1=1',
+      model: new DataModel('rs/report/ycGasSummary', {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 = ` 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}')`
+      }
+      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.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: {
+    metertypes () {
+      return [{label: ' 全部  ', value: ''}, ...this.$appdata.getParam('气表类型')]
+    },
+    chargetype () {
+      return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('补气类型')]
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+.fontSize{
+  font-size: 13px;
+}
+</style>

package/src/components/SellReport/YCMonthSummary.vue

@@ -0,0 +1,282 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex">
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+              <div class="row">
+                <res-select-group :show-component="$parent.$parent.resshow" :initres="$parent.$parent.initres"
+                                  :cascade=true @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div class="col-sm-2 form-group" >
+                  <label for="startDate" class="font_normal_body" title="开始日期">开始时间</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd'"
+                              :show-reset-button="true"
+                              >
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group" >
+                  <label for="endDate" class="font_normal_body" title="结束日期">结束时间</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd'"
+                              :show-reset-button="true"
+                  >
+                  </datepicker>
+                </div>
+
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear  button_spacing" @click="$parent.$parent.clear()">清空</button>
+
+                  <button  class="button_clear button_spacing"  style="margin-top: 10px;background-color: #6aa6e2;"  @click="$parent.$parent.downloadFiles()">导出</button>
+                  <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>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+              </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy" style="height: 95%" v-ref:grid>
+            <template partial='head'>
+              <tr>
+                <th colspan="4" style="text-align: center;"><nobr>壁挂炉</nobr></th>
+                <th colspan="4" style="text-align: center;"><nobr>门面房</nobr></th>
+                <th colspan="3" style="text-align: center;"><nobr>三项强制措施</nobr></th>
+                <th colspan="1" style="text-align: center;"><nobr>欠费户数</nobr></th>
+                <th colspan="2" style="text-align: center;"><nobr></nobr></th>
+              </tr>
+              <tr>
+                <th style="text-align: center;">
+                  <nobr>膜式表</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>卡表</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>金卡物联网表</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>新天物联网表</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>膜式表</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>卡表</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>金卡网联表</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>新天物联网表</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>自闭阀已装</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>不锈钢波纹软管已装</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>带熄火保护灶具</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>膜式表</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>长期不用停用数量（月）</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>当月用气量</nobr>
+                </th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <tr style="position: relative" class="table-bordered">
+                <td style="text-align: center;">{{ row.gbl_machine }}</td>
+                <td style="text-align: center;">{{ row.gbl_card }}</td>
+                <td style="text-align: center;">{{ row.gbl_xt }}</td>
+                <td style="text-align: center;">{{ row.gbl_jk }}</td>
+                <td style="text-align: center;">{{ row.sy_machine }}</td>
+                <td style="text-align: center;">{{ row.sy_card }}</td>
+                <td style="text-align: center;">{{ row.sy_xt }}</td>
+                <td style="text-align: center;">{{ row.sy_jk }}</td>
+                <td style="text-align: center;">{{ row.force_zbf }}</td>
+                <td style="text-align: center;">{{ row.force_bwg }}</td>
+                <td style="text-align: center;">{{ row.force_zj }}</td>
+                <td style="text-align: center;">{{ row.owenum }}</td>
+                <td style="text-align: center;">{{ row.unusenum }}</td>
+                <td style="text-align: center;">{{ row.f_oughtamount }}</td>
+
+              </tr>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+
+  let readySomething = async function (self) {
+    await self.$MagLoadParams.loadParam()
+    self.initmeterbook()
+  }
+  export default {
+    props: ['data'],
+    title: '居民用户各项数据统计表（月报）',
+    data () {
+      return {
+        model: new PagedList('rs/sql/YCMonthSummary', 50, {
+          startDate: 'this.model.startDate',
+          endDate: 'this.model.endDate'
+        }),
+        years:[],
+        other: [],
+        orgCondtionStr: '',
+        resshow: ['company'],
+        initres: {
+          org: [this.$login.f.orgid]
+        },
+        meterbrands: [],
+        meterbooks:[],
+        gasproperties:[],
+        inputtores: [{label: '全部',value: ''}],
+        criteriaShow: false,
+        condition: '',
+        //小区
+        residentialArea: []
+      }
+    },
+    ready () {
+      let year = new Date().getFullYear()
+      this.$refs.paged.$refs.cri.model.searchyear = year
+      this.$refs.paged.$refs.cri.model.compareyear = year-1
+      this.getinputtores()
+      this.getaddress()
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      async initmeterbook(){
+        this.meterbooks = [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
+      },
+      async getaddress(){
+        let HttpReset = new HttpResetClass()
+        var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
+          data: {
+            condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
+          }
+        }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+        let house = [{label: '全部', value: ''}]
+        for (let row of data.data){
+          house.push({label: row.f_residential_area, value: row.f_residential_area})
+        }
+        this.residentialArea = house
+      },
+      async getinputtores () {
+        // 获取抄表员
+        let rs = []
+        if (this.$login.f.f_gasman.length > 0) {
+          for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
+            let temp = {
+              label: this.$login.f.f_gasman[i].name,
+              value: this.$login.f.f_gasman[i].name
+            }
+            rs.push(temp)
+          }
+        }
+        this.inputtores = [{label: '全部', value: ''}, ...rs]
+      },
+      cancel () {
+        this.show = false
+      },
+      userTypeChange () {
+        this.gasproperties = []
+        if (this.$refs.paged.$refs.cri.model !== null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties = []
+          this.gasproperties = this.$appdata.getParam('用气性质')
+        } else {
+          this.gasproperties = [{label: '全部', value: ''}]
+        }
+      },
+      initParams () {
+        // 初始化气表品牌
+        let brandArr = []
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          temp.label = item.label
+          temp.value = item.value.f_meter_brand
+          brandArr.push(temp)
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+        //初始化气表价格
+        this.prices = this.$MagGetSaleParam.getPrices()
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+      selfSearch (args) {
+        let f_orgstr = this.orgCondtionStr
+        args.condition = `${args.condition} ` + f_orgstr
+        this.condition = args.condition
+        this.model.search(args.condition, args.model)
+      },
+      clear () {
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = []
+        })
+      },
+      show () {
+        this.criteriaShow = true
+      },
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
+      async getRes (condition, obj) {
+        this.orgCondtionStr = condition
+        this.orgname = obj.orgnames[0]
+      },
+    },
+    events: {},
+    watch: {},
+    computed: {
+      getfield () {
+        return {
+
+        }
+      },
+      getCondition () {
+        return {
+          startDate: this.$refs.paged.$refs.cri.model.startDate,
+          endDate: this.$refs.paged.$refs.cri.model.endDate,
+          condition: this.condition
+        }
+      },
+      usertypes () {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
+      meterStyle () {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('燃气表型号')]
+      },
+
+
+
+    }
+  }
+</script>
+