sale-client 3.5.2 → 3.5.5

package/.babelrc

@@ -1,5 +1,5 @@
-{
-  "presets": ["es2015", "stage-2"],
-  "plugins": ["transform-runtime"],
-  "comments": false
-}
+{
+  "presets": ["es2015", "stage-2"],
+  "plugins": ["transform-runtime"],
+  "comments": false
+}

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Fri Apr 02 10:09:16 CST 2021
+gradle.version=3.5.1

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -0,0 +1 @@
+

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: 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'))
-
-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://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')
+})

package/package.json

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

package/src/components/FilesManage/FileUserFiles.vue

@@ -437,6 +437,7 @@
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">
+        <button class="button_search button_spacing" type="button" @click="goChargeManage()">去收费</button>
         <button class="button_search button_spacing" type="button" @click="doCopy()">复制</button>
         <button class="button_search button_spacing" type="button" @click="close2()">取消</button>
       </footer>
@@ -636,6 +637,9 @@ let loadParamGem = async function (self) {
         this.isShowDetailInfo = true
         this.rowData = obj
       },
+      goChargeManage () {
+        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+      },
       async doCopy () {
         await this.$copyText(this.resdata)
         this.resshow = false

package/src/components/FilesManage/UserEssentialInfoTest.vue

@@ -1,8 +1,5 @@
 <template>
   <div>
-    <div style="margin-bottom: 2%; margin-top: 2%">
-      <button class="button_search" style="width: max-content" @click="phoneManage()">管理备用电话</button>
-    </div>
     <validator name='v' @valid="$emit('valid')" @invalid="$emit('invalid')">
       <form class="form-horizontal select-overspread ">
         <div class="row">
@@ -17,6 +14,7 @@
             <input type="text" maxlength="11" v-model="baseinfo.base.f_user_phone"
                    v-validate:f_user_phone="{minlength: 11, maxlength: 11  }" class="input_search" style="width:60%"
                    placeholder="客户电话" v-el:phone v-next-el="area">
+            <button type="button" class="glyphicon glyphicon-plus" @click.stop="phoneManage()"></button>
           </div>
           <div class="col-sm-4 form-group" style="" v-if="true">
             <label for="f_user_state" class="font_normal_body">&ensp;客户状态</label>

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -6,7 +6,7 @@
           <img style="margin-top: -5px" src="../../../static/images/lefticon/矩形1183.png">
           <a style="font-size: 20px;font-weight: 500;">基本信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
           <button class="button_search" style="width: max-content" v-show="data.baseinfo.base.f_user_nature === '单位'" @click="showUserDevices($index, data.baseinfo)">用户设备信息</button>
-          <button class="button_search" style="width: max-content" @click="uploadFiles()">上传附件</button>
+          <button class="button_search" style="width: max-content" @click="uploadFiles()">上传/查看附件</button>
           <button class="button_search" style="width: max-content" @click="uploadPictures()">拍照</button>
           <button class="button_search" style="width: max-content" @click="openBankAccount()" v-if="data.meterinfo[0].f_user_type[0] === '非民用' && ($login.r.includes('银行开户'))">银行开户</button>
         </div>
@@ -161,7 +161,7 @@ export default {
           bank: {
             f_bank_name: ''
           },
-          //用户备用电话信息
+          // 用户备用电话信息
           userphonelist: []
         },
         addressinfo: {},
@@ -533,7 +533,7 @@ export default {
             f_meter_book_num: ''
           },
           bank: {},
-          //用户备用电话信息
+          // 用户备用电话信息
           userphonelist: []
         },
         addressinfo: {

package/src/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -151,6 +151,7 @@
     </div>
     <div class="auto" style="float: right;">
       <button class="button_clear " @click="cancelmain()" >返回</button>
+      <button class="button_search" type="button" @click="goChargeManage">去收费</button>
       <button v-if="row.f_meter_brand.includes('西美')&&row.f_meter_type.includes('物联网表')"
               class="button_search" type="button" @click="clearBarrier">清除障碍</button>
       <button v-if="row.f_meter_type.includes('物联网表')"
@@ -316,6 +317,9 @@
         uuidA = s.join('');
         return uuidA;
       },
