|
@@ -220,11 +220,11 @@
|
|
<tr v-for="(item,index) in contentList" :key="index">
|
|
<tr v-for="(item,index) in contentList" :key="index">
|
|
<td class="column">{{ index + 1 }}</td>
|
|
<td class="column">{{ index + 1 }}</td>
|
|
<td class="column">{{ item.feeName }}</td>
|
|
<td class="column">{{ item.feeName }}</td>
|
|
- <td class="column"></td>
|
|
|
|
|
|
+ <td class="column">{{ item.fCurrencyName }}</td>
|
|
<td class="column">{{ item.fFeeunitName }}</td>
|
|
<td class="column">{{ item.fFeeunitName }}</td>
|
|
<td class="column">{{ item.fQty }}</td>
|
|
<td class="column">{{ item.fQty }}</td>
|
|
- <td class="column">{{ item.fUnitprice ? item.fUnitprice.toFixed(2) : item.fUnitprice }}</td>
|
|
|
|
- <td class="column">{{ item.fAmount ? item.fAmount.toFixed(2) : item.fAmount }}</td>
|
|
|
|
|
|
+ <td class="column">{{ item.fUnitprice ? parseFloat(item.fUnitprice).toFixed(2) : item.fUnitprice }}</td>
|
|
|
|
+ <td class="column">{{ item.fAmount ? parseFloat(item.fAmount).toFixed(2) : item.fAmount }}</td>
|
|
<td class="column">{{ item.remark }}</td>
|
|
<td class="column">{{ item.remark }}</td>
|
|
</tr>
|
|
</tr>
|
|
<!-- <tr>-->
|
|
<!-- <tr>-->
|
|
@@ -240,7 +240,7 @@
|
|
<td class="column" colspan="2" style="text-align: left;border-top: none;width: 40%;">{{ chineseStr }}</td>
|
|
<td class="column" colspan="2" style="text-align: left;border-top: none;width: 40%;">{{ chineseStr }}</td>
|
|
<td class="column" style="border-top: none; width: 15%;">小写总金额:</td>
|
|
<td class="column" style="border-top: none; width: 15%;">小写总金额:</td>
|
|
<td class="column" colspan="3" style="border-top: none;text-align: left;width: 30%;">
|
|
<td class="column" colspan="3" style="border-top: none;text-align: left;width: 30%;">
|
|
- {{ formList.fMoney ? formList.fMoney.toFixed(2) : formList.fMoney }}
|
|
|
|
|
|
+ {{ formList.fMoney ? parseFloat(formList.fMoney).toFixed(2) : formList.fMoney }}
|
|
</td>
|
|
</td>
|
|
</tr>
|
|
</tr>
|
|
</table>
|
|
</table>
|
|
@@ -1458,12 +1458,24 @@ export default {
|
|
}
|
|
}
|
|
this.contentList = res.data.tWarehousebillsCntrs
|
|
this.contentList = res.data.tWarehousebillsCntrs
|
|
this.$message.success('保存成功')
|
|
this.$message.success('保存成功')
|
|
|
|
+ viewSingle(this.$refs.avatar.form.fId).then(res => {
|
|
|
|
+ if (res.code === 200) {
|
|
|
|
+ let list = {
|
|
|
|
+ warehouseBills: res.data.warehouseBills,
|
|
|
|
+ tWarehousebillsfees: res.data.tWarehousebillsfees
|
|
|
|
+ }
|
|
|
|
+ this.$refs.avatar.form = list.warehouseBills
|
|
|
|
+ this.contentList = list.tWarehousebillsfees
|
|
|
|
+ this.toChies(this.$refs.avatar.form.fMoney)
|
|
|
|
+ // this.dialogVisible = true
|
|
|
|
+ }
|
|
|
|
+ })
|
|
}
|
|
}
|
|
})
|
|
})
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (item == 1) {
|
|
if (item == 1) {
|
|
- this.dialogVisible = true
|
|
|
|
|
|
+ // this.dialogVisible = true
|
|
} else if (item === 2) {
|
|
} else if (item === 2) {
|
|
let data = {
|
|
let data = {
|
|
tableName: this.queryList.tableName,
|
|
tableName: this.queryList.tableName,
|
|
@@ -1744,6 +1756,7 @@ export default {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ console.log(this.$refs.avatar.form.fMoney)
|
|
this.toChies(this.$refs.avatar.form.fMoney)
|
|
this.toChies(this.$refs.avatar.form.fMoney)
|
|
if (!this.$refs.avatar.form.fId) {
|
|
if (!this.$refs.avatar.form.fId) {
|
|
this.$message.error('未保存,不允许打印')
|
|
this.$message.error('未保存,不允许打印')
|
|
@@ -1753,6 +1766,7 @@ export default {
|
|
} else {
|
|
} else {
|
|
this.formList = this.$refs.avatar.form
|
|
this.formList = this.$refs.avatar.form
|
|
this.submitAndSave(1)
|
|
this.submitAndSave(1)
|
|
|
|
+ this.dialogVisible = true
|
|
}
|
|
}
|
|
break
|
|
break
|
|
default:
|
|
default:
|