sale-client 3.6.98 → 3.6.99
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/dev-server.js +1 -1
- package/package.json +1 -1
- package/src/components/UserFiles/batchUpdateInputtor.vue +1 -1
- package/src/components/revenue/comprehen/Exemption/GasFeeReduction.vue +1 -1
- package/src/components/revenue/invoiceuse/InvoiceChargeList.vue +1 -1
- package/src/components/webMeter/meterinfo/NewMeterList.vue +1 -1
package/build/dev-server.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
var path = require('path')
|
|
2
|
-
const [serverRul, localUrl ] = ['http://
|
|
2
|
+
const [serverRul, localUrl ] = ['http://121.36.106.17:8400/', 'http://121.36.106.17:8400/']
|
|
3
3
|
var merge = require('webpack-merge')
|
|
4
4
|
var baseConfig = require('./webpack.dev.conf')
|
|
5
5
|
var devConfig = {
|
package/package.json
CHANGED
|
@@ -237,7 +237,7 @@
|
|
|
237
237
|
this.uploadshow = true
|
|
238
238
|
},
|
|
239
239
|
selfSearch (args) {
|
|
240
|
-
this.orgCondtionStr =
|
|
240
|
+
this.orgCondtionStr = `and uf.f_filialeid = '${this.f_orgid}'`
|
|
241
241
|
|
|
242
242
|
args.condition = `${args.condition} ` + this.orgCondtionStr
|
|
243
243
|
this.area = this.$refs.paged.$refs.cri.model.f_residential_area
|
|
@@ -197,7 +197,7 @@
|
|
|
197
197
|
console.log('===>', args)
|
|
198
198
|
console.log('=this.model==>', this.model)
|
|
199
199
|
if (!this.orgCondtionStr) {
|
|
200
|
-
args.condition = `${args.condition}` +
|
|
200
|
+
args.condition = `${args.condition}` + ` and f_orgid = '${this.$login.f.orgid}'`
|
|
201
201
|
} else {
|
|
202
202
|
args.condition = `${args.condition}` + this.orgCondtionStr
|
|
203
203
|
}
|
|
@@ -213,7 +213,7 @@
|
|
|
213
213
|
args.condition += ` and f_hand_date <= '${year}-${month}-${day} 23:59:59'`
|
|
214
214
|
}
|
|
215
215
|
|
|
216
|
-
args.condition += ` and f_orgid = ${this.f_orgstr} and f_payment <> '免交'`
|
|
216
|
+
args.condition += ` and f_orgid = '${this.f_orgstr}' and f_payment <> '免交'`
|
|
217
217
|
this.model.search(args.condition, args.model)
|
|
218
218
|
},
|
|
219
219
|
// 获得本月的最后一天。
|
|
@@ -493,7 +493,7 @@
|
|
|
493
493
|
if (plugins.convertToIn(obj) !== null && plugins.convertToIn(obj) !== '') {
|
|
494
494
|
this.orgcondition = ' and f_filialeid in ' + plugins.convertToIn(obj)
|
|
495
495
|
} else {
|
|
496
|
-
this.orgcondition =
|
|
496
|
+
this.orgcondition = ` and f_filialeid = '${this.$login.f.orgid}'`
|
|
497
497
|
}
|
|
498
498
|
},
|
|
499
499
|
|