diff --git a/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatedistribution.js b/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatedistribution.js
index 746b1f2990..190aaede63 100644
--- a/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatedistribution.js
+++ b/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatedistribution.js
@@ -31,7 +31,7 @@ export default {
// 删除
delete: function(params) {
return request({
- url: '/scm/v1/scmspecialrebatecheckapply/delBySids',
+ url: '/scm/v1/scmspecialrebatedistribute/delBySids',
method: 'DELETE',
data: params,
headers: { 'Content-Type': 'application/json' }
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
index 2c0168dda7..8268bfcdad 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
@@ -56,7 +56,7 @@
-
+
@@ -192,6 +192,13 @@ export default {
btnKey: 'doImport',
btnLabel: '导入'
},
+ {
+ type: 'success',
+ size: 'small',
+ icon: 'export',
+ btnKey: 'doExport',
+ btnLabel: '导出'
+ },
{
type: 'danger',
size: 'small',
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistribution.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistribution.vue
index 13a4d6236a..ef3e1e7586 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistribution.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistribution.vue
@@ -128,6 +128,13 @@ export default {
btnKey: 'toAdd',
btnLabel: '新增'
},
+ {
+ type: 'danger',
+ size: 'small',
+ icon: 'del',
+ btnKey: 'doDel',
+ btnLabel: '删除'
+ },
{
type: 'info',
size: 'small',
@@ -225,6 +232,9 @@ export default {
case 'toAdd':
this.toAdd()
break
+ case 'doDel':
+ this.doDel()
+ break
case 'doClose':
this.doClose()
break
@@ -306,6 +316,35 @@ export default {
this.viewState = 4
this.$refs['divInfo'].showInfo(row)
},
+ doDel() {
+ if (this.sids.length === 0) {
+ this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
+ return
+ }
+ const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+ this.$confirm(tip, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ const loading = this.$loading({
+ lock: true,
+ text: 'Loading',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+ req.delete(this.sids).then(resp => {
+ if (resp.success) {
+ this.$message({ type: 'success', message: resp.msg, showClose: true })
+ }
+ this.getList()
+ loading.close()
+ }).catch(e => {
+ loading.close()
+ })
+ }).catch(() => {
+ })
+ },
resetState() {
this.viewState = 1
},
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionAdd.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionAdd.vue
index f7f50fb3d3..190743740a 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionAdd.vue
@@ -216,7 +216,7 @@ export default {
estimateRebate: e.estimateRebate,
uploadMoney: e.uploadMoney,
disNum: e.disNum,
- unitSetAllocationMoney: Math.round((parseFloat(e.uploadMoney) / parseFloat(e.disNum)) * 100) / 100
+ unitSetAllocationMoney: e.disNum === '0' ? '0' : Math.round((parseFloat(e.uploadMoney) / parseFloat(e.disNum)) * 100) / 100
})
})
}
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocated.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocated.vue
index 9f497b82a2..15c364410c 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocated.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocated.vue
@@ -209,6 +209,7 @@ export default {
row.forEach((element) => {
aa.push({
sid: element.sid,
+ checkApplySid: element.checkApplySid,
brandName: element.brandName,
brandSid: element.brandSid,
purchaseSystemName: element.purchaseSystemName,
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedAdd.vue
index db43baa409..4eb4955cd9 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedAdd.vue
@@ -100,6 +100,7 @@ export default {
specialRebateSids: [],
scmSpecialrebateVehsVehSidAndVinNos: []
},
+ checkApplySids: [],
rules: {},
submitdisabled: false
}
@@ -118,17 +119,20 @@ export default {
this.formobj.purchaseSystemSid = sids[0].purchaseSystemSid
var aa = 0
const bb = []
+ const cc = []
for (var i = 0; i < sids.length; i++) {
aa = Math.round((parseFloat(aa) + parseFloat(sids[i].uploadMoney)) * 100) / 100
bb.push(sids[i].sid)
+ cc.push(sids[i].checkApplySid)
}
this.formobj.allocationMoney = aa
this.formobj.specialRebateSids = bb
+ this.checkApplySids = cc
}
},
handleLook() {
this.viewState = 3
- this.$refs['divCheckInfo'].showInfo(this.formobj.specialRebateSids)
+ this.$refs['divCheckInfo'].showInfo(this.checkApplySids)
},
// 明细表添加一行数据
addCommodity() {
@@ -191,6 +195,7 @@ export default {
specialRebateSids: [],
scmSpecialrebateVehsVehSidAndVinNos: []
}
+ this.checkApplySids = []
this.$refs['form_obj'].resetFields()
this.$emit('doback')
},
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue
index ff23ceea3e..d701b03c9c 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue
@@ -124,6 +124,13 @@ export default {
btnKey: 'toAdd',
btnLabel: '新增'
},
+ {
+ type: 'success',
+ size: 'small',
+ icon: 'export',
+ btnKey: 'doExport',
+ btnLabel: '导出'
+ },
{
type: 'danger',
size: 'small',
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiEdit.vue
index 87e8302703..dab712e868 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiEdit.vue
@@ -193,7 +193,7 @@ export default {
estimateRebate: e.estimateRebate,
uploadMoney: e.uploadMoney,
disNum: e.disNum,
- unitSetAllocationMoney: Math.round((parseFloat(e.uploadMoney) / parseFloat(e.disNum)) * 100) / 100
+ unitSetAllocationMoney: e.disNum === '0' ? '0' : Math.round((parseFloat(e.uploadMoney) / parseFloat(e.disNum)) * 100) / 100
})
})
}