|
|
@@ -2256,11 +2256,11 @@ export default {
|
|
|
fWbuOptions: [],
|
|
|
// 计价单位
|
|
|
jFeetunitOptions: [
|
|
|
- {dictLabel: "件数",dictValue: 1},
|
|
|
+ /*{dictLabel: "件数",dictValue: 1},
|
|
|
{dictLabel: "毛重",dictValue: 2},
|
|
|
{dictLabel: "净重",dictValue: 3},
|
|
|
{dictLabel: "尺码",dictValue: 4},
|
|
|
- {dictLabel: "固定",dictValue: 5},
|
|
|
+ {dictLabel: "固定",dictValue: 5},*/
|
|
|
],
|
|
|
// 查询参数
|
|
|
queryParams: {
|
|
|
@@ -2384,6 +2384,9 @@ export default {
|
|
|
this.getDicts("sys_common_status").then((response) => {
|
|
|
this.fBillstatusOptions = response.data;
|
|
|
});
|
|
|
+ this.getDicts("data_unitfees").then((response) => {
|
|
|
+ this.jFeetunitOptions = response.data;
|
|
|
+ });
|
|
|
this.register()
|
|
|
},
|
|
|
activated(){
|
|
|
@@ -2717,7 +2720,7 @@ export default {
|
|
|
fQty: qty,
|
|
|
fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
|
|
|
fFeeid: feeId,
|
|
|
- fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid,
|
|
|
+ fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + '',
|
|
|
fUnitprice: this.dialogWhgenlegList[zhgen].fPrice,
|
|
|
fCurrency: 'RMB',
|
|
|
fExrate: 1,
|
|
|
@@ -2729,7 +2732,7 @@ export default {
|
|
|
fQty: qty,
|
|
|
fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
|
|
|
fFeeid: feeId,
|
|
|
- fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid,
|
|
|
+ fFeeunitid: this.dialogWhgenlegList[zhgen].fFeeUnitid + '',
|
|
|
fUnitprice: this.dialogWhgenlegList[zhgen].fPrice,
|
|
|
fCurrency: 'RMB',
|
|
|
fExrate: 1,
|
|
|
@@ -3322,8 +3325,17 @@ export default {
|
|
|
if (response.data.warehouse) {
|
|
|
this.warehouseDrList = response.data.warehousebillsfeesDr;
|
|
|
}
|
|
|
+ if (response.data.warehousebillsfeesDr) {
|
|
|
+ this.warehouseDrList = response.data.warehousebillsfeesDr;
|
|
|
+ for (let dr in this.warehouseDrList) {
|
|
|
+ this.$set(this.warehouseDrList[dr], "fFeeunitid", this.warehouseDrList[dr].fFeeunitid + '');
|
|
|
+ }
|
|
|
+ }
|
|
|
if (response.data.warehousebillsfeesCr) {
|
|
|
this.warehouseCrList = response.data.warehousebillsfeesCr;
|
|
|
+ for (let cr in this.warehouseCrList) {
|
|
|
+ this.$set(this.warehouseCrList[cr], "fFeeunitid", this.warehouseCrList[cr].fFeeunitid + '');
|
|
|
+ }
|
|
|
}
|
|
|
if (response.data.sysUser) {
|
|
|
this.userVal = response.data.sysUser
|
|
|
@@ -3506,15 +3518,15 @@ export default {
|
|
|
volumn = parseFloat(Number(volumn) + Number(this.dataList[li].volumn)).toFixed(2)
|
|
|
}
|
|
|
}
|
|
|
- if (row.fFeeunitid === 1) {
|
|
|
+ if (row.fFeeunitid == "1") {
|
|
|
this.$set(row, 'fQty', (fQty/1000).toFixed(2))
|
|
|
- } else if (row.fFeeunitid === 2) {
|
|
|
+ } else if (row.fFeeunitid == "2") {
|
|
|
this.$set(row, 'fQty', (fGrossweight/1000).toFixed(2))
|
|
|
- }else if (row.fFeeunitid === 3) {
|
|
|
+ }else if (row.fFeeunitid == "3") {
|
|
|
this.$set(row, 'fQty', (fNetweight/1000).toFixed(2))
|
|
|
- }else if (row.fFeeunitid === 4) {
|
|
|
+ }else if (row.fFeeunitid == "4") {
|
|
|
this.$set(row, 'fQty', (volumn/1000).toFixed(2))
|
|
|
- }else if (row.fFeeunitid === 5) {
|
|
|
+ }else if (row.fFeeunitid == "5") {
|
|
|
this.$set(row, 'fQty', (fixed/1000).toFixed(2))
|
|
|
}
|
|
|
if (row.fUnitprice) {
|
wengyuwen