diff --git a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturn.vue b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturn.vue
index 0083fbb65c..02ef63027d 100644
--- a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturn.vue
+++ b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturn.vue
@@ -22,14 +22,14 @@
-
+
至
-
+
-
+
至
-
+
@@ -66,8 +66,8 @@
-
-
+
+
@@ -155,10 +155,10 @@ export default {
deptName: '',
createByName: '',
billNo: '',
- createTimeStart: '',
- createTimeEnd: '',
- closeDateStart: '',
- closeDateEnd: '',
+ startDate: '',
+ endDate: '',
+ colesStartDate: '',
+ colesEndDate: '',
invoiceName: '',
invoiceValue: '',
createBySid: '',
@@ -276,10 +276,10 @@ export default {
deptName: '',
createByName: '',
billNo: '',
- createTimeStart: '',
- createTimeEnd: '',
- closeDateStart: '',
- closeDateEnd: '',
+ startDate: '',
+ endDate: '',
+ colesStartDate: '',
+ colesEndDate: '',
invoiceName: '',
invoiceValue: '',
createBySid: '',
diff --git a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue
index 9e06ec3798..ed420fd181 100644
--- a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue
+++ b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue
@@ -26,6 +26,20 @@
{{ formobj.createTime }}
+
+
+ 收款账号
+
+
+
+ 账户名称
+
+
+
+ 开户行
+
+
+
备注
@@ -75,16 +89,10 @@
{{ formobj.vehMark }}/{{ formobj.vinNo }}
-
-
- 客户单位
- {{ formobj.customerOrg }}
-
-
合计金额：
- = 工时费： + 材料费： + 附加费： + 税额：
+ {{ formobj.totalAmount }} = 工时费： + 材料费：{{ formobj.goodsAmount }} + 附加费：{{ formobj.addAmount }}
@@ -94,20 +102,66 @@
-
服务项目
+
维修项目
- 退
+ 退
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ 维修领料
+ 商品列表
+
+
+
+
+
+ 退
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
退货信息
+
+
维修项目
+
+ `
+
+
+ 删除
+
+
+
+
+
+
@@ -117,38 +171,27 @@
商品列表
-
-
-
-
- 退
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
退货商品列表
-
整单全退
+
+ 维修用料
+ 商品列表
+
+
全退
- 合计金额：
- = 工时费： + 材料费： + 附加费： + 税额：
-
-
-
-
- 自费金额：
- = 自费工时费： + 自费材料费： + 附加费： + 税额：
-
-
-
-
- 应付金额：
- = 自费金额： + 退优惠： - 抵扣欠款：
+ 退款金额：
+ {{ tkjeCount }} = 工时费：{{ thgsfCount }} + 材料费：{{ thclfCount }} + 附加费：0
@@ -231,7 +262,8 @@ export default {
dialogVisible: false,
tableKey: 1,
sitemKey: 2,
- goodsKey: 3,
+ sitemReturnKey: 3,
+ goodsKey: 4,
index: 0,
formobj: {
type: '',
@@ -253,20 +285,60 @@ export default {
waitorName: '',
customerName: '',
mobile: '',
- customerOrg: '',
vehMark: '',
vinNo: '',
+ taskId: '',
instanceId: '',
- payableAmount: '',
totalAmount: '',
+ hourAmount: '',
+ goodsAmount: '',
+ addAmount: '',
+ payableAmount: '',
+ payableHoursAmount: '',
+ payableGoodsAmount: '',
+ accountBank: '',
+ account: '',
+ accountNumber: '',
sitemVos: [],
goodsDetailsVos: [],
- returnGoods: []
+ returnGoods: [],
+ returnSitemVos: []
},
rules: {}
}
},
- computed: {},
+ computed: {
+ // 计算退货工时费
+ thgsfCount() {
+ let gsf = '0'
+ if (this.formobj.returnSitemVos.length > 0) {
+ this.formobj.returnSitemVos.forEach((e) => {
+ if (e.serviceItem !== '') {
+ gsf = Math.round((parseFloat(gsf) + parseFloat(e.amount)) * 100) / 100
+ }
+ })
+ }
+ return gsf
+ },
+ // 计算退货材料费
+ thclfCount() {
+ let clf = '0'
+ if (this.formobj.returnGoods.length > 0) {
+ this.formobj.returnGoods.forEach((e) => {
+ if (e.goodsSpuName !== '') {
+ clf = Math.round((parseFloat(clf) + parseFloat(e.backAmount !== '' ? e.backAmount : '0')) * 100) / 100
+ }
+ })
+ }
+ return clf
+ },
+ // 计算退款金额
+ tkjeCount() {
+ let tkje = '0'
+ tkje = Math.round((parseFloat(this.thgsfCount) + parseFloat(this.thclfCount)) * 100) / 100
+ return tkje
+ }
+ },
methods: {
showAdd() {
this.viewTitle = '【新增】商品退货申请'
@@ -299,6 +371,7 @@ export default {
req.fetchDetailsBySid(row.sid).then((res) => {
if (res.success) {
this.formobj = res.data
+ this.formobj.totalAmount = Math.round(parseFloat(this.formobj.hourAmount !== '' ? this.formobj.hourAmount : '0') + (parseFloat(this.formobj.goodsAmount !== '' ? this.formobj.goodsAmount : '0') + parseFloat(this.formobj.addAmount !== '' ? this.formobj.addAmount : '0')) * 100) / 100
}
})
},
@@ -360,8 +433,11 @@ export default {
this.formobj.mobile = res.data.mobile
this.formobj.vehMark = res.data.vehMark
this.formobj.vinNo = res.data.vinNo
- this.formobj.customerOrg = res.data.customerOrg
+ this.formobj.hourAmount = res.data.hourAmount
+ this.formobj.goodsAmount = res.data.goodsAmount
+ this.formobj.addAmount = res.data.addAmount
this.formobj.sitemVos = res.data.sitemVos
+ this.formobj.totalAmount = Math.round(parseFloat(this.formobj.hourAmount !== '' ? this.formobj.hourAmount : '0') + (parseFloat(this.formobj.goodsAmount !== '' ? this.formobj.goodsAmount : '0') + parseFloat(this.formobj.addAmount !== '' ? this.formobj.addAmount : '0')) * 100) / 100
this.formobj.goodsDetailsVos = res.data.goodsDetailsVos
}
})
@@ -381,7 +457,10 @@ export default {
this.formobj.mobile = res.data.mobile
this.formobj.vehMark = res.data.vehMark
this.formobj.vinNo = res.data.vinNo
- this.formobj.customerOrg = res.data.customerOrg
+ this.formobj.hourAmount = '0'
+ this.formobj.goodsAmount = res.data.goodsAmount
+ this.formobj.addAmount = res.data.addAmount
+ this.formobj.totalAmount = Math.round(parseFloat(this.formobj.hourAmount !== '' ? this.formobj.hourAmount : '0') + (parseFloat(this.formobj.goodsAmount !== '' ? this.formobj.goodsAmount : '0') + parseFloat(this.formobj.addAmount !== '' ? this.formobj.addAmount : '0')) * 100) / 100
this.formobj.goodsDetailsVos = res.data.goodsDetailsVos
}
})
@@ -390,7 +469,41 @@ export default {
resetState() {
this.viewState = 1
},
+ sitemReturn(row, index) {
+ if (this.formobj.returnSitemVos.length !== 0) {
+ for (var i = 0; i < this.formobj.returnSitemVos.length; i++) {
+ if (this.formobj.returnSitemVos[i].itemLinkSid === row.itemLinkSid) {
+ this.$message({ showClose: true, type: 'error', message: '该记录已在退货中，请勿重复退货' })
+ return
+ }
+ }
+ }
+ this.formobj.returnSitemVos.push({
+ serviceItemSid: row.serviceItemSid,
+ serviceItem: row.serviceItem,
+ serviceTypeSid: row.serviceTypeSid,
+ serviceType: row.serviceType,
+ examineHourPrice: row.examineHourPrice,
+ hourPrice: row.hourPrice,
+ hours: row.hours,
+ price: row.price,
+ discount: row.discount,
+ discountAmount: row.discountAmount,
+ amount: row.amount,
+ remarks: row.remarks,
+ repairerName: row.repairerName,
+ itemLinkSid: row.itemLinkSid
+ })
+ },
goodsReturn(row, index) {
+ if (this.formobj.returnGoods.length !== 0) {
+ for (var i = 0; i < this.formobj.returnGoods.length; i++) {
+ if (this.formobj.returnGoods[i].goodsLinkSid === row.goodsLinkSid) {
+ this.$message({ showClose: true, type: 'error', message: '该记录已在退货中，请勿重复退货' })
+ return
+ }
+ }
+ }
this.formobj.returnGoods.push({
goodsID: row.goodsID,
goodSpuSid: row.sid,
@@ -402,11 +515,19 @@ export default {
goodsSkuOwnSpec: row.goodsSkuOwnSpec,
currentCount: row.count,
returnedCount: row.returnedCount,
+ billObjName: row.billObjName,
+ billObjSid: row.billObjSid,
+ manufacturerName: row.manufacturerName,
+ manufacturerSid: row.manufacturerSid,
+ price: row.price,
backCount: '',
backPrice: '',
- backAmount: ''
+ backAmount: '',
+ goodsLinkSid: row.goodsLinkSid
})
- this.formobj.goodsDetailsVos.splice(index, 1)
+ },
+ sitemDelete(index) {
+ this.formobj.returnSitemVos.splice(index, 1)
},
fullyWithdraw() {
if (this.formobj.returnGoods.length > 0) {
@@ -420,6 +541,9 @@ export default {
})
}
},
+ goodsDelete(index) {
+ this.formobj.returnGoods.splice(index, 1)
+ },
// 计算退货金额
backAmountInput(row) {
if (row.goodsSpuName !== '') {
@@ -429,6 +553,13 @@ export default {
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
+ this.formobj.payableHoursAmount = this.thgsfCount
+ this.formobj.payableGoodsAmount = this.thclfCount
+ this.formobj.payableAmount = this.tkjeCount
+ if (this.formobj.payableAmount === '0') {
+ this.$message({ showClose: true, type: 'error', message: '退款金额不能为零' })
+ return
+ }
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
@@ -446,6 +577,13 @@ export default {
submit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
+ this.formobj.payableHoursAmount = this.thgsfCount
+ this.formobj.payableGoodsAmount = this.thclfCount
+ this.formobj.payableAmount = this.tkjeCount
+ if (this.formobj.payableAmount === '0') {
+ this.$message({ showClose: true, type: 'error', message: '退款金额不能为零' })
+ return
+ }
this.submitdisabled = true
req.submit(this.formobj).then((res) => {
if (res.success) {
@@ -482,15 +620,24 @@ export default {
waitorName: '',
customerName: '',
mobile: '',
- customerOrg: '',
vehMark: '',
vinNo: '',
+ taskId: '',
instanceId: '',
- payableAmount: '',
totalAmount: '',
+ hourAmount: '',
+ goodsAmount: '',
+ addAmount: '',
+ payableAmount: '',
+ payableHoursAmount: '',
+ payableGoodsAmount: '',
+ accountBank: '',
+ account: '',
+ accountNumber: '',
sitemVos: [],
goodsDetailsVos: [],
- returnGoods: []
+ returnGoods: [],
+ returnSitemVos: []
}
this.submitdisabled = false
this.$emit('doback')
@@ -506,10 +653,6 @@ export default {
.addinputInfo {
margin-left: 120px !important;
}
-.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
- margin-left: 120px !important;
- width: calc(100% - 115px);
-}
.titleOne {
padding: 7px;
display: flex;
@@ -517,6 +660,10 @@ export default {
justify-content: space-between;
align-items: center;
}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+ margin-left: 120px !important;
+ width: calc(100% - 115px);
+}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
diff --git a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue
index 7690994369..8dd93cf06a 100644
--- a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue
+++ b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue
@@ -23,6 +23,20 @@
{{ formobj.createTime }}
+
+
+ 收款账号
+ {{ formobj.accountNumber }}
+
+
+ 账户名称
+ {{ formobj.account }}
+
+
+ 开户行
+ {{ formobj.accountBank }}
+
+
备注
@@ -74,18 +88,47 @@
- 客户单位
- {{ formobj.customerOrg }}
+ 合计金额：
+ {{ formobj.totalAmount }} = 工时费：{{ formobj.hourAmount }} + 材料费：{{ formobj.goodsAmount }} + 附加费：{{ formobj.addAmount }}
+
+
+ 应收金额：
+ = 合计优惠： + 已收金额： + 欠款： + 退款抵欠款：
+
+
+ 退货信息
+
+
维修项目
+
+ `
+
+
+
+
+
+
+
+
+
+
+
+
+
-
退货商品列表
+
+ 维修用料
+ 商品列表
+
+
+
@@ -95,20 +138,8 @@
合计金额：
- = 工时费： + 材料费： + 附加费： + 税额：
-
-
-
-
- 自费金额：
- = 自费工时费： + 自费材料费： + 附加费： + 税额：
-
-
-
-
- 应付金额：
- = 自费金额： + 退优惠： - 抵扣欠款：
+ 退款金额：
+ {{ formobj.payableAmount }} = 工时费：{{ formobj.payableHoursAmount }} + 材料费：{{ formobj.payableGoodsAmount }} + 附加费：0
@@ -127,8 +158,7 @@ export default {
viewTitle: '',
viewState: 1,
tableKey: 1,
- sitemKey: 2,
- goodsKey: 3,
+ sitemReturnKey: 2,
index: 0,
formobj: {
type: '',
@@ -150,15 +180,24 @@ export default {
waitorName: '',
customerName: '',
mobile: '',
- customerOrg: '',
vehMark: '',
vinNo: '',
+ taskId: '',
instanceId: '',
- payableAmount: '',
totalAmount: '',
+ hourAmount: '',
+ goodsAmount: '',
+ addAmount: '',
+ payableAmount: '',
+ payableHoursAmount: '',
+ payableGoodsAmount: '',
+ accountBank: '',
+ account: '',
+ accountNumber: '',
sitemVos: [],
goodsDetailsVos: [],
- returnGoods: []
+ returnGoods: [],
+ returnSitemVos: []
},
rules: {}
}
@@ -173,11 +212,11 @@ export default {
req.fetchDetailsBySid(row.sid).then((res) => {
if (res.success) {
this.formobj = res.data
+ this.formobj.totalAmount = Math.round(parseFloat(this.formobj.hourAmount !== '' ? this.formobj.hourAmount : '0') + (parseFloat(this.formobj.goodsAmount !== '' ? this.formobj.goodsAmount : '0') + parseFloat(this.formobj.addAmount !== '' ? this.formobj.addAmount : '0')) * 100) / 100
}
})
},
- handleReturn(isreload) {
- if (isreload === 'true') this.$emit('reloadlist')
+ handleReturn() {
this.formobj = {
type: '',
sid: '',
@@ -198,15 +237,24 @@ export default {
waitorName: '',
customerName: '',
mobile: '',
- customerOrg: '',
vehMark: '',
vinNo: '',
+ taskId: '',
instanceId: '',
- payableAmount: '',
totalAmount: '',
+ hourAmount: '',
+ goodsAmount: '',
+ addAmount: '',
+ payableAmount: '',
+ payableHoursAmount: '',
+ payableGoodsAmount: '',
+ accountBank: '',
+ account: '',
+ accountNumber: '',
sitemVos: [],
goodsDetailsVos: [],
- returnGoods: []
+ returnGoods: [],
+ returnSitemVos: []
}
this.$emit('doback')
}
diff --git a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue
index c464f38d16..a73bb36725 100644
--- a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue
@@ -26,6 +26,20 @@
{{ formobj.createTime }}
+
+
+ 收款账号
+ {{ formobj.accountNumber }}
+
+
+ 账户名称
+ {{ formobj.account }}
+
+
+ 开户行
+ {{ formobj.accountBank }}
+
+
备注
@@ -77,18 +91,47 @@
- 客户单位
- {{ formobj.customerOrg }}
+ 合计金额：
+ {{ formobj.totalAmount }} = 工时费：{{ formobj.hourAmount }} + 材料费：{{ formobj.goodsAmount }} + 附加费：{{ formobj.addAmount }}
+
+
+ 应收金额：
+ = 合计优惠： + 已收金额： + 欠款： + 退款抵欠款：
+
+
+ 退货信息
+
+
维修项目
+
+ `
+
+
+
+
+
+
+
+
+
+
+
+
+
-
退货商品列表
+
+ 维修用料
+ 商品列表
+
+
+
@@ -98,20 +141,8 @@
合计金额：
- = 工时费： + 材料费： + 附加费： + 税额：
-
-
-
-
- 自费金额：
- = 自费工时费： + 自费材料费： + 附加费： + 税额：
-
-
-
-
- 应付金额：
- = 自费金额： + 退优惠： - 抵扣欠款：
+ 退款金额：
+ {{ formobj.payableAmount }} = 工时费：{{ formobj.payableHoursAmount }} + 材料费：{{ formobj.payableGoodsAmount }} + 附加费：0
@@ -169,8 +200,7 @@ export default {
viewTitle: '',
viewState: 1,
tableKey: 1,
- sitemKey: 2,
- goodsKey: 3,
+ sitemReturnKey: 2,
index: 0,
formobj: {
type: '',
@@ -192,15 +222,24 @@ export default {
waitorName: '',
customerName: '',
mobile: '',
- customerOrg: '',
vehMark: '',
vinNo: '',
+ taskId: '',
instanceId: '',
- payableAmount: '',
totalAmount: '',
+ hourAmount: '',
+ goodsAmount: '',
+ addAmount: '',
+ payableAmount: '',
+ payableHoursAmount: '',
+ payableGoodsAmount: '',
+ accountBank: '',
+ account: '',
+ accountNumber: '',
sitemVos: [],
goodsDetailsVos: [],
- returnGoods: []
+ returnGoods: [],
+ returnSitemVos: []
},
rules: {},
options: [],
@@ -279,6 +318,7 @@ export default {
req.fetchDetailsBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
+ this.formobj.totalAmount = Math.round(parseFloat(this.formobj.hourAmount !== '' ? this.formobj.hourAmount : '0') + (parseFloat(this.formobj.goodsAmount !== '' ? this.formobj.goodsAmount : '0') + parseFloat(this.formobj.addAmount !== '' ? this.formobj.addAmount : '0')) * 100) / 100
}
})
selectStaffListss().then((res) => {
diff --git a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue
index d39b79a4c0..a4be3d1506 100644
--- a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue
@@ -25,6 +25,20 @@
{{ formobj.createTime }}
+
+
+ 收款账号
+
+
+
+ 账户名称
+
+
+
+ 开户行
+
+
+
备注
@@ -74,16 +88,10 @@
{{ formobj.vehMark }}/{{ formobj.vinNo }}
-
-
- 客户单位
- {{ formobj.customerOrg }}
-
-
合计金额：
- = 工时费： + 材料费： + 附加费： + 税额：
+ {{ formobj.totalAmount }} = 工时费： + 材料费：{{ formobj.goodsAmount }} + 附加费：{{ formobj.addAmount }}
@@ -93,20 +101,67 @@
-
服务项目
+
维修项目
- 退
+ 退
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ 维修领料
+ 商品列表
+
+
+
+
+
+ 退
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
退货信息
+
+
维修项目
+
+ `
+
+
+ 删除
+
+
+
+
+
+
@@ -116,38 +171,27 @@
商品列表
-
-
-
-
- 退
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
退货商品列表
-
整单全退
+
+ 维修用料
+ 商品列表
+
+
全退
- 合计金额：
- = 工时费： + 材料费： + 附加费： + 税额：
-
-
-
-
- 自费金额：
- = 自费工时费： + 自费材料费： + 附加费： + 税额：
-
-
-
-
- 应付金额：
- = 自费金额： + 退优惠： - 抵扣欠款：
+ 退款金额：
+ {{ tkjeCount }} = 工时费：{{ thgsfCount }} + 材料费：{{ thclfCount }} + 附加费：0
@@ -229,7 +261,8 @@ export default {
dialogVisible: false,
tableKey: 1,
sitemKey: 2,
- goodsKey: 3,
+ sitemReturnKey: 3,
+ goodsKey: 4,
index: 0,
formobj: {
type: '',
@@ -251,15 +284,24 @@ export default {
waitorName: '',
customerName: '',
mobile: '',
- customerOrg: '',
vehMark: '',
vinNo: '',
+ taskId: '',
instanceId: '',
- payableAmount: '',
totalAmount: '',
+ hourAmount: '',
+ goodsAmount: '',
+ addAmount: '',
+ payableAmount: '',
+ payableHoursAmount: '',
+ payableGoodsAmount: '',
+ accountBank: '',
+ account: '',
+ accountNumber: '',
sitemVos: [],
goodsDetailsVos: [],
- returnGoods: []
+ returnGoods: [],
+ returnSitemVos: []
},
rules: {}
}
@@ -281,7 +323,38 @@ export default {
}
}, '*')
},
- computed: {},
+ computed: {
+ // 计算退货工时费
+ thgsfCount() {
+ let gsf = '0'
+ if (this.formobj.returnSitemVos.length > 0) {
+ this.formobj.returnSitemVos.forEach((e) => {
+ if (e.serviceItem !== '') {
+ gsf = Math.round((parseFloat(gsf) + parseFloat(e.amount)) * 100) / 100
+ }
+ })
+ }
+ return gsf
+ },
+ // 计算退货材料费
+ thclfCount() {
+ let clf = '0'
+ if (this.formobj.returnGoods.length > 0) {
+ this.formobj.returnGoods.forEach((e) => {
+ if (e.goodsSpuName !== '') {
+ clf = Math.round((parseFloat(clf) + parseFloat(e.backAmount !== '' ? e.backAmount : '0')) * 100) / 100
+ }
+ })
+ }
+ return clf
+ },
+ // 计算退款金额
+ tkjeCount() {
+ let tkje = '0'
+ tkje = Math.round((parseFloat(this.thgsfCount) + parseFloat(this.thclfCount)) * 100) / 100
+ return tkje
+ }
+ },
methods: {
showInfo(sid) {
this.viewTitle = '【编辑】商品退货申请'
@@ -291,6 +364,7 @@ export default {
req.fetchDetailsBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
+ this.formobj.totalAmount = Math.round(parseFloat(this.formobj.hourAmount !== '' ? this.formobj.hourAmount : '0') + (parseFloat(this.formobj.goodsAmount !== '' ? this.formobj.goodsAmount : '0') + parseFloat(this.formobj.addAmount !== '' ? this.formobj.addAmount : '0')) * 100) / 100
}
})
},
@@ -352,8 +426,11 @@ export default {
this.formobj.mobile = res.data.mobile
this.formobj.vehMark = res.data.vehMark
this.formobj.vinNo = res.data.vinNo
- this.formobj.customerOrg = res.data.customerOrg
+ this.formobj.hourAmount = res.data.hourAmount
+ this.formobj.goodsAmount = res.data.goodsAmount
+ this.formobj.addAmount = res.data.addAmount
this.formobj.sitemVos = res.data.sitemVos
+ this.formobj.totalAmount = Math.round(parseFloat(this.formobj.hourAmount !== '' ? this.formobj.hourAmount : '0') + (parseFloat(this.formobj.goodsAmount !== '' ? this.formobj.goodsAmount : '0') + parseFloat(this.formobj.addAmount !== '' ? this.formobj.addAmount : '0')) * 100) / 100
this.formobj.goodsDetailsVos = res.data.goodsDetailsVos
}
})
@@ -373,7 +450,10 @@ export default {
this.formobj.mobile = res.data.mobile
this.formobj.vehMark = res.data.vehMark
this.formobj.vinNo = res.data.vinNo
- this.formobj.customerOrg = res.data.customerOrg
+ this.formobj.hourAmount = '0'
+ this.formobj.goodsAmount = res.data.goodsAmount
+ this.formobj.addAmount = res.data.addAmount
+ this.formobj.totalAmount = Math.round(parseFloat(this.formobj.hourAmount !== '' ? this.formobj.hourAmount : '0') + (parseFloat(this.formobj.goodsAmount !== '' ? this.formobj.goodsAmount : '0') + parseFloat(this.formobj.addAmount !== '' ? this.formobj.addAmount : '0')) * 100) / 100
this.formobj.goodsDetailsVos = res.data.goodsDetailsVos
}
})
@@ -382,7 +462,41 @@ export default {
resetState() {
this.viewState = 1
},
+ sitemReturn(row, index) {
+ if (this.formobj.returnSitemVos.length !== 0) {
+ for (var i = 0; i < this.formobj.returnSitemVos.length; i++) {
+ if (this.formobj.returnSitemVos[i].itemLinkSid === row.itemLinkSid) {
+ this.$message({ showClose: true, type: 'error', message: '该记录已在退货中，请勿重复退货' })
+ return
+ }
+ }
+ }
+ this.formobj.returnSitemVos.push({
+ serviceItemSid: row.serviceItemSid,
+ serviceItem: row.serviceItem,
+ serviceTypeSid: row.serviceTypeSid,
+ serviceType: row.serviceType,
+ examineHourPrice: row.examineHourPrice,
+ hourPrice: row.hourPrice,
+ hours: row.hours,
+ price: row.price,
+ discount: row.discount,
+ discountAmount: row.discountAmount,
+ amount: row.amount,
+ remarks: row.remarks,
+ repairerName: row.repairerName,
+ itemLinkSid: row.itemLinkSid
+ })
+ },
goodsReturn(row, index) {
+ if (this.formobj.returnGoods.length !== 0) {
+ for (var i = 0; i < this.formobj.returnGoods.length; i++) {
+ if (this.formobj.returnGoods[i].goodsLinkSid === row.goodsLinkSid) {
+ this.$message({ showClose: true, type: 'error', message: '该记录已在退货中，请勿重复退货' })
+ return
+ }
+ }
+ }
this.formobj.returnGoods.push({
goodsID: row.goodsID,
goodSpuSid: row.sid,
@@ -394,11 +508,19 @@ export default {
goodsSkuOwnSpec: row.goodsSkuOwnSpec,
currentCount: row.count,
returnedCount: row.returnedCount,
+ billObjName: row.billObjName,
+ billObjSid: row.billObjSid,
+ manufacturerName: row.manufacturerName,
+ manufacturerSid: row.manufacturerSid,
+ price: row.price,
backCount: '',
backPrice: '',
- backAmount: ''
+ backAmount: '',
+ goodsLinkSid: row.goodsLinkSid
})
- this.formobj.goodsDetailsVos.splice(index, 1)
+ },
+ sitemDelete(index) {
+ this.formobj.returnSitemVos.splice(index, 1)
},
fullyWithdraw() {
if (this.formobj.returnGoods.length > 0) {
@@ -412,6 +534,9 @@ export default {
})
}
},
+ goodsDelete(index) {
+ this.formobj.returnGoods.splice(index, 1)
+ },
// 计算退货金额
backAmountInput(row) {
if (row.goodsSpuName !== '') {
@@ -421,6 +546,9 @@ export default {
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
+ this.formobj.payableHoursAmount = this.thgsfCount
+ this.formobj.payableGoodsAmount = this.thclfCount
+ this.formobj.payableAmount = this.tkjeCount
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
@@ -445,6 +573,9 @@ export default {
submit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
+ this.formobj.payableHoursAmount = this.thgsfCount
+ this.formobj.payableGoodsAmount = this.thclfCount
+ this.formobj.payableAmount = this.tkjeCount
this.submitdisabled = true
req.submit(this.formobj).then((res) => {
if (res.success) {
@@ -477,10 +608,6 @@ export default {
.addinputInfo {
margin-left: 120px !important;
}
-.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
- margin-left: 120px !important;
- width: calc(100% - 115px);
-}
.titleOne {
padding: 7px;
display: flex;
@@ -488,6 +615,10 @@ export default {
justify-content: space-between;
align-items: center;
}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+ margin-left: 120px !important;
+ width: calc(100% - 115px);
+}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
diff --git a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue
index b9d1978f5b..c98360aea6 100644
--- a/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue
@@ -23,6 +23,20 @@
{{ formobj.createTime }}
+
+
+ 收款账号
+ {{ formobj.accountNumber }}
+
+
+ 账户名称
+ {{ formobj.account }}
+
+
+ 开户行
+ {{ formobj.accountBank }}
+
+
备注
@@ -74,18 +88,47 @@
- 客户单位
- {{ formobj.customerOrg }}
+ 合计金额：
+ {{ formobj.totalAmount }} = 工时费：{{ formobj.hourAmount }} + 材料费：{{ formobj.goodsAmount }} + 附加费：{{ formobj.addAmount }}
+
+
+ 应收金额：
+ = 合计优惠： + 已收金额： + 欠款： + 退款抵欠款：
+
+
+ 退货信息
+
+
维修项目
+
+ `
+
+
+
+
+
+
+
+
+
+
+
+
+
-
退货商品列表
+
+ 维修用料
+ 商品列表
+
+
+
@@ -95,20 +138,8 @@
合计金额：
- = 工时费： + 材料费： + 附加费： + 税额：
-
-
-
-
- 自费金额：
- = 自费工时费： + 自费材料费： + 附加费： + 税额：
-
-
-
-
- 应付金额：
- = 自费金额： + 退优惠： - 抵扣欠款：
+ 退款金额：
+ {{ formobj.payableAmount }} = 工时费：{{ formobj.payableHoursAmount }} + 材料费：{{ formobj.payableGoodsAmount }} + 附加费：0
@@ -127,8 +158,7 @@ export default {
viewTitle: '',
viewState: 1,
tableKey: 1,
- sitemKey: 2,
- goodsKey: 3,
+ sitemReturnKey: 2,
index: 0,
formobj: {
type: '',
@@ -150,15 +180,24 @@ export default {
waitorName: '',
customerName: '',
mobile: '',
- customerOrg: '',
vehMark: '',
vinNo: '',
+ taskId: '',
instanceId: '',
- payableAmount: '',
totalAmount: '',
+ hourAmount: '',
+ goodsAmount: '',
+ addAmount: '',
+ payableAmount: '',
+ payableHoursAmount: '',
+ payableGoodsAmount: '',
+ accountBank: '',
+ account: '',
+ accountNumber: '',
sitemVos: [],
goodsDetailsVos: [],
- returnGoods: []
+ returnGoods: [],
+ returnSitemVos: []
},
rules: {},
// 环节所需参数
@@ -208,6 +247,7 @@ export default {
req.fetchDetailsBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
+ this.formobj.totalAmount = Math.round(parseFloat(this.formobj.hourAmount !== '' ? this.formobj.hourAmount : '0') + (parseFloat(this.formobj.goodsAmount !== '' ? this.formobj.goodsAmount : '0') + parseFloat(this.formobj.addAmount !== '' ? this.formobj.addAmount : '0')) * 100) / 100
}
})
},