sale-client 3.5.26 → 3.5.29

package/build/dev-server.js

@@ -1,161 +1,161 @@
-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:8080', bendi1 = 'http://121.36.106.17:8400/'
-// 公司测试服务
-var fuwu = 'http://192.168.50.4:8400'
-// var fuwu = 'http://121.36.106.17:8400/'
-// 铜川正式
-//  var fuwu = 'http://61.134.55.234:9999/'
-// 铜川测试
-// var fuwu = 'http://61.134.55.234:9999/'
-// var fuwu = 'http://60.222.250.39:8300/'
-// 韶关
-// var fuwu = 'http://119.146.1.106:8300/'
-// 巩义测试服务
-// var fuwu = 'http://192.168.0.227:8400'
-// 燎原测试服务
-// var fuwu = 'http://121.41.19.238:8400  '
-// var fuwu = 'http://121.41.19.238:9001/'
-
-// var fuwu = 'http://139.214.92.34:8301/'
-
-var proxyTable = {
-  '/rs/logic/saleExport': {
-    target: fuwu
-  },
-  '/rs/logic/saleGetExportProgress': {
-    target: fuwu
-  },
-  '/files': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getLogin': {
-    target: fuwu
-  },
-  // 查找资源服务数据
-  '/rs/logic/getInitData': {
-    target: fuwu
-  },
-  '/rs/logic/getSaleInitData': {
-    target: fuwu
-  },
-  '/invoice': {
-    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/sql/manage_getarealist': {
-    target: fuwu
-  },
-  '/rs/sql/manage_getstreetlist': {
-    target: fuwu
-  },
-  '/rs/report': {
-    target: 'http://121.36.106.17:8400/'
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/webmeter': {
-    target: 'http://192.168.50.4:8450'
-  },
-  '/rs': {
-    // target: 'http://192.168.30.63:8081/'
-    // target: 'http://121.36.106.17:8400/'
-    target: bendi
-  }
-}
-
-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'))
-
-module.exports = app.listen(8089, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8089')
-})
+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://39.108.82.124:8400/', bendi1 = 'http://121.36.106.17:8400/'
+// 公司测试服务
+var fuwu = 'http://39.108.82.124:8400/'
+// var fuwu = 'http://121.36.106.17:8400/'
+// 铜川正式
+//  var fuwu = 'http://61.134.55.234:9999/'
+// 铜川测试
+// var fuwu = 'http://61.134.55.234:9999/'
+// var fuwu = 'http://60.222.250.39:8300/'
+// 韶关
+// var fuwu = 'http://119.146.1.106:8300/'
+// 巩义测试服务
+// var fuwu = 'http://192.168.0.227:8400'
+// 燎原测试服务
+// var fuwu = 'http://121.41.19.238:8400  '
+// var fuwu = 'http://121.41.19.238:9001/'
+
+// var fuwu = 'http://139.214.92.34:8301/'
+
+var proxyTable = {
+  '/rs/logic/saleExport': {
+    target: fuwu
+  },
+  '/rs/logic/saleGetExportProgress': {
+    target: fuwu
+  },
+  '/files': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getLogin': {
+    target: fuwu
+  },
+  // 查找资源服务数据
+  '/rs/logic/getInitData': {
+    target: fuwu
+  },
+  '/rs/logic/getSaleInitData': {
+    target: fuwu
+  },
+  '/invoice': {
+    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/sql/manage_getarealist': {
+    target: fuwu
+  },
+  '/rs/sql/manage_getstreetlist': {
+    target: fuwu
+  },
+  '/rs/report': {
+    target: 'http://121.36.106.17:8400/'
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/webmeter': {
+    target: fuwu
+  },
+  '/rs': {
+    // target: 'http://192.168.30.63:8081/'
+    // target: 'http://121.36.106.17:8400/'
+    target: bendi
+  }
+}
+
+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'))
+
+module.exports = app.listen(8089, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8089')
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.26",
+  "version": "3.5.29",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/FilesManage/FileUserFiles.vue

@@ -58,8 +58,6 @@
                     <button @click="$parent.$parent.importFile" class="button_export button_spacing"
                             style="float: right" v-if="false">导入
                     </button>
-                    <button  class="button_search button_spacing" style="width: 90px" @click="$parent.$parent.downloadFiles()">模板下载
-                    </button>
                     <!--                    <button class="button_search" style="width: 90px" @click=" $parent.$parent.selectaddress()">选择地址</button>-->
                     <button @click="$parent.$parent.xiaohu()"
                             class="button_delete button_spacing"
@@ -407,9 +405,11 @@
       <footer slot="modal-footer" class="modal-footer">
       </footer>
     </modal>
-    <modal :show.sync="batchMeterShow" width="500px" title="文件导入" v-ref:modal large backdrop="false">
+    <modal :show.sync="batchMeterShow" width="570px" title="文件导入" v-ref:modal large backdrop="false">
       <article slot="modal-body" class="modal-body">
-        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        <file-upload class="my-file-uploader col-sm-9" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        <button  class="button_clear btn-gn"  style="margin-top: 10px;background-color: #6aa6e2;"  @click="downloadFiles()">模板下载
+        </button>
       </article>
       <footer slot="modal-footer" class="modal-footer">
       </footer>

package/src/components/FilesManage/MeterinfoTest.vue

@@ -185,7 +185,7 @@
           </div>
           <div class="col-sm-4 form-group">
             <label class="font_normal_body">表具使用年限</label>
-            <input type="number" class="input_search" style="width:60%" v-model="fireinfo.f_use_limit"
+            <input type="number" class="input_search" style="width:60%" v-model="row.f_use_limit"
                    placeholder='表具使用年限' >
           </div>
           <div class="col-sm-4 form-group">
@@ -794,8 +794,19 @@
         } else {
           this.ratioshow = false
         }
+      },
+      'row.f_gas_date' (val) {
+        if (!this.row.f_use_limit) {
+          this.row.f_use_limit = this.$appdata.getSingleValue('使用年限')
+        }
+        if (!this.row.f_scrap_date && this.row.f_gas_date) {
+          if (this.row.f_use_limit !== undefined) {
+            let date = new Date(this.row.f_gas_date)
+            let year = date.getFullYear() + (this.row.f_use_limit / 1)
+            this.row.f_scrap_date = year + this.row.f_gas_date.slice(4)
+          }
+        }
       }
-
     },
     computed: {
 

package/src/components/FilesManage/UserEssentialInfoTest.vue

@@ -106,6 +106,13 @@
             <input type="text" v-model="baseinfo.base.f_zuhu_phone" class="input_search" style="width:60%"
                    placeholder="租户电话">
           </div>
+        </div>
+        <div class="row">
+          <div style="" class="col-sm-8 form-group">
+            <label for="f_zuhu_idnumber" class="font_normal_body">租户身份证</label>
+            <input type="text" v-model="baseinfo.base.f_zuhu_idnumber" class="input_search" style="width:80%"
+                   placeholder="租户身份证">
+          </div>
           <div style="" class="col-sm-4 form-group">
             <label for="f_is_mgq" class="font_normal_body ">&ensp;付款类型</label>
             <v-select id="f_is_mgq" :value.sync="baseinfo.base.f_cost_type"  v-model="baseinfo.base.f_cost_type"

package/src/components/charge/ChargeOper.vue

@@ -49,7 +49,9 @@
     } else {
       self.temp = []
       for (let i = 0; i < getBtns.length; i++) {
-        if (self.$login.r.includes(getBtns[i].name)) {
+        // 不需要权限的按钮
+        let noInclude = getBtns[i].name === '垃圾费收费'
+        if (noInclude || self.$login.r.includes(getBtns[i].name)) {
           // 进行权限验证
           self.temp.push(getBtns[i])
         }

package/src/components/revenue/base/rightview/CardList.vue

@@ -116,8 +116,7 @@
                 <transfermanage-detail :data="row" v-if="row.type === '过户'"></transfermanage-detail>
                 <othercharge-detail :data="row" v-if="row.type === '其他收费欠费登记'||row.type === '其他收费'||row.type === '维修收费'"></othercharge-detail>
                 <inputtorchange-detail :data="row" v-if="row.type === '抄表员变更'"></inputtorchange-detail>
-                <offgasaddgas-detail :data="row"
-                                     v-if=" row.type === '换表补气' ||row.type === '其他补气' || row.type === '清零补气' || row.type === '掉气补气'||row.type==='物联网补费'||row.type==='物联网扣费'||row.type==='机表补费'||row.type==='机表扣费'||row.type==='物联网补气'||row.type==='物联网扣气' " ></offgasaddgas-detail>
+                <offgasaddgas-detail :data="row" v-if=" row.type === '换表补气' ||row.type === '其他补气' || row.type === '清零补气' || row.type === '掉气补气'||row.type==='物联网补费'||row.type==='物联网扣费'||row.type==='机表补费'||row.type==='机表扣费'||row.type==='物联网补气'||row.type==='物联网扣气' " ></offgasaddgas-detail>
                 <iotopen-detail :data="row" v-if="row.type === '开通'"></iotopen-detail>
                 <iotmetercenter-detail :data="row" v-if="row.type === '物联网收费' || row.type === '物联网开户' || row.type === '调价退费' || row.type === '调价补费'||row.type === '退押金'  "></iotmetercenter-detail>
                 <overuserchange-detail :data="row" v-if="row.type === '超用收费'"></overuserchange-detail>
@@ -134,10 +133,8 @@
                 <autoaccounts-cancel-detail :data="row" v-if="row.type === '自动下账撤销'"></autoaccounts-cancel-detail>
                 <transfermanage-cancel-detail :data="row" v-if="row.type === '过户撤销'"></transfermanage-cancel-detail>
                 <cardmetercenter-cancel-detail :data="row" v-if="row.type === '卡表收费撤销'"></cardmetercenter-cancel-detail>
-                <machinemetercenter-cancel-detail :data="row"
-                                                  v-if="row.type === '机表收费撤销'"></machinemetercenter-cancel-detail>
-                <machinemetercenter-cancel-detail :data="row"
-                                                  v-if="row.type == '预存缴费撤销'"></machinemetercenter-cancel-detail>
+                <machinemetercenter-cancel-detail :data="row" v-if="row.type === '机表收费撤销'"></machinemetercenter-cancel-detail>
+                <machinemetercenter-cancel-detail :data="row" v-if="row.type == '预存缴费撤销'"></machinemetercenter-cancel-detail>
                 <othercharge-cancel-detail :data="row" v-if="row.type === '其他收费撤销'"></othercharge-cancel-detail>
                 <replacecardmanage-cancel-detail :data="row" v-if="row.type === '补卡撤销'"></replacecardmanage-cancel-detail>
                 <iotmetercenter-cancel-detail :data="row" v-if="row.type === '物联网收费撤销'"></iotmetercenter-cancel-detail>
@@ -148,6 +145,7 @@
                 <advance-delivery-detail :data="row" v-if="row.type ==='卡表预交' "></advance-delivery-detail>
                 <machinemetercenter-detail :data="row" v-if="row.type === '预存缴费'||row.type == '调价预存'"></machinemetercenter-detail>
                 <gasloss-detail :data="row" v-if="row.type === '气损收费' || row.type === '气损收费撤销'"></gasloss-detail>
+                <garbage-detail :data="row" v-if="row.type === '垃圾费收费'"></garbage-detail>
               </div>
               <div style="margin-top: 8px;background: #FFF;" v-if="!$parent.$parent.$parent.isSelected(row)">
                 <span>{{row.f_describe}}</span>
@@ -462,6 +460,8 @@
           } else {
             name = 'rs/report/iot_sell'
           }
+        } else if (type === '垃圾费收费') {
+          name = 'rs/report/garbageChargeReport'
         }
         return name
       },

