|
@@ -953,7 +953,7 @@
|
|
|
// 制单部门
|
|
|
deptOptions: [],
|
|
|
// 计费单位(数据字典),下拉选择毛重或净重字典
|
|
|
- fFeetunitOptions: [{
|
|
|
+ fFeetunitOptions: [/*{
|
|
|
dictLabel: '件数',
|
|
|
dictValue: 1
|
|
|
}, {
|
|
@@ -968,7 +968,7 @@
|
|
|
}, {
|
|
|
dictLabel: '固定',
|
|
|
dictValue: 5
|
|
|
- }],
|
|
|
+ }*/],
|
|
|
fTaxrate: 0,
|
|
|
// 费用名称
|
|
|
fWbuOptions: [],
|
|
@@ -1034,6 +1034,9 @@
|
|
|
this.getDicts("tax_rate").then((response) => {
|
|
|
this.fTaxrate = response.data[0].dictValue
|
|
|
});
|
|
|
+ this.getDicts('data_unitfees').then((response) => {
|
|
|
+ this.fFeetunitOptions = response.data
|
|
|
+ })
|
|
|
this.register()
|
|
|
},
|
|
|
activated(){
|
|
@@ -1237,7 +1240,7 @@
|
|
|
this.warehouseDrList.push({
|
|
|
fCorpid: null,
|
|
|
fFeeid: null,
|
|
|
- fFeeunitid: 2,
|
|
|
+ fFeeunitid: "2",
|
|
|
fQty: 0,
|
|
|
fUnitprice: 0,
|
|
|
fAmount: 0,
|
|
@@ -1440,6 +1443,9 @@
|
|
|
}
|
|
|
if (response.data.warehouseFeesList) {
|
|
|
this.warehouseDrList = response.data.warehouseFeesList
|
|
|
+ for (let dr in this.warehouseDrList) {
|
|
|
+ this.$set(this.warehouseDrList[dr], "fFeeunitid", this.warehouseDrList[dr].fFeeunitid + '');
|
|
|
+ }
|
|
|
}
|
|
|
if (response.data.feesList) {
|
|
|
this.fWbuOptions = response.data.feesList
|