manage-client 3.2.217 → 3.2.219

package/src/filiale/WEINAN/sale.js

@@ -1,54 +1,54 @@
-// 分公司特殊组件页面注册
-let specialComp = {
-  // 收费查询
-  'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
-  // 其他收费查询
-  'other-charge-query': (resolve) => { require(['./OtherChargeQuery'], resolve) },
-  // 用户稽查查询
-  'inspect-list-user': (resolve) => {require(['./InspectListUser'], resolve)},
-  //换表查询
-  'meter-change-meter-query': (resolve) => {require(['./ChangeMeterQuery'], resolve)},
-  //补气查询
-  'fill-gas-query': (resolve) => {require(['./FillGasQuery'], resolve)},
-  //表具查询
-  'meter-query': (resolve) => {require(['./MeterQuery'], resolve)},
-  //表具档案综合查询
-  'record-info-query': (resolve) => {require(['./RecordInfoQuery'], resolve)},
-  // 业务查询
-  'business-manage':(resolve) => {require(['./BusinessManage'], resolve)},
-  // 换表查询
-  'change-meter-query':(resolve) => {require(['./manage/ChangeMeterQuery'], resolve)},
-  // 上报数据查询
-  'report-data-query':(resolve) => {require(['./ReportDataQuery'], resolve)},
-  // 上报统计分析--抄表分析
-  'user-gas-list':(resolve) => {require(['./UserGasList'], resolve)},
-  // 用气分析明细查询
-  'new-webmeter-user-gasAll':(resolve) => {require(['./UserGasAll'], resolve)},
-  // 用气分析图表分析
-  'user-gas-echarts':(resolve) => {require(['./UserGasEcharts'], resolve)},
-  // 启用查询
-  'enable-query':(resolve) => {require(['./EnableQuery'], resolve)},
-  // 停用查询
-  'disable-query':(resolve) => {require(['./DisableQuery'], resolve)},
-  // 销户查询
-  'cancellation-query':(resolve) => {require(['./CancellationQuery'], resolve)},
-  // 汇总查询
-  'collect-manage':(resolve) => {require(['./CollectManage'], resolve)},
-  // 开户查询
-  'new-account-query': (resolve) => { require(['./NewAccountQuery'], resolve) },
-  // 购气稽查
-  'inspect-list-gas': (resolve) => { require(['./InspectListGas'], resolve) },
-  // 档案合并查询
-  'merge-file-query': (resolve) => { require(['./MergeFileQuery.vue'], resolve) },
-  //地址管理
-  'user-address': (resolve) => { require(['./UserAddress.vue'], resolve) },
-  //地址变更记录
-  'user-address-change': (resolve) => { require(['./UserAddressChange.vue'], resolve) },
-  // 统计分析
-  'statistical-analysis': (resolve) => { require(['./StatisticalAnalysis.vue'], resolve) },
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+let specialComp = {
+  // 收费查询
+  'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
+  // 其他收费查询
+  'other-charge-query': (resolve) => { require(['./OtherChargeQuery'], resolve) },
+  // 用户稽查查询
+  'inspect-list-user': (resolve) => {require(['./InspectListUser'], resolve)},
+  //换表查询
+  'meter-change-meter-query': (resolve) => {require(['./ChangeMeterQuery'], resolve)},
+  //补气查询
+  'fill-gas-query': (resolve) => {require(['./FillGasQuery'], resolve)},
+  //表具查询
+  'meter-query': (resolve) => {require(['./MeterQuery'], resolve)},
+  //表具档案综合查询
+  'record-info-query': (resolve) => {require(['./RecordInfoQuery'], resolve)},
+  // 业务查询
+  'business-manage':(resolve) => {require(['./BusinessManage'], resolve)},
+  // 换表查询
+  'change-meter-query':(resolve) => {require(['./manage/ChangeMeterQuery'], resolve)},
+  // 上报数据查询
+  'report-data-query':(resolve) => {require(['./ReportDataQuery'], resolve)},
+  // 上报统计分析--抄表分析
+  'user-gas-list':(resolve) => {require(['./UserGasList'], resolve)},
+  // 用气分析明细查询
+  'new-webmeter-user-gasAll':(resolve) => {require(['./UserGasAll'], resolve)},
+  // 用气分析图表分析
+  'user-gas-echarts':(resolve) => {require(['./UserGasEcharts'], resolve)},
+  // 启用查询
+  'enable-query':(resolve) => {require(['./EnableQuery'], resolve)},
+  // 停用查询
+  'disable-query':(resolve) => {require(['./DisableQuery'], resolve)},
+  // 销户查询
+  'cancellation-query':(resolve) => {require(['./CancellationQuery'], resolve)},
+  // 汇总查询
+  'collect-manage':(resolve) => {require(['./CollectManage'], resolve)},
+  // 开户查询
+  'new-account-query': (resolve) => { require(['./NewAccountQuery'], resolve) },
+  // 购气稽查
+  'inspect-list-gas': (resolve) => { require(['./InspectListGas'], resolve) },
+  // 档案合并查询
+  'merge-file-query': (resolve) => { require(['./MergeFileQuery.vue'], resolve) },
+  //地址管理
+  'user-address': (resolve) => { require(['./UserAddress.vue'], resolve) },
+  //地址变更记录
+  'user-address-change': (resolve) => { require(['./UserAddressChange.vue'], resolve) },
+  // 统计分析
+  'statistical-analysis': (resolve) => { require(['./StatisticalAnalysis.vue'], resolve) },
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/meihekou/CardHandplanQuery.vue

@@ -133,6 +133,13 @@
                             close-on-select></v-select>
                 </div>-->
                 <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气价名称</label>
+                  <v-select :value.sync="model.f_price_name"
+                            :options='$parent.$parent.priceName' placeholder='请选择' v-model="model.f_price_name"
+                            condition="f_price_name = '{}'"
+                            close-on-select></v-select>
+                </div>
               </div>
             </div>
           </criteria>
@@ -586,6 +593,9 @@
       },
       whetherPay() {
         return [{label: '全部', value: ''},{label: '是', value: '是'},{label: '否', value: '否'}]
+      },
+      priceName() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
       }
     },
     events:{

package/src/main.js

@@ -1,66 +1,66 @@
-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 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("shanxian")
-webmeterManage("wuhai")
-ManageHome()
-newmanage()
-reportManage()
-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 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("wuhai")
+ManageHome()
+newmanage()
+reportManage()
+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 }
+})
+