manage-client 3.1.35 → 3.1.36-zk

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Wed Oct 20 10:54:09 CST 2021
-gradle.version=5.5
+#Mon Oct 26 16:02:57 CST 2020
+gradle.version=6.1.1

package/ManageClient.iml

@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="ManageClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="3.1.0-17" type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-      <excludeFolder url="file://$MODULE_DIR$/out" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="ManageClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="3.1.0-17" type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/out" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/build/dev-server.js

@@ -1,174 +1,170 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-// var httpProxy = require('http-proxy')
-
-var app = express()
-var compiler = webpack(config)
-// var proxy = httpProxy.createProxyServer()
-
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-// var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-var shaoguan='http://119.146.1.106:8300/'
-var qtx='http://36.103.222.144:6300/'
-var bendi = 'http://127.0.0.1:8086/', fuwu_login = 'http://192.168.50.4:8400'
-var fuwu = 'http://192.168.50.4:8400'
-var system = 'http://192.168.50.4:8400'
-//192.168.
-//  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
-// var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
-var proxyTable = {
-  '/rs/logic/exportfile': {
-    target: fuwu
-  },
-  '/files': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: fuwu
-  },
-  '/rs/logic/getSaleInitData':{
-    target: fuwu
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: fuwu
-  },
-  '/rs/path/getParams': {
-    target: fuwu
-  },
-  '/rs/data': {
-    target: fuwu
-  },
-  '/rs/license': {
-    target: fuwu
-  },
-  '/rs/db': {
-    target: fuwu
-  },
-  '/excel': {
-    target: fuwu
-  },
-  '/rs/config': {
-    target: fuwu
-  },
-  '/rs/sql/getLicenseById': {
-    target: fuwu
-  },
-  '/rs/report': {
-    target: fuwu
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/rs/file': {
-    target: fuwu
-  },
-  '/rs/logic/SumSettleFileImport': {
-    target: 'http://127.0.0.1:8080'
-  },
-  '/rs': {
-    target: fuwu
-  }
-}
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// serve pure static assets
-app.use('/static', express.static('./static'))
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/reports'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/ldap'
-//   })
-// })
-// app.all('/excel/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/charge'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82/charge'
-//   })
-// })
-
-// app.all('/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-// app.all('/rs/user', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-
-module.exports = app.listen(8085, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8085')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+// var httpProxy = require('http-proxy')
+
+var app = express()
+var compiler = webpack(config)
+// var proxy = httpProxy.createProxyServer()
+
+// Define HTTP proxies to your custom API backend
+// https://github.com/chimurai/http-proxy-middleware
+var bendi = 'http://192.168.20.27:8400/'
+var fuwu = 'http://192.168.20.27:8400/'
+var proxyTable = {
+  '/files': {
+    target: fuwu
+  },
+  '/rs/logic/exportfile': {
+    target: bendi
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: fuwu
+  },
+  '/rs/logic/getSaleInitData':{
+    target: fuwu
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: fuwu
+  },
+  '/rs/path/getParams': {
+    target: fuwu
+  },
+  '/rs/data': {
+    target: fuwu
+  },
+  '/rs/license': {
+    target: fuwu
+  },
+  '/rs/db': {
+    target: fuwu
+  },
+  '/excel': {
+    target: fuwu
+  },
+  '/rs/config': {
+    target: fuwu
+  },
+  '/rs/sql/getLicenseById': {
+    target: fuwu
+  },
+  '/rs/report': {
+    target: fuwu
+  },
+  '/rs/sql': {
+    target: bendi
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/rs/file': {
+    target: fuwu
+  },
+  '/rs/logic/SumSettleFileImport': {
+    target: 'http://127.0.0.1:8080'
+  },
+  '/rs': {
+    target: fuwu
+  }
+}
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({action: 'reload'})
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = {target: options}
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
+// serve pure static assets
+app.use('/static', express.static('./static'))
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/reports'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/ldap'
+//   })
+// })
+// app.all('/excel/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/charge'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82/charge'
+//   })
+// })
+
+// app.all('/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+// app.all('/rs/user', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+
+module.exports = app.listen(8085, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8085')
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.1.35",
+  "version": "3.1.36-zk",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
@@ -63,7 +63,7 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.1.89-20",
+    "system-clients": "3.1.89-18",
     "url-loader": "^0.5.7",
     "vue-amap": "0.5.10",
     "vue-client": "1.24.21",

package/src/components/SellReport/ChargeDayReport.vue

@@ -25,15 +25,66 @@
                   </datepicker>
                 </div>
                 <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel :show-component="$parent.$parent.showself"></res-select-group>
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>-->
+<!--                  <v-select :value.sync="model.f_residential_area"-->
+<!--                            class="select_list select"-->
+<!--                            enter-push-->
+<!--                            multiple = "true"-->
+<!--                            v-model="model.f_residential_area"-->
+<!--                            style="width: 60%"-->
+<!--                            :options='$parent.$parent.residentialArea' placeholder='选择小区'-->
+<!--                            close-on-select>-->
+
+<!--                  </v-select>-->
+<!--                </div>-->
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;付款方式&nbsp;</label>
+                  <v-select :value.sync="model.f_payment"
+                            class="select_list select"
+                            multiple
+                            :search="false"
+                            v-model="model.f_payment"
+                            style="width: 60%"
+                            :options='$parent.$parent.payment'
+                            placeholder='付款方式'
+                            close-on-select>
+
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                         condition="f_userinfo_code = '{}' " placeholder="客户编号">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户名称</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                         condition="f_user_name like '%{}%'" placeholder="客户名称">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;收费状态&nbsp;</label>
+                  <v-select :value.sync="model.f_state"
+                            class="select_list select"
+                            :search="false"
+                            v-model="model.f_state"
+                            style="width: 60%"
+                            :options='$parent.$parent.sellstate'
+                            placeholder='收费状态'
+                            condition="f_state in {}"
+                            close-on-select>
+
+                  </v-select>
+                </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
-                  <v-select :value.sync="model.f_residential_area"
+                  <label class="font_normal_body">&nbsp;收费类型&nbsp;</label>
+                  <v-select :value.sync="model.f_type"
                             class="select_list select"
-                            enter-push
-                            multiple = "true"
-                            v-model="model.f_residential_area"
+                            :search="false"
+                            v-model="model.f_type"
                             style="width: 60%"
-                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                            :options='$parent.$parent.selltype'
+                            placeholder='收费类型'
                             close-on-select>
 
                   </v-select>
@@ -87,9 +138,9 @@
                 <th>
                   <nobr>客户地址</nobr>
                 </th>
-                <th>
-                  <nobr>气量</nobr>
-                </th>
+<!--                <th>-->
+<!--                  <nobr>气量</nobr>-->
+<!--                </th>-->
                 <th>
                   <nobr>收款</nobr>
                 </th>
@@ -129,11 +180,11 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_address}}</nobr>
               </td>
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_pregas}}</nobr>-->
+<!--              </td>-->
               <td style="text-align: center;">
