manage-client 3.2.207 → 3.2.208

package/src/filiale/qianneng/OtherChargeQuery.vue

@@ -227,6 +227,9 @@
                 <th>
                   <nobr>数量</nobr>
                 </th>
+                <th>
+                  <nobr>应收</nobr>
+                </th>
                 <th>
                   <nobr>收款</nobr>
                 </th>
@@ -312,6 +315,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_money}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_collection}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_newbalance}}</nobr>
               </td>
@@ -361,7 +367,16 @@
               汇总信息
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              收款合计:&emsp;{{sumsmodel.f_money}}
+              应收合计:&emsp;{{sumsmodel.f_money}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              收款合计:&emsp;{{sumsmodel.f_collection}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              支出合计:&emsp;{{sumsmodel.f_newbalance}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              存入合计:&emsp;{{sumsmodel.f_newcurbalance}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               户数合计:&emsp;{{sumsmodel.hushu}}
@@ -422,7 +437,8 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/otherChargeQuery', 20, {}, {f_money: 0,hushu:0}),
+        model: new PagedList('rs/sql/otherChargeQuery', 20, {}, {f_money: 0, f_collection: 0,
+          f_newbalance: 0, f_newcurbalance: 0, hushu:0}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],

package/src/filiale/qianneng/exportConfig.js

@@ -75,8 +75,8 @@ export default{
   otherchargeConfig: {
     'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_user_phone': '客户电话', 'f_meter_classify': '气表类型',
     'f_meter_brand': '气表品牌', 'f_bill_number': '收据票号', 'f_brand_spec': '收费类型', 'f_typename': '品名规格',
-    'f_typenumber': '型号', 'f_unitprice': '单价', 'f_number': '数量',
-    'f_money': '收款', 'f_newbalance': '支出', 'f_newcurbalance': '收入', 'f_payment': '付款方式', 'f_state': '状态',
+    'f_typenumber': '型号', 'f_unitprice': '单价', 'f_number': '数量', 'f_money': '应收',
+    'f_collection': '收款', 'f_newbalance': '支出', 'f_newcurbalance': '收入', 'f_payment': '付款方式', 'f_state': '状态',
     'f_operate_date': '收费日期', 'f_service_person': '服务人员', 'f_comments': '备注',
     'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司'
   },

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("wuhai")
-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("WEINAN")
+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 }
+})
+