sale-client 3.5.164 → 3.5.165
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/chargeNew/thirdSurplus.vue +1 -1
- package/src/components/revenue/comprehen/ComprehenOperation/OtherGas/OtherGas.vue +2 -2
- package/src/filiale/huayin/FileUserFiles.vue +1007 -0
- package/src/filiale/huayin/MeterinfoTest.vue +985 -0
- package/src/filiale/huayin/sale.js +10 -0
- package/src/filiale/liaoyuan/PriceAdjustment.vue +2 -2
- package/src/filiale/qianneng/CardList.vue +9 -0
package/build/dev-server.js
CHANGED
|
@@ -14,7 +14,7 @@ var bendi = 'http://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400/'
|
|
|
14
14
|
// 公司测试服务
|
|
15
15
|
// var fuwu = 'http://192.168.50.4:8400'
|
|
16
16
|
// var fuwu = 'http://39.99.85.14:8400'
|
|
17
|
-
var fuwu = 'http://
|
|
17
|
+
var fuwu = 'http://121.36.60.63:8700/'
|
|
18
18
|
// var fuwu = 'http://47.93.217.125:8400'
|
|
19
19
|
// var fuwu = 'http://121.36.106.17:8400/'
|
|
20
20
|
// 铜川正式
|
package/package.json
CHANGED
|
@@ -144,7 +144,7 @@
|
|
|
144
144
|
<modal :show.sync="show" width="500px" title="文件导入" v-ref:modal large backdrop="false">
|
|
145
145
|
<article slot="modal-body" class="modal-body">
|
|
146
146
|
<file-upload class="my-file-uploader " name="UploadFile" class="btn btn-success" style="border-radius: 2px;"
|
|
147
|
-
action="rs/file/uploadFile" tagname="
|
|
147
|
+
action="rs/file/uploadFile" tagname="调价导入" v-ref:file :headers="headers" multiple></file-upload>
|
|
148
148
|
</article>
|
|
149
149
|
<footer slot="modal-footer" class="modal-footer">
|
|
150
150
|
</footer>
|
|
@@ -90,8 +90,8 @@
|
|
|
90
90
|
// 若是气量卡表 temp为金额 若是金额卡表 temp为气量
|
|
91
91
|
if (self.isGas) {
|
|
92
92
|
data.f_pregas = self.model.f_pregas
|
|
93
|
-
|
|
94
|
-
|
|
93
|
+
let fee = await self.$CommonService.gasCalculate(param, self.model.f_pregas)
|
|
94
|
+
data.f_preamount = fee.data.chargenum
|
|
95
95
|
} else {
|
|
96
96
|
data.f_preamount = self.model.f_preamount
|
|
97
97
|
let gas = await self.$CommonService.feeCalculate(param, self.model.f_preamount)
|