manage-client 3.2.165 → 3.2.166

package/build/dev-server.js

@@ -23,59 +23,62 @@ var system = 'http://192.168.50.4:8400'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
 var proxyTable = {
   '/rs/logic/exportfile': {
-    target: fuwu
+    target: bendi
   },
   '/rs/sql/otherChargeQuery': {
     target: 'http://localhost:8080/'
   },
+  '/rs/sql/BusinessType': {
+    target: 'http://localhost:8080/'
+  },
   '/files': {
-    target: fuwu
+    target: bendi
   },
   // 查找资源服务数据
   '/rs/search': {
-    target: fuwu
+    target: bendi
   },
   // 查找资源服务数据
   '/rs/logic/getLogin': {
-    target: fuwu
+    target: bendi
   },
   // 查找资源服务数据
   '/rs/logic/getInitData': {
-    target: fuwu
+    target: bendi
   },
   '/rs/logic/getSaleInitData': {
-    target: fuwu
+    target: bendi
   },
   // 用户登录服务地址
   '/rs/user': {
-    target: fuwu
+    target: bendi
   },
   '/rs/path/getParams': {
-    target: fuwu
+    target: bendi
   },
   '/rs/data': {
-    target: fuwu
+    target: bendi
   },
   '/rs/license': {
-    target: fuwu
+    target: bendi
   },
   '/rs/db': {
-    target: fuwu
+    target: bendi
   },
   '/excel': {
-    target: fuwu
+    target: bendi
   },
   '/rs/config': {
-    target: fuwu
+    target: bendi
   },
   '/rs/sql/getLicenseById': {
-    target: fuwu
+    target: bendi
   },
   '/rs/report': {
     target: bendi
   },
   '/rs/vue': {
-    target: fuwu
+    target: bendi
   },
   '/rs/file': {
     target: bendi
@@ -84,7 +87,7 @@ var proxyTable = {
     target: 'http://127.0.0.1:8080'
   },
   '/rs': {
-    target: fuwu
+    target: bendi
   }
 }
 

package/package.json

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

package/src/components/sale/businessquery/BusinessManage.vue

@@ -158,8 +158,6 @@ export default {
   components: {Tabs, TabButton, ChargeQuery},
   ready() {
     this.getaddress()
-    console.log(this.$refs.list)
-    console.log('业务查询')
   },
   methods: {
     async  getaddress(){

package/src/components/sale/businessquery/ChangeMeterQuery.vue

@@ -417,12 +417,9 @@
   import {PagedList} from 'vue-client'
   import defaultPrint from '../config/DefaultPrint'
   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()
@@ -430,7 +427,6 @@
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
   export default {
-
     props:['data'],
     title: '换表查询',
     data() {
@@ -468,7 +464,6 @@
         tfoot: '',
         defaultfield: [],
         // tablestate: [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '停用', value: '停用'}],
-
         //合计数据
         sumsmodel: {},
         changemeter_fee:[
@@ -480,13 +475,8 @@
 
     },
     ready() {
-
-      console.log(this.$parent.startDate)
-      console.log(this.$parent.$parent.startDate)
-      console.log(this.$parent.$parent.$parent.startDate)
       this.startDate=this.$parent.startDate
       this.endDate=this.$parent.endDate
-      console.log("this",this)
       readySomething(this)
     },
     methods: {
@@ -506,8 +496,6 @@
         this.show=true
       },
       getotherfooter () {
-        // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
-        // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];
         this.other = [];
         this.footer = [];
         let exportdata = this.getCondition;
@@ -532,7 +520,6 @@
     brandArr.push(temp)
   })
     this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
-
   },
   async selfSearch(args) {
     if (this.data) {
@@ -564,7 +551,6 @@
     this.criteriaShow = !this.criteriaShow
   },
   getRes(obj) {
-    console.log(obj,"========")
     this.orgCondtionStr = obj
   },
   stamp() {
@@ -572,12 +558,10 @@
     //默认选择要打印的列
     this.modelval = defaultPrint.config
     this.fields = this.getfield
-    console.log('所有打印字段', this.fields)
     this.printshow = true
     this.put()
   },
   dealmsg(val) {
-    console.log('---------------dealmsg')
     val.model = this.model.model
     this.$dispatch('deal-msg', val)
   },

package/src/components/sale/businessquery/GroupChargeQuery.vue

@@ -6,6 +6,7 @@
           <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="['company','department']" :selectin="true" :initres="$parent.$parent.initres"  @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">开始日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -26,19 +27,6 @@
                               condition="f_operate_date <= '{}'">
                   </datepicker>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">客户名称</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                         condition="f_user_name like '%{}%'" placeholder="客户名称">
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">客户类型</label>
-                  <v-select :value.sync="model.f_user_type"
-                            :search="false"
-                            :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
-                            condition="f_user_type = '{}'"
-                            close-on-select></v-select>
-                </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>
@@ -59,6 +47,19 @@
                 </div>
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户名称</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                         condition="f_user_name like '%{}%'" placeholder="客户名称">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户类型</label>
+                  <v-select :value.sync="model.f_user_type"
+                            :search="false"
+                            :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
+                            condition="f_user_type = '{}'"
+                            close-on-select></v-select>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户地址</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
@@ -390,6 +391,7 @@
         this.orgCondtionStr = condition
         this.orgname = obj.orgnames[0]
         this.depname = obj.depnames[0]
+        this.operatorname = this.userresid.filter(x => obj.operatornames.includes(x.value)).map(x=>x.label).toString()
       },
       sort (field, rule) {
         // 将所有排序方式设为不排序，实现相互排斥

package/src/components/sale/businessquery/PrintSheetQuery.vue

@@ -61,7 +61,7 @@
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">用户编号</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
-                         condition="ua.f_userinfo_code = '{}' " placeholder="用户编号">
+                         condition="ui.f_userinfo_code = '{}' " placeholder="用户编号">
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">用户姓名</label>

package/src/filiale/tongchuan/BussinessType.vue

@@ -0,0 +1,123 @@
+<template lang="html">
+  <div id="charts">
+    <div id="sm" :style="{width:'100%',height:'98%'}"></div>
+  </div>
+</template>
+
+<script>
+  /* eslint-disable indent,key-spacing,no-labels */
+
+  import * as Util from '../../Util'
+import co from 'co'
+import echarts from 'echarts'
+import {HttpResetClass } from 'vue-client'
+
+let getData = function * (self) {
+  let load = new HttpResetClass()
+  load.load('POST','rs/sql/BusinessType',
+  {data: {startDate: self.startdate, endDate: self.enddate,f_orgid: self.orgid}},
+  {resolveMsg: null, rejectMsg: null})
+  .then((res) => {
+    self.texttile = '用户类型'
+    let arrparams = []
+    let numdata = []
+    for (var i = 0; i < res.data.length; i++) {
+        arrparams[i] = res.data[i].name
+        numdata[i] = res.data[i].num
+    }
+    self.set(arrparams,numdata)
+  })
+}
+export default {
+  props: {
+    startdate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    enddate: {
+      type: String,
+      default: Util.toStandardDateString()
+    },
+    orgid: {
+      type: String
+    }
+  },
+ data () {
+    title: '业务类型'
+   return {
+     texttile: '',
+     xc: ''
+   }
+ },
+ methods: {
+   set (arrparams,numdata) {
+     this.xc = echarts.init(document.getElementById('sm'))
+     this.xc.setOption({
+       title : {
+         text: '其他业务散列图',
+         subtext: '数据查询来源',
+         x: 'left'
+       },
+        tooltip:{
+          trigger:'axis'
+        },
+       legend: {
+         x: 'left',
+         y: 'bottom',
+         data: ['数量']
+       },
+       toolbox: {
+         show : true,
+         feature : {
+           dataView : {show: true, readOnly: false},
+           magicType : {show: true, type: ['line', 'bar']},
+           restore : {show: true},
+           saveAsImage : {show: true}
+         }
+       },
+       calculable : true,
+       xAxis : [
+         {
+           type : 'category',
+           data : arrparams
+         }
+      ],
+      yAxis : [
+        {
+          type : 'value'
+        }
+      ],
+      series : [
+        {
+          name:'数量',
+          type:'bar',
+          data:numdata,
+          markLine : {
+            silent: true
+          }
+        }
+      ]
+     })
+   },
+   searchdata () {
+     let getGen = getData(this)
+     co(getGen)
+   }
+ },
+ ready () {
+   this.searchdata()
+ },
+ watch: {
+   'startdate' (val) {
+     this.searchdata()
+   },
+   'enddate' (val) {
+     this.searchdata()
+   },
+   'orgid' (val) {
+     this.searchdata()
+   }
+ }
+
+}
+</script>

package/src/filiale/tongchuan/sale.js

@@ -6,16 +6,18 @@ let specialComp = {
   'res-select-group': (resolve) => { require(['./ResSelectGroupNew'], resolve) },
   'fill-gas-query': (resolve) => { require(['./FillGasQuery'], resolve) },
   'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
-  'report-list':(resolve) => { require(['./reportList'], resolve) },
-  'handplan-query': (resolve) => {require(['./HandplanQuery'], resolve)},
+  'report-list': (resolve) => { require(['./reportList'], resolve) },
+  'handplan-query': (resolve) => { require(['./HandplanQuery'], resolve) },
   // 调价记录查询
-   'price-change-query':(resolve) => {require(['./PriceChangeQuery'], resolve)},
+   'price-change-query': (resolve) => { require(['./PriceChangeQuery'], resolve) },
   // 用户设备查询
-  'user-equipment-query':(resolve) => {require(['./UserDeviceQuery'], resolve)},
+  'user-equipment-query': (resolve) => { require(['./UserDeviceQuery'], resolve) },
   // 表具设备查询
- 'equipment-query': (resolve) => {require(['./DeviceQuery'], resolve)},
+ 'equipment-query': (resolve) => { require(['./DeviceQuery'], resolve) },
   // 表具查询
-  'meter-query': (resolve) => {require(['./MeterQuery'], resolve)}
+  'meter-query': (resolve) => { require(['./MeterQuery'], resolve) },
+  // 其他业务散列
+  'bussiness-type': (resolve) => { require(['./BussinessType'], resolve) }
 
 }
 exports.specialComp = specialComp

package/src/main.js

@@ -44,7 +44,7 @@ all()
 ldap()
 system(false)
 
-saleManage("WEINAN")
+saleManage("tongchuan")
 webmeterManage()
 ManageHome()
 newmanage()