manage-client 4.1.34 → 4.1.36

package/build/dev-server.js

@@ -11,17 +11,17 @@ var compiler = webpack(config)
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-var shaoguan = 'http://61.163.123.47:30785/'
-var qtx = 'http://61.163.123.47:30785/'
+// var shaoguan = 'http://61.163.123.47:30785/'
+// var qtx = 'http://61.163.123.47:30785/'
 // var bendi = 'http://220.194.141.253:8600/'
 // var bendi = 'http://203.57.101.233:9001'
 // var bendi = 'http://172.168.1.11:9001/'
 // var bendi = 'http://203.57.101.233:9001/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://61.163.123.47:30785/'
+var bendi = 'http://192.168.50.67:31567/'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://61.163.123.47:30785/'
+var wode = 'http://192.168.50.67:31567/'
 // 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'
@@ -30,41 +30,41 @@ var proxyTable = {
     target: bendi
   },
   '/dataManage': {
-    target: 'http://203.57.101.233:9001/'
+    target: 'http://192.168.50.67:31567/'
 
   },
   '/api/af-revenue/sql/WeChatPaydetail': {
     pathRewrite: {
       '^/api/af-revenue': '/rs'
     },
-    target: 'http://127.0.0.1:8080/'
+    target: 'http://192.168.50.67:31567/'
   },
   '/api/af-revenue/sql/WeChatPayment': {
     pathRewrite: {
       '^/api/af-revenue': '/rs'
     },
-    target: 'http://127.0.0.1:8080/'
+    target: 'http://192.168.50.67:31567/'
   },
   '/api/af-revenue/sql/getGasInspection': {
     pathRewrite: {
       '^/api/af-revenue': '/rs'
     },
-    target: 'http://127.0.0.1:8080/'
+    target: 'http://192.168.50.67:31567/'
   },
   '/api/af-revenue/sql/inspectList_sellinggas': {
     pathRewrite: {
       '^/api/af-revenue': '/rs'
     },
-    target: 'http://127.0.0.1:8080/'
+    target: 'http://192.168.50.67:31567/'
   },
   '/api/af-revenue/sql/inspectList': {
     pathRewrite: {
       '^/api/af-revenue': '/rs'
     },
-    target: 'http://127.0.0.1:8080/'
+    target: 'http://192.168.50.67:31567/'
   },
   '/api': {
-    target: 'http://61.163.123.47:30785/'
+    target: 'http://192.168.50.67:31567/'
 
   },
   '/rs/sql/chargeQuery_by_gasproperties': {
@@ -78,7 +78,7 @@ var proxyTable = {
   },
   // 查找资源服务数据
   '/rs/search': {
-    target: 'http://61.163.123.47:30785/'
+    target: 'http://192.168.50.67:31567/'
   },
   // 查找资源服务数据
   '/rs/logic/getLogin': {
@@ -120,7 +120,7 @@ var proxyTable = {
     target: bendi
   },
   '/rs/vue': {
-    target: 'http://61.163.123.47:30785/'
+    target: 'http://192.168.50.67:31567/'
   },
   '/rs/file': {
     target: bendi

package/package.json

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

package/src/components/SellReport/outletSell.vue

@@ -0,0 +1,256 @@
+<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-3" >
+              <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-3" >
+              <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-3">
+              <label class="font_normal_body">气表品牌</label>
+              <v-select :value.sync="model.gasbrand"
+                        v-model='model.gasbrand'
+                        :options='$parent.$parent.meterbrands'
+                        :multiple = "true"
+                        condition="f_meter_brand in {}"
+                        placeholder='气表品牌'
+                        close-on-select></v-select>
+            </div>
+            <res-select-group :style="'col-sm-3'" @re-res="$parent.$parent.getRes" :show-component="$parent.$parent.showComponent" v-ref:sel></res-select-group>
+          </div>
+          <div class="span" style = "float:right;">
+            <button class="button_search" @click="$parent.$parent.search()">查询</button>
+            <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%'></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.spans}}' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">网点汇总报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='{{$parent.spans}}' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;
+            </th>
+          </tr>
+          <tr>
+            <th colspan='{{$parent.spans}}' style="font-weight: normal; text-align: center;">
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th colspan='{{$parent.spans}}' 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.spans}}' id="test">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left" >
+            <th colspan='1'>财务审核：</th>
+            <th colspan='1'>收款审核：</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('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)
+  }
+}
+let readySomething = async function(self) {
+  await self.$LoadParams.loadParam(self.f_filialeid)
+  self.loadMeterBooks()
+}
+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: [],
+      showComponent:['company','department','operator'],
+      meterbrands:[{label: '全部',value: ''}],
+      orgname: '',
+      depname: '',
+      operatorname: '',
+      orgCondtionStr: '1=1',
+      model: new DataModel('api/af-revenue/report/outletTongHua', {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"
+    readySomething(this)
+    // this.$refs.paged.$refs.criteria.search()
+    console.log(this.$login.f)
+  },
+  methods: {
+    loadMeterBooks(){
+      let meterbrand = this.$GetSaleParam.getGasbrand()
+      for(let row of meterbrand){
+        this.meterbrands.push({label: row.label,value: row.value.f_meter_brand})
+      }
+    },
+    search () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      this.printTime = this.$login.toStandardTimeString()
+      this.$refs.paged.$refs.criteria.model.f_orgid = this.orgCondtionStr + ' and ' + args.condition
+      this.$refs.paged.search(args)
+    },
+    getRes (obj) {
+      // console.log('getres', obj)
+      /* this.orgname = obj.res[0]
+      this.depresid = obj.resids
+      this.f_orgid = obj.resids*/
+      this.orgCondtionStr = '1=1 ' + obj
+    },
+    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').children[0]
+      // (4-3)*2+3
+      var tds = tab.getElementsByTagName('td')
+      var num = 0
+      for (let td of tds) {
+        let span = td.getAttribute('colspan')
+        num = num + ((span ? span : 1) - 0)
+      }
+      console.log("返回的数为"+num)
+      this.spans = num
+    }
+  },
+  computed: {
+
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

package/src/filiale/WEINAN/RecordInfoQuery.vue

@@ -920,9 +920,9 @@
         this.prices = this.$MagGetSaleParam.getPrices();
       },
       async getaddress (searchText){
-        let condition = ' 1 = 1 '
+        let condition = ` f_orgid = '${this.$login.f.orgid}'`
         if (searchText) {
-          condition = ` f_residential_area like '%${searchText}%' `
+          condition = condition + ` and f_residential_area like '%${searchText}%' `
         }
         let HttpReset = new HttpResetClass()
         HttpReset.load('POST', 'api/af-revenue/sql/manageSingleTable?pageNo=1&pageSize=100', {

package/src/filiale/WEINAN/manage/ChangeMeterQuery.vue

@@ -433,13 +433,13 @@
   import exportConfig from '../config/exportConfig'
 
   let readySomething = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
-    self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
 
     self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
     // self.$refs.paged.$refs.cri.search()
     await self.$MagLoadParams.loadParam()
-    self.initParams()
+    await self.initParams()
+    self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
     // self.getaddress()
     // self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }