manage-client 4.1.120 → 4.1.121

package/build/dev-server.js

@@ -6,7 +6,7 @@ const proxyMiddleware = require('http-proxy-middleware')
 const app = express()
 const compiler = webpack(config)
 
-const server = 'https://yc.aofengcloud.com:31467'
+const server = 'http://123.57.3.66:31467'
 const local = 'http://127.0.0.1:9026/'
 const proxyTable = {
   '/dataManage': {
@@ -14,6 +14,22 @@ const proxyTable = {
     changeOrigin: true,
     secure: false
   },
+  '/api/af-revenue/logic': {
+    pathRewrite: {
+      '^/api/af-revenue/logic': '/logic'
+    },
+    target: local,
+    changeOrigin: true,
+    secure: false
+  },
+  '/api/af-revenue/sql': {
+    pathRewrite: {
+      '^/api/af-revenue/sql': '/singlepage/api/af-revenue/sql'
+    },
+    target: server,
+    changeOrigin: true,
+    secure: false
+  },
   // ... existing code ...
   '/api': {
     target: server,

package/package.json

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

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

@@ -42,10 +42,10 @@
                   <button class="button_search button_spacing" @click="search()">查询</button>
                   <button class="button_clear  button_spacing" @click="$parent.$parent.clear()">清空</button>
 
-                  <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
+                  <export-excel :data="$parent.$parent.getCondition"
                                 :field="$parent.$parent.getfield" :header="$parent.$parent.other"
                                 :defaultselect="$parent.$parent.defaultexport"
-                                sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="chargeQuery" template-name='收费查询导出'
+                                sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="chargeSplitQuery" template-name='收费详情查询导出'
                                 :choose-col="true">
                   </export-excel>
 
@@ -1157,10 +1157,56 @@
         }
       },
       getfield() {
-        return exportConfig.chargeConfig
+        return {
+          'id': '收费编号',
+          'f_userinfo_code': '客户编号',
+          'f_olduserinfo_code': '档案编号',
+          'f_user_name': '客户名称',
+          'f_idnumber': '身份证号',
+          'f_user_phone': '客户电话',
+          'f_address': '客户地址',
+          'f_zones': '片区',
+          'f_user_type': '客户类型',
+          'f_gasproperties': '用气性质',
+          'f_meternumber': '表号',
+          'f_meter_brand': '气表品牌',
+          'f_times': '购气次数',
+          'f_price_name': '气价名称',
+          'f_last_tablebase': '上期底数',
+          'f_tablebase': '本期底数',
+          'f_pregas': '气量',
+          'fee': '金额',
+          'f_preamount': '燃气费',
+          'f_collection': '收款',
+          'f_privilege_money': '优惠金额',
+          'f_balance': '上期结余',
+          'f_curbalance': '本期结余',
+          'f_type': '收费类型',
+          'f_payment': '付款方式',
+          'f_bank_type': '支付渠道',
+          'f_state': '状态',
+          'f_operate_date': '收费日期',
+          'f_serial_id': '流水号',
+          'f_delaypay': '违约金',
+          'f_comments': '备注',
+          'f_operator': '操作员',
+          'f_depname': '部门',
+          'f_orgname': '公司',
+          'f_yucun': '预存金额',
+          'f_card_id': '卡号',
+          'f_inputtor': '抄表员',
+          'f_residential_area': '小区',
+          'f_serial_number': '业务单号'
+        }
       },
       defaultexport() {
-          return exportConfig.chargeexportConfig
+          return {
+            'f_userinfo_code': '客户编号',
+            'f_user_name': '客户名称',
+            'f_pregas': '气量',
+            'f_payment': '付款方式',
+            'f_collection': '收款'
+        }
       },
       pricetypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]

package/src/main.js

@@ -6,8 +6,8 @@ import { all } from 'vue-client'
 import { system } from 'system-clients'
 import { ldap } from 'ldap-clients'
 import saleManage from './saleManage'
-import ShanXianSaleManage from './filiale/yuncheng/sale'
-import ShanXianwebSaleManage from './filiale/yuncheng/webmeterManage'
+import ShanXianSaleManage from './filiale/qingjian/sale'
+import ShanXianwebSaleManage from './filiale/qingjian/webmeterManage'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'
 import newmanage from './newmanage'