+      goChargeManage () {
+        this.$goto('charge-manage', {f: this.$login.f}, 'main')
+      },
       openUser () {
         this.$showMessage(`是否需要给用户进行开户？`, ['confirm', 'cancel']).then(async (res) => {
           if (res === 'confirm') {

package/src/components/revenue/base/leftview/SafeCheck.vue

@@ -104,6 +104,10 @@
         <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%" >燃气使用:</td>
         <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_usegas }}</td>
       </tr>
+      <tr>
+        <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;width: 17%" >机械读数:</td>
+        <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_item_name ==='机械读数' ? '无': model.f_item_value }}</td>
+      </tr>
       <tr >
         <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">用户满意度:</td>
         <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">{{ model.f_client_evaluation }}</td>

package/src/components/revenue/comprehen/ComprehenOperation/BatchChange/BatchCancellation.vue

@@ -186,6 +186,8 @@ export default {
       if (owe.data.length > 0 && (!this.useraccount[0].f_meter_classify.includes('卡表'))) {
         this.$showAlert('该表有欠费，无法销户', 'warning', 3000)
         // this.$dispatch('button-specifies', {name:'机表收费', value: 'machine-charge'}, this.row)
+      } else if ((this.model.userinfo.f_meter_classify === '物联网表' && this.model.userinfo.f_balance_amount && this.model.userinfo.f_balance_amount > 0) || (this.model.userinfo.f_meter_classify !== '物联网表' && this.model.userinfo.f_balance && this.model.userinfo.f_balance > 0)) {
+        this.$showAlert('该表有余额，无法销户', 'warning', 3000)
       } else {
         await this.cancellation()
       }

package/src/components/revenue/concentrator/ncArchivesList.vue

@@ -80,7 +80,7 @@
             <td v-show="$parent.$parent.$parent.listshow"  style="text-align:center"><nobr>{{row.f_mpc_state}}</nobr></td>
             <td v-show="$parent.$parent.$parent.listshow"  style="text-align:center"><nobr>{{row.f_mpc_network}}</nobr></td>
             <td v-show="$parent.$parent.$parent.listshow"  style="text-align:center"><nobr>{{row.f_last_message_date}}</nobr></td>
-            <td v-show="$parent.$parent.$parent.listshow"  style="text-align:center"><nobr>{{row.f_newmessage}}</nobr></td>
+            <td v-show="$parent.$parent.$parent.listshow"  style="text-align:center"><nobr>{{row.f_new_message}}</nobr></td>
             <td v-show="$parent.$parent.$parent.listshow"  style="text-align:center"><nobr>{{row.f_modify_user}}</nobr></td>
             <td v-show="$parent.$parent.$parent.listshow"  style="text-align:center"><nobr>{{row.f_modify_date}}</nobr></td>
             <td v-show="$parent.$parent.$parent.listshow" style="text-align:center"><nobr>{{row.sumuserfiles}}</nobr></td>

package/src/components/revenue/concentrator/ncUserfilesList2.vue

@@ -28,6 +28,7 @@
                            condition="f_address like '%{}%'" placeholder='客户地址'>
                   </div>
                   <div class="span" style="float:right;">
+                    <button class="button_search button_spacing" @click="$parent.$parent.networking()">组网</button>
                     <button class="button_search button_spacing" @click="$parent.$parent.meterRead()">抄表</button>
                     <button class="button_search button_spacing" @click="$parent.$parent.confirmaddress()">取消关联</button>
                     <button class="button_search button_spacing" @click="search()">查询</button>
@@ -292,6 +293,35 @@ export default {
         this.search()
       }
     },
+    async networking () {
+      let res = await this.$showMessage('确定对选择的表具进行组网操作吗?', ['confirm', 'cancel'])
+      if (res === 'confirm') {
+        let rowdata = this.$refs.paged.$refs.grid.getRowData()
+        if (rowdata.length <= 0) {
+          this.$showMessage('请至少选择一个表具!')
+          return
+        }
+        console.log(rowdata)
+        let userfilesids = []
+        for (let row of rowdata) {
+          userfilesids.push({
+            f_userfiles_id: row.f_userfiles_id,
+            f_meternumber: row.f_meternumber
+          })
+        }
+        let param = {
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.name,
+          concentratorid: this.fileinfo.id,
+          f_mpc_number: this.fileinfo.f_mpc_number,
+          userfilesid: '',
+          userfilesids: userfilesids,
+          state: 'delete'
+        }
+        await this.$resetpost('rs/logic/concentratorNetWorking', param, {resolveMsg: '组网操作成功!', rejectMsg: '组网操作失败!'})
+        this.search()
+      }
+    },
     search () {
       this.$refs.paged.$refs.cri.search()
     },