-                <nobr>{{row.f_pregas}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_preamount}}</nobr>
+                <nobr>{{row.f_collection}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.price}}</nobr>
@@ -172,11 +223,11 @@
               style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
               汇总信息
             </td>
+<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
+<!--              总气量:&emsp;{{sumsmodel.f_pregas}}-->
+<!--            </td>-->
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              总气量:&emsp;{{sumsmodel.f_pregas}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              总金额:&emsp;{{sumsmodel.f_preamount}}
+              总金额:&emsp;{{sumsmodel.f_collection}}
             </td>
           </tr>
         </table>
@@ -188,7 +239,6 @@
   import {PagedList, HttpResetClass} from 'vue-client'
   import defaultPrint from '../sale/config/DefaultPrint'
   import exportConfig from '../sale/config/exportConfig'
-  import PrintDataSelf from '../sale/common/PrintDataSelf'
 
   let readySomething = async function (self) {
     self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
@@ -204,9 +254,9 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/chargeDayReport', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate'},{
+        model: new PagedList('rs/sql/chargeDayReport', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', sellType: 'this.model.sellType'},{
           f_pregas:0,
-          f_preamount:0
+          f_collection:0
         }),
         gasproperties:[],
         initres: {
@@ -229,17 +279,16 @@
         fields: {},
         thead: '',
         tfoot: '',
-
         // 下拉框
 
         //合计数据
         sumsmodel: {},
         sumField: {
-           'f_pregas': '方量', 'f_preamount': '金额'
+           'f_pregas': '方量', 'f_collection': '金额'
         },
         pageSum: {
           'f_pregas': '0.00',
-          'f_preamount': '0.00',
+          'f_collection': '0.00',
         },
         defaultfield: [],
         config: {
@@ -249,6 +298,7 @@
       }
     },
     ready() {
+      this.$refs.paged.$refs.cri.model.f_state=['有效']
       this.getaddress()
       readySomething(this).then(() => {
         this.$emit('ready')
@@ -281,15 +331,19 @@
         this.startDate=this.$refs.paged.$refs.cri.model.startDate.substring(0,10)
         this.endDate=this.$refs.paged.$refs.cri.model.endDate.substring(0,10)
         args.condition = `${args.condition} ` +' and '+this.orgCondtionStr.trim().substring(4)
+        args.model.sellType = `1=1`
+        if(args.model.f_type.length !== 0){
+          args.model.sellType += ` and f_type in ('${args.model.f_type.toString().replace(/,/g,"','")}')`
+        }
         //小区查询条件
-        this.area =  this.$refs.paged.$refs.cri.model.f_residential_area
+        this.area =  this.$refs.paged.$refs.cri.model.f_payment
         if(this.area.length !== 0){
           let str = JSON.stringify(this.area)
           str = str.replace(/"/g,`'`)
           str = str.replace(/\[/g,``)
           str = str.replace(/\]/g,``)
           //查询多个小区时条件
-          args.condition += ` and f_residential_area in  ( ${str} )`
+          args.condition += ` and f_payment in  ( ${str} )`
         }
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
@@ -409,6 +463,15 @@
           condition: this.$refs.paged.model.condition
         }
       },
+      payment() {
+        return [...this.$appdata.getParam('付款方式查询')]
+      },
+      sellstate(){
+        return [...this.$appdata.getParam('收费状态')]
+      },
+      selltype(){
+        return [{label: '补卡费', value: '补卡费'},{label: '过户费', value: '过户费'},...this.$appdata.getParam('收费类型')]
+      },
       getfield() {
         return exportConfig.ChargeDayReportConfig
       },