manage-client 3.2.109 → 3.2.113

package/src/filiale/rizhao/sale.js

@@ -0,0 +1,10 @@
+// 分公司特殊组件页面注册
+let specialComp = {
+  // 收费查询
+  'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) }
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/tongchuan/DeviceQuery.vue

@@ -363,7 +363,7 @@
         pcdslist:[],
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/deviceQuery', 20),
+        model: new PagedList('rs/sql/deviceQuery', 20, {orderitem: '"f_operate_date DESC"'}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],

package/src/filiale/tongchuan/FillGasQuery.vue

@@ -154,6 +154,9 @@
                 <th>
                   <nobr>客户地址</nobr>
                 </th>
+                <th>
+                  <nobr>表号</nobr>
+                </th>
                 <th>
                   <nobr>卡号</nobr>
                 </th>
@@ -207,6 +210,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_address}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meternumber}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_card_id}}</nobr>
               </td>
@@ -305,7 +311,7 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/fillGasQuery', 20, {}, {f_pregas: 0,f_preamount: 0,hushu:0}),
+        model: new PagedList('rs/sql/fillGasQuery', 20, {orderitem: '"f_operate_date DESC"'}, {f_pregas: 0,f_preamount: 0,hushu:0}),
         criteriaShow: false,
         headData: ["客户编号", "客户名称", "客户电话", "身份证号", "地址", "补气类型", "表编号", "卡号", "气表品牌", "气表状态", "补气量", "补气日期", "操作员", "部门", "公司"],
         bodyData: ["f_userinfo_code", "f_user_name", "f_user_phone", "f_idnumber", "address", "f_type", "f_user_id", "f_card_id", "f_meter_brand", "f_table_state", "f_fillgas", "f_operate_date", "f_operator", "f_depname", "f_orgname"],
@@ -502,7 +508,10 @@
     },
     computed: {
       getCondition() {
-        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          orderitem: " f_operate_date desc"
+        }
       },
       getfield() {
         return exportConfig.fillgasConfig

package/src/filiale/tongchuan/PriceChangeQuery.vue

@@ -205,7 +205,7 @@
         footer:[],
         meterbrands: [],
         pricenames: [],
-        model: new PagedList('rs/sql/pricechangequery', 20),
+        model: new PagedList('rs/sql/pricechangequery', 20, {orderitem: '"f_operate_date DESC"'}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],

package/src/filiale/tongchuan/UserDeviceQuery.vue

@@ -237,7 +237,7 @@
         pcdslist:[],
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/userDeviceQuery', 20,{},{
+        model: new PagedList('rs/sql/userDeviceQuery', 20, {orderitem: '"f_operate_date DESC"'},{
           f_mtc_fee:0
         }),
         criteriaShow: false,

package/src/filiale/tongchuan/config/exportConfig.js

@@ -321,7 +321,7 @@ export default{
     'f_userinfo_code': '客户编号','f_user_name': '客户名称',  'f_user_phone': '客户电话', 'f_address': '客户地址',
     'f_card_id': '卡号','f_meter_brand': '气表品牌','f_type': '补气类型','f_comments': '补气原因',
     'f_pregas': '补气量','f_preamount': '补气金额','f_operate_date': '补气日期',
-    'f_operator': '操作员','f_depname': '部门','f_orgname': '公司'
+    'f_operator': '操作员','f_depname': '部门','f_orgname': '公司', 'f_meternumber': '表号'
   },
 
   fillcardConfig: {
@@ -427,7 +427,7 @@ monthGasConfig: {
   },
   CancellationConfig: {
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_user_phone': '联系电话',
-    'f_address': '客户地址','f_comments': '销户原因', 'f_state': '销户状态',
+    'f_address': '客户地址','f_comments': '销户原因', 'f_state': '销户状态','f_meternumber':'表号',
     'f_operate_date': '销户日期','f_operat_type': '操作类型','f_operator': '操作员','f_depname': '部门','f_orgname': '公司'
   },
   overDueQueryConfig: {

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()
-
-webmeterManage()
-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()
+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 }
+})
+

package/src/saleManage.js

@@ -437,6 +437,15 @@ export default function (filiale) {
     require(['./components/sale/businessquery/sellingChargePrice'], resolve)
   })
 
+  // 资源查询
+  Vue.component('resource-manage', (resolve) => {
+    require(['./components/sale/resourcequery/ResourceManage'], resolve)
+  })
+  // 登录信息查询
+  Vue.component('login-query', (resolve) => {
+    require(['./components/sale/resourcequery/LoginQuery'], resolve)
+  })
+
   // 收费类型日售气量报表
   Vue.component('pricetype-gas-money', (resolve) => {
     require(['./components/sale/businessquery/PricetypeGasMoney'], resolve)