sale-client 3.5.183 → 3.5.185

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Mar 06 19:09:37 CST 2023
-gradle.version=7.5.1
+#Thu Mar 09 16:10:35 CST 2023
+gradle.version=5.2.1

package/build/dev-server.js

@@ -1,67 +1,201 @@
-const express = require('express')
-const webpack = require('webpack')
-const config = require('./webpack.dev.conf')
-const proxyMiddleware = require('http-proxy-middleware')
-const app = express()
-const compiler = webpack(config)
-
-// 自己改了这里不要提交 来回覆盖挺麻烦的
-const [local, server] = ['http://127.0.0.1:8080', 'http://192.168.50.4:8400']
-const port = 8089
-
-const proxyTable = {
-  '/text': {
-    target: local
-  },
-  '/files': {
-    target: server
-  },
-  '/excel': {
-    target: server
-  },
-  '/webmeter': {
-    target: server
-  },
-  '/rs/logic': {
-    target: server
-  },
-  '/rs': {
-    target: server
-  }
-}
-
-const devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-const hotMiddleware = require('webpack-hot-middleware')(compiler)
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({action: 'reload'})
-    cb()
-  })
-})
-
-Object.keys(proxyTable).forEach(function (context) {
-  let options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = {target: options}
-  }
-  app.use(proxyMiddleware(context, options))
-})
-app.use(require('connect-history-api-fallback')())
-app.use(devMiddleware)
-app.use(hotMiddleware)
-app.use('/static', express.static('./static'))
-
-module.exports = app.listen(port, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:' + port)
-})
+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://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400'
+// 公司测试服务
+// var fuwu = 'http://192.168.50.4:8450'
+// 梅河口
+// var fuwu = 'http://139.214.92.34:8301'
+// 单县
+// var fuwu = 'http://119.187.112.234:8400'
+// 中盛
+// var fuwu = 'http://39.99.85.14:8400'
+// 燎原
+var fuwu = 'http://121.36.106.17:8400'
+// 葛华
+// var fuwu = 'http://219.138.226.181:8401'
+// 乌海
+// var fuwu = 'http://203.57.101.233:8400'
+// 铜川
+//  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/stopBasicLivingNew':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/logic/getBatchOperaPro':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/sql/sale_getUser':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/logic/getOperBtns':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/file/uploadFile':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/business/batchRunExcelDefault/filemanage_fileSave/newSettleFileImport':{
+  //   target:'http://127.0.0.1:8080'
+  // },
+  // '/rs/business/batchRunNew/BatchmachineDownHand/machineDownHand':{
+  //   target:'http:127.0.0.1:8080'
+  // },
+  // '/rs/sql/getDownPlan':{
+  //   target:'http:127.0.0.1:8080'
+  // },
+  // '/rs/logic/saleExport': {
+  //   target: fuwu
+  // },
+  // '/rs/logic/saleGetExportProgress': {
+  //   target: fuwu
+  // },
+  // '/rs/logic/getWarningMsg': {
+  //   target: 'http://localhost:8080/'
+  // },
+  '/rs/file': {
+    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')
+})

package/package.json

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

package/src/components/revenue/comprehen/Message/MessageList.vue

@@ -100,7 +100,7 @@
                           :value.sync="model.f_create_start_date"
                           :disabled-days-of-Week="[]"
                           style="width: 60%"
-                          condition="convert(varchar(10),f_createdate,120) >= '{}'"
+                          condition="f_createdate >= '{}'"
                           :format="'yyyy-MM-dd'"
                           :show-reset-button="reset">
               </datepicker>
@@ -112,7 +112,7 @@
                           :value.sync="model.f_create_end_date"
                           :disabled-days-of-Week="[]"
                           style="width: 60%"
-                          condition="convert(varchar(10),f_createdate,120) <= '{}'"
+                          condition="f_createdate <= '{}'"
                           :format="'yyyy-MM-dd'"
                           :show-reset-button="reset">
               </datepicker>
@@ -124,7 +124,7 @@
                           :value.sync="model.f_send_start_date"
                           :disabled-days-of-Week="[]"
                           style="width: 60%"
-                          condition="convert(varchar(10),f_sendtime,120) >= '{}'"
+                          condition="f_sendtime >= '{}'"
                           :format="'yyyy-MM-dd'"
                           :show-reset-button="reset">
               </datepicker>
@@ -136,7 +136,7 @@
                           :value.sync="model.f_send_end_date"
                           :disabled-days-of-Week="[]"
                           style="width: 60%"
-                          condition="convert(varchar(10),f_sendtime,120) <= '{}'"
+                          condition="f_sendtime <= '{}'"
                           :format="'yyyy-MM-dd'"
                           :show-reset-button="reset">
               </datepicker>