package/src/components/revenue/base/rightview/carddetail/GarbageDetail.vue

@@ -0,0 +1,59 @@
+<template>
+  <div class="auto">
+    <partial-view v-ref:pv>
+      <div class="row">
+        <label class = "col-sm-4">开始日期:</label>
+        <span class = "col-sm-8" style="text-align:left">{{model.min_hand_date}}</span>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">结束日期:</label>
+        <span class = "col-sm-8" style="text-align:left">{{model.max_hand_date}}</span>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">缴费月数:</label>
+        <span class = "col-sm-8" style="text-align:left">{{model.month}}</span>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">总金额:</label>
+        <span class = "col-sm-8" style="text-align:left">{{model.money}}</span>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">操作人:</label>
+        <span class = "col-sm-8" style="text-align:left">{{data.f_operator}}</span>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">操作时间:</label>
+        <span class = "col-sm-8" style="text-align:left">{{data.f_operate_date}}</span>
+      </div>
+    </partial-view>
+  </div>
+</template>
+
+<script>
+  export default {
+    title: '垃圾费收费详情',
+    props: ['data'],
+    data () {
+      return {
+        model: {}
+      }
+    },
+    ready () {
+      let sql = 'garbageDetail'
+      let condition = {
+        recordId: this.data.id
+      }
+      this.$info(`加载数据中..., sql:${sql}`)
+      this.$refs.pv.load('rs/logic/getOneData', {data: {sql: sql, params: condition}}).then((a) => {
+        this.$info(`成功获取到数据！, data:${JSON.stringify(a.data)}`)
+        this.model = a.data
+      }).catch((error) => {
+        if (error.status) {
+          this.$warn(`加载数据出错, ${JSON.stringify(error)}`)
+          return
+        }
+        throw error
+      })
+    }
+  }
+</script>

