sale-client 3.4.99 → 3.4.103

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Thu Jan 27 17:21:53 CST 2022
+gradle.version=5.2.1

package/build/dev-server.js

@@ -1,157 +1,157 @@
-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://119.146.1.106:8300/'
-// 公司测试服务
-var fuwu = 'http://192.168.50.4: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://127.0.0.1:8079'
-  },
-  '/rs/vue': {
-    target: fuwu
-  },
-  '/rs': {
-    // target: 'http://192.168.30.63:8081/'
-    target: 'http://127.0.0.1:8078'
-    // 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://119.146.1.106:8300/'
+// 公司测试服务
+var fuwu = 'http://192.168.50.4: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://127.0.0.1:8079'
+  },
+  '/rs/vue': {
+    target: fuwu
+  },
+  '/rs': {
+    // target: 'http://192.168.30.63:8081/'
+    target: 'http://127.0.0.1:8080'
+    // 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')
+})

package/package.json

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

package/src/components/FilesManageNew/UserGeneralInfoTest.vue

@@ -39,7 +39,9 @@
         <div style="text-align:right;">
 <!--          <button class="button_search" v-show="row.f_print_state === null" @click="ignitionSheet()">生成点火单</button>-->
 <!--          <button class="button_search" v-show="row.f_print_state === null" @click="schedule()">生成流程单</button>-->
-          <button class="button_search" @click="confirm()" :disabled="!(essentialInfo && meterInfo )">确认
+          <button v-if="config.meter_required" class="button_search" @click="confirm()" :disabled="!(essentialInfo && meterInfo )">确认
+          </button>
+          <button v-if="!config.meter_required" class="button_search" @click="confirm()" :disabled="!essentialInfo">确认
           </button>
           <button class="button_search" style="width: max-content" v-if="haslimit" @click="limitClick">限购配置</button>
           <button class="button_clear" @click="cancel()">取消</button>
@@ -98,6 +100,8 @@ export default {
     return {
       config: {
         adddevices: false,
+        // 预备户表具信息是否必填
+        meter_required: true,
         f_building_suffix: '栋',
         f_unit_suffix: '单元',
         f_floor_suffix: '层',

package/src/components/charge/ChargeList.vue

@@ -131,6 +131,7 @@
             <button class="button_search" v-show="!$parent.$parent.authArr.includes('读卡限定')" @click="search(), $parent.$parent.clean()" v-el:cx>查询</button>
             <button class="button_clear" v-show="!$parent.$parent.authArr.includes('读卡限定')" @click="$parent.$parent.clear()">清空</button>
             <button class="button_clear" v-if="$parent.$parent.authArr.includes('读卡2')" @click="$parent.$parent.readCardByFactory()">读卡2</button>
+            <button class="button_clear" v-if="$parent.$parent.authArr.includes('磁条卡')" @click="$parent.$parent.readCiTiaoCard()">读磁条卡</button>
             <export-excel v-if="$parent.$parent.authArr.includes('收费综合导出权限')"
                     :data="{condition: $parent.$parent.excelCondition}"
                     :field="$parent.$parent.fields"
@@ -325,6 +326,7 @@
    */
   import {HttpResetClass, PagedList} from 'vue-client'
   import DetailManage from './DetailManage'
+  import Vue from "vue";
 
   let cardBtnGen = async function (self, val) {
     self.cardInfo = val.data
@@ -805,7 +807,35 @@
           this.$showMessage('错误：连接卡服务失败')
         }
       },
-
+      async readCiTiaoCard () {
+        console.log('读磁条卡，开始')
+        let data = {}
+        let getUser = {data: []}
+        try {
+          // let res = {data:{Factory : 'CiTiao',CardID : '5'}}
+          this.$showAlert('请刷卡', 'warning', 50000)
+          let res = await this.$resetpost('http://127.0.0.1:8003/ReadCard_HEC', data, {resolveMsg: null, rejectMsg: null})
+          res.data.Err ? this.$showAlert(res.data.Err, 'danger', 2000) : ''
+          this.$closeAlert()
+          if (res.data.Err === null && res.data.Exception) {
+            this.$showAlert(res.data.Exception, 'danger', 2000)
+          } else {
+            if (res.data.Factory === 'CiTiao') {
+              // 获取用户信息
+              getUser = await this.$resetpost('rs/sql/sale_getUser', {
+                data: {
+                  condition: `gb.f_meter_type in ('机表','物联网表') and u.f_card_id='${res.data.CardID}' and f_whether_hairpin != '未发'`,
+                  orderitem: `${this.orderitem} Desc`
+                }
+              }, {resolveMsg: '读卡成功', rejectMsg: '读卡失败'})
+              this.model.rows = getUser.data
+            }
+          }
+        } catch (error) {
+          console.log('捕获到异常', error)
+          this.$showAlert(error.data, 'danger', 2000)
+        }
+      },
       async readCardByFactory () {
         console.log('通过厂家读卡', this.model.rows.length)
         if (this.model.rows.length == 1) {

package/src/components/charge/ChargeManage.vue

@@ -35,7 +35,7 @@
 
   </div>
   <div v-if="!listpage">
-    <user-info-detail-manage-new :f_userinfo_id="rowData.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+    <user-info-detail-manage-new :f_userfiles_id="rowData.f_userfiles_id" @cancel-main="cancel"></user-info-detail-manage-new>
   </div>
   <div v-if="showModal">
     <charge-modal :warninginfo="warningInfo" :row="modalrow" :modal-show.sync="showModal" @close="close" @modalsuccess="modalsuccess"></charge-modal>