manage-client 4.0.69 → 4.0.71

package/src/filiale/yangchun/WebhandMonthGas.vue

@@ -168,6 +168,17 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
                          condition="f_meternumber = '{}' " placeholder="表号">
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">使用类型</label>
+                  <v-select :value.sync="model.f_usetype"
+                            v-model="model.f_usetype"
+                            :options='$parent.$parent.usetype'
+                            placeholder='使用类型'
+                            style="width:60%"
+                            close-on-select
+                            condition="f_usetype = '{}'">
+                  </v-select>
+                </div>
 <!--                <div class="col-sm-2 form-group">-->
 <!--                  <label class="font_normal_body">气表品牌</label>-->
 <!--                  <v-select :value.sync="model.f_meter_brand" multiple-->
@@ -204,6 +215,7 @@
                 <th><nobr>用气金额</nobr></th>
                 <th><nobr>期间实收金额</nobr></th>
                 <th><nobr>期末余额</nobr></th>
+                <th><nobr>使用类型</nobr></th>
                 <th><nobr>公司</nobr></th>
               </tr>
             </template>
@@ -260,6 +272,9 @@
               <td>
                 <nobr>{{row.f_curbalance}}</nobr>
               </td>
+              <td>
+                <nobr>{{row.f_usetype}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_orgname}}</nobr>
               </td>
@@ -757,6 +772,9 @@ export default {
     usertypes() {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
     },
+    usetype() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('使用类型')]
+    },
     // meterstate() {
     //   return [{label: '全部', value: ''}, ...this.$appdata.getParam('抄表状态')]
     // },

package/src/main.js

@@ -1,70 +1,70 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-
-// import { sale } from 'sale-client'
-import { system } from 'system-clients'
-import { ldap } from 'ldap-clients'
-import saleManage from './saleManage'
-import ShanXianSaleManage from './filiale/yangchun/sale'
-import ShanXianwebSaleManage from './filiale/yangchun/webmeterManage'
-import webmeterManage from './webmeterManage'
-import reportManage from './reportManage'
-import newmanage from './newmanage'
-import ManageHome from './ManageHome'
-import echarts from 'echarts'
-import AMap from 'vue-amap'
-
-Vue.config.silent = true
-// Vue.mmType = 'AES'
-
-Vue.use(AMap)
-
-// 初始化vue-amap
-AMap.initAMapApiLoader({
-  // 高德key
-  key: '3cec9ae8e2349207f7ac29279e3f4abe',
-  // 插件集合 （插件按需引入）
-  plugin: [
-    'AMap.Autocomplete', // 输入提示插件
-    'AMap.PlaceSearch', // POI搜索插件
-    'AMap.Scale', // 右下角缩略图插件 比例尺
-    'AMap.OverView', // 地图鹰眼插件
-    'AMap.ToolBar', // 地图工具条0
-    'AMap.MapType', // 类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
-    'AMap.PolyEditor', // 编辑 折线多，边形
-    'AMap.CircleEditor', // 圆形编辑器插件
-    'AMap.Geolocation' // 定位控件，用来获取和展示用户主机所在的经纬度位置
-  ],
-  uiVersion: '1.0'
-})
-/** **************************通用组件******************************/
-
-Vue.prototype.$echarts = echarts
-all()
-// sale()
-ldap()
-system(false)
-
-saleManage()
-webmeterManage()
-ManageHome()
-newmanage()
-ShanXianwebSaleManage()
-reportManage()
-ShanXianSaleManage()
-require('system-clients/src/styles/less/bootstrap.less')
-require('./components/qinhua/Style/qinhuaStyle.less')
-// require('./bootstrap/less/manageStyle/manageChile.less')
-// require('./bootstrap/less/manageStyle/safeStyle.less')
-
-// 大屏展示要放开的样式
-// require('system-clients/src/styles/less/manageStyle/manageChile.less')
-// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
-// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
-
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+
+// import { sale } from 'sale-client'
+import { system } from 'system-clients'
+import { ldap } from 'ldap-clients'
+import saleManage from './saleManage'
+import ShanXianSaleManage from './filiale/yangchun/sale'
+import ShanXianwebSaleManage from './filiale/yangchun/webmeterManage'
+import webmeterManage from './webmeterManage'
+import reportManage from './reportManage'
+import newmanage from './newmanage'
+import ManageHome from './ManageHome'
+import echarts from 'echarts'
+import AMap from 'vue-amap'
+
+Vue.config.silent = true
+// Vue.mmType = 'AES'
+
+Vue.use(AMap)
+
+// 初始化vue-amap
+AMap.initAMapApiLoader({
+  // 高德key
+  key: '3cec9ae8e2349207f7ac29279e3f4abe',
+  // 插件集合 （插件按需引入）
+  plugin: [
+    'AMap.Autocomplete', // 输入提示插件
+    'AMap.PlaceSearch', // POI搜索插件
+    'AMap.Scale', // 右下角缩略图插件 比例尺
+    'AMap.OverView', // 地图鹰眼插件
+    'AMap.ToolBar', // 地图工具条0
+    'AMap.MapType', // 类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
+    'AMap.PolyEditor', // 编辑 折线多，边形
+    'AMap.CircleEditor', // 圆形编辑器插件
+    'AMap.Geolocation' // 定位控件，用来获取和展示用户主机所在的经纬度位置
+  ],
+  uiVersion: '1.0'
+})
+/** **************************通用组件******************************/
+
+Vue.prototype.$echarts = echarts
+all()
+// sale()
+ldap()
+system(false)
+
+saleManage()
+webmeterManage()
+ManageHome()
+newmanage()
+ShanXianwebSaleManage()
+reportManage()
+ShanXianSaleManage()
+require('system-clients/src/styles/less/bootstrap.less')
+require('./components/qinhua/Style/qinhuaStyle.less')
+// require('./bootstrap/less/manageStyle/manageChile.less')
+// require('./bootstrap/less/manageStyle/safeStyle.less')
+
+// 大屏展示要放开的样式
+// require('system-clients/src/styles/less/manageStyle/manageChile.less')
+// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
+// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})
+