sale-client 3.6.97 → 3.6.99

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [serverRul, localUrl ] = ['http://113.219.193.157:8100/', 'http://113.219.193.157:8100/']
+const [serverRul, localUrl ] = ['http://121.36.106.17:8400/', 'http://121.36.106.17:8400/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/components/UserFiles/batchUpdateInputtor.vue

@@ -237,7 +237,7 @@
         this.uploadshow = true
       },
       selfSearch (args) {
-        this.orgCondtionStr = 'and uf.f_filialeid = ' + this.f_orgid
+        this.orgCondtionStr = `and uf.f_filialeid = '${this.f_orgid}'`
 
         args.condition = `${args.condition} ` + this.orgCondtionStr
         this.area = this.$refs.paged.$refs.cri.model.f_residential_area

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

@@ -365,28 +365,32 @@
               this.$showAlert('此次机表收费之后有自动下账，不能撤销此纪录', 'warning', 1500)
               return
             }
-          } else {
-            if (this.authArr.includes('冲正权限')) {
-              if (this.config.cancleother) {
-                if (row.f_operator != this.$login.f.name) {
-                  this.$showAlert('不能撤销不是自己进行的操作', 'warning', 1500)
+          }
+          if (this.authArr.includes('冲正权限')) {
+            if (this.config.cancleother) {
+              if (row.f_operator != this.$login.f.name) {
+                this.$showAlert('不能撤销不是自己进行的操作', 'warning', 1500)
+                return
+              }
+            }
+            if (this.config.cancletime && !this.$login.f.rolesnames.includes('管理员')) {
+              let a = this.$login.toStandardYearMonth()
+              console.log('当前时间', a < row.f_operate_date)
+              if (!this.authArr.includes('跨月撤销')) {
+                if (row.f_operate_date < a) {
+                  this.$showAlert('不能撤销非本月的记录，请联系管理员获取【跨月撤销】的权限。', 'warning', 1500)
                   return
                 }
-              }
-              if (this.config.cancletime && !this.$login.f.rolesnames.includes('管理员')) {
-                let a = this.$login.toStandardYearMonth()
-                console.log('当前时间', a < row.f_operate_date)
-                if (!this.authArr.includes('跨月撤销')) {
-                  if (row.f_operate_date < a) {
-                    this.$showAlert('不能撤销非本月的记录，请联系管理员获取【跨月撤销】的权限。', 'warning', 1500)
-                    return
-                  }
+                a = this.$login.toStandardDateString() + ' 00:00:00'
+                if (row.f_operate_date < a) {
+                  this.$showAlert('不能撤销不是当天的操作', 'warning', 1500)
+                  return
                 }
               }
-            } else {
-              this.$showAlert('当前用户没有【冲正权限】', 'warning', 1500)
-              return
             }
+          } else {
+            this.$showAlert('当前用户没有【冲正权限】', 'warning', 1500)
+            return
           }
         }
 

package/src/components/revenue/comprehen/Exemption/GasFeeReduction.vue

@@ -197,7 +197,7 @@
         console.log('===>', args)
         console.log('=this.model==>', this.model)
         if (!this.orgCondtionStr) {
-          args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
+          args.condition = `${args.condition}` + ` and f_orgid = '${this.$login.f.orgid}'`
         } else {
           args.condition = `${args.condition}` + this.orgCondtionStr
         }

package/src/components/revenue/invoiceuse/InvoiceChargeList.vue

@@ -213,7 +213,7 @@
           args.condition += ` and f_hand_date <= '${year}-${month}-${day} 23:59:59'`
         }
 
-        args.condition += ` and f_orgid = ${this.f_orgstr} and f_payment <> '免交'`
+        args.condition += ` and f_orgid = '${this.f_orgstr}' and f_payment <> '免交'`
         this.model.search(args.condition, args.model)
       },
       // 获得本月的最后一天。

package/src/components/webMeter/meterinfo/NewMeterList.vue

@@ -493,7 +493,7 @@
         if (plugins.convertToIn(obj) !== null && plugins.convertToIn(obj) !== '') {
           this.orgcondition = ' and f_filialeid in ' + plugins.convertToIn(obj)
         } else {
-          this.orgcondition = ' and f_filialeid = ' + this.$login.f.orgid
+          this.orgcondition = ` and f_filialeid = '${this.$login.f.orgid}'`
         }
       },
 

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import wenxi from './filiale/rizhao/sale'
+// import wenxi from './filiale/rizhao/sale'
 // import FilialeSale from './filiale/yuansheng/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
@@ -15,7 +15,7 @@ Vue.config.silent = true
 all()
 system(false)
 sale()
-wenxi()
+// wenxi()
 // FilialeSale()
 address()
 ldap()