sale-client-xianyang 3.3.447 → 3.3.449

package/build/dev-server.js

@@ -6,13 +6,13 @@ var proxyMiddleware = require('http-proxy-middleware')
 
 var app = express()
 var compiler = webpack(config)
-var server = 'http://192.168.153.129:8300'
-var local = 'http://127.0.0.1:8080'
+var server = 'http://172.16.16.162:8300'
+var local = 'http://172.16.16.162:8300'
 var proxyTable = {
   '/rs/file': {
     target: server
   },
-  '/rs/sql/iot_getNewMeterBrandAndModel': {
+  '/rs/sql/address_getAddress': {
     target: server
   },
   '/rs/logic/address_updateuseraddress': {
@@ -22,7 +22,7 @@ var proxyTable = {
     target: server
   },
   '/rs/logic/changeMeter': {
-    target: server
+    target: local
   },
   '/pos': {
     target: server
@@ -80,13 +80,13 @@ var proxyTable = {
     target: server
   },
   '/rs/logic': {
-    target: server
+    target: local
   },
   '/rs/entity': {
-    target: server
+    target: local
   },
   '/rs/sql': {
-    target: server
+    target: local
   },
   '/webmeter': {
     target: server

package/package.json

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

package/src/components/SellGasCharge/ChargeCancel/CardMeterChargeCancel.vue

@@ -348,6 +348,17 @@ export default {
       //   }
       // }
       this.hascard = hascard
+      // 检查撤销剩余天数限制
+      let cancelDays = this.$appdata.getSingleValue('撤销剩余天数') ? this.$appdata.getSingleValue('撤销剩余天数') : 30
+      if (this.model.f_date) {
+        let chargeDate = new Date(this.model.f_date).getTime()
+        let currentDate = new Date().getTime()
+        let dayDiff = Math.floor((currentDate - chargeDate) / (1000 * 60 * 60 * 24))
+        if (dayDiff > cancelDays) {
+          this.$showAlert(`已超过撤销冲正退款时限：${cancelDays}天。`, 'warning', 2000)
+          return
+        }
+      }
       if (this.config.cancletime) {
         let a = this.$login.toStandardDateString() + ' 00:00:00'
         // console.log('当前时间',row.f_date>a)

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

@@ -68,7 +68,7 @@
                       <a @click.stop="$parent.$parent.$parent.operate('票据补打', row)" href="#">票据补打</a>
                     </li>
                     <li
-                      v-if="row.state === 1 && (row.payment !== '微信支付' && row.payment !== '银行') && (row.type === '换表补气' || row.type === '清零补气' || row.type === '物联网开户' || row.type === '物联网收费' || row.type === '其他收费' || row.type === '过户' || row.type === '换新表' || row.type === '换控制器' || row.type === '气表清零' || row.type === '机表收费' || row.type === '超用收费' || row.type === '补卡' || row.type === '过户'|| row.type === '发卡售气')">
+                      v-if="row.state === 1 && row.f_operator!=='微信公众号' && (row.payment !== '微信支付' && row.payment !== '银行') && (row.type === '换表补气' || row.type === '清零补气' || row.type === '物联网开户' || row.type === '物联网收费' || row.type === '其他收费' || row.type === '过户' || row.type === '换新表' || row.type === '换控制器' || row.type === '气表清零' || row.type === '机表收费' || row.type === '超用收费' || row.type === '补卡' || row.type === '过户'|| row.type === '发卡售气')">
                       <a @click.stop="$parent.$parent.$parent.operate('撤销', row)" href="#">撤销</a>
                     </li>
                     <li