yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

完善数量、金额逻辑

master
guoxing 11 months ago
parent
8919f520b7
commit
3f07a85dc9
2 changed files with 63 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 107
      yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
  2. 6
      yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue

107
yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
View File

@ -194,14 +194,14 @@
<el-input ref="focusAssumptionInput" v-model="scope.row.packageRemark" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="入库价" align="center" width="150">
<el-table-column label="入库单价" align="center" width="150">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" @input="commodityComputeYHAndXSJE3(scope.row,$event)"
v-model="scope.row.cost" clearable placeholder=""
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
</template>
</el-table-column>
<el-table-column label="税额" align="center" width="150">
<el-table-column label="税率" align="center" width="150">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" @input="commodityComputeYHAndXSJE4(scope.row,$event)"
v-model="scope.row.taxAmount" clearable placeholder=""
@ -277,8 +277,8 @@
"sourceBillNo": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"deptName": window.sessionStorage.getItem('departmentName'),
"deptSid": window.sessionStorage.getItem('departmentSid'),
"deptName": '',
"deptSid": '',
"createTime": getCurrentDate(),
"busTypeKey": "",
"busTypeValue": "",
@ -287,8 +287,8 @@
"deliveryDate": getCurrentDate(),
"billState": "新建",
"remarks": "",
"useOrgSid": window.sessionStorage.getItem('departmentSid'),
"createOrgSid": window.sessionStorage.getItem('orgSid'),
"useOrgSid": '',
"createOrgSid": '',
"list": [],
"pcList": []
},
@ -545,26 +545,26 @@
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
"sid": "",
"billNo": "",
"sourceBillSid": "",
"sourceBillNo": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"deptName": window.sessionStorage.getItem('departmentName'),
"deptSid": window.sessionStorage.getItem('departmentSid'),
"createTime": getCurrentDate(),
"busTypeKey": "",
"busTypeValue": "",
"supplierSid": "",
"supplierName": "",
"deliveryDate": getCurrentDate(),
"billState": "新建",
"remarks": "",
"useOrgSid": window.sessionStorage.getItem('departmentSid'),
"createOrgSid": window.sessionStorage.getItem('orgSid'),
"list": [],
"pcList": []
"sid": "",
"billNo": "",
"sourceBillSid": "",
"sourceBillNo": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"deptName": '',
"deptSid": '',
"createTime": getCurrentDate(),
"busTypeKey": "",
"busTypeValue": "",
"supplierSid": "",
"supplierName": "",
"deliveryDate": getCurrentDate(),
"billState": "新建",
"remarks": "",
"useOrgSid": '',
"createOrgSid": '',
"list": [],
"pcList": []
}
this.submitdisabled = false
this.isUpdata = false
@ -594,12 +594,11 @@
if (resp.success) {
this.formobj = resp.data
this.formobj.createByName = window.sessionStorage.getItem('name')
this.formobj.deptName = window.sessionStorage.getItem('departmentName')
this.formobj.deptSid = window.sessionStorage.getItem('departmentSid')
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.useOrgSid = window.sessionStorage.getItem('departmentSid')
this.formobj.createOrgSid = window.sessionStorage.getItem('orgSid')
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1)
}
@ -815,40 +814,54 @@
console.log("aaa", row);
console.log("aaa", val);
if (this.isUpdata) {
if (Number(row.actualInCount) > Number(row.orderCount)) {
row.actualInCount = row.orderCount
// if (this.isUpdata) {
// if (Number(row.actualInCount) > Number(row.orderCount)) {
// row.actualInCount = row.orderCount
// }
// }
// row.amount = (Number(row.actualInCount) * Number(row.taxPrice)).toFixed(2)
row.actualInCount = val
row.amount = (Number(row.actualInCount) * Number(row.cost)).toFixed(2)
}
}
row.amount = (Number(row.actualInCount) * Number(row.taxPrice)).toFixed(2)
},
commodityComputeYHAndXSJE2(row, val) {
console.log("aaa", row);
console.log("aaa", val);
if (this.isUpdata) {
if ((Number(row.rejectCount) + Number(row.actualInCount)) > Number(row.orderCount)) {
row.rejectCount = Number(row.orderCount) - Number(row.actualInCount)
}
}
row.rejectCount = val
// if (this.isUpdata) {
// if ((Number(row.rejectCount) + Number(row.actualInCount)) > Number(row.orderCount)) {
// row.rejectCount = Number(row.orderCount) - Number(row.actualInCount)
// }
// }
},
commodityComputeYHAndXSJE3(row, val) {
console.log("aaa", row);
console.log("aaa", val);
row.taxPrice = (Number(row.cost) * Number(row.taxAmount)).toFixed(2)
row.amount = (Number(row.actualInCount) * Number(row.taxPrice)).toFixed(2)
// row.taxPrice = (Number(row.cost) * Number(row.taxAmount)).toFixed(2)
// row.amount = (Number(row.actualInCount) * Number(row.taxPrice)).toFixed(2)
row.cost = val
row.amount = (Number(row.actualInCount) * Number(row.cost)).toFixed(2)
},
commodityComputeYHAndXSJE4(row, val) {
console.log("aaa", row);
console.log("aaa", val);
row.taxPrice = (Number(row.cost) * Number(row.taxAmount)).toFixed(2)
row.amount = (Number(row.actualInCount) * Number(row.taxPrice)).toFixed(2)
row.taxAmount = val
// row.taxPrice = (Number(row.cost) * Number(row.taxAmount)).toFixed(2)
// row.amount = (Number(row.actualInCount) * Number(row.taxPrice)).toFixed(2)
},
}
}

6
yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue
View File

@ -106,9 +106,9 @@
</template>
</el-table-column>
<el-table-column label="载具说明" prop="packageRemark" align="center" width="180" />
<el-table-column label="入库价" prop="cost" align="center" width="100" />
<el-table-column label="税额" prop="taxAmount" align="center" width="100" />
<el-table-column label="含税单价" prop="taxPrice" align="center" width="100" />
<el-table-column label="入库单价" prop="cost" align="center" width="100" />
<el-table-column label="税率" prop="taxAmount" align="center" width="100" />
<!-- <el-table-column label="含税单价" prop="taxPrice" align="center" width="100" /> -->
<el-table-column label="入库金额" prop="amount" align="center" width="100" />
</el-table>

Write Preview
Loading…
Cancel
Save