package/src/components/revenue/cardHandManage/cardDown.vue

@@ -426,8 +426,8 @@ let readyGen = async function (self) {
 let downGen = function* (type, condition, data, self) {
   self.condition = condition
   self.msg = '确认下发计划'
-  let getUnhand = yield Vue.resetpost('rs/sql/getUnhand', {data: {startDate: self.startDate,
-    condition: self.condition}}, {resolveMsg: null, rejectMsg: '获取待审核数据异常!!'})
+  // let getUnhand = yield Vue.resetpost('rs/sql/getUnhand', {data: {startDate: self.startDate,
+  //   condition: self.condition}}, {resolveMsg: null, rejectMsg: '获取待审核数据异常!!'})
   // if (type === 'single') {
   //   getUnhand = yield Vue.resetpost('rs/sql/getUnhand', {
   //     data: {
@@ -461,19 +461,19 @@ let downGen = function* (type, condition, data, self) {
   //   console.log('========================================================================================')
   //   self.unhandplan.push(temp)
   // }
-  for (let i = 0; i < getUnhand.data.length; i++) {
-    let temp = {
-      id: getUnhand.data[i].id,
-      f_user_id: getUnhand.data[i].f_user_id,
-      f_userfiles_id: getUnhand.data[i].f_userfiles_id
-    }
-    self.unhandplan.push(temp)
-  }
-  if (getUnhand.data.length > 0) {
-    self.msg = self.msg + `, 警告: 之前有 ${getUnhand.data.length} 条待审核数据`
-  } else {
-    self.unhandplan = []
-  }
+  // for (let i = 0; i < getUnhand.data.length; i++) {
+  //   let temp = {
+  //     id: getUnhand.data[i].id,
+  //     f_user_id: getUnhand.data[i].f_user_id,
+  //     f_userfiles_id: getUnhand.data[i].f_userfiles_id
+  //   }
+  //   self.unhandplan.push(temp)
+  // }
+  // if (getUnhand.data.length > 0) {
+  //   self.msg = self.msg + `, 警告: 之前有 ${getUnhand.data.length} 条待审核数据`
+  // } else {
+  //   self.unhandplan = []
+  // }
   // console.log('1111111:',self.msg)
   self.show = true
 }